diff --git a/.gitignore b/.gitignore
index b49fdf8dc86..371c8be2f5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ default.properties
 .DS_Store
 .idea
 *.iml
+*.orig
 Thumbs.db
 /dolibarr_genesis.mp4
 # Log files
diff --git a/.travis.yml b/.travis.yml
index c1bed319447..733e997bdf3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,8 +38,8 @@ env:
 
 jobs:
   fast_finish: true
-  allow_failures:
-  - php: nightly
+  #allow_failures:
+  #- php: nightly
   include:
     - if: type = push
       php: '5.6'
@@ -73,13 +73,6 @@ before_install:
   phpenv config-rm xdebug.ini
   echo
 
-- |
-  if [ "$DB" = 'postgresql' ]; then
-    echo "Check pgloader version"
-    pgloader --version
-    echo
-  fi
-
 install:
 - |
   echo "Updating Composer"
@@ -178,6 +171,10 @@ before_script:
     mysql --version | head -
     mysql -e "SELECT VERSION();"  | head -
     psql --version
+    if [ "$DB" = 'postgresql' ]; then
+      echo "Check pgloader version"
+      pgloader --version
+    fi
     echo
 
   - |
diff --git a/ChangeLog b/ChangeLog
index 8b9edc38f2c..e84bef00e83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,11 +3,82 @@ English Dolibarr ChangeLog
 --------------------------------------------------------------
 
 
+***** ChangeLog for 14.0.0 compared to 13.0.0 *****
+
+For users:
+----------
+
+
+For developers:
+---------------
+
+
+
+WARNING:
+
+Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
+* The ICS value for direct debit or credit transfer is now store on each bank account instead of into the global setup.
+
+
+
+***** ChangeLog for 13.0.1 compared to 13.0.0 *****
+
+FIX: 10.0 before crediting a withdrawal receipt, check whether it has been credited already.
+FIX: 11.0 when a mandatory extrafield of type sellist contains '0' it should be considered empty and trigger an error message upon insertion
+FIX: 11.0 when a new intervention is created from an object, a new $extrafields object is instantiated but not initialized
+FIX: create MO, Column 'tms' cannot be null
+FIX: #14290 #15900
+FIX: #16076
+FIX: #16077
+FIX: #16079
+FIX: #16080
+FIX: 16084
+FIX: #16107
+FIX: #16118 Timezone problem on some fields
+FIX: #16131
+FIX: #16135
+FIX: #16143
+FIX: #16156
+FIX: #16160
+FIX: #16185
+FIX: #16189, fix download/see check deposit PDF
+FIX: #16215
+FIX: Accountancy - label_operation is used instead of label_compte
+FIX: Add critical price patch
+FIX: Assignement of actors on tasks
+FIX: Bad dates on info tabs
+FIX: cash fence for takepos with multientity
+FIX: CSRF errors on margin forms
+FIX: encoding status in graph of vendor proposals
+FIX: Fix detect dispached product and set to received completely when the supplier order have services (support STOCK_SUPPORTS_SERVICES)
+FIX: Hide/Unhide external ICSS calendars
+FIX: link to create event when task is in a project with a thirdparty
+FIX: Localtax must be converted with price2num
+FIX: manage price min for PRODUIT_CUSTOMER_PRICES
+FIX: Missing language ico
+FIX: Must not be able to edit vat of all lines if not draft
+FIX: Bad "htdocs" found into a path
+FIX: removed no more used proc update_modified_column_date_m on pgsql (its presence triggered errors)
+FIX: Vulnerability report by Ricardo Matias
+FIX: select default mail template
+FIX: Select transport mode function when creating a supplier invoice and add unique key to the table llx_c_transport_mode in migrate sql
+FIX: Merge of thirdparties : "unknow column fk_soc" + "Delivery" label
+FIX: SQL Error in group by with postgres or mysql strict mode
+FIX: takepos : load date function
+FIX: Timeout during import
+FIX: Trigger on expense report was not fired
+FIX: User creation of expense report not visible
+FIX: warning when adding a line if $remise_percent is an empty string
+FIX: status late on purchase orders
+FIX: ODT generation very slow
+
+
 ***** ChangeLog for 13.0.0 compared to 12.0.0 *****
 
 For users:
 ----------
-NEW: Add module "Credit transfer SEPA" to manage payment of vendors using bank credit transfer SEPA files.
+NEW: Module "Credit transfer SEPA" to manage payment of vendors using bank credit transfer SEPA files.
+NEW: Module Intracomm report
 NEW: Module Reception (for a more accurate management of your receptions) moved from experimental to stable.
 NEW: Module Recruitment to manage Job position and applications.
 NEW: Several security issues after a private bug bounty campaign. 
@@ -22,7 +93,6 @@ NEW: Solve blocking feature. Can increase stock of a Kit without changing subpro
 NEW: add a widget to show the customers with outstanding limits reached
 NEW: add 2 rules for emailcollector: Message send/not sent from Dolibarr
 NEW: add a counter of number of words for pages in website module
-NEW: add alert before changing thirdparty in TakePOS
 NEW: add a page to list Stock at a given date in the past
 NEW: add a start date to begin binding in accountancy
 NEW: add a statistics page to list popularity of products on invoices
@@ -34,12 +104,12 @@ NEW: add column vat rate in page to define accounting account on product/service
 NEW: add costprice in fields of products list
 NEW: add an import profile for CUSTOMER ORDER, PO, PROPOSAL MODULE, SUPPLIER INVOICE
 NEW: add employee link in expense report binding page
-NEW: add EORI No. as ProfID5
+NEW: add EORI No. as ProfID5  #15382
 NEW: add export for various payments
 NEW: add Extrafields labels and values in mail on create ticket
 NEW: add Extrafields support on ECM module
 NEW: add filter rules "is answer" and "is not answer" in email collector
-NEW: add focus when editing on product/stock/product.php Close #14548
+NEW: add focus when editing on product/stock/product.php  -> close #14548
 NEW: add free text on each terminal of cash desk
 NEW: add global search for customer payments and vendor payments
 NEW: add global search for miscellaneous payments
@@ -67,7 +137,6 @@ NEW: add search param for close date on order list
 NEW: add show preview for mail attachement on form mail
 NEW: add State/Province origin for products
 NEW: add the workflow interaction close intervention on closing ticket
-NEW: add third order printer to TakePOS
 NEW: add tracking number in list and search_all items
 NEW: add vcard for adherent and user
 NEW: add week number for month view in agenda
@@ -75,7 +144,6 @@ NEW: Algeria data (VAT and forme_juridique)
 NEW: allow click on all header numbers on commerce area
 NEW: allow to reopen interventions (green button)
 NEW: allow zero quantity on supplier/vendor order line
-NEW: appearance tab in TakePOS with more visual parameters
 NEW: better currency rate editor
 NEW: can build vendor invoice from vendor orders
 NEW: can change a product in lines of a recurring invoice or contract
@@ -88,21 +156,16 @@ NEW: can edit the list of sending email profiles
 NEW: can enable/disable users in bulk actions
 NEW: can filter on accounting system ref in export of chart of account
 NEW: can filter on container type, language and tags in the list of web pages
-NEW: can hide eatby, sellby dates with option PRODUCT_DISABLE_SELLBY and PRODUCT_DISABLE_EATBY
+NEW: can hide eatby, sellby dates with option PRODUCT_DISABLE_EATBY and PRODUCT_DISABLE_SELLBY
 NEW: can import proposals, sales orders, supplier invoices
 NEW: can set a dedicated SMTP config for sending email from public ticket interface
 NEW: can set tags/categories to website pages
 NEW: can set type of price without tax per default for new sale price creation
 NEW: can use desired stock of a given warehouse for replenishment
-NEW: change thirdparty with barcode scan in TakePOS
 NEW: common behavior for monthly leave list view
 NEW: convert all subscription in datetime
-NEW: can create a thirdparty customer from TakePOS
 NEW: date shipment from order accepts hours
 NEW: price level compatibility for variant
-NEW: delayed payment in TakePOS
-NEW: display date range if exist in TakePOS
-NEW: display resiliate status in TakePOS for member
 NEW: display stat for BOM on "object referent"/linked Object product tab
 NEW: Email configuration - allow auto signed certificate when smtp ssl activated
 NEW: enable free emails input with select2
@@ -124,29 +187,24 @@ NEW: link on balance to the ledger
 NEW: MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER const in email collector
 NEW: manage errors on update extra fields in ticket card
 NEW: mass-actions for the event list view
-NEW: Module Intracomm report
 NEW: more filter for "View change logs"
-NEW: multicurrency total in TakePOS
 NEW: multiselect type and date to date filter
-NEW: Nature of product is now a dictionay
 NEW: new line template: hidden conf to fill service dates from the last service line
 NEW: PDF model storm for delivery
 NEW: possibilty to group payments by mode and show their subtotal
-NEW: Print payment method and change in TakePOS
 NEW: Priority and transparency from external calendar events
+NEW: Products - Nature of product is now a dictionary   #13287
 NEW: Products Import/Export 'default warehouse' and 'use batch number' fields
 NEW: Purchase price table: added filterable table columns
 NEW: rate editor for multicurrency
 NEW: ref_ext field for Commande lines, order lines, Attributes and Combinations, Invoice lines, payments, order lines
 NEW: remove new lines in mail on add ticket message
-NEW: restrict thirdparty to customer in TakePOS
 NEW: Rule "email to" accept wildcard *
-NEW: Save filter of the project homepage
+NEW: save filter of the project homepage
 NEW: select-able columns on customer and supplier invoice paymnet list
 NEW: select-able columns on miscellaneous payments + more data columns
 NEW: select-able columns on social taxes list
 NEW: send context and remove new lines on create ticket
-NEW: show available stock in TakePOS
 NEW: show category filter on lists only when user have rights to read categories
 NEW: show header number and make it clickable in warehouse area, payment area, shipment area
 NEW: show image of user in the combo select of users
@@ -159,15 +217,27 @@ NEW: show tags and status in search list of website pages
 NEW: show user on external calender events (when found)
 NEW: subject title with company name instead of application title in ticket message
 NEW: Support for Samba4 AD
+NEW: TakePOS appearance tab with more visual parameters
+NEW: TakePOS add alert before changing thirdparty 
+NEW: TakePOS add third order printer
+NEW: TakePOS can change thirdparty with barcode scan
+NEW: TakePOS can create a thirdparty customer from TakePOS frontend
 NEW: TakePOS connector compatibility with RECEIPT PRINTERS module
+NEW: TakePOS add delayed payment
+NEW: TakePOS display date range if exist
+NEW: TakePOS display resiliate status for members
 NEW: TakePOS Gift Receipt
-NEW: TakePOS Multicurrency compatibility
+NEW: TakePOS multicurrency compatibility
+NEW: TakePOS multicurrency total
+NEW: TakePOS print payment method and change 
+NEW: TakePOS restrict thirdparty to customer
+NEW: TakePOS show available stock 
 NEW: TakePOS Weighing Scale compatibility with TakePOS connector #14725
-NEW: Third-Party Import new fields: mother company,outstanding debt limit,bank account,incoterms
+NEW: Thirdparty Import new fields: mother company,outstanding debt limit,bank account,incoterms
 NEW: Thirdparty module : box on customer/supplier tab for invoice outsantding amount late
-NEW: ticket classification on create from email collector
+NEW: Ticket classification on create from email collector
 NEW: Ticket message notifications when edited from public interface
-NEW: translate classification labels in ticket
+NEW: Ticket translate classification labels in ticket
 NEW: VAT rate for Angola #15606
 NEW: VAT and juridical status for Algeria
 NEW: VAT report - Invert constant to show by default zero VAT in reports
@@ -181,11 +251,10 @@ NEW: add option "If the feature to manage kits of module Stock is used, show det
 
 For developers:
 ---------------
-NEW: add substitution key  __MEMBER_TYPE__ 
-NEW: add substitution key  __TYPE__ 
+NEW: add __MEMBER_TYPE__ and __TYPE__ substitution key
 NEW: add function dolButtonToOpenUrlInDialogPopup() to be able to open page into a popup
 NEW: show line number on intervention card (via MAIN_VIEW_LINE_NUMBER)
-NEW: Add some fields to link website page to an other object
+NEW: add some fields to link website page to an other object
 NEW: fill ECM src object fields in dol_add_file_process
 NEW: conf to allow to show the full tree in warehouse popup
 NEW: can use parameter ?THEME_DARKMODEENABLED=2 for a preview of theme in dark mode
@@ -194,14 +263,11 @@ NEW: can add event to log into blockedlog module with a constant
 NEW: add property cssview when declaring fields of an object
 NEW: can use dynamic code into the 'enabled' property of DAO fields
 NEW: field ref_ext in llx_commandedet
-NEW: field ref_ext for Attributes and Combinations
+NEW: fields ref_ext for Attributes and Combinations
 NEW: OAuth SCOPE for Admin SDK
-NEW: retrieve discount from invoice from API
 NEW: standardizes API thirdparties by email like other object
-NEW: Thirdparty REST API: endpoint to set price level
-NEW: use new category API for project list view
 NEW: Triggers Attributes and Attributes values
-NEW: added incoterms data into the substitution array
+NEW: add incoterms data into the substitution array
 NEW: add send context for ticket
 NEW: add a message in error_log after detection of SQL or script injection
 NEW: add validation of MX domain for emails
@@ -211,19 +277,20 @@ NEW: add param to not show links when output tags
 
 APIs
 NEW: API get contacts list of a given order
-NEW: API endpoint getContacts and Clean results
+NEW: API endpoint getContacts and clean results
 NEW: API can update a payment
 NEW: API get member by thirdparty
 NEW: API get thirdparty by barcode
 NEW: API get users by email / login
-NEW: allow to edit field "demand reason" through API
 NEW: fetch contact by email with REST API
-NEW: get state by REST API
-NEW: get state dictionary by REST API
-NEW: improve Product API for product variants
+NEW: get state dictionnary by REST API
+NEW: improve Product API for variant products
+NEW: retrieve discount from invoice from API
+NEW: Thirdparty REST API: endpoint to set price level
+NEW: use new category API for project list view
 
 HOOKs
-NEW: Hook on propal card
+NEW: add hook on propal card
 NEW: add hooks on newpayment page to allow external payment modules
 NEW: add hooks on stats pages
 NEW: add formConfirm hook on product page
@@ -238,7 +305,7 @@ Following changes may create regressions for some external modules, but were nec
 * All properties ->titre have been renamed into ->title
 * Property $paiementid in API 'api_supplier_invoices.php' has been renamed into into $payment_mode_id
 * Property 'num_paiement' has been renamed 'num_payment' everywhere for better code consistency.
-* The deprecated subsitution key __SIGNATURE__ has been removed. Use __USER_SIGNATURE__ if you used the old syntax in your email templates.
+* The deprecated subsitution key __SIGNATURE__ has been removed. Replace it with __USER_SIGNATURE__ if you used the old syntax in your email templates.
 * The hidden option HOLIDAY_MORE_PUBLIC_HOLIDAYS has been removed. Use instead the dictionary table if you need to define custom days of holiday.
 * If you build a class that implement CommonObject to use the incoterm properties or methods (->fk_incoterm, ->label_incoterm, ->location_incoterm),
   you must now also include declaration of the Trait 'CommonIncoterm' in your class. All incoterm functions were moved into this Trait.
@@ -250,7 +317,9 @@ Following changes may create regressions for some external modules, but were nec
 * Function showStripePaymentUrl, getStripePaymentUrl, showPaypalPaymentUrl and getPaypalPaymentUrl has been removed. The generic one showOnlinePaymentUrl and getOnlinePaymentUrl are always used.
 * Context for hook showSocinfoOnPrint has been moved from "showsocinfoonprint" to "main"
 * Library htdocs/includes/phpoffice/phpexcel as been removed (replaced with htdocs/includes/phpoffice/PhpSpreadsheet)
-
+* Database transaction in your triggers must be correctly balanced (one close for one open). If not, an error will be returned by the trigger, even if trigger did return error code.
+* Dolibarr v13 is still compatible with any PHP version between 5.6.0 and 7.4.*; Unit tests are OK with PHP 8.0 but some warnings or troubles may appears with PHP 8.0.
+* All your Ajax services must contains such a line at begin of file:  if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
 
 ***** ChangeLog for 12.0.4 compared to 12.0.3 *****
 FIX: make formConfirm an addreplace-type hook
diff --git a/build/README b/build/README
index 14f2b92ae39..626953f9376 100644
--- a/build/README
+++ b/build/README
@@ -7,6 +7,9 @@ Building packages
 ##################################################
 
 All sub-directories of "build" directory contains files (setup or binary tools) required to build automatically Dolibarr packages.
+The build directory and all its contents is absolutely not required to make Dolibarr working. 
+It is here only to build Dolibarr packages, and those generated packages will not contains this "build" directory.
+
 
 There are several tools:
 
@@ -17,8 +20,7 @@ There are several tools:
 --------------------------------------------------------------------------------------------------
 
 
-Prerequisites to build tgz, debian, rpm package:
-
+Prerequisites to build tgz, debian and rpm packages:
 > apt-get install tar dpkg dpatch p7zip-full rpm zip
 
 
@@ -58,10 +60,6 @@ Prerequisites to build autoexe DoliWamp package:
 
 --------------------------------------------------------------------------------------------------
 
-Note: 
-The build directory and all its contents is absolutely not required to make Dolibarr working. 
-It is here only to build Dolibarr packages, and those generated packages will not contains this "build" directory.
-
 
 You can find in "build", following sub-directories:
 
diff --git a/build/debian/control b/build/debian/control
index 0ef5367072f..eed54669555 100755
--- a/build/debian/control
+++ b/build/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>
 # Uploaders: Laurent Destailleur (eldy) <eldy@users.sourceforge.net>		# Only if differs from Maintainer
 Standards-Version: 3.9.6
-Homepage: http://www.dolibarr.org
+Homepage: https://www.dolibarr.org
 Build-Depends: debhelper (>= 9), po-debconf
 # This package need at least debian 7 or ubuntu 13.04 or any distribution based on this version
  
diff --git a/build/debian/dolibarr.postinst b/build/debian/dolibarr.postinst
index 7684d02ff3d..26a08a55826 100644
--- a/build/debian/dolibarr.postinst
+++ b/build/debian/dolibarr.postinst
@@ -23,7 +23,7 @@ setup_empty_conf() {
     mkdir -p /etc/dolibarr
     touch /etc/dolibarr/conf.php
     chown root:www-data /etc/dolibarr/conf.php
-    chmod 664 /etc/dolibarr/conf.php
+    chmod 660 /etc/dolibarr/conf.php
 }
 
 is_new_upstream_version() {
diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
index 41c20740d78..50eb6c84def 100755
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -105,8 +105,8 @@ if (empty($includecustom)) {
     }
 }
 
-print "Release                        : ".$release."\n";
 print "Working on files into          : ".DOL_DOCUMENT_ROOT."\n";
+print "Release                        : ".$release."\n";
 print "Include custom in signature    : ".$includecustom."\n";
 print "Include constants in signature : ";
 foreach ($includeconstants as $countrycode => $tmp) {
diff --git a/dev/README b/dev/README
index 337928507fc..78666d77f3a 100644
--- a/dev/README
+++ b/dev/README
@@ -1,13 +1,14 @@
 README (English)
 --------------------------------
-This directory contains sub-directories to provide tools or
-documentation for developers.
-Note: All files in this directory are in VCS only and are not
-provided with a standard release.
 
+This directory contains sub-directories to provide tools or documentation for developers.
+
+Note: All files in this directory are in the source repository only and are not provided with a standard release. They are useless to make Dolibarr working.
+
+You may find a more complete documentation on Dolibarr on the wiki:
 
-There is also some documentation on Dolibarr Wiki:
 https://wiki.dolibarr.org/
-and
-https://doxygen.dolibarr.org/
 
+and on
+
+https://doxygen.dolibarr.org/
diff --git a/dev/examples/code/create_invoice.php b/dev/examples/code/create_invoice.php
index 1acf181a4ba..1d231a7fd7a 100755
--- a/dev/examples/code/create_invoice.php
+++ b/dev/examples/code/create_invoice.php
@@ -29,8 +29,8 @@ $path=dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
+	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+	exit;
 }
 
 // Global variables
@@ -49,7 +49,10 @@ $langs->load("main");				// To load language file for default language
 
 // Load user and its permissions
 $result=$user->fetch('', 'admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('', $user->error); exit; }
+if (! $result > 0) {
+	dol_print_error('', $user->error);
+	exit;
+}
 $user->getrights();
 
 
@@ -82,12 +85,12 @@ $obj->lines[]=$line1;
 
 // Create invoice
 $idobject=$obj->create($user);
-if ($idobject > 0)
-{
+if ($idobject > 0) {
 	// Change status to validated
 	$result=$obj->validate($user);
-	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else {
+	if ($result > 0) {
+		print "OK Object created with id ".$idobject."\n";
+	} else {
 		$error++;
 		dol_print_error($db, $obj->error);
 	}
@@ -99,8 +102,7 @@ if ($idobject > 0)
 
 // -------------------- END OF YOUR CODE --------------------
 
-if (! $error)
-{
+if (! $error) {
 	$db->commit();
 	print '--- end ok'."\n";
 } else {
diff --git a/dev/examples/code/create_order.php b/dev/examples/code/create_order.php
index 7fe1a82251a..a851ac3cbc5 100755
--- a/dev/examples/code/create_order.php
+++ b/dev/examples/code/create_order.php
@@ -29,8 +29,8 @@ $path=dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
+	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+	exit;
 }
 
 // Global variables
@@ -49,7 +49,10 @@ $langs->load("main");				// To load language file for default language
 
 // Load user and its permissions
 $result=$user->fetch('', 'admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('', $user->error); exit; }
+if (! $result > 0) {
+	dol_print_error('', $user->error);
+	exit;
+}
 $user->getrights();
 
 
@@ -80,12 +83,12 @@ $com->lines[]=$orderline1;
 
 // Create order
 $idobject=$com->create($user);
-if ($idobject > 0)
-{
+if ($idobject > 0) {
 	// Change status to validated
 	$result=$com->valid($user);
-	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else {
+	if ($result > 0) {
+		print "OK Object created with id ".$idobject."\n";
+	} else {
 		$error++;
 		dol_print_error($db, $com->error);
 	}
@@ -97,8 +100,7 @@ if ($idobject > 0)
 
 // -------------------- END OF YOUR CODE --------------------
 
-if (! $error)
-{
+if (! $error) {
 	$db->commit();
 	print '--- end ok'."\n";
 } else {
diff --git a/dev/examples/code/create_product.php b/dev/examples/code/create_product.php
index 20b898a92aa..8f742065f2f 100755
--- a/dev/examples/code/create_product.php
+++ b/dev/examples/code/create_product.php
@@ -29,8 +29,8 @@ $path=dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
+	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+	exit;
 }
 
 // Global variables
@@ -49,7 +49,10 @@ $langs->load("main");				// To load language file for default language
 
 // Load user and its permissions
 $result=$user->fetch('', 'admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('', $user->error); exit; }
+if (! $result > 0) {
+	dol_print_error('', $user->error);
+	exit;
+}
 $user->getrights();
 
 
@@ -79,8 +82,7 @@ $myproduct->weight_units       = 0;
 
 // Create product in database
 $idobject = $myproduct->create($user);
-if ($idobject > 0)
-{
+if ($idobject > 0) {
 	print "OK Object created with id ".$idobject."\n";
 } else {
 	$error++;
@@ -89,8 +91,7 @@ if ($idobject > 0)
 
 // -------------------- END OF YOUR CODE --------------------
 
-if (! $error)
-{
+if (! $error) {
 	$db->commit();
 	print '--- end ok'."\n";
 } else {
diff --git a/dev/examples/code/create_user.php b/dev/examples/code/create_user.php
index d585b490a9c..e374fec531d 100755
--- a/dev/examples/code/create_user.php
+++ b/dev/examples/code/create_user.php
@@ -29,8 +29,8 @@ $path=dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
+	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+	exit;
 }
 
 // Global variables
@@ -49,7 +49,10 @@ $langs->load("main");				// To load language file for default language
 
 // Load user and its permissions
 $result=$user->fetch('', 'admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('', $user->error); exit; }
+if (! $result > 0) {
+	dol_print_error('', $user->error);
+	exit;
+}
 $user->getrights();
 
 
@@ -69,18 +72,17 @@ $obj->nom   = 'ABCDEF';
 
 // Create user
 $idobject=$obj->create($user);
-if ($idobject > 0)
-{
+if ($idobject > 0) {
 	// Change status to validated
 	$result=$obj->setStatut(1);
-	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else {
+	if ($result > 0) {
+		print "OK Object created with id ".$idobject."\n";
+	} else {
 		$error++;
 		dol_print_error($db, $obj->error);
 	}
-} elseif ($obj->error == 'ErrorLoginAlreadyExists')
-{
-     print "User with login ".$obj->login." already exists\n";
+} elseif ($obj->error == 'ErrorLoginAlreadyExists') {
+	 print "User with login ".$obj->login." already exists\n";
 } else {
 	$error++;
 	dol_print_error($db, $obj->error);
@@ -89,8 +91,7 @@ if ($idobject > 0)
 
 // -------------------- END OF YOUR CODE --------------------
 
-if (! $error)
-{
+if (! $error) {
 	$db->commit();
 	print '--- end ok'."\n";
 } else {
diff --git a/dev/examples/code/get_contracts.php b/dev/examples/code/get_contracts.php
index aec246e9480..40bee133d11 100755
--- a/dev/examples/code/get_contracts.php
+++ b/dev/examples/code/get_contracts.php
@@ -29,8 +29,8 @@ $path=dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-    exit;
+	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+	exit;
 }
 
 // Global variables
@@ -49,14 +49,17 @@ $langs->load("main");				// To load language file for default language
 
 // Load user and its permissions
 $result=$user->fetch('', 'admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('', $user->error); exit; }
+if (! $result > 0) {
+	dol_print_error('', $user->error);
+	exit;
+}
 $user->getrights();
 
 
 print "***** ".$script_file." (".$version.") *****\n";
 if (! isset($argv[1])) {	// Check parameters
-    print "Usage: ".$script_file." id_thirdparty ...\n";
-    exit;
+	print "Usage: ".$script_file." id_thirdparty ...\n";
+	exit;
 }
 print '--- start'."\n";
 print 'Argument id_thirdparty='.$argv[1]."\n";
diff --git a/dev/examples/git/pre-commit b/dev/examples/git/pre-commit
new file mode 100644
index 00000000000..f89d662ae65
--- /dev/null
+++ b/dev/examples/git/pre-commit
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+PROJECT=`php -r "echo dirname(dirname(dirname(realpath('$0'))));"`
+STAGED_FILES_CMD=`git diff --cached --name-only --diff-filter=ACMR HEAD | grep \\\\.php`
+
+# Determine if a file list is passed
+if [ "$#" -eq 1 ]
+then
+    oIFS=$IFS
+    IFS='
+    '
+    SFILES="$1"
+    IFS=$oIFS
+fi
+SFILES=${SFILES:-$STAGED_FILES_CMD}
+
+echo "Checking PHP Lint..."
+for FILE in $SFILES
+do
+    php -l -d display_errors=0 $PROJECT/$FILE
+    if [ $? != 0 ]
+    then
+        echo "Fix the error before commit."
+        exit 1
+    fi
+    FILES="$FILES $PROJECT/$FILE"
+done
+
+if [ "$FILES" != "" ]
+then
+    echo "Running PHPCS Code Sniffer..."
+    #~/vendor/bin/phpcs --version
+    #phpcs --standard=PSR2 --encoding=utf-8 -n -p $FILES
+    # Check Dolibarr standard
+    ~/vendor/bin/phpcs -s -p -d memory_limit=-1 --parallel=2 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true $FILES
+    # Check your own standard
+    #~/vendor/bin/phpcs -s -p -d memory_limit=-1 --parallel=2 --extensions=php --colors --tab-width=4 --standard=htdocs/custom/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true $FILES
+
+    if [ $? != 0 ]
+    then
+        # fix standard errors
+        ~/vendor/bin/phpcbf -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true $FILES
+        #~/vendor/bin/phpcbf -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=htdocs/custom/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true $FILES
+        echo "Fix the error before commit."
+        exit 1
+    fi
+fi
+
+exit $?
diff --git a/dev/resources/dbmodel/dolibarr_schema.mwb b/dev/resources/dbmodel/dolibarr_schema.mwb
index 27bc4ab2403..37929762bab 100644
Binary files a/dev/resources/dbmodel/dolibarr_schema.mwb and b/dev/resources/dbmodel/dolibarr_schema.mwb differ
diff --git a/dev/resources/iso-normes/barcode_EAN13.txt b/dev/resources/iso-normes/barcode_EAN13.txt
index 69194625126..f4496327ee4 100644
--- a/dev/resources/iso-normes/barcode_EAN13.txt
+++ b/dev/resources/iso-normes/barcode_EAN13.txt
@@ -1,3 +1,7 @@
+Barcode EAN 13
+
+FR
+==
 Signification des chiffres.
 
 - 2 chiffres pour le code pays ou code systeme
@@ -9,6 +13,24 @@ Cette regle subit de nombreuses entorses pour ameliorer l'usage des chiffres dis
 Voici la liste des codes pays ou systeme :
 
 
+
+EN
+==
+Meaning of the numbers.
+
+- 2 digits for the country code or system code
+- 5 digits for the company identifier
+- 5 digits for item identifier
+- 1 digit for checksum
+
+This rule has been twisted many times to improve the use of the available numbers.
+Here is the list of country codes or system:
+
+
+
+List
+====
+
 00 � 13 UCC (Etats-Unis et Canada)
 20 � 29 Codification interne en magasin
 30 � 37 GENCOD-EAN France
@@ -104,4 +126,4 @@ Voici la liste des codes pays ou systeme :
 978 - 979 Livres (ISBN)
 980 Refus de remboursement
 981 - 982 Coupons (monnaie courante)
-99 Coupons
\ No newline at end of file
+99 Coupons
diff --git a/dev/resources/licence/Links on GPL.txt b/dev/resources/licence/Links on GPL.txt
index 0fb3b63c851..d8a5f790458 100644
--- a/dev/resources/licence/Links on GPL.txt	
+++ b/dev/resources/licence/Links on GPL.txt	
@@ -1,5 +1,6 @@
 * Page with license compatibility
-https://www.gnu.org/licenses/quick-guide-gplv3.fr.html
+[EN] https://www.gnu.org/licenses/quick-guide-gplv3.en.html
+[FR] https://www.gnu.org/licenses/quick-guide-gplv3.fr.html
 
 * FAQ on GPL license
 https://www.fsf.org/licensing/licenses/gpl-faq.html
diff --git a/dev/setup/nginx/dolibarr b/dev/setup/nginx/dolibarr
index 82b8d2dc7bf..ffda5fae609 100644
--- a/dev/setup/nginx/dolibarr
+++ b/dev/setup/nginx/dolibarr
@@ -5,13 +5,13 @@ server {
 
         root /path/to/your/htdocs;
 
-        # Optionnal
+        # Optional
         error_log /path/to/your/log/directory/nginx.error.log;
 	    access_log /path/to/your/log/directory/nginx.access.log;
 
         index index.php index.html index.htm;
 
-        # Optionnal
+        # Optional
         server_name your-fqdn.tld;
 
         location / {
@@ -23,6 +23,6 @@ server {
                 fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
                 fastcgi_read_timeout 600;
                 include fastcgi_params;
-                fastcgi_pass unix:/var/run/php5-fpm.sock;
+                fastcgi_pass unix:/var/run/php5-fpm.sock;  //  /var/run/php/php7.0-fpm.sock
         }
 }
diff --git a/doc/index.html b/doc/index.html
index 5c655136e3e..333f96099c3 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -6,18 +6,15 @@
 </head>
 <body>
 
-This directory contains several subdirectories with entries for 
-informations on Dolibarr.<br>
-But if you are looking for other resources (downloads, documentation, addons, ...), you can find this
-on Internet on web following sites:<br>
-<br>
-* <a href="https://wiki.dolibarr.org">Dolibarr wiki (documentation)</a><br>
+This directory contains several subdirectories with entries for informations on Dolibarr.<br>
+But if you are looking for other resources (downloads, documentation, addons, ...), you can find this on Internet on web following sites:<br>
+
 <br>
 * <a href="https://www.dolibarr.org">Dolibarr portal (official website)</a><br>
 <br>
-* <a href="https://demo.dolibarr.org">Dolibarr demo (online)</a><br>
+* <a href="https://wiki.dolibarr.org">Dolibarr wiki (documentation)</a><br>
 <br>
-* <a href="https://www.nltechno.com/pages/dolibarrwinbin.php">DoliWamp, the Dolibarr for Windows</a><br>
+* <a href="https://demo.dolibarr.org">Dolibarr demo (online)</a><br>
 <br>
 * <a href="https://www.dolistore.com">DoliStore (official addons/plugins market place)</a><br>
 
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 6d621a7e101..3c3489185f4 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -444,9 +444,6 @@ if ($id)
 	// Form to add a new line
 	if ($tabname[$id])
 	{
-		$alabelisused = 0;
-		$var = false;
-
 		$fieldlist = explode(',', $tabfield[$id]);
 
 		// Line for title
@@ -481,7 +478,6 @@ if ($id)
 				}
 				print '</td>';
 			}
-			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
 		}
 
 		print '<td>';
@@ -612,7 +608,7 @@ if ($id)
 					print '&nbsp;<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'"></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/card.php b/htdocs/accountancy/admin/card.php
index 029550192f0..23ebde7e230 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 $error = 0;
 
 // Load translation files required by the page
-$langs->loadLangs(array("bills", "accountancy"));
+$langs->loadLangs(array("bills", "accountancy", "compta"));
 
 $mesg = '';
 $action = GETPOST('action', 'aZ09');
@@ -41,7 +41,9 @@ $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $rowid = GETPOST('rowid', 'int');
 $cancel = GETPOST('cancel', 'alpha');
-$accountingaccount = GETPOST('accountingaccount', 'alpha');
+
+$account_number = GETPOST('account_number', 'string');
+$label = GETPOST('label', 'alpha');
 
 // Security check
 if ($user->socid > 0) accessforbidden();
@@ -65,104 +67,118 @@ if (GETPOST('cancel', 'alpha'))
 if ($action == 'add' && $user->rights->accounting->chartofaccount)
 {
 	if (!$cancel) {
-		$sql = 'SELECT pcg_version FROM '.MAIN_DB_PREFIX.'accounting_system WHERE rowid='.$conf->global->CHARTOFACCOUNTS;
-
-		dol_syslog('accountancy/admin/card.php:: $sql='.$sql);
-		$result = $db->query($sql);
-		$obj = $db->fetch_object($result);
-
-		// Clean code
-
-		// To manage zero or not at the end of the accounting account
-		if ($conf->global->ACCOUNTING_MANAGE_ZERO == 1)
+		if (!$account_number)
 		{
-			$account_number = GETPOST('account_number', 'string');
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountNumber")), null, 'errors');
+			$action = 'create';
+		} elseif (!$label)
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
+			$action = 'create';
 		} else {
-			$account_number = clean_account(GETPOST('account_number', 'string'));
-		}
+			$sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid='.((int) $conf->global->CHARTOFACCOUNTS);
 
-		if (GETPOST('account_parent', 'int') <= 0)
-		{
-			$account_parent = 0;
-		} else {
-			$account_parent = GETPOST('account_parent', 'int');
-		}
+			dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
+			$result = $db->query($sql);
+			$obj = $db->fetch_object($result);
 
-		$object->fk_pcg_version = $obj->pcg_version;
-		$object->pcg_type = GETPOST('pcg_type', 'alpha');
-		$object->account_number = $account_number;
-		$object->account_parent = $account_parent;
-		$object->account_category = GETPOST('account_category', 'alpha');
-		$object->label = GETPOST('label', 'alpha');
-		$object->labelshort = GETPOST('labelshort', 'alpha');
-		$object->active = 1;
+			// Clean code
 
-		$res = $object->create($user);
-		if ($res == - 3) {
-			$error = 1;
-			$action = "create";
-			setEventMessages($object->error, $object->errors, 'errors');
-		} elseif ($res == - 4) {
-			$error = 2;
-			$action = "create";
-			setEventMessages($object->error, $object->errors, 'errors');
-		} elseif ($res < 0)
-		{
-			$error++;
-			setEventMessages($object->error, $object->errors, 'errors');
-			$action = "create";
-		}
-		if (!$error)
-		{
-			setEventMessages("RecordCreatedSuccessfully", null, 'mesgs');
-			$urltogo = $backtopage ? $backtopage : dol_buildpath('/accountancy/admin/account.php', 1);
-			header("Location: ".$urltogo);
-			exit;
+			// To manage zero or not at the end of the accounting account
+			if ($conf->global->ACCOUNTING_MANAGE_ZERO == 1) {
+				$account_number = $account_number;
+			} else {
+				$account_number = clean_account($account_number);
+			}
+
+			if (GETPOST('account_parent', 'int') <= 0) {
+				$account_parent = 0;
+			} else {
+				$account_parent = GETPOST('account_parent', 'int');
+			}
+
+			$object->fk_pcg_version = $obj->pcg_version;
+			$object->pcg_type = GETPOST('pcg_type', 'alpha');
+			$object->account_number = $account_number;
+			$object->account_parent = $account_parent;
+			$object->account_category = GETPOST('account_category', 'alpha');
+			$object->label = $label;
+			$object->labelshort = GETPOST('labelshort', 'alpha');
+			$object->active = 1;
+
+			$res = $object->create($user);
+			if ($res == -3) {
+				$error = 1;
+				$action = "create";
+				setEventMessages($object->error, $object->errors, 'errors');
+			} elseif ($res == -4) {
+				$error = 2;
+				$action = "create";
+				setEventMessages($object->error, $object->errors, 'errors');
+			} elseif ($res < 0) {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = "create";
+			}
+			if (!$error) {
+				setEventMessages("RecordCreatedSuccessfully", null, 'mesgs');
+				$urltogo = $backtopage ? $backtopage : dol_buildpath('/accountancy/admin/account.php', 1);
+				header("Location: " . $urltogo);
+				exit;
+			}
 		}
 	}
 } elseif ($action == 'edit' && $user->rights->accounting->chartofaccount) {
 	if (!$cancel) {
-		$result = $object->fetch($id);
-
-		$sql = 'SELECT pcg_version FROM '.MAIN_DB_PREFIX.'accounting_system WHERE rowid='.$conf->global->CHARTOFACCOUNTS;
-
-		dol_syslog('accountancy/admin/card.php:: $sql='.$sql);
-		$result2 = $db->query($sql);
-		$obj = $db->fetch_object($result2);
-
-		// Clean code
-
-		// To manage zero or not at the end of the accounting account
-		if ($conf->global->ACCOUNTING_MANAGE_ZERO == 1)
+		if (!$account_number)
 		{
-			$account_number = GETPOST('account_number', 'string');
-		} else {
-			$account_number = clean_account(GETPOST('account_number', 'string'));
-		}
-
-		if (GETPOST('account_parent', 'int') <= 0)
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountNumber")), null, 'errors');
+			$action = 'update';
+		} elseif (!$label)
 		{
-			$account_parent = 0;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
+			$action = 'update';
 		} else {
-			$account_parent = GETPOST('account_parent', 'int');
-		}
+			$result = $object->fetch($id);
 
-		$object->fk_pcg_version = $obj->pcg_version;
-		$object->pcg_type = GETPOST('pcg_type', 'alpha');
-		$object->account_number = $account_number;
-		$object->account_parent = $account_parent;
-		$object->account_category = GETPOST('account_category', 'alpha');
-		$object->label = GETPOST('label', 'alpha');
-		$object->labelshort = GETPOST('labelshort', 'alpha');
+			$sql = 'SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS;
 
-		$result = $object->update($user);
+			dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
+			$result2 = $db->query($sql);
+			$obj = $db->fetch_object($result2);
 
-		if ($result > 0) {
-			$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"]."?id=".$id);
-			header("Location: ".$urltogo);
-			exit();
-		} else {
-			$mesg = $object->error;
+			// Clean code
+
+			// To manage zero or not at the end of the accounting account
+			if ($conf->global->ACCOUNTING_MANAGE_ZERO == 1) {
+				$account_number = $account_number;
+			} else {
+				$account_number = clean_account($account_number);
+			}
+
+			if (GETPOST('account_parent', 'int') <= 0) {
+				$account_parent = 0;
+			} else {
+				$account_parent = GETPOST('account_parent', 'int');
+			}
+
+			$object->fk_pcg_version = $obj->pcg_version;
+			$object->pcg_type = GETPOST('pcg_type', 'alpha');
+			$object->account_number = $account_number;
+			$object->account_parent = $account_parent;
+			$object->account_category = GETPOST('account_category', 'alpha');
+			$object->label = $label;
+			$object->labelshort = GETPOST('labelshort', 'alpha');
+
+			$result = $object->update($user);
+
+			if ($result > 0) {
+				$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"] . "?id=" . $id);
+				header("Location: " . $urltogo);
+				exit();
+			} else {
+				$mesg = $object->error;
+			}
 		}
 	} else {
 		$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"]."?id=".$id);
@@ -222,7 +238,7 @@ if ($action == 'create') {
 
 	// Account number
 	print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("AccountNumber").'</span></td>';
-	print '<td><input name="account_number" size="30" value="'.$accountingaccount.'"></td></tr>';
+	print '<td><input name="account_number" size="30" value="'.$account_number.'"></td></tr>';
 
 	// Label
 	print '<tr><td><span class="fieldrequired">'.$langs->trans("Label").'</span></td>';
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 53dfb1cd5f9..e3a39c5d8b1 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -438,8 +438,6 @@ if ($id)
 	// Form to add a new line
 	if ($tabname[$id])
 	{
-		$alabelisused = 0;
-
 		$fieldlist = explode(',', $tabfield[$id]);
 
 		// Line for title
@@ -496,7 +494,6 @@ if ($id)
 				else print $valuetoshow;
 				print '</td>';
 			}
-			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
 		}
 
 		print '<td>';
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index ae36f0f7fa6..a7bf28d9091 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -100,7 +100,7 @@ if ($action == 'update') {
 if ($action == 'setlistsorttodo') {
 	$setlistsorttodo = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_LIST_SORT_VENTILATION_TODO", $setlistsorttodo, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
@@ -114,9 +114,10 @@ if ($action == 'setlistsorttodo') {
 if ($action == 'setlistsortdone') {
 	$setlistsortdone = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_LIST_SORT_VENTILATION_DONE", $setlistsortdone, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
+
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -127,9 +128,10 @@ if ($action == 'setlistsortdone') {
 if ($action == 'setmanagezero') {
 	$setmanagezero = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_MANAGE_ZERO", $setmanagezero, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
+
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -140,9 +142,10 @@ if ($action == 'setmanagezero') {
 if ($action == 'setdisabledirectinput') {
 	$setdisabledirectinput = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "BANK_DISABLE_DIRECT_INPUT", $setdisabledirectinput, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
+
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -153,9 +156,10 @@ if ($action == 'setdisabledirectinput') {
 if ($action == 'setenabledraftexport') {
 	$setenabledraftexport = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL", $setenabledraftexport, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
+
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -166,9 +170,10 @@ if ($action == 'setenabledraftexport') {
 if ($action == 'setenablesubsidiarylist') {
 	$setenablesubsidiarylist = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTANCY_COMBO_FOR_AUX", $setenablesubsidiarylist, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
+
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -179,9 +184,10 @@ if ($action == 'setenablesubsidiarylist') {
 if ($action == 'setdisablebindingonsales') {
 	$setdisablebindingonsales = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_BINDING_ON_SALES", $setdisablebindingonsales, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
+
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -192,9 +198,10 @@ if ($action == 'setdisablebindingonsales') {
 if ($action == 'setdisablebindingonpurchases') {
 	$setdisablebindingonpurchases = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_BINDING_ON_PURCHASES", $setdisablebindingonpurchases, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
+
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -205,9 +212,10 @@ if ($action == 'setdisablebindingonpurchases') {
 if ($action == 'setdisablebindingonexpensereports') {
 	$setdisablebindingonexpensereports = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS", $setdisablebindingonexpensereports, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
+
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -215,9 +223,11 @@ if ($action == 'setdisablebindingonexpensereports') {
 	}
 }
 
+
 /*
  * View
  */
+
 $form = new Form($db);
 
 $title = $langs->trans('ConfigAccountingExpert');
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index bb192f0a693..1d3e8bccdd7 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -407,8 +407,6 @@ if ($id)
 	// Form to add a new line
 	if ($tabname[$id])
 	{
-		$alabelisused = 0;
-
 		$fieldlist = explode(',', $tabfield[$id]);
 
 		// Line for title
@@ -437,7 +435,6 @@ if ($id)
 				else print $valuetoshow;
 				print '</td>';
 			}
-			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
 		}
 
 		print '<td>';
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 2f92cd5842e..b93d82a59c0 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -372,26 +372,26 @@ if ($result)
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans('Options').'</td><td>'.$langs->trans('Description').'</td>';
 	print "</tr>\n";
-	print '<tr class="oddeven"><td class="titlefield"><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_SELL"'.($accounting_product_mode == 'ACCOUNTANCY_SELL' ? ' checked' : '').'> '.$langs->trans('OptionModeProductSell').'</td>';
+	print '<tr class="oddeven"><td><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_SELL"'.($accounting_product_mode == 'ACCOUNTANCY_SELL' ? ' checked' : '').'> '.$langs->trans('OptionModeProductSell').'</td>';
 	print '<td>'.$langs->trans('OptionModeProductSellDesc');
 	print "</td></tr>\n";
 	if ($mysoc->isInEEC())
 	{
-		print '<tr class="oddeven"><td class="titlefield"><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_SELL_INTRA"'.($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA' ? ' checked' : '').'> '.$langs->trans('OptionModeProductSellIntra').'</td>';
+		print '<tr class="oddeven"><td><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_SELL_INTRA"'.($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA' ? ' checked' : '').'> '.$langs->trans('OptionModeProductSellIntra').'</td>';
 		print '<td>'.$langs->trans('OptionModeProductSellIntraDesc');
 		print "</td></tr>\n";
 	}
-	print '<tr class="oddeven"><td class="titlefield"><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_SELL_EXPORT"'.($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT' ? ' checked' : '').'> '.$langs->trans('OptionModeProductSellExport').'</td>';
+	print '<tr class="oddeven"><td><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_SELL_EXPORT"'.($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT' ? ' checked' : '').'> '.$langs->trans('OptionModeProductSellExport').'</td>';
 	print '<td>'.$langs->trans('OptionModeProductSellExportDesc');
 	print "</td></tr>\n";
-	print '<tr class="oddeven"><td class="titlefield"><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_BUY"'.($accounting_product_mode == 'ACCOUNTANCY_BUY' ? ' checked' : '').'> '.$langs->trans('OptionModeProductBuy').'</td>';
+	print '<tr class="oddeven"><td><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_BUY"'.($accounting_product_mode == 'ACCOUNTANCY_BUY' ? ' checked' : '').'> '.$langs->trans('OptionModeProductBuy').'</td>';
 	print '<td>'.$langs->trans('OptionModeProductBuyDesc')."</td></tr>\n";
 	if ($mysoc->isInEEC())
 	{
-		print '<tr class="oddeven"><td class="titlefield"><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_BUY_INTRA"'.($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA' ? ' checked' : '').'> '.$langs->trans('OptionModeProductBuyIntra').'</td>';
+		print '<tr class="oddeven"><td><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_BUY_INTRA"'.($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA' ? ' checked' : '').'> '.$langs->trans('OptionModeProductBuyIntra').'</td>';
 		print '<td>'.$langs->trans('OptionModeProductBuyDesc')."</td></tr>\n";
 	}
-	print '<tr class="oddeven"><td class="titlefield"><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_BUY_EXPORT"'.($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT' ? ' checked' : '').'> '.$langs->trans('OptionModeProductBuyExport').'</td>';
+	print '<tr class="oddeven"><td><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_BUY_EXPORT"'.($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT' ? ' checked' : '').'> '.$langs->trans('OptionModeProductBuyExport').'</td>';
 	print '<td>'.$langs->trans('OptionModeProductBuyDesc')."</td></tr>\n";
 	print "</table>\n";
 
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 1547983da0c..de60bd09897 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -16,7 +16,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
- *
  */
 
 /**
@@ -37,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("accountancy"));
+$langs->loadLangs(array("accountancy", "compta"));
 
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $sortorder = GETPOST("sortorder", 'alpha');
@@ -88,6 +87,7 @@ if (empty($search_date_start) && !GETPOSTISSET('formfilteraction'))
 	} else {
 		$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 		$year_start = dol_print_date(dol_now(), '%Y');
+		if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
 		$year_end = $year_start + 1;
 		$month_end = $month_start - 1;
 		if ($month_end < 1)
@@ -306,7 +306,7 @@ if ($action != 'export_csv')
 
 		$accountingaccountstatic->fetch(null, $line->numero_compte, true);
 		if (!empty($accountingaccountstatic->account_number)) {
-			$accounting_account = $accountingaccountstatic->getNomUrl(0, 1);
+			$accounting_account = $accountingaccountstatic->getNomUrl(0, 1, 0, '', 0, -1, 0, 'accountcard');
 		} else {
 			$accounting_account = length_accountg($line->numero_compte);
 		}
@@ -321,8 +321,19 @@ if ($action != 'export_csv')
 		$root_account_description = $tmparrayforrootaccount['label'];
 		$root_account_number = $tmparrayforrootaccount['account_number'];
 
+		//var_dump($tmparrayforrootaccount);
+		//var_dump($accounting_account);
+		//var_dump($accountingaccountstatic);
 		if (empty($accountingaccountstatic->label) && $accountingaccountstatic->id > 0) {
-			$link = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/card.php?action=update&token='.newToken().'&id='.$accountingaccountstatic->id.'">'.img_edit().'</a>';
+			$link = '<a class="editfielda reposition" href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?action=update&token=' . newToken() . '&id=' . $accountingaccountstatic->id . '">' . img_edit() . '</a>';
+		} elseif ($accounting_account == 'NotDefined') {
+			$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?action=create&token=' . newToken() . '&accountingaccount=' . length_accountg($line->numero_compte) . '">' . img_edit_add() . '</a>';
+		} elseif (empty($tmparrayforrootaccount['label'])) {
+			// $tmparrayforrootaccount['label'] not defined = the account has not parent with a parent.
+			// This is useless, we should not create a new account when an account has no parent, we must edit it to fix its parent.
+			// BUG 1: Accounts on level root or level 1 must not have a parent 2 level higher, so shoule not show a link to create another account.
+			// BUG 2: Adding a link to create a new accounting account here is useless because it is not add as parent of the orphelin.
+			//$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?action=create&token=' . newToken() . '&accountingaccount=' . length_accountg($line->numero_compte) . '">' . img_edit_add() . '</a>';
 		}
 
 		if (!empty($show_subgroup))
@@ -360,8 +371,22 @@ if ($action != 'export_csv')
 		print '<tr class="oddeven">';
 		print '<td>'.$accounting_account.'</td>';
 		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) print '<td class="nowraponall right">'.price($opening_balance).'</td>';
-		print '<td class="nowraponall right">'.price($line->debit).'</td>';
-		print '<td class="nowraponall right">'.price($line->credit).'</td>';
+
+		$urlzoom = '';
+		if ($line->numero_compte) {
+			$urlzoom = DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?search_accountancy_code_start='.urlencode($line->numero_compte).'&search_accountancy_code_end='.urlencode($line->numero_compte);
+			if (GETPOSTISSET('date_startmonth')) {
+				$urlzoom .= '&search_date_startmonth='.GETPOST('date_startmonth', 'int').'&search_date_startday='.GETPOST('date_startday', 'int').'&search_date_startyear='.GETPOST('date_startyear', 'int');
+			}
+			if (GETPOSTISSET('date_endmonth')) {
+				$urlzoom .= '&search_date_endmonth='.GETPOST('date_endmonth', 'int').'&search_date_endday='.GETPOST('date_endday', 'int').'&search_date_endyear='.GETPOST('date_endyear', 'int');
+			}
+		}
+		// Debit
+		print '<td class="nowraponall right"><a href="'.$urlzoom.'">'.price($line->debit).'</a></td>';
+		// Credit
+		print '<td class="nowraponall right"><a href="'.$urlzoom.'">'.price($line->credit).'</a></td>';
+
 		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
 			print '<td class="nowraponall right">'.price(price2num($opening_balance + $line->debit - $line->credit, 'MT')).'</td>';
 		} else {
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index d0f43cfe3dd..e5a061d34bd 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -63,9 +63,11 @@ $accountingjournal->fetch(null, $journal_code);
 $journal_label = $accountingjournal->label;
 
 $subledger_account = GETPOST('subledger_account', 'alphanohtml');
-if ($subledger_account == - 1) {
+if ($subledger_account == -1) {
 	$subledger_account = null;
 }
+$subledger_label = GETPOST('subledger_label', 'alphanohtml');
+
 $label_operation = GETPOST('label_operation', 'alphanohtml');
 $debit = price2num(GETPOST('debit', 'alpha'));
 $credit = price2num(GETPOST('credit', 'alpha'));
@@ -108,6 +110,7 @@ if ($action == "confirm_update") {
 		} else {
 			$object->numero_compte = $accountingaccount_number;
 			$object->subledger_account = $subledger_account;
+			$object->subledger_label = $subledger_label;
 			$object->label_compte = $accountingaccount_label;
 			$object->label_operation = $label_operation;
 			$object->debit = $debit;
@@ -160,6 +163,7 @@ if ($action == "confirm_update") {
 
 		$object->numero_compte = $accountingaccount_number;
 		$object->subledger_account = $subledger_account;
+		$object->subledger_label = $subledger_label;
 		$object->label_compte = $accountingaccount_label;
 		$object->label_operation = $label_operation;
 		$object->debit = $debit;
@@ -224,9 +228,10 @@ if ($action == "confirm_update") {
 		$action = 'create';
 		$error++;
 	}
-	if (!GETPOST('next_num_mvt', 'alpha'))
+	if (!GETPOST('doc_ref', 'alpha'))
 	{
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NumPiece")), null, 'errors');
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Piece")), null, 'errors');
+		$action = 'create';
 		$error++;
 	}
 
@@ -371,7 +376,7 @@ if ($action == 'create')
 	print '</tr>';
 
 	print '<tr>';
-	print '<td>'.$langs->trans("Piece").'</td>';
+	print '<td class="fieldrequired">'.$langs->trans("Piece").'</td>';
 	print '<td><input type="text" class="minwidth200" name="doc_ref" value="'.GETPOST('doc_ref', 'alpha').'"></td>';
 	print '</tr>';
 
@@ -577,7 +582,7 @@ if ($action == 'create')
 
 		print '<br>';
 
-		$result = $object->fetchAllPerMvt($piece_num, $mode);
+		$result = $object->fetchAllPerMvt($piece_num, $mode);	// This load $object->linesmvt
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
@@ -594,7 +599,8 @@ 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\" width=\"100%\">";
+			print '<table class="noborder centpercent">';
+
 			if (count($object->linesmvt) > 0) {
 				$total_debit = 0;
 				$total_credit = 0;
@@ -616,18 +622,22 @@ if ($action == 'create')
 					$total_credit += $line->credit;
 
 					if ($action == 'update' && $line->id == $id) {
+						print '<!-- td columns in edit mode -->';
 						print '<td>';
 						print $formaccounting->select_account((GETPOSTISSET("accountingaccount_number") ? GETPOST("accountingaccount_number", "alpha") : $line->numero_compte), 'accountingaccount_number', 1, array(), 1, 1, '');
 						print '</td>';
 						print '<td>';
-						// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
-						// use setup of keypress to select thirdparty and this hang browser on large database.
-						if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
-						{
+						// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because:
+						// It does not use the setup of "key pressed" to select a thirdparty and this hang browser on large databases.
+						// Also, it is not possible to use a value that is not in the list.
+						// Also, the label is not automatically filled when a value is selected.
+						if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
 							print $formaccounting->select_auxaccount((GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account), 'subledger_account', 1);
 						} else {
-							print '<input type="text" class="maxwidth150" name="subledger_account" value="'.(GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account).'">';
+							print '<input type="text" class="maxwidth150" name="subledger_account" value="'.(GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account).'" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccount")).'">';
 						}
+						// Add also input for subledger label
+						print '<br><input type="text" class="maxwidth150" name="subledger_label" value="'.(GETPOSTISSET("subledger_label") ? GETPOST("subledger_label", "alpha") : $line->subledger_label).'" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccountLabel")).'">';
 						print '</td>';
 						print '<td><input type="text" class="minwidth200" name="label_operation" value="'.(GETPOSTISSET("label_operation") ? GETPOST("label_operation", "alpha") : $line->label_operation).'"></td>';
 						print '<td class="right"><input type="text" size="6" class="right" name="debit" value="'.(GETPOSTISSET("debit") ? GETPOST("debit", "alpha") : price($line->debit)).'"></td>';
@@ -639,20 +649,24 @@ if ($action == 'create')
 					} else {
 						$accountingaccount->fetch(null, $line->numero_compte, true);
 						print '<td>'.$accountingaccount->getNomUrl(0, 1, 1, '', 0).'</td>';
-						print '<td>'.length_accounta($line->subledger_account).'</td>';
+						print '<td>'.length_accounta($line->subledger_account);
+						if ($line->subledger_label) {
+							print ' - <span class="opacitymedium">'.$line->subledger_label.'</span>';
+						}
+						print '</td>';
 						print '<td>'.$line->label_operation.'</td>';
 						print '<td class="nowrap right">'.price($line->debit).'</td>';
 						print '<td class="nowrap right">'.price($line->credit).'</td>';
 
 						print '<td class="center">';
-						print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=update&id='.$line->id.'&piece_num='.$line->piece_num.'&mode='.$mode.'">';
+						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;';
 
 						$actiontodelete = 'delete';
 						if ($mode == '_tmp' || $action != 'delmouv') $actiontodelete = 'confirm_delete';
 
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action='.$actiontodelete.'&id='.$line->id.'&piece_num='.$line->piece_num.'&mode='.$mode.'">';
+						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>';
@@ -671,18 +685,21 @@ if ($action == 'create')
 
 				if ($action == "" || $action == 'add') {
 					print '<tr class="oddeven">';
+					print '<!-- td columns in add mode -->';
 					print '<td>';
 					print $formaccounting->select_account('', 'accountingaccount_number', 1, array(), 1, 1, '');
 					print '</td>';
 					print '<td>';
-					// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
-					// use setup of keypress to select thirdparty and this hang browser on large database.
-					if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
-					{
+					// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because:
+					// It does not use the setup of "key pressed" to select a thirdparty and this hang browser on large databases.
+					// Also, it is not possible to use a value that is not in the list.
+					// Also, the label is not automatically filled when a value is selected.
+					if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
 						print $formaccounting->select_auxaccount('', 'subledger_account', 1);
 					} else {
-						print '<input type="text" class="maxwidth150" name="subledger_account" value="">';
+						print '<input type="text" class="maxwidth150" name="subledger_account" value="" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccount")).'">';
 					}
+					print '<br><input type="text" class="maxwidth150" name="subledger_label" value="" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccountLabel")).'">';
 					print '</td>';
 					print '<td><input type="text" class="minwidth200" name="label_operation" value="'.$label_operation.'"/></td>';
 					print '<td class="right"><input type="text" size="6" class="right" name="debit" value=""/></td>';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 830896776b5..065c0b06d08 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("accountancy"));
+$langs->loadLangs(array("accountancy", "compta"));
 
 $socid = GETPOST('socid', 'int');
 
@@ -87,7 +87,7 @@ $search_debit = GETPOST('search_debit', 'alpha');
 $search_credit = GETPOST('search_credit', 'alpha');
 $search_ledger_code = GETPOST('search_ledger_code', 'array');
 $search_lettering_code = GETPOST('search_lettering_code', 'alpha');
-$search_not_reconciled = GETPOST('search_reconciled_option', 'alpha');
+$search_not_reconciled = GETPOST('search_not_reconciled', 'alpha');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
@@ -140,6 +140,7 @@ if (!in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && !GE
 
 $arrayfields = array(
 	't.piece_num'=>array('label'=>$langs->trans("TransactionNumShort"), 'checked'=>1),
+	't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
 	't.doc_date'=>array('label'=>$langs->trans("Docdate"), 'checked'=>1),
 	't.doc_ref'=>array('label'=>$langs->trans("Piece"), 'checked'=>1),
 	't.numero_compte'=>array('label'=>$langs->trans("AccountAccountingShort"), 'checked'=>1),
@@ -148,7 +149,6 @@ $arrayfields = array(
 	't.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1),
 	't.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1),
 	't.lettering_code'=>array('label'=>$langs->trans("LetteringCode"), 'checked'=>1),
-	't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
 	't.date_creation'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0),
 	't.tms'=>array('label'=>$langs->trans("DateModification"), 'checked'=>0),
 	't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1),
@@ -661,11 +661,11 @@ if (empty($reshook)) {
 	}
 	$newcardbutton .= '<span class="valignmiddle marginrightonly">'.$langs->trans("IncludeDocsAlreadyExported").'</span>';
 
-	$newcardbutton .= dolGetButtonTitle($buttonLabel, $langs->trans("ExportFilteredList").' ('.$listofformat[$formatexportset].')', 'fa fa-file-export paddingleft', $_SERVER["PHP_SELF"].'?action=export_file'.($param ? '&'.$param : ''), $user->rights->accounting->mouvements->export);
+	if (!empty($user->rights->accounting->mouvements->export)) $newcardbutton .= dolGetButtonTitle($buttonLabel, $langs->trans("ExportFilteredList").' ('.$listofformat[$formatexportset].')', 'fa fa-file-export paddingleft', $_SERVER["PHP_SELF"].'?action=export_file'.($param ? '&'.$param : ''), $user->rights->accounting->mouvements->export);
 
 	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
 	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly'));
-	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbysubaccount.php', '', 1, array('morecss' => 'marginleftonly'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbysubaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly'));
 
 	$url = './card.php?action=create';
 	if (!empty($socid)) $url .= '&socid='.$socid;
@@ -688,11 +688,17 @@ print '<table class="tagtable liste centpercent">';
 
 // Filters lines
 print '<tr class="liste_titre_filter">';
+
 // Movement number
 if (!empty($arrayfields['t.piece_num']['checked']))
 {
 	print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="'.dol_escape_htmltag($search_mvt_num).'"></td>';
 }
+// Code journal
+if (!empty($arrayfields['t.code_journal']['checked']))
+{
+	print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="'.(is_array($search_ledger_code) ? join('|', $search_ledger_code) : $search_ledger_code).'"></td>';
+}
 // Date document
 if (!empty($arrayfields['t.doc_date']['checked']))
 {
@@ -778,14 +784,7 @@ if (!empty($arrayfields['t.lettering_code']['checked']))
 {
 	print '<td class="liste_titre center">';
 	print '<input type="text" size="3" class="flat" name="search_lettering_code" value="'.$search_lettering_code.'"/>';
-	print '<br><span class="nowrap"><input type="checkbox" name="search_reconciled_option" value="notreconciled"'.($search_not_reconciled == 'notreconciled' ? ' checked' : '').'>'.$langs->trans("NotReconciled").'</span>';
-	print '</td>';
-}
-// Code journal
-if (!empty($arrayfields['t.code_journal']['checked']))
-{
-	print '<td class="liste_titre center">';
-	print $formaccounting->multi_select_journal($search_ledger_code, 'search_ledger_code', 0, 1, 1, 1);
+	print '<br><span class="nowrap"><input type="checkbox" name="search_not_reconciled" value="notreconciled"'.($search_not_reconciled == 'notreconciled' ? ' checked' : '').'>'.$langs->trans("NotReconciled").'</span>';
 	print '</td>';
 }
 
@@ -839,6 +838,7 @@ print "</tr>\n";
 
 print '<tr class="liste_titre">';
 if (!empty($arrayfields['t.piece_num']['checked']))			print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['t.code_journal']['checked']))			print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
 if (!empty($arrayfields['t.doc_date']['checked']))				print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
 if (!empty($arrayfields['t.doc_ref']['checked']))				print_liste_field_titre($arrayfields['t.doc_ref']['label'], $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
 if (!empty($arrayfields['t.numero_compte']['checked']))		print_liste_field_titre($arrayfields['t.numero_compte']['label'], $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
@@ -847,7 +847,6 @@ if (!empty($arrayfields['t.label_operation']['checked']))		print_liste_field_tit
 if (!empty($arrayfields['t.debit']['checked']))				print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
 if (!empty($arrayfields['t.credit']['checked']))				print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
 if (!empty($arrayfields['t.lettering_code']['checked']))		print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.code_journal']['checked']))			print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
 // Hook fields
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
@@ -913,6 +912,16 @@ while ($i < min($num, $limit))
 		if (!$i) $totalarray['nbfield']++;
 	}
 
+	// Journal code
+	if (!empty($arrayfields['t.code_journal']['checked']))
+	{
+		$accountingjournal = new AccountingJournal($db);
+		$result = $accountingjournal->fetch('', $line->code_journal);
+		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal);
+		print '<td class="center">'.$journaltoshow.'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
 	// Document date
 	if (!empty($arrayfields['t.doc_date']['checked']))
 	{
@@ -1040,16 +1049,6 @@ while ($i < min($num, $limit))
 		if (!$i) $totalarray['nbfield']++;
 	}
 
-	// Journal code
-	if (!empty($arrayfields['t.code_journal']['checked']))
-	{
-		$accountingjournal = new AccountingJournal($db);
-		$result = $accountingjournal->fetch('', $line->code_journal);
-		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal);
-		print '<td class="center">'.$journaltoshow.'</td>';
-		if (!$i) $totalarray['nbfield']++;
-	}
-
 	// 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
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 34a6b2d5ffd..9e62f9e0b79 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -48,6 +48,14 @@ $search_date_endday =  GETPOST('search_date_endday', 'int');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);
 $search_date_end = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
+$search_date_export_startyear =  GETPOST('search_date_export_startyear', 'int');
+$search_date_export_startmonth =  GETPOST('search_date_export_startmonth', 'int');
+$search_date_export_startday =  GETPOST('search_date_export_startday', 'int');
+$search_date_export_endyear =  GETPOST('search_date_export_endyear', 'int');
+$search_date_export_endmonth =  GETPOST('search_date_export_endmonth', 'int');
+$search_date_export_endday =  GETPOST('search_date_export_endday', 'int');
+$search_date_export_start = dol_mktime(0, 0, 0, $search_date_export_startmonth, $search_date_export_startday, $search_date_export_startyear);
+$search_date_export_end = dol_mktime(0, 0, 0, $search_date_export_endmonth, $search_date_export_endday, $search_date_export_endyear);
 
 $search_accountancy_code = GETPOST("search_accountancy_code");
 $search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
@@ -66,7 +74,7 @@ $search_ledger_code = GETPOST('search_ledger_code', 'array');
 $search_debit = GETPOST('search_debit', 'alpha');
 $search_credit = GETPOST('search_credit', 'alpha');
 $search_lettering_code = GETPOST('search_lettering_code', 'alpha');
-$search_not_reconciled = GETPOST('search_reconciled_option', 'alpha');
+$search_not_reconciled = GETPOST('search_not_reconciled', 'alpha');
 
 if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt.x") || GETPOST("button_delmvt")) {
 	$action = 'delbookkeepingyear';
@@ -120,14 +128,15 @@ if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('searc
 
 $arrayfields = array(
 	// 't.subledger_account'=>array('label'=>$langs->trans("SubledgerAccount"), 'checked'=>1),
-	't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
 	't.piece_num'=>array('label'=>$langs->trans("TransactionNumShort"), 'checked'=>1),
+	't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
 	't.doc_date'=>array('label'=>$langs->trans("Docdate"), 'checked'=>1),
 	't.doc_ref'=>array('label'=>$langs->trans("Piece"), 'checked'=>1),
 	't.label_operation'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
 	't.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1),
 	't.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1),
 	't.lettering_code'=>array('label'=>$langs->trans("LetteringCode"), 'checked'=>1),
+	't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1),
 );
 
 if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) unset($arrayfields['t.lettering_code']);
@@ -181,6 +190,14 @@ if (empty($reshook))
 		$search_date_endyear = '';
 		$search_date_endmonth = '';
 		$search_date_endday = '';
+		$search_date_export_start = '';
+		$search_date_export_end = '';
+		$search_date_export_startyear = '';
+		$search_date_export_startmonth = '';
+		$search_date_export_startday = '';
+		$search_date_export_endyear = '';
+		$search_date_export_endmonth = '';
+		$search_date_export_endday = '';
 		$search_debit = '';
 		$search_credit = '';
 		$search_lettering_code = '';
@@ -253,6 +270,14 @@ if (empty($reshook))
 		$filter['t.reconciled_option'] = $search_not_reconciled;
 		$param .= '&search_not_reconciled='.urlencode($search_not_reconciled);
 	}
+	if (!empty($search_date_export_start)) {
+		$filter['t.date_export>='] = $search_date_export_start;
+		$param .= '&search_date_export_startmonth='.$search_date_export_startmonth.'&search_date_export_startday='.$search_date_export_startday.'&search_date_export_startyear='.$search_date_export_startyear;
+	}
+	if (!empty($search_date_export_end)) {
+		$filter['t.date_export<='] = $search_date_export_end;
+		$param .= '&search_date_export_endmonth='.$search_date_export_endmonth.'&search_date_export_endday='.$search_date_export_endday.'&search_date_export_endyear='.$search_date_export_endyear;
+	}
 }
 
 if ($action == 'delbookkeeping' && $user->rights->accounting->mouvements->supprimer) {
@@ -403,7 +428,7 @@ $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $obj
 if (empty($reshook)) {
 	$newcardbutton = dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
 	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
-	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbysubaccount.php', '', 1, array('morecss' => 'marginleftonly'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbysubaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly'));
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create');
 }
 
@@ -448,6 +473,11 @@ print '<table class="tagtable liste centpercent">';
 // Filters lines
 print '<tr class="liste_titre_filter">';
 
+// Movement number
+if (!empty($arrayfields['t.piece_num']['checked']))
+{
+	print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="'.dol_escape_htmltag($search_mvt_num).'"></td>';
+}
 // Code journal
 if (!empty($arrayfields['t.code_journal']['checked'])) {
 	print '<td class="liste_titre center">';
@@ -465,11 +495,6 @@ if (!empty($arrayfields['t.doc_date']['checked'])) {
 	print '</div>';
 	print '</td>';
 }
-// Movement number
-if (!empty($arrayfields['t.piece_num']['checked']))
-{
-	print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="'.dol_escape_htmltag($search_mvt_num).'"></td>';
-}
 // Ref document
 if (!empty($arrayfields['t.doc_ref']['checked'])) {
 	print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_doc_ref" value="'.dol_escape_htmltag($search_doc_ref).'"/></td>';
@@ -491,7 +516,18 @@ if (!empty($arrayfields['t.lettering_code']['checked']))
 {
 	print '<td class="liste_titre center">';
 	print '<input type="text" size="3" class="flat" name="search_lettering_code" value="'.$search_lettering_code.'"/>';
-	print '<br><span class="nowrap"><input type="checkbox" name="search_reconciled_option" value="notreconciled"'.($search_not_reconciled == 'notreconciled' ? ' checked' : '').'>'.$langs->trans("NotReconciled").'</span>';
+	print '<br><span class="nowrap"><input type="checkbox" name="search_not_reconciled" value="notreconciled"'.($search_not_reconciled == 'notreconciled' ? ' checked' : '').'>'.$langs->trans("NotReconciled").'</span>';
+	print '</td>';
+}
+// Date export
+if (!empty($arrayfields['t.date_export']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_export_start, 'search_date_export_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_export_end, 'search_date_export_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print '</div>';
 	print '</td>';
 }
 
@@ -508,14 +544,15 @@ print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
+if (!empty($arrayfields['t.piece_num']['checked']))				print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['t.code_journal']['checked']))			print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
 if (!empty($arrayfields['t.doc_date']['checked']))				print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.piece_num']['checked']))				print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['t.doc_ref']['checked']))				print_liste_field_titre($arrayfields['t.doc_ref']['label'], $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
 if (!empty($arrayfields['t.label_operation']['checked']))		print_liste_field_titre($arrayfields['t.label_operation']['label'], $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
 if (!empty($arrayfields['t.debit']['checked']))					print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
 if (!empty($arrayfields['t.credit']['checked']))				print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
 if (!empty($arrayfields['t.lettering_code']['checked']))		print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['t.date_export']['checked']))			print_liste_field_titre($arrayfields['t.date_export']['label'], $_SERVER['PHP_SELF'], "t.date_export", "", $param, '', $sortfield, $sortorder, 'center ');
 // 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
@@ -546,13 +583,12 @@ while ($i < min($num, $limit))
 
 	// Is it a break ?
 	if ($accountg != $displayed_account_number || !isset($displayed_account_number)) {
-        if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
-            $colnumber = 3;
-            $colnumberend = 7;
-        } else {
-            $colnumber = 4;
-            $colnumberend = 7;
-        }
+		$colnumber = 5;
+		$colnumberend = 7;
+
+		if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) $colnumber--;
+		if (empty($arrayfields['t.date_export']['checked'])) $colnumber--;
+
         $colspan = $totalarray['nbfield'] - $colnumber;
         $colspanend = $totalarray['nbfield'] - $colnumberend;
 		// Show a subtotal by accounting account
@@ -585,7 +621,7 @@ while ($i < min($num, $limit))
 
 		// Show the break account
 		print "<tr>";
-		print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : 9).'" style="font-weight:bold; border-bottom: 1pt solid black;">';
+		print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : 10).'" style="font-weight:bold; border-bottom: 1pt solid black;">';
 		if ($line->numero_compte != "" && $line->numero_compte != '-1') print length_accountg($line->numero_compte).' : '.$object->get_compte_desc($line->numero_compte);
 		else print '<span class="error">'.$langs->trans("Unknown").'</span>';
 		print '</td>';
@@ -601,6 +637,17 @@ while ($i < min($num, $limit))
 
 	print '<tr class="oddeven">';
 
+	// Piece number
+	if (!empty($arrayfields['t.piece_num']['checked']))
+	{
+		print '<td>';
+		$object->id = $line->id;
+		$object->piece_num = $line->piece_num;
+		print $object->getNomUrl(1, '', 0, '', 1);
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
 	// Journal code
 	if (!empty($arrayfields['t.code_journal']['checked']))
 	{
@@ -618,17 +665,6 @@ while ($i < min($num, $limit))
 		if (!$i) $totalarray['nbfield']++;
 	}
 
-	// Piece number
-	if (!empty($arrayfields['t.piece_num']['checked']))
-	{
-		print '<td>';
-		$object->id = $line->id;
-		$object->piece_num = $line->piece_num;
-		print $object->getNomUrl(1, '', 0, '', 1);
-		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
-	}
-
 	// Document ref
 	if (!empty($arrayfields['t.doc_ref']['checked']))
 	{
@@ -735,6 +771,13 @@ while ($i < min($num, $limit))
 		if (!$i) $totalarray['nbfield']++;
 	}
 
+	// Exported operation date
+	if (!empty($arrayfields['t.date_export']['checked']))
+	{
+		print '<td class="center">'.dol_print_date($line->date_export, 'dayhour').'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
 	// Fields from hook
 	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
@@ -763,14 +806,6 @@ while ($i < min($num, $limit))
 }
 
 if ($num > 0) {
-	// Show sub-total of last shown account
-	if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
-	    $colnumber = 3;
-	    $colnumberend = 7;
-	} else {
-	    $colnumber = 4;
-	    $colnumberend = 7;
-	}
 	$colspan = $totalarray['nbfield'] - $colnumber;
 	$colspanend = $totalarray['nbfield'] - $colnumberend;
 	print '<tr class="liste_total">';
diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
index e30a9984949..01b1a0a1335 100644
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2013-2016  Olivier Geffroy     <jeff@jeffinfo.com>
  * Copyright (C) 2013-2020  Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2020  Alexandre Spangaro  <aspangaro@open-dsi.fr>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,15 +39,23 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 $langs->loadLangs(array("accountancy", "compta"));
 
 $action = GETPOST('action', 'aZ09');
-$search_date_startyear =  GETPOST('search_date_startyear', 'int');
-$search_date_startmonth =  GETPOST('search_date_startmonth', 'int');
-$search_date_startday =  GETPOST('search_date_startday', 'int');
-$search_date_endyear =  GETPOST('search_date_endyear', 'int');
-$search_date_endmonth =  GETPOST('search_date_endmonth', 'int');
-$search_date_endday =  GETPOST('search_date_endday', 'int');
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
+$search_date_startday = GETPOST('search_date_startday', 'int');
+$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
+$search_date_endday = GETPOST('search_date_endday', 'int');
 $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);
 $search_date_end = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
+$search_date_export_startyear =  GETPOST('search_date_export_startyear', 'int');
+$search_date_export_startmonth =  GETPOST('search_date_export_startmonth', 'int');
+$search_date_export_startday =  GETPOST('search_date_export_startday', 'int');
+$search_date_export_endyear =  GETPOST('search_date_export_endyear', 'int');
+$search_date_export_endmonth =  GETPOST('search_date_export_endmonth', 'int');
+$search_date_export_endday =  GETPOST('search_date_export_endday', 'int');
+$search_date_export_start = dol_mktime(0, 0, 0, $search_date_export_startmonth, $search_date_export_startday, $search_date_export_startyear);
+$search_date_export_end = dol_mktime(0, 0, 0, $search_date_export_endmonth, $search_date_export_endday, $search_date_export_endyear);
 
 $search_accountancy_code = GETPOST("search_accountancy_code");
 $search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
@@ -66,23 +74,29 @@ $search_ledger_code = GETPOST('search_ledger_code', 'array');
 $search_debit = GETPOST('search_debit', 'alpha');
 $search_credit = GETPOST('search_credit', 'alpha');
 $search_lettering_code = GETPOST('search_lettering_code', 'alpha');
-$search_not_reconciled = GETPOST('search_reconciled_option', 'alpha');
+$search_not_reconciled = GETPOST('search_not_reconciled', 'alpha');
 
 if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt.x") || GETPOST("button_delmvt")) {
 	$action = 'delbookkeepingyear';
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page < 0) { $page = 0; }
+if (empty($page) || $page < 0) {
+	$page = 0;
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if ($sortorder == "") $sortorder = "ASC";
-if ($sortfield == "") $sortfield = "t.doc_date,t.rowid";
+if ($sortorder == "") {
+	$sortorder = "ASC";
+}
+if ($sortfield == "") {
+	$sortfield = "t.doc_date,t.rowid";
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new BookKeeping($db);
@@ -105,11 +119,12 @@ if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('searc
 	} else {
 		$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 		$year_start = dol_print_date(dol_now(), '%Y');
-		if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
+		if (dol_print_date(dol_now(), '%m') < $month_start) {
+			$year_start--; // If current month is lower that starting fiscal month, we start last year
+		}
 		$year_end = $year_start + 1;
 		$month_end = $month_start - 1;
-		if ($month_end < 1)
-		{
+		if ($month_end < 1) {
 			$month_end = 12;
 			$year_end--;
 		}
@@ -120,17 +135,20 @@ if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('searc
 
 $arrayfields = array(
 	// 't.subledger_account'=>array('label'=>$langs->trans("SubledgerAccount"), 'checked'=>1),
-	't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
 	't.piece_num'=>array('label'=>$langs->trans("TransactionNumShort"), 'checked'=>1),
+	't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
 	't.doc_date'=>array('label'=>$langs->trans("Docdate"), 'checked'=>1),
 	't.doc_ref'=>array('label'=>$langs->trans("Piece"), 'checked'=>1),
 	't.label_operation'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
 	't.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1),
 	't.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1),
 	't.lettering_code'=>array('label'=>$langs->trans("LetteringCode"), 'checked'=>1),
+	't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1),
 );
 
-if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) unset($arrayfields['t.lettering_code']);
+if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) {
+	unset($arrayfields['t.lettering_code']);
+}
 
 if ($search_date_start && empty($search_date_startyear)) {
 	$tmparray = dol_getdate($search_date_start);
@@ -149,19 +167,23 @@ if ($search_date_end && empty($search_date_endyear)) {
 /*
  * Action
  */
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $parameters = array('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 ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		$search_doc_date = '';
 		$search_accountancy_code = '';
 		$search_accountancy_code_start = '';
@@ -180,6 +202,14 @@ if (empty($reshook))
 		$search_date_endyear = '';
 		$search_date_endmonth = '';
 		$search_date_endday = '';
+		$search_date_export_start = '';
+		$search_date_export_end = '';
+		$search_date_export_startyear = '';
+		$search_date_export_startmonth = '';
+		$search_date_export_startday = '';
+		$search_date_export_endyear = '';
+		$search_date_export_endmonth = '';
+		$search_date_export_endday = '';
 		$search_debit = '';
 		$search_credit = '';
 		$search_lettering_code = '';
@@ -252,6 +282,14 @@ if (empty($reshook))
 		$filter['t.reconciled_option'] = $search_not_reconciled;
 		$param .= '&search_not_reconciled='.urlencode($search_not_reconciled);
 	}
+	if (!empty($search_date_export_start)) {
+		$filter['t.date_export>='] = $search_date_export_start;
+		$param .= '&search_date_export_startmonth='.$search_date_export_startmonth.'&search_date_export_startday='.$search_date_export_startday.'&search_date_export_startyear='.$search_date_export_startyear;
+	}
+	if (!empty($search_date_export_end)) {
+		$filter['t.date_export<='] = $search_date_export_end;
+		$param .= '&search_date_export_endmonth='.$search_date_export_endmonth.'&search_date_export_endday='.$search_date_export_endday.'&search_date_export_endyear='.$search_date_export_endyear;
+	}
 }
 
 if ($action == 'delbookkeeping' && $user->rights->accounting->mouvements->supprimer) {
@@ -279,8 +317,7 @@ if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouveme
 		$deljournal = 0;
 	}
 
-	if (!empty($delmonth) || !empty($delyear) || !empty($deljournal))
-	{
+	if (!empty($delmonth) || !empty($delyear) || !empty($deljournal)) {
 		$result = $object->deleteByYearAndJournal($delyear, $deljournal, '', ($delmonth > 0 ? $delmonth : 0));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -289,7 +326,7 @@ if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouveme
 		}
 
 		// Make a redirect to avoid to launch the delete later after a back button
-		header("Location: listbysubaccount.php".($param ? '?'.$param : ''));
+		header("Location: ".$_SERVER["PHP_SELF"].($param ? '?'.$param : ''));
 		exit;
 	} else {
 		setEventMessages("NoRecordDeleted", null, 'warnings');
@@ -306,7 +343,7 @@ if ($action == 'delmouvconfirm' && $user->rights->accounting->mouvements->suppri
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 		}
 
-		header("Location: listbysubaccount.php?noreset=1".($param ? '&'.$param : ''));
+		header("Location: ".$_SERVER["PHP_SELF"]."?noreset=1".($param ? '&'.$param : ''));
 		exit;
 	}
 }
@@ -393,7 +430,9 @@ if ($action == 'delbookkeepingyear') {
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="list">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
@@ -403,14 +442,17 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $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', '', 1, array('morecss' => 'marginleftonly'));
-	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbysubaccount.php', '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
-
+	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbysubaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create');
 }
 
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
 
 print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -418,11 +460,16 @@ print info_admin($langs->trans("WarningRecordWithoutSubledgerAreExcluded"));
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+if ($massactionbutton) {
+	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+}
 
 // Reverse sort order
-if (preg_match('/^asc/i', $sortorder)) $sortorder = "asc";
-else $sortorder = "desc";
+if (preg_match('/^asc/i', $sortorder)) {
+	$sortorder = "asc";
+} else {
+	$sortorder = "desc";
+}
 
 $moreforfilter = '';
 
@@ -439,8 +486,11 @@ $moreforfilter .= '</div>';
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-else $moreforfilter = $hookmanager->resPrint;
+if (empty($reshook)) {
+	$moreforfilter .= $hookmanager->resPrint;
+} else {
+	$moreforfilter = $hookmanager->resPrint;
+}
 
 print '<div class="liste_titre liste_titre_bydiv centpercent">';
 print $moreforfilter;
@@ -452,6 +502,11 @@ print '<table class="tagtable liste centpercent">';
 // Filters lines
 print '<tr class="liste_titre_filter">';
 
+// Movement number
+if (!empty($arrayfields['t.piece_num']['checked']))
+{
+	print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="'.dol_escape_htmltag($search_mvt_num).'"></td>';
+}
 // Code journal
 if (!empty($arrayfields['t.code_journal']['checked'])) {
 	print '<td class="liste_titre center">';
@@ -469,11 +524,6 @@ if (!empty($arrayfields['t.doc_date']['checked'])) {
 	print '</div>';
 	print '</td>';
 }
-// Movement number
-if (!empty($arrayfields['t.piece_num']['checked']))
-{
-	print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="'.dol_escape_htmltag($search_mvt_num).'"></td>';
-}
 // Ref document
 if (!empty($arrayfields['t.doc_ref']['checked'])) {
 	print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_doc_ref" value="'.dol_escape_htmltag($search_doc_ref).'"/></td>';
@@ -491,11 +541,21 @@ if (!empty($arrayfields['t.credit']['checked'])) {
 	print '<td class="liste_titre right"><input type="text" class="flat" name="search_credit" size="4" value="'.dol_escape_htmltag($search_credit).'"></td>';
 }
 // Lettering code
-if (!empty($arrayfields['t.lettering_code']['checked']))
-{
+if (!empty($arrayfields['t.lettering_code']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<input type="text" size="3" class="flat" name="search_lettering_code" value="'.$search_lettering_code.'"/>';
-	print '<br><span class="nowrap"><input type="checkbox" name="search_reconciled_option" value="notreconciled"'.($search_not_reconciled == 'notreconciled' ? ' checked' : '').'>'.$langs->trans("NotReconciled").'</span>';
+	print '<br><span class="nowrap"><input type="checkbox" name="search_not_reconciled" value="notreconciled"'.($search_not_reconciled == 'notreconciled' ? ' checked' : '').'>'.$langs->trans("NotReconciled").'</span>';
+	print '</td>';
+}
+// Date export
+if (!empty($arrayfields['t.date_export']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_export_start, 'search_date_export_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_date_export_end, 'search_date_export_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print '</div>';
 	print '</td>';
 }
 
@@ -512,14 +572,33 @@ print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-if (!empty($arrayfields['t.code_journal']['checked']))			print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.doc_date']['checked']))				print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.piece_num']['checked']))				print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['t.doc_ref']['checked']))				print_liste_field_titre($arrayfields['t.doc_ref']['label'], $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['t.label_operation']['checked']))		print_liste_field_titre($arrayfields['t.label_operation']['label'], $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['t.debit']['checked']))					print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['t.credit']['checked']))				print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['t.lettering_code']['checked']))		print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['t.piece_num']['checked'])) {
+	print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.code_journal']['checked'])) {
+	print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['t.doc_date']['checked'])) {
+	print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['t.doc_ref']['checked'])) {
+	print_liste_field_titre($arrayfields['t.doc_ref']['label'], $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.label_operation']['checked'])) {
+	print_liste_field_titre($arrayfields['t.label_operation']['label'], $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.debit']['checked'])) {
+	print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['t.credit']['checked'])) {
+	print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['t.lettering_code']['checked'])) {
+	print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['t.date_export']['checked'])) {
+	print_liste_field_titre($arrayfields['t.date_export']['label'], $_SERVER['PHP_SELF'], "t.date_export", "", $param, '', $sortfield, $sortorder, 'center ');
+}
 // 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
@@ -538,8 +617,7 @@ $displayed_account_number = null; // Start with undefined to be able to distingu
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
-while ($i < min($num, $limit))
-{
+while ($i < min($num, $limit)) {
 	$line = $object->lines[$i];
 
 	$total_debit += $line->debit;
@@ -550,15 +628,15 @@ while ($i < min($num, $limit))
 
 	// Is it a break ?
 	if ($accountg != $displayed_account_number || !isset($displayed_account_number)) {
-        if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
-            $colnumber = 3;
-            $colnumberend = 7;
-        } else {
-            $colnumber = 4;
-            $colnumberend = 7;
-        }
+		$colnumber = 5;
+		$colnumberend = 7;
+
+		if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) $colnumber--;
+		if (empty($arrayfields['t.date_export']['checked'])) $colnumber--;
+
         $colspan = $totalarray['nbfield'] - $colnumber;
         $colspanend = $totalarray['nbfield'] - $colnumberend;
+
 		// Show a subtotal by accounting account
 		if (isset($displayed_account_number)) {
 			print '<tr class="liste_total">';
@@ -571,8 +649,7 @@ while ($i < min($num, $limit))
 			$balance = $sous_total_debit - $sous_total_credit;
 			print '<tr class="liste_total">';
 			print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
-			if ($balance > 0)
-			{
+			if ($balance > 0) {
 				print '<td class="nowraponall right">';
 				print price($sous_total_debit - $sous_total_credit);
 				print '</td>';
@@ -589,14 +666,18 @@ while ($i < min($num, $limit))
 
 		// Show the break account
 		print "<tr>";
-		print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : 9).'" style="font-weight:bold; border-bottom: 1pt solid black;">';
+		print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : 10).'" style="font-weight:bold; border-bottom: 1pt solid black;">';
 		if ($line->subledger_account != "" && $line->subledger_account != '-1') {
 			print $object->get_compte_desc($line->numero_compte).' : '.length_accounta($line->subledger_account);
 		} else {
 			// Should not happen: subledger account must be null or a non empty value
 			print '<span class="error">'.$langs->trans("Unknown");
-			if ($line->subledger_label) print ' ('.$line->subledger_label.')';
-			$htmltext = 'EmptyStringForSubledgerAccountButSubledgerLabelDefined';
+			if ($line->subledger_label) {
+				print ' ('.$line->subledger_label.')';
+				$htmltext = 'EmptyStringForSubledgerAccountButSubledgerLabelDefined';
+			} else {
+				$htmltext = 'EmptyStringForSubledgerAccountAndSubledgerLabel';
+			}
 			print $form->textwithpicto('', $htmltext);
 			print '</span>';
 		}
@@ -613,39 +694,40 @@ while ($i < min($num, $limit))
 
 	print '<tr class="oddeven">';
 
-	// Journal code
-	if (!empty($arrayfields['t.code_journal']['checked']))
-	{
-		$accountingjournal = new AccountingJournal($db);
-		$result = $accountingjournal->fetch('', $line->code_journal);
-		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal);
-		print '<td class="center">'.$journaltoshow.'</td>';
-		if (!$i) $totalarray['nbfield']++;
-	}
-
-	// Document date
-	if (!empty($arrayfields['t.doc_date']['checked']))
-	{
-		print '<td class="center">'.dol_print_date($line->doc_date, 'day').'</td>';
-		if (!$i) $totalarray['nbfield']++;
-	}
-
 	// Piece number
-	if (!empty($arrayfields['t.piece_num']['checked']))
-	{
+	if (!empty($arrayfields['t.piece_num']['checked'])) {
 		print '<td>';
 		$object->id = $line->id;
 		$object->piece_num = $line->piece_num;
 		print $object->getNomUrl(1, '', 0, '', 1);
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	// Journal code
+	if (!empty($arrayfields['t.code_journal']['checked'])) {
+		$accountingjournal = new AccountingJournal($db);
+		$result = $accountingjournal->fetch('', $line->code_journal);
+		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal);
+		print '<td class="center">'.$journaltoshow.'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	// Document date
+	if (!empty($arrayfields['t.doc_date']['checked'])) {
+		print '<td class="center">'.dol_print_date($line->doc_date, 'day').'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Document ref
-	if (!empty($arrayfields['t.doc_ref']['checked']))
-	{
-		if ($line->doc_type == 'customer_invoice')
-		{
+	if (!empty($arrayfields['t.doc_ref']['checked'])) {
+		if ($line->doc_type == 'customer_invoice') {
 			$langs->loadLangs(array('bills'));
 
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -657,8 +739,7 @@ while ($i < min($num, $limit))
 			$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-		} elseif ($line->doc_type == 'supplier_invoice')
-		{
+		} elseif ($line->doc_type == 'supplier_invoice') {
 			$langs->loadLangs(array('bills'));
 
 			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
@@ -670,8 +751,7 @@ while ($i < min($num, $limit))
 			$filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($line->fk_doc, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
 			$subdir = get_exdir($objectstatic->id, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $subdir, $filedir);
-		} elseif ($line->doc_type == 'expense_report')
-		{
+		} elseif ($line->doc_type == 'expense_report') {
 			$langs->loadLangs(array('trips'));
 
 			require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
@@ -683,8 +763,7 @@ while ($i < min($num, $limit))
 			$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-		} elseif ($line->doc_type == 'bank')
-		{
+		} elseif ($line->doc_type == 'bank') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 			$objectstatic = new AccountLine($db);
 			$objectstatic->fetch($line->fk_doc);
@@ -698,8 +777,7 @@ while ($i < min($num, $limit))
 		// Picto + Ref
 		print '<td class="nobordernopadding">';
 
-		if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report')
-		{
+		if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report') {
 			print $objectstatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
 			print $documentlink;
 		} elseif ($line->doc_type == 'bank') {
@@ -712,7 +790,9 @@ while ($i < min($num, $limit))
 		print '</td></tr></table>';
 
 		print "</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Label operation
@@ -720,30 +800,47 @@ while ($i < min($num, $limit))
 		// Affiche un lien vers la facture client/fournisseur
 		$doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
 		print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>'.$line->label_operation.'</td>' : '<td>'.$line->label_operation.'<br><span style="font-size:0.8em">('.length_accounta($line->subledger_account).')</span></td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Amount debit
-	if (!empty($arrayfields['t.debit']['checked']))
-	{
+	if (!empty($arrayfields['t.debit']['checked'])) {
 		print '<td class="nowrap right">'.($line->debit ? price($line->debit) : '').'</td>';
-		if (!$i) $totalarray['nbfield']++;
-		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totaldebit';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+		if (!$i) {
+			$totalarray['pos'][$totalarray['nbfield']] = 'totaldebit';
+		}
 		$totalarray['val']['totaldebit'] += $line->debit;
 	}
 
 	// Amount credit
 	if (!empty($arrayfields['t.credit']['checked'])) {
 		print '<td class="nowrap right">'.($line->credit ? price($line->credit) : '').'</td>';
-		if (!$i) $totalarray['nbfield']++;
-		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalcredit';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+		if (!$i) {
+			$totalarray['pos'][$totalarray['nbfield']] = 'totalcredit';
+		}
 		$totalarray['val']['totalcredit'] += $line->credit;
 	}
 
 	// Lettering code
-	if (!empty($arrayfields['t.lettering_code']['checked']))
-	{
+	if (!empty($arrayfields['t.lettering_code']['checked'])) {
 		print '<td class="center">'.$line->lettering_code.'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	// Exported operation date
+	if (!empty($arrayfields['t.date_export']['checked']))
+	{
+		print '<td class="center">'.dol_print_date($line->date_export, 'dayhour').'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 
@@ -763,7 +860,9 @@ while ($i < min($num, $limit))
 		}
 	}
 	print '</td>';
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Comptabilise le sous-total
 	$sous_total_debit += $line->debit;
@@ -775,14 +874,6 @@ while ($i < min($num, $limit))
 }
 
 if ($num > 0) {
-	// Show sub-total of last shown account
-	if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
-	    $colnumber = 3;
-	    $colnumberend = 7;
-	} else {
-	    $colnumber = 4;
-	    $colnumberend = 7;
-	}
 	$colspan = $totalarray['nbfield'] - $colnumber;
 	$colspanend = $totalarray['nbfield'] - $colnumberend;
 	print '<tr class="liste_total">';
@@ -795,8 +886,7 @@ if ($num > 0) {
 	$balance = $sous_total_debit - $sous_total_credit;
 	print '<tr class="liste_total">';
 	print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
-	if ($balance > 0)
-	{
+	if ($balance > 0) {
 		print '<td class="nowraponall right">';
 		print price($sous_total_debit - $sous_total_credit);
 		print '</td>';
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
index e831e21f814..2d90c9a7b14 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2013      Olivier Geffroy      <jeff@jeffinfo.com>
  * Copyright (C) 2013      Florian Henry	    <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2019 Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2018-2019 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020 Frédéric France      <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,14 +37,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "accountancy"));
 
-$action     = GETPOST('action', 'aZ09');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
-$confirm    = GETPOST('confirm', 'alpha');
-$toselect   = GETPOST('toselect', 'array');
-$socid      = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
+$confirm = GETPOST('confirm', 'alpha');
+$toselect = GETPOST('toselect', 'array');
+// $socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
+// Security check
+$socid = GETPOSTINT("socid");
+// if ($user->socid) $socid=$user->socid;
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOSTISSET('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -54,10 +57,12 @@ if (empty($page) || $page == - 1) {
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if ($sortorder == "")
+if ($sortorder == "") {
 	$sortorder = "ASC";
-if ($sortfield == "")
+}
+if ($sortfield == "") {
 	$sortfield = "bk.doc_date";
+}
 
 /*
 $search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
@@ -74,23 +79,18 @@ if (!empty($lettering)) {
 /*
 if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
 {
-    $search_date_start = '';
-    $search_date_end = '';
+	$search_date_start = '';
+	$search_date_end = '';
 	//$search_doc_type = '';
 	$search_doc_ref = '';
 }
 */
 
-// Security check
-$socid = GETPOST("socid", 'int');
-// if ($user->socid) $socid=$user->socid;
-
 $lettering = new Lettering($db);
 $object = new Societe($db);
 $object->id = $socid;
 $result = $object->fetch($socid);
-if ($result < 0)
-{
+if ($result < 0) {
 	setEventMessages($object->error, $object->errors, 'errors');
 }
 
@@ -208,30 +208,30 @@ if ($resql) {
 	print '<table class="liste centpercent">'."\n";
 
 	/*
-    print '<tr class="liste_titre">';
-    //print '<td><input type="text" name="search_doc_type" value="' . $search_doc_type . '"></td>';
+	print '<tr class="liste_titre">';
+	//print '<td><input type="text" name="search_doc_type" value="' . $search_doc_type . '"></td>';
 
-    // Date
-    print '<td class="liste_titre center">';
-    print '<div class="nowrap">';
-    print $langs->trans('From') . ' ';
-    print $form->selectDate($search_date_start, 'date_creation_start', 0, 0, 1);
-    print '</div>';
-    print '<div class="nowrap">';
-    print $langs->trans('to') . ' ';
-    print $form->selectDate($search_date_end, 'date_creation_end', 0, 0, 1);
-    print '</div>';
-    print '</td>';
+	// Date
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $langs->trans('From') . ' ';
+	print $form->selectDate($search_date_start, 'date_creation_start', 0, 0, 1);
+	print '</div>';
+	print '<div class="nowrap">';
+	print $langs->trans('to') . ' ';
+	print $form->selectDate($search_date_end, 'date_creation_end', 0, 0, 1);
+	print '</div>';
+	print '</td>';
 
-    // Piece
-    print '<td><input type="text" name="search_doc_ref" value="' . $search_doc_ref . '"></td>';
+	// Piece
+	print '<td><input type="text" name="search_doc_ref" value="' . $search_doc_ref . '"></td>';
 
-    print '<td colspan="6">&nbsp;</td>';
-    print '<td class="right">';
-    $searchpicto = $form->showFilterButtons();
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
+	print '<td colspan="6">&nbsp;</td>';
+	print '<td class="right">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
 	*/
 
 	print '<tr class="liste_titre">';
@@ -251,7 +251,9 @@ if ($resql) {
 	$tmp = '';
 
 	while ($obj = $db->fetch_object($resql)) {
-		if ($tmp != $obj->lettering_code || empty($tmp))						$tmp = $obj->lettering_code;
+		if ($tmp != $obj->lettering_code || empty($tmp)) {
+			$tmp = $obj->lettering_code;
+		}
 		/*if ($tmp != $obj->lettering_code || empty($obj->lettering_code))*/	$solde += ($obj->credit - $obj->debit);
 
 		print '<tr class="oddeven">';
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
index b5620f3ec25..31acb9f0191 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
@@ -41,7 +41,11 @@ $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm    = GETPOST('confirm', 'alpha');
 $toselect   = GETPOST('toselect', 'array');
-$socid      = GETPOST('socid', 'int') ? ((int) GETPOST('socid', 'int')) : ((int) GETPOST('id', 'int'));
+// $socid = GETPOST('socid', 'int') ? ((int) GETPOST('socid', 'int')) : ((int) GETPOST('id', 'int'));
+// Security check
+$socid = GETPOSTINT("socid");
+// if ($user->socid) $socid=$user->socid;
+
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -53,10 +57,12 @@ if (empty($page) || $page == - 1) {
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if ($sortorder == "")
+if ($sortorder == "") {
 	$sortorder = "ASC";
-if ($sortfield == "")
+}
+if ($sortfield == "") {
 	$sortfield = "bk.doc_date";
+}
 
 /*
 $search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
@@ -73,24 +79,18 @@ if (!empty($lettering)) {
 /*
 if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
 {
-    $search_date_start = '';
-    $search_date_end = '';
+	$search_date_start = '';
+	$search_date_end = '';
 	//$search_doc_type='';
 	$search_doc_ref='';
 }
 */
 
-
-// Security check
-$socid = GETPOST("socid", 'int');
-// if ($user->socid) $socid=$user->socid;
-
 $lettering = new Lettering($db);
 $object = new Societe($db);
 $object->id = $socid;
 $result = $object->fetch($socid);
-if ($result < 0)
-{
+if ($result < 0) {
 	setEventMessages($object->error, $object->errors, 'errors');
 }
 
@@ -159,8 +159,7 @@ $solde = 0;
 // Count total nb of records and calc total sum
 $nbtotalofrecords = '';
 $resql = $db->query($sql);
-if (!$resql)
-{
+if (!$resql) {
 	dol_print_error($db);
 	exit;
 }
@@ -206,30 +205,30 @@ if ($resql) {
 	print '<table class="liste centpercent">'."\n";
 
 	/*
-    print '<tr class="liste_titre">';
-    //print '<td><input type="text" name="search_doc_type" value="' . $search_doc_type . '"></td>';
+	print '<tr class="liste_titre">';
+	//print '<td><input type="text" name="search_doc_type" value="' . $search_doc_type . '"></td>';
 
-    // Date
-    print '<td class="liste_titre center">';
-    print '<div class="nowrap">';
-    print $langs->trans('From') . ' ';
-    print $form->selectDate($search_date_start, 'date_creation_start', 0, 0, 1);
-    print '</div>';
-    print '<div class="nowrap">';
-    print $langs->trans('to') . ' ';
-    print $form->selectDate($search_date_end, 'date_creation_end', 0, 0, 1);
-    print '</div>';
-    print '</td>';
+	// Date
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $langs->trans('From') . ' ';
+	print $form->selectDate($search_date_start, 'date_creation_start', 0, 0, 1);
+	print '</div>';
+	print '<div class="nowrap">';
+	print $langs->trans('to') . ' ';
+	print $form->selectDate($search_date_end, 'date_creation_end', 0, 0, 1);
+	print '</div>';
+	print '</td>';
 
-    // Piece
-    print '<td><input type="text" name="search_doc_ref" value="' . $search_doc_ref . '"></td>';
+	// Piece
+	print '<td><input type="text" name="search_doc_ref" value="' . $search_doc_ref . '"></td>';
 
-    print '<td colspan="6">&nbsp;</td>';
-    print '<td class="right">';
-    $searchpicto = $form->showFilterButtons();
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
+	print '<td colspan="6">&nbsp;</td>';
+	print '<td class="right">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
 	*/
 
 	print '<tr class="liste_titre">';
@@ -248,7 +247,9 @@ if ($resql) {
 	$solde = 0;
 	$tmp = '';
 	while ($obj = $db->fetch_object($resql)) {
-		if ($tmp != $obj->lettering_code || empty($tmp))						$tmp = $obj->lettering_code;
+		if ($tmp != $obj->lettering_code || empty($tmp)) {
+			$tmp = $obj->lettering_code;
+		}
 		/*if ($tmp != $obj->lettering_code || empty($obj->lettering_code))*/	$solde += ($obj->credit - $obj->debit);
 
 		print '<tr class="oddeven">';
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 201e3cac95a..382b7ee6f62 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -57,8 +57,8 @@ class AccountancyExport
 	public static $EXPORT_TYPE_OPENCONCERTO = 100;
 	public static $EXPORT_TYPE_LDCOMPTA = 110;
 	public static $EXPORT_TYPE_LDCOMPTA10 = 120;
-	public static $EXPORT_TYPE_GESTINUMV3 = 130;
-	public static $EXPORT_TYPE_GESTINUMV5 = 135;
+	public static $EXPORT_TYPE_GESTIMUMV3 = 130;
+	public static $EXPORT_TYPE_GESTIMUMV5 = 135;
 	public static $EXPORT_TYPE_FEC = 1000;
 	public static $EXPORT_TYPE_FEC2 = 1010;
 
@@ -119,8 +119,8 @@ class AccountancyExport
 			self::$EXPORT_TYPE_CHARLEMAGNE => $langs->trans('Modelcsv_charlemagne'),
 			self::$EXPORT_TYPE_LDCOMPTA => $langs->trans('Modelcsv_LDCompta'),
 			self::$EXPORT_TYPE_LDCOMPTA10 => $langs->trans('Modelcsv_LDCompta10'),
-			self::$EXPORT_TYPE_GESTINUMV3 => $langs->trans('Modelcsv_Gestinum_v3'),
-			self::$EXPORT_TYPE_GESTINUMV5 => $langs->trans('Modelcsv_Gestinum_v5'),
+			self::$EXPORT_TYPE_GESTIMUMV3 => $langs->trans('Modelcsv_Gestinum_v3'),
+			self::$EXPORT_TYPE_GESTIMUMV5 => $langs->trans('Modelcsv_Gestinum_v5'),
 			self::$EXPORT_TYPE_FEC => $langs->trans('Modelcsv_FEC'),
 			self::$EXPORT_TYPE_FEC2 => $langs->trans('Modelcsv_FEC2'),
 		);
@@ -154,8 +154,8 @@ class AccountancyExport
 			self::$EXPORT_TYPE_CHARLEMAGNE => 'charlemagne',
 			self::$EXPORT_TYPE_LDCOMPTA => 'ldcompta',
 			self::$EXPORT_TYPE_LDCOMPTA10 => 'ldcompta10',
-			self::$EXPORT_TYPE_GESTINUMV3 => 'gestinumv3',
-			self::$EXPORT_TYPE_GESTINUMV5 => 'gestinumv5',
+			self::$EXPORT_TYPE_GESTIMUMV3 => 'gestimumv3',
+			self::$EXPORT_TYPE_GESTIMUMV5 => 'gestimumv5',
 			self::$EXPORT_TYPE_FEC => 'fec',
 			self::$EXPORT_TYPE_FEC2 => 'fec2',
 		);
@@ -227,11 +227,13 @@ class AccountancyExport
 				self::$EXPORT_TYPE_LDCOMPTA10 => array(
 					'label' => $langs->trans('Modelcsv_LDCompta10'),
 				),
-				self::$EXPORT_TYPE_GESTINUMV3 => array(
+				self::$EXPORT_TYPE_GESTIMUMV3 => array(
 					'label' => $langs->trans('Modelcsv_Gestinumv3'),
+					'ACCOUNTING_EXPORT_FORMAT' => 'txt',
 				),
-				self::$EXPORT_TYPE_GESTINUMV5 => array(
+				self::$EXPORT_TYPE_GESTIMUMV5 => array(
 					'label' => $langs->trans('Modelcsv_Gestinumv5'),
+					'ACCOUNTING_EXPORT_FORMAT' => 'txt',
 				),
 				self::$EXPORT_TYPE_FEC => array(
 					'label' => $langs->trans('Modelcsv_FEC'),
@@ -320,10 +322,10 @@ class AccountancyExport
 			case self::$EXPORT_TYPE_LDCOMPTA10 :
 				$this->exportLDCompta10($TData);
 				break;
-			case self::$EXPORT_TYPE_GESTINUMV3 :
+			case self::$EXPORT_TYPE_GESTIMUMV3 :
 				$this->exportGestimumV3($TData);
 				break;
-			case self::$EXPORT_TYPE_GESTINUMV5 :
+			case self::$EXPORT_TYPE_GESTIMUMV5 :
 				$this->exportGestimumV5($TData);
 				break;
 			case self::$EXPORT_TYPE_FEC :
@@ -820,6 +822,8 @@ class AccountancyExport
 	 */
 	public function exportFEC($objectLines)
 	{
+		global $langs;
+
 		$separator = "\t";
 		$end_line = "\r\n";
 
@@ -855,55 +859,55 @@ class AccountancyExport
                 $date_limit_payment = dol_print_date($line->date_lim_reglement, '%Y%m%d');
 
 				// FEC:JournalCode
-				print $line->code_journal.$separator;
+				print $line->code_journal . $separator;
 
 				// FEC:JournalLib
-				print $line->journal_label.$separator;
+				print dol_string_unaccent($langs->transnoentities($line->journal_label)) . $separator;
 
 				// FEC:EcritureNum
-				print $line->piece_num.$separator;
+				print $line->piece_num . $separator;
 
 				// FEC:EcritureDate
-				print $date_document.$separator;
+				print $date_document . $separator;
 
 				// FEC:CompteNum
-				print length_accountg($line->numero_compte).$separator;
+				print $line->numero_compte . $separator;
 
 				// FEC:CompteLib
-				print dol_string_unaccent($line->label_compte).$separator;
+				print dol_string_unaccent($line->label_compte) . $separator;
 
 				// FEC:CompAuxNum
-				print length_accounta($line->subledger_account).$separator;
+				print $line->subledger_account . $separator;
 
 				// FEC:CompAuxLib
-				print dol_string_unaccent($line->subledger_label).$separator;
+				print dol_string_unaccent($line->subledger_label) . $separator;
 
 				// FEC:PieceRef
-				print $line->doc_ref.$separator;
+				print $line->doc_ref . $separator;
 
 				// FEC:PieceDate
-				print $date_creation.$separator;
+				print dol_string_unaccent($date_creation) . $separator;
 
 				// FEC:EcritureLib
-				print dol_string_unaccent($line->label_operation).$separator;
+				print dol_string_unaccent($line->label_operation) . $separator;
 
 				// FEC:Debit
-				print price2fec($line->debit).$separator;
+				print price2fec($line->debit) . $separator;
 
 				// FEC:Credit
-				print price2fec($line->credit).$separator;
+				print price2fec($line->credit) . $separator;
 
 				// FEC:EcritureLet
-				print $line->lettering_code.$separator;
+				print $line->lettering_code . $separator;
 
 				// FEC:DateLet
-				print $date_lettering.$separator;
+				print $date_lettering . $separator;
 
 				// FEC:ValidDate
-				print $date_validation.$separator;
+				print $date_validation . $separator;
 
 				// FEC:Montantdevise
-				print $line->multicurrency_amount.$separator;
+				print $line->multicurrency_amount . $separator;
 
 				// FEC:Idevise
 				print $line->multicurrency_code.$separator;
@@ -924,6 +928,8 @@ class AccountancyExport
 	 */
 	public function exportFEC2($objectLines)
 	{
+		global $langs;
+
 		$separator = "\t";
 		$end_line = "\r\n";
 
@@ -962,7 +968,7 @@ class AccountancyExport
 				print $line->code_journal . $separator;
 
 				// FEC:JournalLib
-				print $line->journal_label . $separator;
+				print dol_string_unaccent($langs->transnoentities($line->journal_label)) . $separator;
 
 				// FEC:EcritureNum
 				print $line->piece_num . $separator;
@@ -1634,81 +1640,85 @@ class AccountancyExport
 		$invoices_infos = array();
 		$supplier_invoices_infos = array();
 		foreach ($objectLines as $line) {
-			$date = dol_print_date($line->doc_date, '%d/%m/%Y');
-
-			$invoice_ref = $line->doc_ref;
-			$company_name = "";
-
-			if (($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice') && $line->fk_doc > 0) {
-				if (($line->doc_type == 'customer_invoice' && !isset($invoices_infos[$line->fk_doc])) ||
-					($line->doc_type == 'supplier_invoice' && !isset($supplier_invoices_infos[$line->fk_doc]))) {
-					if ($line->doc_type == 'customer_invoice') {
-						// Get new customer invoice ref and company name
-						$sql = 'SELECT f.facnumber, s.nom FROM ' . MAIN_DB_PREFIX . 'facture as f';
-						$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe AS s ON f.fk_soc = s.rowid';
-						$sql .= ' WHERE f.rowid = ' . $line->fk_doc;
-						$resql = $this->db->query($sql);
-						if ($resql) {
-							if ($obj = $this->db->fetch_object($resql)) {
-								// Save invoice infos
-								$invoices_infos[$line->fk_doc] = array('ref' => $obj->facnumber, 'company_name' => $obj->nom);
-								$invoice_ref = $obj->facnumber;
-								$company_name = $obj->nom;
-							}
-						}
-					} else {
-						// Get new supplier invoice ref and company name
-						$sql = 'SELECT ff.ref, s.nom FROM ' . MAIN_DB_PREFIX . 'facture_fourn as ff';
-						$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe AS s ON ff.fk_soc = s.rowid';
-						$sql .= ' WHERE ff.rowid = ' . $line->fk_doc;
-						$resql = $this->db->query($sql);
-						if ($resql) {
-							if ($obj = $this->db->fetch_object($resql)) {
-								// Save invoice infos
-								$supplier_invoices_infos[$line->fk_doc] = array('ref' => $obj->ref, 'company_name' => $obj->nom);
-								$invoice_ref = $obj->ref;
-								$company_name = $obj->nom;
-							}
-						}
-					}
-				} elseif ($line->doc_type == 'customer_invoice') {
-					// Retrieve invoice infos
-					$invoice_ref = $invoices_infos[$line->fk_doc]['ref'];
-					$company_name = $invoices_infos[$line->fk_doc]['company_name'];
-				} else {
-					// Retrieve invoice infos
-					$invoice_ref = $supplier_invoices_infos[$line->fk_doc]['ref'];
-					$company_name = $supplier_invoices_infos[$line->fk_doc]['company_name'];
-				}
-			}
-
-			print $line->id . $this->separator;
-			print $date . $this->separator;
-			print substr($line->code_journal, 0, 4) . $this->separator;
-
-			if ((substr($line->numero_compte, 0, 3) == '411') || (substr($line->numero_compte, 0, 3) == '401')) {
-				print length_accountg($line->subledger_account) . $this->separator;
+			if ($line->debit == 0 && $line->credit == 0) {
+				unset($array[$line]);
 			} else {
-				print substr(length_accountg($line->numero_compte), 0, 15) . $this->separator;
+				$date = dol_print_date($line->doc_date, '%d/%m/%Y');
+
+				$invoice_ref = $line->doc_ref;
+				$company_name = "";
+
+				if (($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice') && $line->fk_doc > 0) {
+					if (($line->doc_type == 'customer_invoice' && !isset($invoices_infos[$line->fk_doc])) ||
+						($line->doc_type == 'supplier_invoice' && !isset($supplier_invoices_infos[$line->fk_doc]))) {
+						if ($line->doc_type == 'customer_invoice') {
+							// Get new customer invoice ref and company name
+							$sql = 'SELECT f.ref, s.nom FROM ' . MAIN_DB_PREFIX . 'facture as f';
+							$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe AS s ON f.fk_soc = s.rowid';
+							$sql .= ' WHERE f.rowid = ' . $line->fk_doc;
+							$resql = $this->db->query($sql);
+							if ($resql) {
+								if ($obj = $this->db->fetch_object($resql)) {
+									// Save invoice infos
+									$invoices_infos[$line->fk_doc] = array('ref' => $obj->ref, 'company_name' => $obj->nom);
+									$invoice_ref = $obj->ref;
+									$company_name = $obj->nom;
+								}
+							}
+						} else {
+							// Get new supplier invoice ref and company name
+							$sql = 'SELECT ff.ref, s.nom FROM ' . MAIN_DB_PREFIX . 'facture_fourn as ff';
+							$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe AS s ON ff.fk_soc = s.rowid';
+							$sql .= ' WHERE ff.rowid = ' . $line->fk_doc;
+							$resql = $this->db->query($sql);
+							if ($resql) {
+								if ($obj = $this->db->fetch_object($resql)) {
+									// Save invoice infos
+									$supplier_invoices_infos[$line->fk_doc] = array('ref' => $obj->ref, 'company_name' => $obj->nom);
+									$invoice_ref = $obj->ref;
+									$company_name = $obj->nom;
+								}
+							}
+						}
+					} elseif ($line->doc_type == 'customer_invoice') {
+						// Retrieve invoice infos
+						$invoice_ref = $invoices_infos[$line->fk_doc]['ref'];
+						$company_name = $invoices_infos[$line->fk_doc]['company_name'];
+					} else {
+						// Retrieve invoice infos
+						$invoice_ref = $supplier_invoices_infos[$line->fk_doc]['ref'];
+						$company_name = $supplier_invoices_infos[$line->fk_doc]['company_name'];
+					}
+				}
+
+				print $line->id . $this->separator;
+				print $date . $this->separator;
+				print substr($line->code_journal, 0, 4) . $this->separator;
+
+				if ((substr($line->numero_compte, 0, 3) == '411') || (substr($line->numero_compte, 0, 3) == '401')) {
+					print length_accountg($line->subledger_account) . $this->separator;
+				} else {
+					print substr(length_accountg($line->numero_compte), 0, 15) . $this->separator;
+				}
+				//Libellé Auto
+				print $this->separator;
+				//print '"'.dol_trunc(str_replace('"', '', $line->label_operation),40,'right','UTF-8',1).'"' . $this->separator;
+				//Libellé manuel
+				print dol_trunc(str_replace('"', '', $invoice_ref . (!empty($company_name) ? ' - ' : '') . $company_name), 40, 'right', 'UTF-8', 1) . $this->separator;
+				//Numéro de pièce
+				print dol_trunc(str_replace('"', '', $line->piece_num), 10, 'right', 'UTF-8', 1) . $this->separator;
+				//Devise
+				print 'EUR' . $this->separator;
+				//Montant
+				print price2num(abs($line->montant)) . $this->separator;
+				//Sens
+				print $line->sens . $this->separator;
+				//Code lettrage
+				print $this->separator;
+				//Date Echéance
+				print $date;
+				print $this->end_line;
 			}
-			//Libellé Auto
-			print $this->separator;
-			//print '"'.dol_trunc(str_replace('"', '', $line->label_operation),40,'right','UTF-8',1).'"' . $this->separator;
-			//Libellé manuel
-			print dol_trunc(str_replace('"', '', $invoice_ref . (!empty($company_name) ? ' - ' : '') . $company_name), 40, 'right', 'UTF-8', 1) . $this->separator;
-			//Numéro de pièce
-			print dol_trunc(str_replace('"', '', $line->piece_num), 10, 'right', 'UTF-8', 1) . $this->separator;
-			//Devise
-			print 'EUR' . $this->separator;
-			//Montant
-			print price2num(abs($line->montant)) . $this->separator;
-			//Sens
-			print $line->sens . $this->separator;
-			//Code lettrage
-			print $this->separator;
-			//Date Echéance
-			print $date;
-			print $this->end_line;
 		}
 	}
 
@@ -1725,27 +1735,31 @@ class AccountancyExport
 		$this->separator = ',';
 
 		foreach ($objectLines as $line) {
-			$date = dol_print_date($line->doc_date, '%d%m%Y');
-
-			print $line->id . $this->separator;
-			print $date . $this->separator;
-			print substr($line->code_journal, 0, 4) . $this->separator;
-			if ((substr($line->numero_compte, 0, 3) == '411') || (substr($line->numero_compte, 0, 3) == '401'))  {
-				print length_accountg($line->subledger_account) . $this->separator;
+			if ($line->debit == 0 && $line->credit == 0) {
+				unset($array[$line]);
 			} else {
-				print substr(length_accountg($line->numero_compte), 0, 15) . $this->separator;
+				$date = dol_print_date($line->doc_date, '%d%m%Y');
+
+				print $line->id . $this->separator;
+				print $date . $this->separator;
+				print substr($line->code_journal, 0, 4) . $this->separator;
+				if ((substr($line->numero_compte, 0, 3) == '411') || (substr($line->numero_compte, 0, 3) == '401')) {
+					print length_accountg($line->subledger_account) . $this->separator;
+				} else {
+					print substr(length_accountg($line->numero_compte), 0, 15) . $this->separator;
+				}
+				print $this->separator;
+				//print '"'.dol_trunc(str_replace('"', '', $line->label_operation),40,'right','UTF-8',1).'"' . $this->separator;
+				print '"' . dol_trunc(str_replace('"', '', $line->doc_ref), 40, 'right', 'UTF-8', 1) . '"' . $this->separator;
+				print '"' . dol_trunc(str_replace('"', '', $line->piece_num), 10, 'right', 'UTF-8', 1) . '"' . $this->separator;
+				print price2num($line->montant) . $this->separator;
+				print $line->sens . $this->separator;
+				print $date . $this->separator;
+				print $this->separator;
+				print $this->separator;
+				print 'EUR';
+				print $this->end_line;
 			}
-			print $this->separator;
-			//print '"'.dol_trunc(str_replace('"', '', $line->label_operation),40,'right','UTF-8',1).'"' . $this->separator;
-			print '"'.dol_trunc(str_replace('"', '', $line->doc_ref), 40, 'right', 'UTF-8', 1).'"' . $this->separator;
-			print '"'.dol_trunc(str_replace('"', '', $line->piece_num), 10, 'right', 'UTF-8', 1).'"'.$this->separator;
-			print price2num($line->montant).$this->separator;
-			print $line->sens.$this->separator;
-			print $date . $this->separator;
-			print $this->separator;
-			print $this->separator;
-			print 'EUR';
-			print $this->end_line;
 		}
 	}
 
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index a76be081471..6ee8a03d8ff 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -126,7 +126,7 @@ class AccountingJournal extends CommonObject
 					$this->rowid		= $obj->rowid;
 
 					$this->code			= $obj->code;
-					$this->ref = $obj->code;
+					$this->ref			= $obj->code;
 					$this->label		= $obj->label;
 					$this->nature		= $obj->nature;
 					$this->active		= $obj->active;
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 3b03e6ae8ca..c8a12cef083 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -315,6 +315,7 @@ class BookKeeping extends CommonObject
 					$objnum = $this->db->fetch_object($resqlnum);
 					$this->piece_num = $objnum->piece_num;
 				}
+
 				dol_syslog(get_class($this).":: create this->piece_num=".$this->piece_num, LOG_DEBUG);
 				if (empty($this->piece_num)) {
 					$sqlnum = "SELECT MAX(piece_num)+1 as maxpiecenum";
@@ -327,8 +328,8 @@ class BookKeeping extends CommonObject
 						$objnum = $this->db->fetch_object($resqlnum);
 						$this->piece_num = $objnum->maxpiecenum;
 					}
+					dol_syslog(get_class($this).":: create this->piece_num=".$this->piece_num, LOG_DEBUG);
 				}
-				dol_syslog(get_class($this).":: create this->piece_num=".$this->piece_num, LOG_DEBUG);
 				if (empty($this->piece_num)) {
 					$this->piece_num = 1;
 				}
@@ -369,7 +370,7 @@ class BookKeeping extends CommonObject
 				$sql .= ", ".(!empty($this->subledger_account) ? ("'".$this->db->escape($this->subledger_account)."'") : "NULL");
 				$sql .= ", ".(!empty($this->subledger_label) ? ("'".$this->db->escape($this->subledger_label)."'") : "NULL");
 				$sql .= ", '".$this->db->escape($this->numero_compte)."'";
-				$sql .= ", ".(!empty($this->label_operation) ? ("'".$this->db->escape($this->label_operation)."'") : "NULL");
+				$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;
@@ -383,7 +384,6 @@ class BookKeeping extends CommonObject
 				$sql .= ", ".(!isset($this->entity) ? $conf->entity : $this->entity);
 				$sql .= ")";
 
-				dol_syslog(get_class($this).":: create sql=".$sql, LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql) {
 					$id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
@@ -795,7 +795,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.label_operation,";
 		$sql .= " t.debit,";
 		$sql .= " t.credit,";
-		$sql .= " t.montant,";
+		$sql .= " t.montant as amount,";
 		$sql .= " t.sens,";
 		$sql .= " t.multicurrency_amount,";
 		$sql .= " t.multicurrency_code,";
@@ -806,7 +806,8 @@ class BookKeeping extends CommonObject
 		$sql .= " t.code_journal,";
 		$sql .= " t.journal_label,";
 		$sql .= " t.piece_num,";
-		$sql .= " t.date_creation";
+		$sql .= " t.date_creation,";
+		$sql .= " t.date_export";
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
@@ -823,12 +824,18 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key.' LIKE \''.$this->db->escape($value).'%\'';
 				} elseif ($key == 't.date_creation>=' || $key == 't.date_creation<=') {
 					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
+				} elseif ($key == 't.date_export>=' || $key == 't.date_export<=') {
+					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.credit' || $key == 't.debit') {
 					$sqlwhere[] = natural_search($key, $value, 1, 1);
                 } elseif ($key == 't.reconciled_option') {
                     $sqlwhere[] = 't.lettering_code IS NULL';
                 } elseif ($key == 't.code_journal' && !empty($value)) {
-                    $sqlwhere[] = natural_search("t.code_journal", join(',', $value), 3, 1);
+                	if (is_array($value)) {
+                		$sqlwhere[] = natural_search("t.code_journal", join(',', $value), 3, 1);
+                	} else {
+                    	$sqlwhere[] = natural_search("t.code_journal", $value, 3, 1);
+                	}
 				} else {
 					$sqlwhere[] = natural_search($key, $value, 0, 1);
 				}
@@ -878,7 +885,8 @@ class BookKeeping extends CommonObject
 				$line->label_operation = $obj->label_operation;
 				$line->debit = $obj->debit;
 				$line->credit = $obj->credit;
-				$line->montant = $obj->montant;
+				$line->montant = $obj->amount; // deprecated
+				$line->amount = $obj->amount;
 				$line->sens = $obj->sens;
 				$line->multicurrency_amount = $obj->multicurrency_amount;
 				$line->multicurrency_code = $obj->multicurrency_code;
@@ -889,7 +897,8 @@ class BookKeeping extends CommonObject
 				$line->code_journal = $obj->code_journal;
 				$line->journal_label = $obj->journal_label;
 				$line->piece_num = $obj->piece_num;
-				$line->date_creation = $obj->date_creation;
+				$line->date_creation = $this->db->jdate($obj->date_creation);
+				$line->date_export = $this->db->jdate($obj->date_export);
 
 				$this->lines[] = $line;
 
@@ -941,7 +950,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.credit,";
 		$sql .= " t.lettering_code,";
 		$sql .= " t.date_lettering,";
-		$sql .= " t.montant,";
+		$sql .= " t.montant as amount,";
 		$sql .= " t.sens,";
 		$sql .= " t.fk_user_author,";
 		$sql .= " t.import_key,";
@@ -1019,7 +1028,8 @@ class BookKeeping extends CommonObject
 				$line->label_operation = $obj->label_operation;
 				$line->debit = $obj->debit;
 				$line->credit = $obj->credit;
-				$line->montant = $obj->montant;
+				$line->montant = $obj->amount;	// deprecated
+				$line->amount = $obj->amount;
 				$line->sens = $obj->sens;
 				$line->lettering_code = $obj->lettering_code;
 				$line->date_lettering = $obj->date_lettering;
@@ -1904,25 +1914,24 @@ class BookKeeping extends CommonObject
 
 	/**
 	 * Return id and description of a root accounting account.
-	 * This function takes the parent of parent to get the root account !
+	 * FIXME: This function takes the parent of parent to get the root account !
 	 *
 	 * @param 	string 	$account	Accounting account
-	 * @return 	string 				Root account
+	 * @return 	array 				Array with root account information (max 2 upper level)
 	 */
 	public function getRootAccount($account = null)
 	{
 		global $conf;
 		$pcgver = $conf->global->CHARTOFACCOUNTS;
 
-		$sql  = "SELECT root.rowid, root.account_number, root.label as label";
+		$sql  = "SELECT root.rowid, root.account_number, root.label as label,";
+		$sql .= " parent.rowid as parent_rowid, parent.account_number as parent_account_number, parent.label as parent_label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
 		$sql .= " AND asy.rowid = ".((int) $pcgver);
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as parent ON aa.account_parent = parent.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as root ON parent.account_parent = root.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as parent ON aa.account_parent = parent.rowid AND parent.active = 1";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as root ON parent.account_parent = root.rowid AND root.active = 1";
 		$sql .= " WHERE aa.account_number = '".$this->db->escape($account)."'";
-		$sql .= " AND parent.active = 1";
-		$sql .= " AND root.active = 1";
 		$sql .= " AND aa.entity IN (".getEntity('accountancy').")";
 
 		dol_syslog(get_class($this)."::select_account sql=".$sql, LOG_DEBUG);
@@ -1933,7 +1942,8 @@ class BookKeeping extends CommonObject
 				$obj = $this->db->fetch_object($resql);
 			}
 
-			return array('id'=>$obj->rowid, 'account_number'=>$obj->account_number, 'label'=>$obj->label);
+			$result = array('id'=>$obj->rowid, 'account_number'=>$obj->account_number, 'label'=>$obj->label);
+			return $result;
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(__METHOD__." ".$this->error, LOG_ERR);
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 1a5098bda38..3634fba2e79 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013       Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2014  Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2017  Alexandre Spangaro	<aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2020  Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2014       Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2015       Jean-François Ferry	<jfefe@aternatik.fr>
  *
@@ -123,9 +123,9 @@ if ($action == 'validatehistory') {
 	$sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
 	$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.tva_tx as tva_tx_prod,";
 	$sql .= " p.accountancy_code_sell as code_sell, p.accountancy_code_sell_intra as code_sell_intra, p.accountancy_code_sell_export as code_sell_export,";
-	$sql .= " aa.rowid as aarowid, aa2.rowid as aarowid_intra, aa3.rowid as aarowid_export,";
+	$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.tva_intra";
+	$sql .= " s.tva_intra, s.accountancy_code_sell as company_code_sell";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
@@ -134,6 +134,7 @@ if ($action == 'validatehistory') {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON p.accountancy_code_sell = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON p.accountancy_code_sell_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON p.accountancy_code_sell_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa4 ON s.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";
 
@@ -153,7 +154,7 @@ if ($action == 'validatehistory') {
 
 			$isBuyerInEEC = isInEEC($objp);
 
-			// Search suggested account for product/service (similar code exists in page list.php to make manual binding)
+			// 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;
@@ -179,6 +180,13 @@ if ($action == 'validatehistory') {
 				}
 			}
 
+			// 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 = '';
+			}
+
 			if ($objp->aarowid_suggest > 0)
 			{
 				$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."facturedet";
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 9a78ea3bfc9..a5c603c2504 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("bills", "compta", "accountancy", "productbatch"));
+$langs->loadLangs(array("bills", "compta", "accountancy", "productbatch", "products"));
 
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
@@ -176,7 +176,8 @@ 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 .= " p.rowid as product_id, p.fk_product_type as product_type, p.ref as product_ref, p.label as product_label, p.accountancy_code_sell,";
+$sql .= " p.rowid as product_id, p.fk_product_type as product_type, p.ref as product_ref, p.label as product_label, p.tobuy, p.tosell,";
+$sql .= " p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export,";
 $sql .= " aa.rowid as fk_compte, aa.account_number, aa.label, aa.labelshort,";
 $sql .= " fd.situation_percent,";
 $sql .= " co.code as country_code, co.label as country,";
@@ -326,7 +327,7 @@ if ($result) {
 	//print '<input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '">';
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tvaintra" value="'.dol_escape_htmltag($search_tvaintra).'"></td>';
-	print '<td class="liste_titre center"><input type="text" class="flat maxwidth50" name="search_account" value="'.dol_escape_htmltag($search_account).'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_account" value="'.dol_escape_htmltag($search_account).'"></td>';
 	print '<td class="liste_titre center">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
@@ -338,7 +339,7 @@ if ($result) {
 	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "f.datef, f.ref, fd.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre("ProductRef", $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
 	//print_liste_field_titre("ProductLabel", $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "fd.description", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("ProductDescription", $_SERVER["PHP_SELF"], "fd.description", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "fd.total_ht", "", $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "fd.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
@@ -377,6 +378,11 @@ if ($result) {
 		$productstatic->id = $objp->product_id;
 		$productstatic->label = $objp->product_label;
 		$productstatic->type = $objp->line_type;
+		$productstatic->status = $objp->tosell;
+		$productstatic->status_buy = $objp->tobuy;
+		$productstatic->accountancy_code_sell = $objp->accountancy_code_sell;
+		$productstatic->accountancy_code_sell_intra = $objp->accountancy_code_sell_intra;
+		$productstatic->accountancy_code_sell_export = $objp->accountancy_code_sell_export;
 
 		$accountingaccountstatic->rowid = $objp->fk_compte;
 		$accountingaccountstatic->label = $objp->label;
@@ -424,11 +430,12 @@ if ($result) {
 
 		print '<td>'.$objp->tva_intra.'</td>';
 
-		print '<td class="center">';
+		print '<td>';
 		print $accountingaccountstatic->getNomUrl(0, 1, 1, '', 1);
 		print ' <a class="editfielda" href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
 		print img_edit();
 		print '</a></td>';
+
 		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="'.$objp->rowid.'"/></td>';
 
 		print '</tr>';
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index eb2743258d7..defe8bfd3b9 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other", "productbatch"));
+$langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other", "productbatch", "products"));
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
@@ -211,9 +211,9 @@ $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label,
 $sql .= " p.accountancy_code_sell as code_sell, p.accountancy_code_sell_intra as code_sell_intra, p.accountancy_code_sell_export as code_sell_export,";
 $sql .= " p.accountancy_code_buy as code_buy, p.accountancy_code_buy_intra as code_buy_intra, p.accountancy_code_buy_export as code_buy_export,";
 $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,";
+$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, s.code_compta as code_compta_client, s.code_compta_fournisseur, s.accountancy_code_sell as company_code_sell";
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
@@ -225,6 +225,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON p.accountancy_code_sell = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON p.accountancy_code_sell_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON p.accountancy_code_sell_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa4 ON s.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";
 // Define begin binding date
@@ -456,11 +457,12 @@ if ($result) {
 		$facture_static->type = $objp->ftype;
 
 		$code_sell_p_notset = '';
+		$code_sell_t_notset = '';
 		$objp->aarowid_suggest = ''; // Will be set later
 
 		$isBuyerInEEC = isInEEC($objp);
 
-		// Search suggested default account for product/service
+		// 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)
@@ -503,7 +505,7 @@ if ($result) {
 		}
 		if ($objp->code_sell_l == -1) $objp->code_sell_l = '';
 
-		// Search suggested account for product/service (similar code exists in page index.php to make automatic binding)
+		// 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;
@@ -529,6 +531,15 @@ if ($result) {
 			}
 		}
 
+		// 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 ($objp->description == "(DEPOSIT)") {
 			$accountdeposittoventilated = new AccountingAccount($db);
@@ -547,6 +558,7 @@ if ($result) {
 
 		// $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
 
 		print '<tr class="oddeven">';
 
@@ -596,7 +608,7 @@ if ($result) {
 
 		// Found accounts
 		print '<td>';
-		$s = '<span class="small">'.(($objp->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': </span>';
+		$s = '<span class="small">1. '.(($objp->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': </span>';
 		$shelp = '';
 		if ($suggestedaccountingaccountbydefaultfor == 'eec') $shelp .= $langs->trans("SaleEEC");
 		elseif ($suggestedaccountingaccountbydefaultfor == 'export') $shelp .= $langs->trans("SaleExport");
@@ -605,24 +617,38 @@ if ($result) {
 		if ($objp->product_id > 0)
 		{
 			print '<br>';
-			$s = '<span class="small">'.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': </span>';
-			$shelp = '';
+			$s = '<span class="small">2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': </span>';
+			$shelp = ''; $ttype = 'help';
 			if ($suggestedaccountingaccountfor == 'eec') $shelp = $langs->trans("SaleEEC");
 			elseif ($suggestedaccountingaccountfor == 'eecwithvat') $shelp = $langs->trans("SaleEECWithVAT");
-			elseif ($suggestedaccountingaccountfor == 'eecwithoutvatnumber') $shelp = $langs->trans("SaleEECWithoutVATNumber");
+			elseif ($suggestedaccountingaccountfor == 'eecwithoutvatnumber') {
+				$shelp = $langs->trans("SaleEECWithoutVATNumber");
+				$ttype = 'warning';
+			}
 			elseif ($suggestedaccountingaccountfor == 'export') $shelp = $langs->trans("SaleExport");
 			$s .= (empty($objp->code_sell_p) ? '<span style="'.$code_sell_p_notset.'">'.$langs->trans("NotDefined").'</span>' : length_accountg($objp->code_sell_p));
+			print $form->textwithpicto($s, $shelp, 1, $ttype, '', 0, 2, '', 1);
+		} else {
+			if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
+				print '<br>';
+				$s = '<span class="small">2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': </span>';
+				$shelp = '';
+				$s .= $langs->trans("NotDefined");
+				print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
+			}
+		}
+		if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
+			print '<br>';
+			$s = '<span class="small">3. '.(($objp->type_l == 1) ? $langs->trans("ServiceForThisThirdparty") : $langs->trans("ProductForThisThirdparty")).': </span>';
+			$shelp = '';
+			$s .= ($objp->code_sell_t > 0 ? length_accountg($objp->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
-		// $objp->code_sell_l = default (it takes the country into consideration), $objp->code_sell_p is value for product (it takes the country into consideration too)
 		print '<td>';
 		$suggestedid = $objp->aarowid_suggest;
-		/*var_dump($suggestedid);
-		var_dump($objp->code_sell_p);
-		var_dump($objp->code_sell_l);*/
 		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]))
@@ -642,7 +668,6 @@ if ($result) {
 
 		// Column with checkbox
 		print '<td class="center">';
-		//var_dump($objp->aarowid);var_dump($objp->aarowid_intra);var_dump($objp->aarowid_export);var_dump($objp->aarowid_suggest);
 		$ischecked = $objp->aarowid_suggest;
 		if ($suggestedaccountingaccountfor == 'eecwithoutvatnumber') $ischecked = 0;
 		print '<input type="checkbox" class="flat checkforselect checkforselect'.$objp->rowid.'" name="toselect[]" value="'.$objp->rowid."_".$i.'"'.($ischecked ? "checked" : "").'/>';
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index d353041234f..71839ecf08a 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -150,7 +150,7 @@ $userstatic = new User($db);
 $bankaccountstatic = new Account($db);
 $chargestatic = new ChargeSociales($db);
 $paymentdonstatic = new PaymentDonation($db);
-$paymentvatstatic = new TVA($db);
+$paymentvatstatic = new Tva($db);
 $paymentsalstatic = new PaymentSalary($db);
 $paymentexpensereportstatic = new PaymentExpenseReport($db);
 $paymentvariousstatic = new PaymentVarious($db);
@@ -549,7 +549,7 @@ if (!$error && $action == 'writebookkeeping') {
 					$bookkeeping->debit = ($mt >= 0 ? $mt : 0);
 					$bookkeeping->credit = ($mt < 0 ? -$mt : 0);
 					$bookkeeping->code_journal = $journal;
-					$bookkeeping->journal_label = $journal_label;
+					$bookkeeping->journal_label = $langs->transnoentities($journal_label);
 					$bookkeeping->fk_user_author = $user->id;
 					$bookkeeping->date_creation = $now;
 
@@ -605,7 +605,7 @@ if (!$error && $action == 'writebookkeeping') {
 						$bookkeeping->debit = ($mt < 0 ? -$mt : 0);
 						$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
 						$bookkeeping->code_journal = $journal;
-						$bookkeeping->journal_label = $journal_label;
+						$bookkeeping->journal_label = $langs->transnoentities($journal_label);
 						$bookkeeping->fk_user_author = $user->id;
 						$bookkeeping->date_creation = $now;
 
@@ -737,7 +737,7 @@ if (!$error && $action == 'writebookkeeping') {
 						$bookkeeping->debit = ($mt < 0 ? -$mt : 0);
 						$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
 						$bookkeeping->code_journal = $journal;
-						$bookkeeping->journal_label = $journal_label;
+						$bookkeeping->journal_label = $langs->transnoentities($journal_label);
 						$bookkeeping->fk_user_author = $user->id;
 						$bookkeeping->date_creation = $now;
 						$bookkeeping->label_compte = '';
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 26e2b4cdf77..70ec097cd27 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -223,7 +223,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->debit = ($mt <= 0) ? -$mt : 0;
 					$bookkeeping->credit = ($mt > 0) ? $mt : 0;
 					$bookkeeping->code_journal = $journal;
-					$bookkeeping->journal_label = $journal_label;
+					$bookkeeping->journal_label = $langs->transnoentities($journal_label);
 					$bookkeeping->fk_user_author = $user->id;
 					$bookkeeping->entity = $conf->entity;
 
@@ -271,7 +271,7 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->debit = ($mt > 0) ? $mt : 0;
 						$bookkeeping->credit = ($mt <= 0) ? -$mt : 0;
 						$bookkeeping->code_journal = $journal;
-						$bookkeeping->journal_label = $journal_label;
+						$bookkeeping->journal_label = $langs->transnoentities($journal_label);
 						$bookkeeping->fk_user_author = $user->id;
 						$bookkeeping->entity = $conf->entity;
 
@@ -329,7 +329,7 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->debit = ($mt > 0) ? $mt : 0;
 						$bookkeeping->credit = ($mt <= 0) ? -$mt : 0;
 						$bookkeeping->code_journal = $journal;
-						$bookkeeping->journal_label = $journal_label;
+						$bookkeeping->journal_label = $langs->transnoentities($journal_label);
 						$bookkeeping->fk_user_author = $user->id;
 						$bookkeeping->entity = $conf->entity;
 
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 94f878527dd..611dde36af5 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -322,7 +322,7 @@ if ($action == 'writebookkeeping') {
 				$bookkeeping->debit = ($mt <= 0) ? -$mt : 0;
 				$bookkeeping->credit = ($mt > 0) ? $mt : 0;
 				$bookkeeping->code_journal = $journal;
-				$bookkeeping->journal_label = $journal_label;
+				$bookkeeping->journal_label = $langs->transnoentities($journal_label);
 				$bookkeeping->fk_user_author = $user->id;
 				$bookkeeping->entity = $conf->entity;
 
@@ -372,7 +372,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
 					$bookkeeping->credit = ($mt <= 0) ? -$mt : 0;
 					$bookkeeping->code_journal = $journal;
-					$bookkeeping->journal_label = $journal_label;
+					$bookkeeping->journal_label = $langs->transnoentities($journal_label);
 					$bookkeeping->fk_user_author = $user->id;
 					$bookkeeping->entity = $conf->entity;
 
@@ -433,7 +433,7 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->debit = ($mt > 0) ? $mt : 0;
 						$bookkeeping->credit = ($mt <= 0) ? -$mt : 0;
 						$bookkeeping->code_journal = $journal;
-						$bookkeeping->journal_label = $journal_label;
+						$bookkeeping->journal_label = $langs->transnoentities($journal_label);
 						$bookkeeping->fk_user_author = $user->id;
 						$bookkeeping->entity = $conf->entity;
 
@@ -484,7 +484,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
 					$bookkeeping->credit = ($mt <= 0) ? -$mt : 0;
 					$bookkeeping->code_journal = $journal;
-					$bookkeeping->journal_label = $journal_label;
+					$bookkeeping->journal_label = $langs->transnoentities($journal_label);
 					$bookkeeping->fk_user_author = $user->id;
 					$bookkeeping->entity = $conf->entity;
 
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 9f44e02aafa..62d2238a116 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -333,7 +333,7 @@ if ($action == 'writebookkeeping') {
 				$bookkeeping->debit = ($mt >= 0) ? $mt : 0;
 				$bookkeeping->credit = ($mt < 0) ? -$mt : 0;
 				$bookkeeping->code_journal = $journal;
-				$bookkeeping->journal_label = $journal_label;
+				$bookkeeping->journal_label = $langs->transnoentities($journal_label);
 				$bookkeeping->fk_user_author = $user->id;
 				$bookkeeping->entity = $conf->entity;
 
@@ -383,7 +383,7 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->debit = ($mt < 0) ? -$mt : 0;
 					$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
 					$bookkeeping->code_journal = $journal;
-					$bookkeeping->journal_label = $journal_label;
+					$bookkeeping->journal_label = $langs->transnoentities($journal_label);
 					$bookkeeping->fk_user_author = $user->id;
 					$bookkeeping->entity = $conf->entity;
 
@@ -443,7 +443,7 @@ if ($action == 'writebookkeeping') {
 						$bookkeeping->debit = ($mt < 0) ? -$mt : 0;
 						$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
 						$bookkeeping->code_journal = $journal;
-						$bookkeeping->journal_label = $journal_label;
+						$bookkeeping->journal_label = $langs->transnoentities($journal_label);
 						$bookkeeping->fk_user_author = $user->id;
 						$bookkeeping->entity = $conf->entity;
 
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 0dbe09fa468..9dd097f3d0c 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -120,9 +120,9 @@ if ($action == 'validatehistory') {
 	$sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
 	$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type,";
 	$sql .= " p.accountancy_code_buy as code_buy, p.accountancy_code_buy_intra as code_buy_intra, p.accountancy_code_buy_export as code_buy_export, p.tva_tx as tva_tx_prod,";
-	$sql .= " aa.rowid as aarowid, aa2.rowid as aarowid_intra, aa3.rowid as aarowid_export,";
+	$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.tva_intra";
+	$sql .= " s.tva_intra, 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";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
@@ -131,6 +131,7 @@ if ($action == 'validatehistory') {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON p.accountancy_code_buy = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON p.accountancy_code_buy_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON p.accountancy_code_buy_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa4 ON s.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";
 
@@ -151,7 +152,7 @@ if ($action == 'validatehistory') {
 
 			$isSellerInEEC = isInEEC($objp);
 
-			// Search suggested account for product/service
+			// 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;
@@ -169,6 +170,13 @@ if ($action == 'validatehistory') {
 				}
 			}
 
+			// 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)
 			{
 				$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det";
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index e23d9f9868a..70d6d89216f 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("compta", "bills", "other", "accountancy", "productbatch"));
+$langs->loadLangs(array("compta", "bills", "other", "accountancy", "productbatch", "products"));
 
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
@@ -178,7 +178,8 @@ print '<script type="text/javascript">
 $sql = "SELECT f.rowid as facid, f.ref as ref, f.ref_supplier, f.libelle as invoice_label, f.datef, f.fk_soc,";
 $sql .= " l.rowid, l.fk_product, l.product_type as line_type, l.description, l.total_ht , l.qty, l.tva_tx, l.vat_src_code,";
 $sql .= " aa.label, aa.labelshort, aa.account_number,";
-$sql .= " p.rowid as product_id, p.fk_product_type as product_type, p.ref as product_ref, p.label as product_label, p.fk_product_type as type,";
+$sql .= " p.rowid as product_id, p.fk_product_type as product_type, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.tobuy, p.tosell,";
+$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";
 $parameters = array();
@@ -333,16 +334,16 @@ if ($result) {
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("InvoiceLabel", $_SERVER["PHP_SELF"], "f.libelle", "", $param, '', $sortfield, $sortorder);
+	//print_liste_field_titre("InvoiceLabel", $_SERVER["PHP_SELF"], "f.libelle", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "f.datef, f.ref, l.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre("ProductRef", $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
 	//print_liste_field_titre("ProductLabel", $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("ProductDescription", $_SERVER["PHP_SELF"], "l.description", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "l.total_ht", "", $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("VATIntraShort", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("AccountAccounting", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
 	$checkpicto = $form->showCheckAddButtons();
 	print_liste_field_titre($checkpicto, '', '', '', '', '', '', '', 'center ');
@@ -376,6 +377,11 @@ if ($result) {
 		$productstatic->id = $objp->product_id;
 		$productstatic->label = $objp->product_label;
 		$productstatic->type = $objp->line_type;
+		$productstatic->status = $objp->tosell;
+		$productstatic->status_buy = $objp->tobuy;
+		$productstatic->accountancy_code_buy = $objp->accountancy_code_buy;
+		$productstatic->accountancy_code_buy_intra = $objp->accountancy_code_sell_buy;
+		$productstatic->accountancy_code_buy_export = $objp->accountancy_code_sell_buy;
 
 		$accountingaccountstatic->rowid = $objp->fk_compte;
 		$accountingaccountstatic->label = $objp->label;
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index cbdecd2e85e..37f596c05c1 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -30,6 +30,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.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.'/fourn/class/fournisseur.product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
@@ -38,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other", "productbatch"));
+$langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other", "productbatch", "products"));
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
@@ -215,9 +216,9 @@ $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label,
 $sql .= " p.accountancy_code_sell as code_sell, p.accountancy_code_sell_intra as code_sell_intra, p.accountancy_code_sell_export as code_sell_export,";
 $sql .= " p.accountancy_code_buy as code_buy, p.accountancy_code_buy_intra as code_buy_intra, p.accountancy_code_buy_export as code_buy_export,";
 $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,";
+$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, s.code_compta as code_compta_client, s.code_compta_fournisseur, s.accountancy_code_buy as company_code_buy";
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
@@ -229,6 +230,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON p.accountancy_code_buy = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON p.accountancy_code_buy_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON p.accountancy_code_buy_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa4 ON s.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";
 // Define begin binding date
@@ -460,10 +462,12 @@ if ($result) {
 		$facturefourn_static->label = $objp->invoice_label;
 
 		$code_buy_p_notset = '';
+		$code_buy_t_notset = '';
 		$objp->aarowid_suggest = ''; // Will be set later
 
 		$isSellerInEEC = isInEEC($objp);
 
+		// 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)
@@ -494,7 +498,7 @@ if ($result) {
 		}
 		if ($objp->code_sell_l == -1) $objp->code_sell_l = '';
 
-		// Search suggested account for product/service
+		// 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;
@@ -512,6 +516,13 @@ if ($result) {
 			}
 		}
 
+		// 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 (!empty($objp->code_buy_p)) {
 			// Value was defined previously
 		} else {
@@ -521,6 +532,7 @@ if ($result) {
 
 		// $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
 
 		print '<tr class="oddeven">';
 
@@ -576,7 +588,7 @@ if ($result) {
 
 		// Found accounts
 		print '<td>';
-		$s = '<span class="small">'.(($objp->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': </span>';
+		$s = '<span class="small">1. '.(($objp->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': </span>';
 		$shelp = '';
 		if ($suggestedaccountingaccountbydefaultfor == 'eec') $shelp .= $langs->trans("SaleEEC");
 		elseif ($suggestedaccountingaccountbydefaultfor == 'export') $shelp .= $langs->trans("SaleExport");
@@ -585,13 +597,24 @@ if ($result) {
 		if ($objp->product_id > 0)
 		{
 			print '<br>';
-			$s = '<span class="small">'.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': </span>';
+			$s = '<span class="small">2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': </span>';
 			$shelp = '';
 			if ($suggestedaccountingaccountfor == 'eec') $shelp = $langs->trans("SaleEEC");
 			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);
+		} else {
+			print '<br>';
+			$s = '<span class="small">2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': </span>';
+			$shelp = '';
+			$s .= $langs->trans("NotDefined");
+			print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
 		}
+		print '<br>';
+		$s = '<span class="small">3. '.(($objp->type_l == 1) ? $langs->trans("ServiceForThisThirdparty") : $langs->trans("ProductForThisThirdparty")).': </span>';
+		$shelp = '';
+		$s .= ($objp->code_buy_t > 0 ? length_accountg($objp->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
diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 8acf1f1b191..fef3bd53177 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -136,7 +136,7 @@ if ($action == 'update' || $action == 'add') {
 	$constnote = GETPOST('constnote');
 	$res = dolibarr_set_const($db, $constname, $constvalue, $choices[$consttype], 0, $constnote, $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
diff --git a/htdocs/adherents/admin/adherent_emails.php b/htdocs/adherents/admin/adherent_emails.php
index 4374d281895..21ce5037ef5 100644
--- a/htdocs/adherents/admin/adherent_emails.php
+++ b/htdocs/adherents/admin/adherent_emails.php
@@ -92,7 +92,7 @@ if ($action == 'update' || $action == 'add') {
 
 	$res = dolibarr_set_const($db, $constname, $constvalue, $typetouse, 0, $constnote, $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index d0cdb098bae..e3acf3c4d99 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -63,7 +63,7 @@ if ($action == 'update') {
 		$res = dolibarr_set_const($db, "MEMBER_NEWFORM_FORCETYPE", $forcetype, 'chaine', 0, '', $conf->entity);
 	}
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index c87c1d90b0d..8e5cdbe8067 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1749,7 +1749,7 @@ class Adherent extends CommonObject
 
 				if (!$error) {
 					// Set invoice as paid
-					$invoice->set_paid($user);
+					$invoice->setPaid($user);
 				}
 			}
 
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index b2ef8e8854b..44e0e4177b8 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -85,9 +85,15 @@ if ($result) {
 		$adhtype->label = $objp->label;
 		$AdherentType[$objp->rowid] = $adhtype;
 
-		if ($objp->statut == -1) { $MemberToValidate[$objp->rowid] = $objp->somme; }
-		if ($objp->statut == 1) { $MembersValidated[$objp->rowid] = $objp->somme; }
-		if ($objp->statut == 0) { $MembersResiliated[$objp->rowid] = $objp->somme; }
+		if ($objp->statut == -1) {
+			$MemberToValidate[$objp->rowid] = $objp->somme;
+		}
+		if ($objp->statut == 1) {
+			$MembersValidated[$objp->rowid] = $objp->somme;
+		}
+		if ($objp->statut == 0) {
+			$MembersResiliated[$objp->rowid] = $objp->somme;
+		}
 
 		$i++;
 	}
@@ -136,10 +142,14 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is usel
 		print '<table class="noborder nohover centpercent">';
 		$i = 0;
 		foreach ($listofsearchfields as $key => $value) {
-			if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+			if ($i == 0) {
+				print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+			}
 			print '<tr class="oddeven">';
 			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-			if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			if ($i == 0) {
+				print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			}
 			print '</tr>';
 			$i++;
 		}
@@ -284,7 +294,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
  */
 $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
-$sql = "SELECT a.rowid, a.statut as status, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
+$sql = "SELECT a.rowid, a.ref, a.statut as status, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
 $sql .= " a.gender, a.email, a.photo, a.morphy,";
 $sql .= " a.tms as datem, a.datefin as date_end_subscription,";
 $sql .= " ta.rowid as typeid, ta.libelle as label, ta.subscription as need_subscription";
@@ -308,7 +318,7 @@ if ($resql) {
 			$obj = $db->fetch_object($resql);
 
 			$staticmember->id = $obj->rowid;
-			$staticmember->ref = $obj->rowid;
+			$staticmember->ref = $obj->ref;
 			$staticmember->lastname = $obj->lastname;
 			$staticmember->firstname = $obj->firstname;
 			$staticmember->gender = $obj->gender;
diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index 7a1d5b66ece..a0dbe4e9838 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -66,6 +66,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 
 	if ($action != 'updateedit' && !$error)
 	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
@@ -114,57 +115,57 @@ print '<tr class="liste_titre"><th class="titlefield wordbreak">'.$langs->trans(
 
 // Name
 print '<tr class="oddeven"><td><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
-print '<input name="nom" id="name" class="minwidth200" value="'.($conf->global->MAIN_INFO_ACCOUNTANT_NAME ? $conf->global->MAIN_INFO_ACCOUNTANT_NAME : GETPOST("nom", 'nohtml')).'"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"').'></td></tr>'."\n";
+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";
 
 // Address
 print '<tr class="oddeven"><td><label for="address">'.$langs->trans("CompanyAddress").'</label></td><td>';
-print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_3.'">'.($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS ? $conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS : GETPOST("address", 'nohtml')).'</textarea></td></tr>'."\n";
+print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_3.'">'.(GETPOSTISSET('address') ? GETPOST('address', 'nohtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS) ? $conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS : '')).'</textarea></td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="zipcode">'.$langs->trans("CompanyZip").'</label></td><td>';
-print '<input class="minwidth100" name="zipcode" id="zipcode" value="'.($conf->global->MAIN_INFO_ACCOUNTANT_ZIP ? $conf->global->MAIN_INFO_ACCOUNTANT_ZIP : GETPOST("zipcode", 'alpha')).'"></td></tr>'."\n";
+print '<input class="minwidth100" name="zipcode" id="zipcode" value="'.(GETPOSTISSET('zipcode') ? GETPOST('zipcode', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_ZIP) ? $conf->global->MAIN_INFO_ACCOUNTANT_ZIP : '')).'"></td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="town">'.$langs->trans("CompanyTown").'</label></td><td>';
-print '<input name="town" class="minwidth100" id="town" value="'.($conf->global->MAIN_INFO_ACCOUNTANT_TOWN ? $conf->global->MAIN_INFO_ACCOUNTANT_TOWN : GETPOST("town", 'nohtml')).'"></td></tr>'."\n";
+print '<input name="town" class="minwidth100" id="town" value="'.(GETPOSTISSET('town') ? GETPOST('town', 'nohtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_TOWN) ? $conf->global->MAIN_INFO_ACCOUNTANT_TOWN : '')).'"></td></tr>'."\n";
 
 // Country
 print '<tr class="oddeven"><td><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
 print img_picto('', 'globe-americas', 'class="paddingrightonly"');
-print $form->select_country($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'country_id');
+print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id', 'int') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY) ? $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY : '')), 'country_id');
 if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 print '</td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
-$formcompany->select_departement($conf->global->MAIN_INFO_ACCOUNTANT_STATE, $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'state_id');
+$formcompany->select_departement((GETPOSTISSET('state_id') ? GETPOST('state_id', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_STATE) ? $conf->global->MAIN_INFO_ACCOUNTANT_STATE : '')), (GETPOSTISSET('country_id') ? GETPOST('country_id', 'int') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY) ? $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY : '')), 'state_id');
 print '</td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
 print img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright');
-print '<input name="tel" id="phone" value="'.$conf->global->MAIN_INFO_ACCOUNTANT_PHONE.'"></td></tr>';
+print '<input name="tel" id="phone" value="'.(GETPOSTISSET('tel') ? GETPOST('tel', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_PHONE) ? $conf->global->MAIN_INFO_ACCOUNTANT_PHONE : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
 print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright');
-print '<input name="fax" id="fax" value="'.$conf->global->MAIN_INFO_ACCOUNTANT_FAX.'"></td></tr>';
+print '<input name="fax" id="fax" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_FAX) ? $conf->global->MAIN_INFO_ACCOUNTANT_FAX : '')).'"></td></tr>';
 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, '', 'paddingright');
-print '<input name="mail" id="email" class="minwidth200" value="'.$conf->global->MAIN_INFO_ACCOUNTANT_MAIL.'"></td></tr>';
+print '<input name="mail" id="email" class="minwidth200" 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
 print '<tr class="oddeven"><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
 print img_picto('', 'globe', '', false, 0, 0, '', 'paddingright');
-print '<input name="web" id="web" class="minwidth300" value="'.$conf->global->MAIN_INFO_ACCOUNTANT_WEB.'"></td></tr>';
+print '<input name="web" id="web" class="minwidth300" value="'.(GETPOSTISSET('web') ? GETPOST('web', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_WEB) ? $conf->global->MAIN_INFO_ACCOUNTANT_WEB : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Code
 print '<tr class="oddeven"><td><label for="code">'.$langs->trans("AccountantFileNumber").'</label></td><td>';
-print '<input name="code" id="code" class="minwidth100" value="'.($conf->global->MAIN_INFO_ACCOUNTANT_CODE ? $conf->global->MAIN_INFO_ACCOUNTANT_CODE : GETPOST("code", 'nohtml')).'"></td></tr>'."\n";
+print '<input name="code" id="code" class="minwidth100" value="'.(GETPOSTISSET('code') ? GETPOST('code', 'nohtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_CODE) ? $conf->global->MAIN_INFO_ACCOUNTANT_CODE : '')).'"></td></tr>'."\n";
 
 // Note
 print '<tr class="oddeven"><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
-print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : $conf->global->MAIN_INFO_ACCOUNTANT_NOTE).'</textarea></td></tr>';
+print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_NOTE) ? $conf->global->MAIN_INFO_ACCOUNTANT_NOTE : '')).'</textarea></td></tr>';
 print '</td></tr>';
 
 print '</table>';
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index b1cc1d7619b..efdd6213dd5 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -97,7 +97,7 @@ if ($action == "save" && empty($cancel))
 		if ($search_event === '' || preg_match('/'.preg_quote($search_event, '/').'/i', $keyparam))
 		{
 			$res = dolibarr_set_const($db, $keyparam, (GETPOST($keyparam, 'alpha') ?GETPOST($keyparam, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-			if (!$res > 0) $error++;
+			if (!($res > 0)) $error++;
 		}
 	}
 
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 7fbd139072d..f99c530c7e2 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -82,15 +82,15 @@ if ($actionsave)
 
 		//print '-name='.$name.'-color='.$color;
 		$res = dolibarr_set_const($db, 'AGENDA_EXT_NAME'.$i, $name, 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) $error++;
+		if (!($res > 0)) $error++;
 		$res = dolibarr_set_const($db, 'AGENDA_EXT_SRC'.$i, $src, 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) $error++;
+		if (!($res > 0)) $error++;
 		$res = dolibarr_set_const($db, 'AGENDA_EXT_OFFSETTZ'.$i, $offsettz, 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) $error++;
+		if (!($res > 0)) $error++;
 		$res = dolibarr_set_const($db, 'AGENDA_EXT_COLOR'.$i, $color, 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) $error++;
+		if (!($res > 0)) $error++;
 		$res = dolibarr_set_const($db, 'AGENDA_EXT_ENABLED'.$i, $enabled, 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) $error++;
+		if (!($res > 0)) $error++;
 		$i++;
 	}
 
@@ -98,7 +98,7 @@ if ($actionsave)
 	if (!$error)
 	{
 		$res = dolibarr_set_const($db, 'AGENDA_EXT_NB', trim(GETPOST('AGENDA_EXT_NB', 'int')), 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) $error++;
+		if (!($res > 0)) $error++;
 		if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB = 5;
 		$MAXAGENDA = empty($conf->global->AGENDA_EXT_NB) ? 5 : $conf->global->AGENDA_EXT_NB;
 	}
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index c1f77f4995e..a072869be8c 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -51,6 +51,7 @@ $type = 'action';
 
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
+$reg = array();
 if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 {
 	$code = $reg[1];
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index d21ffdb1630..4cd7bff4ed8 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -112,7 +112,7 @@ if ($actionsave)
 		if ($color == '-1') $color = '';
 
 		$res = dolibarr_set_const($db, 'BANK_COLORIZE_MOVEMENT_COLOR'.$i, $color, 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) $error++;
+		if (!($res > 0)) $error++;
 		$i++;
 	}
 
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index 6ff8a988899..84fbb8dae30 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -400,7 +400,7 @@ if ($conf->product->enabled)
 						print img_picto($langs->trans("Activated"), 'switch_on');
 						print '</a></td>';
 					} else {
-						print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproducto&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
+						print '<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>';
 					}
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index 34c3af89c53..36b5ab91f67 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -52,7 +52,7 @@ if ($action == 'updateMask')
 
 	if ($maskconstbom) $res = dolibarr_set_const($db, $maskconstbom, $maskbom, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -141,7 +141,7 @@ elseif ($action == 'setdoc')
 	$draft = GETPOST("BOM_DRAFT_WATERMARK");
 	$res = dolibarr_set_const($db, "BOM_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -155,7 +155,7 @@ elseif ($action == 'setdoc')
 
 	$res = dolibarr_set_const($db, "BOM_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 63c3350fd9d..404ed12c235 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -446,14 +446,14 @@ print '<td>';
 print $langs->trans("MaxNbOfLinesForBoxes");
 print '</td>'."\n";
 print '<td>';
-print '<input type="text" class="flat" size="6" name="MAIN_BOXES_MAXLINES" value="'.$conf->global->MAIN_BOXES_MAXLINES.'">';
+print '<input type="text" class="flat" size="6" name="MAIN_BOXES_MAXLINES" value="'.(!empty($conf->global->MAIN_BOXES_MAXLINES) ? $conf->global->MAIN_BOXES_MAXLINES : '').'">';
 print '</td>';
 print '</tr>';
 
 // Activate FileCache - Developement
 if ($conf->global->MAIN_FEATURES_LEVEL == 2 || !empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
 	print '<tr class="oddeven"><td width="35%">'.$langs->trans("EnableFileCache").'</td><td>';
-	print $form->selectyesno('MAIN_ACTIVATE_FILECACHE', $conf->global->MAIN_ACTIVATE_FILECACHE, 1);
+	print $form->selectyesno('MAIN_ACTIVATE_FILECACHE', (!empty($conf->global->MAIN_ACTIVATE_FILECACHE) ? $conf->global->MAIN_ACTIVATE_FILECACHE : 0), 1);
 	print '</td>';
 	print '</tr>';
 }
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index 8c2acb5dc8b..f00e6454761 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -55,7 +55,7 @@ if ($action == 'updateMask')
 	$maskchequereceipts = GETPOST('maskchequereceipts', 'alpha');
 	if ($maskconstchequereceipts) $res = dolibarr_set_const($db, $maskconstchequereceipts, $maskchequereceipts, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if (!$error)
 	{
@@ -76,7 +76,7 @@ if ($action == 'set_BANK_CHEQUERECEIPT_FREE_TEXT')
 
 	$res = dolibarr_set_const($db, "BANK_CHEQUERECEIPT_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index cde0253f99a..c971cf42091 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -61,7 +61,7 @@ if ($action == 'updateMask')
 
 	if ($maskconstorder) $res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -146,7 +146,7 @@ elseif ($action == 'setdoc') {
 	$draft = GETPOST("COMMANDE_DRAFT_WATERMARK");
 	$res = dolibarr_set_const($db, "COMMANDE_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -160,7 +160,7 @@ elseif ($action == 'setdoc') {
 
 	$res = dolibarr_set_const($db, "ORDER_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -172,7 +172,7 @@ elseif ($action == 'setdoc') {
 	// 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 (!($res > 0)) $error++;
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -186,7 +186,7 @@ elseif ($action == 'setdoc') {
 	$res = dolibarr_set_const($db, "FACTURE_RIB_NUMBER", $rib, 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "FACTURE_CHQ_NUMBER", $chq, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if (!$error)
 	{
@@ -201,7 +201,7 @@ elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_ORDER')
 {
 	$res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_ORDER", $value, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if (!$error)
 	{
@@ -216,7 +216,7 @@ elseif ($action == 'set_WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER')
 {
 	$res = dolibarr_set_const($db, "WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER", $value, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if (!$error)
 	{
@@ -668,7 +668,7 @@ Whet is definition of "shippable" according to all different STOCK_CALCULATE_...
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ShippableOrderIconInList").'</td>';
-print '<td>&nbsp</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">';
@@ -687,7 +687,7 @@ if ($conf->banque->enabled)
 {
 
     print '<tr class="oddeven"><td>';
-    print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").'</td><td>&nbsp</td><td class="center">';
+    print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").'</td><td>&nbsp;</td><td class="center">';
     if (! empty($conf->use_javascript_ajax))
     {
         print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_ORDER');
@@ -717,7 +717,7 @@ if ($conf->stock->enabled)
 {
 
     print '<tr class="oddeven"><td>';
-    print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").'</td><td>&nbsp</td><td class="center">';
+    print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").'</td><td>&nbsp;</td><td class="center">';
     if (! empty($conf->use_javascript_ajax))
     {
         print ajax_constantonoff('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER');
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index b82f0fcd765..81e6bda40a0 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -215,8 +215,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 
 	if ($_POST["optionlocaltax1"] == "localtax1on")
 	{
-		if (!isset($_REQUEST['lt1']))
-		{
+		if (!GETPOSTISSET('lt1')) {
 			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX1", 0, 'chaine', 0, '', $conf->entity);
 		} else {
 			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX1", GETPOST('lt1', 'aZ09'), 'chaine', 0, '', $conf->entity);
@@ -225,8 +224,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 	}
 	if ($_POST["optionlocaltax2"] == "localtax2on")
 	{
-		if (!isset($_REQUEST['lt2']))
-		{
+		if (!GETPOSTISSET('lt2')) {
 			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX2", 0, 'chaine', 0, '', $conf->entity);
 		} else {
 			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX2", GETPOST('lt2', 'aZ09'), 'chaine', 0, '', $conf->entity);
@@ -236,6 +234,9 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 
 	if (!$error)
 	{
+		if (GETPOST('save')) {	// To avoid to show message when we juste switch the country that resubmit the form.
+			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		}
 		$db->commit();
 	} else {
 		$db->rollback();
@@ -393,18 +394,18 @@ print '<tr class="liste_titre"><th class="titlefield wordbreak">'.$langs->trans(
 
 // Name
 print '<tr class="oddeven"><td class="fieldrequired wordbreak"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
-print '<input name="nom" id="name" class="minwidth200" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM ? $conf->global->MAIN_INFO_SOCIETE_NOM : GETPOST("nom", 'nohtml')).'"'.(empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? ' autofocus="autofocus"' : '').'></td></tr>'."\n";
+print '<input name="nom" id="name" class="minwidth200" value="'.dol_escape_htmltag((GETPOSTISSET('nom') ? GETPOST('nom', 'nohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? $conf->global->MAIN_INFO_SOCIETE_NOM : ''))).'"'.(empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? ' autofocus="autofocus"' : '').'></td></tr>'."\n";
 
 // Address
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ADDRESS">'.$langs->trans("CompanyAddress").'</label></td><td>';
-print '<textarea name="MAIN_INFO_SOCIETE_ADDRESS" id="MAIN_INFO_SOCIETE_ADDRESS" class="quatrevingtpercent" rows="'.ROWS_3.'">'.($conf->global->MAIN_INFO_SOCIETE_ADDRESS ? $conf->global->MAIN_INFO_SOCIETE_ADDRESS : GETPOST("MAIN_INFO_SOCIETE_ADDRESS", 'nohtml')).'</textarea></td></tr>'."\n";
+print '<textarea name="MAIN_INFO_SOCIETE_ADDRESS" id="MAIN_INFO_SOCIETE_ADDRESS" class="quatrevingtpercent" rows="'.ROWS_3.'">'.(GETPOSTISSET('MAIN_INFO_SOCIETE_ADDRESS') ? GETPOST('MAIN_INFO_SOCIETE_ADDRESS', 'nohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS) ? $conf->global->MAIN_INFO_SOCIETE_ADDRESS : '')).'</textarea></td></tr>'."\n";
 
 // Zip
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ZIP">'.$langs->trans("CompanyZip").'</label></td><td>';
-print '<input class="width100" name="MAIN_INFO_SOCIETE_ZIP" id="MAIN_INFO_SOCIETE_ZIP" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP ? $conf->global->MAIN_INFO_SOCIETE_ZIP : GETPOST("MAIN_INFO_SOCIETE_ZIP", 'alpha')).'"></td></tr>'."\n";
+print '<input class="width100" name="MAIN_INFO_SOCIETE_ZIP" id="MAIN_INFO_SOCIETE_ZIP" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_ZIP') ? GETPOST('MAIN_INFO_SOCIETE_ZIP', 'alpha') : (!empty($conf->global->MAIN_INFO_SOCIETE_ZIP) ? $conf->global->MAIN_INFO_SOCIETE_ZIP : ''))).'"></td></tr>'."\n";
 
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_TOWN">'.$langs->trans("CompanyTown").'</label></td><td>';
-print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth200" id="MAIN_INFO_SOCIETE_TOWN" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN ? $conf->global->MAIN_INFO_SOCIETE_TOWN : GETPOST("MAIN_INFO_SOCIETE_TOWN", 'nohtml')).'"></td></tr>'."\n";
+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">';
@@ -431,25 +432,25 @@ print '</td></tr>'."\n";
 // Phone
 print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
 print img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright');
-print '<input name="tel" id="phone" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TEL).'"></td></tr>';
+print '<input name="tel" id="phone" value="'.dol_escape_htmltag((GETPOSTISSET('tel') ? GETPOST('tel', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_TEL) ? $conf->global->MAIN_INFO_SOCIETE_TEL : ''))).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Fax
 print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
 print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright');
-print '<input name="fax" id="fax" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_FAX).'"></td></tr>';
+print '<input name="fax" id="fax" value="'.dol_escape_htmltag((GETPOSTISSET('fax') ? GETPOST('fax', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_FAX) ? $conf->global->MAIN_INFO_SOCIETE_FAX : ''))).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Email
 print '<tr class="oddeven"><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
 print img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright');
-print '<input name="mail" id="email" class="minwidth200" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL).'"></td></tr>';
+print '<input name="mail" id="email" class="minwidth200" 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
 print '<tr class="oddeven"><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
 print img_picto('', 'globe', '', false, 0, 0, '', 'paddingright');
-print '<input name="web" id="web" class="minwidth300" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_WEB).'"></td></tr>';
+print '<input name="web" id="web" class="minwidth300" value="'.dol_escape_htmltag((GETPOSTISSET('web') ? GETPOST('web', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_WEB) ? $conf->global->MAIN_INFO_SOCIETE_WEB : ''))).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Barcode
@@ -457,7 +458,7 @@ if (!empty($conf->barcode->enabled)) {
 	print '<tr class="oddeven"><td>';
 	print '<label for="barcode">'.$langs->trans("Gencod").'</label></td><td>';
 	print '<span class="fa paddingright fa-barcode"></span>';
-	print '<input name="barcode" id="barcode" class="minwidth150" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_GENCOD).'"></td></tr>';
+	print '<input name="barcode" id="barcode" class="minwidth150" value="'.dol_escape_htmltag((GETPOSTISSET('barcode') ? GETPOST('barcode', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_GENCODE) ? $conf->global->MAIN_INFO_SOCIETE_GENCODE : ''))).'"></td></tr>';
 	print '</td></tr>';
 }
 
@@ -534,7 +535,7 @@ print '</td></tr>';
 
 // Note
 print '<tr class="oddeven"><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
-print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : $conf->global->MAIN_INFO_SOCIETE_NOTE).'</textarea></td></tr>';
+print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_NOTE) ? $conf->global->MAIN_INFO_SOCIETE_NOTE : '')).'</textarea></td></tr>';
 print '</td></tr>';
 
 print '</table>';
@@ -549,17 +550,17 @@ $langs->load("companies");
 
 // Managing Director(s)
 print '<tr class="oddeven"><td><label for="director">'.$langs->trans("ManagingDirectors").'</label></td><td>';
-print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="directors" class="minwidth200" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MANAGERS).'"></td></tr>';
+print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="directors" class="minwidth200" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_MANAGERS') ? GETPOST('MAIN_INFO_SOCIETE_MANAGERS', 'nohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS) ? $conf->global->MAIN_INFO_SOCIETE_MANAGERS : ''))).'"></td></tr>';
 
 // GDPR contact
 print '<tr class="oddeven"><td>';
 print $form->textwithpicto($langs->trans("GDPRContact"), $langs->trans("GDPRContactDesc"));
 print '</td><td>';
-print '<input name="MAIN_INFO_GDPR" id="infodirector" class="minwidth500" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_GDPR).'"></td></tr>';
+print '<input name="MAIN_INFO_GDPR" id="infodirector" class="minwidth500" value="'.dol_escape_htmltag((GETPOSTISSET("MAIN_INFO_GDPR") ? GETPOST("MAIN_INFO_GDPR", 'nohtml') : (!empty($conf->global->MAIN_INFO_GDPR) ? $conf->global->MAIN_INFO_GDPR : ''))).'"></td></tr>';
 
 // Capital
 print '<tr class="oddeven"><td><label for="capital">'.$langs->trans("Capital").'</label></td><td>';
-print '<input name="capital" id="capital" class="maxwidth100" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_CAPITAL).'"></td></tr>';
+print '<input name="capital" id="capital" class="maxwidth100" value="'.dol_escape_htmltag((GETPOSTISSET('capital') ? GETPOST('capital', 'nohtml') : (!empty($conf->global->MAIN_INFO_CAPITAL) ? $conf->global->MAIN_INFO_CAPITAL : ''))).'"></td></tr>';
 
 // Juridical Status
 print '<tr class="oddeven"><td><label for="forme_juridique_code">'.$langs->trans("JuridicalStatus").'</label></td><td>';
diff --git a/htdocs/admin/company_socialnetworks.php b/htdocs/admin/company_socialnetworks.php
index 5cbdb948b4a..93c6739d37d 100644
--- a/htdocs/admin/company_socialnetworks.php
+++ b/htdocs/admin/company_socialnetworks.php
@@ -117,11 +117,11 @@ foreach ($listofnetworks as $key => $value) {
 		$networkconstname = 'MAIN_INFO_SOCIETE_'.strtoupper($key).'_URL';
 		$networkconstid = 'MAIN_INFO_SOCIETE_'.strtoupper($key);
 		print '<td><span class="fa paddingright '.($value['icon'] ? $value['icon'] : 'fa-link').'"></span>';
-		print '<input name="'.$key.'url" id="'.$key.'url" class="minwidth300" value="'.dol_escape_htmltag($conf->global->$networkconstname).'">';
+		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="'.dol_escape_htmltag($conf->global->$networkconstid).'">';
+		print '<input name="'.$key.'" id="'.$key.'" class="minwidth300" value="'.(!empty($conf->global->$networkconstid) ? dol_escape_htmltag($conf->global->$networkconstid) : '').'">';
 		print '</td>';
-		print '<td>'.dol_print_socialnetworks($conf->global->$networkconstid, 0, 0, $key, $listofnetworks).'</td>';
+		print '<td>'.dol_print_socialnetworks((!empty($conf->global->$networkconstid) ? dol_escape_htmltag($conf->global->$networkconstid) : ''), 0, 0, $key, $listofnetworks).'</td>';
 		print '</tr>'."\n";
 	}
 }
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index b5e4c0ddf45..05330e92b89 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -57,7 +57,7 @@ if ($action == 'updateMask')
 	$maskvalue = GETPOST('maskcontract', 'alpha');
 	if ($maskconst) $res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index 8f005c0f0d7..4008a3cd7be 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -172,13 +172,13 @@ $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>';
-$message .= img_picto('', 'globe').' '.$langs->trans("WebDavServer", 'WebDAV', $url);
+$message .= img_picto('', 'globe').' '.str_replace('{url}', $url, $langs->trans("WebDavServer", 'WebDAV', '{url}'));
 $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>';
-	$message .= img_picto('', 'globe').' '.$langs->trans("WebDavServer", 'WebDAV public', $url);
+	$message .= img_picto('', 'globe').' '.str_replace('{url}', $url, $langs->trans("WebDavServer", 'WebDAV public', '{url}'));
 	$message .= '<br>';
 }
 print $message;
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 789762830e3..ae9427d70e0 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -72,9 +72,9 @@ $hookmanager->initHooks(array('admindefaultvalues', 'globaladmin'));
  */
 
 if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && !empty($massaction) && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
 
-$parameters = array('socid'=>$socid);
+$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');
 
@@ -186,7 +186,7 @@ llxHeader('', $langs->trans("Setup"), $wikihelp);
 
 $param = '&mode='.$mode;
 
-$enabledisablehtml .= $langs->trans("EnableDefaultValues").' ';
+$enabledisablehtml = $langs->trans("EnableDefaultValues").' ';
 if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))
 {
 	// Button off, click to enable
@@ -213,7 +213,7 @@ if ($defaultkey)      $param .= '&defaultkey='.urlencode($defaultkey);
 if ($defaultvalue)    $param .= '&defaultvalue='.urlencode($defaultvalue);
 
 
-print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && $debug) ? '?debug=1' : '').'" method="POST">';
+print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && !empty($debug)) ? '?debug=1' : '').'" method="POST">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index d605f75c511..90ea5f290b6 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -33,129 +33,131 @@ $langs->load("admin");
 if (!$user->admin) accessforbidden();
 
 $action = GETPOST('action', 'aZ09');
+if (empty($action)) $action = 'edit';
 
+// Define list of managed delays
 $modules = array(
-		'agenda' => array(
-				array(
-						'code' => 'MAIN_DELAY_ACTIONS_TODO',
-						'img' => 'action'
-				)
-		),
-		'projet' => array(
-				array(
-						'code' => 'MAIN_DELAY_PROJECT_TO_CLOSE',
-						'img' => 'project'
-				),
-				array(
-						'code' => 'MAIN_DELAY_TASKS_TODO',
-						'img' => 'projecttask'
-				)
-		),
-		'propal' => array(
-				array(
-						'code' => 'MAIN_DELAY_PROPALS_TO_CLOSE',
-						'img' => 'propal'
-				),
-				array(
-						'code' => 'MAIN_DELAY_PROPALS_TO_BILL',
-						'img' => 'propal'
-				)
-		),
-		'commande' => array(
-				array(
-						'code' => 'MAIN_DELAY_ORDERS_TO_PROCESS',
-						'img' => 'order'
-				)
-		),
-		'facture' => array(
-				array(
-						'code' => 'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',
-						'img' => 'bill'
-				)
-		),
-		'fournisseur' => array(
-				array(
-						'code' => 'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',
-						'img' => 'order'
-				),
-				array(
-						'code' => 'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',
-						'img' => 'bill'
-				)
-		),
-		'service' => array(
-				array(
-						'code' => 'MAIN_DELAY_NOT_ACTIVATED_SERVICES',
-						'img' => 'service'
-				),
-				array(
-						'code' => 'MAIN_DELAY_RUNNING_SERVICES',
-						'img' => 'service'
-				)
-		),
-		'banque' => array(
-				array(
-						'code' => 'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',
-						'img' => 'account'
-				),
-				array(
-						'code' => 'MAIN_DELAY_CHEQUES_TO_DEPOSIT',
-						'img' => 'account'
-				)
-		),
-		'adherent' => array(
-				array(
-						'code' => 'MAIN_DELAY_MEMBERS',
-						'img' => 'user'
-				)
-		),
-		'expensereport' => array(
-				array(
-						'code' => 'MAIN_DELAY_EXPENSEREPORTS',
-						'img' => 'trip'
-				),
-				/* TODO Enable this
-		        array(
-    		        'code' => 'MAIN_DELAY_EXPENSEREPORTS_TO_PAY',
-    		        'img' => 'trip'
-    		    )*/
-		),
-		'holiday' => array(
-			array(
-				'code' => 'MAIN_DELAY_HOLIDAYS',
-				'img' => 'holiday'
-			),
-		),
+    'agenda' => array(
+        array(
+            'code' => 'MAIN_DELAY_ACTIONS_TODO',
+            'img' => 'action'
+        )
+    ),
+    'projet' => array(
+        array(
+            'code' => 'MAIN_DELAY_PROJECT_TO_CLOSE',
+            'img' => 'project'
+        ),
+        array(
+            'code' => 'MAIN_DELAY_TASKS_TODO',
+            'img' => 'projecttask'
+        )
+    ),
+    'propal' => array(
+        array(
+            'code' => 'MAIN_DELAY_PROPALS_TO_CLOSE',
+            'img' => 'propal'
+        ),
+        array(
+            'code' => 'MAIN_DELAY_PROPALS_TO_BILL',
+            'img' => 'propal'
+        )
+    ),
+    'commande' => array(
+        array(
+            'code' => 'MAIN_DELAY_ORDERS_TO_PROCESS',
+            'img' => 'order'
+        )
+    ),
+    'facture' => array(
+        array(
+            'code' => 'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',
+            'img' => 'bill'
+        )
+    ),
+    'fournisseur' => array(
+        array(
+            'code' => 'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',
+            'img' => 'order'
+        ),
+        array(
+            'code' => 'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',
+            'img' => 'bill'
+        )
+    ),
+    'service' => array(
+        array(
+            'code' => 'MAIN_DELAY_NOT_ACTIVATED_SERVICES',
+            'img' => 'service'
+        ),
+        array(
+            'code' => 'MAIN_DELAY_RUNNING_SERVICES',
+            'img' => 'service'
+        )
+    ),
+    'banque' => array(
+        array(
+            'code' => 'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',
+            'img' => 'account'
+        ),
+        array(
+            'code' => 'MAIN_DELAY_CHEQUES_TO_DEPOSIT',
+            'img' => 'account'
+        )
+    ),
+    'adherent' => array(
+        array(
+            'code' => 'MAIN_DELAY_MEMBERS',
+            'img' => 'user'
+        )
+    ),
+    'expensereport' => array(
+        array(
+            'code' => 'MAIN_DELAY_EXPENSEREPORTS',
+            'img' => 'trip'
+        ),
+        /* TODO Enable this
+         array(
+         'code' => 'MAIN_DELAY_EXPENSEREPORTS_TO_PAY',
+         'img' => 'trip'
+         )*/
+    ),
+    'holiday' => array(
+        array(
+            'code' => 'MAIN_DELAY_HOLIDAYS',
+            'img' => 'holiday'
+        ),
+    ),
 );
 
 $labelmeteo = array(0=>$langs->trans("No"), 1=>$langs->trans("Yes"), 2=>$langs->trans("OnMobileOnly"));
 
 if (!isset($conf->global->MAIN_DELAY_PROJECT_TO_CLOSE)) {
-	$conf->global->MAIN_DELAY_PROJECT_TO_CLOSE = 7; // Must be same value than into conf.class.php
+    $conf->global->MAIN_DELAY_PROJECT_TO_CLOSE = 7; // Must be same value than into conf.class.php
 }
 if (!isset($conf->global->MAIN_DELAY_TASKS_TODO)) {
-	$conf->global->MAIN_DELAY_TASKS_TODO = 7; // Must be same value than into conf.class.php
+    $conf->global->MAIN_DELAY_TASKS_TODO = 7; // Must be same value than into conf.class.php
 }
 if (!isset($conf->global->MAIN_DELAY_MEMBERS)) {
-	$conf->global->MAIN_DELAY_MEMBERS = 0; // Must be same value than into conf.class.php
+    $conf->global->MAIN_DELAY_MEMBERS = 0; // Must be same value than into conf.class.php
 }
 if (!isset($conf->global->MAIN_DELAY_ACTIONS_TODO)) {
-	$conf->global->MAIN_DELAY_ACTIONS_TODO = 7; // Must be same value than into conf.class.php
+    $conf->global->MAIN_DELAY_ACTIONS_TODO = 7; // Must be same value than into conf.class.php
 }
 if (!isset($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS)) {
-	$conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
+    $conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
 }
 if (!isset($conf->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS)) {
-	$conf->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS = 7;
+    $conf->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS = 7;
 }
 if (!isset($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS)) {
-	$conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
+    $conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
 }
 if (!isset($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS)) {
-	$conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
+    $conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
 }
 if (!isset($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS)) {
-	$conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
+    $conf->global->MAIN_DELAY_ORDERS_TO_PROCESS = 2;
 }
 
 
@@ -166,30 +168,34 @@ if (!isset($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS)) {
 
 if ($action == 'update')
 {
-	foreach ($modules as $module => $delays)
-	{
-		if (!empty($conf->$module->enabled))
-		{
-			foreach ($delays as $delay)
-			{
-				if (GETPOST($delay['code']) != '')
-				{
-					dolibarr_set_const($db, $delay['code'], GETPOST($delay['code']), 'chaine', 0, '', $conf->entity);
-				}
-			}
-		}
-	}
+    foreach ($modules as $module => $delays)
+    {
+        if (!empty($conf->$module->enabled))
+        {
+            foreach ($delays as $delay)
+            {
+                if (GETPOST($delay['code']) != '')
+                {
+                    dolibarr_set_const($db, $delay['code'], GETPOST($delay['code']), 'chaine', 0, '', $conf->entity);
+                }
+            }
+        }
+    }
 
-	dolibarr_set_const($db, "MAIN_DISABLE_METEO", $_POST["MAIN_DISABLE_METEO"], 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_USE_METEO_WITH_PERCENTAGE", GETPOST("MAIN_USE_METEO_WITH_PERCENTAGE"), 'chaine', 0, '', $conf->entity);
+    dolibarr_set_const($db, "MAIN_DISABLE_METEO", $_POST["MAIN_DISABLE_METEO"], 'chaine', 0, '', $conf->entity);
+    dolibarr_set_const($db, "MAIN_USE_METEO_WITH_PERCENTAGE", GETPOST("MAIN_USE_METEO_WITH_PERCENTAGE"), 'chaine', 0, '', $conf->entity);
 
-	// For update value with percentage
-	$plus = '';
-	if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $plus = '_PERCENTAGE';
-	// Update values
-	for ($i = 0; $i < 4; $i++) {
-		if (GETPOSTISSET('MAIN_METEO'.$plus.'_LEVEL'.$i)) dolibarr_set_const($db, 'MAIN_METEO'.$plus.'_LEVEL'.$i, GETPOST('MAIN_METEO'.$plus.'_LEVEL'.$i, 'int'), 'chaine', 0, '', $conf->entity);
-	}
+    // For update value with percentage
+    $plus = '';
+    if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $plus = '_PERCENTAGE';
+    // Update values
+    for ($i = 0; $i < 4; $i++) {
+        if (GETPOSTISSET('MAIN_METEO'.$plus.'_LEVEL'.$i)) dolibarr_set_const($db, 'MAIN_METEO'.$plus.'_LEVEL'.$i, GETPOST('MAIN_METEO'.$plus.'_LEVEL'.$i, 'int'), 'chaine', 0, '', $conf->entity);
+    }
+
+	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+
+	$action = 'edit';
 }
 
 
@@ -209,156 +215,156 @@ print "<br>\n";
 
 if ($action == 'edit')
 {
-	print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" name="form_index">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="update">';
+    print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" name="form_index">';
+    print '<input type="hidden" name="token" value="'.newToken().'">';
+    print '<input type="hidden" name="action" value="update">';
 
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
+    print '<table class="noborder centpercent">';
+    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
 
-	foreach ($modules as $module => $delays)
-	{
-		if (!empty($conf->$module->enabled))
-		{
-			foreach ($delays as $delay)
-			{
-				$value = (!empty($conf->global->{$delay['code']}) ? $conf->global->{$delay['code']}:0);
-				print '<tr class="oddeven">';
-				print '<td width="20px">'.img_object('', $delay['img']).'</td>';
-				print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td><td class="nowraponall">';
-				print '<input class="right maxwidth75" type="number" name="'.$delay['code'].'" value="'.$value.'"> '.$langs->trans("days").'</td></tr>';
-			}
-		}
-	}
+    foreach ($modules as $module => $delays)
+    {
+        if (!empty($conf->$module->enabled))
+        {
+            foreach ($delays as $delay)
+            {
+                $value = (!empty($conf->global->{$delay['code']}) ? $conf->global->{$delay['code']}:0);
+                print '<tr class="oddeven">';
+                print '<td width="20px">'.img_object('', $delay['img']).'</td>';
+                print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td><td class="nowraponall">';
+                print '<input class="right maxwidth75" type="number" name="'.$delay['code'].'" value="'.$value.'"> '.$langs->trans("days").'</td></tr>';
+            }
+        }
+    }
 
-	print '</table>';
+    print '</table>';
 
-	print '<br>';
+    print '<br>';
 
-	// Show if meteo is enabled
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
+    // Show if meteo is enabled
+    print '<table class="noborder centpercent">';
+    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
 
-	print '<tr class="oddeven">';
-	print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td class="center">';
-	print $form->selectarray('MAIN_DISABLE_METEO', $labelmeteo, (empty($conf->global->MAIN_DISABLE_METEO) ? 0 : $conf->global->MAIN_DISABLE_METEO));
-	print '</td></tr>';
+    print '<tr class="oddeven">';
+    print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td class="center">';
+    print $form->selectarray('MAIN_DISABLE_METEO', $labelmeteo, (empty($conf->global->MAIN_DISABLE_METEO) ? 0 : $conf->global->MAIN_DISABLE_METEO));
+    print '</td></tr>';
 
-	print '</table>';
+    print '</table>';
 } else {
-	/*
+    /*
      * Show parameters
      */
 
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
+    print '<table class="noborder centpercent">';
+    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
 
-	foreach ($modules as $module => $delays)
-	{
-		if (!empty($conf->$module->enabled))
-		{
-			foreach ($delays as $delay)
-			{
-				$value = (!empty($conf->global->{$delay['code']}) ? $conf->global->{$delay['code']}:0);
-				print '<tr class="oddeven">';
-				print '<td width="20px">'.img_object('', $delay['img']).'</td>';
-				print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td>';
-				print '<td class="right">'.$value.' '.$langs->trans("days").'</td></tr>';
-			}
-		}
-	}
+    foreach ($modules as $module => $delays)
+    {
+        if (!empty($conf->$module->enabled))
+        {
+            foreach ($delays as $delay)
+            {
+                $value = (!empty($conf->global->{$delay['code']}) ? $conf->global->{$delay['code']}:0);
+                print '<tr class="oddeven">';
+                print '<td width="20px">'.img_object('', $delay['img']).'</td>';
+                print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td>';
+                print '<td class="right">'.$value.' '.$langs->trans("days").'</td></tr>';
+            }
+        }
+    }
 
-	print '</table>';
+    print '</table>';
 
-	print '<br>';
+    print '<br>';
 
-	// Show if meteo is enabled
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
+    // Show if meteo is enabled
+    print '<table class="noborder centpercent">';
+    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
 
-	print '<tr class="oddeven">';
-	print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td class="center">';
-	print $labelmeteo[$conf->global->MAIN_DISABLE_METEO];
-	print '</td></tr>';
+    print '<tr class="oddeven">';
+    print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td class="center">';
+    print $labelmeteo[$conf->global->MAIN_DISABLE_METEO];
+    print '</td></tr>';
 
-	print '</table>';
+    print '</table>';
 }
 
 print '<br>';
 
 
 if ($conf->global->MAIN_DISABLE_METEO != 1) {
-	// Show logo for weather
-	print '<span class="opacitymedium">'.$langs->trans("DescWeather").'</span> ';
+    // Show logo for weather
+    print '<span class="opacitymedium">'.$langs->trans("DescWeather").'</span> ';
 
-	if ($action == 'edit') {
-		$str_mode_std = $langs->trans('MeteoStdModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->transnoentitiesnoconv('MeteoPercentageMod'));
-		$str_mode_percentage = $langs->trans('MeteoPercentageModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->transnoentitiesnoconv('MeteoStdMod'));
-		if (empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $str_mode_enabled = $str_mode_std;
-		else $str_mode_enabled = $str_mode_percentage;
-		print '<a href="#" onclick="return false;" id="change_mode">'.$str_mode_enabled.'</a>';
-		print '<input type="hidden" id="MAIN_USE_METEO_WITH_PERCENTAGE" name="MAIN_USE_METEO_WITH_PERCENTAGE" value="'.$conf->global->MAIN_USE_METEO_WITH_PERCENTAGE.'" />';
+    if ($action == 'edit') {
+        $str_mode_std = $langs->trans('MeteoStdModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->transnoentitiesnoconv('MeteoPercentageMod'));
+        $str_mode_percentage = $langs->trans('MeteoPercentageModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->transnoentitiesnoconv('MeteoStdMod'));
+        if (empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $str_mode_enabled = $str_mode_std;
+        else $str_mode_enabled = $str_mode_percentage;
+        print '<a href="#" onclick="return false;" id="change_mode">'.$str_mode_enabled.'</a>';
+        print '<input type="hidden" id="MAIN_USE_METEO_WITH_PERCENTAGE" name="MAIN_USE_METEO_WITH_PERCENTAGE" value="'.$conf->global->MAIN_USE_METEO_WITH_PERCENTAGE.'" />';
 
-		print '<br><br>';
-	} else {
-		if (empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) print $langs->trans('MeteoStdModEnabled');
-		else print $langs->trans('MeteoPercentageModEnabled');
-		print '<br><br>';
-	}
+        print '<br><br>';
+    } else {
+        if (empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) print $langs->trans('MeteoStdModEnabled');
+        else print $langs->trans('MeteoPercentageModEnabled');
+        print '<br><br>';
+    }
 
-	$offset = 0;
-	$cursor = 10; // By default
-	//if (! empty($conf->global->MAIN_METEO_OFFSET)) $offset=$conf->global->MAIN_METEO_OFFSET;
-	//if (! empty($conf->global->MAIN_METEO_GAP)) $cursor=$conf->global->MAIN_METEO_GAP;
-	$level0 = $offset; if (!empty($conf->global->MAIN_METEO_LEVEL0)) $level0 = $conf->global->MAIN_METEO_LEVEL0;
-	$level1 = $offset + 1 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL1)) $level1 = $conf->global->MAIN_METEO_LEVEL1;
-	$level2 = $offset + 2 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL2)) $level2 = $conf->global->MAIN_METEO_LEVEL2;
-	$level3 = $offset + 3 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL3)) $level3 = $conf->global->MAIN_METEO_LEVEL3;
-	$text = ''; $options = 'class="valignmiddle" height="60px"';
+    $offset = 0;
+    $cursor = 10; // By default
+    //if (! empty($conf->global->MAIN_METEO_OFFSET)) $offset=$conf->global->MAIN_METEO_OFFSET;
+    //if (! empty($conf->global->MAIN_METEO_GAP)) $cursor=$conf->global->MAIN_METEO_GAP;
+    $level0 = $offset; if (!empty($conf->global->MAIN_METEO_LEVEL0)) $level0 = $conf->global->MAIN_METEO_LEVEL0;
+    $level1 = $offset + 1 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL1)) $level1 = $conf->global->MAIN_METEO_LEVEL1;
+    $level2 = $offset + 2 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL2)) $level2 = $conf->global->MAIN_METEO_LEVEL2;
+    $level3 = $offset + 3 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL3)) $level3 = $conf->global->MAIN_METEO_LEVEL3;
+    $text = ''; $options = 'class="valignmiddle" height="60px"';
 
 
-	if ($action == 'edit') {
-		print '<div id="standard" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '' : 'style="display:none;"').'>';
+    if ($action == 'edit') {
+        print '<div id="standard" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '' : 'style="display:none;"').'>';
 
-		print '<div>';
-		print '<div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 0, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL0" value="'.$level0.'"/></td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 1, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL1" value="'.$level1.'"/></td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 2, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL2" value="'.$level2.'"/></td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 3, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL3" value="'.$level3.'"/></td>';
-		print '</div>';
-		print '</div>';
+        print '<div>';
+        print '<div class="inline-block" style="padding-right: 20px">';
+        print img_weather($text, 0, $options);
+        print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL0" value="'.$level0.'"/></td>';
+        print '</div><div class="inline-block" style="padding-right: 20px">';
+        print img_weather($text, 1, $options);
+        print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL1" value="'.$level1.'"/></td>';
+        print '</div><div class="inline-block" style="padding-right: 20px">';
+        print img_weather($text, 2, $options);
+        print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL2" value="'.$level2.'"/></td>';
+        print '</div><div class="inline-block" style="padding-right: 20px">';
+        print img_weather($text, 3, $options);
+        print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL3" value="'.$level3.'"/></td>';
+        print '</div>';
+        print '</div>';
 
-		print '</div>';
+        print '</div>';
 
-		print '<div id="percentage" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'style="display:none;"' : '').'>';
+        print '<div id="percentage" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'style="display:none;"' : '').'>';
 
-		print '<div>';
-		print '<div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 0, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL0" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'"/>&nbsp;%</td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 1, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL1" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'"/>&nbsp;%</td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 2, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL2" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'"/>&nbsp;%</td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 3, $options);
-		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL3" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'"/>&nbsp;%</td>';
-		print '</div>';
-		print '</div>';
+        print '<div>';
+        print '<div class="inline-block" style="padding-right: 20px">';
+        print img_weather($text, 0, $options);
+        print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL0" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'"/>&nbsp;%</td>';
+        print '</div><div class="inline-block" style="padding-right: 20px">';
+        print img_weather($text, 1, $options);
+        print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL1" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'"/>&nbsp;%</td>';
+        print '</div><div class="inline-block" style="padding-right: 20px">';
+        print img_weather($text, 2, $options);
+        print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL2" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'"/>&nbsp;%</td>';
+        print '</div><div class="inline-block" style="padding-right: 20px">';
+        print img_weather($text, 3, $options);
+        print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL3" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'"/>&nbsp;%</td>';
+        print '</div>';
+        print '</div>';
 
-		print '</div>';
+        print '</div>';
 
-		?>
+        ?>
 
 		<script type="text/javascript">
 
diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php
index b1606268205..9b9060aa054 100644
--- a/htdocs/admin/delivery.php
+++ b/htdocs/admin/delivery.php
@@ -58,7 +58,7 @@ if ($action == 'updateMask')
 	$maskdelivery = GETPOST('maskdelivery', 'alpha');
 	if ($maskconstdelivery)  $res = dolibarr_set_const($db, $maskconstdelivery, $maskdelivery, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -73,7 +73,7 @@ if ($action == 'set_DELIVERY_FREE_TEXT')
 	$free = GETPOST('DELIVERY_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
 	$res = dolibarr_set_const($db, "DELIVERY_FREE_TEXT", $free, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 0d812d70009..af4c2aa348e 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -236,7 +236,7 @@ $tabsqlsort[3] = "country ASC, code ASC";
 $tabsqlsort[4] = "code ASC";
 $tabsqlsort[5] = "label ASC";
 $tabsqlsort[6] = "a.type ASC, a.module ASC, a.position ASC, a.code ASC";
-$tabsqlsort[7] = "country ASC, code ASC, a.libelle ASC";
+$tabsqlsort[7] = "c.label ASC, a.code ASC, a.libelle ASC";
 $tabsqlsort[8] = "country DESC,".(!empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? ' t.position ASC,' : '')." libelle ASC";
 $tabsqlsort[9] = "label ASC";
 $tabsqlsort[10] = "country ASC, code ASC, taux ASC, recuperableonly ASC, localtax1 ASC, localtax2 ASC";
@@ -621,6 +621,7 @@ if ($id == 11)
 		// 'contract' => $langs->trans('Contract'),
 		'project' => $langs->trans('Project'),
 		'project_task' => $langs->trans('Task'),
+        'ticket' => $langs->trans('Ticket'),
 		'agenda' => $langs->trans('Agenda'),
 		'dolresource' => $langs->trans('Resource'),
 		// old deprecated
@@ -798,11 +799,15 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 			$keycode = $listfieldvalue[$i];
 			if (empty($keycode)) $keycode = $value;
 
-			if ($value == 'price' || preg_match('/^amount/i', $value) || $value == 'taux') {
-				$_POST[$keycode] = price2num($_POST[$keycode], 'MU');
-			} elseif ($value == 'entity') {
-				$_POST[$keycode] = getEntity($tabname[$id]);
-			}
+            if ($value == 'price' || preg_match('/^amount/i', $value)) {
+            	$_POST[$keycode] = price2num(GETPOST($keycode), 'MU');
+            }
+            elseif ($value == 'taux' || $value == 'localtax1' || $value == 'localtax2') {
+            	$_POST[$keycode] = price2num(GETPOST($keycode), 8);
+            }
+            elseif ($value == 'entity') {
+            	$_POST[$keycode] = getEntity($tabname[$id]);
+            }
 
 			if ($i) $sql .= ",";
 
@@ -822,11 +827,11 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 		}
 		$sql .= ",1)";
 
-		dol_syslog("actionadd", LOG_DEBUG);
-		$result = $db->query($sql);
-		if ($result)	// Add is ok
-		{
-			setEventMessages($langs->transnoentities("RecordCreatedSuccessfully"), null, 'mesgs');
+        dol_syslog("actionadd", LOG_DEBUG);
+        $result = $db->query($sql);
+        if ($result)	// Add is ok
+        {
+            setEventMessages($langs->transnoentities("RecordCreatedSuccessfully"), null, 'mesgs');
 
 			// Clean $_POST array, we keep only id of dictionary
 			if ($id == 10 && GETPOST('country', 'int') > 0) {
@@ -861,11 +866,15 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
 			$keycode = $listfieldvalue[$i];
 			if (empty($keycode)) $keycode = $field;
 
-			if ($field == 'price' || preg_match('/^amount/i', $field) || $field == 'taux') {
-				$_POST[$keycode] = price2num($_POST[$keycode], 'MU');
-			} elseif ($field == 'entity') {
-				$_POST[$keycode] = getEntity($tabname[$id]);
-			}
+            if ($field == 'price' || preg_match('/^amount/i', $field)) {
+            	$_POST[$keycode] = price2num(GETPOST($keycode), 'MU');
+            }
+            elseif ($field == 'taux' || $field == 'localtax1' || $field == 'localtax2') {
+            	$_POST[$keycode] = price2num(GETPOST($keycode), 8);
+            }
+            elseif ($field == 'entity') {
+            	$_POST[$keycode] = getEntity($tabname[$id]);
+            }
 
 			if ($i) $sql .= ",";
 			$sql .= $field."=";
@@ -1068,6 +1077,7 @@ if ($id)
 	elseif ($search_code != '' && $id == 28)    $sql .= natural_search("h.code", $search_code);
 	elseif ($search_code != '' && $id == 32)    $sql .= natural_search("a.code", $search_code);
 	elseif ($search_code != '' && $id == 3)     $sql .= natural_search("r.code_region", $search_code);
+	elseif ($search_code != '' && $id == 7)     $sql .= natural_search("a.code", $search_code);
 	elseif ($search_code != '' && $id != 9)     $sql .= natural_search("code", $search_code);
 
 	if ($sortfield)
@@ -1106,7 +1116,6 @@ if ($id)
 	// Form to add a new line
 	if ($tabname[$id])
 	{
-		$alabelisused = 0;
 		$withentity = null;
 
 		$fieldlist = explode(',', $tabfield[$id]);
@@ -1213,7 +1222,6 @@ if ($id)
 				else $tdsoffields .= $valuetoshow;
 				$tdsoffields .= '</td>';
 			}
-			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
 		}
 
 		if ($id == 4) $tdsoffields .= '<td></td>';
@@ -1492,11 +1500,9 @@ if ($id)
 								continue;
 							}
 
-							if ($value == 'element')
-							{
+							if ($value == 'element') {
 								$valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
-							} elseif ($value == 'source')
-							{
+							} elseif ($value == 'source') {
 								$valuetoshow = isset($sourceList[$valuetoshow]) ? $sourceList[$valuetoshow] : $valuetoshow;
 							} elseif ($valuetoshow == 'all') {
 								$valuetoshow = $langs->trans('All');
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index e7149ece88d..9d3dfaaf09b 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -416,7 +416,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	if (function_exists('imap_open'))
 	{
-		$connectstringserver = $object->getConnectStringIMAP();
+		// Note: $object->host has been loaded by the fetch
+		$usessl = 1;
+
+		$connectstringserver = $object->getConnectStringIMAP($usessl);
 
 		try {
 			if ($sourcedir) {
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 61688e18515..ad04e09ffd1 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -61,7 +61,7 @@ if ($action == 'updateMask') {
 		$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
 	}
 
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 00dcb7c3180..c5b8262c4be 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -66,7 +66,7 @@ if ($action == 'updateMask')
 	if ($maskconstcredit)  $res = dolibarr_set_const($db, $maskconstcredit, $maskcredit, 'chaine', 0, '', $conf->entity);
 	if ($maskconstdeposit)  $res = dolibarr_set_const($db, $maskconstdeposit, $maskdeposit, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -156,7 +156,7 @@ elseif ($action == 'setdoc')
 	$res = dolibarr_set_const($db, "FACTURE_RIB_NUMBER", $rib, 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "FACTURE_CHQ_NUMBER", $chq, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -170,7 +170,7 @@ elseif ($action == 'setdoc')
 
 	$res = dolibarr_set_const($db, "FACTURE_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -184,7 +184,7 @@ elseif ($action == 'setdoc')
 
 	$res = dolibarr_set_const($db, "INVOICE_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -198,7 +198,7 @@ elseif ($action == 'setdoc')
 
 	$res = dolibarr_set_const($db, "FAC_FORCE_DATE_VALIDATION", $forcedate, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -217,7 +217,7 @@ elseif ($action == 'setdoc')
 		foreach ($invoicetypemodels as $type => $value)
 		{
 			$res = dolibarr_set_const($db, 'FACTURE_ADDON_PDF_'.intval($type), $value, 'chaine', 0, '', $conf->entity);
-			if (!$res > 0) $error++;
+			if (!($res > 0)) $error++;
 		}
 
 		if (!$error)
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index e3178d946a0..afe6bc2239c 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -58,7 +58,7 @@ if ($action == 'updateMask')
 	$maskvalue = GETPOST('maskvalue', 'alpha');
 	if ($maskconst) $res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -147,7 +147,7 @@ elseif ($action == 'setdoc')
 	$freetext = GETPOST('FICHINTER_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
 	$res = dolibarr_set_const($db, "FICHINTER_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -160,7 +160,7 @@ elseif ($action == 'setdoc')
 	$draft = GETPOST('FICHINTER_DRAFT_WATERMARK', 'alpha');
 	$res = dolibarr_set_const($db, "FICHINTER_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -173,7 +173,7 @@ elseif ($action == 'setdoc')
 	$val = GETPOST('FICHINTER_PRINT_PRODUCTS', 'alpha');
 	$res = dolibarr_set_const($db, "FICHINTER_PRINT_PRODUCTS", ($val == 'on' ? 1 : 0), 'bool', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -185,7 +185,7 @@ elseif ($action == 'setdoc')
 	$val = GETPOST('FICHINTER_USE_SERVICE_DURATION', 'alpha');
 	$res = dolibarr_set_const($db, "FICHINTER_USE_SERVICE_DURATION", ($val == 'on' ? 1 : 0), 'bool', 0, '', $conf->entity);
 
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
@@ -198,7 +198,7 @@ elseif ($action == 'setdoc')
 	$val = GETPOST('FICHINTER_WITHOUT_DURATION', 'alpha');
 	$res = dolibarr_set_const($db, "FICHINTER_WITHOUT_DURATION", ($val == 'on' ? 1 : 0), 'bool', 0, '', $conf->entity);
 
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
@@ -211,7 +211,7 @@ elseif ($action == 'setdoc')
 	$val = GETPOST('FICHINTER_DATE_WITHOUT_HOUR', 'alpha');
 	$res = dolibarr_set_const($db, "FICHINTER_DATE_WITHOUT_HOUR", ($val == 'on' ? 1 : 0), 'bool', 0, '', $conf->entity);
 
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index eca8319d661..d8de2dd847d 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -59,7 +59,7 @@ if ($action == 'updateMask')
 	$maskvalue = GETPOST('maskholiday', 'alpha');
 	if ($maskconst) $res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index 9132cc4b4d1..08c19091caa 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -163,7 +163,7 @@ if ($action == 'edit')
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
-	print '</td><td><input class="flat" name="'.$mainroundingruletot.'" size="3" value="'.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : $conf->global->MAIN_ROUNDING_RULE_TOT).'"></td></tr>';
+	print '</td><td><input class="flat" name="'.$mainroundingruletot.'" size="3" value="'.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : (!empty($conf->global->MAIN_ROUNDING_RULE_TOT) ? $conf->global->MAIN_ROUNDING_RULE_TOT : '')).'"></td></tr>';
 
 	print '</table>';
 
@@ -193,7 +193,7 @@ if ($action == 'edit')
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"), $langs->trans("ParameterActiveForNextInputOnly"));
-	print '</td><td align="right">'.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : $conf->global->MAIN_ROUNDING_RULE_TOT).'</td></tr>';
+	print '</td><td align="right">'.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : (!empty($conf->global->MAIN_ROUNDING_RULE_TOT) ? $conf->global->MAIN_ROUNDING_RULE_TOT : '')).'</td></tr>';
 
 	print '</table>';
 	print '</div>';
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 1c96ce68780..4ea5db1cecd 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -34,6 +34,7 @@ if (!$user->admin) accessforbidden();
 
 $action = GETPOST('action', 'aZ09');
 
+$form = new Form($db);
 
 
 /*
@@ -49,20 +50,23 @@ if ($action == 'setvalue')
 	$checkread = GETPOST('value', 'alpha');
 	$checkread_key = GETPOST('MAILING_EMAIL_UNSUBSCRIBE_KEY', 'alpha');
 	$mailingdelay = GETPOST('MAILING_DELAY', 'int');
+	$contactbulkdefault = GETPOST('MAILING_CONTACT_DEFAULT_BULK_STATUS', 'int');
 
 	$res = dolibarr_set_const($db, "MAILING_EMAIL_FROM", $mailfrom, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 	$res = dolibarr_set_const($db, "MAILING_EMAIL_ERRORSTO", $mailerror, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 	$res = dolibarr_set_const($db, "MAILING_DELAY", $mailingdelay, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
+	$res = dolibarr_set_const($db, "MAILING_CONTACT_DEFAULT_BULK_STATUS", $contactbulkdefault, 'chaine', 0, '', $conf->entity);
+	if (!($res > 0)) $error++;
 
 	// Create temporary encryption key if nedded
 	$res = dolibarr_set_const($db, "MAILING_EMAIL_UNSUBSCRIBE_KEY", $checkread_key, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
-	if (!$error)
-	{
+
+	if (!$error) {
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -70,7 +74,17 @@ if ($action == 'setvalue')
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
-
+if ($action == 'setonsearchandlistgooncustomerorsuppliercard') {
+	$setonsearchandlistgooncustomerorsuppliercard = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD", $setonsearchandlistgooncustomerorsuppliercard, 'yesno', 0, '', $conf->entity);
+	if (!($res > 0)) $error++;
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+}
 
 /*
  *	View
@@ -136,6 +150,16 @@ print '<input size="32" type="text" name="MAILING_EMAIL_UNSUBSCRIBE_KEY" id="MAI
 if (!empty($conf->use_javascript_ajax)) print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
 print '</td></tr>';
 
+// default blacklist from mailing
+print '<tr class="oddeven">';
+print '<td>' . $langs->trans("DefaultBlacklistMailingStatus") . '</td>';
+print '<td>';
+$blacklist_setting=array(0=>$langs->trans('No'),1=>$langs->trans('Yes'),-1=>$langs->trans('DefaultStatusEmptyMandatory'));
+print $form->selectarray("MAILING_CONTACT_DEFAULT_BULK_STATUS", $blacklist_setting, $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS);
+print '</td>';
+print '</tr>';
+
+
 if (!empty($conf->use_javascript_ajax) && $conf->global->MAIN_FEATURES_LEVEL >= 1) {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("MailAdvTargetRecipients").'</td><td>';
diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php
index 8070beab59b..3c9c634a8cd 100644
--- a/htdocs/admin/mailman.php
+++ b/htdocs/admin/mailman.php
@@ -59,7 +59,7 @@ if ($action == 'update' || $action == 'add')
 		$constnote = $_POST["constnote"][$key];
 		$res = dolibarr_set_const($db, $constname, $constvalue, $type[$consttype], 0, $constnote, $conf->entity);
 
-		if (!$res > 0) $error++;
+		if (!($res > 0)) $error++;
 	}
 
  	if (!$error)
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 5e32a637c8f..b0b18de20dc 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -532,6 +532,7 @@ if ($action == 'edit')
 	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
 	print "<br>\n";
 
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
@@ -552,10 +553,12 @@ if ($action == 'edit')
 	}
 
 	print '</table>';
+	print '</div>';
 
 	if (empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {
 		print '<br>';
 
+		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td></td></tr>';
 
@@ -663,6 +666,7 @@ if ($action == 'edit')
 		}
 
 		print '</table>';
+		print '</div>';
 
 		if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {
 			print info_admin($langs->trans("WarningPHPMail").'<br>'.$langs->trans("WarningPHPMailA").'<br>'.$langs->trans("WarningPHPMailB").'<br>'.$langs->trans("WarningPHPMailC").'<br><br>'.$langs->trans("WarningPHPMailD"), 0, 0, 'warning');
@@ -670,13 +674,15 @@ if ($action == 'edit')
 
 		print '<br>';
 
+		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("OtherOptions").'</td><td></td></tr>';
 
 		// From
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM", ini_get('sendmail_from') ?ini_get('sendmail_from') : $langs->transnoentities("Undefined")).'</td>';
 		print '<td>'.$conf->global->MAIN_MAIL_EMAIL_FROM;
-		if (!empty($conf->global->MAIN_MAIL_EMAIL_FROM) && !isValidEmail($conf->global->MAIN_MAIL_EMAIL_FROM)) print img_warning($langs->trans("ErrorBadEMail"));
+		if (empty($conf->global->MAIN_MAIL_EMAIL_FROM)) print img_warning($langs->trans("Mandatory"));
+		elseif (!isValidEmail($conf->global->MAIN_MAIL_EMAIL_FROM)) print img_warning($langs->trans("ErrorBadEMail"));
 		print '</td></tr>';
 
 		// Default from type
@@ -746,6 +752,7 @@ if ($action == 'edit')
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ENABLED_USER_DEST_SELECT").'</td><td>'.yn($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT).'</td></tr>';
 
 		print '</table>';
+		print '</div>';
 	}
 
 	print dol_get_fiche_end();
@@ -761,7 +768,7 @@ if ($action == 'edit')
 		{
 			if (function_exists('fsockopen') && $port && $server)
 			{
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testconnect#formmailbeforetitle">'.$langs->trans("DoTestServerAvailability").'</a>';
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testconnect&date='.dol_now().'#formmailaftertstconnect">'.$langs->trans("DoTestServerAvailability").'</a>';
 			}
 		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("FeatureNotAvailableOnLinux").'">'.$langs->trans("DoTestServerAvailability").'</a>';
@@ -837,6 +844,7 @@ if ($action == 'edit')
 	// Run the test to connect
 	if ($action == 'testconnect')
 	{
+		print '<div id="formmailaftertstconnect" name="formmailaftertstconnect"></div>';
 		print load_fiche_titre($langs->trans("DoTestServerAvailability"));
 
 		include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
@@ -851,6 +859,7 @@ if ($action == 'edit')
 			}
 
 			setEventMessages($errormsg, null, 'errors');
+			print $errormsg;
 		}
 		print '<br>';
 	}
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index f182fb39cbd..8945daa23f8 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -290,6 +290,11 @@ if ($action == 'create') {
 
 	// Id
 	$parent_rowid = GETPOST('menuId', 'int');
+	$parent_mainmenu = '';
+	$parent_leftmenu = '';
+	$parent_langs = '';
+	$parent_level = '';
+
 	if (GETPOST('menuId', 'int')) {
 		$sql = "SELECT m.rowid, m.mainmenu, m.leftmenu, m.level, m.langs FROM ".MAIN_DB_PREFIX."menu as m WHERE m.rowid = ".GETPOST('menuId', 'int');
 		$res = $db->query($sql);
@@ -328,8 +333,8 @@ if ($action == 'create') {
 	} else {
 		print '<select name="type" class="flat" id="topleft">';
 		print '<option value="">&nbsp;</option>';
-		print '<option value="top"'.($_POST["type"] && $_POST["type"] == 'top' ? ' selected' : '').'>'.$langs->trans('Top').'</option>';
-		print '<option value="left"'.($_POST["type"] && $_POST["type"] == 'left' ? ' selected' : '').'>'.$langs->trans('Left').'</option>';
+		print '<option value="top"'.(!empty($_POST["type"]) && $_POST["type"] == 'top' ? ' selected' : '').'>'.$langs->trans('Top').'</option>';
+		print '<option value="left"'.(!empty($_POST["type"]) && $_POST["type"] == 'left' ? ' selected' : '').'>'.$langs->trans('Left').'</option>';
 		print '</select>';
 	}
 	print '</td><td>'.$langs->trans('DetailType').'</td></tr>';
@@ -370,8 +375,8 @@ if ($action == 'create') {
 
 	// Target
 	print '<tr><td>'.$langs->trans('Target').'</td><td><select class="flat" name="target">';
-	print '<option value=""'.($menu->target == "" ? ' selected' : '').'>&nbsp;</option>';
-	print '<option value="_blank"'.($menu->target == "_blank" ? ' selected' : '').'>'.$langs->trans('_blank').'</option>';
+	print '<option value=""'.(isset($menu->target) && $menu->target == "" ? ' selected' : '').'>&nbsp;</option>';
+	print '<option value="_blank"'.(isset($menu->target) && $menu->target == "_blank" ? ' selected' : '').'>'.$langs->trans('_blank').'</option>';
 	print '</select></td></td><td>'.$langs->trans('DetailTarget').'</td></tr>';
 
 	// Enabled
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index a1ebb21838b..045332bb2d9 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -367,7 +367,7 @@ if ($conf->use_javascript_ajax)
 	$remainingdata = array();
 	foreach ($data as $datar)
 	{
-		if (empty($datar['rowid']) || $tree_recur_alreadyadded[$datar['rowid']]) continue;
+		if (empty($datar['rowid']) || !empty($tree_recur_alreadyadded[$datar['rowid']])) continue;
 		$remainingdata[] = $datar;
 	}
 
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 472777ee898..e6a85894fc4 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -472,22 +472,22 @@ if ($nbofactivatedmodules <= 1) {
 print load_fiche_titre($langs->trans("ModulesSetup"), '', 'title_setup');
 
 // Start to show page
+$deschelp  = '';
 if ($mode == 'common' || $mode == 'commonkanban') {
 	$desc = $langs->trans("ModulesDesc", '{picto}');
 	$desc = str_replace('{picto}', img_picto('', 'switch_off'), $desc);
-	print '<span class="opacitymedium hideonsmartphone">'.$desc."<br><br></span>\n";
+	$deschelp = '<span class="opacitymedium hideonsmartphone">'.$desc."<br><br></span>\n";
 }
 if ($mode == 'marketplace') {
-	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesMarketPlaceDesc")."<br><br></span>\n";
+	$deschelp = '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesMarketPlaceDesc")."<br><br></span>\n";
 }
 if ($mode == 'deploy') {
-	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."<br><br></span>\n";
+	$deschelp = '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))."<br><br></span>\n";
 }
 if ($mode == 'develop') {
-	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDevelopDesc")."<br><br></span>\n";
+	$deschelp = '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModulesDevelopDesc")."<br><br></span>\n";
 }
 
-
 $head = modules_prepare_head();
 
 
@@ -495,17 +495,25 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 	dol_set_focus('#search_keyword');
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') {
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	if (isset($optioncss) && $optioncss != '') {
 		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	}
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="page" value="'.$page.'">';
+	if (isset($sortfield) && $sortfield != '') {
+	    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	}
+	if (isset($sortorder) && $sortorder != '') {
+	    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	}
+	if (isset($page) && $page != '') {
+	    print '<input type="hidden" name="page" value="'.$page.'">';
+	}
 	print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 	print dol_get_fiche_head($head, 'modules', '', -1);
 
+	print $deschelp;
+
 	$moreforfilter = '<div class="valignmiddle">';
 
 	$moreforfilter .= '<div class="floatright right pagination"><ul><li>';
@@ -517,10 +525,10 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 
 	$moreforfilter .= '<div class="colorbacktimesheet float valignmiddle">';
 	$moreforfilter .= '<div class="divsearchfield paddingtop">';
-	$moreforfilter .= $langs->trans('Keyword').': <input type="text" id="search_keyword" name="search_keyword" class="maxwidth100" value="'.dol_escape_htmltag($search_keyword).'">';
+	$moreforfilter .= img_picto($langs->trans("Filter"), 'filter', 'class="paddingright opacitymedium"').'<input type="text" id="search_keyword" name="search_keyword" class="maxwidth100" value="'.dol_escape_htmltag($search_keyword).'" placeholder="'.dol_escape_htmltag($langs->trans('Keyword')).'">';
 	$moreforfilter .= '</div>';
 	$moreforfilter .= '<div class="divsearchfield paddingtop">';
-	$moreforfilter .= $langs->trans('Origin').': '.$form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth200', 1);
+	$moreforfilter .= $form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), $langs->trans('Origin'), 0, 0, '', 0, 0, 0, '', 'maxwidth200', 1);
 	$moreforfilter .= '</div>';
 	if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
 		$array_version = array('stable'=>$langs->transnoentitiesnoconv("Stable"));
@@ -534,11 +542,11 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 			$array_version['development'] = $langs->trans("Development");
 		}
 		$moreforfilter .= '<div class="divsearchfield paddingtop">';
-		$moreforfilter .= $langs->trans('Version').': '.$form->selectarray('search_version', $array_version, $search_version, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
+		$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 .= $langs->trans('Status').': '.$form->selectarray('search_status', array('active'=>$langs->transnoentitiesnoconv("Enabled"), 'disabled'=>$langs->transnoentitiesnoconv("Disabled")), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
+	$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">';
@@ -931,6 +939,10 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 if ($mode == 'marketplace') {
 	print dol_get_fiche_head($head, $mode, '', -1);
 
+	print $deschelp;
+
+	print '<br>';
+
 	// Marketplace
 	print '<div class="div-table-responsive-no-min">';
 	print '<table summary="list_of_modules" class="noborder centpercent">'."\n";
@@ -971,8 +983,8 @@ if ($mode == 'marketplace') {
 		?>
 					<input type="hidden" name="token" value="<?php echo newToken(); ?>">
 					<input type="hidden" name="mode" value="marketplace">
-					<div class="divsearchfield"><?php echo $langs->trans('Keyword') ?>:
-						<input name="search_keyword" placeholder="<?php echo $langs->trans('Chercher un module') ?>" id="search_keyword" type="text" size="50" value="<?php echo $options['search'] ?>"><br>
+					<div class="divsearchfield">
+						<input name="search_keyword" placeholder="<?php echo $langs->trans('Keyword') ?>" id="search_keyword" type="text" size="50" value="<?php echo $options['search'] ?>"><br>
 					</div>
 					<div class="divsearchfield">
 						<input class="button buttongen" value="<?php echo $langs->trans('Rechercher') ?>" type="submit">
@@ -999,7 +1011,7 @@ if ($mode == 'marketplace') {
 			<div id="listing-content">
 				<table summary="list_of_modules" id="list_of_modules" class="productlist centpercent">
 					<tbody id="listOfModules">
-						<?php echo $dolistore->get_products($categorie); ?>
+						<?php echo $dolistore->get_products(!empty($categorie) ? $categorie: ''); ?>
 					</tbody>
 				</table>
 			</div>
@@ -1014,6 +1026,8 @@ if ($mode == 'marketplace') {
 if ($mode == 'deploy') {
 	print dol_get_fiche_head($head, $mode, '', -1);
 
+	print $deschelp;
+
 	$dolibarrdataroot = preg_replace('/([\\/]+)$/i', '', DOL_DATA_ROOT);
 	$allowonlineinstall = true;
 	$allowfromweb = 1;
@@ -1080,28 +1094,36 @@ if ($mode == 'deploy') {
 			$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
@@ -1176,6 +1198,10 @@ if ($mode == 'deploy') {
 if ($mode == 'develop') {
 	print dol_get_fiche_head($head, $mode, '', -1);
 
+	print $deschelp;
+
+	print '<br>';
+
 	// Marketplace
 	print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\n";
 	print "<tr class=\"liste_titre\">\n";
diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index af6210eee1f..a5ae9d15e63 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -53,7 +53,7 @@ if ($action == 'updateMask')
 
 	if ($maskconstmrp) $res = dolibarr_set_const($db, $maskconstmrp, $maskmrp, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -142,7 +142,7 @@ elseif ($action == 'setdoc')
 	$draft = GETPOST("MRP_MO_DRAFT_WATERMARK");
 	$res = dolibarr_set_const($db, "MRP_MO_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -156,7 +156,7 @@ elseif ($action == 'setdoc')
 
 	$res = dolibarr_set_const($db, "MRP_MO_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
diff --git a/htdocs/admin/openinghours.php b/htdocs/admin/openinghours.php
index c3cbcb3d0ae..ec805f33281 100644
--- a/htdocs/admin/openinghours.php
+++ b/htdocs/admin/openinghours.php
@@ -57,6 +57,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 
 	if ($action != 'updateedit' && !$error)
 	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
@@ -95,37 +96,37 @@ 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="'.($conf->global->MAIN_INFO_OPENINGHOURS_MONDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_MONDAY : GETPOST("monday", 'alpha')).'"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"').'></td></tr>'."\n";
+	print '<input name="monday" id="monday" class="minwidth100" value="'.(!empty($conf->global->MAIN_INFO_OPENINGHOURS_MONDAY) ? $conf->global->MAIN_INFO_OPENINGHOURS_MONDAY : GETPOST("monday", 'alpha')).'"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"').'></td></tr>'."\n";
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Tuesday"), $langs->trans("OpeningHoursFormatDesc"));
 	print '</td><td>';
-	print '<input name="tuesday" id="tuesday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_TUESDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_TUESDAY : GETPOST("tuesday", 'alpha')).'"></td></tr>'."\n";
+	print '<input name="tuesday" id="tuesday" class="minwidth100" value="'.(!empty($conf->global->MAIN_INFO_OPENINGHOURS_TUESDAY) ? $conf->global->MAIN_INFO_OPENINGHOURS_TUESDAY : GETPOST("tuesday", 'alpha')).'"></td></tr>'."\n";
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Wednesday"), $langs->trans("OpeningHoursFormatDesc"));
 	print '</td><td>';
-	print '<input name="wednesday" id="wednesday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_WEDNESDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_WEDNESDAY : GETPOST("wednesday", 'alpha')).'"></td></tr>'."\n";
+	print '<input name="wednesday" id="wednesday" class="minwidth100" value="'.(!empty($conf->global->MAIN_INFO_OPENINGHOURS_WEDNESDAY) ? $conf->global->MAIN_INFO_OPENINGHOURS_WEDNESDAY : GETPOST("wednesday", 'alpha')).'"></td></tr>'."\n";
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Thursday"), $langs->trans("OpeningHoursFormatDesc"));
 	print '</td><td>';
-	print '<input name="thursday" id="thursday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_THURSDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_THURSDAY : GETPOST("thursday", 'alpha')).'"></td></tr>'."\n";
+	print '<input name="thursday" id="thursday" class="minwidth100" value="'.(!empty($conf->global->MAIN_INFO_OPENINGHOURS_THURSDAY) ? $conf->global->MAIN_INFO_OPENINGHOURS_THURSDAY : GETPOST("thursday", 'alpha')).'"></td></tr>'."\n";
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Friday"), $langs->trans("OpeningHoursFormatDesc"));
 	print '</td><td>';
-	print '<input name="friday" id="friday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_FRIDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_FRIDAY : GETPOST("friday", 'alpha')).'"></td></tr>'."\n";
+	print '<input name="friday" id="friday" class="minwidth100" value="'.(!empty($conf->global->MAIN_INFO_OPENINGHOURS_FRIDAY) ? $conf->global->MAIN_INFO_OPENINGHOURS_FRIDAY : GETPOST("friday", 'alpha')).'"></td></tr>'."\n";
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Saturday"), $langs->trans("OpeningHoursFormatDesc"));
 	print '</td><td>';
-	print '<input name="saturday" id="saturday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_SATURDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_SATURDAY : GETPOST("saturday", 'alpha')).'"></td></tr>'."\n";
+	print '<input name="saturday" id="saturday" class="minwidth100" value="'.(!empty($conf->global->MAIN_INFO_OPENINGHOURS_SATURDAY) ? $conf->global->MAIN_INFO_OPENINGHOURS_SATURDAY : GETPOST("saturday", 'alpha')).'"></td></tr>'."\n";
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Sunday"), $langs->trans("OpeningHoursFormatDesc"));
 	print '</td><td>';
-	print '<input name="sunday" id="sunday" class="minwidth100" value="'.($conf->global->MAIN_INFO_OPENINGHOURS_SUNDAY ? $conf->global->MAIN_INFO_OPENINGHOURS_SUNDAY : GETPOST("sunday", 'alpha')).'"></td></tr>'."\n";
+	print '<input name="sunday" id="sunday" class="minwidth100" value="'.(!empty($conf->global->MAIN_INFO_OPENINGHOURS_SUNDAY) ? $conf->global->MAIN_INFO_OPENINGHOURS_SUNDAY : GETPOST("sunday", 'alpha')).'"></td></tr>'."\n";
 
 	print '</table>';
 
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index 378e1b4fe68..d27096df8f9 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -51,7 +51,7 @@ if ($action == 'updateMask')
 	$maskpayment = GETPOST('maskpayment', 'alpha');
 	if ($maskconstpayment) $res = dolibarr_set_const($db, $maskconstpayment, $maskpayment, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if (!$error)
 	{
@@ -70,10 +70,10 @@ if ($action == 'setparams')
 {
 	$freetext = GETPOST('FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS', 'restricthtml'); // No alpha here, we want exact string
 	$res = dolibarr_set_const($db, "FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS", $freetext, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	$res = dolibarr_set_const($db, "PAYMENTS_REPORT_GROUP_BY_MOD", GETPOST('PAYMENTS_REPORT_GROUP_BY_MOD', 'int'), 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if ($error)
 	{
@@ -157,9 +157,7 @@ foreach ($dirmodels as $reldir)
 						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
 						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
-						if ($module->isEnabled())
-						{
-							$var = !$var;
+						if ($module->isEnabled()) {
 							print '<tr class="oddeven"><td width="100">';
 							echo preg_replace('/\-.*$/', '', preg_replace('/mod_payment_/', '', preg_replace('/\.php$/', '', $file)));
 							print "</td><td>\n";
diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php
index a21b2aa6e1d..cea40f9f840 100644
--- a/htdocs/admin/paymentbybanktransfer.php
+++ b/htdocs/admin/paymentbybanktransfer.php
@@ -50,10 +50,9 @@ if ($action == "set")
 
 	$id = GETPOST('PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT', 'int');
 	$account = new Account($db);
-	if ($account->fetch($id) > 0)
-	{
+	if ($account->fetch($id) > 0) {
 		$res = dolibarr_set_const($db, "PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT", $id, 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) $error++;
+		if (!($res > 0)) $error++;
 		/*
         $res = dolibarr_set_const($db, "PRELEVEMENT_CODE_BANQUE", $account->code_banque,'chaine',0,'',$conf->entity);
         if (! $res > 0) $error++;
@@ -70,32 +69,35 @@ if ($action == "set")
         $res = dolibarr_set_const($db, "PRELEVEMENT_RAISON_SOCIALE", $account->proprio,'chaine',0,'',$conf->entity);
         if (! $res > 0) $error++;
         */
-	} else $error++;
+	} else {
+		$error++;
+	}
 	/* Moved to account
 	$res = dolibarr_set_const($db, "PAYMENTBYBANKTRANSFER_ICS", GETPOST("PAYMENTBYBANKTRANSFER_ICS"), 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 	*/
+
 	if (GETPOST("PAYMENTBYBANKTRANSFER_USER") > 0)
 	{
 		$res = dolibarr_set_const($db, "PAYMENTBYBANKTRANSFER_USER", GETPOST("PAYMENTBYBANKTRANSFER_USER"), 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) $error++;
+		if (!($res > 0)) $error++;
 	}
 	/*
 	if (GETPOST("PAYMENTBYBANKTRANSFER_END_TO_END") || GETPOST("PAYMENTBYBANKTRANSFER_END_TO_END") == "")
 	{
 		$res = dolibarr_set_const($db, "PAYMENTBYBANKTRANSFER_END_TO_END", GETPOST("PAYMENTBYBANKTRANSFER_END_TO_END"), 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) $error++;
+		if (!($res > 0)) $error++;
 	}
 	if (GETPOST("PAYMENTBYBANKTRANSFER_USTRD") || GETPOST("PAYMENTBYBANKTRANSFER_USTRD") == "")
 	{
 		$res = dolibarr_set_const($db, "PAYMENTBYBANKTRANSFER_USTRD", GETPOST("PAYMENTBYBANKTRANSFER_USTRD"), 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) $error++;
+		if (!($res > 0)) $error++;
 	}
 	*/
 	if (GETPOST("PAYMENTBYBANKTRANSFER_ADDDAYS") || GETPOST("PAYMENTBYBANKTRANSFER_ADDDAYS") == "")
 	{
 		$res = dolibarr_set_const($db, "PAYMENTBYBANKTRANSFER_ADDDAYS", GETPOST("PAYMENTBYBANKTRANSFER_ADDDAYS"), 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) $error++;
+		if (!($res > 0)) $error++;
 	} elseif (!$error)
 	{
 		$db->commit();
@@ -279,9 +281,7 @@ foreach ($dirmodels as $reldir)
                             if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
                             if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
 
-                            if ($modulequalified)
-                            {
-                                $var = !$var;
+                            if ($modulequalified) {
                                 print '<tr class="oddeven"><td width="100">';
                                 print (empty($module->name)?$name:$module->name);
                                 print "</td><td>\n";
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 16a1c42ddaa..008e5277bc3 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -161,7 +161,7 @@ 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>';
 
-$selected = $conf->global->MAIN_PDF_FORMAT;
+$selected = (isset($conf->global->MAIN_PDF_FORMAT) ? $conf->global->MAIN_PDF_FORMAT : '');
 if (empty($selected)) $selected = dol_getDefaultFormat();
 
 // Show pdf format
@@ -320,13 +320,13 @@ print '</td></tr>';
 
 
 print '<tr class="oddeven"><td>'.$langs->trans("ShowDetailsInPDFPageFoot").'</td><td>';
-print $form->selectarray('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS', $arraydetailsforpdffoot, $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS);
+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>';
 
 print '<tr class="oddeven"><td>'.$langs->trans("PDF_USE_ALSO_LANGUAGE_CODE").'</td><td>';
 //if (! empty($conf->global->MAIN_MULTILANGS))
 //{
-print $formadmin->select_language(GETPOSTISSET('PDF_USE_ALSO_LANGUAGE_CODE') ? GETPOST('PDF_USE_ALSO_LANGUAGE_CODE') : $conf->global->PDF_USE_ALSO_LANGUAGE_CODE, 'PDF_USE_ALSO_LANGUAGE_CODE', 0, null, 1);
+print $formadmin->select_language(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), 'PDF_USE_ALSO_LANGUAGE_CODE', 0, null, 1);
 //} else {
 //	print '<span class="opacitymedium">'.$langs->trans("MultiLangNotEnabled").'</span>';
 //}
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 4905f4f2497..3d37b2a7c8a 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -166,7 +166,7 @@ if ($result)
 			if (is_object($modules[$obj->module]) && ($modules[$obj->module]->module_position > 0))
 			{
 				// TODO Define familyposition
-				$family = $modules[$obj->module]->family_position;
+			    $family = (!empty($modules[$obj->module]->family_position) ? $modules[$obj->module]->family_position : '');
 				$familyposition = 0;
 				$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX."rights_def SET module_position = ".$modules[$obj->module]->module_position.",";
 				$sqlupdate .= " family_position = ".$familyposition;
@@ -214,7 +214,7 @@ if ($result)
 			print '</tr>'."\n";
 		}
 
-		$perm_libelle = ($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $obj->label));
+		$perm_libelle = (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $obj->label));
 
 		print '<tr class="oddeven">';
 
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 1d6d35c8719..0e6f926cb10 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -55,7 +55,7 @@ if ($action == "set")
 	if ($account->fetch($id) > 0)
 	{
 		$res = dolibarr_set_const($db, "PRELEVEMENT_ID_BANKACCOUNT", $id, 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) $error++;
+		if (!($res > 0)) $error++;
 		/*
         $res = dolibarr_set_const($db, "PRELEVEMENT_CODE_BANQUE", $account->code_banque,'chaine',0,'',$conf->entity);
         if (! $res > 0) $error++;
@@ -75,21 +75,20 @@ if ($action == "set")
 	} else $error++;
 
 	/* Moved to account
-
 	$res = dolibarr_set_const($db, "PRELEVEMENT_ICS", GETPOST("PRELEVEMENT_ICS"), 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 	*/
 	if (GETPOST("PRELEVEMENT_USER") > 0) {
 		$res = dolibarr_set_const($db, "PRELEVEMENT_USER", GETPOST("PRELEVEMENT_USER"), 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) $error++;
+		if (!($res > 0)) $error++;
 	}
 	if (GETPOST("PRELEVEMENT_END_TO_END") || GETPOST("PRELEVEMENT_END_TO_END") == "") {
 		$res = dolibarr_set_const($db, "PRELEVEMENT_END_TO_END", GETPOST("PRELEVEMENT_END_TO_END"), 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) $error++;
+		if (!($res > 0)) $error++;
 	}
 	if (GETPOST("PRELEVEMENT_USTRD") || GETPOST("PRELEVEMENT_USTRD") == "") {
 		$res = dolibarr_set_const($db, "PRELEVEMENT_USTRD", GETPOST("PRELEVEMENT_USTRD"), 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) $error++;
+		if (!($res > 0)) $error++;
 	}
 
     $res = dolibarr_set_const($db, "PRELEVEMENT_ADDDAYS", GETPOST("PRELEVEMENT_ADDDAYS"), 'chaine', 0, '', $conf->entity);
@@ -288,9 +287,7 @@ foreach ($dirmodels as $reldir)
                             if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
                             if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
 
-                            if ($modulequalified)
-                            {
-                                $var = !$var;
+                            if ($modulequalified) {
                                 print '<tr class="oddeven"><td width="100">';
                                 print (empty($module->name)?$name:$module->name);
                                 print "</td><td>\n";
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 78c22e7b397..607d300c2e1 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -57,7 +57,7 @@ if ($action == 'updateMask') {
 	$maskpropal = GETPOST('maskpropal', 'alpha');
 	if ($maskconstpropal) $res = dolibarr_set_const($db, $maskconstpropal, $maskpropal, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -109,7 +109,7 @@ if ($action == 'updateMask') {
 	$res = dolibarr_set_const($db, "FACTURE_RIB_NUMBER", $rib, 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "FACTURE_CHQ_NUMBER", $chq, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if (!$error)
 	{
@@ -121,7 +121,7 @@ if ($action == 'updateMask') {
 	$draft = GETPOST('PROPALE_DRAFT_WATERMARK', 'alpha');
 
 	$res = dolibarr_set_const($db, "PROPALE_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -134,7 +134,7 @@ if ($action == 'updateMask') {
 
 	$res = dolibarr_set_const($db, "PROPOSAL_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -145,7 +145,7 @@ if ($action == 'updateMask') {
 } elseif ($action == 'setdefaultduration') {
 	$res = dolibarr_set_const($db, "PROPALE_VALIDITY_DURATION", $value, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -156,7 +156,7 @@ if ($action == 'updateMask') {
 } elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') {
 	$res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL", $value, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -383,9 +383,7 @@ foreach ($dirmodels as $reldir)
 							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
 							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
 
-							if ($modulequalified)
-							{
-								$var = !$var;
+							if ($modulequalified) {
 								print '<tr class="oddeven"><td width="100">';
 								print (empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
@@ -654,7 +652,7 @@ if ($conf->banque->enabled)
 {
 
     print '<tr class="oddeven"><td>';
-    print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").'</td><td>&nbsp</td><td class="right">';
+    print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").'</td><td>&nbsp;</td><td class="right">';
     if (! empty($conf->use_javascript_ajax))
     {
         print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL');
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index 0349f8a3435..9290a0459d0 100644
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -155,7 +155,7 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MAIN_PROXY_USE").'</td><td class="right">';
 print '</td>';
 print '<td class="nowrap">';
-print $form->selectyesno('MAIN_PROXY_USE', $conf->global->MAIN_PROXY_USE, 1);
+print $form->selectyesno('MAIN_PROXY_USE', (!empty($conf->global->MAIN_PROXY_USE) ? $conf->global->MAIN_PROXY_USE : 0), 1);
 print '</td>';
 print '</tr>';
 
@@ -164,7 +164,7 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MAIN_PROXY_HOST").'</td><td class="right">';
 print '</td>';
 print '<td class="nowrap">';
-print '<input class="flat" name="MAIN_PROXY_HOST" type="text" size="16" value="'.$conf->global->MAIN_PROXY_HOST.'">';
+print '<input class="flat" name="MAIN_PROXY_HOST" type="text" size="16" value="'.(!empty($conf->global->MAIN_PROXY_HOST) ? $conf->global->MAIN_PROXY_HOST : '').'">';
 print '</td>';
 print '</tr>';
 
@@ -173,7 +173,7 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MAIN_PROXY_PORT").'</td><td class="right">';
 print '</td>';
 print '<td class="nowrap">';
-print '<input class="flat" name="MAIN_PROXY_PORT" type="text" size="4" value="'.$conf->global->MAIN_PROXY_PORT.'">';
+print '<input class="flat" name="MAIN_PROXY_PORT" type="text" size="4" value="'.(!empty($conf->global->MAIN_PROXY_PORT) ? $conf->global->MAIN_PROXY_PORT : '').'">';
 print '</td>';
 print '</tr>';
 
@@ -182,7 +182,7 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MAIN_PROXY_USER").'</td><td class="right">';
 print '</td>';
 print '<td class="nowrap">';
-print '<input class="flat" name="MAIN_PROXY_USER" type="text" size="16" value="'.$conf->global->MAIN_PROXY_USER.'">';
+print '<input class="flat" name="MAIN_PROXY_USER" type="text" size="16" value="'.(!empty($conf->global->MAIN_PROXY_USER) ? $conf->global->MAIN_PROXY_USER : '').'">';
 print '</td>';
 print '</tr>';
 
@@ -191,7 +191,7 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MAIN_PROXY_PASS").'</td><td class="right">';
 print '</td>';
 print '<td class="nowrap">';
-print '<input class="flat" name="MAIN_PROXY_PASS" type="text" size="16" value="'.$conf->global->MAIN_PROXY_PASS.'">';
+print '<input class="flat" name="MAIN_PROXY_PASS" type="text" size="16" value="'.(!empty($conf->global->MAIN_PROXY_PASS) ? $conf->global->MAIN_PROXY_PASS : '').'">';
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index 3c878c5c664..31f2228d401 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -443,7 +443,6 @@ if ($mode == 'template' && $user->admin) {
 		print '<td><input size="50" type="text" name="templatename" value="'.$printer->listprinterstemplates[$line]['name'].'"></td>';
 		print '<td>';
 		print '<textarea name="template" wrap="soft" cols="120" rows="12">';
-		print GETPOSTISSET('template') ? GETPOST('template', 'alpha') : $printer->listprinterstemplates[$line]['template'];
 		print '</textarea>';
 		print '</td>';
 		print '<td></td>';
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 30085d3f1f1..86db4fab6e2 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -241,8 +241,8 @@ print '</tr>';
 foreach ($arrayhandler as $key => $module)
 {
 	// Show modules according to features level
-	if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-	if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+    if (!empty($module->version) && $module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+    if (!empty($module->version) && $module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
 
 	if ($module->isEnabled())
 	{
diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index ea5ea2983fd..d51ff3ae558 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -116,7 +116,7 @@ print '</tr>';
 print '<tr class="oddeven">';
 print '<td colspan="2">'.$langs->trans("MaxSizeForUploadedFiles").'.';
 $max = @ini_get('upload_max_filesize');
-if ($max) print ' '.$langs->trans("MustBeLowerThanPHPLimit", $max * 1024, $langs->trans("Kb")).'.';
+if (isset($max)) print ' '.$langs->trans("MustBeLowerThanPHPLimit", ((int) $max) * 1024, $langs->trans("Kb")).'.';
 else print ' '.$langs->trans("NoMaxSizeByPHPLimit").'.';
 print '</td>';
 print '<td class="nowrap">';
diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php
index 2fa111578a9..018fb70a80d 100644
--- a/htdocs/admin/spip.php
+++ b/htdocs/admin/spip.php
@@ -67,7 +67,7 @@ if ($action == 'update' || $action == 'add')
 
 			$res = dolibarr_set_const($db, $constname, $constvalue, $type[$consttype], 0, $constnote, $conf->entity);
 
-			if (!$res > 0) $error++;
+			if (!($res > 0)) $error++;
 		}
 
 	 	if (!$error)
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 031b0ef102f..fa4676bc6ce 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -96,7 +96,7 @@ if ($action == 'warehouse')
 	if ($value == -1 || empty($value) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) {
 		$res = dolibarr_del_const($db, "MAIN_DEFAULT_WAREHOUSE", $conf->entity);
 	}
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 }
 
 if ($action == 'specimen')
@@ -707,7 +707,15 @@ if (!empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
 	print "</td>\n";
 	print "</tr>\n";
 }
-
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("WarehouseAskWarehouseDuringPropal").'</td>';
+print '<td class="right">';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL');
+} else {
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL", $arrval, $conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL);
+}
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("WarehouseAskWarehouseDuringOrder").'</td>';
 print '<td class="right">';
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 86faa655687..b7a14a53541 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -65,7 +65,7 @@ if ($action == 'updateMask')
 	if ($maskconstinvoice)  $res = dolibarr_set_const($db, $maskconstinvoice, $maskinvoice, 'chaine', 0, '', $conf->entity);
 	if ($maskconstcredit)  $res = dolibarr_set_const($db, $maskconstcredit, $maskcredit, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if (!$error)
 	{
@@ -170,7 +170,7 @@ if ($action == 'set_SUPPLIER_INVOICE_FREE_TEXT')
 
 	$res = dolibarr_set_const($db, "SUPPLIER_INVOICE_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if (!$error)
 	{
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index e2433c5348b..543a6196469 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -63,7 +63,7 @@ if ($action == 'updateMask')
 
 	if ($maskconstorder)  $res = dolibarr_set_const($db, $maskconstorder, $maskvalue, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if (!$error)
 	{
@@ -194,7 +194,7 @@ elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER')
 {
 	$res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER", $value, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if (!$error)
 	{
@@ -485,7 +485,7 @@ if ($conf->banque->enabled)
 {
 
     print '<tr class="oddeven"><td>';
-    print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").'</td><td>&nbsp</td><td align="center">';
+    print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").'</td><td>&nbsp;</td><td align="center">';
     if (! empty($conf->use_javascript_ajax))
     {
         print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER');
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index 3408496de31..c0e0d650d90 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -52,7 +52,7 @@ if ($action == 'updateMask')
 	$masksupplierpayment = GETPOST('masksupplierpayment', 'alpha');
 	if ($maskconstsupplierpayment) $res = dolibarr_set_const($db, $maskconstsupplierpayment, $masksupplierpayment, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if (!$error)
 	{
@@ -136,7 +136,7 @@ elseif ($action == 'setdoc')
 } elseif ($action == 'setparams')
 {
 	   $res = dolibarr_set_const($db, "PAYMENTS_FOURN_REPORT_GROUP_BY_MOD", GETPOST('PAYMENTS_FOURN_REPORT_GROUP_BY_MOD', 'int'), 'chaine', 0, '', $conf->entity);
-	   if (!$res > 0) $error++;
+	   if (!($res > 0)) $error++;
 
 	if ($error)
 	   {
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 0855a41cf8f..9910f08b064 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -55,7 +55,7 @@ if ($action == 'updateMask')
 	$masksupplier_proposal = GETPOST('masksupplier_proposal', 'alpha');
 	if ($maskconstsupplier_proposal) $res = dolibarr_set_const($db, $maskconstsupplier_proposal, $masksupplier_proposal, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -111,7 +111,7 @@ if ($action == 'set_SUPPLIER_PROPOSAL_DRAFT_WATERMARK')
 	$draft = GETPOST('SUPPLIER_PROPOSAL_DRAFT_WATERMARK', 'alpha');
 
 	$res = dolibarr_set_const($db, "SUPPLIER_PROPOSAL_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -127,7 +127,7 @@ if ($action == 'set_SUPPLIER_PROPOSAL_FREE_TEXT')
 
 	$res = dolibarr_set_const($db, "SUPPLIER_PROPOSAL_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -141,7 +141,7 @@ if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL')
 {
 	$res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL", $value, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if (!$error)
 	{
@@ -511,7 +511,7 @@ print '</form>';
 if ($conf->banque->enabled)
 {
 	print '<tr class="oddeven"><td>';
-	print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp</td><td class="right">';
+	print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp;</td><td class="right">';
 	if (!empty($conf->use_javascript_ajax))
 	{
 		print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL');
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 45500843aed..c884e30da75 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -138,7 +138,7 @@ if ($action == 'setlevel')
 	$res = dolibarr_set_const($db, "SYSLOG_LEVEL", $level, 'chaine', 0, '', 0);
 	dol_syslog("admin/syslog: level ".$level);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if (!$error)
 	{
@@ -146,7 +146,7 @@ if ($action == 'setlevel')
 		$res = dolibarr_set_const($db, "SYSLOG_FILE_SAVES", $file_saves, 'chaine', 0, '', 0);
 		dol_syslog("admin/syslog: file saves  ".$file_saves);
 
-		if (!$res > 0) $error++;
+		if (!($res > 0)) $error++;
 	}
 
 	if (!$error)
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 1100b86f412..5e89d8ae683 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -73,7 +73,7 @@ print load_fiche_titre($title, '', 'title_setup');
 // Version
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
-print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Version").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
+print '<tr class="liste_titre"><td class="titlefieldcreate">'.$langs->trans("Version").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
 print '<tr class="oddeven"><td>'.$langs->trans("CurrentVersion").' ('.$langs->trans("Programs").')</td><td>'.DOL_VERSION;
 // If current version differs from last upgrade
 if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE))
@@ -139,7 +139,7 @@ print '<br>';
 // Session
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
-print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Session").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>'."\n";
+print '<tr class="liste_titre"><td class="titlefieldcreate">'.$langs->trans("Session").'</td><td colspan="2">'.$langs->trans("Value").'</td></tr>'."\n";
 print '<tr class="oddeven"><td>'.$langs->trans("SessionSavePath").'</td><td colspan="2">'.session_save_path().'</td></tr>'."\n";
 print '<tr class="oddeven"><td>'.$langs->trans("SessionName").'</td><td colspan="2">'.session_name().'</td></tr>'."\n";
 print '<tr class="oddeven"><td>'.$langs->trans("SessionId").'</td><td colspan="2">'.session_id().'</td></tr>'."\n";
@@ -180,7 +180,7 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
-	print '<td class="titlefield">'.$langs->trans("LanguageFilesCachedIntoShmopSharedMemory").'</td>';
+	print '<td class="titlefieldcreate">'.$langs->trans("LanguageFilesCachedIntoShmopSharedMemory").'</td>';
 	print '<td>'.$langs->trans("NbOfEntries").'</td>';
 	print '<td class="right">'.$langs->trans("Address").'</td>';
 	print '</tr>'."\n";
@@ -202,7 +202,7 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S
 // Localisation
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
-print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("LocalisationDolibarrParameters").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
+print '<tr class="liste_titre"><td class="titlefieldcreate">'.$langs->trans("LocalisationDolibarrParameters").'</td><td>'.$langs->trans("Value").'</td></tr>'."\n";
 print '<tr class="oddeven"><td>'.$langs->trans("LanguageBrowserParameter", "HTTP_ACCEPT_LANGUAGE").'</td><td>'.$_SERVER["HTTP_ACCEPT_LANGUAGE"].'</td></tr>'."\n";
 print '<tr class="oddeven"><td>'.$langs->trans("CurrentUserLanguage").'</td><td>'.$langs->getDefaultLang().'</td></tr>'."\n";
 // Thousands
@@ -222,7 +222,22 @@ if (($thousand != ',' && $thousand != '.') || ($thousand != ' '))
 	print "</tr>\n";
 }
 print '<tr class="oddeven"><td>&nbsp; => price(1234.56)</td><td>'.price(1234.56).'</td></tr>'."\n";
-// Timezone
+
+// Timezones
+
+// Database timezone
+if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
+{
+	print '<tr class="oddeven"><td>'.$langs->trans("MySQLTimeZone").' (database)</td><td>'; // Timezone server base
+	$sql = "SHOW VARIABLES where variable_name = 'system_time_zone'";
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$obj = $db->fetch_object($resql);
+		print $form->textwithtooltip($obj->Value, $langs->trans('TZHasNoEffect'), 2, 1, img_info(''));
+	}
+	print '</td></tr>'."\n";
+}
 $txt = $langs->trans("OSTZ").' (variable system TZ): '.(!empty($_ENV["TZ"]) ? $_ENV["TZ"] : $langs->trans("NotDefined")).'<br>'."\n";
 $txt .= $langs->trans("PHPTZ").' (date_default_timezone_get() / php.ini date.timezone): '.(getServerTimeZoneString()." / ".(ini_get("date.timezone") ? ini_get("date.timezone") : $langs->trans("NotDefined")))."<br>\n"; // date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
 $txt .= $langs->trans("Dolibarr constant MAIN_SERVER_TZ").': '.(empty($conf->global->MAIN_SERVER_TZ) ? $langs->trans("NotDefined") : $conf->global->MAIN_SERVER_TZ);
@@ -238,23 +253,10 @@ $val .= ' &nbsp; &nbsp; &nbsp; '.getServerTimeZoneString();
 $val .= ' &nbsp; &nbsp; &nbsp; '.$langs->trans("DaylingSavingTime").': '.($daylight === 'unknown' ? 'unknown' : ($a == $c ?yn($daylight) : yn(0).($daylight ? '  &nbsp; &nbsp; ('.$langs->trans('YesInSummer').')' : '')));
 print $form->textwithtooltip($val, $txt, 2, 1, img_info(''));
 print '</td></tr>'."\n"; // value defined in http://fr3.php.net/manual/en/timezones.europe.php
-print '<tr class="oddeven"><td>&nbsp; => '.$langs->trans("CurrentHour").'</td><td>'.dol_print_date(dol_now(), 'dayhour', 'tzserver').'</td></tr>'."\n";
+print '<tr class="oddeven"><td>&nbsp; => '.$langs->trans("CurrentHour").'</td><td>'.dol_print_date(dol_now('gmt'), 'dayhour', 'tzserver').'</td></tr>'."\n";
 print '<tr class="oddeven"><td>&nbsp; => dol_print_date(0,"dayhourtext")</td><td>'.dol_print_date(0, "dayhourtext").'</td>';
 print '<tr class="oddeven"><td>&nbsp; => dol_get_first_day(1970,1,false)</td><td>'.dol_get_first_day(1970, 1, false).' &nbsp; &nbsp; (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970, 1, false), 'dayhour').')</td>';
 print '<tr class="oddeven"><td>&nbsp; => dol_get_first_day(1970,1,true)</td><td>'.dol_get_first_day(1970, 1, true).' &nbsp; &nbsp; (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970, 1, true), 'dayhour').')</td>';
-// Database timezone
-if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
-{
-	print '<tr class="oddeven"><td>'.$langs->trans("MySQLTimeZone").' (database)</td><td>'; // Timezone server base
-	$sql = "SHOW VARIABLES where variable_name = 'system_time_zone'";
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$obj = $db->fetch_object($resql);
-		print $form->textwithtooltip($obj->Value, $langs->trans('TZHasNoEffect'), 2, 1, img_info(''));
-	}
-	print '</td></tr>'."\n";
-}
 // Client
 $tz = (int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst'];
 print '<tr class="oddeven"><td>'.$langs->trans("ClientTZ").'</td><td>'.($tz ? ($tz >= 0 ? '+' : '').$tz : '').' ('.($tz >= 0 ? '+' : '').($tz * 60 * 60).')';
@@ -265,7 +267,7 @@ else print yn(0);
 if (!empty($_SESSION['dol_dst_first'])) print ' &nbsp; &nbsp; ('.dol_print_date(dol_stringtotime($_SESSION['dol_dst_first']), 'dayhour', 'gmt').' - '.dol_print_date(dol_stringtotime($_SESSION['dol_dst_second']), 'dayhour', 'gmt').')';
 print '</td></tr>'."\n";
 print '</td></tr>'."\n";
-print '<tr class="oddeven"><td>&nbsp; => '.$langs->trans("ClientHour").'</td><td>'.dol_print_date(dol_now(), 'dayhour', 'tzuser').'</td></tr>'."\n";
+print '<tr class="oddeven"><td>&nbsp; => '.$langs->trans("ClientHour").'</td><td>'.dol_print_date(dol_now('gmt'), 'dayhour', 'tzuser').'</td></tr>'."\n";
 
 $filesystemencoding = ini_get("unicode.filesystem_encoding"); // Disponible avec PHP 6.0
 print '<tr class="oddeven"><td>'.$langs->trans("File encoding").' (php.ini unicode.filesystem_encoding)</td><td>'.$filesystemencoding.'</td></tr>'."\n";
@@ -340,7 +342,7 @@ $configfileparameters = array(
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print '<td class="titlefield">'.$langs->trans("Parameters").' ';
+print '<td class="titlefieldcreate">'.$langs->trans("Parameters").' ';
 print $langs->trans("ConfigurationFile").' ('.$conffiletoshowshort.')';
 print '</td>';
 print '<td>'.$langs->trans("Parameter").'</td>';
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index a94a78a9794..4ed21144346 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -264,7 +264,7 @@ if (!$error && $xml)
 				$out .= "</tr>\n";
 			}
 		} else {
-			$out .= '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+			$out .= '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		$out .= '</table>';
 		$out .= '</div>';
@@ -317,7 +317,7 @@ if (!$error && $xml)
 			$out .= '<td class="right"></td>'."\n";
 			$out .= "</tr>\n";
 		} else {
-			$out .= '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+			$out .= '<tr class="oddeven"><td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		$out .= '</table>';
 		$out .= '</div>';
@@ -370,12 +370,11 @@ if (!$error && $xml)
 			$out .= '<td class="right"></td>'."\n";
 			$out .= "</tr>\n";
 		} else {
-			$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+			$out .= '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		$out .= '</table>';
 		$out .= '</div>';
 
-
 		// Show warning
 		if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
 		{
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index 6d9e3574789..e589db3ca26 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -473,7 +473,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 $resql = $db->query($sql);
 if ($resql)
 {
-	$limitforoptim = 10000;
+	$limitforoptim = 100000;
 	$num = $db->num_rows($resql);
 	$obj = $db->fetch_object($resql);
 	$nb = $obj->nb;
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index cf38687f66f..ea628621bce 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -51,15 +51,39 @@ if (isset($title))
 
 // Check PHP setup is OK
 $maxphp = @ini_get('upload_max_filesize'); // In unknown
-if (preg_match('/k$/i', $maxphp)) $maxphp = $maxphp * 1;
-if (preg_match('/m$/i', $maxphp)) $maxphp = $maxphp * 1024;
-if (preg_match('/g$/i', $maxphp)) $maxphp = $maxphp * 1024 * 1024;
-if (preg_match('/t$/i', $maxphp)) $maxphp = $maxphp * 1024 * 1024 * 1024;
+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 = $maxphp2 * 1;
-if (preg_match('/m$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024;
-if (preg_match('/g$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024 * 1024;
-if (preg_match('/t$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024 * 1024 * 1024;
+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;
+}
 if ($maxphp > 0 && $maxphp2 > 0 && $maxphp > $maxphp2)
 {
 	$langs->load("errors");
@@ -69,13 +93,13 @@ if ($maxphp > 0 && $maxphp2 > 0 && $maxphp > $maxphp2)
 
 
 print '<table class="noborder centpercent">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 $ErrorPicturePath = "../../theme/eldy/img/error.png";
 $WarningPicturePath = "../../theme/eldy/img/warning.png";
 $OkayPicturePath = "../../theme/eldy/img/tick.png";
 
-print '<tr><td width="220">'.$langs->trans("Version").'</td><td>';
+print '<tr><td>'.$langs->trans("Version").'</td><td>';
 
 $arrayphpminversionerror = array(5, 5, 0);
 $arrayphpminversionwarning = array(5, 6, 0);
@@ -129,11 +153,8 @@ $loadedExtensions    = array_map('strtolower', get_loaded_extensions(false));
 
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print '<td width="200">'.$langs->trans("Extension").'</td>';
-//print '<td align="center">'.$langs->trans("EnabledInSetup").'</td>';
-print '<td align="center">'.$langs->trans("Loaded").'</td>';
-print '<td align="center">'.$langs->trans("FunctionTest").'</td>';
-print '<td>'.$langs->trans("Result").'</td>';
+print '<td class="titlefield">'.$langs->trans("Extension").'</td>';
+print '<td>'.$langs->trans("Test").'</td>';
 print '</tr>';
 
 $functions = ["mb_check_encoding"];
@@ -141,9 +162,6 @@ $name      = "MBString";
 
 print "<tr>";
 print "<td>".$name."</td>";
-//print getTableColumn($name, $activatedExtensions);
-print getTableColumn($name, $loadedExtensions);
-print getTableColumnFunction($functions);
 print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
 print "</tr>";
 
@@ -152,9 +170,6 @@ $name      = "JSON";
 
 print "<tr>";
 print "<td>".$name."</td>";
-//print getTableColumn($name, $activatedExtensions);
-print getTableColumn($name, $loadedExtensions);
-print getTableColumnFunction($functions);
 print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
 print "</tr>";
 
@@ -163,8 +178,6 @@ $name      = "GD";
 
 print "<tr>";
 print "<td>".$name."</td>";
-print getTableColumn($name, $loadedExtensions);
-print getTableColumnFunction($functions);
 print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
 print "</tr>";
 
@@ -173,8 +186,6 @@ $name      = "Curl";
 
 print "<tr>";
 print "<td>".$name."</td>";
-print getTableColumn($name, $loadedExtensions);
-print getTableColumnFunction($functions);
 print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
 print "</tr>";
 
@@ -185,8 +196,6 @@ if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@loc
 
 	print "<tr>";
 	print "<td>".$name."</td>";
-	print getTableColumn($name, $loadedExtensions);
-	print getTableColumnFunction($functions);
 	print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
 	print "</tr>";
 }
@@ -196,8 +205,6 @@ $name      = "IMAP";
 
 print "<tr>";
 print "<td>".$name."</td>";
-print getTableColumn($name, $loadedExtensions);
-print getTableColumnFunction($functions);
 print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
 print "</tr>";
 
@@ -206,8 +213,6 @@ $name      = "xDebug";
 
 print "<tr>";
 print "<td>".$name."</td>";
-print getTableColumn($name, $loadedExtensions);
-print getTableColumnFunction($functions);
 print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
 print "</tr>";
 
@@ -222,7 +227,7 @@ foreach ($phparray as $key => $value)
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder">';
 	print '<tr class="liste_titre">';
-	print '<td width="220px">'.$key.'</td>';
+	print '<td class="titlefield">'.$key.'</td>';
 	print '<td colspan="2">'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
 
@@ -269,69 +274,6 @@ llxFooter();
 $db->close();
 
 
-/**
- * Return a table column with a indicator (okay or warning), based on the given name and list
- *
- * @param string $name		The name to check inside the given list
- * @param array  $list      A list that should contains the given name
- *
- * @return string
- */
-function getTableColumn($name, array $list)
-{
-	global $langs;
-
-	$name = strtolower($name);
-	$html = "<td align='center'>";
-
-	if (in_array($name, $list))
-	{
-		if ($name == 'xdebug') $html .= '<img src="../../theme/eldy/img/warning.png" title="'.$langs->trans("ModuleActivated", "xdebug").'">';
-		else $html .= '<img src="../../theme/eldy/img/tick.png" title="Ok">';
-	} else {
-		if ($name == 'xdebug') $html .= yn(0);
-		else $html .= '<img src="../../theme/eldy/img/warning.png" title="Warning">';
-	}
-
-	$html .= "</td>";
-
-	return $html;
-}
-
-/**
- * Return a table column with a indicator (okay or warning), based on the given functions to check
- *
- * @param array $functions	A list with functions to check
- *
- * @return string
- */
-function getTableColumnFunction(array $functions)
-{
-	if (count($functions) < 1)
-	{
-		return "<td align='center'>-</td>";
-	}
-
-	$result = true;
-	$html   = "<td align='center'>";
-
-	foreach ($functions as $function)
-	{
-		$result = $result && function_exists($function);
-	}
-
-	if ($result)
-	{
-		$html .= '<img src="../../theme/eldy/img/tick.png" alt="Ok">';
-	} else {
-		$html .= '<img src="../../theme/eldy/img/warning.png" alt="Warning">';
-	}
-
-	$html .= "</td>";
-
-	return $html;
-}
-
 /**
  * Return a result column with a translated result text
  *
@@ -339,7 +281,6 @@ function getTableColumnFunction(array $functions)
  * @param array $activated		A list with all activated PHP extensions. Deprecated.
  * @param array $loaded			A list with all loaded PHP extensions
  * @param array $functions		A list with all PHP functions to check
- *
  * @return string
  */
 function getResultColumn($name, array $activated, array $loaded, array $functions)
@@ -347,6 +288,7 @@ function getResultColumn($name, array $activated, array $loaded, array $function
 	global $langs;
 
 	$result = true;
+
 	//$result = $result && in_array(strtolower($name), $activated);
 	$result = $result && in_array(strtolower($name), $loaded);
 
@@ -356,7 +298,29 @@ function getResultColumn($name, array $activated, array $loaded, array $function
 	}
 
 	$html = "<td>";
-	$html .= $result ? $langs->trans("PHPSupport", $name) : $langs->trans("ErrorPHPDoesNotSupport", $name);
+	if ($result) {
+		if (strtolower($name) == 'xdebug') $html .= img_warning($langs->trans("ModuleActivated", "xdebug"));
+		else $html .= img_picto($langs->trans("Ok"), 'tick');
+		if (in_array(strtolower($name), $loaded)) {
+			$html .= ' '.$langs->trans("Loaded").' - ';
+		} else {
+			//$html .= ' '.$langs->trans("NotLoaded").' - ';
+		}
+		if (strtolower($name) == 'xdebug') {
+			$html .= ' '.$langs->trans("ModuleActivated", "xdebug");
+		} else {
+			$html .= ' '.$langs->trans("PHPSupport", $name);
+		}
+	} else {
+		if (strtolower($name) == 'xdebug') $html .= yn(0).' - ';
+		else $html .= img_warning($langs->trans("ModuleActivated", "xdebug"));
+		if (in_array(strtolower($name), $loaded)) {
+			$html .= ' '.$langs->trans("Loaded").' - ';
+		} else {
+			//$html .= ' '.$langs->trans("NotLoaded").' - ';
+		}
+		$html .= ' '.$langs->trans("ErrorPHPDoesNotSupport", $name);
+	}
 	$html .= "</td>";
 
 	return $html;
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index f978c0dcd81..f0ada86a393 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -43,9 +43,6 @@ if (GETPOST('action', 'aZ09') == 'donothing')
  * View
  */
 
-$form = new Form($db);
-$nowstring = dol_print_date(dol_now(), 'dayhourlog');
-
 llxHeader();
 
 print load_fiche_titre($langs->trans("Security"), '', 'title_setup');
@@ -78,7 +75,7 @@ else {
 print '<br>';
 
 print '<br>';
-print load_fiche_titre($langs->trans("ConfigFile"), '', 'folder');
+print load_fiche_titre($langs->trans("ConfigurationFile"), '', 'folder');
 
 print '<strong>'.$langs->trans("dolibarr_main_prod").'</strong>: '.$dolibarr_main_prod;
 if (empty($dolibarr_main_prod)) {
@@ -90,7 +87,12 @@ print '<strong>'.$langs->trans("dolibarr_nocsrfcheck").'</strong>: '.$dolibarr_n
 if (!empty($dolibarr_nocsrfcheck)) {
 	print img_picto('', 'warning').' &nbsp;  '.$langs->trans("IfYouAreOnAProductionSetThis", 0);
 }
+print '<br>';
 
+print '<strong>'.$langs->trans("dolibarr_main_restrict_ip").'</strong>: '.$dolibarr_main_restrict_ip;
+/*if (empty($dolibarr_main_restrict_ip)) {
+	print ' &nbsp; '.img_picto('', 'warning').' '.$langs->trans("IfYouAreOnAProductionSetThis", 1);
+}*/
 print '<br>';
 
 print '<br>';
@@ -102,9 +104,17 @@ print '<strong>'.$langs->trans("PermissionsOnFilesInWebRoot").'</strong>: ';
 print 'TODO';
 print '<br>';
 
-print '<strong>'.$langs->trans("PermissionsOnFile", 'conf.php').'</strong>: ';
-// TODO Check permission on file conf.php (read only for the web user)
-print 'TODO';
+print '<strong>'.$langs->trans("PermissionsOnFile", $conffile).'</strong>: ';		// $conffile is defined into filefunc.inc.php
+$perms = fileperms($dolibarr_main_document_root.'/'.$conffile);
+if ($perms) {
+	if (($perms & 0x0004) || ($perms & 0x0002)) {
+		print img_warning().' '.$langs->trans("ConfFileIsReadableOrWritableByAnyUsers");
+	} else {
+		print img_picto('', 'tick');
+	}
+} else {
+	print img_warning().' '.$langs->trans("FailedToReadFile", $conffile);
+}
 print '<br>';
 
 print '<br>';
@@ -137,14 +147,15 @@ print '<br>';
 print load_fiche_titre($langs->trans("Menu").' '.$langs->trans("SecuritySetup"), '', 'folder');
 
 //print '<strong>'.$langs->trans("PasswordEncryption").'</strong>: ';
-print '<strong>MAIN_SECURITY_HASH_ALGO</strong> = '.(empty($conf->global->MAIN_SECURITY_HASH_ALGO) ? 'unset' : '')." &nbsp; ";
+print '<strong>MAIN_SECURITY_HASH_ALGO</strong> = '.(empty($conf->global->MAIN_SECURITY_HASH_ALGO) ? $langs->trans("Undefined") : '')." &nbsp; ";
 print '<span class="opacitymedium"> &nbsp; If unset: \'md5\'</span> ';
 print '<span class="opacitymedium"> - Recommanded value: \'password_hash\'</span><br>';
-print '<strong>MAIN_SECURITY_SALT</strong> = '.$conf->global->MAIN_SECURITY_SALT.'<br>';
+print '<strong>MAIN_SECURITY_SALT</strong> = '.(empty($conf->global->MAIN_SECURITY_SALT) ? $langs->trans("Undefined") : '').'<br>';
 print '<br>';
 // TODO
 
 print '<strong>'.$langs->trans("AntivirusEnabledOnUpload").'</strong>: ';
+print empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ? '' : img_picto('', 'tick').' ';
 print yn($conf->global->MAIN_ANTIVIRUS_COMMAND ? 1 : 0);
 if (!empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) {
 	print ' &nbsp; - '.$conf->global->MAIN_ANTIVIRUS_COMMAND;
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index 0963a264c52..4efc95061d4 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -65,7 +65,7 @@ if ($action == 'update') {
 	$db->begin();
 
 	$res = dolibarr_set_const($db, 'TAX_MODE', $tax_mode, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	switch ($tax_mode)
 	{
@@ -90,13 +90,13 @@ if ($action == 'update') {
 	}
 
 	$res = dolibarr_set_const($db, 'TAX_MODE_SELL_PRODUCT', $valuesellproduct, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 	$res = dolibarr_set_const($db, 'TAX_MODE_BUY_PRODUCT', $valuebuyproduct, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 	$res = dolibarr_set_const($db, 'TAX_MODE_SELL_SERVICE', $valuesellservice, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 	$res = dolibarr_set_const($db, 'TAX_MODE_BUY_SERVICE', $valuebuyservice, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	dolibarr_set_const($db, "MAIN_INFO_TVAINTRA", GETPOST("tva", 'alpha'), 'chaine', 0, '', $conf->entity);
 
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index f7e72f53e7e..690fee6a222 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -59,7 +59,7 @@ if ($action == 'updateMask') {
 		$res = dolibarr_set_const($db, $maskconstticket, $maskticket, 'chaine', 0, '', $conf->entity);
 	}
 
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
@@ -113,7 +113,7 @@ elseif ($action == 'setmod') {
 	} else {
 		$res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_EMAIL_FROM', '', 'chaine', 0, '', $conf->entity);
 	}
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
@@ -124,7 +124,7 @@ elseif ($action == 'setmod') {
 	} else {
 		$res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_EMAIL_TO', '', 'chaine', 0, '', $conf->entity);
 	}
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
@@ -134,7 +134,7 @@ elseif ($action == 'setmod') {
 	} else {
 		$res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_INTRO', $langs->trans('TicketMessageMailIntroText'), 'chaine', 0, '', $conf->entity);
 	}
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
@@ -144,7 +144,7 @@ elseif ($action == 'setmod') {
 	} else {
 		$res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_SIGNATURE', $langs->trans('TicketMessageMailSignatureText'), 'chaine', 0, '', $conf->entity);
 	}
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 }
@@ -152,13 +152,13 @@ elseif ($action == 'setmod') {
 if ($action == 'setvarother') {
 	$param_must_exists = GETPOST('TICKET_EMAIL_MUST_EXISTS', 'alpha');
 	$res = dolibarr_set_const($db, 'TICKET_EMAIL_MUST_EXISTS', $param_must_exists, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
 	$param_disable_email = GETPOST('TICKET_DISABLE_NOTIFICATION_MAILS', 'alpha');
 	$res = dolibarr_set_const($db, 'TICKET_DISABLE_NOTIFICATION_MAILS', $param_disable_email, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
@@ -166,7 +166,7 @@ if ($action == 'setvarother') {
 	{
 		$param_show_module_logo = GETPOST('TICKET_SHOW_MODULE_LOGO', 'alpha');
 		$res = dolibarr_set_const($db, 'TICKET_SHOW_MODULE_LOGO', $param_show_module_logo, 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) {
+		if (!($res > 0)) {
 			$error++;
 		}
 	}
@@ -175,20 +175,20 @@ if ($action == 'setvarother') {
 	{
 		$param_notification_also_main_addressemail = GETPOST('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', 'alpha');
 		$res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', $param_notification_also_main_addressemail, 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) {
+		if (!($res > 0)) {
 			$error++;
 		}
 	}
 
 	$param_limit_view = GETPOST('TICKET_LIMIT_VIEW_ASSIGNED_ONLY', 'alpha');
 	$res = dolibarr_set_const($db, 'TICKET_LIMIT_VIEW_ASSIGNED_ONLY', $param_limit_view, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
 	$param_auto_assign = GETPOST('TICKET_AUTO_ASSIGN_USER_CREATE', 'alpha');
 	$res = dolibarr_set_const($db, 'TICKET_AUTO_ASSIGN_USER_CREATE', $param_auto_assign, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 }
diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php
index 80f458a2b5c..2bbf620b3c6 100644
--- a/htdocs/admin/ticket_public.php
+++ b/htdocs/admin/ticket_public.php
@@ -63,7 +63,7 @@ if ($action == 'setvar') {
 	} else {
 		$res = dolibarr_set_const($db, 'TICKET_PUBLIC_INTERFACE_TOPIC', '', 'chaine', 0, '', $conf->entity);
 	}
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
@@ -73,7 +73,7 @@ if ($action == 'setvar') {
 	} else {
 		$res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HOME', $langs->trans('TicketPublicInterfaceTextHome'), 'chaine', 0, '', $conf->entity);
 	}
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
@@ -83,7 +83,7 @@ if ($action == 'setvar') {
 	} else {
 		$res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HELP_MESSAGE', $langs->trans('TicketPublicPleaseBeAccuratelyDescribe'), 'chaine', 0, '', $conf->entity);
 	}
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
@@ -93,7 +93,7 @@ if ($action == 'setvar') {
 	} else {
 		$res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_NEW', $langs->trans('TicketMessageMailNewText'), 'chaine', 0, '', $conf->entity);
 	}
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
@@ -103,13 +103,13 @@ if ($action == 'setvar') {
 	} else {
 		$res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', '', 'chaine', 0, '', $conf->entity);
 	}
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
 	$param_public_notification_new_message_default_email = GETPOST('TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL', 'alpha');
 	$res = dolibarr_set_const($db, 'TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL', $param_public_notification_new_message_default_email, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 }
@@ -117,25 +117,25 @@ if ($action == 'setvar') {
 if ($action == 'setvarother') {
 	$param_enable_public_interface = GETPOST('TICKET_ENABLE_PUBLIC_INTERFACE', 'alpha');
 	$res = dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', $param_enable_public_interface, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
 	$param_must_exists = GETPOST('TICKET_EMAIL_MUST_EXISTS', 'alpha');
 	$res = dolibarr_set_const($db, 'TICKET_EMAIL_MUST_EXISTS', $param_must_exists, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
 	$param_disable_email = GETPOST('TICKET_DISABLE_CUSTOMER_MAILS', 'alpha');
 	$res = dolibarr_set_const($db, 'TICKET_DISABLE_CUSTOMER_MAILS', $param_disable_email, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
    	$param_show_module_logo = GETPOST('TICKET_SHOW_COMPANY_LOGO', 'alpha');
    	$res = dolibarr_set_const($db, 'TICKET_SHOW_COMPANY_LOGO', $param_show_module_logo, 'chaine', 0, '', $conf->entity);
-   	if (!$res > 0) {
+   	if (!($res > 0)) {
 	   	$error++;
    	}
 
@@ -143,7 +143,7 @@ if ($action == 'setvarother') {
 	{
 		$param_notification_also_main_addressemail = GETPOST('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', 'alpha');
 		$res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', $param_notification_also_main_addressemail, 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) {
+		if (!($res > 0)) {
 			$error++;
 		}
 	}
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 0c3679c62fa..b2fd7f5c2ee 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -80,7 +80,7 @@ $_SESSION["commandbackuptorun"] = '';
 $_SESSION["commandbackupresult"] = '';
 
 // Increase limit of time. Works only if we are not in safe mode
-$ExecTimeLimit = 600;
+$ExecTimeLimit = 600;	// Set it to 0 to not use a forced time limit
 if (!empty($ExecTimeLimit))
 {
 	$err = error_reporting();
@@ -95,8 +95,6 @@ if (!empty($MemoryLimit))
 	@ini_set('memory_limit', $MemoryLimit);
 }
 
-$form = new Form($db);
-$formfile = new FormFile($db);
 
 //$help_url='EN:Backups|FR:Sauvegardes|ES:Copias_de_seguridad';
 //llxHeader('','',$help_url);
@@ -222,16 +220,7 @@ if ($errormsg)
 }
 
 
-/*
-$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").'<br>'.$langs->trans("ToBuildBackupFileClickHere",DOL_URL_ROOT.'/admin/tools/dolibarr_export.php')),0,$langs->trans("PreviousDumpFiles"));
-
-print '<br>';
-*/
-
 // Redirect to backup page
 header("Location: dolibarr_export.php".(GETPOST('page_y', 'int') ? '?page_y='.GETPOST('page_y', 'int') : ''));
 
-$time_end = time();
-
 $db->close();
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index c31f1c07093..dfaa8e576de 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -40,9 +40,9 @@ $transkey = GETPOST('transkey', 'alphanohtml');
 $transvalue = GETPOST('transvalue', 'restricthtml');
 
 
-$mode = GETPOST('mode', 'aZ09') ?GETPOST('mode', 'aZ09') : 'searchkey';
+$mode = GETPOST('mode', 'aZ09') ? GETPOST('mode', 'aZ09') : 'searchkey';
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -62,9 +62,9 @@ $hookmanager->initHooks(array('admintranslation', 'globaladmin'));
  */
 
 if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && !empty($massaction) && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
 
-$parameters = array('socid'=>$socid);
+$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');
 
@@ -217,14 +217,14 @@ print '<br>';
 
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
 if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+if (isset($optioncss) && $optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
 if ($langcode)        $param .= '&langcode='.urlencode($langcode);
 if ($transkey)        $param .= '&transkey='.urlencode($transkey);
 if ($transvalue)      $param .= '&transvalue='.urlencode($transvalue);
 
 
-print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && $debug) ? '?debug=1' : '').'" method="POST">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && !empty($debug)) ? '?debug=1' : '').'" method="POST">';
+if (isset($optioncss) && $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.'">';
@@ -472,7 +472,7 @@ if ($mode == 'searchkey')
 	print '</td>';
 	// Action column
 	print '<td class="nowrap right">';
-	$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
+	$searchpicto = $form->showFilterAndCheckAddButtons(!empty($massactionbutton) ? 1 : 0, 'checkforselect', 1);
 	print $searchpicto;
 	print '</td>';
 	print '</tr>';
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index 0ca4be65910..09225a6e4a8 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -75,7 +75,7 @@ $tablib[1] = "Websites";
 
 // Requests to extract data
 $tabsql = array();
-$tabsql[1] = "SELECT f.rowid as rowid, f.entity, f.ref, f.description, f.virtualhost, f.position, f.status FROM ".MAIN_DB_PREFIX.'website as f WHERE f.entity IN ('.getEntity('website').')';
+$tabsql[1] = "SELECT f.rowid as rowid, f.entity, f.ref, f.description, f.virtualhost, f.position, f.status, f.date_creation FROM ".MAIN_DB_PREFIX.'website as f WHERE f.entity IN ('.getEntity('website').')';
 
 // Criteria to sort dictionaries
 $tabsqlsort = array();
@@ -83,7 +83,7 @@ $tabsqlsort[1] = "ref ASC";
 
 // Nom des champs en resultat de select pour affichage du dictionnaire
 $tabfield = array();
-$tabfield[1] = "ref,description,virtualhost,position";
+$tabfield[1] = "ref,description,virtualhost,position,date_creation";
 
 // Nom des champs d'edition pour modification d'un enregistrement
 $tabfieldvalue = array();
@@ -139,8 +139,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 			$fieldnamekey = $listfield[$f];
 			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
 			break;
-		} elseif ($value == 'ref' && !preg_match('/^[a-z0-9_\-\.]+$/i', $_POST[$value]))
-		{
+		} elseif ($value == 'ref' && !preg_match('/^[a-z0-9_\-\.]+$/i', GETPOST($value))) {
 			$ok = 0;
 			$fieldnamekey = $listfield[$f];
 			setEventMessages($langs->transnoentities("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities($fieldnamekey)), null, 'errors');
@@ -149,9 +148,8 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 	}
 
 	// Clean parameters
-	if (!empty($_POST['ref']))
-	{
-		$websitekey = strtolower($_POST['ref']);
+	if (GETPOST('ref')) {
+		$websitekey = strtolower(GETPOST('ref'));
 	}
 
 	// Si verif ok et action add, on ajoute la ligne
@@ -435,15 +433,14 @@ if ($id)
 	// Form to add a new line
 	if ($tabname[$id])
 	{
-		$alabelisused = 0;
-		$var = false;
-
 		$fieldlist = explode(',', $tabfield[$id]);
 
 		// Line for title
 		print '<tr class="liste_titre">';
 		foreach ($fieldlist as $field => $value)
 		{
+			if ($fieldlist[$field] == 'date_creation') continue;
+
 			// Determine le nom du champ par rapport aux noms possibles
 			// dans les dictionnaires de donnees
 			$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
@@ -461,7 +458,6 @@ if ($id)
 		   		} else print $valuetoshow;
 				print '</td>';
 			}
-			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
 		}
 
 		print '<td colspan="4">';
@@ -469,7 +465,7 @@ if ($id)
 		print '</tr>';
 
 		// Line to enter new values
-		print "<tr ".$bcnd[$var].">";
+		print '<tr class="oddeven">';
 
 		$obj = new stdClass();
 		// If data was already input, we define them in obj to populate input fields.
@@ -538,6 +534,7 @@ if ($id)
 				if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
 				if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
 				if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); }
+				if ($fieldlist[$field] == 'date_creation') { $valuetoshow = $langs->trans("DateCreation"); }
 
 				// Affiche nom du champ
 				if ($showfield)
@@ -570,7 +567,7 @@ if ($id)
 					print '&nbsp;<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
 				} else {
 				  	$tmpaction = 'view';
-					$parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
 					$reshook = $hookmanager->executeHooks('viewWebsiteFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
 					$error = $hookmanager->error; $errors = $hookmanager->errors;
@@ -601,7 +598,7 @@ if ($id)
 					print "</td>";
 
 					// Modify link
-					print '<td align="center"><a class="reposition" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
+					print '<td align="center"><a class="reposition editfielda" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
 
 					// Delete link
 					if ($iserasable) print '<td align="center"><a class="reposition" href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a></td>';
@@ -650,6 +647,7 @@ function fieldListWebsites($fieldlist, $obj = '', $tabname = '', $context = '')
 	foreach ($fieldlist as $field => $value)
 	{
 		$fieldname = $fieldlist[$field];
+
 		if ($fieldlist[$field] == 'lang')
 		{
 			print '<td>';
@@ -658,6 +656,8 @@ function fieldListWebsites($fieldlist, $obj = '', $tabname = '', $context = '')
 		} elseif ($fieldlist[$field] == 'code' && isset($obj->$fieldname)) {
 			print '<td><input type="text" class="flat" value="'.(!empty($obj->$fieldname) ? $obj->$fieldname : '').'" size="10" name="'.$fieldlist[$field].'"></td>';
 		} else {
+			if ($fieldlist[$field] == 'date_creation') continue;
+
 			print '<td>';
 			$size = '';
 			if ($fieldlist[$field] == 'code') $size = 'size="8" ';
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index 6bd3edca2b8..c1e099362ad 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 if (!$user->admin) accessforbidden();
 
 // Load translation files required by the page
-$langs->loadLangs(array("admin", "workflow", "propal", "workflow", "orders", "supplier_proposal", "receptions", "errors"));
+$langs->loadLangs(array("admin", "workflow", "propal", "workflow", "orders", "supplier_proposal", "receptions", "errors", 'sendings'));
 
 $action = GETPOST('action', 'aZ09');
 
@@ -130,6 +130,14 @@ $workflowcodes = array(
 		'enabled'=>(!empty($conf->reception->enabled) && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))),
 		'picto'=>'bill'
 	),
+
+	// Automatic classification shipping
+	'WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE' => array(
+		'family' => 'classify_shipping',
+		'position' => 66,
+		'enabled' => ! empty($conf->expedition->enabled) && ! empty($conf->facture->enabled),
+		'picto' => 'shipment'
+	)
 );
 
 if (!empty($conf->modules_parts['workflow']) && is_array($conf->modules_parts['workflow'])) {
@@ -190,6 +198,7 @@ foreach ($workflowcodes as $key => $params) {
 			if ($reg[1] == 'supplier_proposal')	$header .= ' - '.$langs->trans('SupplierProposal');
 			if ($reg[1] == 'supplier_order')	$header .= ' - '.$langs->trans('SupplierOrder');
 			if ($reg[1] == 'reception')			$header .= ' - '.$langs->trans('Reception');
+			if ($reg[1] == 'shipping')			$header .= ' - '.$langs->trans('Shipment');
 		} else {
 			$header = $langs->trans("Description");
 		}
diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php
new file mode 100755
index 00000000000..98d72bf9f00
--- /dev/null
+++ b/htdocs/admin/workstation.php
@@ -0,0 +1,513 @@
+<?php
+/* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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    workstation/admin/setup.php
+ * \ingroup workstation
+ * \brief   Workstation setup page.
+ */
+
+// Load Dolibarr environment
+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 "../class/myclass.class.php";
+
+// Translations
+$langs->loadLangs(array("admin", "workstation@workstation"));
+
+// Access control
+if (!$user->admin) accessforbidden();
+
+// Parameters
+$action = GETPOST('action', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+$value = GETPOST('value', 'alpha');
+
+/*$arrayofparameters = array(
+	'WORKSTATION_MYPARAM1'=>array('css'=>'minwidth200', 'enabled'=>1),
+	'WORKSTATION_MYPARAM2'=>array('css'=>'minwidth500', 'enabled'=>1)
+);*/
+
+$error = 0;
+$setupnotempty = 0;
+
+
+/*
+ * Actions
+ */
+
+if ((float) DOL_VERSION >= 6)
+{
+	include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+}
+
+if ($action == 'updateMask')
+{
+	$maskconstorder = GETPOST('maskconstWorkstation', 'alpha');
+	$maskorder = GETPOST('maskWorkstation', '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/workstation/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
+		if (file_exists($file))
+		{
+			$filefound = 1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
+
+	if ($filefound)
+	{
+		require_once $file;
+
+		$module = new $classname($db);
+
+		if ($module->write_file($tmpobject, $langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+			return;
+		} else {
+			setEventMessages($module->error, null, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
+}
+
+// Activate a model
+elseif ($action == 'set')
+{
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+} elseif ($action == 'del')
+{
+	$tmpobjectkey = GETPOST('object');
+
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
+		if ($conf->global->$constforval == "$value") dolibarr_del_const($db, $constforval, $conf->entity);
+	}
+}
+
+// Set default model
+elseif ($action == 'setdoc')
+{
+	$tmpobjectkey = GETPOST('object');
+	$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
+	if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity))
+	{
+		// The constant that was read before the new set
+		// We therefore requires a variable to have a coherent view
+		$conf->global->$constforval = $value;
+	}
+
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
+} elseif ($action == 'setmod')
+{
+	// TODO Check if numbering module chosen can be activated
+	// by calling method canBeActivated
+	$tmpobjectkey = GETPOST('object');
+	$constforval = 'WORKSTATION_'.strtoupper($tmpobjectkey)."_ADDON";
+	dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+$page_name = "WorkstationSetup";
+llxHeader('', $langs->trans($page_name));
+
+// Subheader
+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
+
+print load_fiche_titre($langs->trans($page_name), $linkback, 'object_workstation@workstation');
+
+// Configuration header
+$head = workstationAdminPrepareHead();
+print dol_get_fiche_head($head, 'settings', '', -1, "workstation@workstation");
+
+// Setup page goes here
+//echo '<span class="opacitymedium">'.$langs->trans("WorkstationSetupPage").'</span><br><br>';
+
+
+if ($action == 'edit')
+{
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
+
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+
+	foreach ($arrayofparameters as $key => $val)
+	{
+		print '<tr class="oddeven"><td>';
+		$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
+		print $form->textwithpicto($langs->trans($key), $tooltiphelp);
+		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->$key.'"></td></tr>';
+	}
+	print '</table>';
+
+	print '<br><div class="center">';
+	print '<input class="button 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 $key => $val)
+		{
+			$setupnotempty++;
+
+			print '<tr class="oddeven"><td>';
+			$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
+			print $form->textwithpicto($langs->trans($key), $tooltiphelp);
+			print '</td><td>'.$conf->global->$key.'</td></tr>';
+		}
+
+		print '</table>';
+
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+		print '</div>';
+	}/* else {
+		print '<br>'.$langs->trans("NothingToSetup");
+	}*/
+}
+
+
+$moduledir = 'workstation';
+$myTmpObjects = array();
+$myTmpObjects['workstation'] = 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 = 'WORKSTATION_'.strtoupper($myTmpObjectKey).'_ADDON';
+								if ($conf->global->$constforvar == $file)
+								{
+									print img_picto($langs->trans("Activated"), 'switch_on');
+								} else {
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&object='.strtolower($myTmpObjectKey).'&value='.urlencode($file).'">';
+									print img_picto($langs->trans("Disabled"), 'switch_off');
+									print '</a>';
+								}
+								print '</td>';
+
+								$mytmpinstance = new $myTmpObjectKey($db);
+								$mytmpinstance->initAsSpecimen();
+
+								// Info
+								$htmltooltip = '';
+								$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+
+								$nextval = $module->getNextValue($mytmpinstance);
+								if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+									$htmltooltip .= ''.$langs->trans("NextValue").': ';
+									if ($nextval) {
+										if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+											$nextval = $langs->trans($nextval);
+											$htmltooltip .= $nextval.'<br>';
+									} else {
+										$htmltooltip .= $langs->trans($module->error).'<br>';
+									}
+								}
+
+								print '<td class="center">';
+								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print '</td>';
+
+								print "</tr>\n";
+							}
+						}
+					}
+					closedir($handle);
+				}
+			}
+		}
+		print "</table><br>\n";
+	}
+
+	if ($myTmpObjectArray['includedocgeneration']) {
+		/*
+		 * Document templates generators
+		 */
+		$setupnotempty++;
+		$type = strtolower($myTmpObjectKey);
+
+		print load_fiche_titre($langs->trans("DocumentModules", $myTmpObjectKey), '', '');
+
+		// Load array def with activated templates
+		$def = array();
+		$sql = "SELECT nom";
+		$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+		$sql .= " WHERE type = '".$db->escape($type)."'";
+		$sql .= " AND entity = ".$conf->entity;
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num_rows = $db->num_rows($resql);
+			while ($i < $num_rows)
+			{
+				$array = $db->fetch_array($resql);
+				array_push($def, $array[0]);
+				$i++;
+			}
+		} else {
+			dol_print_error($db);
+		}
+
+		print "<table class=\"noborder\" width=\"100%\">\n";
+		print "<tr class=\"liste_titre\">\n";
+		print '<td>'.$langs->trans("Name").'</td>';
+		print '<td>'.$langs->trans("Description").'</td>';
+		print '<td class="center" width="60">'.$langs->trans("Status")."</td>\n";
+		print '<td class="center" width="60">'.$langs->trans("Default")."</td>\n";
+		print '<td class="center" width="38">'.$langs->trans("ShortInfo").'</td>';
+		print '<td class="center" width="38">'.$langs->trans("Preview").'</td>';
+		print "</tr>\n";
+
+		clearstatcache();
+
+		foreach ($dirmodels as $reldir)
+		{
+			foreach (array('', '/doc') as $valdir)
+			{
+				$realpath = $reldir."core/modules/".$moduledir.$valdir;
+				$dir = dol_buildpath($realpath);
+
+				if (is_dir($dir))
+				{
+					$handle = opendir($dir);
+					if (is_resource($handle))
+					{
+						while (($file = readdir($handle)) !== false)
+						{
+							$filelist[] = $file;
+						}
+						closedir($handle);
+						arsort($filelist);
+
+						foreach ($filelist as $file)
+						{
+							if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+							{
+								if (file_exists($dir.'/'.$file))
+								{
+									$name = substr($file, 4, dol_strlen($file) - 16);
+									$classname = substr($file, 0, dol_strlen($file) - 12);
+
+									require_once $dir.'/'.$file;
+									$module = new $classname($db);
+
+									$modulequalified = 1;
+									if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+									if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+
+									if ($modulequalified)
+									{
+										print '<tr class="oddeven"><td width="100">';
+										print (empty($module->name) ? $name : $module->name);
+										print "</td><td>\n";
+										if (method_exists($module, 'info')) print $module->info($langs);
+										else print $module->description;
+										print '</td>';
+
+										// Active
+										if (in_array($name, $def))
+										{
+											print '<td class="center">'."\n";
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'">';
+											print img_picto($langs->trans("Enabled"), 'switch_on');
+											print '</a>';
+											print '</td>';
+										} else {
+											print '<td class="center">'."\n";
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+											print "</td>";
+										}
+
+										// Default
+										print '<td class="center">';
+										$constforvar = 'WORKSTATION_'.strtoupper($myTmpObjectKey).'_ADDON';
+										if ($conf->global->$constforvar == $name)
+										{
+											print img_picto($langs->trans("Default"), 'on');
+										} else {
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+										}
+										print '</td>';
+
+										// Info
+										$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+										$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+										if ($module->type == 'pdf')
+										{
+											$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+										}
+										$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
+
+										$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+										$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+										$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+
+										print '<td class="center">';
+										print $form->textwithpicto('', $htmltooltip, 1, 0);
+										print '</td>';
+
+										// Preview
+										print '<td class="center">';
+										if ($module->type == 'pdf')
+										{
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&object='.$myTmpObjectKey.'">'.img_object($langs->trans("Preview"), 'generic').'</a>';
+										} else {
+											print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+										}
+										print '</td>';
+
+										print "</tr>\n";
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		print '</table>';
+	}
+}
+
+/*if (empty($setupnotempty)) {
+	print '<br>'.$langs->trans("NothingToSetup");
+}*/
+
+// Page end
+print dol_get_fiche_end();
+
+llxFooter();
+$db->close();
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 2d6a598398c..ebeeac5c5b9 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -425,7 +425,7 @@ class Documents extends DolibarrApi
 				throw new RestException(500, 'Error while fetching object: '.$object->error);
 			}
 
-			$upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
+			$upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'product');
 		}
 		elseif ($modulepart == 'agenda' || $modulepart == 'action' || $modulepart == 'event')
 		{
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 84d4ddc3679..85a45e9ff45 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -643,7 +643,7 @@ class Setup extends DolibarrApi
 	public function getListOfShipmentMethods($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
 	{
 		$list = array();
-		$sql = "SELECT t.rowid, t.code, t.libelle, t.description, t.tracking";
+		$sql = "SELECT t.rowid, t.code, t.libelle as label, t.description, t.tracking";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as t";
 		$sql .= " WHERE t.active = ".$active;
 		// Add sql filters
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index 8a513034a4a..2a3a13cca69 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -22,6 +22,11 @@
  *	\ingroup	member
  *	\brief		Page to print sheets with barcodes using the document templates into core/modules/printsheets
  */
+
+if (!empty($_POST['mode']) && $_POST['mode'] === 'label') {	// Page is called to build a PDF and output, we must ne renew the token.
+	if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+}
+
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -237,16 +242,22 @@ if ($action == 'builddoc')
 
 			$outfile = $langs->trans("BarCode").'_sheets_'.dol_print_date(dol_now(), 'dayhourlog').'.pdf';
 
-			if (!$mesg) $result = doc_label_pdf_create($db, $arrayofrecords, $modellabel, $outputlangs, $diroutput, $template, dol_sanitizeFileName($outfile));
+			if (!$mesg) {
+				$outputlangs = $langs;
+
+				// This generates and send PDF to output
+				// TODO Move
+				$result = doc_label_pdf_create($db, $arrayofrecords, $modellabel, $outputlangs, $diroutput, $template, dol_sanitizeFileName($outfile));
+			}
 		}
 
-		if ($result <= 0)
-		{
-			dol_print_error('', $result);
-		}
+		if ($result <= 0 || $mesg) {
+			if (empty($mesg)) {
+				$mesg = 'Error '.$result;
+			}
 
-		if (!$mesg)
-		{
+			setEventMessages($mesg, null, 'errors');
+		} else {
 			$db->close();
 			exit;
 		}
@@ -275,10 +286,10 @@ dol_htmloutput_errors($mesg);
 //print img_picto('','puce').' '.$langs->trans("PrintsheetForOneBarCode").'<br>';
 //print '<br>';
 
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+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="'.newtoken().'">';
+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">';
 
diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php
index 39725eae3b7..86a563881e4 100644
--- a/htdocs/blockedlog/admin/blockedlog.php
+++ b/htdocs/blockedlog/admin/blockedlog.php
@@ -77,6 +77,7 @@ if (preg_match('/del_(.*)/', $action, $reg))
 
 $form = new Form($db);
 $block_static = new BlockedLog($db);
+$block_static->loadTrackedEvents();
 
 llxHeader('', $langs->trans("BlockedLogSetup"));
 
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 67c6c394815..8f7b209cc6e 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -43,6 +43,7 @@ $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '
 $search_showonlyerrors = GETPOST('search_showonlyerrors', 'int');
 if ($search_showonlyerrors < 0) $search_showonlyerrors = 0;
 
+$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'));
@@ -68,11 +69,20 @@ if (empty($sortfield)) $sortfield = 'rowid';
 if (empty($sortorder)) $sortorder = 'DESC';
 
 $block_static = new BlockedLog($db);
-
+$block_static->loadTrackedEvents();
 
 $result = restrictedArea($user, 'blockedlog', 0, '');
 
 
+$max_execution_time_for_importexport = (empty($conf->global->EXPORT_MAX_EXECUTION_TIME) ? 300 : $conf->global->EXPORT_MAX_EXECUTION_TIME); // 5mn if not defined
+$max_time = @ini_get("max_execution_time");
+if ($max_time && $max_time < $max_execution_time_for_importexport)
+{
+	dol_syslog("max_execution_time=".$max_time." is lower than max_execution_time_for_importexport=".$max_execution_time_for_importexport.". We try to increase it dynamically.");
+	@ini_set("max_execution_time", $max_execution_time_for_importexport); // This work only if safe mode is off. also web servers has timeout of 300
+}
+
+
 /*
  * Actions
  */
@@ -80,6 +90,7 @@ $result = restrictedArea($user, 'blockedlog', 0, '');
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
+	$search_id = '';
 	$search_fk_user = '';
 	$search_start = -1;
 	$search_end = -1;
@@ -263,7 +274,7 @@ llxHeader('', $langs->trans("BrowseBlockedLog"));
 
 $MAXLINES = 10000;
 
-$blocks = $block_static->getLog('all', 0, $MAXLINES, $sortfield, $sortorder, $search_fk_user, $search_start, $search_end, $search_ref, $search_amount, $search_code);
+$blocks = $block_static->getLog('all', $search_id, $MAXLINES, $sortfield, $sortorder, $search_fk_user, $search_start, $search_end, $search_ref, $search_amount, $search_code);
 if (!is_array($blocks))
 {
 	if ($blocks == -2)
@@ -296,6 +307,7 @@ print '<br>';
 $param = '';
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
 if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if ($search_id != '')       $param .= '&search_id='.urlencode($search_id);
 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'));
 if ($search_startmonth > 0) $param .= '&search_startmonth='.urlencode(GETPOST('search_startmonth', 'int'));
@@ -355,7 +367,7 @@ print '<table class="noborder centpercent">';
 // Line of filters
 print '<tr class="liste_titre_filter">';
 
-print '<td class="liste_titre">&nbsp;</td>';
+print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="'.dol_escape_htmltag($search_id).'"></td>';
 
 print '<td class="liste_titre">';
 //print $langs->trans("from").': ';
@@ -433,12 +445,18 @@ if (!empty($conf->global->BLOCKEDLOG_SCAN_ALL_FOR_LOWERIDINERROR)) {
 	// This is version that optimize the memory (but will not report errors that are outside the filter range)
 	$loweridinerror = 0;
 	$checkresult = array();
+	$checkdetail = array();
 	if (is_array($blocks))
 	{
 		foreach ($blocks as &$block)
 		{
-			$checksignature = $block->checkSignature(); // Note: this make a sql request at each call, we can't avoid this as the sorting order is various
+			$tmpcheckresult = $block->checkSignature('', 1); // Note: this make a sql request at each call, we can't avoid this as the sorting order is various
+
+			$checksignature = $tmpcheckresult['checkresult'];
+
 			$checkresult[$block->id] = $checksignature; // false if error
+			$checkdetail[$block->id] = $tmpcheckresult;
+
 			if (!$checksignature)
 			{
 				if (empty($loweridinerror)) $loweridinerror = $block->id;
@@ -450,13 +468,23 @@ if (!empty($conf->global->BLOCKEDLOG_SCAN_ALL_FOR_LOWERIDINERROR)) {
 
 if (is_array($blocks))
 {
+	$nbshown = 0;
+	$MAXFORSHOWLINK = 100;
+	$object_link = '';
+
 	foreach ($blocks as &$block)
 	{
-		$object_link = $block->getObjectLink();
-
 		//if (empty($search_showonlyerrors) || ! $checkresult[$block->id] || ($loweridinerror && $block->id >= $loweridinerror))
 		if (empty($search_showonlyerrors) || !$checkresult[$block->id])
 		{
+			$nbshown++;
+
+			if ($nbshown < $MAXFORSHOWLINK) {	// For performance and memory purpose, we get/show the link of objects only for the 100 first output
+				$object_link = $block->getObjectLink();
+			} else {
+				$object_link = $block->element.'/'.$block->fk_object;
+			}
+
 		   	print '<tr class="oddeven">';
 
 		   	// ID
@@ -475,7 +503,9 @@ if (is_array($blocks))
 		   	print '<td>'.$langs->trans('log'.$block->action).'</td>';
 
 		   	// Ref
-		   	print '<td class="nowrap">'.$block->ref_object.'</td>';
+		   	print '<td class="nowraponall">';
+		   	print $block->ref_object;
+		   	print '</td>';
 
 		   	// Link to source object
 		   	print '<td'.(preg_match('/<a/', $object_link) ? ' class="nowrap"' : '').'><!-- object_link -->'.$object_link.'</td>';
@@ -488,19 +518,26 @@ if (is_array($blocks))
 
 		   	// Fingerprint
 		   	print '<td class="nowrap">';
-		   	print $form->textwithpicto(dol_trunc($block->signature, '8'), $block->signature, 1, 'help', '', 0, 2, 'fingerprint'.$block->id);
+		   	$texttoshow = $langs->trans("Fingerprint").' - '.$langs->trans("Saved").':<br>'.$block->signature;
+		   	$texttoshow .= '<br><br>'.$langs->trans("Fingerprint").' - Recalculated sha256(previoushash * data):<br>'.$checkdetail[$block->id]['calculatedsignature'];
+		   	$texttoshow .= '<br><span class="opacitymedium">'.$langs->trans("PreviousHash").'='.$checkdetail[$block->id]['previoushash'].'</span>';
+		   	//$texttoshow .= '<br>keyforsignature='.$checkdetail[$block->id]['keyforsignature'];
+		   	print $form->textwithpicto(dol_trunc($block->signature, '8'), $texttoshow, 1, 'help', '', 0, 2, 'fingerprint'.$block->id);
 		   	print '</td>';
 
 		   	// Status
 		   	print '<td class="center">';
 		   	if (!$checkresult[$block->id] || ($loweridinerror && $block->id >= $loweridinerror))	// If error
 		   	{
-		   		if ($checkresult[$block->id]) print img_picto($langs->trans('OkCheckFingerprintValidityButChainIsKo'), 'statut4');
-		   		else print img_picto($langs->trans('KoCheckFingerprintValidity'), 'statut8');
+		   		if ($checkresult[$block->id]) {
+		   			print '<span class="badge badge-status4 badge-status" title="'.$langs->trans('OkCheckFingerprintValidityButChainIsKo').'">OK</span>';
+		   		}
+		   		else {
+		   			print '<span class="badge badge-status8 badge-status" title="'.$langs->trans('KoCheckFingerprintValidity').'">KO</span>';
+		   		}
 		   	} else {
-		   		print img_picto($langs->trans('OkCheckFingerprintValidity'), 'statut4');
+		   		print '<span class="badge badge-status4 badge-status" title="'.$langs->trans('OkCheckFingerprintValidity').'">OK</span>';
 		   	}
-
 		   	print '</td>';
 
 		   	// Note
@@ -520,6 +557,10 @@ if (is_array($blocks))
 			print '</tr>';
 		}
 	}
+
+	if ($nbshown == 0) {
+		print '<tr><td colspan="12"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+	}
 }
 
 print '</table>';
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index f6402ca3b04..7844432f3f8 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -124,69 +124,114 @@ class BlockedLog
 	 */
 	public function __construct(DoliDB $db)
 	{
-		global $conf;
-
 		$this->db = $db;
+	}
+
+
+	/**
+	 * Load list of tracked events into $this->trackedevents.
+	 *
+	 * @return int			Always 1
+	 */
+	public function loadTrackedEvents()
+	{
+		global $conf;
 
 		$this->trackedevents = array();
 
-		if ($conf->facture->enabled) $this->trackedevents['BILL_VALIDATE'] = 'logBILL_VALIDATE';
-		if ($conf->facture->enabled) $this->trackedevents['BILL_DELETE'] = 'logBILL_DELETE';
-		if ($conf->facture->enabled) $this->trackedevents['BILL_SENTBYMAIL'] = 'logBILL_SENTBYMAIL';
-		if ($conf->facture->enabled) $this->trackedevents['DOC_DOWNLOAD'] = 'BlockedLogBillDownload';
-		if ($conf->facture->enabled) $this->trackedevents['DOC_PREVIEW'] = 'BlockedLogBillPreview';
-
-		if ($conf->facture->enabled) $this->trackedevents['PAYMENT_CUSTOMER_CREATE'] = 'logPAYMENT_CUSTOMER_CREATE';
-		if ($conf->facture->enabled) $this->trackedevents['PAYMENT_CUSTOMER_DELETE'] = 'logPAYMENT_CUSTOMER_DELETE';
+		if ($conf->facture->enabled) {
+			$this->trackedevents['BILL_VALIDATE'] = 'logBILL_VALIDATE';
+		}
+		if ($conf->facture->enabled) {
+			$this->trackedevents['BILL_DELETE'] = 'logBILL_DELETE';
+		}
+		if ($conf->facture->enabled) {
+			$this->trackedevents['BILL_SENTBYMAIL'] = 'logBILL_SENTBYMAIL';
+		}
+		if ($conf->facture->enabled) {
+			$this->trackedevents['DOC_DOWNLOAD'] = 'BlockedLogBillDownload';
+		}
+		if ($conf->facture->enabled) {
+			$this->trackedevents['DOC_PREVIEW'] = 'BlockedLogBillPreview';
+		}
+		if ($conf->facture->enabled) {
+			$this->trackedevents['PAYMENT_CUSTOMER_CREATE'] = 'logPAYMENT_CUSTOMER_CREATE';
+		}
+		if ($conf->facture->enabled) {
+			$this->trackedevents['PAYMENT_CUSTOMER_DELETE'] = 'logPAYMENT_CUSTOMER_DELETE';
+		}
 
 		/* Supplier
-		if ($conf->fournisseur->enabled) $this->trackedevents['BILL_SUPPLIER_VALIDATE']='BlockedLogSupplierBillValidate';
-		if ($conf->fournisseur->enabled) $this->trackedevents['BILL_SUPPLIER_DELETE']='BlockedLogSupplierBillDelete';
-		if ($conf->fournisseur->enabled) $this->trackedevents['BILL_SUPPLIER_SENTBYMAIL']='BlockedLogSupplierBillSentByEmail'; // Trigger key does not exists, we want just into array to list it as done
-		if ($conf->fournisseur->enabled) $this->trackedevents['SUPPLIER_DOC_DOWNLOAD']='BlockedLogSupplierBillDownload';		// Trigger key does not exists, we want just into array to list it as done
-		if ($conf->fournisseur->enabled) $this->trackedevents['SUPPLIER_DOC_PREVIEW']='BlockedLogSupplierBillPreview';		// Trigger key does not exists, we want just into array to list it as done
+		 if ($conf->fournisseur->enabled) $this->trackedevents['BILL_SUPPLIER_VALIDATE']='BlockedLogSupplierBillValidate';
+		 if ($conf->fournisseur->enabled) $this->trackedevents['BILL_SUPPLIER_DELETE']='BlockedLogSupplierBillDelete';
+		 if ($conf->fournisseur->enabled) $this->trackedevents['BILL_SUPPLIER_SENTBYMAIL']='BlockedLogSupplierBillSentByEmail'; // Trigger key does not exists, we want just into array to list it as done
+		 if ($conf->fournisseur->enabled) $this->trackedevents['SUPPLIER_DOC_DOWNLOAD']='BlockedLogSupplierBillDownload';		// Trigger key does not exists, we want just into array to list it as done
+		 if ($conf->fournisseur->enabled) $this->trackedevents['SUPPLIER_DOC_PREVIEW']='BlockedLogSupplierBillPreview';		// Trigger key does not exists, we want just into array to list it as done
 
-		if ($conf->fournisseur->enabled) $this->trackedevents['PAYMENT_SUPPLIER_CREATE']='BlockedLogSupplierBillPaymentCreate';
-		if ($conf->fournisseur->enabled) $this->trackedevents['PAYMENT_SUPPLIER_DELETE']='BlockedLogsupplierBillPaymentCreate';
-		*/
+		 if ($conf->fournisseur->enabled) $this->trackedevents['PAYMENT_SUPPLIER_CREATE']='BlockedLogSupplierBillPaymentCreate';
+		 if ($conf->fournisseur->enabled) $this->trackedevents['PAYMENT_SUPPLIER_DELETE']='BlockedLogsupplierBillPaymentCreate';
+		 */
 
-		if ($conf->don->enabled) $this->trackedevents['DON_VALIDATE'] = 'logDON_VALIDATE';
-		if ($conf->don->enabled) $this->trackedevents['DON_DELETE'] = 'logDON_DELETE';
+		if ($conf->don->enabled) {
+			$this->trackedevents['DON_VALIDATE'] = 'logDON_VALIDATE';
+		}
+		if ($conf->don->enabled) {
+			$this->trackedevents['DON_DELETE'] = 'logDON_DELETE';
+		}
 		//if ($conf->don->enabled) $this->trackedevents['DON_SENTBYMAIL']='logDON_SENTBYMAIL';
 
-		if ($conf->don->enabled) $this->trackedevents['DONATION_PAYMENT_CREATE'] = 'logDONATION_PAYMENT_CREATE';
-		if ($conf->don->enabled) $this->trackedevents['DONATION_PAYMENT_DELETE'] = 'logDONATION_PAYMENT_DELETE';
+		if ($conf->don->enabled) {
+			$this->trackedevents['DONATION_PAYMENT_CREATE'] = 'logDONATION_PAYMENT_CREATE';
+		}
+		if ($conf->don->enabled) {
+			$this->trackedevents['DONATION_PAYMENT_DELETE'] = 'logDONATION_PAYMENT_DELETE';
+		}
 
 		/*
-		if ($conf->salary->enabled) $this->trackedevents['PAYMENT_SALARY_CREATE']='BlockedLogSalaryPaymentCreate';
-		if ($conf->salary->enabled) $this->trackedevents['PAYMENT_SALARY_MODIFY']='BlockedLogSalaryPaymentCreate';
-		if ($conf->salary->enabled) $this->trackedevents['PAYMENT_SALARY_DELETE']='BlockedLogSalaryPaymentCreate';
-		*/
-
-		if ($conf->adherent->enabled) $this->trackedevents['MEMBER_SUBSCRIPTION_CREATE'] = 'logMEMBER_SUBSCRIPTION_CREATE';
-		if ($conf->adherent->enabled) $this->trackedevents['MEMBER_SUBSCRIPTION_MODIFY'] = 'logMEMBER_SUBSCRIPTION_MODIFY';
-		if ($conf->adherent->enabled) $this->trackedevents['MEMBER_SUBSCRIPTION_DELETE'] = 'logMEMBER_SUBSCRIPTION_DELETE';
-
-
-		if ($conf->banque->enabled) $this->trackedevents['PAYMENT_VARIOUS_CREATE'] = 'logPAYMENT_VARIOUS_CREATE';
-		if ($conf->banque->enabled) $this->trackedevents['PAYMENT_VARIOUS_MODIFY'] = 'logPAYMENT_VARIOUS_MODIFY';
-		if ($conf->banque->enabled) $this->trackedevents['PAYMENT_VARIOUS_DELETE'] = 'logPAYMENT_VARIOUS_DELETE';
+		 if ($conf->salary->enabled) $this->trackedevents['PAYMENT_SALARY_CREATE']='BlockedLogSalaryPaymentCreate';
+		 if ($conf->salary->enabled) $this->trackedevents['PAYMENT_SALARY_MODIFY']='BlockedLogSalaryPaymentCreate';
+		 if ($conf->salary->enabled) $this->trackedevents['PAYMENT_SALARY_DELETE']='BlockedLogSalaryPaymentCreate';
+		 */
 
+		if ($conf->adherent->enabled) {
+			$this->trackedevents['MEMBER_SUBSCRIPTION_CREATE'] = 'logMEMBER_SUBSCRIPTION_CREATE';
+		}
+		if ($conf->adherent->enabled) {
+			$this->trackedevents['MEMBER_SUBSCRIPTION_MODIFY'] = 'logMEMBER_SUBSCRIPTION_MODIFY';
+		}
+		if ($conf->adherent->enabled) {
+			$this->trackedevents['MEMBER_SUBSCRIPTION_DELETE'] = 'logMEMBER_SUBSCRIPTION_DELETE';
+		}
+		if ($conf->banque->enabled) {
+			$this->trackedevents['PAYMENT_VARIOUS_CREATE'] = 'logPAYMENT_VARIOUS_CREATE';
+		}
+		if ($conf->banque->enabled) {
+			$this->trackedevents['PAYMENT_VARIOUS_MODIFY'] = 'logPAYMENT_VARIOUS_MODIFY';
+		}
+		if ($conf->banque->enabled) {
+			$this->trackedevents['PAYMENT_VARIOUS_DELETE'] = 'logPAYMENT_VARIOUS_DELETE';
+		}
 		// $conf->global->BANK_ENABLE_POS_CASHCONTROL must be set to 1 by all external POS modules
 		$moduleposenabled = (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->BANK_ENABLE_POS_CASHCONTROL));
-		if ($moduleposenabled) $this->trackedevents['CASHCONTROL_VALIDATE'] = 'logCASHCONTROL_VALIDATE';
+		if ($moduleposenabled) {
+			$this->trackedevents['CASHCONTROL_VALIDATE'] = 'logCASHCONTROL_VALIDATE';
+		}
 
+		// Add more action to track from a conf variable
 		if (!empty($conf->global->BLOCKEDLOG_ADD_ACTIONS_SUPPORTED)) {
 			$tmparrayofmoresupportedevents = explode(',', $conf->global->BLOCKEDLOG_ADD_ACTIONS_SUPPORTED);
 			foreach ($tmparrayofmoresupportedevents as $val) {
 				$this->trackedevents[$val] = 'log'.$val;
 			}
 		}
+
+		return 1;
 	}
 
 	/**
-	 *  Try to retrieve source object (it it still exists)
-	 * @return string
+	 * Try to retrieve source object (it it still exists).
+	 *
+	 * @return string		URL string of source object
 	 */
 	public function getObjectLink()
 	{
@@ -396,7 +441,7 @@ class BlockedLog
 				'name', 'name_alias', 'ref_ext', 'address', 'zip', 'town', 'state_code', 'country_code', 'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6', 'phone', 'fax', 'email', 'barcode',
 				'tva_intra', 'localtax1_assuj', 'localtax1_value', 'localtax2_assuj', 'localtax2_value', 'managers', 'capital', 'typent_code', 'forme_juridique_code', 'code_client', 'code_fournisseur'
 				))) continue; // Discard if not into a dedicated list
-				if (!is_object($value)) $this->object_data->thirdparty->{$key} = $value;
+				if (!is_object($value) && !is_null($value) && $value !== '') $this->object_data->thirdparty->{$key} = $value;
 			}
 		}
 
@@ -412,7 +457,7 @@ class BlockedLog
 				'name', 'name_alias', 'ref_ext', 'address', 'zip', 'town', 'state_code', 'country_code', 'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6', 'phone', 'fax', 'email', 'barcode',
 				'tva_intra', 'localtax1_assuj', 'localtax1_value', 'localtax2_assuj', 'localtax2_value', 'managers', 'capital', 'typent_code', 'forme_juridique_code', 'code_client', 'code_fournisseur'
 				))) continue; // Discard if not into a dedicated list
-				if (!is_object($value)) $this->object_data->mycompany->{$key} = $value;
+				if (!is_object($value) && !is_null($value) && $value !== '') $this->object_data->mycompany->{$key} = $value;
 			}
 		}
 
@@ -448,10 +493,12 @@ class BlockedLog
 								$this->object_data->invoiceline[$lineid] = new stdClass();
 							}
 
-							$this->object_data->invoiceline[$lineid]->{$keyline} = $valueline;
+							if (!is_object($valueline) && !is_null($valueline) && $valueline !== '') {
+								$this->object_data->invoiceline[$lineid]->{$keyline} = $valueline;
+							}
 						}
 					}
-				} elseif (!is_object($value)) $this->object_data->{$key} = $value;
+				} elseif (!is_object($value) && !is_null($value) && $value !== '') $this->object_data->{$key} = $value;
 			}
 
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
@@ -463,7 +510,7 @@ class BlockedLog
 				if (!in_array($key, array(
 				'ref', 'ref_client', 'ref_supplier', 'date', 'datef', 'type', 'total_ht', 'total_tva', 'total_ttc', 'localtax1', 'localtax2', 'revenuestamp', 'datepointoftax', 'note_public'
 				))) continue; // Discard if not into a dedicated list
-				if (!is_object($value)) $this->object_data->{$key} = $value;
+				if (!is_object($value) && !is_null($value) && $value !== '') $this->object_data->{$key} = $value;
 			}
 
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
@@ -475,9 +522,10 @@ class BlockedLog
 			$this->object_data->ref = $object->ref;
 			$this->object_data->date = $datepayment;
 			$this->object_data->type_code = dol_getIdFromCode($this->db, $paymenttypeid, 'c_paiement', 'id', 'code');
-			$this->object_data->payment_num = $object->num_payment;
+
+			if (!empty($object->num_payment)) $this->object_data->payment_num = $object->num_payment;
+			if (!empty($object->note_private)) $this->object_data->note_private = $object->note_private;
 			//$this->object_data->fk_account = $object->fk_account;
-			$this->object_data->note = $object->note;
 			//var_dump($this->object_data);exit;
 
 			$totalamount = 0;
@@ -555,7 +603,7 @@ class BlockedLog
 						'name', 'name_alias', 'ref_ext', 'address', 'zip', 'town', 'state_code', 'country_code', 'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6', 'phone', 'fax', 'email', 'barcode',
 						'tva_intra', 'localtax1_assuj', 'localtax1_value', 'localtax2_assuj', 'localtax2_value', 'managers', 'capital', 'typent_code', 'forme_juridique_code', 'code_client', 'code_fournisseur'
 						))) continue; // Discard if not into a dedicated list
-						if (!is_object($value)) $paymentpart->thirdparty->{$key} = $value;
+						if (!is_object($value) && !is_null($value) && $value !== '') $paymentpart->thirdparty->{$key} = $value;
 					}
 				}
 
@@ -571,8 +619,7 @@ class BlockedLog
 						if (!in_array($key, array(
 						'ref', 'ref_client', 'ref_supplier', 'date', 'datef', 'type', 'total_ht', 'total_tva', 'total_ttc', 'localtax1', 'localtax2', 'revenuestamp', 'datepointoftax', 'note_public'
 						))) continue; // Discard if not into a dedicated list
-						if (!is_object($value))
-						{
+						if (!is_object($value) && !is_null($value) && $value !== '') {
 							if ($this->element == 'payment_donation') $paymentpart->donation->{$key} = $value;
 							elseif ($this->element == 'payment_various') $paymentpart->various->{$key} = $value;
 							else $paymentpart->invoice->{$key} = $value;
@@ -600,7 +647,7 @@ class BlockedLog
 				if (!in_array($key, array(
 					'id', 'datec', 'dateh', 'datef', 'fk_adherent', 'amount', 'import_key', 'statut', 'note'
 				))) continue; // Discard if not into a dedicated list
-				if (!is_object($value)) $this->object_data->{$key} = $value;
+				if (!is_object($value) && !is_null($value) && $value !== '') $this->object_data->{$key} = $value;
 			}
 
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
@@ -609,7 +656,7 @@ class BlockedLog
 			foreach ($object as $key=>$value)
 			{
 				if (in_array($key, $arrayoffieldstoexclude)) continue; // Discard some properties
-				if (!is_object($value)) $this->object_data->{$key} = $value;
+				if (!is_object($value) && !is_null($value) && $value !== '') $this->object_data->{$key} = $value;
 			}
 
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
@@ -626,31 +673,24 @@ class BlockedLog
 	 */
 	public function fetch($id)
 	{
-
 		global $langs;
 
-		dol_syslog(get_class($this)."::fetch id=".$id, LOG_DEBUG);
-
 		if (empty($id))
 		{
 			$this->error = 'BadParameter';
 			return -1;
 		}
 
-		$langs->load("blockedlog");
-
 		$sql = "SELECT b.rowid, b.date_creation, b.signature, b.signature_line, b.amounts, b.action, b.element, b.fk_object, b.entity,";
 		$sql .= " b.certified, b.tms, b.fk_user, b.user_fullname, b.date_object, b.ref_object, b.object_data, b.object_version";
 		$sql .= " FROM ".MAIN_DB_PREFIX."blockedlog as b";
-		if ($id) $sql .= " WHERE b.rowid = ".$id;
+		if ($id) $sql .= " WHERE b.rowid = ".((int) $id);
 
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			if ($this->db->num_rows($resql))
-			{
-				$obj = $this->db->fetch_object($resql);
-
+			$obj = $this->db->fetch_object($resql);
+			if ($obj) {
 				$this->id = $obj->rowid;
 				$this->entity = $obj->entity;
 				$this->ref				= $obj->rowid;
@@ -678,6 +718,7 @@ class BlockedLog
 
 				return 1;
 			} else {
+				$langs->load("blockedlog");
 				$this->error = $langs->trans("RecordNotFound");
 				return 0;
 			}
@@ -840,10 +881,11 @@ class BlockedLog
 	/**
 	 *	Check if current signature still correct compared to the value in chain
 	 *
-	 *	@param	string		$previoushash		If previous signature hash is known, we can provide it to avoid to make a search of it in database.
-	 *	@return	boolean							True if OK, False if KO
+	 *	@param	string			$previoushash		If previous signature hash is known, we can provide it to avoid to make a search of it in database.
+	 *  @param	int				$returnarray		1=Return array of details, 2=Return array of details including keyforsignature, 0=Boolean
+	 *	@return	boolean|array						True if OK, False if KO
 	 */
-	public function checkSignature($previoushash = '')
+	public function checkSignature($previoushash = '', $returnarray = 0)
 	{
 		if (empty($previoushash))
 		{
@@ -852,7 +894,7 @@ class BlockedLog
 		// Recalculate hash
 		$keyforsignature = $this->buildKeyForSignature();
 
-		$signature_line = dol_hash($keyforsignature, '5'); // Not really usefull
+		//$signature_line = dol_hash($keyforsignature, '5'); // Not really usefull
 		$signature = dol_hash($previoushash.$keyforsignature, '5');
 		//var_dump($previoushash); var_dump($keyforsignature); var_dump($signature_line); var_dump($signature);
 
@@ -862,7 +904,17 @@ class BlockedLog
 			$this->error = 'Signature KO';
 		}
 
-		return $res;
+		if ($returnarray) {
+			if ($returnarray == 1) {
+				unset($keyforsignature);
+				return array('checkresult' => $res, 'calculatedsignature' => $signature, 'previoushash' => $previoushash);
+			} else {	// Consume much memory ($keyforsignature is a large var)
+				return array('checkresult' => $res, 'calculatedsignature' => $signature, 'previoushash' => $previoushash, 'keyforsignature'=>$keyforsignature);
+			}
+		} else {
+			unset($keyforsignature);
+			return $res;
+		}
 	}
 
 	/**
@@ -941,25 +993,27 @@ class BlockedLog
 	 */
 	public function getLog($element, $fk_object, $limit = 0, $sortfield = '', $sortorder = '', $search_fk_user = -1, $search_start = -1, $search_end = -1, $search_ref = '', $search_amount = '', $search_code = '')
 	{
-		global $conf, $cachedlogs;
+		global $conf;
+		//global $cachedlogs;
 
 		/* $cachedlogs allow fastest search */
-		if (empty($cachedlogs)) $cachedlogs = array();
+		//if (empty($cachedlogs)) $cachedlogs = array();
 
 		if ($element == 'all') {
 	 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
-	         WHERE entity=".$conf->entity;
+			 WHERE entity=".$conf->entity;
 		} elseif ($element == 'not_certified') {
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
-	         WHERE entity=".$conf->entity." AND certified = 0";
+			 WHERE entity=".$conf->entity." AND certified = 0";
 		} elseif ($element == 'just_certified') {
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
-	         WHERE entity=".$conf->entity." AND certified = 1";
+			 WHERE entity=".$conf->entity." AND certified = 1";
 		} else {
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
-	         WHERE entity=".$conf->entity." AND element='".$element."' AND fk_object=".(int) $fk_object;
+			 WHERE entity=".$conf->entity." AND element='".$this->db->escape($element)."'";
 		}
 
+		if ($fk_object)	          $sql .= natural_search("rowid", $fk_object, 1);
 		if ($search_fk_user > 0)  $sql .= natural_search("fk_user", $search_fk_user, 2);
 		if ($search_start > 0)    $sql .= " AND date_creation >= '".$this->db->idate($search_start)."'";
 		if ($search_end > 0)      $sql .= " AND date_creation <= '".$this->db->idate($search_end)."'";
@@ -984,15 +1038,16 @@ class BlockedLog
 					return -2;
 				}
 
-				if (!isset($cachedlogs[$obj->rowid]))
-				{
-					$b = new BlockedLog($this->db);
-					$b->fetch($obj->rowid);
+				//if (!isset($cachedlogs[$obj->rowid]))
+				//{
+				$b = new BlockedLog($this->db);
+				$b->fetch($obj->rowid);
+				//$b->loadTrackedEvents();
+				//$cachedlogs[$obj->rowid] = $b;
+				//}
 
-					$cachedlogs[$obj->rowid] = $b;
-				}
-
-				$results[] = $cachedlogs[$obj->rowid];
+				//$results[] = $cachedlogs[$obj->rowid];
+				$results[] = $b;
 			}
 
 			return $results;
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 5c170d0aa72..47f1d336279 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -134,10 +134,10 @@ if (empty($reshook))
 
 		// Set if we used free entry or predefined product
 		$idprod = (int) GETPOST('idprod', 'int');
-		$qty = GETPOST('qty', 'int');
-		$qty_frozen = GETPOST('qty_frozen', 'int');
+		$qty = price2num(GETPOST('qty', 'alpha'), 'MS');
+		$qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS');
 		$disable_stock_change = GETPOST('disable_stock_change', 'int');
-		$efficiency = GETPOST('efficiency', 'int');
+		$efficiency = price2num(GETPOST('efficiency', 'alpha'));
 
 		if ($qty == '') {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
@@ -155,8 +155,6 @@ if (empty($reshook))
 
 		if (!$error)
 		{
-			$lastposition = 0;
-
 			$bomline = new BOMLine($db);
 			$bomline->fk_bom = $id;
 			$bomline->fk_product = $idprod;
@@ -181,8 +179,10 @@ if (empty($reshook))
 				unset($_POST['qty_frozen']);
 				unset($_POST['disable_stock_change']);
 
-				$object->fetchLines();
-			}
+    		    $object->fetchLines();
+
+    		    $object->calculateCosts();
+    		}
 		}
 	}
 
@@ -193,10 +193,10 @@ if (empty($reshook))
 		$error = 0;
 
 		// Set if we used free entry or predefined product
-		$qty = price2num(GETPOST('qty', 'int'));
-		$qty_frozen = GETPOST('qty_frozen', 'int');
+		$qty = price2num(GETPOST('qty', 'alpha'), 'MS');
+		$qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS');
 		$disable_stock_change = GETPOST('disable_stock_change', 'int');
-		$efficiency = price2num(GETPOST('efficiency', 'int'));
+		$efficiency = price2num(GETPOST('efficiency', 'alpha'));
 
 		if ($qty == '') {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
@@ -221,7 +221,9 @@ if (empty($reshook))
 			unset($_POST['qty_frozen']);
 			unset($_POST['disable_stock_change']);
 
-			$object->fetchLines();
+		    $object->fetchLines();
+
+		    $object->calculateCosts();
 		}
 	}
 }
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index d29cdb7c6bb..9e54fc67e8a 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -113,7 +113,6 @@ if (!empty($conf->global->PRODUCT_USE_UNITS))
 {
 	$coldisplay++;
 	print '<td class="nobottom linecoluseunit left">';
-	// print $form->selectUnits(empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, "units");
 	print '</td>';
 }
 
@@ -142,7 +141,7 @@ print '</td>';
 print '</tr>';
 
 if (is_object($objectline)) {
-	print $objectline->showOptionals($extrafields, 'edit', array('style'=>$bcnd[$var], 'colspan'=>$coldisplay), '', '', 1);
+	print $objectline->showOptionals($extrafields, 'edit', array('style'=>$bcnd[$var], 'colspan'=>$coldisplay), '', '', 1, 'line');
 }
 ?>
 
diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index 77638b875ff..4d10539c824 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -112,7 +112,6 @@ if (!empty($conf->global->PRODUCT_USE_UNITS))
 {
 	$coldisplay++;
 	print '<td class="nobottom linecoluseunit left">';
-	// print $form->selectUnits($line->fk_unit, "units");
 	print '</td>';
 }
 
@@ -142,7 +141,7 @@ print '</td>';
 print '</tr>';
 
 if (is_object($objectline)) {
-	print $objectline->showOptionals($extrafields, 'edit', array('style'=>$bcnd[$var], 'colspan'=>$coldisplay), '', '', 1);
+	print $objectline->showOptionals($extrafields, 'edit', array('style'=>$bcnd[$var], 'colspan'=>$coldisplay), '', '', 1, 'line');
 }
 
 print "<!-- END PHP TEMPLATE objectline_edit.tpl.php -->\n";
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 87c1a72789d..bc8506b2151 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -161,7 +161,7 @@ print '</tr>';
 //Line extrafield
 if (!empty($extrafields))
 {
-	print $line->showOptionals($extrafields, 'view', array('style'=>'class="drag drop oddeven"', 'colspan'=>$coldisplay), '', '', 1);
+	print $line->showOptionals($extrafields, 'view', array('style'=>'class="drag drop oddeven"', 'colspan'=>$coldisplay), '', '', 1, 'line');
 }
 
 print "<!-- END PHP TEMPLATE objectline_view.tpl.php -->\n";
diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php
index c049d4af16f..5f30db5d7f2 100644
--- a/htdocs/bookmarks/admin/bookmark.php
+++ b/htdocs/bookmarks/admin/bookmark.php
@@ -38,7 +38,7 @@ if ($action == 'setvalue') {
 	$showmenu = GETPOST('BOOKMARKS_SHOW_IN_MENU', 'alpha');
 	$res = dolibarr_set_const($db, "BOOKMARKS_SHOW_IN_MENU", $showmenu, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index 5f0e9baddf5..21e10c05fc7 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -62,7 +62,7 @@ if (GETPOST('action', 'alpha') == 'set')
 
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index 9468c395756..da320c7d855 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -318,8 +318,8 @@ switch ($action)
 						if ($invoice->total_ttc == $obj_facturation->amountWithTax()
 							&& $obj_facturation->getSetPaymentMode() != 'DIFF')
 						{
-							// We set status to payed
-							$result = $invoice->set_paid($user);
+							// We set status to paid
+							$result = $invoice->setPaid($user);
 				  			//print 'set paid';exit;
 						}
 					}
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index feca9c4f204..74e16f9082d 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -210,7 +210,7 @@ llxHeader("", $langs->trans("Categories"), $helpurl);
 if ($user->rights->categorie->creer)
 {
 	// Create or add
-	if ($action == 'create' || $_POST["addcat"] == 'addcat')
+	if ($action == 'create' || GETPOST("addcat") == 'addcat')
 	{
 		dol_set_focus('#label');
 
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 93b162e4f28..187691293e4 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -287,16 +287,19 @@ print dol_get_fiche_end();
  */
 
 print "<div class='tabsAction'>\n";
+$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $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 ($user->rights->categorie->creer)
+	{
+		$socid = ($object->socid ? "&socid=".$object->socid : "");
+		print '<a class="butAction" href="edit.php?id='.$object->id.$socid.'&type='.$type.'">'.$langs->trans("Modify").'</a>';
+	}
 
-if ($user->rights->categorie->creer)
-{
-	$socid = ($object->socid ? "&socid=".$object->socid : "");
-	print '<a class="butAction" href="edit.php?id='.$object->id.$socid.'&type='.$type.'">'.$langs->trans("Modify").'</a>';
-}
-
-if ($user->rights->categorie->supprimer)
-{
-	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'&type='.$type.'&backtolist='.urlencode($backtolist).'">'.$langs->trans("Delete").'</a>';
+	if ($user->rights->categorie->supprimer)
+	{
+		print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'&type='.$type.'&backtolist='.urlencode($backtolist).'">'.$langs->trans("Delete").'</a>';
+	}
 }
 
 print "</div>";
diff --git a/htdocs/collab/index.php b/htdocs/collab/index.php
index 7353ea881ee..e5fe22c9168 100644
--- a/htdocs/collab/index.php
+++ b/htdocs/collab/index.php
@@ -114,7 +114,7 @@ if ($action == 'delete')
 	if ($res > 0)
 	{
 		$res = $objectpage->delete($user);
-		if (!$res > 0)
+		if (!($res > 0))
 		{
 			$error++;
 			setEventMessages($objectpage->error, $objectpage->errors, 'errors');
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 6499db671cb..6f1e83103d5 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -228,8 +228,8 @@ if (empty($reshook) && $action == 'add')
 	$percentage = in_array(GETPOST('status'), array(-1, 100)) ?GETPOST('status') : (in_array(GETPOST('complete'), array(-1, 100)) ?GETPOST('complete') : GETPOST("percentage")); // If status is -1 or 100, percentage is not defined and we must use status
 
 	// Clean parameters
-	$datep = dol_mktime($fulldayevent ? '00' : GETPOST("aphour", 'int'), $fulldayevent ? '00' : GETPOST("apmin", 'int'), $fulldayevent ? '00' : GETPOST("apsec", 'int'), GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'));
-	$datef = dol_mktime($fulldayevent ? '23' : GETPOST("p2hour", 'int'), $fulldayevent ? '59' : GETPOST("p2min", 'int'), $fulldayevent ? '59' : GETPOST("apsec", 'int'), GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'));
+	$datep = dol_mktime($fulldayevent ? '00' : GETPOST("aphour", 'int'), $fulldayevent ? '00' : GETPOST("apmin", 'int'), $fulldayevent ? '00' : GETPOST("apsec", 'int'), GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), 'tzuser');
+	$datef = dol_mktime($fulldayevent ? '23' : GETPOST("p2hour", 'int'), $fulldayevent ? '59' : GETPOST("p2min", 'int'), $fulldayevent ? '59' : GETPOST("apsec", 'int'), GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), 'tzuser');
 
 	// Check parameters
 	if (!$datef && $percentage == 100)
@@ -479,8 +479,8 @@ if (empty($reshook) && $action == 'update')
 		$object->fetch_userassigned();
 		$object->oldcopy = clone $object;
 
-		$datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'));
-		$datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2min, $fulldayevent ? '59' : '0', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'));
+		$datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), 'tzuser');
+		$datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2min, $fulldayevent ? '59' : '0', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), 'tzuser');
 
 		$object->type_id     = dol_getIdFromCode($db, GETPOST("actioncode", 'aZ09'), 'c_actioncomm');
 		$object->label       = GETPOST("label", "alphanohtml");
@@ -953,7 +953,7 @@ if ($action == 'create')
 	// Full day
 	print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td><input type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday') ? ' checked' : '').'></td></tr>';
 
-	$datep = ($datep ? $datep : $object->datep);
+	$datep = ($datep ? $datep : (is_null($object->datep) ? '' : $object->datep));
 	if (GETPOST('datep', 'int', 1)) $datep = dol_stringtotime(GETPOST('datep', 'int', 1), 0);
 	$datef = ($datef ? $datef : $object->datef);
 	if (GETPOST('datef', 'int', 1)) $datef = dol_stringtotime(GETPOST('datef', 'int', 1), 0);
@@ -1324,8 +1324,8 @@ if ($id > 0)
 	{
 		$percentage = in_array(GETPOST('status'), array(-1, 100)) ?GETPOST('status') : (in_array(GETPOST('complete'), array(-1, 100)) ?GETPOST('complete') : GETPOST("percentage")); // If status is -1 or 100, percentage is not defined and we must use status
 
-		$datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'));
-		$datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2min, $fulldayevent ? '59' : '0', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'));
+		$datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), 'tzuser');
+		$datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2min, $fulldayevent ? '59' : '0', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), 'tzuser');
 
 		$object->type_id     = dol_getIdFromCode($db, GETPOST("actioncode", 'aZ09'), 'c_actioncomm');
 		$object->label       = GETPOST("label", "alphanohtml");
@@ -1430,23 +1430,23 @@ if ($id > 0)
 
 		// Full day event
 		print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3"><input type="checkbox" id="fullday" name="fullday" '.($object->fulldayevent ? ' checked' : '').'></td></tr>';
-
+		print dol_print_date($object->datep, 'dayhour', 'gmt');
 		// Date start - end
 		print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("DateActionStart").' - '.$langs->trans("DateActionEnd").'</span></td><td colspan="3">';
 		if (GETPOST("afaire") == 1) {
-			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 0, "action", 1, 1, 0, 'fulldaystart');
+			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 0, "action", 1, 1, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuser');
 		} elseif (GETPOST("afaire") == 2) {
-			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart');
+			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuser');
 		} else {
-			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart');
+			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuser');
 		}
 		print ' - ';
 		if (GETPOST("afaire") == 1) {
-			print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend');
+			print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuser');
 		} elseif (GETPOST("afaire") == 2) {
-			print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend');
+			print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuser');
 		} else {
-			print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend');
+			print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuser');
 		}
 		print '</td></tr>';
 
@@ -1884,16 +1884,16 @@ if ($id > 0)
 
 		// Date start
 		print '<tr><td>'.$langs->trans("DateActionStart").'</td><td>';
-		if (!$object->fulldayevent) print dol_print_date($object->datep, 'dayhour');
-		else print dol_print_date($object->datep, 'day');
+		if (!$object->fulldayevent) print dol_print_date($object->datep, 'dayhour', 'tzuser');
+		else 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"));
 		print '</td>';
 		print '</tr>';
 
 		// Date end
 		print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td>';
-		if (!$object->fulldayevent) print dol_print_date($object->datef, 'dayhour');
-		else print dol_print_date($object->datef, 'day');
+		if (!$object->fulldayevent) print dol_print_date($object->datef, 'dayhour', 'tzuser');
+		else 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"));
 		print '</td></tr>';
 
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 5a9b0afa336..f7e0ef6acb1 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1222,13 +1222,20 @@ class ActionComm extends CommonObject
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
 		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+    	if (!$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 = ".$user->id;
+    	}
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 		$sql .= " WHERE 1 = 1";
 		if (empty($load_state_board)) $sql .= " AND a.percent >= 0 AND a.percent < 100";
 		$sql .= " AND a.entity IN (".getEntity('agenda').")";
 		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
 		if ($user->socid) $sql .= " AND a.fk_soc = ".$user->socid;
-		if (!$user->rights->agenda->allactions->read) $sql .= " AND (a.fk_user_author = ".$user->id." OR a.fk_user_action = ".$user->id." OR a.fk_user_done = ".$user->id.")";
+		if (!$user->rights->agenda->allactions->read) {
+    	    $sql .= " AND (a.fk_user_author = ".$user->id." OR a.fk_user_action = ".$user->id." OR a.fk_user_done = ".$user->id;
+    	    $sql .= " OR ar.fk_element = ".$user->id; // Added by PV
+    	    $sql .= ")";
+		}
 
 		$resql = $this->db->query($sql);
 		if ($resql)
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index dc0ada64eb3..d5f5edbb143 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -280,10 +280,10 @@ if (empty($action) || $action == 'show_month')
 	$tmpday += ((isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1) - 1);
 	if ($tmpday >= 1) $tmpday -= 7; // If tmpday is 0 we start with sunday, if -6, we start with monday of previous week.
 	// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
-	$firstdaytoshow = dol_mktime(0, 0, 0, $prev_month, $max_day_in_prev_month + $tmpday, $prev_year, 'gmt');
+	$firstdaytoshow = dol_mktime(0, 0, 0, $prev_month, $max_day_in_prev_month + $tmpday, $prev_year, 'tzuserrel');
 	$next_day = 7 - ($max_day_in_month + 1 - $tmpday) % 7;
 	if ($next_day < 6) $next_day += 7;
-	$lastdaytoshow = dol_mktime(0, 0, 0, $next_month, $next_day, $next_year, 'gmt');
+	$lastdaytoshow = dol_mktime(0, 0, 0, $next_month, $next_day, $next_year, 'tzuserrel');
 }
 if ($action == 'show_week')
 {
@@ -304,10 +304,10 @@ if ($action == 'show_week')
 	$next_day   = $next['day'];
 
 	// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
-	$firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year, 'gmt');
+	$firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year, 'tzuserrel');
 	$lastdaytoshow = dol_time_plus_duree($firstdaytoshow, 7, 'd');
 
-	$max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year));
+	$max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year, 'gmt'));
 
 	$tmpday = $first_day;
 }
@@ -323,8 +323,8 @@ if ($action == 'show_day')
 	$next_day   = $next['day'];
 
 	// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
-	$firstdaytoshow = dol_mktime(0, 0, 0, $prev_month, $prev_day, $prev_year, 'gmt');
-	$lastdaytoshow = dol_mktime(0, 0, 0, $next_month, $next_day, $next_year, 'gmt');
+	$firstdaytoshow = dol_mktime(0, 0, 0, $prev_month, $prev_day, $prev_year, 'tzuserrel');
+	$lastdaytoshow = dol_mktime(0, 0, 0, $next_month, $next_day, $next_year, 'tzuserrel');
 }
 //print 'xx'.$prev_year.'-'.$prev_month.'-'.$prev_day;
 //print 'xx'.$next_year.'-'.$next_month.'-'.$next_day;
@@ -454,6 +454,15 @@ $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsm
 
 $viewmode .= '<span class="marginrightonly"></span>';
 
+// Add more views from hooks
+$parameters = array(); $object = null;
+$reshook = $hookmanager->executeHooks('addCalendarView', $parameters, $object, $action);
+if (empty($reshook)) {
+	$viewmode .= $hookmanager->resPrint;
+} elseif ($reshook > 1) {
+	$viewmode = $hookmanager->resPrint;
+}
+
 
 $newcardbutton = '';
 if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
@@ -505,7 +514,7 @@ if (!empty($conf->use_javascript_ajax))	// If javascript on
 	{
 		$s .= '<script type="text/javascript">'."\n";
 		$s .= 'jQuery(document).ready(function () {
-				jQuery("table input[name^=\"check_ext\"]").click(function() {
+				jQuery("div input[name^=\"check_ext\"]").click(function() {
 					var name = $(this).attr("name");
 					jQuery(".family_ext" + name.replace("check_ext", "")).toggle();
 				});
@@ -515,7 +524,7 @@ 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> '.$val['name'].' &nbsp; </div>';
+			$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>';
 		}
 	}
 
@@ -598,17 +607,18 @@ if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND (a.fk_soc IS
 if ($socid > 0) $sql .= ' AND a.fk_soc = '.$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')
 {
 	$sql .= " AND (";
-	$sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
-	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= " (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'))."')";
 	$sql .= " OR ";
-	$sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
-	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= " (a.datep2 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'))."')";
 	$sql .= " OR ";
-	$sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
-	$sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year, 'tzuserrel'))."'";
+	$sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year, 'tzuserrel'))."')";
 	$sql .= ')';
 } else {
 	// To limit array
@@ -714,9 +724,9 @@ if ($resql)
 
 			// Add an entry in actionarray for each day
 			$daycursor = $event->date_start_in_calendar;
-			$annee = dol_print_date($daycursor, '%Y');
-			$mois = dol_print_date($daycursor, '%m');
-			$jour = dol_print_date($daycursor, '%d');
+			$annee = dol_print_date($daycursor, '%Y', 'tzuserrel');
+			$mois = dol_print_date($daycursor, '%m', 'tzuserrel');
+			$jour = dol_print_date($daycursor, '%d', 'tzuserrel');
 			//var_dump(dol_print_date($event->date_start_in_calendar, 'dayhour', 'gmt'));
 			//var_dump($annee.'-'.$mois.'-'.$jour);
 
@@ -1222,11 +1232,11 @@ if (empty($action) || $action == 'show_month')      // View by month
 	print '<table width="100%" class="noborder nocellnopadd cal_pannel cal_month">';
 	print ' <tr class="liste_titre">';
 	// Column title of weeks numbers
-	echo '  <td align="center">#</td>';
+	echo '  <td class="center">#</td>';
 	$i = 0;
 	while ($i < 7)
 	{
-		print '  <td class="center bold uppercase tdfordaytitle">';
+		print '  <td class="center bold uppercase tdfordaytitle'.($i == 0 ? ' borderleft' : '').'">';
 		$numdayinweek = (($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7);
 		if (!empty($conf->dol_optimize_smallscreen))
 		{
@@ -1530,9 +1540,9 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 
 	foreach ($eventarray as $daykey => $notused)
 	{
-		$annee = date('Y', $daykey);
-		$mois = date('m', $daykey);
-		$jour = date('d', $daykey);
+		$annee = dol_print_date($daykey, '%Y');
+		$mois =  dol_print_date($daykey, '%m');
+		$jour =  dol_print_date($daykey, '%d');
 
 		if ($day == $jour && $month == $mois && $year == $annee)
 		{
@@ -1694,20 +1704,17 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 						if (empty($event->fulldayevent))
 						{
 							// Show hours (start ... end)
-							$tmpyearstart  = date('Y', $event->date_start_in_calendar);
-							$tmpmonthstart = date('m', $event->date_start_in_calendar);
-							$tmpdaystart   = date('d', $event->date_start_in_calendar);
-							$tmpyearend    = date('Y', $event->date_end_in_calendar);
-							$tmpmonthend   = date('m', $event->date_end_in_calendar);
-							$tmpdayend     = date('d', $event->date_end_in_calendar);
-							/*var_dump($tmpyearstart.' '.$tmpmonthstart.' '.$tmpdaystart);
-							var_dump($tmpyearend.' '.$tmpmonthend.' '.$tmpdayend);
-							var_dump($annee.' '.$mois.' '.$jour);*/
+							$tmpyearstart  = dol_print_date($event->date_start_in_calendar, '%Y', 'tzuserrel');
+							$tmpmonthstart = dol_print_date($event->date_start_in_calendar, '%m', 'tzuserrel');
+							$tmpdaystart   = dol_print_date($event->date_start_in_calendar, '%d', 'tzuserrel');
+							$tmpyearend    = dol_print_date($event->date_end_in_calendar, '%Y', 'tzuserrel');
+							$tmpmonthend   = dol_print_date($event->date_end_in_calendar, '%m', 'tzuserrel');
+							$tmpdayend     = dol_print_date($event->date_end_in_calendar, '%d', 'tzuserrel');
 
 							// Hour start
 							if ($tmpyearstart == $annee && $tmpmonthstart == $mois && $tmpdaystart == $jour)
 							{
-								$daterange .= dol_print_date($event->date_start_in_calendar, 'hour'); // Il faudrait utiliser ici tzuser, mais si on ne peut pas car qd on rentre un date dans fiche action, en input la conversion local->gmt se base sur le TZ server et non user
+								$daterange .= dol_print_date($event->date_start_in_calendar, 'hour', 'tzuserrel');
 								if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar)
 								{
 									if ($tmpyearstart == $tmpyearend && $tmpmonthstart == $tmpmonthend && $tmpdaystart == $tmpdayend)
@@ -1727,7 +1734,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 							if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar)
 							{
 								if ($tmpyearend == $annee && $tmpmonthend == $mois && $tmpdayend == $jour)
-								$daterange .= dol_print_date($event->date_end_in_calendar, 'hour'); // Il faudrait utiliser ici tzuser, mais si on ne peut pas car qd on rentre un date dans fiche action, en input la conversion local->gmt se base sur le TZ server et non user
+								$daterange .= dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
 							}
 						} else {
 							if ($showinfo)
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 7fc58b73c9f..b1d864589e8 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -67,9 +67,9 @@ $search_id = GETPOST('search_id', 'alpha');
 $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'));
-$datestart = dol_mktime(0, 0, 0, GETPOST('datestartmonth', 'int'), GETPOST('datestartday', 'int'), GETPOST('datestartyear', 'int'));
-$dateend = dol_mktime(0, 0, 0, GETPOST('dateendmonth', 'int'), GETPOST('dateendday', 'int'), GETPOST('dateendyear', 'int'));
+$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');
 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);
 
@@ -136,9 +136,9 @@ $arrayfields = array(
 	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
 	'a.fk_contact'=>array('label'=>"Contact", 'checked'=>0),
 	'a.fk_element'=>array('label'=>"LinkedObject", 'checked'=>1, 'enabled'=>(!empty($conf->global->AGENDA_SHOW_LINKED_OBJECT))),
-	'a.percent'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
-	'a.datec'=>array('label'=>'DateCreation', 'checked'=>0),
-	'a.tms'=>array('label'=>'DateModification', 'checked'=>0)
+	'a.datec'=>array('label'=>'DateCreation', 'checked'=>0, 'position'=>510),
+	'a.tms'=>array('label'=>'DateModification', 'checked'=>0, 'position'=>520),
+	'a.percent'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000)
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -366,7 +366,7 @@ if ($socid > 0) $sql .= " AND s.rowid = ".$socid;
 if ($filtert > 0 || $usergroup > 0) $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
 if ($type) $sql .= " AND c.id = ".(int) $type;
 if ($search_status == '0') { $sql .= " AND a.percent = 0"; }
-if ($search_status == '-1') { $sql .= " AND a.percent = -1"; }	// Not applicable
+if ($search_status == 'na') { $sql .= " AND a.percent = -1"; }	// Not applicable
 if ($search_status == '50') { $sql .= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started
 if ($search_status == '100') { $sql .= " AND a.percent = 100"; }
 if ($search_status == 'done') { $sql .= " AND (a.percent = 100)"; }
@@ -474,11 +474,9 @@ if ($resql)
 	// Calendars from hooks
 	$parameters = array(); $object = null;
 	$reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
-	if (empty($reshook))
-	{
+	if (empty($reshook)) {
 		$s .= $hookmanager->resPrint;
-	} elseif ($reshook > 1)
-	{
+	} elseif ($reshook > 1) {
 		$s = $hookmanager->resPrint;
 	}
 
@@ -515,6 +513,15 @@ if ($resql)
 
 	$viewmode .= '<span class="marginrightonly"></span>';
 
+	// Add more views from hooks
+	$parameters = array(); $object = null;
+	$reshook = $hookmanager->executeHooks('addCalendarView', $parameters, $object, $action);
+	if (empty($reshook)) {
+		$viewmode .= $hookmanager->resPrint;
+	} elseif ($reshook > 1) {
+		$viewmode = $hookmanager->resPrint;
+	}
+
 	$tmpforcreatebutton = dol_getdate(dol_now(), true);
 
 	$newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$tmpforcreatebutton['year'];
@@ -559,12 +566,12 @@ if ($resql)
 	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);
+		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);
+		print $form->selectDate($dateend, 'dateend', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', '', 'tzuserrel');
 		print '</td>';
 	}
 	if (!empty($arrayfields['s.nom']['checked'])) {
@@ -732,7 +739,7 @@ if ($resql)
 		// Start date
 		if (!empty($arrayfields['a.datep']['checked'])) {
 			print '<td class="center nowraponall">';
-			print dol_print_date($db->jdate($obj->dp), $formatToUse);
+			print dol_print_date($db->jdate($obj->dp), $formatToUse, 'tzuser');
 			$late = 0;
 			if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late = 1;
 			if ($obj->percent == 0 && !$obj->dp && $obj->dp2 && $db->jdate($obj->dp) < ($now - $delay_warning)) $late = 1;
@@ -745,7 +752,7 @@ if ($resql)
 		// End date
 		if (!empty($arrayfields['a.datep2']['checked'])) {
 			print '<td class="center nowraponall">';
-			print dol_print_date($db->jdate($obj->dp2), $formatToUse);
+			print dol_print_date($db->jdate($obj->dp2), $formatToUse, 'tzuser');
 			print '</td>';
 		}
 
@@ -830,11 +837,11 @@ if ($resql)
 		// Date creation
 		if (!empty($arrayfields['a.datec']['checked'])) {
 			// Status/Percent
-			print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->datec), 'dayhour').'</td>';
+			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').'</td>';
+			print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->datem), 'dayhour', 'tzuser').'</td>';
 		}
 		if (!empty($arrayfields['a.percent']['checked'])) {
 			// Status/Percent
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 29b86b96868..a399ee3d580 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -265,7 +265,7 @@ $next_month = $month;
 $next_day   = $day;
 
 // Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
-$firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year, 'gmt');
+$firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year, 'tzuserrel');
 $lastdaytoshow = dol_time_plus_duree($firstdaytoshow, 7, 'd');
 //print $firstday.'-'.$first_month.'-'.$first_year;
 //print dol_print_date($firstdaytoshow,'dayhour');
@@ -384,6 +384,15 @@ $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsm
 
 $viewmode .= '<span class="marginrightonly"></span>';
 
+// Add more views from hooks
+$parameters = array(); $object = null;
+$reshook = $hookmanager->executeHooks('addCalendarView', $parameters, $object, $action);
+if (empty($reshook)) {
+	$viewmode .= $hookmanager->resPrint;
+} elseif ($reshook > 1) {
+	$viewmode = $hookmanager->resPrint;
+}
+
 
 $newcardbutton = '';
 if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
@@ -473,14 +482,14 @@ if ($filtert > 0 || $usergroup > 0) $sql .= " AND ar.fk_actioncomm = a.id AND ar
 if ($action == 'show_day')
 {
 	$sql .= " AND (";
-	$sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+	$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))."')";
 	$sql .= " OR ";
-	$sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
+	$sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year, 'tzuserrel'))."'";
 	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
 	$sql .= " OR ";
 	$sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
-	$sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year, 'tzuserrel'))."')";
 	$sql .= ')';
 } else {
 	// To limit array
@@ -590,9 +599,9 @@ if ($resql)
 
 			// Add an entry in actionarray for each day
 			$daycursor = $event->date_start_in_calendar;
-			$annee = dol_print_date($daycursor, '%Y');
-			$mois = dol_print_date($daycursor, '%m');
-			$jour = dol_print_date($daycursor, '%d');
+			$annee = dol_print_date($daycursor, '%Y', 'tzuserrel');
+			$mois = dol_print_date($daycursor, '%m', 'tzuserrel');
+			$jour = dol_print_date($daycursor, '%d', 'tzuserrel');
 
 			// Loop on each day covered by action to prepare an index to show on calendar
 			$loop = true; $j = 0;
@@ -849,9 +858,9 @@ 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', 'gmt');
-		$mois =  dol_print_date($daykey, '%m', 'gmt');
-		$jour =  dol_print_date($daykey, '%d', 'gmt');
+		$annee = dol_print_date($daykey, '%Y');
+		$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 ?
 		{
@@ -922,9 +931,9 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 					$newcolor = ''; //init
 					if (empty($event->fulldayevent))
 					{
-						$a = dol_mktime((int) $h, 0, 0, $month, $day, $year, 'auto', 0);
-						$b = dol_mktime((int) $h, 30, 0, $month, $day, $year, 'auto', 0);
-						$c = dol_mktime((int) $h + 1, 0, 0, $month, $day, $year, 'auto', 0);
+						$a = dol_mktime((int) $h, 0, 0, $month, $day, $year, 'tzuserrel', 0);
+						$b = dol_mktime((int) $h, 30, 0, $month, $day, $year, 'tzuserrel', 0);
+						$c = dol_mktime((int) $h + 1, 0, 0, $month, $day, $year, 'tzuserrel', 0);
 
 						$dateendtouse = $event->date_end_in_calendar;
 						if ($dateendtouse == $event->date_start_in_calendar) $dateendtouse++;
@@ -935,13 +944,13 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 						{
 							$busy = $event->transparency;
 							$cases1[$h][$event->id]['busy'] = $busy;
-							$cases1[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour');
+							$cases1[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzuserrel');
 							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
 							{
 								$tmpa = dol_getdate($event->date_start_in_calendar, true);
 								$tmpb = dol_getdate($event->date_end_in_calendar, true);
-								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
-								else $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
+								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
+								else $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel');
 							}
 							if ($event->label) $cases1[$h][$event->id]['string'] .= ' - '.$event->label;
 							$cases1[$h][$event->id]['typecode'] = $event->type_code;
@@ -981,13 +990,13 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 						{
 							$busy = $event->transparency;
 							$cases2[$h][$event->id]['busy'] = $busy;
-							$cases2[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour');
+							$cases2[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzuserrel');
 							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
 							{
 								$tmpa = dol_getdate($event->date_start_in_calendar, true);
 								$tmpb = dol_getdate($event->date_end_in_calendar, true);
-								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
-								else $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
+								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
+								else $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel');
 							}
 							if ($event->label) $cases2[$h][$event->id]['string'] .= ' - '.$event->label;
 							$cases2[$h][$event->id]['typecode'] = $event->type_code;
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 55e6725ba8d..6b54a327705 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -389,13 +389,26 @@ $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsm
 
 $viewmode .= '<span class="marginrightonly"></span>';
 
+// Add more views from hooks
+$parameters = array(); $object = null;
+$reshook = $hookmanager->executeHooks('addCalendarView', $parameters, $object, $action);
+if (empty($reshook)) {
+	$viewmode .= $hookmanager->resPrint;
+} elseif ($reshook > 1) {
+	$viewmode = $hookmanager->resPrint;
+}
+
 
 $newcardbutton = '';
 if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
 {
 	$tmpforcreatebutton = dol_getdate(dol_now(), true);
 
-	$newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$tmpforcreatebutton['year'];
+	$newparam .= '&month='.urlencode(str_pad($month, 2, "0", STR_PAD_LEFT)).'&year='.urlencode($tmpforcreatebutton['year']);
+	if ($begin_h !== '') $newparam .= '&begin_h='.urlencode($begin_h);
+	if ($end_h !== '') $newparam .= '&end_h='.urlencode($end_h);
+	if ($begin_d !== '') $newparam .= '&begin_d='.urlencode($begin_d);
+	if ($end_d !== '') $newparam .= '&end_d='.urlencode($end_d);
 
 	//$param='month='.$monthshown.'&year='.$year;
 	$hourminsec = '100000';
@@ -478,14 +491,14 @@ if ($filtert > 0 || $usergroup > 0) $sql .= " AND ar.fk_actioncomm = a.id AND ar
 if ($action == 'show_day')
 {
 	$sql .= " AND (";
-	$sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
-	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= " (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'))."')";
 	$sql .= " OR ";
-	$sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
-	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= " (a.datep2 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'))."')";
 	$sql .= " OR ";
-	$sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."'";
-	$sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
+	$sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year, 'tzuserrel'))."'";
+	$sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year, 'tzuserrel'))."')";
 	$sql .= ')';
 } else {
 	// To limit array
@@ -596,9 +609,10 @@ if ($resql)
 
 			// Add an entry in actionarray for each day
 			$daycursor = $event->date_start_in_calendar;
-			$annee = dol_print_date($daycursor, '%Y');
-			$mois = dol_print_date($daycursor, '%m');
-			$jour = dol_print_date($daycursor, '%d');
+			$annee = dol_print_date($daycursor, '%Y', 'tzuserrel');
+			$mois = dol_print_date($daycursor, '%m', 'tzuserrel');
+			$jour = dol_print_date($daycursor, '%d', 'tzuserrel');
+			//print $daycursor.' '.dol_print_date($daycursor, 'dayhour', 'gmt').' '.$event->id.' -> '.$annee.'-'.$mois.'-'.$jour.'<br>';
 
 			// Loop on each day covered by action to prepare an index to show on calendar
 			$loop = true; $j = 0;
@@ -911,7 +925,7 @@ jQuery(document).ready(function() {
 		if (ids == \'none\') /* No event */
 		{
 			/* alert(\'no event\'); */
-			url = "'.DOL_URL_ROOT.'/comm/action/card.php?action=create&assignedtouser="+userid+"&datep="+year+month+day+hour+min+"00&backtopage='.urlencode($_SERVER["PHP_SELF"].'?year='.$year.'&month='.$month.'&day='.$day).'"
+			url = "'.DOL_URL_ROOT.'/comm/action/card.php?action=create&assignedtouser="+userid+"&datep="+year+month+day+hour+min+"00&backtopage='.urlencode($_SERVER["PHP_SELF"].'?year='.$year.'&month='.$month.'&day='.$day.($begin_h !== '' ? '&begin_h='.$begin_h : '').($end_h !== '' ? '&end_h='.$end_h : '').($begin_d !== '' ? '&begin_d='.$begin_d : '').($end_d !== '' ? '&end_d='.$end_d : '')).'"
 			window.location.href = url;
 		}
 		else if (ids.indexOf(",") > -1)	/* There is several events */
@@ -970,7 +984,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 	$cases2 = array(); // Color second half hour
 
 	$i = 0; $numother = 0; $numbirthday = 0; $numical = 0; $numicals = array();
-	$ymd = sprintf("%04d", $year).sprintf("%02d", $month).sprintf("%02d", $day);
+	//$ymd = sprintf("%04d", $year).sprintf("%02d", $month).sprintf("%02d", $day);
 
 	$colorindexused[$user->id] = 0; // Color index for current user (user->id) is always 0
 	$nextindextouse = count($colorindexused); // At first run this is 0, so first user has 0, next 1, ...
@@ -979,16 +993,16 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 	// We are in a particular day for $username, now we scan all events
 	foreach ($eventarray as $daykey => $notused)
 	{
-		$annee = dol_print_date($daykey, '%Y', 'gmt');
-		$mois =  dol_print_date($daykey, '%m', 'gmt');
-		$jour =  dol_print_date($daykey, '%d', 'gmt');
+		$annee = dol_print_date($daykey, '%Y');
+		$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
 			foreach ($eventarray[$daykey] as $index => $event)
 			{
-				//print $daykey.' '.$year.'-'.$month.'-'.$day.' -> '.$event->id.' '.$index.' '.$annee.'-'.$mois.'-'.$jour."<br>\n";
+				//print $daykey.' '.dol_print_date($daykey, 'dayhour', 'gmt').' '.$year.'-'.$month.'-'.$day.' -> '.$event->id.' '.$index.' '.$annee.'-'.$mois.'-'.$jour."<br>\n";
 				//var_dump($event);
 
 				$keysofuserassigned = array_keys($event->userassigned);
@@ -1069,7 +1083,6 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 					// Define color
 					$color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
 				}
-				//$cssclass=$cssclass.' '.$cssclass.'_day_'.$ymd;
 
 				// Define all rects with event (cases1 is first half hour, cases2 is second half hour)
 				for ($h = $begin_h; $h < $end_h; $h++)
@@ -1078,9 +1091,9 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 					$newcolor = ''; //init
 					if (empty($event->fulldayevent))
 					{
-						$a = dol_mktime((int) $h, 0, 0, $month, $day, $year, 'auto', 0);
-						$b = dol_mktime((int) $h, 30, 0, $month, $day, $year, 'auto', 0);
-						$c = dol_mktime((int) $h + 1, 0, 0, $month, $day, $year, 'auto', 0);
+						$a = dol_mktime((int) $h, 0, 0, $month, $day, $year, 'tzuserrel', 0);
+						$b = dol_mktime((int) $h, 30, 0, $month, $day, $year, 'tzuserrel', 0);
+						$c = dol_mktime((int) $h + 1, 0, 0, $month, $day, $year, 'tzuserrel', 0);
 
 						$dateendtouse = $event->date_end_in_calendar;
 						if ($dateendtouse == $event->date_start_in_calendar) $dateendtouse++;
@@ -1091,13 +1104,13 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 						{
 							$busy = $event->transparency;
 							$cases1[$h][$event->id]['busy'] = $busy;
-							$cases1[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour');
+							$cases1[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzuserrel');
 							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
 							{
 								$tmpa = dol_getdate($event->date_start_in_calendar, true);
 								$tmpb = dol_getdate($event->date_end_in_calendar, true);
-								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
-								else $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
+								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
+								else $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel');
 							}
 							if ($event->label) $cases1[$h][$event->id]['string'] .= ' - '.$event->label;
 							$cases1[$h][$event->id]['typecode'] = $event->type_code;
@@ -1137,13 +1150,13 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 						{
 							$busy = $event->transparency;
 							$cases2[$h][$event->id]['busy'] = $busy;
-							$cases2[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour');
+							$cases2[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzuserrel');
 							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
 							{
 								$tmpa = dol_getdate($event->date_start_in_calendar, true);
 								$tmpb = dol_getdate($event->date_end_in_calendar, true);
-								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour');
-								else $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour');
+								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
+								else $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel');
 							}
 							if ($event->label) $cases2[$h][$event->id]['string'] .= ' - '.$event->label;
 							$cases2[$h][$event->id]['typecode'] = $event->type_code;
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 93316384c2a..1be8d68760e 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -87,7 +87,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $hookmanager->initHooks(array('thirdpartycomm', '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->client > 0) || empty($user->rights->societe->lire)) {
@@ -97,6 +97,14 @@ if ($object->id > 0) {
 
 $now = dol_now();
 
+if ($id > 0 && empty($object->id))
+{
+	// Load data of third party
+	$res = $object->fetch($id);
+	if ($object->id < 0) dol_print_error($db, $object->error, $object->errors);
+}
+
+
 
 /*
  * Actions
@@ -226,6 +234,12 @@ if (empty($reshook))
 		}
 		if ($error) $action = 'edit_extras';
 	}
+
+	// warehouse
+	if ($action == 'setwarehouse' && $user->rights->societe->creer)
+	{
+		$result = $object->setWarehouse(GETPOST('fk_warehouse', 'int'));
+	}
 }
 
 
@@ -238,13 +252,6 @@ $userstatic = new User($db);
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 
-if ($id > 0 && empty($object->id))
-{
-	// Load data of third party
-	$res = $object->fetch($id);
-	if ($object->id < 0) dol_print_error($db, $object->error, $object->errors);
-}
-
 $title = $langs->trans("CustomerCard");
 if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name;
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
@@ -266,9 +273,9 @@ if ($object->id > 0)
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
-	// Prospect/Customer
-	print '<tr><td class="titlefield">'.$langs->trans('ProspectCustomer').'</td><td>';
-	print $object->getLibCustProspStatut();
+	// Type Prospect/Customer/Supplier
+	print '<tr><td class="titlefield">'.$langs->trans('NatureOfThirdParty').'</td><td>';
+	print $object->getTypeUrl(1);
 	print '</td></tr>';
 
 	// Prefix
@@ -480,7 +487,24 @@ if ($object->id > 0)
 		print "</td>";
 		print '</tr>';
 	}
-
+	// Warehouse
+	if (!empty($conf->stock->enabled))
+	{
+		$langs->load('stocks');
+		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+		$formproduct = new FormProduct($db);
+		print '<tr class="nowrap">';
+		print '<td>';
+		print $form->editfieldkey("Warehouse", 'warehouse', '', $object, $user->rights->societe->creer);
+		print '</td><td>';
+		if ($action == 'editwarehouse') {
+			$formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_warehouse, 'fk_warehouse', 1);
+		} else {
+			$formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_warehouse, 'none');
+		}
+		print '</td>';
+		print '</tr>';
+	}
 	// Preferred shipping Method
 	if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD)) {
 		print '<tr><td class="nowrap">';
@@ -507,11 +531,12 @@ if ($object->id > 0)
 		print '<table class="centpercent nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans('IntracommReportTransportMode');
 		print '<td>';
-		if (($action != 'edittransportmode') && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edittransportmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+		if (($action != 'edittransportmode') && $user->rights->societe->creer) {
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edittransportmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
-		if ($action == 'edittransportmode')
-		{
+		if ($action == 'edittransportmode') {
 			$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_transport_mode, 'fk_transport_mode', 1);
 		}
 		else {
@@ -538,8 +563,7 @@ if ($object->id > 0)
 	include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
 
 	// Module Adherent
-	if (!empty($conf->adherent->enabled))
-	{
+	if (!empty($conf->adherent->enabled)) {
 		$langs->load("members");
 		$langs->load("users");
 
@@ -547,10 +571,9 @@ if ($object->id > 0)
 		print '<td>';
 		$adh = new Adherent($db);
 		$result = $adh->fetch('', '', $object->id);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$adh->ref = $adh->getFullName($langs);
-			print $adh->getNomUrl(1);
+			print $adh->getNomUrl(-1);
 		} else {
 			print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
 		}
@@ -1266,6 +1289,12 @@ if ($object->id > 0)
 		}
 	}
 
+	// Allow external modules to add their own shortlist of recent objects
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('addMoreRecentObjects', $parameters, $object, $action);
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	else print $hookmanager->resPrint;
+
 	print '</div></div></div>';
 	print '<div style="clear:both"></div>';
 
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 384b88655f6..46636f93812 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -161,10 +161,18 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 
 		if ($num > 0) {
 			$i = 0;
+			$othernb = 0;
 
-			while ($i < $nbofloop) {
+			while ($i < $num && $i < $conf->liste_limit) {
 				$obj = $db->fetch_object($resql);
 
+				if ($i >= $max) {
+					$othernb += 1;
+					$i++;
+					$total += (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc);
+					continue;
+				}
+
 				$propalstatic->id = $obj->rowid;
 				$propalstatic->ref = $obj->ref;
 				$propalstatic->ref_client = $obj->ref_client;
@@ -196,6 +204,14 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 				$i++;
 				$total += (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc);
 			}
+
+			if ($othernb) {
+				print '<tr class="oddeven">';
+				print '<td class="nowrap" colspan="5">';
+				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
+				print '</td>';
+				print "</tr>\n";
+			}
 		}
 
 		addSummaryTableLine(3, $num, $nbofloop, $total, "NoProposal");
@@ -236,10 +252,18 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 
 		if ($num > 0) {
 			$i = 0;
+			$othernb = 0;
 
-			while ($i < $nbofloop) {
+			while ($i < $num && $i < $conf->liste_limit) {
 				$obj = $db->fetch_object($resql);
 
+				if ($i >= $max) {
+					$othernb += 1;
+					$i++;
+					$total += (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc);
+					continue;
+				}
+
 				$supplierproposalstatic->id = $obj->rowid;
 				$supplierproposalstatic->ref = $obj->ref;
 				$supplierproposalstatic->total_ht = $obj->total_ht;
@@ -270,6 +294,14 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 				$i++;
 				$total += (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc);
 			}
+
+			if ($othernb) {
+				print '<tr class="oddeven">';
+				print '<td class="nowrap" colspan="5">';
+				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
+				print '</td>';
+				print "</tr>\n";
+			}
 		}
 
 		addSummaryTableLine(3, $num, $nbofloop, $total, "NoProposal");
@@ -310,10 +342,18 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 
 		if ($num > 0) {
 			$i = 0;
+			$othernb = 0;
 
-			while ($i < $nbofloop) {
+			while ($i < $num && $i < $conf->liste_limit) {
 				$obj = $db->fetch_object($resql);
 
+				if ($i >= $max) {
+					$othernb += 1;
+					$i++;
+					$total += (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc);
+					continue;
+				}
+
 				$orderstatic->id = $obj->rowid;
 				$orderstatic->ref = $obj->ref;
 				$orderstatic->ref_client = $obj->ref_client;
@@ -345,6 +385,14 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 				$i++;
 				$total += (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc);
 			}
+
+			if ($othernb) {
+				print '<tr class="oddeven">';
+				print '<td class="nowrap" colspan="5">';
+				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
+				print '</td>';
+				print "</tr>\n";
+			}
 		}
 
 		addSummaryTableLine(3, $num, $nbofloop, $total, "NoProposal");
@@ -385,10 +433,18 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 
 		if ($num > 0) {
 			$i = 0;
+			$othernb = 0;
 
-			while ($i < $nbofloop) {
+			while ($i < $num && $i < $conf->liste_limit) {
 				$obj = $db->fetch_object($resql);
 
+				if ($i >= $max) {
+					$othernb += 1;
+					$i++;
+					$total += (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc);
+					continue;
+				}
+
 				$supplierorderstatic->id = $obj->rowid;
 				$supplierorderstatic->ref = $obj->ref;
 				$supplierorderstatic->ref_supplier = $obj->ref_suppliert;
@@ -420,6 +476,14 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$i++;
 				$total += (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc);
 			}
+
+			if ($othernb) {
+				print '<tr class="oddeven">';
+				print '<td class="nowrap" colspan="5">';
+				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
+				print '</td>';
+				print "</tr>\n";
+			}
 		}
 
 		addSummaryTableLine(3, $num, $nbofloop, $total, "NoProposal");
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index bcf1e9c1e3b..a2a06c2a038 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -575,17 +575,17 @@ if ($object->fetch($id) >= 0)
 		print '</td>';
 		// Source
 		print '<td class="liste_titre">';
-		print '&nbsp';
+		print '&nbsp;';
 		print '</td>';
 
 		// Date last update
 		print '<td class="liste_titre">';
-		print '&nbsp';
+		print '&nbsp;';
 		print '</td>';
 
 		// Date sending
 		print '<td class="liste_titre">';
-		print '&nbsp';
+		print '&nbsp;';
 		print '</td>';
 
 		//Statut
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 9da825e262e..8a005d2dc82 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -119,9 +119,8 @@ llxHeader('', $langs->trans("Mailing"), 'EN:Module_EMailing|FR:Module_Mailing|ES
 
 $form = new Form($db);
 
-if ($filteremail)
-{
-	$sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi,";
+if ($filteremail) {
+	$sql = "SELECT m.rowid, m.titre as title, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi,";
 	$sql .= " mc.statut as sendstatut";
 	$sql .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc";
 	$sql .= " WHERE m.rowid = mc.fk_mailing AND m.entity = ".$conf->entity;
@@ -131,7 +130,7 @@ if ($filteremail)
 	if (!$sortorder) $sortorder = "ASC";
 	if (!$sortfield) $sortfield = "m.rowid";
 } else {
-	$sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi";
+	$sql = "SELECT m.rowid, m.titre as title, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi";
 	$sql .= " FROM ".MAIN_DB_PREFIX."mailing as m";
 	$sql .= " WHERE m.entity = ".$conf->entity;
 	if ($search_ref) $sql .= " AND m.rowid = '".$db->escape($search_ref)."'";
@@ -238,9 +237,10 @@ if ($resql)
 		print $email->getNomUrl(1);
 		print '</td>';
 
+		// Title
 		print '<td>'.$obj->title.'</td>';
-		// Date creation
 
+		// Date creation
 		print '<td class="center">';
 		print dol_print_date($db->jdate($obj->datec), 'day');
 		print '</td>';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index f6a63ba9a48..da97b627858 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2013-2014  Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2014       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2016       Marcos García           <marcosgdf@gmail.com>
- * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020	    Nicolas ZABOURI         <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -129,7 +129,6 @@ $permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc
 $permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php
 $permissiontoedit = $usercancreate; // Used by the include of actions_lineupdown.inc.php
 
-
 /*
  * Actions
  */
@@ -242,6 +241,7 @@ if (empty($reshook))
 	} // Validation
 	elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate)
 	{
+		$idwarehouse = GETPOST('idwarehouse', 'int');
 		$result = $object->valid($user);
 		if ($result >= 0)
 		{
@@ -349,12 +349,13 @@ if (empty($reshook))
 					$object->demand_reason_id = GETPOST('demand_reason_id');
 					$object->fk_delivery_address = GETPOST('fk_address', 'int');
 					$object->shipping_method_id = GETPOST('shipping_method_id', 'int');
+					$object->warehouse_id = GETPOST('warehouse_id', 'int');
 					$object->duree_validite = $duration;
 					$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_percent = GETPOST('remise_percent');
-					$object->remise_absolue = GETPOST('remise_absolue');
+					$object->remise_percent = price2num(GETPOST('remise_percent'), 2);
+					$object->remise_absolue = price2num(GETPOST('remise_absolue'), 'MU');
 					$object->socid = GETPOST('socid', 'int');
 					$object->contact_id = GETPOST('contactid', 'int');
 					$object->fk_project = GETPOST('projectid', 'int');
@@ -380,6 +381,7 @@ if (empty($reshook))
 				$object->demand_reason_id = GETPOST('demand_reason_id', 'int');
 				$object->fk_delivery_address = GETPOST('fk_address', 'int');
 				$object->shipping_method_id = GETPOST('shipping_method_id', 'int');
+				$object->warehouse_id = GETPOST('warehouse_id', 'int');
 				$object->duree_validite = price2num(GETPOST('duree_validite', 'alpha'));
 				$object->cond_reglement_id = GETPOST('cond_reglement_id', 'int');
 				$object->mode_reglement_id = GETPOST('mode_reglement_id', 'int');
@@ -796,7 +798,7 @@ if (empty($reshook))
 	} elseif ($action == 'addline' && $usercancreate) {		// Add line
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOSTISSET('dp_desc') ?GETPOST('dp_desc', 'restricthtml') : '');
+		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$price_ht = price2num(GETPOST('price_ht'));
 		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'));
 		$prod_entry_mode = GETPOST('prod_entry_mode');
@@ -809,8 +811,8 @@ if (empty($reshook))
 			$tva_tx = '';
 		}
 
-		$qty = price2num(GETPOST('qty'.$predef), 'MS');
-		$remise_percent = GETPOST('remise_percent'.$predef);
+		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
+		$remise_percent = price2num(GETPOST('remise_percent'.$predef), 2);
 		if (empty($remise_percent)) $remise_percent = 0;
 
 		// Extrafields
@@ -999,11 +1001,16 @@ if (empty($reshook))
 						$outputlangs->setDefaultLang($newlang);
 					}
 
-					$desc = (!empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description;
+					$desc = (!empty($prod->multilangs[$outputlangs->defaultlang]["description"])) ? $prod->multilangs[$outputlangs->defaultlang]["description"] : $prod->description;
 				} else {
 					$desc = $prod->description;
 				}
 
+				//If text set in desc is the same as product description (as now it's preloaded) whe add it only one time
+				if ($product_desc==$desc && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
+					$product_desc='';
+				}
+
 				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) $desc = $product_desc;
 				else $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 
@@ -1203,7 +1210,7 @@ if (empty($reshook))
 				$price_min = $product->multiprices_min [$object->thirdparty->price_level];
 
 			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
-			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && ($price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent')) / 100) < price2num($price_min)))) {
+			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 - price2num(GETPOST('remise_percent'), 2) / 100) < price2num($price_min)))) {
 				setEventMessages($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), null, 'errors');
 				$error++;
 			}
@@ -1234,9 +1241,9 @@ if (empty($reshook))
 				}
 			}
 
-			$qty = price2num(GETPOST('qty'), 'MS');
+			$qty = price2num(GETPOST('qty', 'alpha'), 'MS');
 
-			$result = $object->updateline(GETPOST('lineid', 'int'), $pu_ht, $qty, GETPOST('remise_percent'), $vat_rate, $localtax1_rate, $localtax2_rate, $description, 'HT', $info_bits, $special_code, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $type, $date_start, $date_end, $array_options, $_POST["units"], $pu_ht_devise);
+			$result = $object->updateline(GETPOST('lineid', 'int'), $pu_ht, $qty, price2num(GETPOST('remise_percent'), 2), $vat_rate, $localtax1_rate, $localtax2_rate, $description, 'HT', $info_bits, $special_code, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $type, $date_start, $date_end, $array_options, GETPOST("units"), $pu_ht_devise);
 
 			if ($result >= 0) {
 				$db->commit();
@@ -1320,6 +1327,9 @@ if (empty($reshook))
 	} // shipping method
 	elseif ($action == 'setshippingmethod' && $usercancreate) {
 		$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
+	}// warehouse
+	elseif ($action == 'setwarehouse' && $usercancreate) {
+		$result = $object->setWarehouse(GETPOST('warehouse_id', 'int'));
 	} elseif ($action == 'update_extras') {
 		$object->oldcopy = dol_clone($object);
 
@@ -1464,6 +1474,7 @@ if ($action == 'create')
 			$mode_reglement_id 	= (!empty($objectsrc->mode_reglement_id) ? $objectsrc->mode_reglement_id : (!empty($soc->mode_reglement_id) ? $soc->mode_reglement_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));
+			$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);
 
 			// Replicate extrafields
@@ -1480,6 +1491,14 @@ if ($action == 'create')
 		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
 	}
 
+	//Warehouse default if null
+	if ($soc->fk_warehouse > 0) $warehouse_id = $soc->fk_warehouse;
+	if (!empty($conf->stock->enabled) && empty($warehouse_id) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER))
+	{
+		if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) $warehouse_id = $conf->global->MAIN_DEFAULT_WAREHOUSE;
+		if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) $warehouse_id = $user->fk_warehouse;
+	}
+
 	$object = new Propal($db);
 
 	print '<form name="addprop" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
@@ -1512,9 +1531,13 @@ if ($action == 'create')
 		print $soc->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$soc->id.'">';
 		print '</td>';
+		if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD) && !empty($soc->shipping_method_id)) {
+			$shipping_method_id = $soc->shipping_method_id;
+		}
+		//$warehouse_id       = $soc->warehouse_id;
 	} else {
 		print '<td>';
-		print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 maxwidth500');
+		print img_picto('', 'company').$form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 maxwidth500');
 		// reload page to retrieve customer informations
 		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED))
 		{
@@ -1534,11 +1557,11 @@ if ($action == 'create')
 	}
 	print '</tr>'."\n";
 
-	if ($socid > 0)
-	{
+	if ($socid > 0) {
 		// Contacts (ask contact only if thirdparty already defined).
 		print "<tr><td>".$langs->trans("DefaultContact").'</td><td>';
-		$form->select_contacts($soc->id, $contactid, 'contactid', 1, $srccontactslist);
+		print img_picto('', 'contact');
+		print $form->selectcontacts($soc->id, $contactid, 'contactid', 1, $srccontactslist);
 		print '</td></tr>';
 
 		// Third party discounts info line
@@ -1559,21 +1582,24 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Validaty duration
-	print '<tr><td class="fieldrequired">'.$langs->trans("ValidityDuration").'</td><td><input name="duree_validite" class="width50" value="'.(GETPOSTISSET('duree_validite') ? GETPOST('duree_validite', 'alphanohtml') : $conf->global->PROPALE_VALIDITY_DURATION).'"> '.$langs->trans("days").'</td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("ValidityDuration").'</td><td>'.img_picto('', 'clock').'&ensp;<input name="duree_validite" class="width50" value="'.(GETPOSTISSET('duree_validite') ? GETPOST('duree_validite', 'alphanohtml') : $conf->global->PROPALE_VALIDITY_DURATION).'"> '.$langs->trans("days").'</td></tr>';
 
 	// 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);
 	print '</td></tr>';
 
 	// Mode of payment
 	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
+	print img_picto('', 'bank').'&ensp;';
 	$form->select_types_paiements((GETPOSTISSET('mode_reglement_id') ? GETPOST('mode_reglement_id', 'int') : $soc->mode_reglement_id), 'mode_reglement_id');
 	print '</td></tr>';
 
 	// Bank Account
 	if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && !empty($conf->banque->enabled)) {
 		print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
+		print img_picto('', 'bank_account');
 		$form->select_comptes($soc->fk_account, 'fk_account', 0, '', 1);
 		print '</td></tr>';
 	}
@@ -1585,9 +1611,11 @@ if ($action == 'create')
 
 	// Delivery delay
 	print '<tr class="fielddeliverydelay"><td>'.$langs->trans('AvailabilityPeriod');
-	if (!empty($conf->commande->enabled))
+	if (!empty($conf->commande->enabled)) {
 		print ' ('.$langs->trans('AfterOrder').')';
+	}
 	print '</td><td>';
+	print img_picto('', 'clock').'&ensp;';
 	$form->selectAvailabilityDelay('', 'availability_id', '', 1);
 	print '</td></tr>';
 
@@ -1597,10 +1625,20 @@ if ($action == 'create')
 			$shipping_method_id = $soc->shipping_method_id;
 		}
 		print '<tr><td>'.$langs->trans('SendingMethod').'</td><td>';
+		print img_picto('', 'object_dollyrevert').'&ensp;';
 		print $form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1);
 		print '</td></tr>';
 	}
 
+	// Warehouse
+	if (!empty($conf->stock->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL)) {
+		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+		$formproduct = new FormProduct($db);
+		print '<tr><td>'.$langs->trans('Warehouse').'</td><td>';
+		print img_picto('', 'stock').$formproduct->selectWarehouses($warehouse_id, 'warehouse_id', '', 1, 0, 0, '', 0, 0, array(), 'maxwidth175 maxwidth500 widthcentpercentminusxx');
+		print '</td></tr>';
+	}
+
 	// Delivery date (or manufacturing)
 	print '<tr><td>'.$langs->trans("DeliveryDate").'</td>';
 	print '<td>';
@@ -1621,7 +1659,7 @@ if ($action == 'create')
 		$langs->load("projects");
 		print '<tr>';
 		print '<td>'.$langs->trans("Project").'</td><td>';
-		$numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
+		print img_picto('', 'project').$formproject->select_projects(($soc->id > 0 ? $soc->id : -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).'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
 		print '</td>';
 		print '</tr>';
@@ -1641,8 +1679,10 @@ if ($action == 'create')
 	print '<tr>';
 	print '<td>'.$langs->trans("DefaultModel").'</td>';
 	print '<td>';
+	print img_picto('', 'pdf').'&ensp;';
 	$liste = ModelePDFPropales::liste_modeles($db);
-	print $form->selectarray('model', $liste, ($conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT ? $conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT : $conf->global->PROPALE_ADDON_PDF));
+	$preselected = ($conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT ? $conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT : $conf->global->PROPALE_ADDON_PDF);
+	print $form->selectarray('model', $liste, $preselected, 0, 0, 0, '', 0, 0, 0, '', '', 1);
 	print "</td></tr>";
 
 	// Multicurrency
@@ -2097,6 +2137,24 @@ if ($action == 'create')
 		print '</tr>';
 	}
 
+	// Warehouse
+	if (!empty($conf->stock->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL)) {
+		$langs->load('stocks');
+		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+		$formproduct = new FormProduct($db);
+		print '<tr><td>';
+		$editenable = $usercancreate;
+		print $form->editfieldkey("Warehouse", 'warehouse', '', $object, $editenable);
+		print '</td><td>';
+		if ($action == 'editwarehouse') {
+			$formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->warehouse_id, 'warehouse_id', 1);
+		} else {
+			$formproduct->formSelectWarehouses($_SERVER['PHP_SELF'].'?id='.$object->id, $object->warehouse_id, 'none');
+		}
+		print '</td>';
+		print '</tr>';
+	}
+
 	// Origin of demand
 	print '<tr><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 10a2238088b..a115d8bca5e 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -208,6 +208,8 @@ class Propal extends CommonObject
 	public $demand_reason_id;
 	public $demand_reason_code;
 
+	public $warehouse_id;
+
 	public $extraparams = array();
 
 	/**
@@ -231,8 +233,6 @@ class Propal extends CommonObject
 	public $multicurrency_total_tva;
 	public $multicurrency_total_ttc;
 
-	public $oldcopy;
-
 
 	/**
 	 *  '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')
@@ -298,6 +298,7 @@ class Propal extends CommonObject
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'PDFTemplate', 'enabled'=>1, 'visible'=>0, 'position'=>180),
 		'date_livraison' =>array('type'=>'date', 'label'=>'DateDeliveryPlanned', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
 		'fk_shipping_method' =>array('type'=>'integer', 'label'=>'ShippingMethod', 'enabled'=>1, 'visible'=>-1, 'position'=>190),
+		'fk_warehouse' =>array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Fk warehouse', 'enabled'=>1, 'visible'=>-1, 'position'=>191),
 		'fk_availability' =>array('type'=>'integer', 'label'=>'Availability', 'enabled'=>1, 'visible'=>-1, 'position'=>195),
 		'fk_delivery_address' =>array('type'=>'integer', 'label'=>'DeliveryAddress', 'enabled'=>1, 'visible'=>0, 'position'=>200), // deprecated
 		'fk_input_reason' =>array('type'=>'integer', 'label'=>'InputReason', 'enabled'=>1, 'visible'=>-1, 'position'=>205),
@@ -484,6 +485,7 @@ class Propal extends CommonObject
 				}
 			} else {
 				$this->error = $line->error;
+				$this->errors = $line->errors;
 				$this->db->rollback();
 				return -2;
 			}
@@ -710,8 +712,8 @@ class Propal extends CommonObject
 
 				// Mise a jour informations denormalisees au niveau de la propale meme
 				$result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
-				if ($result > 0)
-				{
+
+				if ($result > 0) {
 					$this->db->commit();
 					return $this->line->id;
 				} else {
@@ -721,6 +723,7 @@ class Propal extends CommonObject
 				}
 			} else {
 				$this->error = $this->line->error;
+				$this->errors = $this->line->errors;
 				$this->db->rollback();
 				return -2;
 			}
@@ -913,7 +916,7 @@ class Propal extends CommonObject
 				return $result;
 			} else {
 				$this->error = $this->line->error;
-
+				$this->errors = $this->line->errors;
 				$this->db->rollback();
 				return -1;
 			}
@@ -1051,6 +1054,7 @@ class Propal extends CommonObject
 		$sql .= ", ref_client";
 		$sql .= ", date_livraison";
 		$sql .= ", fk_shipping_method";
+		$sql .= ", fk_warehouse";
 		$sql .= ", fk_availability";
 		$sql .= ", fk_input_reason";
 		$sql .= ", fk_projet";
@@ -1083,6 +1087,7 @@ class Propal extends CommonObject
 		$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');
+		$sql .= ", ".($this->warehouse_id > 0 ? $this->warehouse_id : 'NULL');
 		$sql .= ", ".$this->availability_id;
 		$sql .= ", ".$this->demand_reason_id;
 		$sql .= ", ".($this->fk_project ? $this->fk_project : "null");
@@ -1437,6 +1442,7 @@ class Propal extends CommonObject
 		$sql .= ", p.fk_mode_reglement";
 		$sql .= ', p.fk_account';
 		$sql .= ", p.fk_shipping_method";
+		$sql .= ", p.fk_warehouse";
 		$sql .= ", p.fk_incoterms, p.location_incoterms";
 		$sql .= ", p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc";
 		$sql .= ", p.tms as date_modification";
@@ -1510,6 +1516,7 @@ class Propal extends CommonObject
 				$this->date_livraison       = $this->db->jdate($obj->delivery_date); // deprecated
 				$this->delivery_date        = $this->db->jdate($obj->delivery_date);
 				$this->shipping_method_id   = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
+				$this->warehouse_id         = ($obj->fk_warehouse > 0) ? $obj->fk_warehouse : null;
 				$this->availability_id      = $obj->fk_availability;
 				$this->availability_code    = $obj->availability_code;
 				$this->availability         = $obj->availability;
@@ -1625,7 +1632,7 @@ class Propal extends CommonObject
 		$sql .= " fk_input_reason=".(isset($this->demand_reason_id) ? $this->demand_reason_id : "null").",";
 		$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
 		$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 .= " model_pdf=".(isset($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null").",";
 		$sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null")."";
 		$sql .= " WHERE rowid=".$this->id;
 
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index d8f523f16da..cc296e4472a 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -47,6 +47,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'propal', 'compta', 'bills', 'orders', 'products', 'deliveries', 'categories'));
+if (!empty($conf->expedition->enabled)) $langs->loadLangs(array('sendings'));
 
 $socid = GETPOST('socid', 'int');
 
@@ -66,6 +67,7 @@ $search_refproject = GETPOST('search_refproject', 'alpha');
 $search_project = GETPOST('search_project', 'alpha');
 
 $search_societe = GETPOST('search_societe', 'alpha');
+$search_societe_alias = GETPOST('search_societe_alias', 'alpha');
 $search_montant_ht = GETPOST('search_montant_ht', 'alpha');
 $search_montant_vat = GETPOST('search_montant_vat', 'alpha');
 $search_montant_ttc = GETPOST('search_montant_ttc', 'alpha');
@@ -89,6 +91,9 @@ $search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_st
 $search_datedelivery_end = dol_mktime(23, 59, 59, GETPOST('search_datedelivery_endmonth', 'int'), GETPOST('search_datedelivery_endday', 'int'), GETPOST('search_datedelivery_endyear', 'int'));
 $search_availability = GETPOST('search_availability', 'int');
 $search_categ_cus = GETPOST("search_categ_cus", 'int');
+$search_fk_cond_reglement = GETPOST("search_fk_cond_reglement", 'int');
+$search_fk_shipping_method = GETPOST("search_fk_shipping_method", 'int');
+$search_fk_mode_reglement = GETPOST("search_fk_mode_reglement", 'int');
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
 
@@ -157,6 +162,7 @@ $arrayfields = array(
 	'pr.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1)),
 	'pr.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1)),
 	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
+	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>1),
 	's.town'=>array('label'=>"Town", 'checked'=>1),
 	's.zip'=>array('label'=>"Zip", 'checked'=>1),
 	'state.nom'=>array('label'=>"StateShort", 'checked'=>0),
@@ -166,6 +172,9 @@ $arrayfields = array(
 	'p.fin_validite'=>array('label'=>"DateEnd", 'checked'=>1),
 	'p.date_livraison'=>array('label'=>"DeliveryDate", 'checked'=>0),
 	'ava.rowid'=>array('label'=>"AvailabilityPeriod", 'checked'=>0),
+	'p.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>0, 'enabled'=>!empty($conf->expedition->enabled)),
+	'p.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>0),
+	'p.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>0),
 	'p.total_ht'=>array('label'=>"AmountHT", 'checked'=>1),
 	'p.total_vat'=>array('label'=>"AmountVAT", 'checked'=>0),
 	'p.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0),
@@ -187,6 +196,7 @@ $arrayfields = array(
 	'p.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES))),
 	'p.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 );
+
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
@@ -215,6 +225,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_refproject = '';
 	$search_project = '';
 	$search_societe = '';
+	$search_societe_alias = '';
 	$search_montant_ht = '';
 	$search_montant_vat = '';
 	$search_montant_ttc = '';
@@ -243,6 +254,9 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$toselect = '';
 	$search_array_options = array();
 	$search_categ_cus = 0;
+	$search_fk_cond_reglement = '';
+	$search_fk_shipping_method = '';
+	$search_fk_mode_reglement = '';
 }
 if ($object_statut != '') $search_status = $object_statut;
 
@@ -257,6 +271,98 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
+if ($action == 'validate') {
+	if (GETPOST('confirm') == 'yes') {
+		$tmpproposal = new Propal($db);
+		$db->begin();
+		$error = 0;
+		foreach ($toselect as $checked) {
+			if ($tmpproposal->fetch($checked)) {
+				if ($tmpproposal->statut == 0) {
+					if ($tmpproposal->valid($user)) {
+						setEventMessage($tmpproposal->ref." ".$langs->trans('PassedInOpenStatus'), 'mesgs');
+					} else {
+						setEventMessage($langs->trans('CantBeValidated'), 'errors');
+						$error++;
+					}
+				} else {
+					setEventMessage($tmpproposal->ref." ".$langs->trans('IsNotADraft'), 'errors');
+					$error++;
+				}
+			}
+			dol_print_error($db);
+			$error++;
+		}
+		if ($error) {
+			$db->rollback();
+		} else {
+			$db->commit();
+		}
+	}
+}
+
+if ($action == "sign") {
+	if (GETPOST('confirm') == 'yes') {
+		$tmpproposal = new Propal($db);
+		$db->begin();
+		$error = 0;
+		foreach ($toselect as $checked) {
+			if ($tmpproposal->fetch($checked)) {
+				if ($tmpproposal->statut == 1) {
+					$tmpproposal->statut = 2;
+					if ($tmpproposal->update($user)) {
+						setEventMessage($tmpproposal->ref." ".$langs->trans('Signed'), 'mesgs');
+					} else {
+						dol_print_error($db);
+						$error++;
+					}
+				} else {
+					setEventMessage($tmpproposal->ref." ".$langs->trans('CantBeSign'), 'errors');
+					$error++;
+				}
+			} else {
+				dol_print_error($db);
+				$error++;
+			}
+		}
+		if ($error) {
+			$db->rollback();
+		} else {
+			$db->commit();
+		}
+	}
+}
+if ($action == "nosign") {
+	if (GETPOST('confirm') == 'yes') {
+		$tmpproposal = new Propal($db);
+		$db->begin();
+		$error = 0;
+		foreach ($toselect as $checked) {
+			if ($tmpproposal->fetch($checked)) {
+				if ($tmpproposal->statut == 1) {
+					$tmpproposal->statut = 3;
+					if ($tmpproposal->update($user)) {
+						setEventMessage($tmpproposal->ref." ".$langs->trans('NoSigned'), 'mesgs');
+					} else {
+						dol_print_error($db);
+						$error++;
+					}
+				} else {
+					setEventMessage($tmpproposal->ref." ".$langs->trans('CantBeClosed'), 'errors');
+					$error++;
+				}
+			} else {
+				dol_print_error($db);
+				$error++;
+			}
+		}
+		if ($error) {
+			$db->rollback();
+		} else {
+			$db->commit();
+		}
+	}
+}
 
 
 /*
@@ -277,8 +383,8 @@ $help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos'
 //llxHeader('',$langs->trans('Proposal'),$help_url);
 
 $sql = 'SELECT';
-if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
-$sql .= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';
+if ($sall || $search_product_category > 0 || $search_user > 0) $sql = 'SELECT DISTINCT';
+$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';
 $sql .= " typent.code as typent_code,";
 $sql .= " ava.rowid as availability,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
@@ -286,6 +392,7 @@ $sql .= ' p.rowid, p.entity, p.note_private, p.total_ht, p.tva as total_vat, p.t
 $sql .= ' p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva as multicurrency_total_vat, p.multicurrency_total_ttc,';
 $sql .= ' p.datec as date_creation, p.tms as date_update, p.date_cloture as date_cloture,';
 $sql .= ' p.note_public, p.note_private,';
+$sql .= ' p.fk_cond_reglement,p.fk_mode_reglement,p.fk_shipping_method,';
 $sql .= " pr.rowid as project_id, pr.ref as project_ref, pr.title as project_label,";
 $sql .= ' u.login';
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
@@ -329,14 +436,14 @@ if ($search_town)					$sql .= natural_search('s.town', $search_town);
 if ($search_zip)					$sql .= natural_search("s.zip", $search_zip);
 if ($search_state)					$sql .= natural_search("state.nom", $search_state);
 if ($search_country)				$sql .= " AND s.fk_pays IN (".$db->sanitize($db->escape($search_country)).')';
-if ($search_type_thirdparty)		$sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';
+if ($search_type_thirdparty != '' && $search_type_thirdparty > 0)		$sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';
 if ($search_ref)					$sql .= natural_search('p.ref', $search_ref);
 if ($search_refcustomer)			$sql .= natural_search('p.ref_client', $search_refcustomer);
 if ($search_refproject)				$sql .= natural_search('pr.ref', $search_refproject);
 if ($search_project)				$sql .= natural_search('pr.title', $search_project);
 if ($search_availability)			$sql .= " AND p.fk_availability IN (".$db->sanitize($db->escape($search_availability)).')';
-
 if ($search_societe)				$sql .= natural_search('s.nom', $search_societe);
+if ($search_societe_alias)			$sql .= natural_search('s.name_alias', $search_societe_alias);
 if ($search_login)					$sql .= natural_search("u.login", $search_login);
 if ($search_montant_ht != '')		$sql .= natural_search("p.total_ht", $search_montant_ht, 1);
 if ($search_montant_vat != '')		$sql .= natural_search("p.tva", $search_montant_vat, 1);
@@ -352,6 +459,10 @@ if ($sall) {
 if ($search_categ_cus > 0)			$sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
 if ($search_categ_cus == -2)		$sql .= " AND cc.fk_categorie IS NULL";
 
+if ($search_fk_cond_reglement > 0) $sql .= " AND p.fk_cond_reglement = ".$db->escape($search_fk_cond_reglement);
+if ($search_fk_shipping_method > 0) $sql .= " AND p.fk_shipping_method = ".$db->escape($search_fk_shipping_method);
+if ($search_fk_mode_reglement > 0) $sql .= " AND p.fk_mode_reglement = ".$db->escape($search_fk_mode_reglement);
+
 if ($search_product_category > 0)	$sql .= " AND cp.fk_categorie = ".$db->escape($search_product_category);
 if ($socid > 0) $sql .= ' AND s.rowid = '.$socid;
 if ($search_status != '' && $search_status != '-1')
@@ -443,6 +554,7 @@ if ($resql)
 	if ($search_refcustomer) 			$param .= '&search_refcustomer='.urlencode($search_refcustomer);
 	if ($search_refproject)  			$param .= '&search_refproject='.urlencode($search_refproject);
 	if ($search_societe)     			$param .= '&search_societe='.urlencode($search_societe);
+	if ($search_societe_alias)     		$param .= '&search_societe_alias='.urlencode($search_societe_alias);
 	if ($search_user > 0)    			$param .= '&search_user='.urlencode($search_user);
 	if ($search_sale > 0)    			$param .= '&search_sale='.urlencode($search_sale);
 	if ($search_montant_ht)  			$param .= '&search_montant_ht='.urlencode($search_montant_ht);
@@ -458,6 +570,15 @@ if ($resql)
 	if ($optioncss != '')    			$param .= '&optioncss='.urlencode($optioncss);
 	if ($search_categ_cus > 0)          $param .= '&search_categ_cus='.urlencode($search_categ_cus);
 	if ($search_product_category != '') $param .= '&search_product_category='.$search_product_category;
+	if ($search_fk_cond_reglement > 0) $param .= '&search_fk_cond_reglement='.$search_fk_cond_reglement;
+	if ($search_fk_shipping_method > 0) $param .= '&search_fk_shipping_method='.$search_fk_shipping_method;
+	if ($search_fk_mode_reglement > 0) $param .= '&search_fk_mode_reglement='.$search_fk_mode_reglement;
+	if ($search_type_thirdparty > 0) $param .= '&search_type_thirdparty='.$search_type_thirdparty;
+	if ($search_town)					$param .= '&search_town='.$search_town;
+	if ($search_zip)					$param .= '&search_zip='.$search_zip;
+	if ($search_state)					$param .= '&search_state='.$search_state;
+	if ($search_town)					$param .= '&search_town='.$search_town;
+	if ($search_country)					$param .= '&search_country='.$search_country;
 
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -469,6 +590,7 @@ if ($resql)
 		'presend'=>$langs->trans("SendByMail"),
 		'prevalidate'=>$langs->trans("Validate"),
 		'presign'=>$langs->trans("Sign"),
+		'nopresign'=>$langs->trans("NoSign"),
 	);
 	if ($user->rights->propal->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 	if ($user->rights->propal->cloturer) $arrayofmassactions['closed'] = $langs->trans("Close");
@@ -507,6 +629,11 @@ if ($resql)
 		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassSignature"), $langs->trans("ConfirmMassSignatureQuestion"), "sign", null, '', 0, 200, 500, 1);
 	}
 
+	if ($massaction == 'nopresign')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassNoSignature"), $langs->trans("ConfirmMassNoSignatureQuestion"), "nosign", null, '', 0, 200, 500, 1);
+	}
+
 	if ($sall)
 	{
 		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
@@ -602,6 +729,12 @@ if ($resql)
 		print '<input class="flat maxwidth100" type="text" name="search_societe" value="'.dol_escape_htmltag($search_societe).'">';
 		print '</td>';
 	}
+	if (!empty($arrayfields['s.name_alias']['checked']))
+	{
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat maxwidth100" type="text" name="search_societe_alias" value="'.dol_escape_htmltag($search_societe_alias).'">';
+		print '</td>';
+	}
 	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_town" value="'.$search_town.'"></td>';
 	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_zip" value="'.$search_zip.'"></td>';
 	// State
@@ -622,7 +755,7 @@ if ($resql)
 	if (!empty($arrayfields['typent.code']['checked']))
 	{
 		print '<td class="liste_titre maxwidth100onsmartphone" align="center">';
-		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
+		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 		print ajax_combobox('search_type_thirdparty');
 		print '</td>';
 	}
@@ -670,6 +803,27 @@ if ($resql)
 		print ajax_combobox('search_availability');
 		print '</td>';
 	}
+	// Shipping Method
+	if (!empty($arrayfields['p.fk_shipping_method']['checked']))
+	{
+		print '<td class="liste_titre">';
+		$form->selectShippingMethod($search_fk_shipping_method, 'search_fk_shipping_method', '', 1, '', 1);
+		print '</td>';
+	}
+	// Payment term
+	if (!empty($arrayfields['p.fk_cond_reglement']['checked']))
+	{
+		print '<td class="liste_titre">';
+		$form->select_conditions_paiements($search_fk_cond_reglement, 'search_fk_cond_reglement', -1, 1, 1);
+		print '</td>';
+	}
+	// Payment mode
+	if (!empty($arrayfields['p.fk_mode_reglement']['checked']))
+	{
+		print '<td class="liste_titre">';
+		$form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1);
+		print '</td>';
+	}
 	if (!empty($arrayfields['p.total_ht']['checked']))
 	{
 		// Amount
@@ -821,6 +975,7 @@ if ($resql)
 	if (!empty($arrayfields['pr.ref']['checked']))				print_liste_field_titre($arrayfields['pr.ref']['label'], $_SERVER["PHP_SELF"], 'pr.ref', '', $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['pr.title']['checked']))         	print_liste_field_titre($arrayfields['pr.title']['label'], $_SERVER["PHP_SELF"], 'pr.title', '', $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['s.nom']['checked']))            	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['s.name_alias']['checked']))        print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], 's.name_alias', '', $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['s.town']['checked']))           	print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['s.zip']['checked']))            	print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['state.nom']['checked']))        	print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
@@ -830,6 +985,9 @@ if ($resql)
 	if (!empty($arrayfields['p.fin_validite']['checked']))		print_liste_field_titre($arrayfields['p.fin_validite']['label'], $_SERVER["PHP_SELF"], 'dfv', '', $param, 'align="center"', $sortfield, $sortorder);
 	if (!empty($arrayfields['p.date_livraison']['checked']))	print_liste_field_titre($arrayfields['p.date_livraison']['label'], $_SERVER["PHP_SELF"], 'ddelivery', '', $param, 'align="center"', $sortfield, $sortorder);
 	if (!empty($arrayfields['ava.rowid']['checked']))			print_liste_field_titre($arrayfields['ava.rowid']['label'], $_SERVER["PHP_SELF"], 'availability', '', $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['p.fk_shipping_method']['checked']))	print_liste_field_titre($arrayfields['p.fk_shipping_method']['label'], $_SERVER["PHP_SELF"], "p.fk_shipping_method", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['p.fk_cond_reglement']['checked']))		print_liste_field_titre($arrayfields['p.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "p.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['p.fk_mode_reglement']['checked']))		print_liste_field_titre($arrayfields['p.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "p.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['p.total_ht']['checked']))			print_liste_field_titre($arrayfields['p.total_ht']['label'], $_SERVER["PHP_SELF"], 'p.total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
 	if (!empty($arrayfields['p.total_vat']['checked']))			print_liste_field_titre($arrayfields['p.total_vat']['label'], $_SERVER["PHP_SELF"], 'p.tva', '', $param, 'class="right"', $sortfield, $sortorder);
 	if (!empty($arrayfields['p.total_ttc']['checked']))			print_liste_field_titre($arrayfields['p.total_ttc']['label'], $_SERVER["PHP_SELF"], 'p.total', '', $param, 'class="right"', $sortfield, $sortorder);
@@ -981,6 +1139,15 @@ if ($resql)
 			if (!$i) $totalarray['nbfield']++;
 		}
 
+		// Alias
+		if (!empty($arrayfields['s.name_alias']['checked']))
+		{
+			print '<td class="tdoverflowmax200">';
+			print $obj->alias;
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+
 		// Town
 		if (!empty($arrayfields['s.town']['checked']))
 		{
@@ -1064,7 +1231,30 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
-
+		//Shipping Method
+		if (!empty($arrayfields['p.fk_shipping_method']['checked']))
+		{
+			print '<td>';
+			$form->formSelectShippingMethod('', $obj->fk_shipping_method, 'none', 1);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Payment terms
+		if (!empty($arrayfields['p.fk_cond_reglement']['checked']))
+		{
+			print '<td>';
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none');
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Payment mode
+		if (!empty($arrayfields['p.fk_mode_reglement']['checked']))
+		{
+			print '<td>';
+			$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 		// Amount HT
 		if (!empty($arrayfields['p.total_ht']['checked']))
 		{
@@ -1105,7 +1295,6 @@ if ($resql)
 			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'p.total_invoiced';
 			$totalarray['val']['p.total_invoiced'] += $totalInvoicedTTC;
 		}
-
 		// Currency
 		if (!empty($arrayfields['p.multicurrency_code']['checked']))
 		{
@@ -1173,15 +1362,13 @@ if ($resql)
 				$listsalesrepresentatives = $companystatic->getSalesRepresentatives($user);
 				if ($listsalesrepresentatives < 0) dol_print_error($db);
 				$nbofsalesrepresentative = count($listsalesrepresentatives);
-				if ($nbofsalesrepresentative > 3)   // We print only number
-				{
+				if ($nbofsalesrepresentative > 6) {
+					// We print only number
 					print $nbofsalesrepresentative;
-				} elseif ($nbofsalesrepresentative > 0)
-				{
+				} elseif ($nbofsalesrepresentative > 0) {
 					$userstatic = new User($db);
 					$j = 0;
-					foreach ($listsalesrepresentatives as $val)
-					{
+					foreach ($listsalesrepresentatives as $val) {
 						$userstatic->id = $val['id'];
 						$userstatic->lastname = $val['lastname'];
 						$userstatic->firstname = $val['firstname'];
@@ -1189,17 +1376,22 @@ if ($resql)
 						$userstatic->statut = $val['statut'];
 						$userstatic->entity = $val['entity'];
 						$userstatic->photo = $val['photo'];
-
+						$userstatic->login = $val['login'];
+						$userstatic->phone = $val['phone'];
+						$userstatic->job = $val['job'];
+						$userstatic->gender = $val['gender'];
 						//print '<div class="float">':
-						print $userstatic->getNomUrl(-2);
+						print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);
 						$j++;
-						if ($j < $nbofsalesrepresentative) print ' ';
+						if ($j < $nbofsalesrepresentative) {
+							print ' ';
+						}
 						//print '</div>';
 					}
 				}
 				//else print $langs->trans("NoSalesRepresentativeAffected");
 			} else {
-				print '&nbsp';
+				print '&nbsp;';
 			}
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
@@ -1299,72 +1491,10 @@ if ($resql)
 	$delallowed = $user->rights->propal->creer;
 
 	print $formfile->showdocuments('massfilesarea_proposals', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-
-	if ($action == 'validate') {
-		if (GETPOST('confirm') == 'yes') {
-			$tmpproposal = new Propal($db);
-			$db->begin();
-			$error = 0;
-			foreach ($toselect as $checked) {
-				if ($tmpproposal->fetch($checked)) {
-					if ($tmpproposal->statut == 0) {
-						if ($tmpproposal->valid($user)) {
-							setEventMessage($tmpproposal->ref." ".$langs->trans('PassedInOpenStatus'), 'mesgs');
-						} else {
-							setEventMessage($langs->trans('CantBeValidated'), 'errors');
-							$error++;
-						}
-					} else {
-						setEventMessage($tmpproposal->ref." ".$langs->trans('IsNotADraft'), 'errors');
-						$error++;
-					}
-				}
-				dol_print_error($db);
-				$error++;
-			}
-			if ($error) {
-				$db->rollback();
-			} else {
-				$db->commit();
-			}
-		}
-	}
-
-	if ($action == "sign") {
-		if (GETPOST('confirm') == 'yes') {
-			$tmpproposal = new Propal($db);
-			$db->begin();
-			$error = 0;
-			foreach ($toselect as $checked) {
-				if ($tmpproposal->fetch($checked)) {
-					if ($tmpproposal->statut == 1) {
-						$tmpproposal->statut = 2;
-						if ($tmpproposal->update($user)) {
-							setEventMessage($tmpproposal->ref." ".$langs->trans('Signed'), 'mesgs');
-						} else {
-							dol_print_error($db);
-							$error++;
-						}
-					} else {
-						setEventMessage($tmpproposal->ref." ".$langs->trans('CantBeSign'), 'errors');
-						$error++;
-					}
-				} else {
-					dol_print_error($db);
-					$error++;
-				}
-			}
-			if ($error) {
-				$db->rollback();
-			} else {
-				$db->commit();
-			}
-		}
-	}
 } else {
 		dol_print_error($db);
 }
 
-	// End of page
-	llxFooter();
-	$db->close();
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 34feb8bbe44..c28da3ed048 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -263,7 +263,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 	// ThirdParty Type
 	print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>';
 	$sortparam_typent = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
-	print $form->selectarray("typent_id", $formcompany->typent_array(0), $typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam_typent);
+	print $form->selectarray("typent_id", $formcompany->typent_array(0), $typent_id, 1, 0, 0, '', 0, 0, 0, $sortparam_typent, '', 1);
 	if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 	print '</td></tr>';
 	// Category
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 57c1cf40114..e2900858c84 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -70,7 +70,7 @@ if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes')
 	$remid = (GETPOST("remid", 'int') ? GETPOST("remid", 'int') : 0);
 	$discount = new DiscountAbsolute($db);
 	$res = $discount->fetch($remid);
-	if (!$res > 0)
+	if (!($res > 0))
 	{
 		$error++;
 		setEventMessages($langs->trans("ErrorFailedToLoadDiscount"), null, 'errors');
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index b8061bcea93..f7cc3e7af47 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014       Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
- * 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
@@ -113,11 +113,6 @@ $permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc
 $permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php
 $permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 
-if (!empty($conf->expedition->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
-	if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) $object->warehouse_id = $conf->global->MAIN_DEFAULT_WAREHOUSE;
-	if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) $object->warehouse_id = $user->fk_warehouse;
-}
-
 $error = 0;
 
 $date_delivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
@@ -506,7 +501,7 @@ if (empty($reshook))
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'setremise' && $usercancreate) {
-		$result = $object->set_remise($user, GETPOST('remise'));
+		$result = $object->setDiscount($user, GETPOST('remise'));
 		if ($result < 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -612,10 +607,10 @@ if (empty($reshook))
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'setremisepercent' && $usercancreate) {
-		$result = $object->set_remise($user, GETPOST('remise_percent'));
+		$result = $object->setDiscount($user, price2num(GETPOST('remise_percent'), 2));
 	} elseif ($action == 'setremiseabsolue' && $usercancreate) {
-		$result = $object->set_remise_absolue($user, GETPOST('remise_absolue'));
-	} elseif ($action == 'addline' && GETPOST('submitforalllines', 'aZ09') && GETPOST('vatforalllines', 'alpha')) {
+		$result = $object->set_remise_absolue($user, price2num(GETPOST('remise_absolue'), 'MU'));
+	} elseif ($action == 'addline' && GETPOST('submitforalllines', 'alpha') && GETPOST('vatforalllines', 'alpha')) {
 		// Define vat_rate
 		$vat_rate = (GETPOST('vatforalllines') ? GETPOST('vatforalllines') : 0);
 		$vat_rate = str_replace('*', '', $vat_rate);
@@ -633,7 +628,7 @@ if (empty($reshook))
 		$predef = '';
 		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$price_ht = price2num(GETPOST('price_ht'), 'MU');
-		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CR');
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU');
 		$prod_entry_mode = GETPOST('prod_entry_mode');
 		if ($prod_entry_mode == 'free')
 		{
@@ -644,8 +639,12 @@ if (empty($reshook))
 			$tva_tx = '';
 		}
 
-		$qty = price2num(GETPOST('qty'.$predef, 'alpha'));
+		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
+
 		$remise_percent = (GETPOSTISSET('remise_percent'.$predef) ? price2num(GETPOST('remise_percent'.$predef, 'alpha')) : 0);
+		if (empty($remise_percent)) {
+			$remise_percent = 0;
+		}
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -846,6 +845,11 @@ 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 (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) $desc = $product_desc;
 				else $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 
@@ -1032,7 +1036,7 @@ if (empty($reshook))
 
 			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
 
-			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && ($price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent')) / 100) < price2num($price_min)))) {
+			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 - price2num(GETPOST('remise_percent'), 2) / 100) < price2num($price_min)))) {
 				setEventMessages($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), null, 'errors');
 				$error++;
 			}
@@ -1060,7 +1064,7 @@ if (empty($reshook))
 					}
 				}
 			}
-			$result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, GETPOST('qty'), GETPOST('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, price2num(GETPOST('qty'), 'MS'), price2num(GETPOST('remise_percent'), 2), $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)) {
@@ -1533,6 +1537,14 @@ if ($action == 'create' && $usercancreate)
 		$note_public = $object->getDefaultCreateValueFor('note_public');
 	}
 
+	//Warehouse default if null
+	if ($soc->fk_warehouse > 0) $warehouse_id = $soc->fk_warehouse;
+	if (!empty($conf->stock->enabled) && empty($warehouse_id) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER))
+	{
+		if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) $warehouse_id = $conf->global->MAIN_DEFAULT_WAREHOUSE;
+		if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) $warehouse_id = $user->fk_warehouse;
+	}
+
 	print '<form name="crea_commande" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
@@ -1590,7 +1602,8 @@ if ($action == 'create' && $usercancreate)
 	if ($socid > 0) {
 		// Contacts (ask contact only if thirdparty already defined).
 		print "<tr><td>".$langs->trans("DefaultContact").'</td><td>';
-		$form->select_contacts($soc->id, $contactid, 'contactid', 1, $srccontactslist, '', 1);
+		print img_picto('', 'contact');
+		print $form->selectcontacts($soc->id, $contactid, 'contactid', 1, $srccontactslist, '', 1);
 		print '</td></tr>';
 
 		// Ligne info remises tiers
@@ -1626,31 +1639,34 @@ if ($action == 'create' && $usercancreate)
 
 	// Mode de reglement
 	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
+	print img_picto('', 'bank').'&ensp;';
 	$form->select_types_paiements($mode_reglement_id, 'mode_reglement_id');
 	print '</td></tr>';
 
 	// Bank Account
-	if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && !empty($conf->banque->enabled))
-	{
+	if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && !empty($conf->banque->enabled)) {
 		print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
+		print img_picto('', 'bank_account');
 		$form->select_comptes($fk_account, 'fk_account', 0, '', 1);
 		print '</td></tr>';
 	}
 
 	// Delivery delay
 	print '<tr class="fielddeliverydelay"><td>'.$langs->trans('AvailabilityPeriod').'</td><td>';
+	print img_picto('', 'clock').'&ensp;';
 	$form->selectAvailabilityDelay($availability_id, 'availability_id', '', 1);
 	print '</td></tr>';
 
 	// Shipping Method
 	if (!empty($conf->expedition->enabled)) {
 		print '<tr><td>'.$langs->trans('SendingMethod').'</td><td>';
+		print img_picto('', 'object_dollyrevert').'&ensp;';
 		print $form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1);
 		print '</td></tr>';
 	}
 
 	// Warehouse
-	if (!empty($conf->expedition->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
+	if (!empty($conf->stock->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
 		print '<tr><td>'.$langs->trans('Warehouse').'</td><td>';
@@ -1716,9 +1732,11 @@ if ($action == 'create' && $usercancreate)
 	// Template to use by default
 	print '<tr><td>'.$langs->trans('DefaultModel').'</td>';
 	print '<td>';
+	print img_picto('', 'pdf').'&ensp;';
 	include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
 	$liste = ModelePDFCommandes::liste_modeles($db);
-	print $form->selectarray('model', $liste, $conf->global->COMMANDE_ADDON_PDF);
+	$preselected = $conf->global->COMMANDE_ADDON_PDF;
+	print $form->selectarray('model', $liste, $preselected, 0, 0, 0, '', 0, 0, 0, '', '', 1);
 	print "</td></tr>";
 
 	// Multicurrency
@@ -2160,7 +2178,7 @@ if ($action == 'create' && $usercancreate)
 		}
 
 		// Warehouse
-		if (!empty($conf->expedition->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
+		if (!empty($conf->stock->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
 			$langs->load('stocks');
 			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 			$formproduct = new FormProduct($db);
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 3cc0fa72ae6..4c2f643df1c 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -11,6 +11,7 @@
  * Copyright (C) 2014-2015 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2018      Nicolas ZABOURI	<info@inovea-conseil.com>
  * Copyright (C) 2016-2018 Ferran Marcet        <fmarcet@2byte.es>
+ * Copyright (C) 2021       Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -126,6 +127,10 @@ class Commande extends CommonOrder
 	 * @var int Draft Status of the order
 	 */
 	public $brouillon;
+
+	/**
+	 * @var string Condition payment code
+	 */
 	public $cond_reglement_code;
 
 	/**
@@ -166,8 +171,16 @@ class Commande extends CommonOrder
 	 */
 	public $availability;
 
-	public $demand_reason_id; // Source reason. Why we receive order (after a phone campaign, ...)
+	/**
+	 * @var int Source demand reason Id
+	 */
+	public $demand_reason_id;
+
+	/**
+	 * @var string Source reason code. Why we receive order (after a phone campaign, ...)
+	 */
 	public $demand_reason_code;
+
 	/**
 	 * @var int Date of order
 	 */
@@ -182,11 +195,15 @@ class Commande extends CommonOrder
 
 	/**
 	 * @var int	Date expected for delivery
+	 * @see delivery_date
 	 * @deprecated
 	 */
-	public $date_livraison; // deprecated; Use delivery_date instead.
+	public $date_livraison;
 
-	public $delivery_date; // Date expected of shipment (date starting shipment, not the reception that occurs some days after)
+	/**
+	 * @var int	Date expected of shipment (date starting shipment, not the reception that occurs some days after)
+	 */
+	public $delivery_date;
 
 	/**
 	 * @var int ID
@@ -200,6 +217,11 @@ class Commande extends CommonOrder
 	public $special_code;
 	public $source; // Order mode. How we received order (by phone, by email, ...)
 
+	/**
+	 * @var int Warehouse Id
+	 */
+	public $warehouse_id;
+
 	public $extraparams = array();
 
 	public $linked_objects = array();
@@ -225,17 +247,15 @@ class Commande extends CommonOrder
 	 */
 	public $fk_multicurrency;
 
+	/**
+	 * @var string multicurrency code
+	 */
 	public $multicurrency_code;
 	public $multicurrency_tx;
 	public $multicurrency_total_ht;
 	public $multicurrency_total_tva;
 	public $multicurrency_total_ttc;
 
-	/**
-	 * @var Commande clone of order object
-	 */
-	public $oldcopy;
-
 	//! key of module source when order generated from a dedicated module ('cashdesk', 'takepos', ...)
 	public $module_source;
 	//! key of pos source ('0', '1', ...)
@@ -742,11 +762,11 @@ class Commande extends CommonOrder
 
 		if ($usercanclose)
 		{
-			$this->db->begin();
 			if ($this->statut == self::STATUS_CLOSED)
 			{
 				return 0;
 			}
+			$this->db->begin();
 
 			$now = dol_now();
 
@@ -1824,6 +1844,8 @@ class Commande extends CommonOrder
 				$this->project = null; // Clear if another value was already set by fetch_projet
 
 				$this->statut = $obj->fk_statut;
+				$this->status = $obj->fk_statut;
+
 				$this->user_author_id = $obj->fk_user_author;
 				$this->user_valid = $obj->fk_user_valid;
 				$this->total_ht				= $obj->total_ht;
@@ -1974,6 +1996,7 @@ class Commande extends CommonOrder
 				}
 			} else {
 				$this->error = $line->error;
+				$this->errors = $line->errors;
 				$this->db->rollback();
 				return -2;
 			}
@@ -2360,6 +2383,8 @@ class Commande extends CommonOrder
 	/**
 	 * 	Applique une remise relative
 	 *
+	 *  @deprecated
+	 *  @see setDiscount()
 	 * 	@param     	User		$user		User qui positionne la remise
 	 * 	@param     	float		$remise		Discount (percent)
 	 * 	@param     	int			$notrigger	1=Does not execute triggers, 0= execute triggers
@@ -2368,6 +2393,20 @@ class Commande extends CommonOrder
 	public function set_remise($user, $remise, $notrigger = 0)
 	{
 		// phpcs:enable
+		dol_syslog(get_class($this)."::set_remise is deprecated, use setDiscount instead", LOG_NOTICE);
+		return $this->setDiscount($user, $remise, $notrigger);
+	}
+
+	/**
+	 * 	Applique une remise relative
+	 *
+	 * 	@param     	User		$user		User qui positionne la remise
+	 * 	@param     	float		$remise		Discount (percent)
+	 * 	@param     	int			$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *	@return		int 					<0 if KO, >0 if OK
+	 */
+	public function setDiscount($user, $remise, $notrigger = 0)
+	{
 		$remise = trim($remise) ?trim($remise) : 0;
 
 		if ($user->rights->commande->creer)
@@ -2896,19 +2935,20 @@ class Commande extends CommonOrder
 	 * Classify the order as invoiced
 	 *
 	 * @param	User    $user       Object user making the change
-	 * @param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 * @return	int                 <0 if KO, >0 if OK
+	 * @param	int		$notrigger	1=Does not execute triggers, 0=execute triggers
+	 * @return	int                 <0 if KO, 0 if already billed,  >0 if OK
 	 */
 	public function classifyBilled(User $user, $notrigger = 0)
 	{
 		$error = 0;
 
-		$this->db->begin();
 		if ($this->billed)
 		{
 			return 0;
 		}
 
+		$this->db->begin();
+
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET facture = 1';
 		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
 
@@ -3271,7 +3311,7 @@ class Commande extends CommonOrder
 		$sql .= " fk_input_reason=".($this->demand_reason_id > 0 ? $this->demand_reason_id : "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 .= " model_pdf=".(isset($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null").",";
 		$sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null")."";
 
 		$sql .= " WHERE rowid=".$this->id;
@@ -3921,7 +3961,7 @@ class Commande extends CommonOrder
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($this->modelpdf)) {	// dperecated
+			} elseif (!empty($this->modelpdf)) {	// deprecated
 				$modele = $this->modelpdf;
 			} elseif (!empty($conf->global->COMMANDE_ADDON_PDF)) {
 				$modele = $conf->global->COMMANDE_ADDON_PDF;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 885081e84a1..8b4a79f4dda 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -67,6 +67,7 @@ $search_product_category = GETPOST('search_product_category', 'int');
 $search_ref = GETPOST('search_ref', 'alpha') != '' ?GETPOST('search_ref', 'alpha') : GETPOST('sref', 'alpha');
 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
+$search_company_alias = GETPOST('search_company_alias', 'alpha');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
 $search_state = GETPOST("search_state", 'alpha');
@@ -95,7 +96,9 @@ $search_remove_btn = GETPOST('button_removefilter', 'alpha');
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_project = GETPOST('search_project', 'alpha');
 $search_shippable = GETPOST('search_shippable', 'aZ09');
-
+$search_fk_cond_reglement = GETPOST("search_fk_cond_reglement", 'int');
+$search_fk_shipping_method = GETPOST("search_fk_shipping_method", 'int');
+$search_fk_mode_reglement = GETPOST("search_fk_mode_reglement", 'int');
 
 // Security check
 $id = (GETPOST('orderid') ?GETPOST('orderid', 'int') : GETPOST('id', 'int'));
@@ -147,6 +150,7 @@ $arrayfields = array(
 	'p.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1), 'position'=>20),
 	'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1), 'position'=>25),
 	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30),
+	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>1, 'position'=>31),
 	's.town'=>array('label'=>"Town", 'checked'=>1, 'position'=>35),
 	's.zip'=>array('label'=>"Zip", 'checked'=>1, 'position'=>40),
 	'state.nom'=>array('label'=>"StateShort", 'checked'=>0, 'position'=>45),
@@ -154,6 +158,9 @@ $arrayfields = array(
 	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers, 'position'=>55),
 	'c.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1, 'position'=>60),
 	'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>empty($conf->global->ORDER_DISABLE_DELIVERY_DATE), 'position'=>65),
+	'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>0, 'position'=>66 , 'enabled'=>!empty($conf->expedition->enabled)),
+	'c.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>0, 'position'=>67),
+	'c.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>0, 'position'=>68),
 	'c.total_ht'=>array('label'=>"AmountHT", 'checked'=>1, 'position'=>75),
 	'c.total_vat'=>array('label'=>"AmountVAT", 'checked'=>0, 'position'=>80),
 	'c.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0, 'position'=>85),
@@ -206,6 +213,7 @@ if (empty($reshook))
 		$search_ref = '';
 		$search_ref_customer = '';
 		$search_company = '';
+		$search_company_alias = '';
 		$search_town = '';
 		$search_zip = "";
 		$search_state = "";
@@ -235,6 +243,9 @@ if (empty($reshook))
 		$search_categ_cus = 0;
 		$search_datecloture_start = '';
 		$search_datecloture_end = '';
+		$search_fk_cond_reglement = '';
+		$search_fk_shipping_method = '';
+		$search_fk_mode_reglement = '';
 	}
 	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'))
@@ -271,8 +282,8 @@ $help_url = "EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_P
 // llxHeader('',$title,$help_url);
 
 $sql = 'SELECT';
-if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
-$sql .= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
+if ($sall || $search_product_category > 0 || $search_user > 0) $sql = 'SELECT DISTINCT';
+$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= ' c.rowid, c.ref, c.total_ht, c.tva as total_tva, c.total_ttc, c.ref_client, c.fk_user_author,';
@@ -280,7 +291,8 @@ $sql .= ' c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multic
 $sql .= ' c.date_valid, c.date_commande, c.note_public, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as billed,';
 $sql .= ' c.date_creation as date_creation, c.tms as date_update, c.date_cloture as date_cloture,';
 $sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";
-$sql .= " u.login";
+$sql .= " u.login,";
+$sql .= ' c.fk_cond_reglement,c.fk_mode_reglement,c.fk_shipping_method';
 if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label']))
@@ -353,6 +365,7 @@ if ($search_state)                           $sql .= natural_search("state.nom",
 if ($search_country)                         $sql .= " AND s.fk_pays IN (".$search_country.')';
 if ($search_type_thirdparty)                 $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
 if ($search_company)                         $sql .= natural_search('s.nom', $search_company);
+if ($search_company_alias)                   $sql .= natural_search('s.name_alias', $search_company_alias);
 if ($search_sale > 0)                        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;
 if ($search_user > 0)                        $sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='commande' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".$search_user;
 if ($search_total_ht != '')                  $sql .= natural_search('c.total_ht', $search_total_ht, 1);
@@ -369,6 +382,9 @@ if ($search_project_ref != '')               $sql .= natural_search("p.ref", $se
 if ($search_project != '')                   $sql .= natural_search("p.title", $search_project);
 if ($search_categ_cus > 0)                   $sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
 if ($search_categ_cus == -2)                 $sql .= " AND cc.fk_categorie IS NULL";
+if ($search_fk_cond_reglement > 0) $sql .= " AND c.fk_cond_reglement = ".$db->escape($search_fk_cond_reglement);
+if ($search_fk_shipping_method > 0) $sql .= " AND c.fk_shipping_method = ".$db->escape($search_fk_shipping_method);
+if ($search_fk_mode_reglement > 0) $sql .= " AND c.fk_mode_reglement = ".$db->escape($search_fk_mode_reglement);
 
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -454,6 +470,7 @@ if ($resql)
 	if ($search_datedelivery_end) 	$param .= '&search_datedelivery_end_day='.dol_print_date($search_datedelivery_end, '%d').'&search_datedelivery_end_month='.dol_print_date($search_datedelivery_end, '%m').'&search_datedelivery_end_year='.dol_print_date($search_datedelivery_end, '%Y');
 	if ($search_ref)      			$param .= '&search_ref='.urlencode($search_ref);
 	if ($search_company)  			$param .= '&search_company='.urlencode($search_company);
+	if ($search_company_alias)  	$param .= '&search_company_alias='.urlencode($search_company_alias);
 	if ($search_ref_customer)		$param .= '&search_ref_customer='.urlencode($search_ref_customer);
 	if ($search_user > 0) 			$param .= '&search_user='.urlencode($search_user);
 	if ($search_sale > 0) 			$param .= '&search_sale='.urlencode($search_sale);
@@ -472,12 +489,15 @@ if ($resql)
 	if ($search_zip != '')        	$param .= '&search_zip='.urlencode($search_zip);
 	if ($search_state != '')      	$param .= '&search_state='.urlencode($search_state);
 	if ($search_country != '')    	$param .= '&search_country='.urlencode($search_country);
-	if ($search_type_thirdparty != '')  $param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+	if ($search_type_thirdparty != '' && $search_type_thirdparty > 0)  $param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
 	if ($search_product_category != '') $param .= '&search_product_category='.urlencode($search_product_category);
 	if ($search_categ_cus > 0)      $param .= '&search_categ_cus='.urlencode($search_categ_cus);
 	if ($show_files)            	$param .= '&show_files='.urlencode($show_files);
 	if ($optioncss != '')       	$param .= '&optioncss='.urlencode($optioncss);
 	if ($search_billed != '')		$param .= '&search_billed='.urlencode($search_billed);
+	if ($search_fk_cond_reglement > 0) $param .= '&search_fk_cond_reglement='.$search_fk_cond_reglement;
+	if ($search_fk_shipping_method > 0) $param .= '&search_fk_shipping_method='.$search_fk_shipping_method;
+	if ($search_fk_mode_reglement > 0) $param .= '&search_fk_mode_reglement='.$search_fk_mode_reglement;
 
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -678,6 +698,13 @@ if ($resql)
 		print '<input class="flat maxwidth100" type="text" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
 		print '</td>';
 	}
+	// Alias
+	if (!empty($arrayfields['s.name_alias']['checked']))
+	{
+		print '<td class="liste_titre" align="left">';
+		print '<input class="flat maxwidth100" type="text" name="search_company_alias" value="'.dol_escape_htmltag($search_company_alias).'">';
+		print '</td>';
+	}
 	// Town
 	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
 	// Zip
@@ -700,7 +727,7 @@ if ($resql)
 	if (!empty($arrayfields['typent.code']['checked']))
 	{
 		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
-		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
+		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 		print '</td>';
 	}
 	// Date order
@@ -726,6 +753,27 @@ if ($resql)
 		print '</div>';
 		print '</td>';
 	}
+	// Shipping Method
+	if (!empty($arrayfields['c.fk_shipping_method']['checked']))
+	{
+		print '<td class="liste_titre">';
+		$form->selectShippingMethod($search_fk_shipping_method, 'search_fk_shipping_method', '', 1, '', 1);
+		print '</td>';
+	}
+	// Payment term
+	if (!empty($arrayfields['c.fk_cond_reglement']['checked']))
+	{
+		print '<td class="liste_titre">';
+		$form->select_conditions_paiements($search_fk_cond_reglement, 'search_fk_cond_reglement', -1, 1, 1);
+		print '</td>';
+	}
+	// Payment mode
+	if (!empty($arrayfields['c.fk_mode_reglement']['checked']))
+	{
+		print '<td class="liste_titre">';
+		$form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1);
+		print '</td>';
+	}
 	if (!empty($arrayfields['c.total_ht']['checked']))
 	{
 		// Amount
@@ -881,6 +929,7 @@ if ($resql)
 	if (!empty($arrayfields['p.ref']['checked'])) 	         print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['p.title']['checked'])) 	     print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['s.name_alias']['checked']))     print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], 's.name_alias', '', $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
@@ -888,6 +937,9 @@ if ($resql)
 	if (!empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['c.date_commande']['checked']))  print_liste_field_titre($arrayfields['c.date_commande']['label'], $_SERVER["PHP_SELF"], 'c.date_commande', '', $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['c.date_delivery']['checked']))  print_liste_field_titre($arrayfields['c.date_delivery']['label'], $_SERVER["PHP_SELF"], 'c.date_livraison', '', $param, '', $sortfield, $sortorder, 'center ');
+	if (!empty($arrayfields['c.fk_shipping_method']['checked']))	print_liste_field_titre($arrayfields['c.fk_shipping_method']['label'], $_SERVER["PHP_SELF"], "c.fk_shipping_method", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['c.fk_cond_reglement']['checked']))		print_liste_field_titre($arrayfields['c.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "c.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['c.fk_mode_reglement']['checked']))		print_liste_field_titre($arrayfields['c.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "c.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['c.total_ht']['checked']))       print_liste_field_titre($arrayfields['c.total_ht']['label'], $_SERVER["PHP_SELF"], 'c.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
 	if (!empty($arrayfields['c.total_vat']['checked']))      print_liste_field_titre($arrayfields['c.total_vat']['label'], $_SERVER["PHP_SELF"], 'c.tva', '', $param, '', $sortfield, $sortorder, 'right ');
 	if (!empty($arrayfields['c.total_ttc']['checked']))      print_liste_field_titre($arrayfields['c.total_ttc']['label'], $_SERVER["PHP_SELF"], 'c.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
@@ -1038,6 +1090,14 @@ if ($resql)
 			if (!$i) $totalarray['nbfield']++;
 		}
 		// Town
+		if (!empty($arrayfields['s.name_alias']['checked']))
+		{
+			print '<td class="nocellnopadd">';
+			print $obj->alias;
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Town
 		if (!empty($arrayfields['s.town']['checked']))
 		{
 			print '<td class="nocellnopadd">';
@@ -1094,6 +1154,30 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
+		//Shipping Method
+		if (!empty($arrayfields['c.fk_shipping_method']['checked']))
+		{
+			print '<td>';
+			$form->formSelectShippingMethod('', $obj->fk_shipping_method, 'none', 1);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Payment terms
+		if (!empty($arrayfields['c.fk_cond_reglement']['checked']))
+		{
+			print '<td>';
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none');
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Payment mode
+		if (!empty($arrayfields['c.fk_mode_reglement']['checked']))
+		{
+			print '<td>';
+			$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 		// Amount HT
 		if (!empty($arrayfields['c.total_ht']['checked']))
 		{
@@ -1326,7 +1410,6 @@ if ($resql)
 			print '<td class="center">'.yn($obj->billed).'</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
-
 		// Status
 		if (!empty($arrayfields['c.fk_statut']['checked']))
 		{
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 6e5e022c651..43980135140 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -271,7 +271,7 @@ print '</td></tr>';
 // ThirdParty Type
 print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>';
 $sortparam_typent = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
-print $form->selectarray("typent_id", $formcompany->typent_array(0), $typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam_typent);
+print $form->selectarray("typent_id", $formcompany->typent_array(0), $typent_id, 1, 0, 0, '', 0, 0, 0, $sortparam_typent, '', 1);
 if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 print '</td></tr>';
 // Category
@@ -283,7 +283,7 @@ if ($mode == 'customer')
 if ($mode == 'supplier')
 {
 	$cat_type = Categorie::TYPE_SUPPLIER;
-	$cat_label = $langs->trans("Supplier").' '.lcfirst($langs->trans("Customer"));
+    $cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Supplier"));
 }
 print '<tr><td>'.$cat_label.'</td><td>';
 print $formother->select_categories($cat_type, $categ_id, 'categ_id', true);
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 63021eb3b07..37c125668ec 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -9,6 +9,8 @@
  * 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) 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,6 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/paymentvat.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
@@ -286,8 +289,9 @@ if (GETPOST('save') && !$cancel && $user->rights->banque->modifier)
 	$cat1      = GETPOST("cat1", 'alpha');
 
 	$bankaccountid = $id;
-	if (GETPOST('add_account', 'int') > 0) $bankaccountid = GETPOST('add_account', 'int');
-
+	if (GETPOST('add_account', 'int') > 0) {
+		$bankaccountid = GETPOST('add_account', 'int');
+	}
 	if (!$dateop) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
@@ -304,8 +308,7 @@ if (GETPOST('save') && !$cancel && $user->rights->banque->modifier)
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
 	}
-	if (!$bankaccountid > 0)
-	{
+	if (!$bankaccountid > 0) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
 	}
@@ -315,8 +318,7 @@ if (GETPOST('save') && !$cancel && $user->rights->banque->modifier)
     	$error++;
     }*/
 
-	if (!$error && !empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT))
-	{
+	if (!$error && !empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)) {
 		$objecttmp = new Account($db);
 		$objecttmp->fetch($bankaccountid);
 		$insertid = $objecttmp->addline($dateop, $operation, $label, $amount, $num_chq, ($cat1 > 0 ? $cat1 : 0), $user, '', '', $search_accountancy_code);
@@ -368,7 +370,7 @@ $donstatic = new Don($db);
 $paymentstatic = new Paiement($db);
 $paymentsupplierstatic = new PaiementFourn($db);
 $paymentscstatic = new PaymentSocialContribution($db);
-$paymentvatstatic = new TVA($db);
+$paymentvatstatic = new PaymentVAT($db);
 $paymentsalstatic = new PaymentSalary($db);
 $paymentdonationstatic = new PaymentDonation($db);
 $paymentvariousstatic = new PaymentVarious($db);
@@ -444,13 +446,32 @@ if ($id > 0 || !empty($ref))
 	{
 		if ($object->canBeConciliated() > 0)
 		{
+			$allowautomaticconciliation = false; // TODO
+			$titletoconciliatemanual = $langs->trans("Conciliate");
+			$titletoconciliateauto = $langs->trans("Conciliate");
+			if ($allowautomaticconciliation) {
+				$titletoconciliatemanual .= ' ('.$langs->trans("Manual").')';
+				$titletoconciliateauto .= ' ('.$langs->trans("Auto").')';
+			}
+
 			// If not cash account and can be reconciliate
 			if ($user->rights->banque->consolidate) {
 				$newparam = $param;
 				$newparam = preg_replace('/search_conciliated=\d+/i', '', $newparam);
-				$buttonreconcile = '<a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&amp;sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$langs->trans("Conciliate").'</a>';
+				$buttonreconcile = '<a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&amp;sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$titletoconciliatemanual.'</a>';
 			} else {
-				$buttonreconcile = '<a class="butActionRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
+				$buttonreconcile = '<a class="butActionRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$titletoconciliatemanual.'</a>';
+			}
+
+			if ($allowautomaticconciliation) {
+				// If not cash account and can be reconciliate
+				if ($user->rights->banque->consolidate) {
+					$newparam = $param;
+					$newparam = preg_replace('/search_conciliated=\d+/i', '', $newparam);
+					$buttonreconcile .= ' <a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&amp;sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$titletoconciliateauto.'</a>';
+				} else {
+					$buttonreconcile .= ' <a class="butActionRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$titletoconciliateauto.'</a>';
+				}
 			}
 		}
 	}
@@ -1212,7 +1233,8 @@ if ($resql)
 					$paymentvatstatic->id = $links[$key]['url_id'];
 					$paymentvatstatic->ref = $links[$key]['url_id'];
 					print ' '.$paymentvatstatic->getNomUrl(2);
-				} elseif ($links[$key]['type'] == 'payment_salary')
+    	        }
+    	        elseif ($links[$key]['type'] == 'payment_salary')
 				{
 					$paymentsalstatic->id = $links[$key]['url_id'];
 					$paymentsalstatic->ref = $links[$key]['url_id'];
@@ -1274,7 +1296,10 @@ if ($resql)
 				{
 				} elseif ($links[$key]['type'] == 'sc')
 				{
-				} else {
+				}
+                elseif ($links[$key]['type'] == 'vat')
+                {
+                } 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'].'">';
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index e0f48e9498b..363ce28c57f 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -591,7 +591,8 @@ class Account extends CommonObject
 
 			return $accline->id;
 		} else {
-			$this->error = $this->db->lasterror();
+			$this->error = $accline->error;
+			$this->errors = $accline->errors;
 			$this->db->rollback();
 
 			return -2;
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index 33f7f3a0352..abcc260d9d8 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -8,6 +8,7 @@
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -58,11 +59,15 @@ if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'banque', $fieldvalue, 'bank_account', '', '', $fieldtype);
 if (!$user->rights->banque->lire && !$user->rights->banque->consolidate) accessforbidden();
 
+$hookmanager->initHooks(array('bankline'));
+
 
 /*
  * Actions
  */
-
+$parameters = array('socid' => $socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 if ($cancel)
 {
 	if ($backtopage)
@@ -351,14 +356,22 @@ if ($result)
 					print img_object($langs->trans('SocialContribution'), 'bill').' ';
 					print $langs->trans("SocialContribution").($links[$key]['label'] ? ' - '.$links[$key]['label'] : '');
 					print '</a>';
-				} elseif ($links[$key]['type'] == 'payment_sc') {
+				}
+				elseif ($links[$key]['type'] == 'vat') {
+					print '<a href="'.DOL_URL_ROOT.'/compta/tva/card.php?id='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('VATDeclaration'), 'bill').' ';
+					print $langs->trans("VATDeclaration").($links[$key]['label'] ? '&nbsp;'.$links[$key]['label'] : '');
+					print '</a>';
+				}
+                elseif ($links[$key]['type'] == 'payment_sc') {
 					print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
 					print img_object($langs->trans('Payment'), 'payment').' ';
 					print $langs->trans("SocialContributionPayment");
 					print '</a>';
-				} elseif ($links[$key]['type'] == 'payment_vat') {
-					print '<a href="'.DOL_URL_ROOT.'/compta/tva/card.php?id='.$links[$key]['url_id'].'">';
-					print img_object($langs->trans('VAT'), 'payment').' ';
+                }
+                elseif ($links[$key]['type'] == 'payment_vat') {
+                    print '<a href="'.DOL_URL_ROOT.'/compta/payment_vat/card.php?id='.$links[$key]['url_id'].'">';
+                    print img_object($langs->trans('VATPayment'), 'payment').' ';
 					print $langs->trans("VATPayment");
 					print '</a>';
 				} elseif ($links[$key]['type'] == 'payment_salary') {
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 9a534b76320..5f095363e12 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -199,7 +199,7 @@ $chargestatic = new ChargeSociales($db);
 $memberstatic = new Adherent($db);
 $paymentstatic = new Paiement($db);
 $paymentsupplierstatic = new PaiementFourn($db);
-$paymentvatstatic = new TVA($db);
+$paymentvatstatic = new Tva($db);
 $bankstatic = new Account($db);
 $banklinestatic = new AccountLine($db);
 $remisestatic = new RemiseCheque($db);
@@ -257,12 +257,34 @@ if (empty($numref))
 		print '<div class="tabsAction">';
 
 		if ($object->canBeConciliated() > 0) {
+			$allowautomaticconciliation = false; // TODO
+			$titletoconciliatemanual = $langs->trans("Conciliate");
+			$titletoconciliateauto = $langs->trans("Conciliate");
+			if ($allowautomaticconciliation) {
+				$titletoconciliatemanual .= ' ('.$langs->trans("Manual").')';
+				$titletoconciliateauto .= ' ('.$langs->trans("Auto").')';
+			}
+
 			// If not cash account and can be reconciliate
 			if ($user->rights->banque->consolidate) {
-				print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&sortorder=asc,asc,asc&search_conciliated=0&search_account='.$id.$param.'">'.$langs->trans("Conciliate").'</a>';
+				$buttonreconcile = '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&sortorder=asc,asc,asc&search_conciliated=0&search_account='.$id.$param.'">'.$titletoconciliatemanual.'</a>';
 			} else {
-				print '<a class="butActionRefused classfortooltip" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
+				$buttonreconcile = '<a class="butActionRefused classfortooltip" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$titletoconciliatemanual.'</a>';
 			}
+
+
+			if ($allowautomaticconciliation) {
+				// If not cash account and can be reconciliate
+				if ($user->rights->banque->consolidate) {
+					$newparam = $param;
+					$newparam = preg_replace('/search_conciliated=\d+/i', '', $newparam);
+					$buttonreconcile .= ' <a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&amp;sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$titletoconciliateauto.'</a>';
+				} else {
+					$buttonreconcile .= ' <a class="butActionRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$titletoconciliateauto.'</a>';
+				}
+			}
+
+			print $buttonreconcile;
 		}
 
 		print '</div>';
diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
index 7e1b7fd0567..c100dfd0091 100644
--- a/htdocs/compta/bank/transfer.php
+++ b/htdocs/compta/bank/transfer.php
@@ -40,11 +40,14 @@ if (!$user->rights->banque->transfer)
 $action = GETPOST('action', 'aZ09');
 $error = 0;
 
+$hookmanager->initHooks(array('banktransfer'));
 
 /*
  * Actions
  */
-
+$parameters = array('socid' => $socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 if ($action == 'add')
 {
 	$langs->load("errors");
@@ -125,7 +128,9 @@ if ($action == 'add')
 
 			if (!$error)
 			{
-				$mesgs = $langs->trans("TransferFromToDone", '<a href="bankentries_list.php?id='.$accountfrom->id.'&sortfield=b.datev,b.dateo,b.rowid&sortorder=desc">'.$accountfrom->label."</a>", '<a href="bankentries_list.php?id='.$accountto->id.'">'.$accountto->label."</a>", $amount, $langs->transnoentities("Currency".$conf->currency));
+				$mesgs = $langs->trans("TransferFromToDone", '{s1}', '{s2}', $amount, $langs->transnoentitiesnoconv("Currency".$conf->currency));
+				$mesgs = str_replace('{s1}', '<a href="bankentries_list.php?id='.$accountfrom->id.'&sortfield=b.datev,b.dateo,b.rowid&sortorder=desc">'.$accountfrom->label.'</a>', $mesgs);
+				$mesgs = str_replace('{s2}', '<a href="bankentries_list.php?id='.$accountto->id.'">'.$accountto->label.'</a>', $mesgs);
 				setEventMessages($mesgs, null, 'mesgs');
 				$db->commit();
 			} else {
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 0efe367089c..0c2db362e75 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2017-2019  Alexandre Spangaro      <aspangaro@open-dsi.fr>
+/* Copyright (C) 2017-2021  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -266,6 +266,18 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->banque->m
 			$object->datev = $newdatepayment;
 		}
 
+        if (GETPOSTISSET("clone_sens")) {
+            $object->sens = GETPOST("clone_sens", 'int');
+        } else {
+            $object->sens = $object->sens;
+        }
+
+        if (GETPOST("clone_amount", "alpha")) {
+            $object->amount = price2num(GETPOST("clone_amount", "alpha"));
+        } else {
+            $object->amount = price2num($object->amount);
+        }
+
 		if ($object->check())
 		{
 			$id = $object->create($user);
@@ -486,14 +498,19 @@ if ($id)
 	// Clone confirmation
 	if ($action === 'clone')
 	{
+        $set_value_help = $form->textwithpicto('', $langs->trans($langs->trans("AccountingDirectionHelp")));
+        $sensarray = array('0' => $langs->trans("Debit"), '1' => $langs->trans("Credit"));
+
 		$formquestion = array(
 			array('type' => 'text', 'name' => 'clone_label', 'label' => $langs->trans("Label"), 'value' => $langs->trans("CopyOf").' '.$object->label),
-		);
-		$formquestion[] = array('type' => 'date', 'tdclass'=>'fieldrequired', 'name' => 'clone_date_payment', 'label' => $langs->trans("DatePayment"), 'value' => -1);
-		$formquestion[] = array('type' => 'date', 'name' => 'clone_date_value', 'label' => $langs->trans("DateValue"), 'value' => -1);
-		$formquestion[] = array('type' => 'other', 'tdclass'=>'fieldrequired', 'name' => 'accountid', 'label' => $langs->trans("BankAccount"), 'value' => $form->select_comptes($accountid, "accountid", 0, '', 1, '', 0, 'minwidth200', 1));
+            array('type' => 'date', 'tdclass'=>'fieldrequired', 'name' => 'clone_date_payment', 'label' => $langs->trans("DatePayment"), 'value' => -1),
+		    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),
+        );
 
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneVariousPayment', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 300);
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneVariousPayment', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 350);
 	}
 
 	print dol_get_fiche_head($head, 'card', $langs->trans("VariousPayment"), -1, $object->picto);
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 9c936c1d943..0d91eb38e7d 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -424,6 +424,10 @@ if ($result)
 	{
 		$obj = $db->fetch_object($result);
 
+		$variousstatic->id = $obj->rowid;
+		$variousstatic->ref = $obj->rowid;
+		$variousstatic->label = $obj->label;
+
 		print '<tr class="oddeven">';
 
 		// No
@@ -433,15 +437,13 @@ if ($result)
 
 		// Ref
 		if ($arrayfields['ref']['checked']) {
-			$variousstatic->id = $obj->rowid;
-			$variousstatic->ref = $obj->rowid;
-			print "<td>".$variousstatic->getNomUrl(1)."</td>";
+			print '<td>'.$variousstatic->getNomUrl(1)."</td>";
 			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Label payment
 		if ($arrayfields['label']['checked']) {
-			print "<td>".dol_trunc($obj->label, 40)."</td>";
+			print '<td class="tdoverflowmax150" title="'.$variousstatic->label.'">'.$variousstatic->label."</td>";
 			if (!$i) $totalarray['nbfield']++;
 		}
 
@@ -460,7 +462,13 @@ if ($result)
 
 		// Type
 		if ($arrayfields['type']['checked']) {
-			print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
+			print '<td>';
+			if ($obj->payment_code) {
+				print $langs->trans("PaymentTypeShort".$obj->payment_code);
+				print ' ';
+			}
+			print $obj->num_payment;
+			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
 
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 25505325c98..a1471f48482 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -439,7 +439,7 @@ if (empty($reshook))
 		$predef = '';
 		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$price_ht = price2num(GETPOST('price_ht'), 'MU');
-		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CR');
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU');
 		$prod_entry_mode = GETPOST('prod_entry_mode', 'alpha');
 		if ($prod_entry_mode == 'free')
 		{
@@ -450,8 +450,8 @@ if (empty($reshook))
 			$tva_tx = '';
 		}
 
-		$qty = price2num(GETPOST('qty'.$predef), 'alpha');
-		$remise_percent = GETPOST('remise_percent'.$predef);
+		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
+		$remise_percent = price2num(GETPOST('remise_percent'.$predef), 2);
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -801,7 +801,7 @@ if (empty($reshook))
 			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
 
 			// Check price is not lower than minimum (check is done only for standard or replacement invoices)
-			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT) && $price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent')) / 100) < price2num($price_min))))
+			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT) && $price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent', 2)) / 100) < price2num($price_min))))
 			{
 				setEventMessages($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), null, 'errors');
 				$error++;
@@ -837,7 +837,7 @@ if (empty($reshook))
 				$localtax1_rate,
 				$localtax1_rate,
 				GETPOST('productid'),
-				GETPOST('remise_percent'),
+				price2num(GETPOST('remise_percent'), 2),
 				'HT',
 				$info_bits,
 				0,
@@ -923,7 +923,8 @@ if (empty($reshook))
  *	View
  */
 
-llxHeader('', $langs->trans("RepeatableInvoices"), 'ch-facture.html#s-fac-facture-rec');
+$help_url = '';
+llxHeader('', $langs->trans("RepeatableInvoices"), $help_url);
 
 $form = new Form($db);
 $formother = new FormOther($db);
@@ -932,8 +933,7 @@ $companystatic = new Societe($db);
 $invoicerectmp = new FactureRec($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
+$nowlasthour = dol_get_last_hour($now);
 
 
 /*
@@ -1245,7 +1245,9 @@ if ($action == 'create')
 
 		print '<table class="border centpercent tableforfield">';
 
-		print '<tr><td class="titlefield">'.$langs->trans("Author").'</td><td>'.$author->getFullName($langs)."</td></tr>";
+		print '<tr><td class="titlefield">'.$langs->trans("Author").'</td><td>';
+		print $author->getNomUrl(-1);
+		print "</td></tr>";
 
 		print '<tr><td>'.$langs->trans("AmountHT").'</td>';
 		print '<td>'.price($object->total_ht, '', $langs, 1, -1, -1, $conf->currency).'</td>';
@@ -1667,8 +1669,7 @@ if ($action == 'create')
 				{
 					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 <= $today)
-					{
+					if (empty($object->frequency) || $object->date_when <= $nowlasthour) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->thirdparty->id.'&fac_rec='.$object->id.'">'.$langs->trans("CreateBill").'</a></div>';
 					} else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("DateIsNotEnough")).'">'.$langs->trans("CreateBill").'</a></div>';
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index cbcb49583b1..cdb729991da 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -14,7 +14,7 @@
  * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2014-2019  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2015-2016  Marcos García           <marcosgdf@gmail.com>
- * Copyright (C) 2018-2019  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
@@ -193,7 +193,7 @@ if (empty($reshook))
 		$result = $object->fetch($id);
 
 		if ($object->statut == Facture::STATUS_CLOSED || ($object->statut == Facture::STATUS_ABANDONED && ($object->close_code != 'replaced' || $object->getIdReplacingInvoice() == 0)) || ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 1)) {    // ($object->statut == 1 && $object->paye == 1) should not happened but can be found when data are corrupted
-			$result = $object->set_unpaid($user);
+			$result = $object->setUnpaid($user);
 			if ($result > 0) {
 				header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id);
 				exit();
@@ -476,19 +476,15 @@ if (empty($reshook))
 			}
 		}
 	} // Set incoterm
-	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
-	{
+	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled)) {
 		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
 	} // bank account
-	elseif ($action == 'setbankaccount' && $usercancreate)
-	{
+	elseif ($action == 'setbankaccount' && $usercancreate) {
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
-	} elseif ($action == 'setremisepercent' && $usercancreate)
-	{
+	} elseif ($action == 'setremisepercent' && $usercancreate) {
 		$object->fetch($id);
-		$result = $object->set_remise($user, $_POST['remise_percent']);
-	} elseif ($action == "setabsolutediscount" && $usercancreate)
-	{
+		$result = $object->setDiscount($user, price2num(GETPOST('remise_percent'), 2));
+	} elseif ($action == "setabsolutediscount" && $usercancreate) {
 		// POST[remise_id] or POST[remise_id_for_payment]
 
 		// We use the credit to reduce amount of invoice
@@ -751,7 +747,7 @@ if (empty($reshook))
 	elseif ($action == 'confirm_paid' && $confirm == 'yes' && $usercanissuepayment)
 	{
 		$object->fetch($id);
-		$result = $object->set_paid($user);
+		$result = $object->setPaid($user);
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	} // Classif "paid partialy"
 	elseif ($action == 'confirm_paid_partially' && $confirm == 'yes' && $usercanissuepayment)
@@ -760,7 +756,7 @@ if (empty($reshook))
 		$close_code = GETPOST("close_code", 'restricthtml');
 		$close_note = GETPOST("close_note", 'restricthtml');
 		if ($close_code) {
-			$result = $object->set_paid($user, $close_code, $close_note);
+			$result = $object->setPaid($user, $close_code, $close_note);
 			if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 		} else {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Reason")), null, 'errors');
@@ -771,7 +767,7 @@ if (empty($reshook))
 		$close_code = GETPOST("close_code", 'restricthtml');
 		$close_note = GETPOST("close_note", 'restricthtml');
 		if ($close_code) {
-			$result = $object->set_canceled($user, $close_code, $close_note);
+			$result = $object->setCanceled($user, $close_code, $close_note);
 			if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 		} else {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Reason")), null, 'errors');
@@ -925,7 +921,7 @@ if (empty($reshook))
 			{
 				if ($object->type != Facture::TYPE_DEPOSIT) {
 					// Classe facture
-					$result = $object->set_paid($user);
+					$result = $object->setPaid($user);
 					if ($result >= 0)
 					{
 						$db->commit();
@@ -974,14 +970,17 @@ if (empty($reshook))
 		if ($ret < 0) $error++;
 
 		// Replacement invoice
-		if ($_POST['type'] == Facture::TYPE_REPLACEMENT)
+		if (GETPOST('type') == Facture::TYPE_REPLACEMENT)
 		{
 			$dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-			if (empty($dateinvoice))
-			{
+			if (empty($dateinvoice)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 				$action = 'create';
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now()) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+				$error++;
+				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
+				$action = 'create';
 			}
 
 			if (!($_POST['fac_replacement'] > 0)) {
@@ -990,26 +989,25 @@ if (empty($reshook))
 				$action = 'create';
 			}
 
-			$date_pointoftax = dol_mktime(12, 0, 0, $_POST['date_pointoftaxmonth'], $_POST['date_pointoftaxday'], $_POST['date_pointoftaxyear']);
+			$date_pointoftax = dol_mktime(12, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'));
 
 			if (!$error) {
 				// This is a replacement invoice
-				$result = $object->fetch($_POST['fac_replacement']);
+				$result = $object->fetch(GETPOST('fac_replacement', 'int'));
 				$object->fetch_thirdparty();
 
 				$object->date = $dateinvoice;
 				$object->date_pointoftax = $date_pointoftax;
 				$object->note_public		= trim(GETPOST('note_public', 'restricthtml'));
 				// We do not copy the private note
-				$object->ref_client			= $_POST['ref_client'];
-				$object->ref_int = $_POST['ref_int'];
-				$object->model_pdf = $_POST['model'];
-				$object->fk_project			= $_POST['projectid'];
-				$object->cond_reglement_id	= $_POST['cond_reglement_id'];
-				$object->mode_reglement_id	= $_POST['mode_reglement_id'];
+				$object->ref_client			= GETPOST('ref_client', 'alphanohtml');
+				$object->model_pdf = GETPOST('model', 'alphanohtml');
+				$object->fk_project			= GETPOST('projectid', 'int');
+				$object->cond_reglement_id	= GETPOST('cond_reglement_id', 'int');
+				$object->mode_reglement_id	= GETPOST('mode_reglement_id', 'int');
 				$object->fk_account = GETPOST('fk_account', 'int');
-				$object->remise_absolue		= $_POST['remise_absolue'];
-				$object->remise_percent		= $_POST['remise_percent'];
+				$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');
@@ -1029,7 +1027,7 @@ if (empty($reshook))
 		// Credit note invoice
 		if (GETPOST('type') == Facture::TYPE_CREDIT_NOTE)
 		{
-			$sourceinvoice = GETPOST('fac_avoir');
+			$sourceinvoice = GETPOST('fac_avoir', 'int');
 			if (!($sourceinvoice > 0) && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE))
 			{
 				$error++;
@@ -1038,11 +1036,14 @@ if (empty($reshook))
 			}
 
 			$dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-			if (empty($dateinvoice))
-			{
+			if (empty($dateinvoice)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 				$action = 'create';
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now()) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+				$error++;
+				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
+				$action = 'create';
 			}
 
 			$date_pointoftax = dol_mktime(12, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'));
@@ -1061,11 +1062,11 @@ if (empty($reshook))
 				$object->ref_client			= GETPOST('ref_client');
 				$object->model_pdf = GETPOST('model');
 				$object->fk_project			= GETPOST('projectid', 'int');
-				$object->cond_reglement_id	= 0;
-				$object->mode_reglement_id	= GETPOST('mode_reglement_id');
+				$object->cond_reglement_id	= 0;		// No payment term for a credit note
+				$object->mode_reglement_id	= GETPOST('mode_reglement_id', 'int');
 				$object->fk_account = GETPOST('fk_account', 'int');
-				$object->remise_absolue		= GETPOST('remise_absolue');
-				$object->remise_percent		= GETPOST('remise_percent');
+				$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');
@@ -1252,14 +1253,17 @@ if (empty($reshook))
 		}
 
 		// Standard invoice or Deposit invoice, created from a Predefined template invoice
-		if (($_POST['type'] == Facture::TYPE_STANDARD || $_POST['type'] == Facture::TYPE_DEPOSIT) && GETPOST('fac_rec', 'int') > 0)
+		if ((GETPOST('type') == Facture::TYPE_STANDARD || GETPOST('type') == Facture::TYPE_DEPOSIT) && GETPOST('fac_rec', 'int') > 0)
 		{
 			$dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-			if (empty($dateinvoice))
-			{
+			if (empty($dateinvoice)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 				$action = 'create';
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now()) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+				$error++;
+				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
+				$action = 'create';
 			}
 
 			$date_pointoftax = dol_mktime(12, 0, 0, $_POST['date_pointoftaxmonth'], $_POST['date_pointoftaxday'], $_POST['date_pointoftaxyear']);
@@ -1280,8 +1284,8 @@ if (empty($reshook))
 				$object->mode_reglement_id	= GETPOST('mode_reglement_id', 'int');
 				$object->fk_account = GETPOST('fk_account', 'int');
 				$object->amount = price2num(GETPOST('amount'));
-				$object->remise_absolue		= GETPOST('remise_absolue');
-				$object->remise_percent		= GETPOST('remise_percent');
+				$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');
@@ -1295,7 +1299,7 @@ if (empty($reshook))
 		}
 
 		// Standard or deposit or proforma invoice, not from a Predefined template invoice
-		if (($_POST['type'] == Facture::TYPE_STANDARD || $_POST['type'] == Facture::TYPE_DEPOSIT || $_POST['type'] == Facture::TYPE_PROFORMA || ($_POST['type'] == Facture::TYPE_SITUATION && empty($_POST['situations']))) && GETPOST('fac_rec') <= 0)
+		if ((GETPOST('type') == Facture::TYPE_STANDARD || GETPOST('type') == Facture::TYPE_DEPOSIT || GETPOST('type') == Facture::TYPE_PROFORMA || (GETPOST('type') == Facture::TYPE_SITUATION && !GETPOST('situations'))) && GETPOST('fac_rec') <= 0)
 		{
 			if (GETPOST('socid', 'int') < 1)
 			{
@@ -1305,14 +1309,17 @@ if (empty($reshook))
 			}
 
 			$dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-			if (empty($dateinvoice))
-			{
+			if (empty($dateinvoice)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 				$action = 'create';
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now()) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+				$error++;
+				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
+				$action = 'create';
 			}
 
-			$date_pointoftax = dol_mktime(12, 0, 0, $_POST['date_pointoftaxmonth'], $_POST['date_pointoftaxday'], $_POST['date_pointoftaxyear']);
+			$date_pointoftax = dol_mktime(12, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'));
 
 			if (!$error)
 			{
@@ -1331,8 +1338,8 @@ if (empty($reshook))
 				$object->mode_reglement_id	= GETPOST('mode_reglement_id');
 				$object->fk_account = GETPOST('fk_account', 'int');
 				$object->amount = price2num(GETPOST('amount'));
-				$object->remise_absolue		= GETPOST('remise_absolue');
-				$object->remise_percent		= GETPOST('remise_percent');
+				$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');
@@ -1710,12 +1717,12 @@ if (empty($reshook))
 					$id = $object->create($user);
 
 					for ($i = 1; $i <= $NBLINES; $i++) {
-						if ($_POST['idprod'.$i]) {
+						if (GETPOST('idprod'.$i, 'int')) {
 							$product = new Product($db);
-							$product->fetch($_POST['idprod'.$i]);
-							$startday = dol_mktime(12, 0, 0, $_POST['date_start'.$i.'month'], $_POST['date_start'.$i.'day'], $_POST['date_start'.$i.'year']);
-							$endday = dol_mktime(12, 0, 0, $_POST['date_end'.$i.'month'], $_POST['date_end'.$i.'day'], $_POST['date_end'.$i.'year']);
-							$result = $object->addline($product->description, $product->price, $_POST['qty'.$i], $product->tva_tx, $product->localtax1_tx, $product->localtax2_tx, $_POST['idprod'.$i], $_POST['remise_percent'.$i], $startday, $endday, 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type, -1, 0, '', 0, 0, null, 0, '', 0, 100, '', $product->fk_unit);
+							$product->fetch(GETPOST('idprod'.$i, 'int'));
+							$startday = dol_mktime(12, 0, 0, GETPOST('date_start'.$i.'month'), GETPOST('date_start'.$i.'day'), GETPOST('date_start'.$i.'year'));
+							$endday = dol_mktime(12, 0, 0, GETPOST('date_end'.$i.'month'), GETPOST('date_end'.$i.'day'), GETPOST('date_end'.$i.'year'));
+							$result = $object->addline($product->description, $product->price, price2num(GETPOST('qty'.$i), 'MS'), $product->tva_tx, $product->localtax1_tx, $product->localtax2_tx, $_POST['idprod'.$i], $_POST['remise_percent'.$i], $startday, $endday, 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type, -1, 0, '', 0, 0, null, 0, '', 0, 100, '', $product->fk_unit);
 						}
 					}
 				}
@@ -1723,18 +1730,22 @@ if (empty($reshook))
 		}
 
 		// Situation invoices
-		if (GETPOST('type') == Facture::TYPE_SITUATION && (!empty($_POST['situations'])))
+		if (GETPOST('type') == Facture::TYPE_SITUATION && GETPOST('situations'))
 		{
-			$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-			if (empty($datefacture)) {
+			$dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+			if (empty($dateinvoice)) {
 				$error++;
 				$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date"));
 				setEventMessages($mesg, null, 'errors');
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now()) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+				$error++;
+				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
+				$action = 'create';
 			}
 
-			$date_pointoftax = dol_mktime(12, 0, 0, $_POST['date_pointoftaxmonth'], $_POST['date_pointoftaxday'], $_POST['date_pointoftaxyear']);
+			$date_pointoftax = dol_mktime(12, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'));
 
-			if (!($_POST['situations'] > 0)) {
+			if (!(GETPOST('situations', 'int') > 0)) {
 				$error++;
 				$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("InvoiceSituation"));
 				setEventMessages($mesg, null, 'errors');
@@ -1742,8 +1753,8 @@ if (empty($reshook))
 			}
 
 			if (!$error) {
-				$result = $object->fetch($_POST['situations']);
-				$object->fk_facture_source = $_POST['situations'];
+				$result = $object->fetch(GETPOST('situations', 'int'));
+				$object->fk_facture_source = GETPOST('situations', 'int');
 				$object->type = Facture::TYPE_SITUATION;
 
 				if (!empty($origin) && !empty($originid))
@@ -1811,7 +1822,7 @@ if (empty($reshook))
 				}
 
 				$object->fetch_thirdparty();
-				$object->date = $datefacture;
+				$object->date = $dateinvoice;
 				$object->date_pointoftax = $date_pointoftax;
 				$object->note_public = trim(GETPOST('note_public', 'restricthtml'));
 				$object->note = trim(GETPOST('note', 'restricthtml'));
@@ -1821,8 +1832,8 @@ if (empty($reshook))
 				$object->fk_project = GETPOST('projectid', 'int');
 				$object->cond_reglement_id = GETPOST('cond_reglement_id', 'int');
 				$object->mode_reglement_id = GETPOST('mode_reglement_id', 'int');
-				$object->remise_absolue = GETPOST('remise_absolue', 'int');
-				$object->remise_percent = GETPOST('remise_percent', 'int');
+				$object->remise_absolue =price2num(GETPOST('remise_absolue'), 'MU');
+				$object->remise_percent = price2num(GETPOST('remise_percent'), 2);
 
 				// Proprietes particulieres a facture de remplacement
 
@@ -1894,7 +1905,7 @@ if (empty($reshook))
 
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOST('dp_desc', 'none') ?GETPOST('dp_desc', 'restricthtml') : '');
+		$product_desc =(GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$price_ht = price2num(GETPOST('price_ht'));
 		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'));
 		$prod_entry_mode = GETPOST('prod_entry_mode', 'alpha');
@@ -1907,8 +1918,8 @@ if (empty($reshook))
 			$tva_tx = '';
 		}
 
-		$qty = GETPOST('qty'.$predef);
-		$remise_percent = GETPOST('remise_percent'.$predef);
+		$qty = price2num(GETPOST('qty'.$predef), 'MS');
+		$remise_percent = price2num(GETPOST('remise_percent'.$predef), 2);
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -2064,6 +2075,11 @@ 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 (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) $desc = $product_desc;
 				else $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 
@@ -2293,7 +2309,7 @@ if (empty($reshook))
 			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
 
 			// Check price is not lower than minimum (check is done only for standard or replacement invoices)
-			if ($usercanproductignorepricemin && (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT) && $price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent')) / 100) < price2num($price_min)))) {
+			if ($usercanproductignorepricemin && (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT) && $price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent'), 2) / 100) < price2num($price_min)))) {
 				setEventMessages($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), null, 'errors');
 				$error++;
 			}
@@ -2346,7 +2362,7 @@ if (empty($reshook))
 				}
 			}
 
-			$result = $object->updateline(GETPOST('lineid', 'int'), $description, $pu_ht, $qty, price2num(GETPOST('remise_percent', 'alpha')),
+			$result = $object->updateline(GETPOST('lineid', 'int'), $description, $pu_ht, $qty, price2num(GETPOST('remise_percent'), 2),
 				$date_start, $date_end, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $type,
 				GETPOST('fk_parent_line', 'int'), 0, $fournprice, $buyingprice, $label, $special_code, $array_options, price2num(GETPOST('progress', 'alpha')),
 				GETPOST('units', 'alpha'), $pu_ht_devise);
@@ -2935,7 +2951,7 @@ if ($action == 'create')
 	} else {
 		print '<tr><td class="fieldrequired">'.$langs->trans('Customer').'</td>';
 		print '<td colspan="2">';
-		print $form->select_company($soc->id, 'socid', '((s.client = 1 OR s.client = 3) AND s.status=1)', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
+		print img_picto('', 'company').$form->select_company($soc->id, 'socid', '((s.client = 1 OR s.client = 3) AND s.status=1)', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// Option to reload page to retrieve customer informations.
 		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED))
 		{
@@ -3342,11 +3358,11 @@ if ($action == 'create')
 		print '</td></tr>';
 	}
 
-	$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+	$newdateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
 	// Date invoice
 	print '<tr><td class="fieldrequired">'.$langs->trans('DateInvoice').'</td><td colspan="2">';
-	print $form->selectDate($datefacture ? $datefacture : $dateinvoice, '', '', '', '', "add", 1, 1);
+	print $form->selectDate($newdateinvoice ? $newdateinvoice : $dateinvoice, '', '', '', '', "add", 1, 1);
 	print '</td></tr>';
 
 	// Date point of tax
@@ -3423,11 +3439,11 @@ if ($action == 'create')
 	if (!empty($conf->banque->enabled))
 	{
 		if (GETPOSTISSET('fk_account')) {
-			$fk_account = GETPOST('fk_account');
+			$fk_account = GETPOST('fk_account', 'int');
 		}
 
 		print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';
-		$form->select_comptes($fk_account, 'fk_account', 0, '', 1);
+		print img_picto('', 'bank_account', 'class="paddingrightonly"').$form->select_comptes($fk_account, 'fk_account', 0, '', 1, '', 0, '', 1);
 		print '</td></tr>';
 	}
 
@@ -3436,7 +3452,7 @@ if ($action == 'create')
 	{
 		$langs->load('projects');
 		print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">';
-		$numprojet = $formproject->select_projects(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
+		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 '</td></tr>';
 	}
@@ -3483,11 +3499,11 @@ if ($action == 'create')
 	if (!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) {
 		// Hidden conf
 		$paramkey = 'FACTURE_ADDON_PDF_'.$object->type;
-		$curent = !empty($conf->global->$paramkey) ? $conf->global->$paramkey : $conf->global->FACTURE_ADDON_PDF;
+		$preselected = !empty($conf->global->$paramkey) ? $conf->global->$paramkey : $conf->global->FACTURE_ADDON_PDF;
 	} else {
-		$curent = $conf->global->FACTURE_ADDON_PDF;
+		$preselected = $conf->global->FACTURE_ADDON_PDF;
 	}
-	print $form->selectarray('model', $liste, $curent);
+	print $form->selectarray('model', $liste, $preselected, 0, 0, 0, '', 0, 0, 0, '', '', 1);
 	print "</td></tr>";
 
 	// Multicurrency
@@ -3504,7 +3520,7 @@ if ($action == 'create')
 	$htmltext = '';
 	if (GETPOST('fac_rec', 'int') > 0)
 	{
-		$dateexample = ($datefacture ? $datefacture : $dateinvoice);
+		$dateexample = ($newdateinvoice ? $newdateinvoice : $dateinvoice);
 		if (empty($dateexample)) $dateexample = dol_now();
 		$substitutionarray = array(
 			'__TOTAL_HT__' => $langs->trans("AmountHT").' ('.$langs->trans("Example").': '.price($exampletemplateinvoice->total_ht).')',
@@ -4123,7 +4139,7 @@ if ($action == 'create')
 		$result = $tmptemplate->fetch($object->fk_fac_rec_source);
 		if ($result > 0) {
 			print ' <span class="opacitymediumbycolor paddingleft">';
-			print $langs->transnoentities("GeneratedFromTemplate", '<a href="'.DOL_MAIN_URL_ROOT.'/compta/facture/card-rec.php?facid='.$tmptemplate->id.'">'.dol_escape_htmltag($tmptemplate->ref).'</a>');
+			print $langs->transnoentities("GeneratedFromTemplate", '<a href="'.DOL_URL_ROOT.'/compta/facture/card-rec.php?facid='.$tmptemplate->id.'">'.dol_escape_htmltag($tmptemplate->ref).'</a>');
 			print '</span>';
 		}
 	}
@@ -4264,7 +4280,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 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&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
 			print '</tr></table>';
 			print '</td><td>';
 			if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 19a5c8c287b..444fca3155a 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -910,7 +910,7 @@ class Invoices extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$result = $this->invoice->set_paid(DolibarrApiAccess::$user, $close_code, $close_note);
+		$result = $this->invoice->setPaid(DolibarrApiAccess::$user, $close_code, $close_note);
 		if ($result == 0) {
 			throw new RestException(304, 'Error nothing done. May be object is already validated');
 		}
@@ -960,7 +960,7 @@ class Invoices extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$result = $this->invoice->set_unpaid(DolibarrApiAccess::$user);
+		$result = $this->invoice->setUnpaid(DolibarrApiAccess::$user);
 		if ($result == 0) {
 			throw new RestException(304, 'Nothing done');
 		}
@@ -1051,7 +1051,7 @@ class Invoices extends DolibarrApi
 		}
 
 		if ($this->invoice->paye) {
-			throw new RestException(500, 'Alreay payed');
+			throw new RestException(500, 'Alreay paid');
 		}
 
 		$this->invoice->fetch($id);
@@ -1167,7 +1167,7 @@ class Invoices extends DolibarrApi
 			{
 				if ($this->invoice->type != Facture::TYPE_DEPOSIT) {
 					// Classe facture
-					$result = $this->invoice->set_paid(DolibarrApiAccess::$user);
+					$result = $this->invoice->setPaid(DolibarrApiAccess::$user);
 					if ($result >= 0)
 					{
 						$this->db->commit();
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 29e78f90af8..13a58a3e075 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -280,7 +280,7 @@ class FactureRec extends CommonInvoice
 			$sql .= ", ".(!empty($facsrc->remise) ? $this->remise : '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->modelpdf) ? ("'".$this->db->escape($this->modelpdf)."'") : "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");
@@ -347,7 +347,7 @@ class FactureRec extends CommonInvoice
 						{
 							// Extrafields
 							if (method_exists($facsrc->lines[$i], 'fetch_optionals')) {
-								$facsrc->lines[$i]->fetch_optionals($facsrc->lines[$i]->rowid);
+								$facsrc->lines[$i]->fetch_optionals($facsrc->lines[$i]->id);
 								$objectline->array_options = $facsrc->lines[$i]->array_options;
 							}
 
@@ -562,7 +562,7 @@ class FactureRec extends CommonInvoice
 				$this->note_private           = $obj->note_private;
 				$this->note_public            = $obj->note_public;
 				$this->user_author            = $obj->fk_user_author;
-				$this->modelpdf               = $obj->model_pdf; // deprecatd
+				$this->modelpdf               = $obj->model_pdf; // deprecated
 				$this->model_pdf              = $obj->model_pdf;
 				$this->rang = $obj->rang;
 				$this->special_code = $obj->special_code;
@@ -1280,9 +1280,8 @@ class FactureRec extends CommonInvoice
 					{
 						// We refresh the object in order to have all necessary data (like date_lim_reglement)
 						$facture->fetch($facture->id);
-						$result = $facture->generateDocument($facturerec->modelpdf, $langs);
-						if ($result <= 0)
-						{
+						$result = $facture->generateDocument($facturerec->model_pdf, $langs);
+						if ($result <= 0) {
 							$this->errors = $facture->errors;
 							$this->error = $facture->error;
 							$error++;
@@ -1873,7 +1872,7 @@ class FactureRec extends CommonInvoice
 		dol_syslog(get_class($this)."::setModelPdf", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
-			$this->modelpdf = $model;
+			$this->model_pdf = $model;
 			return 1;
 		} else {
 			dol_print_error($this->db);
@@ -2072,6 +2071,8 @@ class FactureLigneRec extends CommonInvoiceLine
 		$sql .= ", fk_contract_line=".($this->fk_contract_line ? $this->fk_contract_line : "null");
 		$sql .= " WHERE rowid = ".$this->id;
 
+		$this->db->begin();
+
 		dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -2091,13 +2092,18 @@ class FactureLigneRec extends CommonInvoiceLine
 				$result = $this->call_trigger('LINEBILLREC_UPDATE', $user);
 				if ($result < 0)
 				{
-					$this->db->rollback();
-					return -2;
+					$error++;
 				}
 				// End call triggers
 			}
-			$this->db->commit();
-			return 1;
+
+			if ($error) {
+				$this->db->rollback();
+				return -2;
+			} else {
+				$this->db->commit();
+				return 1;
+			}
 		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 24f5b748e52..7f686accb4e 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -498,7 +498,7 @@ class Facture extends CommonInvoice
 			$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->modelpdf          = GETPOST('model', 'alpha') ? GETPOST('model', 'alpha') : $_facrec->modelpdf;
+			$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;
@@ -797,6 +797,7 @@ class Facture extends CommonInvoice
 					if ($result < 0)
 					{
 						$this->error = $newinvoiceline->error;
+						$this->errors = $newinvoiceline->errors;
 						$error++;
 						break;
 					}
@@ -1062,8 +1063,8 @@ class Facture extends CommonInvoice
 		$facture->note_public       = $this->note_public;
 		$facture->note_private      = $this->note_private;
 		$facture->ref_client        = $this->ref_client;
-		$facture->modelpdf          = $this->modelpdf; // deprecated
-		$facture->model_pdf         = $this->modelpdf;
+		$facture->modelpdf          = $this->model_pdf; // deprecated
+		$facture->model_pdf         = $this->model_pdf;
 		$facture->fk_project        = $this->fk_project;
 		$facture->cond_reglement_id = $this->cond_reglement_id;
 		$facture->mode_reglement_id = $this->mode_reglement_id;
@@ -1165,6 +1166,7 @@ class Facture extends CommonInvoice
 
 		$object->id = 0;
 		$object->statut = self::STATUS_DRAFT;
+		$object->status = self::STATUS_DRAFT;
 
 		// Clear fields
 		$object->date               = (empty($this->date) ? dol_now() : $this->date);
@@ -1191,23 +1193,23 @@ class Facture extends CommonInvoice
 			{
 				unset($object->lines[$i]);
 			}
-						// Bloc to update dates of service (month by month only if previously filled at 1d near start or end of month)
+
+			// Bloc to update dates of service (month by month only if previously filled and similare to start and end of month)
 			// If it's a service with start and end dates
-			if (!empty($line->date_start) && !empty($line->date_end)) {
+			if (!empty($conf->global->INVOICE_AUTO_NEXT_MONTH_ON_LINES) && !empty($line->date_start) && !empty($line->date_end)) {
 				// Get the dates
 				$start = dol_getdate($line->date_start);
 				$end = dol_getdate($line->date_end);
 
 				// Get the first and last day of the month
 				$first = dol_get_first_day($start['year'], $start['mon']);
-				$last = dol_get_first_day($end['year'], $end['mon']);
+				$last = dol_get_last_day($end['year'], $end['mon']);
 
-				// Get diff betweend start/end of month and previously filled
-				$diffFirst = num_between_day($first, dol_mktime($start['hours'], $start['minutes'], $start['seconds'], $start['mon'], $start['mday'], $start['year'], 'user'));
-				$diffLast = num_between_day(dol_mktime($end['hours'], $end['minutes'], $end['seconds'], $end['mon'], $end['mday'], $end['year'], 'user'), $last);
-
-				// If there is <= 1d (or 2?) of start/or/end of month
-				if ($diffFirst <= 2 && $diffLast <= 2) {
+				//print dol_print_date(dol_mktime(0, 0, 0, $start['mon'], $start['mday'], $start['year'], 'gmt'), 'dayhour').' '.dol_print_date($first, 'dayhour').'<br>';
+				//print dol_mktime(23, 59, 59, $end['mon'], $end['mday'], $end['year'], 'gmt').' '.$last.'<br>';exit;
+				// If start date is first date of month and end date is last date of month
+				if (dol_mktime(0, 0, 0, $start['mon'], $start['mday'], $start['year'], 'gmt') == $first
+					&& dol_mktime(23, 59, 59, $end['mon'], $end['mday'], $end['year'], 'gmt') == $last) {
 					$nextMonth = dol_get_next_month($end['mon'], $end['year']);
 					$newFirst = dol_get_first_day($nextMonth['year'], $nextMonth['month']);
 					$newLast = dol_get_last_day($nextMonth['year'], $nextMonth['month']);
@@ -1594,6 +1596,8 @@ class Facture extends CommonInvoice
 				$this->project = null; // Clear if another value was already set by fetch_projet
 
 				$this->statut = $obj->fk_statut;
+				$this->status = $obj->fk_statut;
+
 				$this->date_lim_reglement = $this->db->jdate($obj->dlr);
 				$this->mode_reglement_id	= $obj->fk_mode_reglement;
 				$this->mode_reglement_code	= $obj->mode_reglement_code;
@@ -2290,6 +2294,8 @@ 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
 	 *
+	 *	@deprecated
+	 *  @see setPaid()
 	 *  @param	User	$user      	Object user that modify
 	 *	@param  string	$close_code	Code renseigne si on classe a payee completement alors que paiement incomplet (cas escompte par exemple)
 	 *	@param  string	$close_note	Commentaire renseigne si on classe a payee alors que paiement incomplet (cas escompte par exemple)
@@ -2298,6 +2304,21 @@ class Facture extends CommonInvoice
 	public function set_paid($user, $close_code = '', $close_note = '')
 	{
 		// phpcs:enable
+		dol_syslog(get_class($this)."::set_paid is deprecated, use setPaid instead", LOG_NOTICE);
+		return $this->setPaid($user, $close_code, $close_note);
+	}
+
+	/**
+	 *  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
+	 *
+	 *  @param	User	$user      	Object user that modify
+	 *	@param  string	$close_code	Code renseigne si on classe a payee completement alors que paiement incomplet (cas escompte par exemple)
+	 *	@param  string	$close_note	Commentaire renseigne si on classe a payee alors que paiement incomplet (cas escompte par exemple)
+	 *  @return int         		<0 if KO, >0 if OK
+	 */
+	public function setPaid($user, $close_code = '', $close_note = '')
+	{
 		$error = 0;
 
 		if ($this->paye != 1)
@@ -2349,12 +2370,28 @@ class Facture extends CommonInvoice
 	 *	Fonction utilisee quand un paiement prelevement est refuse,
 	 * 	ou quand une facture annulee et reouverte.
 	 *
+	 *	@deprecated
+	 *  @see setUnpaid()
 	 *  @param	User	$user       Object user that change status
 	 *  @return int         		<0 if KO, >0 if OK
 	 */
 	public function set_unpaid($user)
 	{
 		// phpcs:enable
+		dol_syslog(get_class($this)."::set_unpaid is deprecated, use setUnpaid instead", LOG_NOTICE);
+		return $this->setUnpaid($user);
+	}
+
+	/**
+	 *  Tag la facture comme non payee completement + appel trigger BILL_UNPAYED
+	 *	Fonction utilisee quand un paiement prelevement est refuse,
+	 * 	ou quand une facture annulee et reouverte.
+	 *
+	 *  @param	User	$user       Object user that change status
+	 *  @return int         		<0 if KO, >0 if OK
+	 */
+	public function setUnpaid($user)
+	{
 		$error = 0;
 
 		$this->db->begin();
@@ -2396,6 +2433,8 @@ class Facture extends CommonInvoice
 	 *	Warning, if option to decrease stock on invoice was set, this function does not change stock (it might be a cancel because
 	 *  of no payment even if merchandises were sent).
 	 *
+	 *	@deprecated
+	 *  @see setCanceled()
 	 *	@param	User	$user        	Object user making change
 	 *	@param	string	$close_code		Code of closing invoice (CLOSECODE_REPLACED, CLOSECODE_...)
 	 *	@param	string	$close_note		Comment
@@ -2404,8 +2443,23 @@ class Facture extends CommonInvoice
 	public function set_canceled($user, $close_code = '', $close_note = '')
 	{
 		// phpcs:enable
+		dol_syslog(get_class($this)."::set_canceled is deprecated, use setCanceled instead", LOG_NOTICE);
+		return $this->setCanceled($user, $close_code, $close_note);
+	}
 
-		dol_syslog(get_class($this)."::set_canceled rowid=".$this->id, LOG_DEBUG);
+	/**
+	 *	Tag invoice as canceled, with no payment on it (example for replacement invoice or payment never received) + call trigger BILL_CANCEL
+	 *	Warning, if option to decrease stock on invoice was set, this function does not change stock (it might be a cancel because
+	 *  of no payment even if merchandises were sent).
+	 *
+	 *	@param	User	$user        	Object user making change
+	 *	@param	string	$close_code		Code of closing invoice (CLOSECODE_REPLACED, CLOSECODE_...)
+	 *	@param	string	$close_note		Comment
+	 *	@return int         			<0 if KO, >0 if OK
+	 */
+	public function setCanceled($user, $close_code = '', $close_note = '')
+	{
+		dol_syslog(get_class($this)."::setCanceled rowid=".$this->id, LOG_DEBUG);
 
 		$this->db->begin();
 
@@ -2539,7 +2593,7 @@ class Facture extends CommonInvoice
 				return -12;
 			}
 
-			$result = $facreplaced->set_canceled($user, self::CLOSECODE_REPLACED, '');
+			$result = $facreplaced->setCanceled($user, self::CLOSECODE_REPLACED, '');
 			if ($result < 0)
 			{
 				$this->error = $facreplaced->error;
@@ -3199,6 +3253,7 @@ class Facture extends CommonInvoice
 				}
 			} else {
 				$this->error = $this->line->error;
+				$this->errors = $this->line->errors;
 				$this->db->rollback();
 				return -2;
 			}
@@ -3367,8 +3422,8 @@ class Facture extends CommonInvoice
 			}
 
 			$this->line->id = $rowid;
-			$this->line->rowid				= $rowid;
-			$this->line->label				= $label;
+			$this->line->rowid = $rowid;
+			$this->line->label = $label;
 			$this->line->desc = $desc;
 			$this->line->ref_ext = $ref_ext;
 			$this->line->qty = ($this->type == self::TYPE_CREDIT_NOTE ?abs($qty) : $qty); // For credit note, quantity is always positive and unit price negative
@@ -3564,6 +3619,8 @@ class Facture extends CommonInvoice
 	/**
 	 *	Set percent discount
 	 *
+	 *  @deprecated
+	 *  @see setDiscount()
 	 *	@param     	User	$user		User that set discount
 	 *	@param     	double	$remise		Discount
 	 *  @param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
@@ -3572,6 +3629,20 @@ class Facture extends CommonInvoice
 	public function set_remise($user, $remise, $notrigger = 0)
 	{
 		// phpcs:enable
+		dol_syslog(get_class($this)."::set_remise is deprecated, use setDiscount instead", LOG_NOTICE);
+		return $this->setDiscount($user, $remise, $notrigger);
+	}
+
+	/**
+	 *	Set percent discount
+	 *
+	 *	@param     	User	$user		User that set discount
+	 *	@param     	double	$remise		Discount
+	 *  @param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *	@return		int 		<0 if ko, >0 if ok
+	 */
+	public function setDiscount($user, $remise, $notrigger = 0)
+	{
 		// Clean parameters
 		if (empty($remise)) $remise = 0;
 
@@ -3729,7 +3800,7 @@ class Facture extends CommonInvoice
 		}
 
 		if (!empty($addon)) {
-			dol_syslog("Call getNextNumRef with ".$addonConstName." = ".$conf->global->FACTURE_ADDON.", thirdparty=".$soc->nom.", type=".$soc->typent_code, LOG_DEBUG);
+			dol_syslog("Call getNextNumRef with ".$addonConstName." = ".$conf->global->FACTURE_ADDON.", thirdparty=".$soc->name.", type=".$soc->typent_code, LOG_DEBUG);
 
 			$mybool = false;
 
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index a1bde7e4f3d..7b60dd639f6 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -85,6 +85,7 @@ $search_type = GETPOST('search_type', 'int');
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_project = GETPOST('search_project', 'alpha');
 $search_societe = GETPOST('search_societe', 'alpha');
+$search_societe_alias = GETPOST('search_societe_alias', 'alpha');
 $search_montant_ht = GETPOST('search_montant_ht', 'alpha');
 $search_montant_vat = GETPOST('search_montant_vat', 'alpha');
 $search_montant_localtax1 = GETPOST('search_montant_localtax1', 'alpha');
@@ -182,6 +183,7 @@ $arrayfields = array(
 	'p.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1), 'position'=>40),
 	'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1), 'position'=>40),
 	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>50),
+	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>1, 'position'=>51),
 	's.town'=>array('label'=>"Town", 'checked'=>1, 'position'=>55),
 	's.zip'=>array('label'=>"Zip", 'checked'=>1, 'position'=>60),
 	'state.nom'=>array('label'=>"StateShort", 'checked'=>0, 'position'=>65),
@@ -254,6 +256,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter',
 	$search_project_ref = '';
 	$search_project = '';
 	$search_societe = '';
+	$search_societe_alias = '';
 	$search_montant_ht = '';
 	$search_montant_vat = '';
 	$search_montant_localtax1 = '';
@@ -413,7 +416,7 @@ $formcompany = new FormCompany($db);
 $thirdpartystatic = new Societe($db);
 
 $sql = 'SELECT';
-if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
+if ($sall || $search_product_category > 0 || $search_user > 0) $sql = 'SELECT DISTINCT';
 $sql .= ' f.rowid as id, f.ref, f.ref_client, f.type, f.note_private, f.note_public, f.increment, f.fk_mode_reglement, f.fk_cond_reglement, f.total as total_ht, f.tva as total_vat, f.total_ttc,';
 $sql .= ' f.localtax1 as total_localtax1, f.localtax2 as total_localtax2,';
 $sql .= ' f.fk_user_author,';
@@ -422,7 +425,7 @@ $sql .= ' f.datef as df, f.date_valid, f.date_lim_reglement as datelimite, f.mod
 $sql .= ' f.paye as paye, f.fk_statut, f.close_code,';
 $sql .= ' f.datec as date_creation, f.tms as date_update, f.date_closing as date_closing,';
 $sql .= ' f.retained_warranty, f.retained_warranty_date_limit, f.situation_final, f.situation_cycle_ref, f.situation_counter,';
-$sql .= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,';
+$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,';
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= " country.code as country_code,";
@@ -486,12 +489,14 @@ if ($search_type != '' && $search_type != '-1') $sql .= " AND f.type IN (".$db->
 if ($search_project_ref) $sql .= natural_search('p.ref', $search_project_ref);
 if ($search_project) $sql .= natural_search('p.title', $search_project);
 if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
+if ($search_societe_alias) $sql .= natural_search('s.name_alias', $search_societe_alias);
 if ($search_town)  $sql .= natural_search('s.town', $search_town);
 if ($search_zip)   $sql .= natural_search("s.zip", $search_zip);
 if ($search_state) $sql .= natural_search("state.nom", $search_state);
 if ($search_country) $sql .= " AND s.fk_pays IN (".$db->sanitize($db->escape($search_country)).')';
-if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';
+if ($search_type_thirdparty != '' && $search_type_thirdparty != '-1') $sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';
 if ($search_company) $sql .= natural_search('s.nom', $search_company);
+if ($search_company_alias) $sql .= natural_search('s.name_alias', $search_company_alias);
 if ($search_montant_ht != '') $sql .= natural_search('f.total', $search_montant_ht, 1);
 if ($search_montant_vat != '') $sql .= natural_search('f.tva', $search_montant_vat, 1);
 if ($search_montant_localtax1 != '') $sql .= natural_search('f.localtax1', $search_montant_localtax1, 1);
@@ -551,7 +556,7 @@ if (!$sall)
 	$sql .= ' f.retained_warranty, f.retained_warranty_date_limit, f.situation_final, f.situation_cycle_ref, f.situation_counter,';
 	$sql .= ' f.fk_user_author, f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva,';
 	$sql .= ' f.multicurrency_total_tva, f.multicurrency_total_ttc,';
-	$sql .= ' s.rowid, s.nom, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,';
+	$sql .= ' s.rowid, s.nom, s.name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,';
 	$sql .= ' typent.code,';
 	$sql .= ' state.code_departement, state.nom,';
 	$sql .= ' country.code,';
@@ -628,6 +633,7 @@ if ($resql)
 	if ($search_project)     $param .= '&search_project='.urlencode($search_project);
 	if ($search_type != '')  $param .= '&search_type='.urlencode($search_type);
 	if ($search_societe)     $param .= '&search_societe='.urlencode($search_societe);
+	if ($search_societe_alias)			$param .= '&search_societe_alias='.urlencode($search_societe_alias);
 	if ($search_town)        $param .= '&search_town='.urlencode($search_town);
 	if ($search_zip)         $param .= '&search_zip='.urlencode($search_zip);
 	if ($search_sale > 0)    $param .= '&search_sale='.urlencode($search_sale);
@@ -861,6 +867,11 @@ if ($resql)
 	{
 		print '<td class="liste_titre"><input class="flat maxwidth75imp" type="text" name="search_societe" value="'.$search_societe.'"></td>';
 	}
+	// Alias
+	if (!empty($arrayfields['s.name_alias']['checked']))
+	{
+		print '<td class="liste_titre"><input class="flat maxwidth75imp" type="text" name="search_societe_alias" value="'.$search_societe_alias.'"></td>';
+	}
 	// Town
 	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat maxwidth75imp" type="text" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
 	// Zip
@@ -883,7 +894,7 @@ if ($resql)
 	if (!empty($arrayfields['typent.code']['checked']))
 	{
 		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
-		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), 'maxwidth100');
+		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), 'maxwidth100', 1);
 		print '</td>';
 	}
 	// Payment mode
@@ -1099,6 +1110,7 @@ if ($resql)
 	if (!empty($arrayfields['p.ref']['checked']))                         print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER['PHP_SELF'], "p.ref", '', $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['p.title']['checked']))                       print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER['PHP_SELF'], "p.title", '', $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['s.nom']['checked']))                         print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER['PHP_SELF'], 's.nom', '', $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['s.name_alias']['checked']))                  print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER['PHP_SELF'], 's.name_alias', '', $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['s.town']['checked']))                        print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['s.zip']['checked']))                         print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['state.nom']['checked']))                     print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
@@ -1361,6 +1373,14 @@ if ($resql)
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
 			}
+			// Alias
+			if (!empty($arrayfields['s.name_alias']['checked']))
+			{
+				print '<td>';
+				print $obj->name_alias;
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
 			// Town
 			if (!empty($arrayfields['s.town']['checked']))
 			{
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index d50813cbea4..26bab3c1984 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -287,7 +287,9 @@ if ($object->id > 0)
 
 	// Type
 	print '<tr><td class="titlefield">'.$langs->trans('Type').'</td><td colspan="3">';
+	print '<span class="badgeneutral">';
 	print $object->getLibType();
+	print '</span>';
 	if ($object->module_source) {
 		print ' <span class="opacitymediumbycolor">('.$langs->trans("POS").' '.$object->module_source.' - '.$langs->trans("Terminal").' '.$object->pos_source.')</span>';
 	}
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 13378979932..2a722f8723d 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -264,7 +264,7 @@ print '</td></tr>';
 // ThirdParty Type
 print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>';
 $sortparam_typent = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
-print $form->selectarray("typent_id", $formcompany->typent_array(0), $typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam_typent);
+print $form->selectarray("typent_id", $formcompany->typent_array(0), $typent_id, 1, 0, 0, '', 0, 0, 0, $sortparam_typent, '', 1);
 if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 print '</td></tr>';
 
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 5614659eac0..dc397d286cc 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -161,8 +161,9 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	$sql .= $hookmanager->resPrint;
 
 	$sql .= " GROUP BY f.rowid, f.ref, f.datef, f.total, f.tva, f.total_ttc, f.ref_client, f.type, f.fk_statut, f.paye,";
-	$sql .= " s.email, s.nom, s.rowid, s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur,";
+	$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) $sql.= ", sc.fk_soc, sc.fk_user";
 
 	// Add Group from hooks
 	$parameters = array();
@@ -192,11 +193,19 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 			$companystatic = new Societe($db);
 
 			$i = 0;
+			$othernb = 0;
 			$tot_ttc = 0;
-			while ($i < $num)
+			while ($i < $num && $i < $conf->liste_limit)
 			{
 				$obj = $db->fetch_object($resql);
 
+				if ($i >= $max) {
+					$othernb += 1;
+					$i++;
+					$tot_ttc += $obj->total_ttc;
+					continue;
+				}
+
 				$tmpinvoice->id = $obj->rowid;
 				$tmpinvoice->ref = $obj->ref;
 				$tmpinvoice->date = $db->jdate($obj->date);
@@ -231,6 +240,14 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 				$i++;
 			}
 
+			if ($othernb) {
+				print '<tr class="oddeven">';
+				print '<td class="nowrap" colspan="3">';
+				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
+				print '</td>';
+				print "</tr>\n";
+			}
+
 			print '<tr class="liste_total"><td class="left">'.$langs->trans("Total").'</td>';
 			print '<td colspan="2" class="right">'.price($tot_ttc).'</td>';
 			print '</tr>';
@@ -289,11 +306,19 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 			$companystatic = new Societe($db);
 
 			$i = 0;
+			$othernb = 0;
 			$tot_ttc = 0;
-			while ($i < $num)
+			while ($i < $num && $i < $conf->liste_limit)
 			{
 				$obj = $db->fetch_object($resql);
 
+				if ($i >= $max) {
+					$othernb += 1;
+					$i++;
+					$tot_ttc += $obj->total_ttc;
+					continue;
+				}
+
 				$facturesupplierstatic->ref = $obj->ref;
 				$facturesupplierstatic->id = $obj->rowid;
 				$facturesupplierstatic->total_ht = $obj->total_ht;
@@ -327,6 +352,14 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$i++;
 			}
 
+			if ($othernb) {
+				print '<tr class="oddeven">';
+				print '<td class="nowrap" colspan="3">';
+				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
+				print '</td>';
+				print "</tr>\n";
+			}
+
 			print '<tr class="liste_total"><td class="left">'.$langs->trans("Total").'</td>';
 			print '<td colspan="2" class="right">'.price($tot_ttc).'</td>';
 			print '</tr>';
@@ -1089,7 +1122,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 }
 
 /*
- * Unpayed supplier invoices
+ * Unpaid supplier invoices
  */
 if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire)
 {
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index b14c567a01d..18367a04a46 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -381,7 +381,7 @@ class Localtax extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	localtax payed
+	 *	Total of localtax paid in invoice
 	 *
 	 *	@param	int		$year		Year
 	 *	@return	int					???
@@ -419,8 +419,7 @@ class Localtax extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	localtax payed
-	 *  Total de la localtax payed
+	 *  Total of localtax paid
 	 *
 	 *	@param	int		$year		Year
 	 *	@return	int					???
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index 7d48d6e1f2d..bedb7259184 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -565,7 +565,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 /*
- * Payed
+ * Paid
  */
 
 print load_fiche_titre($langs->transcountry($LTPaid, $mysoc->country_code), '', '');
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 83393a52cb6..b8bd1b6c564 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -373,6 +373,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
             			function setPaiementCode()
             			{
             				var code = $("#selectpaiementcode option:selected").val();
+							console.log("setPaiementCode code="+code);
 
                             if (code == \'CHQ\' || code == \'VIR\')
             				{
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 9d452ef52b3..b7f8d3c9a3d 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -119,7 +119,7 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->facture
 				$outputlangs->setDefaultLang($_REQUEST['lang_id']);
 			}
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-				$fac->generateDocument($fac->modelpdf, $outputlangs);
+				$fac->generateDocument($fac->model_pdf, $outputlangs);
 			}
 		}
 
@@ -265,10 +265,8 @@ print '</td></tr>';
 // Bank account
 if (!empty($conf->banque->enabled))
 {
-	if ($object->fk_account > 0)
-	{
-		if ($object->type_code == 'CHQ' && $bankline->fk_bordereau > 0)
-		{
+	if ($object->fk_account > 0) {
+		if ($object->type_code == 'CHQ' && $bankline->fk_bordereau > 0) {
 			dol_include_once('/compta/paiement/cheque/class/remisecheque.class.php');
 			$bordereau = new RemiseCheque($db);
 			$bordereau->fetch($bankline->fk_bordereau);
@@ -285,7 +283,12 @@ if (!empty($conf->banque->enabled))
 	print '<tr>';
 	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
 	print '<td>';
-	print $bankline->getNomUrl(1, 0, 'showconciliatedandaccounted');
+	if ($object->fk_account > 0) {
+		print $bankline->getNomUrl(1, 0, 'showconciliatedandaccounted');
+	} else {
+		$langs->load("admin");
+		print '<span class="opacitymedium">'.$langs->trans("NoRecordFoundIBankcAccount", $langs->transnoentitiesnoconv("Module85Name")).'</span>';
+	}
 	print '</td>';
 	print '</tr>';
 }
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 4b93cb4cca3..c6afa4def1d 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -749,7 +749,7 @@ if ($action != 'new')
 	if ($object->statut == 1)
 	{
 		$filename = dol_sanitizeFileName($object->ref);
-		$filedir = $dir.get_exdir($object->ref, 0, 1, 0, $object, 'cheque').dol_sanitizeFileName($object->ref);
+		$filedir = $dir.get_exdir($object->ref, 0, 1, 0, $object, 'checkdeposits');
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 
 		print $formfile->showdocuments('remisecheque', $filename, $filedir, $urlsource, 1, 1);
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 4e22d8f141a..9c685bcce1d 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -788,7 +788,7 @@ class RemiseCheque extends CommonObject
 			{
 				$invoice = new Facture($this->db);
 				$invoice->fetch($obj->fk_facture);
-				$invoice->set_unpaid($user);
+				$invoice->setUnpaid($user);
 
 				$rejectedPayment->amounts[$obj->fk_facture] = price2num($obj->amount) * -1;
 			}
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 6b7f1612836..fc37c3f309c 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -192,6 +192,7 @@ class Paiement extends CommonObject
 				$this->amount         = $obj->amount;
 				$this->multicurrency_amount = $obj->multicurrency_amount;
 				$this->note           = $obj->note;
+				$this->note_private   = $obj->note;
 				$this->type_label = $obj->type_label;
 				$this->type_code      = $obj->type_code;
 				$this->statut         = $obj->statut;
@@ -397,10 +398,11 @@ class Paiement extends CommonObject
 								// Set invoice to paid
 								if (!$error)
 								{
-									$result = $invoice->set_paid($user, '', '');
+									$result = $invoice->setPaid($user, '', '');
 									if ($result < 0)
 									{
 										$this->error = $invoice->error;
+										$this->errors = $invoice->errors;
 										$error++;
 									}
 								}
@@ -423,7 +425,7 @@ class Paiement extends CommonObject
 								$outputlangs->setDefaultLang($newlang);
 							}
 							$ret = $invoice->fetch($facid); // Reload to get new records
-							$result = $invoice->generateDocument($invoice->modelpdf, $outputlangs);
+							$result = $invoice->generateDocument($invoice->model_pdf, $outputlangs);
 							if ($result < 0) {
 								setEventMessages($invoice->error, $invoice->errors, 'errors');
 								$error++;
@@ -578,9 +580,10 @@ class Paiement extends CommonObject
 	 *      @param  string	$emetteur_nom       Name of transmitter
 	 *      @param  string	$emetteur_banque    Name of bank
 	 *      @param	int		$notrigger			No trigger
+	 *  	@param	string	$accountancycode	When we record a free bank entry, we must provide accounting account if accountancy module is on.
 	 *      @return int                 		<0 if KO, bank_line_id if OK
 	 */
-	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque, $notrigger = 0)
+	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque, $notrigger = 0, $accountancycode = '')
 	{
 		global $conf, $langs, $user;
 
@@ -625,7 +628,8 @@ class Paiement extends CommonObject
 				'',
 				$user,
 				$emetteur_nom,
-				$emetteur_banque
+				$emetteur_banque,
+				$accountancycode
 			);
 
 			// Mise a jour fk_bank dans llx_paiement
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index e1f6fb38dbc..cfcdead5fed 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -148,7 +148,7 @@ llxHeader('', $langs->trans('ListPayment'));
 
 if (GETPOST("orphelins", "alpha")) {
 	// Payments not linked to an invoice. Should not happend. For debug only.
-	$sql = "SELECT p.ref, p.datep, p.amount, p.statut, p.num_paiement";
+	$sql = "SELECT p.rowid, p.ref, p.datep, p.amount, p.statut, p.num_paiement";
 	$sql .= ", c.code as paiement_code";
 
 	// Add fields from hooks
@@ -166,7 +166,7 @@ if (GETPOST("orphelins", "alpha")) {
 	$sql .= $hookmanager->resPrint;
 } else {
 	// DISTINCT is to avoid duplicate when there is a link to sales representatives
-	$sql = "SELECT DISTINCT p.ref, p.datep, p.fk_bank, p.amount, p.statut, p.num_paiement";
+	$sql = "SELECT DISTINCT p.rowid, p.ref, p.datep, p.fk_bank, p.amount, p.statut, p.num_paiement";
 	$sql .= ", c.code as paiement_code";
 	$sql .= ", ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.fk_accountancy_journal as accountancy_journal";
 	$sql .= ", s.rowid as socid, s.nom as name, s.email";
@@ -390,7 +390,7 @@ while ($i < min($num, $limit)) {
 	$objp = $db->fetch_object($resql);
 
 	$object->id = $objp->rowid;
-	$object->ref = $objp->ref;
+	$object->ref = ($objp->ref ? $objp->ref : $objp->rowid);
 
 	$companystatic->id = $objp->socid;
 	$companystatic->name = $objp->name;
@@ -497,6 +497,14 @@ while ($i < min($num, $limit)) {
 // 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>';
+}
+
 print "</table>";
 print "</div>";
 print "</form>";
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 299cdf9a6c3..247f66b5acf 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -223,7 +223,7 @@ if ($action == 'create')
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
 	$datepaye = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
-	$datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ? (GETPOSTISSET("remonth") ? $datepaye : -1) : 0;
+	$datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ? (GETPOSTISSET("remonth") ? $datepaye : -1) : '';
 	print $form->selectDate($datepayment, '', '', '', 0, "add_payment", 1, 1, 0, '', '', $charge->date_ech, '', 1, $langs->trans("DateOfSocialContribution"));
 	print "</td>";
 	print '</tr>';
@@ -236,7 +236,7 @@ if ($action == 'create')
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 	print '<td>';
-	$form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid") : $charge->accountid, "accountid", 0, '', 2); // Show opend bank account list
+	$form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid", 'int') : $charge->accountid, "accountid", 0, '', 2); // Show opend bank account list
 	print '</td></tr>';
 
 	// Number
diff --git a/htdocs/compta/paiement_vat.php b/htdocs/compta/paiement_vat.php
new file mode 100644
index 00000000000..5e073f69c53
--- /dev/null
+++ b/htdocs/compta/paiement_vat.php
@@ -0,0 +1,339 @@
+<?php
+/* Copyright (C) 2004-2014  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2016-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
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/paiement_charge.php
+ *      \ingroup    tax
+ *      \brief      Page to add payment of a tax
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/paymentvat.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("banks", "bills"));
+
+$chid = GETPOST("id", 'int');
+$action = GETPOST('action', 'alpha');
+$amounts = array();
+
+// Security check
+$socid = 0;
+if ($user->socid > 0)
+{
+	$socid = $user->socid;
+}
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'yes'))
+{
+	$error = 0;
+
+	if ($_POST["cancel"])
+	{
+		$loc = DOL_URL_ROOT.'/compta/tva/card.php?id='.$chid;
+		header("Location: ".$loc);
+		exit;
+	}
+
+	$datepaye = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
+
+	if (!(GETPOST("paiementtype", 'int') > 0))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode")), null, 'errors');
+		$error++;
+        $action = 'create';
+	}
+	if ($datepaye == '')
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
+		$error++;
+        $action = 'create';
+	}
+	if (!empty($conf->banque->enabled) && !(GETPOST("accountid", 'int') > 0))
+    {
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToDebit")), null, 'errors');
+        $error++;
+        $action = 'create';
+    }
+
+	if (!$error)
+	{
+		$paymentid = 0;
+
+		// Read possible payments
+		foreach ($_POST as $key => $value)
+		{
+			if (substr($key, 0, 7) == 'amount_')
+			{
+				$other_chid = substr($key, 7);
+				$amounts[$other_chid] = price2num(GETPOST($key));
+			}
+		}
+
+        if (count($amounts) <= 0)
+        {
+            $error++;
+            setEventMessages($langs->trans("ErrorNoPaymentDefined"), null, 'errors');
+            $action = 'create';
+        }
+
+        if (!$error)
+        {
+    		$db->begin();
+
+    		// Create a line of payments
+    		$paiement = new PaymentVAT($db);
+    		$paiement->chid         = $chid;
+    		$paiement->datepaye     = $datepaye;
+    		$paiement->amounts      = $amounts; // Tableau de montant
+    		$paiement->paiementtype = GETPOST("paiementtype", 'alphanohtml');
+    		$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
+    		$paiement->note         = (string) GETPOST("note", 'restricthtml');
+    		$paiement->note_private = (string) GETPOST("note", 'restricthtml');
+
+    		if (!$error) {
+    		    $paymentid = $paiement->create($user, (GETPOST('closepaidvat') == 'on' ? 1 : 0));
+                if ($paymentid < 0)
+                {
+                	$error++;
+                	setEventMessages($paiement->error, null, 'errors');
+                	$action = 'create';
+                }
+    		}
+
+            if (!$error)
+            {
+                $result = $paiement->addPaymentToBank($user, 'payment_vat', '(VATPayment)', GETPOST('accountid', 'int'), '', '');
+                if (!($result > 0))
+                {
+                	$error++;
+                	setEventMessages($paiement->error, null, 'errors');
+                	$action = 'create';
+                }
+            }
+
+    	    if (!$error)
+            {
+                $db->commit();
+                $loc = DOL_URL_ROOT.'/compta/tva/card.php?id='.$chid;
+                header('Location: '.$loc);
+                exit;
+            }
+            else {
+                $db->rollback();
+            }
+        }
+	}
+}
+
+
+/*
+ * View
+ */
+
+llxHeader();
+
+$form = new Form($db);
+
+
+// Formulaire de creation d'un paiement de charge
+if ($action == 'create')
+{
+	$tva = new Tva($db);
+	$tva->fetch($chid);
+	$tva->accountid = $tva->fk_account ? $tva->fk_account : $tva->accountid;
+	$tva->paiementtype = $tva->type_payment;
+
+	$total = $tva->amount;
+	if (!empty($conf->use_javascript_ajax))
+	{
+		print "\n".'<script type="text/javascript" language="javascript">';
+
+		//Add js for AutoFill
+		print ' $(document).ready(function () {';
+		print ' 	$(".AutoFillAmount").on(\'click touchstart\', function(){
+                        var amount = $(this).data("value");
+						document.getElementById($(this).data(\'rowid\')).value = amount ;
+					});';
+		print '	});'."\n";
+
+		print '	</script>'."\n";
+	}
+
+	print load_fiche_titre($langs->trans("DoPayment"));
+	print "<br>\n";
+
+	print '<form name="add_payment" action="'.$_SERVER['PHP_SELF'].'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="id" value="'.$chid.'">';
+	print '<input type="hidden" name="chid" value="'.$chid.'">';
+	print '<input type="hidden" name="action" value="add_payment">';
+
+	print dol_get_fiche_head('', '');
+
+	print '<table class="border centpercent">';
+
+	print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td><a href="'.DOL_URL_ROOT.'/compta/tva/card.php?id='.$chid.'">'.$chid.'</a></td></tr>';
+	//print '<tr><td>'.$langs->trans("Type")."</td><td>".$tva->type_label."</td></tr>\n";
+	print '<tr><td>'.$langs->trans("Period")."</td><td>".dol_print_date($tva->datev, 'day')."</td></tr>\n";
+	print '<tr><td>'.$langs->trans("Label").'</td><td>'.$tva->label."</td></tr>\n";
+	/*print '<tr><td>'.$langs->trans("DateDue")."</td><td>".dol_print_date($tva->date_ech,'day')."</td></tr>\n";
+	print '<tr><td>'.$langs->trans("Amount")."</td><td>".price($tva->amount,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';*/
+
+	$sql = "SELECT sum(p.amount) as total";
+	$sql .= " FROM ".MAIN_DB_PREFIX."payment_vat as p";
+	$sql .= " WHERE p.fk_tva = ".$chid;
+	$resql = $db->query($sql);
+	if ($resql) {
+		$obj = $db->fetch_object($resql);
+		$sumpaid = $obj->total;
+		$db->free();
+	}
+	/*print '<tr><td>'.$langs->trans("AlreadyPaid").'</td><td>'.price($sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
+	print '<tr><td class="tdtop">'.$langs->trans("RemainderToPay").'</td><td>'.price($total-$sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';*/
+
+	print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
+	$datepaye = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
+	$datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ? (GETPOST("remonth", 'int') ? $datepaye : -1) : 0;
+	print $form->selectDate($datepayment, '', '', '', '', "add_payment", 1, 1);
+	print "</td>";
+	print '</tr>';
+
+	print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
+	$form->select_types_paiements(GETPOSTISSET("paiementtype") ? GETPOST("paiementtype", "int") : $tva->paiementtype, "paiementtype");
+	print "</td>\n";
+	print '</tr>';
+
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
+	print '<td>';
+	$form->select_comptes(GETPOST("accountid") ? GETPOST("accountid", "int") : $tva->accountid, "accountid", 0, '', 1); // Show opend bank account list
+	print '</td></tr>';
+
+	// Number
+	print '<tr><td>'.$langs->trans('Numero');
+	print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
+	print '</td>';
+	print '<td><input name="num_payment" type="text" value="'.GETPOST('num_payment', 'alphanohtml').'"></td></tr>'."\n";
+
+	print '<tr>';
+	print '<td class="tdtop">'.$langs->trans("Comments").'</td>';
+	print '<td class="tdtop"><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_3.'"></textarea></td>';
+	print '</tr>';
+
+	print '</table>';
+
+	print dol_get_fiche_end();
+
+	/*
+ 	 * Autres charges impayees
+	 */
+	$num = 1;
+	$i = 0;
+
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	//print '<td>'.$langs->trans("SocialContribution").'</td>';
+	print '<td class="left">'.$langs->trans("DateDue").'</td>';
+	print '<td class="right">'.$langs->trans("Amount").'</td>';
+	print '<td class="right">'.$langs->trans("AlreadyPaid").'</td>';
+	print '<td class="right">'.$langs->trans("RemainderToPay").'</td>';
+	print '<td class="center">'.$langs->trans("Amount").'</td>';
+	print "</tr>\n";
+
+	$total = 0;
+	$totalrecu = 0;
+
+	while ($i < $num)
+	{
+		$objp = $tva;
+
+		print '<tr class="oddeven">';
+
+		if ($objp->datev > 0)
+		{
+			print '<td class="left">'.dol_print_date($objp->datev, 'day').'</td>'."\n";
+		}
+		else {
+			print "<td align=\"center\"><b>!!!</b></td>\n";
+		}
+
+		print '<td class="right">'.price($objp->amount)."</td>";
+
+		print '<td class="right">'.price($sumpaid)."</td>";
+
+		print '<td class="right">'.price($objp->amount - $sumpaid)."</td>";
+
+		print '<td class="center">';
+
+		if ($sumpaid <> $objp->amount)
+		{
+			$namef = "amount_".$objp->id;
+			$nameRemain = "remain_".$objp->id;
+			/* Disabled, we autofil the amount with remain to pay by default
+			if (!empty($conf->use_javascript_ajax)) {
+					print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmount' data-rowid='".$namef."' data-value='".($objp->amount - $sumpaid)."'");
+			} */
+			$remaintopay = $objp->amount - $sumpaid;
+			print '<input type=hidden class="sum_remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
+			print '<input type="text" class="right width100" name="'.$namef.'" id="'.$namef.'" value="'.$remaintopay.'">';
+		}
+		else {
+			print '-';
+		}
+		print "</td>";
+
+		print "</tr>\n";
+		$total += $objp->total;
+		$total_ttc += $objp->total_ttc;
+		$totalrecu += $objp->am;
+		$i++;
+	}
+	if ($i > 1) {
+		// Print total
+		print '<tr class="oddeven">';
+		print '<td colspan="2" class="left">'.$langs->trans("Total").':</td>';
+		print '<td class="right"><b>'.price($total_ttc).'</b></td>';
+		print '<td class="right"><b>'.price($totalrecu).'</b></td>';
+		print '<td class="right"><b>'.price($total_ttc - $totalrecu).'</b></td>';
+		print '<td align="center">&nbsp;</td>';
+		print "</tr>\n";
+	}
+
+	print "</table>";
+
+	// Bouton Save payment
+	print '<br><div class="center"><input type="checkbox" checked name="closepaidvat"> '.$langs->trans("ClosePaidVATAutomatically");
+	print '<br><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 '</div>';
+
+	print "</form>\n";
+}
+
+llxFooter();
+$db->close();
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index 11c8512a265..78fa11fc70b 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -162,7 +162,7 @@ print dol_get_fiche_end();
 
 
 /*
- * List of social contributions payed
+ * List of social contributions paid
  */
 
 $disable_delete = 0;
@@ -213,7 +213,7 @@ if ($resql)
 			print '<td class="right">'.price($objp->sc_amount).'</td>';
 			// Status
 			print '<td class="center">'.$socialcontrib->getLibStatut(4, $objp->amount).'</td>';
-			// Amount payed
+			// Amount paid
 			print '<td class="right">'.price($objp->amount).'</td>';
 			print "</tr>\n";
 			if ($objp->paye == 1)	// If at least one invoice is paid, disable delete
diff --git a/htdocs/compta/payment_vat/card.php b/htdocs/compta/payment_vat/card.php
new file mode 100644
index 00000000000..dee616eb2ef
--- /dev/null
+++ b/htdocs/compta/payment_vat/card.php
@@ -0,0 +1,330 @@
+<?php
+/* Copyright (C) 2004      Rodolphe Quiedeville  <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2014 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
+ * Copyright (C) 2005-2009 Regis Houssin         <regis.houssin@inodbox.com>
+ * Copyright (C) 2021      Gauthier VERDOL       <gauthier.verdol@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	    \file       htdocs/compta/payment_vat/card.php
+ *		\ingroup    facture
+ *		\brief      Onglet payment of a social contribution
+ *		\remarks	Fichier presque identique a fournisseur/paiement/card.php
+ */
+
+require '../../main.inc.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/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
+if (!empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('bills', 'banks', 'companies'));
+
+// Security check
+$id = GETPOST("id", 'int');
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm');
+if ($user->socid) $socid = $user->socid;
+// TODO ajouter regle pour restreindre acces paiement
+//$result = restrictedArea($user, 'facture', $id,'');
+
+$object = new PaymentVAT($db);
+if ($id > 0)
+{
+	$result = $object->fetch($id);
+	if (!$result) dol_print_error($db, 'Failed to get payment id '.$id);
+}
+
+
+/*
+ * Actions
+ */
+
+// Delete payment
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->tax->charges->supprimer)
+{
+	$db->begin();
+
+	$result = $object->delete($user);
+	if ($result > 0)
+	{
+        $db->commit();
+        header("Location: ".DOL_URL_ROOT."/compta/tva/payments.php?mode=tvaonly");
+        exit;
+	}
+	else {
+		setEventMessages($object->error, $object->errors, 'errors');
+        $db->rollback();
+	}
+}
+
+// Validate social contribution
+/*
+if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->tax->charges->creer)
+{
+	$db->begin();
+
+	$result=$object->valide();
+
+	if ($result > 0)
+	{
+		$db->commit();
+
+		$factures=array();	// TODO Get all id of invoices linked to this payment
+		foreach($factures as $id)
+		{
+			$fac = new Facture($db);
+			$fac->fetch($id);
+
+			$outputlangs = $langs;
+			if (! empty($_REQUEST['lang_id']))
+			{
+				$outputlangs = new Translate("",$conf);
+				$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+			}
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				$fac->generateDocument($fac->modelpdf, $outputlangs);
+			}
+		}
+
+		header('Location: card.php?id='.$object->id);
+		exit;
+	}
+	else
+	{
+		setEventMessages($object->error, $object->errors, 'errors');
+		$db->rollback();
+	}
+}
+*/
+
+
+/*
+ * View
+ */
+
+llxHeader();
+
+$tva = new TVA($db);
+
+$form = new Form($db);
+
+$h = 0;
+
+$head[$h][0] = DOL_URL_ROOT.'/compta/payment_vat/card.php?id='.$id;
+$head[$h][1] = $langs->trans("VATPayment");
+$hselected = $h;
+$h++;
+
+/*$head[$h][0] = DOL_URL_ROOT.'/compta/payment_sc/info.php?id='.$id;
+$head[$h][1] = $langs->trans("Info");
+$h++;
+*/
+
+
+print dol_get_fiche_head($head, $hselected, $langs->trans("VATPayment"), -1, 'payment');
+
+/*
+ * Deletion confirmation of payment
+ */
+if ($action == 'delete') {
+	print $form->formconfirm('card.php?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete', '', 0, 2);
+}
+
+/*
+ * Validation confirmation of payment
+ */
+/*
+if ($action == 'valide')
+{
+	$facid = $_GET['facid'];
+	print $form->formconfirm('card.php?id='.$object->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2);
+
+}
+*/
+
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/compta/tva/payments.php">'.$langs->trans("BackToList").'</a>';
+
+dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'id', '');
+
+
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
+
+print '<table class="border centpercent">';
+
+// Ref
+/*print '<tr><td class="titlefield">'.$langs->trans('Ref').'</td>';
+print '<td colspan="3">';
+print $form->showrefnav($object,'id','',1,'rowid','id');
+print '</td></tr>';*/
+
+// Date
+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>';
+
+// Numero
+print '<tr><td>'.$langs->trans('Numero').'</td><td colspan="3">'.$object->num_paiement.'</td></tr>';
+
+// Montant
+print '<tr><td>'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
+
+// Note
+print '<tr><td>'.$langs->trans('Note').'</td><td colspan="3">'.nl2br($object->note).'</td></tr>';
+
+// Bank account
+if (!empty($conf->banque->enabled))
+{
+    if ($object->bank_account)
+    {
+    	$bankline = new AccountLine($db);
+    	$bankline->fetch($object->bank_line);
+
+    	print '<tr>';
+    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
+		print '<td colspan="3">';
+		print $bankline->getNomUrl(1, 0, 'showall');
+    	print '</td>';
+    	print '</tr>';
+    }
+}
+
+print '</table>';
+
+print '</div>';
+
+print dol_get_fiche_end();
+
+
+/*
+ * List of social contributions payed
+ */
+
+$disable_delete = 0;
+$sql = 'SELECT f.rowid as scid, f.label as label, f.paye, f.amount as tva_amount, pf.amount';
+//$sql .= ', pc.libelle as sc_type';
+$sql .= ' FROM '.MAIN_DB_PREFIX.'payment_vat as pf,'.MAIN_DB_PREFIX.'tva as f';
+//$sql .= ', '.MAIN_DB_PREFIX.'c_chargesociales as pc';
+$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;
+
+dol_syslog("compta/payment_vat/card.php", LOG_DEBUG);
+$resql = $db->query($sql);
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+
+	$i = 0;
+	$total = 0;
+	print '<br><table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans('VATDeclaration').'</td>';
+    //print '<td>'.$langs->trans('Type').'</td>';
+	print '<td>'.$langs->trans('Label').'</td>';
+	print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';
+	print '<td class="center">'.$langs->trans('Status').'</td>';
+	print '<td class="right">'.$langs->trans('PayedByThisPayment').'</td>';
+	print "</tr>\n";
+
+	if ($num > 0)
+	{
+		while ($i < $num)
+		{
+			$objp = $db->fetch_object($resql);
+
+			print '<tr class="oddeven">';
+			// Ref
+			print '<td>';
+			$tva->fetch($objp->scid);
+			print $tva->getNomUrl(1);
+			print "</td>\n";
+			// Type
+			/* print '<td>';
+            print $tva->type_label;4
+            print "</td>\n";*/
+			// Label
+			print '<td>'.$objp->label.'</td>';
+			// Expected to pay
+			print '<td class="right">'.price($objp->tva_amount).'</td>';
+			// Status
+			print '<td class="center">'.$tva->getLibStatut(4, $objp->amount).'</td>';
+			// Amount payed
+			print '<td class="right">'.price($objp->amount).'</td>';
+			print "</tr>\n";
+			if ($objp->paye == 1)	// If at least one invoice is paid, disable delete
+			{
+				$disable_delete = 1;
+			}
+			$total = $total + $objp->amount;
+			$i++;
+		}
+	}
+
+
+	print "</table>\n";
+	$db->free($resql);
+}
+else {
+	dol_print_error($db);
+}
+
+
+
+/*
+ * Boutons Actions
+ */
+print '<div class="tabsAction">';
+
+/*
+if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
+{
+	if ($user->socid == 0 && $object->statut == 0 && $_GET['action'] == '')
+	{
+		if ($user->rights->facture->paiement)
+		{
+			print '<a class="butAction" href="card.php?id='.$_GET['id'].'&amp;facid='.$objp->facid.'&amp;action=valide">'.$langs->trans('Valid').'</a>';
+		}
+	}
+}
+*/
+
+if ($action == '')
+{
+	if ($user->rights->tax->charges->supprimer)
+	{
+		if (!$disable_delete)
+		{
+			print '<a class="butActionDelete" href="card.php?id='.$_GET['id'].'&amp;action=delete">'.$langs->trans('Delete').'</a>';
+		}
+		else {
+			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentVATPaid")).'">'.$langs->trans('Delete').'</a>';
+		}
+	}
+}
+
+print '</div>';
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 5d87303236a..73642df96bd 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2005       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2010  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2010-2016  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
@@ -98,7 +98,13 @@ if (empty($reshook))
 	// Seems to no be used and replaced with $action == 'infocredit'
 	if ($action == 'confirm_credite' && GETPOST('confirm', 'alpha') == 'yes')
 	{
-		$res = $object->set_credite();
+		if ($object->statut == 2) {
+			$res = -1;
+			setEventMessages('WithdrawalCantBeCreditedTwice', array(), 'errors');
+		} else {
+			$res = $object->set_credite();
+		}
+
 		if ($res >= 0)
 		{
 			header("Location: card.php?id=".$id);
@@ -145,10 +151,16 @@ if (empty($reshook))
 	{
 		$dt = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
-		$error = $object->set_infocredit($user, $dt);
+		if ($object->statut == 2) {
+			$error = 1;
+			setEventMessages('WithdrawalCantBeCreditedTwice', array(), 'errors');
+		} else {
+			$error = $object->set_infocredit($user, $dt);
+		}
+
 		if ($error)
 		{
-			setEventMessages($object->error, $object->errors, 'errors');
+        	setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 }
@@ -354,8 +366,8 @@ if ($id > 0 || $ref)
 	{
 		$result = $db->query($sql);
 		$nbtotalofrecords = $db->num_rows($result);
-		if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-		{
+		if (($page * $limit) > $nbtotalofrecords) {
+			// if total resultset is smaller then paging size (filtering), goto and load page 0
 			$page = 0;
 			$offset = 0;
 		}
@@ -445,15 +457,14 @@ if ($id > 0 || $ref)
 			$i++;
 		}
 
-		if ($num > 0)
-		{
+		if ($num > 0) {
 			print '<tr class="liste_total">';
 			print '<td>'.$langs->trans("Total").'</td>';
 			print '<td>&nbsp;</td>';
 			print '<td class="right">';
-			if (empty($offset) && $num <= $limit)	// If we have all record on same page, then the following test/warning can be done
-			{
-				if ($total != $object->amount) print img_warning("TotalAmountOfdirectDebitOrderDiffersFromSumOfLines");
+			if (empty($offset) && $num <= $limit) {
+				// If we have all record on same page, then the following test/warning can be done
+				if ($total != $object->amount) print img_warning($langs->trans("TotalAmountOfdirectDebitOrderDiffersFromSumOfLines"));
 			}
 			print price($total);
 			print "</td>\n";
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 89687997a59..22737fcfbfe 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -371,11 +371,11 @@ class BonPrelevement extends CommonObject
 				$num = count($facs);
 				for ($i = 0; $i < $num; $i++)
 				{
-					/* Tag invoice as payed */
+					/* Tag invoice as paid */
 					dol_syslog(get_class($this)."::set_credite set_paid fac ".$facs[$i]);
 					$fac = new Facture($this->db);
 					$fac->fetch($facs[$i]);
-					$result = $fac->set_paid($user);
+					$result = $fac->setPaid($user);
 				}
 			}
 
@@ -482,7 +482,7 @@ class BonPrelevement extends CommonObject
 
 					// @TODO Move this after creation of payment
 					if (price2num($alreadypayed + $facs[$i][1], 'MT') == $fac->total_ttc) {
-						$result = $fac->set_paid($user);
+						$result = $fac->setPaid($user);
 						if ($result < 0) {
 							$this->error = $fac->error;
 							$this->errors = $fac->errors;
@@ -1704,7 +1704,7 @@ class BonPrelevement extends CommonObject
 				fputs($this->file, '				<Id>'.$CrLf);
 				fputs($this->file, '				    <PrvtId>'.$CrLf);
 				fputs($this->file, '					<Othr>'.$CrLf);
-				fputs($this->file, '						<Id>'.$conf->global->PAYMENTBYBANKTRANSFER_ICS.'</Id>'.$CrLf);
+				fputs($this->file, '						<Id>'.$this->emetteur_ics.'</Id>'.$CrLf);
 				fputs($this->file, '					</Othr>'.$CrLf);
 				fputs($this->file, '				    </PrvtId>'.$CrLf);
 				fputs($this->file, '				</Id>'.$CrLf);
diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index 8b7d21d221f..28a3b1e4efa 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -184,7 +184,7 @@ class RejetPrelevement
 			//Tag invoice as unpaid
 			dol_syslog("RejetPrelevement::Create set_unpaid fac ".$fac->ref);
 
-			$fac->set_unpaid($user);
+			$fac->setUnpaid($user);
 
 			//TODO: Must be managed by notifications module
 			// Send email to sender of the standing order request
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 26b91a1e100..db751735bb0 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -66,18 +66,14 @@ $parameters = array('mode' => $mode, 'format' => $format, 'limit' => $limit, 'pa
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	// Change customer bank information to withdraw
-	if ($action == 'modify')
-	{
-		for ($i = 1; $i < 9; $i++)
-		{
+	if ($action == 'modify') {
+		for ($i = 1; $i < 9; $i++) {
 			dolibarr_set_const($db, GETPOST("nom$i"), GETPOST("value$i"), 'chaine', 0, '', $conf->entity);
 		}
 	}
-	if ($action == 'create')
-	{
+	if ($action == 'create') {
 		$default_account=($type == 'bank-transfer' ? 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT' : 'PRELEVEMENT_ID_BANKACCOUNT');
 
 		if ($id_bankaccount != $conf->global->{$default_account}){
@@ -88,7 +84,8 @@ if (empty($reshook))
 		$bank = new Account($db);
 		$bank->fetch($conf->global->{$default_account});
 		if (empty($bank->ics) || empty($bank->ics_transfer)){
-			setEventMessages($langs->trans("ErrorICSmissing", $bank->getNomUrl(1)), null, 'errors');
+			$errormessage = str_replace('{url}', $bank->getNomUrl(1), $langs->trans("ErrorICSmissing", '{url}'));
+			setEventMessages($errormessage, null, 'errors');
 			header("Location: ".DOL_URL_ROOT.'/compta/prelevement/create.php');
 			exit;
 		}
@@ -111,8 +108,7 @@ if (empty($reshook))
 			$mesg = $langs->trans("NoInvoiceCouldBeWithdrawed", $format);
 			setEventMessages($mesg, null, 'errors');
 			$mesg .= '<br>'."\n";
-			foreach ($bprev->invoice_in_error as $key => $val)
-			{
+			foreach ($bprev->invoice_in_error as $key => $val) {
 				$mesg .= '<span class="warning">'.$val."</span><br>\n";
 			}
 		} else {
@@ -145,8 +141,7 @@ $bprev = new BonPrelevement($db);
 
 llxHeader('', $langs->trans("NewStandingOrder"));
 
-if (prelevement_check_config($type) < 0)
-{
+if (prelevement_check_config($type) < 0) {
 	$langs->load("errors");
 	setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Withdraw")), null, 'errors');
 }
@@ -237,8 +232,7 @@ if ($nb) {
 			print '<a class="butAction" type="submit" href="create.php?action=create&format=ALL&type='.$type.'">'.$title."</a>\n";
 		}
 	} else {
-		if ($mysoc->isInEEC())
-		{
+		if ($mysoc->isInEEC()) {
 			$title = $langs->trans("CreateForSepaFRST");
 			if ($type == 'bank-transfer') {
 				$title = $langs->trans("CreateSepaFileForPaymentByBankTransfer");
@@ -289,8 +283,7 @@ $sql .= " ".MAIN_DB_PREFIX."societe as s,";
 $sql .= " ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
 $sql .= " WHERE s.rowid = f.fk_soc";
 $sql .= " AND f.entity IN (".getEntity('invoice').")";
-if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS))
-{
+if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS)) {
 	$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
 }
 //$sql .= " AND pfd.amount > 0";
@@ -305,12 +298,11 @@ if ($type == 'bank-transfer') {
 if ($socid > 0) $sql .= " AND f.fk_soc = ".$socid;
 
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-	{
+	if (($page * $limit) > $nbtotalofrecords) {
+		// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
@@ -399,7 +391,7 @@ if ($resql)
 					if ($format) print ' ('.$format.')';
 				}
 			} else {
-				print img_warning($langs->trans("NoBankAccount"));
+				print img_warning($langs->trans("NoBankAccountDefined"));
 			}
 			print '</td>';
 			// Amount
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index bf28ceb0996..07f3424ba60 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2013 Regis Houssin            <regis.houssin@inodbox.com>
  * Copyright (C) 2016-2018 Frédéric France          <frederic.france@netlogic.fr>
  * Copyright (C) 2017      Alexandre Spangaro       <aspangaro@open-dsi.fr>
+ * Copyright (C) 2021      Gauthier VERDOL     		<gauthier.verdol@atm-consulting.fr>
  *
  * This 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,10 +29,13 @@ require '../../main.inc.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';
-if (!empty($conf->projet->enabled)) {
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.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';
 }
@@ -40,7 +44,7 @@ if (!empty($conf->accounting->enabled)) {
 }
 
 // Load translation files required by the page
-$langs->loadLangs(array('compta', 'bills', 'banks'));
+$langs->loadLangs(array('compta', 'bills', 'banks', 'hrm'));
 
 $id = GETPOST('id', 'int');
 $action = GETPOST('action', 'aZ09');
@@ -51,6 +55,7 @@ $dateech = dol_mktime(GETPOST('echhour'), GETPOST('echmin'), GETPOST('echsec'),
 $dateperiod = dol_mktime(GETPOST('periodhour'), GETPOST('periodmin'), GETPOST('periodsec'), GETPOST('periodmonth'), GETPOST('periodday'), GETPOST('periodyear'));
 $label = GETPOST('label', 'alpha');
 $actioncode = GETPOST('actioncode');
+$fk_user = GETPOST('userid', 'int');
 
 // Security check
 $socid = GETPOST('socid', 'int');
@@ -69,14 +74,14 @@ $object = new ChargeSociales($db);
 if ($action == 'confirm_paid' && $user->rights->tax->charges->creer && $confirm == 'yes')
 {
 	$object->fetch($id);
-	$result = $object->set_paid($user);
+	$result = $object->setPaid($user);
 }
 
 if ($action == 'reopen' && $user->rights->tax->charges->creer) {
 	$result = $object->fetch($id);
 	if ($object->paye)
 	{
-		$result = $object->set_unpaid($user);
+		$result = $object->setUnpaid($user);
 		if ($result > 0)
 		{
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
@@ -94,6 +99,12 @@ if ($action == 'classin' && $user->rights->tax->charges->creer)
 	$object->setProject(GETPOST('projectid'));
 }
 
+if ($action == 'setfk_user' && $user->rights->tax->charges->creer) {
+	$object->fetch($id);
+	$object->fk_user = $fk_user;
+	$object->update($user);
+}
+
 if ($action == 'setlib' && $user->rights->tax->charges->creer)
 {
 	$object->fetch($id);
@@ -163,6 +174,7 @@ if ($action == 'add' && $user->rights->tax->charges->creer)
 		$object->date_ech = $dateech;
 		$object->periode = $dateperiod;
 		$object->amount = $amount;
+		$object->fk_user			= $fk_user;
 		$object->mode_reglement_id = (int) GETPOST('mode_reglement_id', 'int');
 		$object->fk_account = (int) GETPOST('fk_account', 'int');
 		$object->fk_project = (int) GETPOST('fk_project', 'int');
@@ -182,8 +194,7 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->tax->charges->cre
 
 	if (!$dateech)
 	{
-		setEventMessages($langs->trans("ErrorFieldReqrequire_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
-uired", $langs->transnoentities("Date")), null, 'errors');
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$action = 'edit';
 	} elseif (!$dateperiod)
 	{
@@ -203,6 +214,7 @@ uired", $langs->transnoentities("Date")), null, 'errors');
 		$object->date_ech = $dateech;
 		$object->periode = $dateperiod;
 		$object->amount = $amount;
+		$object->fk_user	= $fk_user;
 
 		$result = $object->update($user);
 		if ($result <= 0) {
@@ -343,6 +355,12 @@ if ($action == 'create')
 	print '<td><input type="text" size="6" name="amount" class="flat" value="'.dol_escape_htmltag(GETPOST('amount', 'alpha')).'"></td>';
 	print '</tr>';
 
+	// Employee
+	print '<tr><td>';
+	print $langs->trans('Employee');
+	print '</td>';
+	print '<td>'.$form->select_dolusers($fk_user, 'userid', 1).'</td></tr>';
+
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
@@ -443,6 +461,26 @@ if ($id > 0)
 		// Ref customer
 		$morehtmlref .= $form->editfieldkey("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
 		$morehtmlref .= $form->editfieldval("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
+
+		// Employee
+		if ($action != 'editfk_user') {
+			$morehtmlref .= '<br>' . $form->editfieldkey("Employee", 'fk_user', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
+
+			if (!empty($object->fk_user)) {
+				$userstatic = new User($db);
+				$userstatic->fetch($object->fk_user);
+				$morehtmlref .= $userstatic->getNomUrl(1);
+			}
+		} else {
+			$morehtmlref .= '<br>'.$langs->trans('Employee').' :&nbsp;';
+			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+			$morehtmlref .= '<input type="hidden" name="action" value="setfk_user">';
+			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+			$morehtmlref .= $form->select_dolusers($object->fk_user, 'userid', 1);
+			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			$morehtmlref .= '</form>';
+		}
+
 		// Project
 		if (!empty($conf->projet->enabled))
 		{
diff --git a/htdocs/compta/sociales/class/cchargesociales.class.php b/htdocs/compta/sociales/class/cchargesociales.class.php
index ceace76bba9..c5ec3b24968 100644
--- a/htdocs/compta/sociales/class/cchargesociales.class.php
+++ b/htdocs/compta/sociales/class/cchargesociales.class.php
@@ -46,9 +46,15 @@ class Cchargesociales
 
 	/**
 	 * @var string Label
+	 * @deprecated
 	 */
 	public $libelle;
 
+	/**
+	 * @var string Label
+	 */
+	public $label;
+
 	public $deductible;
 	public $active;
 	public $code;
@@ -107,7 +113,6 @@ class Cchargesociales
 
 		// Insert request
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'(';
-
 		$sql .= 'libelle,';
 		$sql .= 'deductible,';
 		$sql .= 'active,';
@@ -115,10 +120,7 @@ class Cchargesociales
 		$sql .= 'fk_pays,';
 		$sql .= 'module';
 		$sql .= 'accountancy_code';
-
-
 		$sql .= ') VALUES (';
-
 		$sql .= ' '.(!isset($this->libelle) ? 'NULL' : "'".$this->db->escape($this->libelle)."'").',';
 		$sql .= ' '.(!isset($this->deductible) ? 'NULL' : $this->deductible).',';
 		$sql .= ' '.(!isset($this->active) ? 'NULL' : $this->active).',';
@@ -126,8 +128,6 @@ class Cchargesociales
 		$sql .= ' '.(!isset($this->fk_pays) ? 'NULL' : $this->fk_pays).',';
 		$sql .= ' '.(!isset($this->module) ? 'NULL' : "'".$this->db->escape($this->module)."'").',';
 		$sql .= ' '.(!isset($this->accountancy_code) ? 'NULL' : "'".$this->db->escape($this->accountancy_code)."'");
-
-
 		$sql .= ')';
 
 		$this->db->begin();
@@ -179,7 +179,7 @@ class Cchargesociales
 
 		$sql = 'SELECT';
 		$sql .= " t.id,";
-		$sql .= " t.libelle,";
+		$sql .= " t.libelle as label,";
 		$sql .= " t.deductible,";
 		$sql .= " t.active,";
 		$sql .= " t.code,";
@@ -201,7 +201,8 @@ class Cchargesociales
 
 				$this->id = $obj->id;
 
-				$this->libelle = $obj->libelle;
+				$this->libelle = $obj->label;
+				$this->label = $obj->label;
 				$this->deductible = $obj->deductible;
 				$this->active = $obj->active;
 				$this->code = $obj->code;
@@ -501,6 +502,7 @@ class Cchargesociales
 		$this->id = 0;
 
 		$this->libelle = '';
+		$this->label = '';
 		$this->deductible = '';
 		$this->active = '';
 		$this->code = '';
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index ffb2d04e155..ec4e945f922 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2016-2020 Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2017      Alexandre Spangaro	<aspangaro@open-dsi.fr>
+ * Copyright (C) 2021      Gauthier VERDOL		<gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -107,6 +108,11 @@ class ChargeSociales extends CommonObject
 	 */
 	public $fk_project;
 
+	/**
+	 * @var int ID
+	 */
+	public $fk_user;
+
 
 	const STATUS_UNPAID = 0;
 	const STATUS_PAID = 1;
@@ -133,8 +139,8 @@ class ChargeSociales extends CommonObject
 	{
 		$sql = "SELECT cs.rowid, cs.date_ech";
 		$sql .= ", cs.libelle as label, cs.fk_type, cs.amount, cs.fk_projet as fk_project, cs.paye, cs.periode, cs.import_key";
-		$sql .= ", cs.fk_account, cs.fk_mode_reglement";
-		$sql .= ", c.libelle";
+        $sql .= ", cs.fk_account, cs.fk_mode_reglement, cs.fk_user";
+		$sql .= ", c.libelle as type_label";
 		$sql .= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
 		$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as cs";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_chargesociales as c ON cs.fk_type = c.id";
@@ -157,13 +163,14 @@ class ChargeSociales extends CommonObject
 				$this->lib					= $obj->label;
 				$this->label				= $obj->label;
 				$this->type					= $obj->fk_type;
-				$this->type_label			= $obj->libelle;
+				$this->type_label			= $obj->type_label;
 				$this->fk_account			= $obj->fk_account;
 				$this->mode_reglement_id = $obj->fk_mode_reglement;
 				$this->mode_reglement_code = $obj->mode_reglement_code;
 				$this->mode_reglement = $obj->mode_reglement_libelle;
 				$this->amount = $obj->amount;
 				$this->fk_project = $obj->fk_project;
+				$this->fk_user = $obj->fk_user;
 				$this->paye = $obj->paye;
 				$this->periode = $this->db->jdate($obj->periode);
 				$this->import_key = $this->import_key;
@@ -222,7 +229,7 @@ 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, date_creation)";
+        $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");
@@ -233,6 +240,7 @@ class ChargeSociales extends CommonObject
 		$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->db->idate($now)."'";
 		$sql .= ")";
 
@@ -346,6 +354,7 @@ class ChargeSociales extends CommonObject
 		$sql .= ", periode='".$this->db->idate($this->periode)."'";
 		$sql .= ", amount='".price2num($this->amount, 'MT')."'";
 		$sql .= ", fk_projet=".($this->fk_project > 0 ? $this->db->escape($this->fk_project) : "NULL");
+		$sql .= ", fk_user=".($this->fk_user > 0 ? $this->db->escape($this->fk_user) : "NULL");
 		$sql .= ", fk_user_modif=".$user->id;
 		$sql .= " WHERE rowid=".$this->id;
 
@@ -421,14 +430,28 @@ class ChargeSociales extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *    Tag social contribution as payed completely
+	 *    Tag social contribution as paid completely
 	 *
-	 *    @param    User    $user       Object user making change
-	 *    @return   int					<0 if KO, >0 if OK
+	 *	@deprecated
+	 *  @see setPaid()
+	 *  @param    User    $user       Object user making change
+	 *  @return   int					<0 if KO, >0 if OK
 	 */
 	public function set_paid($user)
 	{
 		// phpcs:enable
+		dol_syslog(get_class($this)."::set_paid is deprecated, use setPaid instead", LOG_NOTICE);
+		return $this->setPaid($user);
+	}
+
+	/**
+	 *    Tag social contribution as paid completely
+	 *
+	 *    @param    User    $user       Object user making change
+	 *    @return   int					<0 if KO, >0 if OK
+	 */
+	public function setPaid($user)
+	{
 		$sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales SET";
 		$sql .= " paye = 1";
 		$sql .= " WHERE rowid = ".$this->id;
@@ -439,14 +462,28 @@ class ChargeSociales extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *    Remove tag payed on social contribution
+	 *    Remove tag paid on social contribution
 	 *
-	 *    @param	User	$user       Object user making change
-	 *    @return	int					<0 if KO, >0 if OK
+	 *	@deprecated
+	 *  @see setUnpaid()
+	 *  @param	User	$user       Object user making change
+	 *  @return	int					<0 if KO, >0 if OK
 	 */
 	public function set_unpaid($user)
 	{
 		// phpcs:enable
+		dol_syslog(get_class($this)."::set_unpaid is deprecated, use setUnpaid instead", LOG_NOTICE);
+		return $this->setUnpaid($user);
+	}
+
+	/**
+	 *    Remove tag paid on social contribution
+	 *
+	 *    @param	User	$user       Object user making change
+	 *    @return	int					<0 if KO, >0 if OK
+	 */
+	public function setUnpaid($user)
+	{
 		$sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales SET";
 		$sql .= " paye = 0";
 		$sql .= " WHERE rowid = ".$this->id;
@@ -459,7 +496,7 @@ class ChargeSociales extends CommonObject
 	 *  Retourne le libelle du statut d'une charge (impaye, payee)
 	 *
 	 *  @param	int		$mode       	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
-	 *  @param  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+	 *  @param  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount paid if you have it, 1 otherwise)
 	 *  @return	string        			Label
 	 */
 	public function getLibStatut($mode = 0, $alreadypaid = -1)
@@ -473,7 +510,7 @@ class ChargeSociales extends CommonObject
 	 *
 	 *  @param	int		$status        	Id status
 	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
-	 *  @param  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+	 *  @param  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount paid if you have it, 1 otherwise)
 	 *  @return string        			Label
 	 */
 	public function LibStatut($status, $mode = 0, $alreadypaid = -1)
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 2f4f772fca0..9258ff63fc3 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -46,6 +46,11 @@ class PaymentSocialContribution extends CommonObject
 	 */
 	public $picto = 'payment';
 
+	/**
+	 * @var string	Label
+	 */
+	public $label;
+
 	/**
 	 * @var int ID
 	 */
@@ -110,7 +115,7 @@ class PaymentSocialContribution extends CommonObject
 	 *  Use this->amounts to have list of lines for the payment
 	 *
 	 *  @param      User	$user   				User making payment
-	 *	@param		int		$closepaidcontrib   	1=Also close payed contributions to paid, 0=Do nothing more
+	 *	@param		int		$closepaidcontrib   	1=Also close paid contributions to paid, 0=Do nothing more
 	 *  @return     int     						<0 if KO, id of payment if OK
 	 */
 	public function create($user, $closepaidcontrib = 0)
@@ -178,7 +183,7 @@ class PaymentSocialContribution extends CommonObject
 					{
 						$amount = price2num($amount);
 
-						// If we want to closed payed invoices
+						// If we want to closed paid invoices
 						if ($closepaidcontrib)
 						{
 							$contrib = new ChargeSociales($this->db);
@@ -192,7 +197,7 @@ class PaymentSocialContribution extends CommonObject
 							$remaintopay = price2num($contrib->amount - $paiement - $creditnotes - $deposits, 'MT');
 							if ($remaintopay == 0)
 							{
-								$result = $contrib->set_paid($user);
+								$result = $contrib->setPaid($user);
 							} else dol_syslog("Remain to pay for conrib ".$contribid." not null. We do nothing.");
 						}
 					}
@@ -679,7 +684,7 @@ class PaymentSocialContribution extends CommonObject
 
 		$result = '';
 
-		if (empty($this->ref)) $this->ref = $this->lib;
+		if (empty($this->ref)) $this->ref = $this->label;
 
 		$label = img_picto('', $this->picto).' <u>'.$langs->trans("SocialContributionPayment").'</u>';
 		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 746a8480453..9a691a1785f 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -5,7 +5,8 @@
  * Copyright (C) 2016      Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2020      Pierre Ardoin     	<mapiolca@me.com>
  * Copyright (C) 2020		Tobias Sekan		<tobias.sekan@startmail.com>
-
+ * Copyright (C) 2021      Gauthier VERDOL     	<gauthier.verdol@atm-consulting.fr>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -40,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.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('compta', 'banks', 'bills'));
+$langs->loadLangs(array('compta', 'banks', 'bills', 'hrm'));
 
 $action				= GETPOST('action', 'aZ09');
 $massaction			= GETPOST('massaction', 'alpha');
@@ -56,7 +57,8 @@ $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_project_ref = GETPOST('search_project_ref', 'alpha');
-$search_project		= GETPOST('search_project', 'alpha');
+$search_project = GETPOST('search_project', 'alpha');
+$search_users = GETPOST('search_users');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield			= GETPOST("sortfield", 'alpha');
@@ -91,6 +93,7 @@ $arrayfields = array(
 	'cs.rowid'		=>array('label'=>"Ref", 'checked'=>1, 'position'=>10),
 	'cs.libelle'	=>array('label'=>"Label", 'checked'=>1, 'position'=>20),
 	'cs.fk_type'	=>array('label'=>"Type", 'checked'=>1, 'position'=>30),
+	'cs.fk_user'	=>array('label'=>"Employee", 'checked'=>1, 'position'=>30),
 	'p.ref'			=>array('label'=>"ProjectRef", 'checked'=>1, 'position'=>40, 'enable'=>(!empty($conf->projet->enabled))),
 	'cs.date_ech'	=>array('label'=>"Date", 'checked'=>1, 'position'=>50),
 	'cs.periode'	=>array('label'=>"PeriodEndDate", 'checked'=>1, 'position'=>60),
@@ -128,6 +131,7 @@ if (empty($reshook)) {
 		$search_month_lim = '';
 		$search_project_ref = '';
 		$search_project = '';
+		$search_users = '';
 		$search_array_options = array();
 	}
 }
@@ -144,8 +148,8 @@ if (!empty($conf->projet->enabled)) $projectstatic = new Project($db);
 
 llxHeader('', $langs->trans("SocialContributions"));
 
-$sql = "SELECT cs.rowid, cs.fk_type as type, ";
-$sql .= " cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode,";
+$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,";
 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,";
 $sql .= " SUM(pc.amount) as alreadypayed";
@@ -153,12 +157,14 @@ $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,";
 $sql .= " ".MAIN_DB_PREFIX."chargesociales as cs";
 if (!empty($conf->projet->enabled)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = cs.fk_projet";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementcharge as pc ON pc.fk_charge = cs.rowid";
+$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;
 // Search criteria
 if ($search_ref)	$sql .= " AND cs.rowid=".$db->escape($search_ref);
 if ($search_label) 	$sql .= natural_search("cs.libelle", $search_label);
 if (!empty($conf->projet->enabled)) if ($search_project_ref != '') $sql .= natural_search("p.ref", $search_project_ref);
+if (!empty($search_users)) $sql .= ' AND cs.fk_user IN('.implode(', ', $search_users).')';
 if ($search_amount) $sql .= natural_search("cs.amount", $search_amount, 1);
 if ($search_status != '' && $search_status >= 0) $sql .= " AND cs.paye = ".$db->escape($search_status);
 $sql .= dolSqlDateFilter("cs.periode", $search_day_lim, $search_month_lim, $search_year_lim);
@@ -179,7 +185,7 @@ if ($filtre) {
 if ($search_typeid) {
 	$sql .= " AND cs.fk_type=".$db->escape($search_typeid);
 }
-$sql .= " GROUP BY cs.rowid, cs.fk_type, cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode, c.libelle";
+$sql .= " GROUP BY cs.rowid, cs.fk_type, cs.fk_user, cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode, c.libelle";
 if (!empty($conf->projet->enabled)) $sql .= ", p.rowid, p.ref, p.title";
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -211,6 +217,9 @@ if ($search_label)  $param .= '&search_label='.urlencode($search_label);
 if ($search_project_ref >= 0) $param .= "&search_project_ref=".urlencode($search_project_ref);
 if ($search_amount) $param .= '&search_amount='.urlencode($search_amount);
 if ($search_typeid) $param .= '&search_typeid='.urlencode($search_typeid);
+if ($search_users) {
+	foreach ($search_users as $id_user) $param .= '&search_users[]='.urlencode($id_user);
+}
 if ($search_status != '' && $search_status != '-1') $param .= '&search_status='.urlencode($search_status);
 if ($year)          $param .= '&year='.urlencode($year);
 
@@ -289,6 +298,12 @@ if (!empty($arrayfields['cs.fk_type']['checked'])) {
 	print '</td>';
 }
 
+if (!empty($arrayfields['cs.fk_user']['checked'])) {
+	// Employee
+	print '<td class="liste_titre" align="left">';
+	print $form->select_dolusers($search_users, 'search_users', 1, null, 0, '', '', '0', '0', 0, '', 0, '', '', 0, 0, true);
+}
+
 // Filter: Project ref
 if (!empty($arrayfields['p.ref']['checked'])) {
 	print '<td class="liste_titre">';
@@ -343,6 +358,7 @@ if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST))	print_liste_field_titr
 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, 'class="left"', $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, 'class="left"', $sortfield, $sortorder);
+if (!empty($arrayfields['cs.fk_user']['checked']))			print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.lastname", "", $param, 'class="left"', $sortfield, $sortorder);
 if (!empty($arrayfields['p.ref']['checked']))				print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['cs.date_ech']['checked']))			print_liste_field_titre($arrayfields['cs.date_ech']['label'], $_SERVER["PHP_SELF"], "cs.date_ech", '', $param, 'align="center"', $sortfield, $sortorder);
 if (!empty($arrayfields['cs.periode']['checked']))			print_liste_field_titre($arrayfields['cs.periode']['label'], $_SERVER["PHP_SELF"], "cs.periode", '', $param, 'align="center"', $sortfield, $sortorder);
@@ -358,14 +374,14 @@ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], '', '', '', '', $
 print '</tr>';
 
 $i = 0;
-$totalarray = array();
+		$totalarray = $TLoadedUsers = array();
 while ($i < min($num, $limit))
 {
 	$obj = $db->fetch_object($resql);
 
 	$chargesociale_static->id = $obj->rowid;
 	$chargesociale_static->ref = $obj->rowid;
-	$chargesociale_static->label = $obj->libelle;
+	$chargesociale_static->label = $obj->label;
 	$chargesociale_static->type_label = $obj->type_label;
 	if (!empty($conf->projet->enabled)) {
 		$projectstatic->id = $obj->project_id;
@@ -389,7 +405,7 @@ while ($i < min($num, $limit))
 
 	// Label
 	if (!empty($arrayfields['cs.libelle']['checked'])) {
-		print '<td>'.dol_trunc($obj->libelle, 42).'</td>';
+		print '<td>'.dol_trunc($obj->label, 42).'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 
@@ -399,6 +415,22 @@ while ($i < min($num, $limit))
 		if (!$i) $totalarray['nbfield']++;
 	}
 
+	if (!empty($arrayfields['cs.fk_user']['checked'])) {
+		// Employee
+		print "<td>";
+		if (!empty($obj->fk_user)) {
+			if (!empty($TLoadedUsers[$obj->fk_user])) $ustatic = $TLoadedUsers[$obj->fk_user];
+			else {
+				$ustatic = new User($db);
+				$ustatic->fetch($obj->fk_user);
+				$TLoadedUsers[$obj->fk_user] = $ustatic;
+			}
+			print $ustatic->getNomUrl(-1);
+		}
+		print "</td>\n";
+		if (!$i) $totalarray['nbfield']++;
+	}
+
 	// Project ref
 	if (!empty($arrayfields['p.ref']['checked'])) {
 		print '<td class="nowrap">';
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 0be6659f7b4..03c128e841f 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -44,12 +44,12 @@ $nbofyear = 4;
 $year = GETPOST('year', 'int');
 if (empty($year))
 {
-	$year_current = strftime("%Y", dol_now());
-	$month_current = strftime("%m", dol_now());
+	$year_current = dol_print_date(dol_now(), "%Y");
+	$month_current = dol_print_date(dol_now(), "%m");
 	$year_start = $year_current - ($nbofyear - 1);
 } else {
 	$year_current = $year;
-	$month_current = strftime("%m", dol_now());
+	$month_current = dol_print_date(dol_now(), "%m");
 	$year_start = $year - ($nbofyear - 1);
 }
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
@@ -58,12 +58,12 @@ $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 // We define date_start and date_end
 if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 {
-	$q = GETPOST("q") ?GETPOST("q") : 0;
+	$q = GETPOST("q") ? GETPOST("q") : 0;
 	if ($q == 0)
 	{
 		// We define date_start and date_end
 		$year_end = $year_start + ($nbofyear - 1);
-		$month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+		$month_start = GETPOSTISSET("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)
@@ -86,8 +86,10 @@ $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
 
 $tmps = dol_getdate($date_start);
+$mothn_start = $tmps['mon'];
 $year_start = $tmps['year'];
 $tmpe = dol_getdate($date_end);
+$month_end = $tmpe['mon'];
 $year_end = $tmpe['year'];
 $nbofyear = ($year_end - $year_start) + 1;
 
@@ -306,7 +308,7 @@ $now = dol_now();
 $casenow = dol_print_date($now, "%Y-%m");
 
 // Loop on each month
-$nb_mois_decalage = $conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START - 1) : 0;
+$nb_mois_decalage = GETPOSTISSET('date_startmonth') ? (GETPOST('date_startmonth', 'int') - 1) : (empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 0 : ($conf->global->SOCIETE_FISCAL_MONTH_START - 1));
 for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 {
 	$mois_modulo = $mois; // ajout
@@ -338,68 +340,75 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 		if ($annee >= $year_start)	// We ignore $annee < $year_start, we loop on it to be able to make delta, nothing is output.
 		{
 			if ($modecompta == 'CREANCES-DETTES') {
-				// Valeur CA du mois w/o VAT
+				// Value turnover of month w/o VAT
 				print '<td class="right">';
-				if ($cum_ht[$case])
-				{
-					$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
-					print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price($cum_ht[$case], 1).'</a>';
-				} else {
-					if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print '&nbsp;'; }
+				if ($annee < $year_end || ($annee == $year_end && $mois <= $month_end)) {
+					if ($cum_ht[$case]) {
+						$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
+						print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price($cum_ht[$case], 1).'</a>';
+					} else {
+						if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print '&nbsp;'; }
+					}
 				}
 				print "</td>";
 			}
 
-			// Valeur CA du mois
+			// Value turnover of month
 			print '<td class="right">';
-			if ($cum[$case])
-			{
-				$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
-				if ($modecompta != 'BOOKKEEPING') print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">';
-				print price($cum[$case], 1);
-				if ($modecompta != 'BOOKKEEPING') print '</a>';
-			} else {
-				if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print '&nbsp;'; }
+			if ($annee < $year_end || ($annee == $year_end && $mois <= $month_end)) {
+				if ($cum[$case]) {
+					$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
+					if ($modecompta != 'BOOKKEEPING') print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">';
+					print price($cum[$case], 1);
+					if ($modecompta != 'BOOKKEEPING') print '</a>';
+				} else {
+					if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print '&nbsp;'; }
+				}
 			}
 			print "</td>";
 
-			// Pourcentage du mois
-			if ($annee_decalage > $minyear && $case <= $casenow)
-			{
-				if ($cum[$caseprev] && $cum[$case])
+			// Percentage of month
+			print '<td class="borderrightlight right">';
+			//var_dump($annee.' '.$year_end.' '.$mois.' '.$month_end);
+			if ($annee < $year_end || ($annee == $year_end && $mois <= $month_end)) {
+				if ($annee_decalage > $minyear && $case <= $casenow)
 				{
-					$percent = (round(($cum[$case] - $cum[$caseprev]) / $cum[$caseprev], 4) * 100);
-					//print "X $cum[$case] - $cum[$caseprev] - $cum[$caseprev] - $percent X";
-					print '<td class="borderrightlight right">'.($percent >= 0 ? "+$percent" : "$percent").'%</td>';
+					if ($cum[$caseprev] && $cum[$case])
+					{
+						$percent = (round(($cum[$case] - $cum[$caseprev]) / $cum[$caseprev], 4) * 100);
+						//print "X $cum[$case] - $cum[$caseprev] - $cum[$caseprev] - $percent X";
+						print ($percent >= 0 ? "+$percent" : "$percent").'%';
+					}
+					if ($cum[$caseprev] && !$cum[$case])
+					{
+						print '-100%';
+					}
+					if (!$cum[$caseprev] && $cum[$case])
+					{
+						//print '<td class="right">+Inf%</td>';
+						print '-';
+					}
+					if (isset($cum[$caseprev]) && !$cum[$caseprev] && !$cum[$case])
+					{
+						print '+0%';
+					}
+					if (!isset($cum[$caseprev]) && !$cum[$case])
+					{
+						print '-';
+					}
+				} else {
+					if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; } else { print '&nbsp;'; }
 				}
-				if ($cum[$caseprev] && !$cum[$case])
-				{
-					print '<td class="borderrightlight right">-100%</td>';
-				}
-				if (!$cum[$caseprev] && $cum[$case])
-				{
-					//print '<td class="right">+Inf%</td>';
-					print '<td class="borderrightlight right">-</td>';
-				}
-				if (isset($cum[$caseprev]) && !$cum[$caseprev] && !$cum[$case])
-				{
-					print '<td class="borderrightlight right">+0%</td>';
-				}
-				if (!isset($cum[$caseprev]) && !$cum[$case])
-				{
-					print '<td class="borderrightlight right">-</td>';
-				}
-			} else {
-				print '<td class="borderrightlight right">';
-				if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; } else { print '&nbsp;'; }
-				print '</td>';
 			}
+			print '</td>';
 
 			if ($annee_decalage < $year_end || ($annee_decalage == $year_end && $mois > 12 && $annee < $year_end)) print '<td width="15">&nbsp;</td>';
 		}
 
-		$total_ht[$annee] += ((!empty($cum_ht[$case])) ? $cum_ht[$case] : 0);
-		$total[$annee] += $cum[$case];
+		if ($annee < $year_end || ($annee == $year_end && $mois <= $month_end)) {
+			$total_ht[$annee] += ((!empty($cum_ht[$case])) ? $cum_ht[$case] : 0);
+			$total[$annee] += $cum[$case];
+		}
 	}
 
 	print '</tr>';
@@ -470,34 +479,37 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
  }
  */
 
-// Affiche total
+// Show total
 print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td>';
 for ($annee = $year_start; $annee <= $year_end; $annee++)
 {
 	if ($modecompta == 'CREANCES-DETTES') {
 		// Montant total HT
-		if ($total_ht[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
-		{
-			print '<td class="nowrap right">'.($total_ht[$annee] ?price($total_ht[$annee]) : "0")."</td>";
+		if ($total_ht[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear))) {
+			print '<td class="nowrap right">';
+			print ($total_ht[$annee] ?price($total_ht[$annee]) : "0");
+			print "</td>";
 		} else {
 			print '<td>&nbsp;</td>';
 		}
 	}
 
-	// Montant total
-	if ($total[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
-	{
-		print '<td class="nowrap right">'.($total[$annee] ?price($total[$annee]) : "0")."</td>";
+	// Total amount
+	if ($total[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear))) {
+		print '<td class="nowrap right">';
+		print ($total[$annee] ?price($total[$annee]) : "0");
+		print "</td>";
 	} else {
 		print '<td>&nbsp;</td>';
 	}
 
 	// Pourcentage total
-	if ($annee > $minyear && $annee <= max($nowyear, $maxyear))
-	{
+	if ($annee > $minyear && $annee <= max($nowyear, $maxyear)) {
 		if ($total[$annee - 1] && $total[$annee]) {
 			$percent = (round(($total[$annee] - $total[$annee - 1]) / $total[$annee - 1], 4) * 100);
-			print '<td class="nowrap borderrightlight right">'.($percent >= 0 ? "+$percent" : "$percent").'%</td>';
+			print '<td class="nowrap borderrightlight right">';
+			print ($percent >= 0 ? "+$percent" : "$percent").'%';
+			print '</td>';
 		}
 		if ($total[$annee - 1] && !$total[$annee])
 		{
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 493f01ee53c..a961d4f1994 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2015-2017 Alexandre Spangaro   <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,15 +28,23 @@
 
 require '../../main.inc.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';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/vat.lib.php';
 
+if (!empty($conf->accounting->enabled)) {
+        include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+}
+
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'banks', 'bills'));
 
 $id = GETPOST("id", 'int');
 $action = GETPOST("action", "alpha");
+$confirm = GETPOST('confirm');
 $refund = GETPOST("refund", "int");
+$auto_create_payment = GETPOST("auto_create_paiement", "int");
+
 if (empty($refund)) $refund = 0;
 
 $datev = dol_mktime(12, 0, 0, GETPOST("datevmonth", 'int'), GETPOST("datevday", 'int'), GETPOST("datevyear", 'int'));
@@ -73,32 +82,71 @@ if ($action == 'setlib' && $user->rights->tax->charges->creer)
 
 if ($action == 'setdatev' && $user->rights->tax->charges->creer)
 {
-	$object->fetch($id);
-	$object->datev = $datev;
-	$result = $object->update($user);
-	if ($result < 0) dol_print_error($db, $object->error);
+    $object->fetch($id);
+    $object->datev = $datev;
+    $result = $object->update($user);
+    if ($result < 0) dol_print_error($db, $object->error);
 
-	$action = '';
+    $action = '';
+}
+
+// payment mode
+if ($action == 'setmode' && $user->rights->tax->charges->creer) {
+	$object->fetch($id);
+	$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+	if ($result < 0)
+		setEventMessages($object->error, $object->errors, 'errors');
+}
+
+// Bank account
+if ($action == 'setbankaccount' && $user->rights->tax->charges->creer) {
+	$object->fetch($id);
+	$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+}
+
+// Classify paid
+if ($action == 'confirm_paid' && $user->rights->tax->charges->creer && $confirm == 'yes')
+{
+	$object->fetch($id);
+	$result = $object->setPaid($user);
+}
+
+if ($action == 'reopen' && $user->rights->tax->charges->creer) {
+	$result = $object->fetch($id);
+	if ($object->paye)
+	{
+		$result = $object->setUnpaid($user);
+		if ($result > 0)
+		{
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
+			exit();
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 }
 
 if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 {
-	$error = 0;
+    $error = 0;
 
-	$object->accountid = GETPOST("accountid", 'int');
-	$object->type_payment = GETPOST("type_payment", 'alphanohtml');
+    $object->fk_account = GETPOST("accountid", 'int');
+    $object->type_payment = GETPOST("type_payment", 'alphanohtml');
 	$object->num_payment = GETPOST("num_payment", 'alphanohtml');
 
 	$object->datev = $datev;
-	$object->datep = $datep;
+    $object->datep = $datep;
 
 	$amount = price2num(GETPOST("amount", 'alpha'));
 	if ($refund == 1) {
 		$amount = -$amount;
 	}
-	$object->amount = $amount;
+    $object->amount = $amount;
 	$object->label = GETPOST("label", 'alpha');
-	$object->note_private = GETPOST("note", 'restricthtml');
+	$object->note = GETPOST("note", 'none');
 
 	if (empty($object->datep))
 	{
@@ -110,7 +158,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PeriodEndDate")), null, 'errors');
 		$error++;
 	}
-	if (empty($object->type_payment) || $object->type_payment < 0)
+	if (!empty($auto_create_payment) && (empty($object->type_payment) || $object->type_payment < 0))
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PaymentMode")), null, 'errors');
 		$error++;
@@ -120,38 +168,81 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
 		$error++;
 	}
+	if (!empty($auto_create_payment) && ($object->fk_account <= 0))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountToCredit")), null, 'errors');
+		$error++;
+	}
 
 	if (!$error)
 	{
-		$db->begin();
+		$ret = $object->create($user);
+		if ($ret < 0) $error++;
 
-		$ret = $object->addPayment($user);
-		if ($ret > 0)
+		// Auto create payment
+		if (!empty($auto_create_payment) && !$error)
 		{
-			$db->commit();
-			header("Location: list.php");
+			$db->begin();
+
+			// Create a line of payments
+			$paiement = new PaymentVAT($db);
+			$paiement->chid         = $object->id;
+			$paiement->datepaye     = $datep;
+			$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');
+
+			if (!$error)
+			{
+				$paymentid = $paiement->create($user, (int) GETPOST('closepaidtva'));
+				if ($paymentid < 0)
+				{
+					$error++;
+					setEventMessages($paiement->error, null, 'errors');
+					$action = 'create';
+				}
+			}
+
+			if (!$error)
+			{
+				$result = $paiement->addPaymentToBank($user, 'payment_vat', '(VATPayment)', GETPOST('accountid', 'int'), '', '');
+				if (!($result > 0))
+				{
+					$error++;
+					setEventMessages($paiement->error, null, 'errors');
+				}
+			}
+
+			if (!$error)
+			{
+				$db->commit();
+			}
+			else {
+				$db->rollback();
+			}
+		}
+		if (empty($error)) {
+			header("Location: card.php?id=" . $object->id);
 			exit;
-		} else {
-			$db->rollback();
-			setEventMessages($object->error, $object->errors, 'errors');
-			$action = "create";
 		}
 	}
 
 	$action = 'create';
 }
 
-if ($action == 'delete')
+if ($action == 'confirm_delete' && $confirm == 'yes')
 {
-	$result = $object->fetch($id);
+    $result = $object->fetch($id);
+	$totalpaye = $object->getSommePaiement();
 
-	if ($object->rappro == 0)
+	if (empty($totalpaye))
 	{
-		$db->begin();
+	    $db->begin();
 
-		$ret = $object->delete($user);
-		if ($ret > 0)
-		{
+	    $ret = $object->delete($user);
+	    if ($ret > 0)
+	    {
 			if ($object->fk_bank)
 			{
 				$accountline = new AccountLine($db);
@@ -164,21 +255,99 @@ if ($action == 'delete')
 				$db->commit();
 				header("Location: ".DOL_URL_ROOT.'/compta/tva/list.php');
 				exit;
-			} else {
+			}
+			else {
 				$object->error = $accountline->error;
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		} else {
-			$db->rollback();
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	} else {
-		$mesg = 'Error try do delete a line linked to a conciliated bank transaction';
-		setEventMessages($mesg, null, 'errors');
+	    }
+	    else {
+	        $db->rollback();
+	        setEventMessages($object->error, $object->errors, 'errors');
+	    }
+	}
+	else {
+		setEventMessages($langs->trans('DisabledBecausePayments'), null, 'errors');
 	}
 }
 
+if ($action == 'update' && !$_POST["cancel"] && $user->rights->tax->charges->creer)
+{
+	$amount = price2num(GETPOST('amount'));
+
+	if (empty($amount))
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors');
+		$action = 'edit';
+	}
+	elseif (!is_numeric($amount))
+	{
+		setEventMessages($langs->trans("ErrorFieldMustBeANumeric", $langs->transnoentities("Amount")), null, 'errors');
+		$action = 'create';
+	}
+	else {
+		$result = $object->fetch($id);
+
+		$object->amount		= price2num($amount);
+
+		$result = $object->update($user);
+		if ($result <= 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+}
+
+// Action clone object
+if ($action == 'confirm_clone' && $confirm != 'yes') { $action = ''; }
+
+if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->charges->creer))
+{
+	$db->begin();
+
+	$originalId = $id;
+
+	$object->fetch($id);
+
+	if ($object->id > 0)
+	{
+		$object->paye = 0;
+		$object->id = $object->ref = null;
+
+		if (GETPOST('clone_label', 'alphanohtml')) {
+			$object->label = GETPOST('clone_label', 'alphanohtml');
+		}
+		else {
+			$object->label = $langs->trans("CopyOf").' '.$object->label;
+		}
+
+		$newdateperiod = dol_mktime(0, 0, 0, GETPOST('clone_periodmonth', 'int'), GETPOST('clone_periodday', 'int'), GETPOST('clone_periodyear', 'int'));
+		if ($newdateperiod) $object->datev = $newdateperiod;
+
+		//if ($object->check()) {
+		$id = $object->create($user);
+		if ($id > 0)
+		{
+			$db->commit();
+			$db->close();
+
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+			exit;
+		}
+		else {
+			$id = $originalId;
+			$db->rollback();
+
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+		//}
+	}
+	else {
+		$db->rollback();
+		dol_print_error($db, $object->error);
+	}
+}
 
 /*
  *	View
@@ -205,11 +374,10 @@ if ($id)
 if ($action == 'create')
 {
 	print load_fiche_titre($langs->trans("VAT").' - '.$langs->trans("New"));
-
 	if (!empty($conf->use_javascript_ajax))
-	{
-		print "\n".'<script type="text/javascript" language="javascript">';
-		print '$(document).ready(function () {
+    {
+        print "\n".'<script type="text/javascript" language="javascript">';
+        print '$(document).ready(function () {
                 $("#radiopayment").click(function() {
                     $("#label").val($(this).data("label"));
 
@@ -218,44 +386,68 @@ if ($action == 'create')
                     $("#label").val($(this).data("label"));
 
                 });
-        });';
+				$("#auto_create_paiement").click(function() {
+					if($(this).is(":checked")) {
+						$("#label_fk_account").addClass("fieldrequired");
+						$("#label_type_payment").addClass("fieldrequired");
+						$(".hide_if_no_auto_create_payment").show();
+					} else {
+						$("#label_fk_account").removeClass("fieldrequired");
+						$("#label_type_payment").removeClass("fieldrequired");
+						$(".hide_if_no_auto_create_payment").hide();
+					}
+				});';
+
+		if ($_REQUEST['action'] === 'add') { // form has been send but there is at least one error
+			if (empty($auto_create_payment)) {
+				print '$("#label_fk_account").removeClass("fieldrequired");
+					   $("#label_type_payment").removeClass("fieldrequired");
+					   $(".hide_if_no_auto_create_payment").hide();';
+			} else {
+				print '$("#label_fk_account").addClass("fieldrequired");
+					   $("#label_type_payment").addClass("fieldrequired");
+					   $(".hide_if_no_auto_create_payment").show();';
+			}
+		}
+
+        print '});';
 		print '</script>'."\n";
 	}
 
-	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" name="formvat" method="post">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="add">';
+    print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" name="formvat" method="post">';
+    print '<input type="hidden" name="token" value="'.newToken().'">';
+    print '<input type="hidden" name="action" value="add">';
 
-	print '<div id="selectmethod">';
-	print '<div class="hideonsmartphone float">';
-	print $langs->trans("Type").':&nbsp;&nbsp;&nbsp;';
-	print '</div>';
-	print '<label for="radiopayment">';
-	print '<input type="radio" id="radiopayment" data-label="'.$langs->trans('VATPayment').'" class="flat" name="refund" value="0"'.($refund ? '' : ' checked="checked"').'>';
-	print '&nbsp;';
-	print $langs->trans("Payment");
-	print '</label>';
-	print '&nbsp;&nbsp;&nbsp;';
-	print '<label for="radiorefund">';
-	print '<input type="radio" id="radiorefund" data-label="'.$langs->trans('VATRefund').'" class="flat" name="refund" value="1"'.($refund ? ' checked="checked"' : '').'>';
-	print '&nbsp;';
-	print $langs->trans("PaymentBack");
-	print '</label>';
-	print '</div>';
-	print "<br>\n";
+    print '<div id="selectmethod">';
+    print '<div class="hideonsmartphone float">';
+    print $langs->trans("Type").':&nbsp;&nbsp;&nbsp;';
+    print '</div>';
+    print '<label for="radiopayment">';
+    print '<input type="radio" id="radiopayment" data-label="'.$langs->trans('VATPayment').'" class="flat" name="refund" value="0"'.($refund ? '' : ' checked="checked"').'>';
+    print '&nbsp;';
+    print $langs->trans("Payment");
+    print '</label>';
+    print '&nbsp;&nbsp;&nbsp;';
+    print '<label for="radiorefund">';
+    print '<input type="radio" id="radiorefund" data-label="'.$langs->trans('VATRefund').'" class="flat" name="refund" value="1"'.($refund ? ' checked="checked"' : '').'>';
+    print '&nbsp;';
+    print $langs->trans("Refund");
+    print '</label>';
+    print '</div>';
+    print "<br>\n";
 
-	print dol_get_fiche_head();
+    dol_fiche_head();
 
-	print '<table class="border centpercent">';
+    print '<table class="border centpercent">';
 
-	print "<tr>";
-	print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
-	print $form->selectDate($datep, "datep", '', '', '', 'add', 1, 1);
-	print '</td></tr>';
+    print '<tr class="hide_if_no_auto_create_payment">';
+    print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
+    print $form->selectDate($datep, "datep", '', '', '', 'add', 1, 1);
+    print '</td></tr>';
 
-	print '<tr><td class="fieldrequired">'.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).'</td><td>';
-	print $form->selectDate((GETPOST("datevmonth", 'int') ? $datev : -1), "datev", '', '', '', 'add', 1, 1);
-	print '</td></tr>';
+    print '<tr><td class="titlefieldcreate fieldrequired">'.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).'</td><td>';
+    print $form->selectDate((GETPOST("datevmonth", 'int') ? $datev : -1), "datev", '', '', '', 'add', 1, 1);
+    print '</td></tr>';
 
 	// Label
 	if ($refund == 1) {
@@ -268,32 +460,47 @@ if ($action == 'create')
 	// Amount
 	print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.GETPOST("amount", "alpha").'"></td></tr>';
 
-	if (!empty($conf->banque->enabled))
-	{
-		print '<tr><td class="fieldrequired">'.$langs->trans("BankAccount").'</td><td>';
-		$form->select_comptes(GETPOST("accountid", 'int'), "accountid", 0, "courant=1", 2); // List of bank account available
-		print '</td></tr>';
-	}
-
-	// Type payment
-	print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
+    // Type payment
+	print '<tr><td class="fieldrequired" id="label_type_payment">'.$langs->trans("PaymentMode").'</td><td>';
 	$form->select_types_paiements(GETPOST("type_payment"), "type_payment");
 	print "</td>\n";
 	print "</tr>";
 
+	if (!empty($conf->banque->enabled))
+	{
+		print '<tr><td class="fieldrequired" id="label_fk_account">'.$langs->trans("BankAccount").'</td><td>';
+		$form->select_comptes(GETPOST("accountid", 'int'), "accountid", 0, "courant=1", 1); // List of bank account available
+		print '</td></tr>';
+	}
+
+	// Auto create payment
+	print '<tr><td>'.$langs->trans('AutomaticCreationPayment').'</td>';
+	print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" '.($_REQUEST['action'] === 'add' ? (empty($auto_create_payment) ? '' : 'checked="checked"') : 'checked="checked"').' value="1"></td></tr>'."\n";
+
 	// Number
-	print '<tr><td>'.$langs->trans('Numero');
+	print '<tr class="hide_if_no_auto_create_payment"><td>'.$langs->trans('Numero');
 	print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
 	print '<td><input name="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
 
-	// Other attributes
-	$parameters = array();
-	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
+	// Comments
+	print '<tr class="hide_if_no_auto_create_payment">';
+	print '<td class="tdtop">'.$langs->trans("Comments").'</td>';
+	print '<td class="tdtop"><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_3.'"></textarea></td>';
+	print '</tr>';
 
-	print '</table>';
+    // 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 dol_get_fiche_end();
+	// Bouton Save payment
+	print '<tr class="hide_if_no_auto_create_payment"><td>';
+	print $langs->trans("ClosePaidVATAutomatically");
+	print '</td><td><input type="checkbox" checked value="1" name="closepaidtva"></td></tr>';
+
+    print '</table>';
+
+    dol_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
@@ -301,7 +508,7 @@ if ($action == 'create')
 	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
-	print '</form>';
+    print '</form>';
 }
 
 // View mode
@@ -309,7 +516,40 @@ if ($id)
 {
 	$head = vat_prepare_head($object);
 
-	print dol_get_fiche_head($head, 'card', $langs->trans("VATPayment"), -1, 'payment');
+	$totalpaye = $object->getSommePaiement();
+
+	// Clone confirmation
+	if ($action === 'clone')
+	{
+		$formquestion = array(
+			array('type' => 'text', 'name' => 'clone_label', 'label' => $langs->trans("Label"), 'value' => $langs->trans("CopyOf").' '.$object->label),
+		);
+
+		//$formquestion[] = array('type' => 'date', 'name' => 'clone_date_ech', 'label' => $langs->trans("Date"), 'value' => -1);
+		$formquestion[] = array('type' => 'date', 'name' => 'clone_period', 'label' => $langs->trans("PeriodEndDate"), 'value' => -1);
+
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneVAT', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 240);
+	}
+
+	if ($action == 'paid')
+	{
+		$text = $langs->trans('ConfirmPayVAT');
+		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans('PayVAT'), $text, "confirm_paid", '', '', 2);
+	}
+
+	if ($action == 'delete')
+	{
+		$text = $langs->trans('ConfirmDeleteVAT');
+		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('DeleteVAT'), $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().'">';
+	}
+
+	dol_fiche_head($head, 'card', $langs->trans("VATPayment"), -1, 'payment');
 
 	$morehtmlref = '<div class="refidno">';
 	// Label of social contribution
@@ -320,9 +560,12 @@ if ($id)
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/tva/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
+	$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
 
 	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
 
 	print '<table class="border centpercent">';
@@ -330,10 +573,10 @@ if ($id)
 	// Label
 	//print '<tr><td class="titlefield">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
 
-	print "<tr>";
+	/*print "<tr>";
 	print '<td class="titlefield">'.$langs->trans("DatePayment").'</td><td>';
 	print dol_print_date($object->datep, 'day');
-	print '</td></tr>';
+	print '</td></tr>';*/
 
 	print '<tr><td>';
 	print $form->editfieldkey($form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")), 'datev', $object->datev, $object, $user->rights->tax->charges->creer, 'day');
@@ -342,22 +585,46 @@ if ($id)
 	//print dol_print_date($object->datev,'day');
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
+	if ($action == 'edit') {
+		print '<tr><td class="fieldrequired">' . $langs->trans("Amount") . '</td><td><input name="amount" size="10" value="' . $object->amount . '"></td></tr>';
+	} else {
+		print '<tr><td>' . $langs->trans("Amount") . '</td><td>' . price($object->amount) . '</td></tr>';
+	}
 
+	// Mode of payment
+	print '<tr><td>';
+	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	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 '</tr></table>';
+	print '</td><td>';
+	if ($action == 'editmode') {
+		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->type_payment, 'mode_reglement_id');
+	} else {
+		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->type_payment, 'none');
+	}
+	print '</td></tr>';
+
+	// Bank account
 	if (!empty($conf->banque->enabled))
 	{
-		if ($object->fk_account > 0)
-		{
-			$bankline = new AccountLine($db);
-			$bankline->fetch($object->fk_bank);
-
-			print '<tr>';
-			print '<td>'.$langs->trans('BankTransactionLine').'</td>';
-			print '<td>';
-			print $bankline->getNomUrl(1, 0, 'showall');
-			print '</td>';
-			print '</tr>';
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans('BankAccount');
+		print '<td>';
+		if ($action != 'editbankaccount' && $user->rights->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 '</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>';
 	}
 
 	// Other attributes
@@ -369,22 +636,180 @@ if ($id)
 
 	print '</div>';
 
-	print dol_get_fiche_end();
+	print '<div class="fichehalfright">';
+	print '<div class="ficheaddleft">';
+
+	$nbcols = 3;
+	if (!empty($conf->banque->enabled)) {
+		$nbcols++;
+	}
+
+	/*
+	 * Payments
+	 */
+	$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."payment_vat as p";
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_typepaiement = c.id";
+	$sql .= ", ".MAIN_DB_PREFIX."tva as tva";
+	$sql .= " WHERE p.fk_tva = ".$id;
+	$sql .= " AND p.fk_tva = tva.rowid";
+	$sql .= " AND tva.entity IN (".getEntity('tax').")";
+	$sql .= " ORDER BY dp DESC";
+
+	//print $sql;
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$totalpaye = 0;
+
+		$num = $db->num_rows($resql);
+		$i = 0; $total = 0;
+
+		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+		print '<table class="noborder paymenttable">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("RefPayment").'</td>';
+		print '<td>'.$langs->trans("Date").'</td>';
+		print '<td>'.$langs->trans("Type").'</td>';
+		if (!empty($conf->banque->enabled)) {
+			print '<td class="liste_titre right">'.$langs->trans('BankAccount').'</td>';
+		}
+		print '<td class="right">'.$langs->trans("Amount").'</td>';
+		print '</tr>';
+
+		if ($num > 0)
+		{
+			$bankaccountstatic = new Account($db);
+			while ($i < $num)
+			{
+				$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 '<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";
+				if (!empty($conf->banque->enabled))
+				{
+					$bankaccountstatic->id = $objp->baid;
+					$bankaccountstatic->ref = $objp->baref;
+					$bankaccountstatic->label = $objp->baref;
+					$bankaccountstatic->number = $objp->banumber;
+					$bankaccountstatic->currency_code = $objp->bacurrency_code;
+
+					if (!empty($conf->accounting->enabled)) {
+						$bankaccountstatic->account_number = $objp->account_number;
+
+						$accountingjournal = new AccountingJournal($db);
+						$accountingjournal->fetch($objp->fk_accountancy_journal);
+						$bankaccountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+					}
+
+					print '<td class="right">';
+					if ($bankaccountstatic->id)
+						print $bankaccountstatic->getNomUrl(1, 'transactions');
+					print '</td>';
+				}
+				print '<td class="right">'.price($objp->amount)."</td>\n";
+				print "</tr>";
+				$totalpaye += $objp->amount;
+				$i++;
+			}
+		}
+		else {
+			print '<tr class="oddeven"><td><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
+			print '<td></td><td></td><td></td><td></td>';
+			print '</tr>';
+		}
+
+		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';
+
+		print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("RemainderToPay")." :</td>";
+		print '<td class="right'.($resteapayer ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayer)."</td></tr>\n";
+
+		print "</table>";
+		print '</div>';
+
+		$db->free($resql);
+	}
+	else {
+		dol_print_error($db);
+	}
+
+	print '</div>';
+	print '</div>';
+	print '</div>';
+
+	print '<div class="clearboth"></div>';
+
+	dol_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";
+	}
 
 	/*
 	 * Action buttons
 	 */
 	print "<div class=\"tabsAction\">\n";
-	if ($object->rappro == 0)
+	if ($action != 'edit')
 	{
-		if (!empty($user->rights->tax->charges->supprimer))
+		// Reopen
+		if ($object->paye && $user->rights->tax->charges->creer)
 		{
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
-		} else {
-			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("NotAllowed"))).'">'.$langs->trans("Delete").'</a></div>';
+			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>";
+		}
+
+		// 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>";
+		}
+
+		// 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>";
+		}
+
+		// Classify 'paid'
+		if ($object->paye == 0
+		&& (
+			(round($resteapayer) <= 0 && $object->amount > 0)
+			|| (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>";
+		}
+
+		// 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>";
+		}
+
+		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>';
+		}
+		else {
+			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("DisabledBecausePayments"))).'">'.$langs->trans("Delete").'</a></div>';
 		}
-	} else {
-		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("LinkedToAConciliatedTransaction").'">'.$langs->trans("Delete").'</a></div>';
 	}
 	print "</div>";
 }
diff --git a/htdocs/compta/tva/class/paymentvat.class.php b/htdocs/compta/tva/class/paymentvat.class.php
new file mode 100644
index 00000000000..13369e596bc
--- /dev/null
+++ b/htdocs/compta/tva/class/paymentvat.class.php
@@ -0,0 +1,724 @@
+<?php
+/* Copyright (C) 2002      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+ *		\ingroup    facture
+ *		\brief      File of class to manage payment of social contributions
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
+
+
+/**
+ *	Class to manage payments of social contributions
+ */
+class PaymentVAT extends CommonObject
+{
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'payment_vat';
+
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'payment_vat';
+
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'payment';
+
+	/**
+     * @var int ID
+     */
+	public $fk_tva;
+
+	public $datec = '';
+	public $tms = '';
+	public $datep = '';
+
+	/**
+	 * @deprecated
+	 * @see $amount
+	 */
+	public $total;
+
+    public $amount; // Total amount of payment
+    public $amounts = array(); // Array of amounts
+
+    /**
+     * @var int ID
+     */
+	public $fk_typepaiement;
+
+	/**
+	 * @var string
+	 * @deprecated
+	 */
+	public $num_paiement;
+
+	/**
+	 * @var string
+	 */
+	public $num_payment;
+
+	/**
+     * @var int ID
+     */
+	public $fk_bank;
+
+	/**
+     * @var int ID
+     */
+	public $fk_user_creat;
+
+	/**
+     * @var int ID
+     */
+	public $fk_user_modif;
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 *  Create payment of social contribution into database.
+     *  Use this->amounts to have list of lines for the payment
+     *
+	 *  @param      User	$user   				User making payment
+	 *	@param		int		$closepaidcontrib   	1=Also close payed contributions to paid, 0=Do nothing more
+	 *  @return     int     						<0 if KO, id of payment if OK
+	 */
+	public function create($user, $closepaidcontrib = 0)
+	{
+		global $conf, $langs;
+
+		$error = 0;
+
+        $now = dol_now();
+
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+
+		// Validate parametres
+		if (!$this->datepaye)
+		{
+			$this->error = 'ErrorBadValueForParameterCreatePaymentVAT';
+			return -1;
+		}
+
+		// Clean parameters
+		if (isset($this->fk_tva)) $this->fk_tva = (int) $this->fk_tva;
+		if (isset($this->amount)) $this->amount = trim($this->amount);
+		if (isset($this->fk_typepaiement)) $this->fk_typepaiement = (int) $this->fk_typepaiement;
+		if (isset($this->num_paiement)) $this->num_paiement = trim($this->num_paiement); // deprecated
+		if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment);
+		if (isset($this->note)) $this->note = trim($this->note);
+		if (isset($this->fk_bank)) $this->fk_bank = (int) $this->fk_bank;
+		if (isset($this->fk_user_creat)) $this->fk_user_creat = (int) $this->fk_user_creat;
+		if (isset($this->fk_user_modif)) $this->fk_user_modif = (int) $this->fk_user_modif;
+
+        $totalamount = 0;
+        foreach ($this->amounts as $key => $value)  // How payment is dispatch
+        {
+            $newvalue = price2num($value, 'MT');
+            $this->amounts[$key] = $newvalue;
+            $totalamount += $newvalue;
+        }
+        $totalamount = price2num($totalamount);
+
+        // Check parameters
+        if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+
+
+		$this->db->begin();
+
+		if ($totalamount != 0)
+		{
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_vat (fk_tva, datec, datep, amount,";
+			$sql .= " fk_typepaiement, num_paiement, note, fk_user_creat, fk_bank)";
+			$sql .= " VALUES ($this->chid, '".$this->db->idate($now)."',";
+			$sql .= " '".$this->db->idate($this->datepaye)."',";
+			$sql .= " ".$totalamount.",";
+			$sql .= " ".$this->paiementtype.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note)."', ".$user->id.",";
+			$sql .= " 0)";
+
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_vat");
+
+				// Insere tableau des montants / factures
+				foreach ($this->amounts as $key => $amount)
+				{
+					$contribid = $key;
+					if (is_numeric($amount) && $amount <> 0)
+					{
+						$amount = price2num($amount);
+
+						// If we want to closed payed invoices
+						if ($closepaidcontrib)
+						{
+							$contrib = new Tva($this->db);
+							$contrib->fetch($contribid);
+							$paiement = $contrib->getSommePaiement();
+							//$creditnotes=$contrib->getSumCreditNotesUsed();
+							$creditnotes = 0;
+							//$deposits=$contrib->getSumDepositsUsed();
+							$deposits = 0;
+							$alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
+							$remaintopay = price2num($contrib->amount - $paiement - $creditnotes - $deposits, 'MT');
+							if ($remaintopay == 0)
+							{
+								$result = $contrib->setPaid($user);
+							}
+							else dol_syslog("Remain to pay for conrib ".$contribid." not null. We do nothing.");
+						}
+					}
+				}
+			}
+			else {
+				$error++;
+			}
+		}
+
+		$result = $this->call_trigger('PAYMENTVAT_CREATE', $user);
+		if ($result < 0) $error++;
+
+		if ($totalamount != 0 && !$error)
+		{
+		    $this->amount = $totalamount;
+            $this->total = $totalamount; // deprecated
+		    $this->db->commit();
+			return $this->id;
+		}
+		else {
+			$this->error = $this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param	int		$id         Id object
+	 *  @return int         		<0 if KO, >0 if OK
+	 */
+	public function fetch($id)
+	{
+		global $langs;
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
+		$sql .= " t.fk_tva,";
+		$sql .= " t.datec,";
+		$sql .= " t.tms,";
+		$sql .= " t.datep,";
+		$sql .= " t.amount,";
+		$sql .= " t.fk_typepaiement,";
+		$sql .= " t.num_paiement as num_payment,";
+		$sql .= " t.note,";
+		$sql .= " t.fk_bank,";
+		$sql .= " t.fk_user_creat,";
+		$sql .= " t.fk_user_modif,";
+		$sql .= " pt.code as type_code, pt.libelle as type_label,";
+		$sql .= ' b.fk_account';
+		$sql .= " FROM ".MAIN_DB_PREFIX."payment_vat as t LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pt ON t.fk_typepaiement = pt.id";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
+		$sql .= " WHERE t.rowid = ".$id;
+		// TODO link on entity of tax;
+
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id    = $obj->rowid;
+				$this->ref   = $obj->rowid;
+
+				$this->fk_tva = $obj->fk_tva;
+				$this->datec = $this->db->jdate($obj->datec);
+				$this->tms = $this->db->jdate($obj->tms);
+				$this->datep = $this->db->jdate($obj->datep);
+				$this->amount = $obj->amount;
+				$this->fk_typepaiement = $obj->fk_typepaiement;
+				$this->num_paiement = $obj->num_payment;
+				$this->num_payment = $obj->num_payment;
+				$this->note = $obj->note;
+				$this->fk_bank = $obj->fk_bank;
+				$this->fk_user_creat = $obj->fk_user_creat;
+				$this->fk_user_modif = $obj->fk_user_modif;
+
+				$this->type_code = $obj->type_code;
+				$this->type_label = $obj->type_label;
+
+				$this->bank_account   = $obj->fk_account;
+				$this->bank_line      = $obj->fk_bank;
+			}
+			$this->db->free($resql);
+
+			return 1;
+		}
+		else {
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Update database
+	 *
+	 *  @param	User	$user        	User that modify
+	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *  @return int         			<0 if KO, >0 if OK
+	 */
+	public function update($user = null, $notrigger = 0)
+	{
+		global $conf, $langs;
+		$error = 0;
+
+		// Clean parameters
+
+		if (isset($this->fk_tva)) $this->fk_tva = (int) $this->fk_tva;
+		if (isset($this->amount)) $this->amount = trim($this->amount);
+		if (isset($this->fk_typepaiement)) $this->fk_typepaiement = (int) $this->fk_typepaiement;
+		if (isset($this->num_paiement)) $this->num_paiement = trim($this->num_paiement); // deprecated
+		if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment);
+		if (isset($this->note)) $this->note = trim($this->note);
+		if (isset($this->fk_bank)) $this->fk_bank = (int) $this->fk_bank;
+		if (isset($this->fk_user_creat)) $this->fk_user_creat = (int) $this->fk_user_creat;
+		if (isset($this->fk_user_modif)) $this->fk_user_modif = (int) $this->fk_user_modif;
+
+
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_vat SET";
+
+		$sql .= " fk_tva=".(isset($this->fk_tva) ? $this->fk_tva : "null").",";
+		$sql .= " datec=".(dol_strlen($this->datec) != 0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
+		$sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+		$sql .= " datep=".(dol_strlen($this->datep) != 0 ? "'".$this->db->idate($this->datep)."'" : 'null').",";
+		$sql .= " amount=".(isset($this->amount) ? $this->amount : "null").",";
+		$sql .= " fk_typepaiement=".(isset($this->fk_typepaiement) ? $this->fk_typepaiement : "null").",";
+		$sql .= " num_paiement=".(isset($this->num_paiement) ? "'".$this->db->escape($this->num_paiement)."'" : "null").",";
+		$sql .= " note=".(isset($this->note) ? "'".$this->db->escape($this->note)."'" : "null").",";
+		$sql .= " fk_bank=".(isset($this->fk_bank) ? $this->fk_bank : "null").",";
+		$sql .= " fk_user_creat=".(isset($this->fk_user_creat) ? $this->fk_user_creat : "null").",";
+		$sql .= " fk_user_modif=".(isset($this->fk_user_modif) ? $this->fk_user_modif : "null")."";
+
+
+		$sql .= " WHERE rowid=".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		}
+		else {
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+
+	/**
+	 *  Delete object in database
+	 *
+	 *  @param	User	$user        	User that delete
+	 *  @param  int		$notrigger		0=launch triggers after, 1=disable triggers
+	 *  @return int						<0 if KO, >0 if OK
+	 */
+	public function delete($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+		$error = 0;
+
+		dol_syslog(get_class($this)."::delete");
+
+		$this->db->begin();
+
+	    if ($this->bank_line > 0)
+        {
+        	$accline = new AccountLine($this->db);
+			$accline->fetch($this->bank_line);
+			$result = $accline->delete();
+			if ($result < 0) {
+				$this->errors[] = $accline->error;
+				$error++;
+			}
+        }
+
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_vat";
+			$sql .= " WHERE rowid=".$this->id;
+
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		}
+		else {
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+
+
+	/**
+	 *	Load an object from its id and create a new one in database
+	 *
+	 *  @param	User	$user		    User making the clone
+	 *	@param	int		$fromid     	Id of object to clone
+	 * 	@return	int						New id of clone
+	 */
+	public function createFromClone(User $user, $fromid)
+	{
+		$error = 0;
+
+		$object = new PaymentSocialContribution($this->db);
+
+		$this->db->begin();
+
+		// Load source object
+		$object->fetch($fromid);
+		$object->id = 0;
+		$object->statut = 0;
+
+		// Clear fields
+		// ...
+
+		// Create clone
+		$object->context['createfromclone'] = 'createfromclone';
+		$result = $object->create($user);
+
+		// Other options
+		if ($result < 0)
+		{
+			$this->error = $object->error;
+			$error++;
+		}
+
+		unset($object->context['createfromclone']);
+
+		// End
+		if (!$error)
+		{
+			$this->db->commit();
+			return $object->id;
+		}
+		else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+     *  Initialise an instance with random values.
+     *  Used to build previews or test instances.
+     *	id must be 0 if object instance is a specimen.
+     *
+     *  @return	void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->id = 0;
+
+		$this->fk_tva = 0;
+		$this->datec = '';
+		$this->tms = '';
+		$this->datep = '';
+		$this->amount = '';
+		$this->fk_typepaiement = '';
+		$this->num_payment = '';
+		$this->note_private = '';
+		$this->note_public = '';
+		$this->fk_bank = 0;
+		$this->fk_user_creat = 0;
+		$this->fk_user_modif = 0;
+	}
+
+
+    /**
+     *      Add record into bank for payment with links between this bank record and invoices of payment.
+     *      All payment properties must have been set first like after a call to create().
+     *
+     *      @param	User	$user               Object of user making payment
+     *      @param  string	$mode               'payment_sc'
+     *      @param  string	$label              Label to use in bank record
+     *      @param  int		$accountid          Id of bank account to do link with
+     *      @param  string	$emetteur_nom       Name of transmitter
+     *      @param  string	$emetteur_banque    Name of bank
+     *      @return int                 		<0 if KO, >0 if OK
+     */
+    public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
+    {
+        global $conf;
+
+		// Clean data
+        $this->num_payment = trim($this->num_payment ? $this->num_payment : $this->num_paiement);
+
+        $error = 0;
+
+        if (!empty($conf->banque->enabled))
+        {
+            include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+            $acc = new Account($this->db);
+            $acc->fetch($accountid);
+
+            $total = $this->total;
+            if ($mode == 'payment_vat') $total = -$total;
+
+            // Insert payment into llx_bank
+            $bank_line_id = $acc->addline(
+                $this->datepaye,
+                $this->paiementtype, // Payment mode id or code ("CHQ or VIR for example")
+                $label,
+                $total,
+                $this->num_payment,
+                '',
+                $user,
+                $emetteur_nom,
+                $emetteur_banque
+            );
+
+            // Mise a jour fk_bank dans llx_paiement.
+            // On connait ainsi le paiement qui a genere l'ecriture bancaire
+            if ($bank_line_id > 0)
+            {
+                $result = $this->update_fk_bank($bank_line_id);
+                if ($result <= 0)
+                {
+                    $error++;
+                    dol_print_error($this->db);
+                }
+
+                // Add link 'payment', 'payment_supplier', 'payment_sc' in bank_url between payment and bank transaction
+                $url = '';
+                if ($mode == 'payment_vat') $url = DOL_URL_ROOT.'/compta/payment_vat/card.php?id=';
+                if ($url)
+                {
+                    $result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
+                    if ($result <= 0)
+                    {
+                        $error++;
+                        dol_print_error($this->db);
+                    }
+                }
+
+                // Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
+                $linkaddedforthirdparty = array();
+                foreach ($this->amounts as $key => $value)
+                {
+                    if ($mode == 'payment_vat')
+                    {
+                        $tva = new Tva($this->db);
+                        $tva->fetch($key);
+                        $result = $acc->add_url_line($bank_line_id, $tva->id, DOL_URL_ROOT.'/compta/tva/card.php?id=', '('.$tva->label.')', 'vat');
+                        if ($result <= 0) dol_print_error($this->db);
+                    }
+                }
+            }
+            else {
+                $this->error = $acc->error;
+                $error++;
+            }
+        }
+
+        if (!$error)
+        {
+            return 1;
+        }
+        else {
+            return -1;
+        }
+    }
+
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Mise a jour du lien entre le paiement de  tva et la ligne dans llx_bank generee
+	 *
+	 *  @param	int		$id_bank         Id if bank
+	 *  @return	int			             >0 if OK, <=0 if KO
+	 */
+	public function update_fk_bank($id_bank)
+	{
+        // phpcs:enable
+		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_vat SET fk_bank = ".$id_bank." WHERE rowid = ".$this->id;
+
+		dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			return 1;
+		}
+		else {
+			$this->error = $this->db->error();
+			return 0;
+		}
+	}
+
+
+	/**
+	 * Retourne le libelle du statut d'une facture (brouillon, validee, abandonnee, payee)
+	 *
+	 * @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 * @return  string				Libelle
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->statut, $mode);
+	}
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Renvoi le libelle d'un statut donne
+	 *
+	 * @param   int		$status     Statut
+	 * @param   int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 * @return	string  		    Libelle du statut
+	 */
+	public function LibStatut($status, $mode = 0)
+	{
+        // phpcs:enable
+		global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
+
+		$langs->load('compta');
+		/*if ($mode == 0)
+			{
+			if ($status == 0) return $langs->trans('ToValidate');
+			if ($status == 1) return $langs->trans('Validated');
+			}
+			if ($mode == 1)
+			{
+			if ($status == 0) return $langs->trans('ToValidate');
+			if ($status == 1) return $langs->trans('Validated');
+			}
+			if ($mode == 2)
+			{
+			if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate');
+			if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated');
+			}
+			if ($mode == 3)
+			{
+			if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1');
+			if ($status == 1) return img_picto($langs->trans('Validated'),'statut4');
+			}
+			if ($mode == 4)
+			{
+			if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate');
+			if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated');
+			}
+			if ($mode == 5)
+			{
+			if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
+			if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
+			}
+			if ($mode == 6)
+			{
+			if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
+			if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
+			}*/
+		return '';
+	}
+
+	/**
+	 *  Return clicable name (with picto eventually)
+	 *
+	 *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
+	 * 	@param	int		$maxlen			Longueur max libelle
+	 *	@return	string					Chaine avec URL
+	 */
+	public function getNomUrl($withpicto = 0, $maxlen = 0)
+	{
+		global $langs;
+
+		$result = '';
+
+		if (empty($this->ref)) $this->ref = $this->lib;
+
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("VATPayment").'</u>';
+		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		if (!empty($this->label)) {
+			$labeltoshow = $this->label;
+			$reg = array();
+			if (preg_match('/^\((.*)\)$/i', $this->label, $reg))
+			{
+				// Label generique car entre parentheses. On l'affiche en le traduisant
+				if ($reg[1] == 'paiement') $reg[1] = 'Payment';
+				$labeltoshow = $langs->trans($reg[1]);
+			}
+			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$labeltoshow;
+		}
+		if ($this->datep) $label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->datep, 'day');
+
+		if (!empty($this->id)) {
+			$link = '<a href="'.DOL_URL_ROOT.'/compta/payment_vat/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+			$linkend = '</a>';
+
+			if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
+			if ($withpicto && $withpicto != 2) $result .= ' ';
+			if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+		}
+
+		return $result;
+	}
+}
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 51cac4c7394..a39a00d8b01 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2011-2017  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Philippe Grand          <philippe.grand@atoo-net.com>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,13 +57,13 @@ class Tva extends CommonObject
 	public $num_payment;
 
 	/**
-	 * @var string label
-	 */
-	public $label;
+     * @var string label
+     */
+    public $label;
 
-	/**
-	 * @var int ID
-	 */
+    /**
+     * @var int ID
+     */
 	public $fk_bank;
 
 	/**
@@ -71,35 +72,39 @@ class Tva extends CommonObject
 	public $accountid;
 
 	/**
-	 * @var int ID
-	 */
+     * @var int ID
+     */
 	public $fk_user_creat;
 
 	/**
-	 * @var int ID
-	 */
+     * @var int ID
+     */
 	public $fk_user_modif;
 
-	/**
+
+	const STATUS_UNPAID = 0;
+	const STATUS_PAID = 1;
+
+    /**
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
-	 */
-	public function __construct($db)
-	{
-		$this->db = $db;
-	}
+     */
+    public function __construct($db)
+    {
+        $this->db = $db;
+    }
 
 
-	/**
-	 *  Create in database
-	 *
-	 *  @param      User	$user       User that create
-	 *  @return     int      			<0 if KO, >0 if OK
-	 */
-	public function create($user)
-	{
-		global $conf, $langs;
+    /**
+     *  Create in database
+     *
+     *  @param      User	$user       User that create
+     *  @return     int      			<0 if KO, >0 if OK
+     */
+    public function create($user)
+    {
+    	global $conf, $langs;
 
 		$error = 0;
 		$now = dol_now();
@@ -107,8 +112,9 @@ class Tva extends CommonObject
 		// Clean parameters
 		$this->amount = trim($this->amount);
 		$this->label = trim($this->label);
+		$this->type_payment = (int) $this->type_payment;
 		$this->note = trim($this->note);
-		$this->fk_bank = (int) $this->fk_bank;
+		$this->fk_account = (int) $this->fk_account;
 		$this->fk_user_creat = (int) $this->fk_user_creat;
 		$this->fk_user_modif = (int) $this->fk_user_modif;
 
@@ -125,57 +131,61 @@ class Tva extends CommonObject
 		$sql .= "amount,";
 		$sql .= "label,";
 		$sql .= "note,";
-		$sql .= "fk_bank,";
+		$sql .= "fk_account,";
+		$sql .= "fk_typepayment,";
 		$sql .= "fk_user_creat,";
 		$sql .= "fk_user_modif";
-		$sql .= ") VALUES (";
+        $sql .= ") VALUES (";
 		$sql .= " '".$this->db->idate($now)."',";
 		$sql .= " '".$this->db->idate($this->datep)."',";
 		$sql .= " '".$this->db->idate($this->datev)."',";
 		$sql .= " '".$this->db->escape($this->amount)."',";
 		$sql .= " '".$this->db->escape($this->label)."',";
 		$sql .= " '".$this->db->escape($this->note)."',";
-		$sql .= " ".($this->fk_bank <= 0 ? "NULL" : "'".$this->db->escape($this->fk_bank)."'").",";
+		$sql .= " '".$this->db->escape($this->fk_account)."',";
+		$sql .= " '".$this->db->escape($this->type_payment)."',";
 		$sql .= " '".$this->db->escape($this->fk_user_creat)."',";
 		$sql .= " '".$this->db->escape($this->fk_user_modif)."'";
 		$sql .= ")";
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva");
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva");
 
-			// Call trigger
-			$result = $this->call_trigger('TVA_CREATE', $user);
-			if ($result < 0) $error++;
-			// End call triggers
+            // Call trigger
+            $result = $this->call_trigger('TVA_CREATE', $user);
+            if ($result < 0) $error++;
+            // End call triggers
 
-			if (!$error)
-			{
-				$this->db->commit();
-				return $this->id;
-			} else {
+            if (!$error)
+            {
+            	$this->db->commit();
+            	return $this->id;
+            }
+            else {
 				$this->db->rollback();
 				return -1;
-			}
-		} else {
+            }
+        }
+        else {
 			$this->error = "Error ".$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-		}
-	}
+        }
+    }
 
-	/**
-	 * Update database
-	 *
-	 * @param   User	$user        	User that modify
-	 * @param	int		$notrigger	    0=no, 1=yes (no update trigger)
-	 * @return  int         			<0 if KO, >0 if OK
-	 */
-	public function update($user, $notrigger = 0)
-	{
-		global $conf, $langs;
+    /**
+     * Update database
+     *
+     * @param   User	$user        	User that modify
+     * @param	int		$notrigger	    0=no, 1=yes (no update trigger)
+     * @return  int         			<0 if KO, >0 if OK
+     */
+    public function update($user, $notrigger = 0)
+    {
+    	global $conf, $langs;
 
 		$error = 0;
 
@@ -183,7 +193,6 @@ class Tva extends CommonObject
 		$this->amount = trim($this->amount);
 		$this->label = trim($this->label);
 		$this->note = trim($this->note);
-		$this->fk_bank = (int) $this->fk_bank;
 		$this->fk_user_creat = (int) $this->fk_user_creat;
 		$this->fk_user_modif = (int) $this->fk_user_modif;
 
@@ -193,56 +202,90 @@ class Tva extends CommonObject
 		$this->db->begin();
 
 		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX."tva SET";
+        $sql = "UPDATE ".MAIN_DB_PREFIX."tva SET";
 		$sql .= " tms='".$this->db->idate($this->tms)."',";
 		$sql .= " datep='".$this->db->idate($this->datep)."',";
 		$sql .= " datev='".$this->db->idate($this->datev)."',";
 		$sql .= " amount=".price2num($this->amount).",";
 		$sql .= " label='".$this->db->escape($this->label)."',";
 		$sql .= " note='".$this->db->escape($this->note)."',";
-		$sql .= " fk_bank=".$this->fk_bank.",";
 		$sql .= " fk_user_creat=".$this->fk_user_creat.",";
 		$sql .= " fk_user_modif=".($this->fk_user_modif > 0 ? $this->fk_user_modif : $user->id)."";
-		$sql .= " WHERE rowid=".$this->id;
+        $sql .= " WHERE rowid=".$this->id;
 
-		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
-			$this->error = "Error ".$this->db->lasterror();
-			$error++;
-		}
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if (!$resql)
+        {
+            $this->error = "Error ".$this->db->lasterror();
+            $error++;
+        }
 
 		if (!$error && !$notrigger)
 		{
-			// Call trigger
-			$result = $this->call_trigger('TVA_MODIFY', $user);
-			if ($result < 0) $error++;
-			// End call triggers
-		}
+            // Call trigger
+            $result = $this->call_trigger('TVA_MODIFY', $user);
+            if ($result < 0) $error++;
+            // End call triggers
+    	}
 
-		if (!$error)
-		{
-			$this->db->commit();
-			return 1;
-		} else {
-			$this->db->rollback();
-			return -1;
-		}
+        if (!$error)
+    	{
+    		$this->db->commit();
+    		return 1;
+    	}
+    	else {
+    		$this->db->rollback();
+    		return -1;
+    	}
+    }
+
+	/**
+	 *    Tag TVA as payed completely
+	 *
+	 *    @param    User    $user       Object user making change
+	 *    @return   int					<0 if KO, >0 if OK
+	 */
+	public function setPaid($user)
+	{
+		// phpcs:enable
+		$sql = "UPDATE ".MAIN_DB_PREFIX."tva SET";
+		$sql .= " paye = 1";
+		$sql .= " WHERE rowid = ".$this->id;
+		$resql = $this->db->query($sql);
+		if ($resql) return 1;
+		else return -1;
+	}
+
+	/**
+	 *    Remove tag payed on TVA
+	 *
+	 *    @param	User	$user       Object user making change
+	 *    @return	int					<0 if KO, >0 if OK
+	 */
+	public function setUnpaid($user)
+	{
+		// phpcs:enable
+		$sql = "UPDATE ".MAIN_DB_PREFIX."tva SET";
+		$sql .= " paye = 0";
+		$sql .= " WHERE rowid = ".$this->id;
+		$resql = $this->db->query($sql);
+		if ($resql) return 1;
+		else return -1;
 	}
 
 
-	/**
-	 *  Load object in memory from database
-	 *
-	 *  @param	int		$id         id object
-	 *  @param  User	$user       User that load
-	 *  @return int         		<0 if KO, >0 if OK
-	 */
-	public function fetch($id, $user = null)
-	{
-		global $langs;
-		$sql = "SELECT";
+    /**
+     *  Load object in memory from database
+     *
+     *  @param	int		$id         id object
+     *  @param  User	$user       User that load
+     *  @return int         		<0 if KO, >0 if OK
+     */
+    public function fetch($id, $user = null)
+    {
+    	global $langs;
+        $sql = "SELECT";
 		$sql .= " t.rowid,";
 
 		$sql .= " t.tms,";
@@ -253,27 +296,25 @@ class Tva extends CommonObject
 		$sql .= " t.num_payment,";
 		$sql .= " t.label,";
 		$sql .= " t.note,";
-		$sql .= " t.fk_bank,";
+		$sql .= " t.paye,";
 		$sql .= " t.fk_user_creat,";
 		$sql .= " t.fk_user_modif,";
-		$sql .= " b.fk_account,";
-		$sql .= " b.fk_type,";
-		$sql .= " b.rappro";
+		$sql .= " t.fk_account";
 
-		$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON t.fk_bank = b.rowid";
-		$sql .= " WHERE t.rowid = ".$id;
+        $sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
+		//$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON t.fk_bank = b.rowid";
+        $sql .= " WHERE t.rowid = ".$id;
 
-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
-				$obj = $this->db->fetch_object($resql);
+    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            if ($this->db->num_rows($resql))
+            {
+                $obj = $this->db->fetch_object($resql);
 
-				$this->id    = $obj->rowid;
-				$this->ref   = $obj->rowid;
+                $this->id    = $obj->rowid;
+                $this->ref   = $obj->rowid;
 				$this->tms   = $this->db->jdate($obj->tms);
 				$this->datep = $this->db->jdate($obj->datep);
 				$this->datev = $this->db->jdate($obj->datev);
@@ -281,30 +322,31 @@ class Tva extends CommonObject
 				$this->type_payment = $obj->fk_typepayment;
 				$this->num_payment = $obj->num_payment;
 				$this->label = $obj->label;
+				$this->paye  = $obj->paye;
 				$this->note  = $obj->note;
-				$this->fk_bank = $obj->fk_bank;
 				$this->fk_user_creat = $obj->fk_user_creat;
 				$this->fk_user_modif = $obj->fk_user_modif;
 				$this->fk_account = $obj->fk_account;
 				$this->fk_type = $obj->fk_type;
 				$this->rappro  = $obj->rappro;
-			}
-			$this->db->free($resql);
+            }
+            $this->db->free($resql);
 
-			return 1;
-		} else {
-	  		$this->error = "Error ".$this->db->lasterror();
-			return -1;
-		}
-	}
+            return 1;
+        }
+        else {
+      	    $this->error = "Error ".$this->db->lasterror();
+            return -1;
+        }
+    }
 
 
  	/**
- 	 *  Delete object in database
- 	 *
- 	 *	@param	User	$user       User that delete
- 	 *	@return	int					<0 if KO, >0 if OK
- 	 */
+	 *  Delete object in database
+	 *
+     *	@param	User	$user       User that delete
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
 	public function delete($user)
 	{
 		global $conf, $langs;
@@ -333,11 +375,11 @@ class Tva extends CommonObject
 
 
 	/**
-	 *  Initialise an instance with random values.
-	 *  Used to build previews or test instances.
-	 *	id must be 0 if object instance is a specimen.
-	 *
-	 *  @return	void
+     *  Initialise an instance with random values.
+     *  Used to build previews or test instances.
+     *	id must be 0 if object instance is a specimen.
+     *
+     *  @return	void
 	 */
 	public function initAsSpecimen()
 	{
@@ -355,154 +397,160 @@ class Tva extends CommonObject
 	}
 
 
-	/**
-	 *  Balance of VAT
-	 *
-	 *	@param	int		$year		Year
-	 *	@return	double				Amount
-	 */
-	public function solde($year = 0)
-	{
+    /**
+     *  Balance of VAT
+     *
+     *	@param	int		$year		Year
+     *	@return	double				Amount
+     */
+    public function solde($year = 0)
+    {
 
-		$reglee = $this->tva_sum_reglee($year);
+        $reglee = $this->tva_sum_reglee($year);
 
-		$payee = $this->tva_sum_payee($year);
-		$collectee = $this->tva_sum_collectee($year);
+        $payee = $this->tva_sum_payee($year);
+        $collectee = $this->tva_sum_collectee($year);
 
-		$solde = $reglee - ($collectee - $payee);
+        $solde = $reglee - ($collectee - $payee);
 
-		return $solde;
-	}
+        return $solde;
+    }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 * 	Total of the VAT from invoices emitted by the thirdparty.
-	 *
-	 *	@param	int		$year		Year
-	 *  @return	double				Amount
-	 */
-	public function tva_sum_collectee($year = 0)
-	{
-		// phpcs:enable
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    /**
+     * 	Total of the VAT from invoices emitted by the thirdparty.
+     *
+     *	@param	int		$year		Year
+     *  @return	double				Amount
+     */
+    public function tva_sum_collectee($year = 0)
+    {
+        // phpcs:enable
 
-		$sql = "SELECT sum(f.tva) as amount";
-		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1";
-		if ($year)
-		{
+        $sql = "SELECT sum(f.tva) as amount";
+        $sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1";
+        if ($year)
+        {
 			$sql .= " AND f.datef >= '".$this->db->escape($year)."-01-01' AND f.datef <= '".$this->db->escape($year)."-12-31' ";
-		}
+        }
 
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
-				$obj = $this->db->fetch_object($result);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            if ($this->db->num_rows($result))
+            {
+                $obj = $this->db->fetch_object($result);
 				$ret = $obj->amount;
-				$this->db->free($result);
-				return $ret;
-			} else {
-				$this->db->free($result);
+                $this->db->free($result);
+                return $ret;
+            }
+            else {
+                $this->db->free($result);
 				return 0;
-			}
-		} else {
-			print $this->db->lasterror();
-			return -1;
-		}
-	}
+            }
+        }
+        else {
+            print $this->db->lasterror();
+            return -1;
+        }
+    }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 * 	VAT payed
-	 *
-	 *	@param	int		$year		Year
-	 *	@return	double				Amount
-	 */
-	public function tva_sum_payee($year = 0)
-	{
-		// phpcs:enable
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    /**
+     * 	VAT payed
+     *
+     *	@param	int		$year		Year
+     *	@return	double				Amount
+     */
+    public function tva_sum_payee($year = 0)
+    {
+        // phpcs:enable
 
-		$sql = "SELECT sum(f.total_tva) as total_tva";
-		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-		if ($year)
-		{
-			$sql .= " WHERE f.datef >= '".$this->db->escape($year)."-01-01' AND f.datef <= '".$this->db->escape($year)."-12-31' ";
-		}
+        $sql = "SELECT sum(f.total_tva) as total_tva";
+        $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+        if ($year)
+        {
+            $sql .= " WHERE f.datef >= '".$this->db->escape($year)."-01-01' AND f.datef <= '".$this->db->escape($year)."-12-31' ";
+        }
 
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
-				$obj = $this->db->fetch_object($result);
-				$ret = $obj->total_tva;
-				$this->db->free($result);
-				return $ret;
-			} else {
-				$this->db->free($result);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            if ($this->db->num_rows($result))
+            {
+                $obj = $this->db->fetch_object($result);
+                $ret = $obj->total_tva;
+            	$this->db->free($result);
+                return $ret;
+            }
+            else {
+            	$this->db->free($result);
 				return 0;
-			}
-		} else {
-			print $this->db->lasterror();
-			return -1;
-		}
-	}
+            }
+        }
+        else {
+            print $this->db->lasterror();
+            return -1;
+        }
+    }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 * 	Total of the VAT payed
-	 *
-	 *	@param	int		$year		Year
-	 *	@return	double				Amount
-	 */
-	public function tva_sum_reglee($year = 0)
-	{
-		// phpcs:enable
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    /**
+     * 	Total of the VAT payed
+     *
+     *	@param	int		$year		Year
+     *	@return	double				Amount
+     */
+    public function tva_sum_reglee($year = 0)
+    {
+        // phpcs:enable
 
-		$sql = "SELECT sum(f.amount) as amount";
-		$sql .= " FROM ".MAIN_DB_PREFIX."tva as f";
+        $sql = "SELECT sum(f.amount) as amount";
+        $sql .= " FROM ".MAIN_DB_PREFIX."tva as f";
 
-		if ($year)
-		{
+        if ($year)
+        {
 			$sql .= " WHERE f.datev >= '".$this->db->escape($year)."-01-01' AND f.datev <= '".$this->db->escape($year)."-12-31' ";
-		}
+        }
 
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
-				$obj = $this->db->fetch_object($result);
-				$ret = $obj->amount;
-				$this->db->free($result);
-				return $ret;
-			} else {
-				$this->db->free($result);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            if ($this->db->num_rows($result))
+            {
+                $obj = $this->db->fetch_object($result);
+                $ret = $obj->amount;
+            	$this->db->free($result);
+                return $ret;
+            }
+            else {
+            	$this->db->free($result);
 				return 0;
-			}
-		} else {
-			print $this->db->lasterror();
-			return -1;
-		}
-	}
+            }
+        }
+        else {
+            print $this->db->lasterror();
+            return -1;
+        }
+    }
 
 
-	/**
-	 *  Create in database
-	 *
+    /**
+     *  Create in database
+     *
 	 *	@param	User	$user		Object user that insert
 	 *	@return	int					<0 if KO, rowid in tva table if OK
-	 */
-	public function addPayment($user)
-	{
-		global $conf, $langs;
+     */
+    public function addPayment($user)
+    {
+        global $conf, $langs;
 
-		$this->db->begin();
+        $this->db->begin();
 
-		// Clean parameters
-		$this->amount = price2num(trim($this->amount));
-		$this->label = trim($this->label);
+        // Clean parameters
+        $this->amount = price2num(trim($this->amount));
+        $this->label = trim($this->label);
 		$this->note = trim($this->note);
 		$this->num_payment = trim($this->num_payment);
 		$this->fk_bank = (int) $this->fk_bank;
@@ -510,81 +558,81 @@ class Tva extends CommonObject
 		$this->fk_user_modif = (int) $this->fk_user_modif;
 		if (empty($this->datec)) $this->datec = dol_now();
 
-		// Check parameters
+        // Check parameters
 		if (!$this->label)
 		{
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
 			return -3;
 		}
-		if ($this->amount == '')
-		{
-			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
-			return -4;
-		}
-		if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
-		{
-			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
-			return -5;
-		}
-		if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
-		{
-			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
-			return -5;
-		}
+        if ($this->amount == '')
+        {
+            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
+            return -4;
+        }
+        if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
+        {
+            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
+            return -5;
+        }
+        if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
+        {
+            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
+            return -5;
+        }
 
-		// Insert into llx_tva
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."tva (";
-		$sql .= "datec";
-		$sql .= ", datep";
-		$sql .= ", datev";
+        // Insert into llx_tva
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."tva (";
+        $sql .= "datec";
+        $sql .= ", datep";
+        $sql .= ", datev";
 		$sql .= ", amount";
 		$sql .= ", fk_typepayment";
 		$sql .= ", num_payment";
 		if ($this->note)  $sql .= ", note";
-		if ($this->label) $sql .= ", label";
-		$sql .= ", fk_user_creat";
+        if ($this->label) $sql .= ", label";
+        $sql .= ", fk_user_creat";
 		$sql .= ", fk_bank";
 		$sql .= ", entity";
 		$sql .= ") ";
-		$sql .= " VALUES (";
-		$sql .= " '".$this->db->idate($this->datec)."'";
-		$sql .= ", '".$this->db->idate($this->datep)."'";
-		$sql .= ", '".$this->db->idate($this->datev)."'";
+        $sql .= " VALUES (";
+        $sql .= " '".$this->db->idate($this->datec)."'";
+        $sql .= ", '".$this->db->idate($this->datep)."'";
+        $sql .= ", '".$this->db->idate($this->datev)."'";
 		$sql .= ", ".$this->amount;
-		$sql .= ", '".$this->db->escape($this->type_payment)."'";
+        $sql .= ", '".$this->db->escape($this->type_payment)."'";
 		$sql .= ", '".$this->db->escape($this->num_payment)."'";
 		if ($this->note)  $sql .= ", '".$this->db->escape($this->note)."'";
-		if ($this->label) $sql .= ", '".$this->db->escape($this->label)."'";
-		$sql .= ", '".$this->db->escape($user->id)."'";
+        if ($this->label) $sql .= ", '".$this->db->escape($this->label)."'";
+        $sql .= ", '".$this->db->escape($user->id)."'";
 		$sql .= ", NULL";
 		$sql .= ", ".$conf->entity;
-		$sql .= ")";
+        $sql .= ")";
 
 		dol_syslog(get_class($this)."::addPayment", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva"); // TODO should be called 'payment_vat'
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva"); // TODO should be called 'payment_vat'
 
-			// Call trigger
-			//XXX: Should be done just befor commit no ?
-			$result = $this->call_trigger('TVA_ADDPAYMENT', $user);
-			if ($result < 0)
-			{
-				$this->id = 0;
-				$ok = 0;
-			}
-			// End call triggers
+            // Call trigger
+            //XXX: Should be done just befor commit no ?
+            $result = $this->call_trigger('TVA_ADDPAYMENT', $user);
+            if ($result < 0)
+            {
+            	$this->id = 0;
+            	$ok = 0;
+            }
+            // End call triggers
 
-			if ($this->id > 0)
-			{
-				$ok = 1;
+            if ($this->id > 0)
+            {
+                $ok = 1;
 				if (!empty($conf->banque->enabled) && !empty($this->amount))
-				{
-					// Insert into llx_bank
-					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+                {
+                    // Insert into llx_bank
+                    require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-					$acc = new Account($this->db);
+                    $acc = new Account($this->db);
 					$result = $acc->fetch($this->accountid);
 					if ($result <= 0) dol_print_error($this->db);
 
@@ -594,60 +642,65 @@ class Tva extends CommonObject
 						$bank_line_id = $acc->addline($this->datep, $this->type_payment, $this->label, abs($this->amount), $this->num_payment, '', $user);
 					}
 
-					// Update fk_bank into llx_tva. So we know vat line used to generate bank transaction
-					if ($bank_line_id > 0)
+                    // Update fk_bank into llx_tva. So we know vat line used to generate bank transaction
+                    if ($bank_line_id > 0)
 					{
-						$this->update_fk_bank($bank_line_id);
-					} else {
+                        $this->update_fk_bank($bank_line_id);
+                    }
+					else {
 						$this->error = $acc->error;
 						$ok = 0;
 					}
 
-					// Update links
-					$result = $acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/tva/card.php?id=', "(VATPayment)", "payment_vat");
-					if ($result < 0)
-					{
-						$this->error = $acc->error;
-						$ok = 0;
-					}
-				}
+                    // Update links
+                    $result = $acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/tva/card.php?id=', "(VATPayment)", "payment_vat");
+                    if ($result < 0)
+                    {
+                    	$this->error = $acc->error;
+                    	$ok = 0;
+                    }
+	            }
 
 				if ($ok)
 				{
 					$this->db->commit();
 					return $this->id;
-				} else {
+				}
+				else {
 					$this->db->rollback();
 					return -3;
 				}
-			} else {
-				$this->db->rollback();
-				return -2;
-			}
-		} else {
-			$this->error = $this->db->error();
-			$this->db->rollback();
-			return -1;
-		}
-	}
+            }
+            else {
+                $this->db->rollback();
+                return -2;
+            }
+        }
+        else {
+            $this->error = $this->db->error();
+            $this->db->rollback();
+            return -1;
+        }
+    }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    /**
 	 *  Update link between payment tva and line generate into llx_bank
-	 *
-	 *  @param	int		$id_bank    Id bank account
+     *
+     *  @param	int		$id_bank    Id bank account
 	 *	@return	int					<0 if KO, >0 if OK
-	 */
+     */
 	public function update_fk_bank($id_bank)
 	{
-		// phpcs:enable
+        // phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'tva SET fk_bank = '.(int) $id_bank;
 		$sql .= ' WHERE rowid = '.(int) $this->id;
 		$result = $this->db->query($sql);
 		if ($result)
 		{
 			return 1;
-		} else {
+		}
+		else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -658,11 +711,12 @@ class Tva extends CommonObject
 	 *
 	 *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param	string	$option			link option
-	 *  @param	int  	$notooltip		1=Disable tooltip
-	 *  @param	string	$morecss			More CSS
+     *  @param	int  	$notooltip		1=Disable tooltip
+     *  @param	string	$morecss		More CSS
+	 *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string					Chaine with URL
 	 */
-	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '')
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
 	{
 		global $langs, $conf;
 
@@ -673,24 +727,35 @@ class Tva extends CommonObject
 		$label = '<u>'.$langs->trans("ShowVatPayment").'</u>';
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		if (!empty($this->label))
+			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
 
-		$url = DOL_URL_ROOT.'/compta/tva/card.php?id='.$this->id;
+        $url = DOL_URL_ROOT.'/compta/tva/card.php?id='.$this->id;
 
-		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
-				$label = $langs->trans("ShowMyObject");
-				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-			}
-			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        if ($option != 'nolink')
+        {
+        	// Add param to save lastsearch_values or not
+        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+        }
 
-		$linkstart = '<a href="'.$url.'"';
-		$linkstart .= $linkclose.'>';
-		$linkend = '</a>';
+        $linkclose = '';
+        if (empty($notooltip))
+        {
+        	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+        	{
+        		$label = $langs->trans("ShowMyObject");
+        		$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+        	}
+        	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+        	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+        }
+        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+
+        $linkstart = '<a href="'.$url.'"';
+        $linkstart .= $linkclose.'>';
+        $linkend = '</a>';
 
 		$picto = 'payment';
 
@@ -703,34 +768,35 @@ class Tva extends CommonObject
 	}
 
 	/**
-	 * 	Return amount of payments already done
-	 *
-	 *	@return		int		Amount of payment already done, <0 if KO
-	 */
-	public function getSommePaiement()
-	{
-		$table = 'paiementcharge';
-		$field = 'fk_charge';
+     * 	Return amount of payments already done
+     *
+     *	@return		int		Amount of payment already done, <0 if KO
+     */
+    public function getSommePaiement()
+    {
+        $table = 'payment_vat';
+        $field = 'fk_tva';
 
-		$sql = 'SELECT sum(amount) as amount';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$table;
-		$sql .= ' WHERE '.$field.' = '.$this->id;
+        $sql = 'SELECT sum(amount) as amount';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.$table;
+        $sql .= ' WHERE '.$field.' = '.$this->id;
 
-		dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$amount = 0;
+        dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $amount = 0;
 
-			$obj = $this->db->fetch_object($resql);
-			if ($obj) $amount = $obj->amount ? $obj->amount : 0;
+            $obj = $this->db->fetch_object($resql);
+            if ($obj) $amount = $obj->amount ? $obj->amount : 0;
 
-			$this->db->free($resql);
-			return $amount;
-		} else {
-			return -1;
-		}
-	}
+            $this->db->free($resql);
+            return $amount;
+        }
+        else {
+            return -1;
+        }
+    }
 
 	/**
 	 *	Informations of vat payment object
@@ -772,35 +838,61 @@ class Tva extends CommonObject
 			}
 
 			$this->db->free($result);
-		} else {
+		}
+		else {
 			dol_print_error($this->db);
 		}
 	}
 
 	/**
-	 * Retourne le libelle du statut d'une facture (brouillon, validee, abandonnee, payee)
+	 *  Retourne le libelle du statut d'une TVA (impaye, payee)
 	 *
-	 * @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 * @return  string				Libelle
+	 *  @param	int		$mode       	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
+	 *  @param  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+	 *  @return	string        			Label
 	 */
-	public function getLibStatut($mode = 0)
+	public function getLibStatut($mode = 0, $alreadypaid = -1)
 	{
-		return $this->LibStatut($this->statut, $mode);
+		return $this->LibStatut($this->paye, $mode, $alreadypaid);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * Renvoi le libelle d'un statut donne
+	 *  Renvoi le libelle d'un statut donne
 	 *
-	 * @param   int		$status     Statut
-	 * @param   int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 * @return	string  		    Libelle du statut
+	 *  @param	int		$status        	Id status
+	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
+	 *  @param  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+	 *  @return string        			Label
 	 */
-	public function LibStatut($status, $mode = 0)
+	public function LibStatut($status, $mode = 0, $alreadypaid = -1)
 	{
 		// phpcs:enable
-		global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
+		global $langs;
 
-		return '';
+		// Load translation files required by the page
+		$langs->loadLangs(array("customers", "bills"));
+
+		// We reinit status array to force to redefine them because label may change according to properties values.
+		$this->labelStatus = array();
+		$this->labelStatusShort = array();
+
+		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");
+		}
+
+		$statusType = 'status1';
+		if ($status == 0 && $alreadypaid <> 0) $statusType = 'status3';
+		if ($status == 1) $statusType = 'status6';
+
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
 }
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index 4a16d996ab8..081023cd2e8 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2014      Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,6 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("other", "compta", "banks", "bills", "companies", "product", "trips", "admin"));
 
+$form = new Form($db);
 $now = dol_now();
 $current_date = dol_getdate($now);
 if (empty($conf->global->SOCIETE_FISCAL_MONTH_START)) $conf->global->SOCIETE_FISCAL_MONTH_START = 1;
@@ -57,11 +59,13 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	$q = GETPOST("q", "int");
 	if (empty($q))
 	{
-		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); } else {
+		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); }
+		else {
 			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
 				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
 				$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
-			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
+			}
+			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
 				if ($current_date['mon'] < $conf->global->SOCIETE_FISCAL_MONTH_START) {
 					if (($conf->global->SOCIETE_FISCAL_MONTH_START - $current_date['mon']) > 6) {	// If period started from less than 6 years, we show past year
 						$year_start--;
@@ -73,12 +77,14 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 				}
 				$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
 				$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
-			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
+			}
+			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
 				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -1, 'm');
 				$date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
 			}
 		}
-	} else {
+	}
+	else {
 		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
 		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
 		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -108,100 +114,102 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
  */
 function pt($db, $sql, $date)
 {
-	global $conf, $bc, $langs;
+    global $conf, $bc, $langs, $form;
 
-	$result = $db->query($sql);
-	if ($result) {
-		$num = $db->num_rows($result);
-		$i = 0;
-		$total = 0;
-		print '<table class="noborder centpercent">';
+    $result = $db->query($sql);
+    if ($result) {
+        $num = $db->num_rows($result);
+        $i = 0;
+        $total = 0;
+        print '<table class="noborder centpercent">';
 
-		print '<tr class="liste_titre">';
-		print '<td class="nowrap">'.$date.'</td>';
-		print '<td class="right">'.$langs->trans("ClaimedForThisPeriod").'</td>';
-		print '<td class="right">'.$langs->trans("PaidDuringThisPeriod").'</td>';
-		print "</tr>\n";
+        print '<tr class="liste_titre">';
+        print '<td class="nowrap">'.$date.'</td>';
+        print '<td class="right">'.$langs->trans("ClaimedForThisPeriod").'</td>';
+        print '<td class="right">'.$langs->trans("PaidDuringThisPeriod").$form->textwithpicto('', $langs->trans('PaidDuringThisPeriodDesc'), 1).'</td>';
+        print "</tr>\n";
 
-		$totalclaimed = 0;
-		$totalpaid = 0;
-		$amountclaimed = 0;
-		$amountpaid = 0;
-		$previousmonth = '';
-		$previousmode = '';
-		$mode = '';
+        $totalclaimed = 0;
+        $totalpaid = 0;
+        $amountclaimed = 0;
+        $amountpaid = 0;
+        $previousmonth = '';
+        $previousmode = '';
+        $mode = '';
 
-		while ($i < $num) {
-			$obj = $db->fetch_object($result);
-			$mode = $obj->mode;
+        while ($i < $num) {
+            $obj = $db->fetch_object($result);
+            $mode = $obj->mode;
 
-			//print $obj->dm.' '.$obj->mode.' '.$previousmonth.' '.$previousmode;
-			if ($obj->mode == 'claimed' && !empty($previousmode))
-			{
-				print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$previousmonth."</td>\n";
-				print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
-				print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
-				print "</tr>\n";
+            //print $obj->dm.' '.$obj->mode.' '.$previousmonth.' '.$previousmode;
+            if ($obj->mode == 'claimed' && !empty($previousmode))
+            {
+            	print '<tr class="oddeven">';
+            	print '<td class="nowrap">'.$previousmonth."</td>\n";
+            	print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
+            	print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
+            	print "</tr>\n";
 
-				$amountclaimed = 0;
-				$amountpaid = 0;
-			}
+            	$amountclaimed = 0;
+            	$amountpaid = 0;
+            }
 
-			if ($obj->mode == 'claimed')
-			{
-				$amountclaimed = $obj->mm;
-				$totalclaimed = $totalclaimed + $amountclaimed;
-			}
-			if ($obj->mode == 'paid')
-			{
-				$amountpaid = $obj->mm;
-				$totalpaid = $totalpaid + $amountpaid;
-			}
+            if ($obj->mode == 'claimed')
+            {
+            	$amountclaimed = $obj->mm;
+            	$totalclaimed = $totalclaimed + $amountclaimed;
+            }
+            if ($obj->mode == 'paid')
+            {
+            	$amountpaid = $obj->mm;
+            	$totalpaid = $totalpaid + $amountpaid;
+            }
 
-			if ($obj->mode == 'paid')
-			{
-				print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$obj->dm."</td>\n";
-				print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
-				print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
-				print "</tr>\n";
-				$amountclaimed = 0;
-				$amountpaid = 0;
-				$previousmode = '';
-				$previousmonth = '';
-			} else {
-				$previousmode = $obj->mode;
-				$previousmonth = $obj->dm;
-			}
+            if ($obj->mode == 'paid')
+            {
+            	print '<tr class="oddeven">';
+            	print '<td class="nowrap">'.$obj->dm."</td>\n";
+            	print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
+            	print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
+            	print "</tr>\n";
+            	$amountclaimed = 0;
+            	$amountpaid = 0;
+            	$previousmode = '';
+            	$previousmonth = '';
+            }
+            else {
+            	$previousmode = $obj->mode;
+            	$previousmonth = $obj->dm;
+            }
 
-			$i++;
-		}
+            $i++;
+        }
 
-		if ($mode == 'claimed' && !empty($previousmode))
-		{
-			print '<tr class="oddeven">';
-			print '<td class="nowrap">'.$previousmonth."</td>\n";
-			print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
-			print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
-			print "</tr>\n";
+        if ($mode == 'claimed' && !empty($previousmode))
+        {
+        	print '<tr class="oddeven">';
+        	print '<td class="nowrap">'.$previousmonth."</td>\n";
+        	print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
+        	print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
+        	print "</tr>\n";
 
-			$amountclaimed = 0;
-			$amountpaid = 0;
-		}
+        	$amountclaimed = 0;
+        	$amountpaid = 0;
+        }
 
-		print '<tr class="liste_total">';
-		print '<td class="right">'.$langs->trans("Total").'</td>';
-		print '<td class="nowrap right">'.price($totalclaimed).'</td>';
-		print '<td class="nowrap right">'.price($totalpaid).'</td>';
-		print "</tr>";
+        print '<tr class="liste_total">';
+        print '<td class="right">'.$langs->trans("Total").'</td>';
+        print '<td class="nowrap right">'.price($totalclaimed).'</td>';
+        print '<td class="nowrap right">'.price($totalpaid).'</td>';
+        print "</tr>";
 
-		print "</table>";
+        print "</table>";
 
-		$db->free($result);
-	} else {
-		dol_print_error($db);
-	}
+        $db->free($result);
+    }
+    else {
+        dol_print_error($db);
+    }
 }
 
 
@@ -209,7 +217,6 @@ function pt($db, $sql, $date)
  * View
  */
 
-$form = new Form($db);
 $company_static = new Societe($db);
 $tva = new Tva($db);
 
@@ -362,7 +369,8 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 				'vat'				=>$x_paye[$my_paye_rate]['vat_list'][$id],
 				//'link'				=>$expensereport->getNomUrl(1)
 				);
-			} else {
+			}
+			else {
 				//$invoice_supplier->id=$x_paye[$my_paye_rate]['facid'][$id];
 				//$invoice_supplier->ref=$x_paye[$my_paye_rate]['facnum'][$id];
 				//$invoice_supplier->type=$x_paye[$my_paye_rate]['type'][$id];
@@ -392,144 +400,144 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 	}
 	//now we have an array (x_both) indexed by rates for coll and paye
 
-	$action = "tva";
-	$object = array(&$x_coll, &$x_paye, &$x_both);
-	$parameters["mode"] = $modetax;
-	$parameters["year"] = $y;
-	$parameters["month"] = $m;
-	$parameters["type"] = 'vat';
+    $action = "tva";
+    $object = array(&$x_coll, &$x_paye, &$x_both);
+    $parameters["mode"] = $modetax;
+    $parameters["year"] = $y;
+    $parameters["month"] = $m;
+    $parameters["type"] = 'vat';
 
-	// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
-	$hookmanager->initHooks(array('externalbalance'));
-	$reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+    // Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
+    $hookmanager->initHooks(array('externalbalance'));
+    $reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-	if (!is_array($x_coll) && $coll_listbuy == -1)
-	{
-		$langs->load("errors");
-		print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
-		break;
-	}
-	if (!is_array($x_paye) && $coll_listbuy == -2)
-	{
-		print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-		break;
-	}
+    if (!is_array($x_coll) && $coll_listbuy == -1)
+    {
+        $langs->load("errors");
+        print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
+        break;
+    }
+    if (!is_array($x_paye) && $coll_listbuy == -2)
+    {
+        print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
+        break;
+    }
 
 
-	print '<tr class="oddeven">';
-	print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/tva/quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y").'</a></td>';
+    print '<tr class="oddeven">';
+    print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/tva/quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y").'</a></td>';
 
-	$x_coll_sum = 0;
-	foreach (array_keys($x_coll) as $rate)
-	{
-		$subtot_coll_total_ht = 0;
-		$subtot_coll_vat = 0;
+    $x_coll_sum = 0;
+    foreach (array_keys($x_coll) as $rate)
+    {
+    	$subtot_coll_total_ht = 0;
+    	$subtot_coll_vat = 0;
 
-		foreach ($x_both[$rate]['coll']['detail'] as $index => $fields)
-		{
-			// Payment
-			$ratiopaymentinvoice = 1;
-			if ($modetax != 1)
-			{
-				// Define type
-				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
-				$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
-				// Try to enhance type detection using date_start and date_end for free lines where type
-				// was not saved.
-				if (!empty($fields['ddate_start'])) {
-					$type = 1;
-				}
-				if (!empty($fields['ddate_end'])) {
-					$type = 1;
-				}
+    	foreach ($x_both[$rate]['coll']['detail'] as $index => $fields)
+	    {
+	    	// Payment
+	    	$ratiopaymentinvoice = 1;
+	    	if ($modetax != 1)
+	    	{
+	    		// Define type
+	    		// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+	    		$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+	    		// Try to enhance type detection using date_start and date_end for free lines where type
+	    		// was not saved.
+	    		if (!empty($fields['ddate_start'])) {
+	    			$type = 1;
+	    		}
+	    		if (!empty($fields['ddate_end'])) {
+	    			$type = 1;
+	    		}
 
-				if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-					|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
-				{
-					//print $langs->trans("NA");
-				} else {
-					if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
-						$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
-					}
-				}
-			}
-			//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
-			$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
-			$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
-			$subtot_coll_total_ht += $temp_ht;
-			$subtot_coll_vat      += $temp_vat;
-			$x_coll_sum           += $temp_vat;
-		}
-	}
-	print '<td class="nowrap right">'.price(price2num($x_coll_sum, 'MT')).'</td>';
+	    		if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+	    			|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+	    		{
+	    			//print $langs->trans("NA");
+	    		} else {
+	    			if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+	    				$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+	    			}
+	    		}
+	    	}
+	    	//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+	    	$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+	    	$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
+	    	$subtot_coll_total_ht += $temp_ht;
+	    	$subtot_coll_vat      += $temp_vat;
+	    	$x_coll_sum           += $temp_vat;
+	    }
+    }
+    print '<td class="nowrap right">'.price(price2num($x_coll_sum, 'MT')).'</td>';
 
-	$x_paye_sum = 0;
-	foreach (array_keys($x_paye) as $rate)
-	{
-		$subtot_paye_total_ht = 0;
-		$subtot_paye_vat = 0;
+    $x_paye_sum = 0;
+    foreach (array_keys($x_paye) as $rate)
+    {
+    	$subtot_paye_total_ht = 0;
+    	$subtot_paye_vat = 0;
 
-		foreach ($x_both[$rate]['paye']['detail'] as $index => $fields)
-		{
-			// Payment
-			$ratiopaymentinvoice = 1;
-			if ($modetax != 1)
-			{
-				// Define type
-				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
-				$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
-				// Try to enhance type detection using date_start and date_end for free lines where type
-				// was not saved.
-				if (!empty($fields['ddate_start'])) {
-					$type = 1;
-				}
-				if (!empty($fields['ddate_end'])) {
-					$type = 1;
-				}
+	    foreach ($x_both[$rate]['paye']['detail'] as $index => $fields)
+	    {
+	    	// Payment
+	    	$ratiopaymentinvoice = 1;
+	    	if ($modetax != 1)
+	    	{
+	    		// Define type
+	    		// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+	    		$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+	    		// Try to enhance type detection using date_start and date_end for free lines where type
+	    		// was not saved.
+	    		if (!empty($fields['ddate_start'])) {
+	    			$type = 1;
+	    		}
+	    		if (!empty($fields['ddate_end'])) {
+	    			$type = 1;
+	    		}
 
-				if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-					|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
-				{
-					//print $langs->trans("NA");
-				} else {
-					if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
-						$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
-					}
-				}
-			}
-			//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
-			$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
-			$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
-			$subtot_paye_total_ht += $temp_ht;
-			$subtot_paye_vat      += $temp_vat;
-			$x_paye_sum           += $temp_vat;
-		}
-	}
-	print '<td class="nowrap right">'.price(price2num($x_paye_sum, 'MT')).'</td>';
+	    		if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+	    			|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+	    		{
+	    			//print $langs->trans("NA");
+	    		} else {
+	    			if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+	    				$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+	    			}
+	    		}
+	    	}
+	    	//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+	    	$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+	    	$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
+	    	$subtot_paye_total_ht += $temp_ht;
+	    	$subtot_paye_vat      += $temp_vat;
+	    	$x_paye_sum           += $temp_vat;
+	    }
+    }
+    print '<td class="nowrap right">'.price(price2num($x_paye_sum, 'MT')).'</td>';
 
-	$subtotalcoll = $subtotalcoll + $x_coll_sum;
-	$subtotalpaye = $subtotalpaye + $x_paye_sum;
+    $subtotalcoll = $subtotalcoll + $x_coll_sum;
+    $subtotalpaye = $subtotalpaye + $x_paye_sum;
 
-	$diff = $x_coll_sum - $x_paye_sum;
-	$total = $total + $diff;
-	$subtotal = price2num($subtotal + $diff, 'MT');
+    $diff = $x_coll_sum - $x_paye_sum;
+    $total = $total + $diff;
+    $subtotal = price2num($subtotal + $diff, 'MT');
 
-	print '<td class="nowrap right">'.price(price2num($diff, 'MT')).'</td>'."\n";
-	print "<td>&nbsp;</td>\n";
-	print "</tr>\n";
+    print '<td class="nowrap right">'.price(price2num($diff, 'MT')).'</td>'."\n";
+    print "<td>&nbsp;</td>\n";
+    print "</tr>\n";
 
-	$i++; $m++;
-	if ($i > 2)
-	{
-		print '<tr class="liste_total">';
-		print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.round($m / 3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
-		print '<td class="nowrap right">'.price(price2num($subtotalcoll, 'MT')).'</td>';
-		print '<td class="nowrap right">'.price(price2num($subtotalpaye, 'MT')).'</td>';
-		print '<td class="nowrap right">'.price(price2num($subtotal, 'MT')).'</td>';
-		print '<td>&nbsp;</td></tr>';
-		$i = 0;
-		$subtotalcoll = 0; $subtotalpaye = 0; $subtotal = 0;
-	}
+    $i++; $m++;
+    if ($i > 2)
+    {
+        print '<tr class="liste_total">';
+        print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.round($m / 3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
+        print '<td class="nowrap right">'.price(price2num($subtotalcoll, 'MT')).'</td>';
+        print '<td class="nowrap right">'.price(price2num($subtotalpaye, 'MT')).'</td>';
+        print '<td class="nowrap right">'.price(price2num($subtotal, 'MT')).'</td>';
+        print '<td>&nbsp;</td></tr>';
+        $i = 0;
+        $subtotalcoll = 0; $subtotalpaye = 0; $subtotal = 0;
+    }
 }
 print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("TotalToPay").':</td><td class="nowrap right">'.price(price2num($total, 'MT')).'</td>';
 print "<td>&nbsp;</td>\n";
@@ -543,25 +551,26 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 /*
- * Payed
+ * Paid
  */
 
 print load_fiche_titre($langs->trans("VATPaid"), '', '');
 
 $sql = '';
 
-$sql .= "SELECT SUM(amount) as mm, date_format(f.datev,'%Y-%m') as dm, 'claimed' as mode";
-$sql .= " FROM ".MAIN_DB_PREFIX."tva as f";
-$sql .= " WHERE f.entity = ".$conf->entity;
-$sql .= " AND (f.datev >= '".$db->idate($date_start)."' AND f.datev <= '".$db->idate($date_end)."')";
+$sql .= "SELECT SUM(amount) as mm, date_format(tva.datev,'%Y-%m') as dm, 'claimed' as mode";
+$sql .= " FROM ".MAIN_DB_PREFIX."tva as tva";
+$sql .= " WHERE tva.entity = ".$conf->entity;
+$sql .= " AND (tva.datev >= '".$db->idate($date_start)."' AND tva.datev <= '".$db->idate($date_end)."')";
 $sql .= " GROUP BY dm";
 
 $sql .= " UNION ";
 
-$sql .= "SELECT SUM(amount) as mm, date_format(f.datep,'%Y-%m') as dm, 'paid' as mode";
-$sql .= " FROM ".MAIN_DB_PREFIX."tva as f";
-$sql .= " WHERE f.entity = ".$conf->entity;
-$sql .= " AND (f.datep >= '".$db->idate($date_start)."' AND f.datep <= '".$db->idate($date_end)."')";
+$sql .= "SELECT SUM(ptva.amount) as mm, date_format(tva.datev,'%Y-%m') as dm, 'paid' as mode";
+$sql .= " FROM ".MAIN_DB_PREFIX."tva as tva";
+$sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_vat as ptva ON (tva.rowid = ptva.fk_tva)";
+$sql .= " WHERE tva.entity = ".$conf->entity;
+$sql .= " AND (tva.datev >= '".$db->idate($date_start)."' AND tva.datev <= '".$db->idate($date_end)."')";
 $sql .= " GROUP BY dm";
 
 $sql .= " ORDER BY dm ASC, mode ASC";
@@ -578,37 +587,37 @@ if (!empty($conf->global->MAIN_FEATURES_LEVEL))
      * Recap
      */
 
-	print load_fiche_titre($langs->trans("VATBalance"), '', ''); // need to add translation
+    print load_fiche_titre($langs->trans("VATBalance"), '', ''); // need to add translation
 
-	$sql1 = "SELECT SUM(amount) as mm";
-	$sql1 .= " FROM ".MAIN_DB_PREFIX."tva as f";
-	$sql1 .= " WHERE f.entity = ".$conf->entity;
-	$sql1 .= " AND f.datev >= '".$db->idate($date_start)."'";
-	$sql1 .= " AND f.datev <= '".$db->idate($date_end)."'";
+    $sql1 = "SELECT SUM(amount) as mm";
+    $sql1 .= " FROM ".MAIN_DB_PREFIX."tva as f";
+    $sql1 .= " WHERE f.entity = ".$conf->entity;
+    $sql1 .= " AND f.datev >= '".$db->idate($date_start)."'";
+    $sql1 .= " AND f.datev <= '".$db->idate($date_end)."'";
 
-	$result = $db->query($sql1);
-	if ($result) {
-		$obj = $db->fetch_object($result);
-		print '<table class="noborder centpercent">';
+    $result = $db->query($sql1);
+    if ($result) {
+        $obj = $db->fetch_object($result);
+        print '<table class="noborder centpercent">';
 
-		print "<tr>";
-		print '<td class="right">'.$langs->trans("VATDue").'</td>';
-		print '<td class="nowrap right">'.price(price2num($total, 'MT')).'</td>';
-		print "</tr>\n";
+        print "<tr>";
+        print '<td class="right">'.$langs->trans("VATDue").'</td>';
+        print '<td class="nowrap right">'.price(price2num($total, 'MT')).'</td>';
+        print "</tr>\n";
 
-		print "<tr>";
-		print '<td class="right">'.$langs->trans("VATPaid").'</td>';
-		print '<td class="nowrap right">'.price(price2num($obj->mm, 'MT'))."</td>\n";
-		print "</tr>\n";
+        print "<tr>";
+        print '<td class="right">'.$langs->trans("VATPaid").'</td>';
+        print '<td class="nowrap right">'.price(price2num($obj->mm, 'MT'))."</td>\n";
+        print "</tr>\n";
 
-		$restopay = $total - $obj->mm;
-		print "<tr>";
-		print '<td class="right">'.$langs->trans("RemainToPay").'</td>';
-		print '<td class="nowrap right">'.price(price2num($restopay, 'MT')).'</td>';
-		print "</tr>\n";
+        $restopay = $total - $obj->mm;
+        print "<tr>";
+        print '<td class="right">'.$langs->trans("RemainToPay").'</td>';
+        print '<td class="nowrap right">'.price(price2num($restopay, 'MT')).'</td>';
+        print "</tr>\n";
 
-		print '</table>';
-	}
+        print '</table>';
+    }
 }
 
 print '</div></div>';
diff --git a/htdocs/compta/tva/info.php b/htdocs/compta/tva/info.php
index ddabf6e2b49..45799c8e1f5 100644
--- a/htdocs/compta/tva/info.php
+++ b/htdocs/compta/tva/info.php
@@ -83,6 +83,8 @@ dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0,
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
 
+print '<br>';
+
 print '<table width="100%"><tr><td>';
 dol_print_object_info($object);
 print '</td></tr></table>';
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index a142518279f..dd5118bc656 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2009	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2011-2019	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.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
@@ -57,6 +58,7 @@ $search_type = GETPOST('search_type', 'int');
 $search_cheque = GETPOST('search_cheque', 'alpha');
 $search_account				= GETPOST('search_account', 'int');
 $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');
@@ -75,12 +77,9 @@ $arrayfields = array(
 	't.rowid'			=>array('checked'=>1, 'position'=>10, 'label'=>"Ref",),
 	't.label'			=>array('checked'=>1, 'position'=>20, 'label'=>"Label"),
 	't.datev'			=>array('checked'=>1, 'position'=>30, 'label'=>"PeriodEndDate"),
-	't.datep'			=>array('checked'=>1, 'position'=>40, 'label'=>"DatePayment"),
 	't.fk_typepayment'	=>array('checked'=>1, 'position'=>50, 'label'=>"Type"),
-	't.num_payment'		=>array('checked'=>1, 'position'=>60, 'label'=>"Numero", 'tooltip'=>"ChequeOrTransferNumber"),
-	'transaction'		=>array('checked'=>1, 'position'=>70, 'label'=>"BankTransactionLine", 'enabled'=>(!empty($conf->banque->enabled))),
-	'ba.label'			=>array('checked'=>1, 'position'=>80, 'label'=>"Account", 'enable'=>(!empty($conf->banque->enabled))),
-	't.amount'			=>array('checked'=>1, 'position'=>90, 'label'=>"PayedByThisPayment"),
+	't.amount'			=>array('checked'=>1, 'position'=>90, 'label'=>"Amount"),
+	't.status'			=>array('checked'=>1, 'position'=>90, 'label'=>"Status"),
 );
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -113,6 +112,7 @@ if (empty($reshook)) {
 		$search_cheque = '';
 		$search_account = '';
 		$search_amount = '';
+		$search_status = '';
 	}
 }
 
@@ -128,15 +128,13 @@ $bankstatic = new Account($db);
 $accountingjournal = new AccountingJournal($db);
 $bankline = new AccountLine($db);
 
-llxHeader('', $langs->trans("VATPayments"));
+llxHeader('', $langs->trans("VATDeclarations"));
 
-$sql = 'SELECT t.rowid, t.amount, t.label, t.datev, t.datep, t.fk_typepayment as type, t.num_payment, t.fk_bank';
-$sql .= ', ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel';
-$sql .= ', pst.code as payment_code';
+$sql = 'SELECT t.rowid, t.amount, t.label, t.datev, t.datep, t.paye, t.fk_typepayment as type, t.num_payment, pst.code as payment_code,';
+$sql .= ' SUM(ptva.amount) as alreadypayed';
 $sql .= ' FROM '.MAIN_DB_PREFIX.'tva as t';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as pst ON t.fk_typepayment = pst.id';
-$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
-$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_vat as ptva ON ptva.fk_tva = t.rowid";
 $sql .= ' WHERE t.entity IN ('.getEntity($object->element).')';
 
 if (!empty($search_ref))							$sql .= natural_search('t.rowid', $search_ref);
@@ -146,10 +144,11 @@ if (!empty($search_dateend_end))					$sql .= ' AND t.datev <= "'.$db->idate($sea
 if (!empty($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).'"';
 if (!empty($search_type) && $search_type > 0)		$sql .= ' AND t.fk_typepayment='.$search_type;
-if (!empty($search_cheque))							$sql .= natural_search('t.num_payment', $search_cheque);
 if (!empty($search_account) && $search_account > 0)	$sql .= ' AND b.fk_account='.$search_account;
 if (!empty($search_amount))							$sql .= natural_search('t.amount', price2num(trim($search_amount)), 1);
+if ($search_status != '' && $search_status >= 0) 	$sql .= " AND t.paye = ".$db->escape($search_status);
 
+$sql .= " GROUP BY t.rowid, t.amount, t.label, t.datev, t.datep, t.paye, t.fk_typepayment, t.num_payment, pst.code";
 $sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
@@ -200,6 +199,7 @@ if (!empty($search_type) && $search_type > 0)		$param .= '&search_type='.$search
 if (!empty($search_cheque))							$param .= '&search_cheque="'.$search_cheque.'"';
 if (!empty($search_account) && $search_account > 0)	$param .= '&search_account='.$search_account;
 if (!empty($search_amount))							$param .= '&search_amount="'.$search_amount.'"';
+if ($search_status != '' && $search_status != '-1') $param .= '&search_status='.urlencode($search_status);
 
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -213,7 +213,7 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 $url = DOL_URL_ROOT.'/compta/tva/card.php?action=create';
 if (!empty($socid)) $url .= '&socid='.$socid;
 $newcardbutton = dolGetButtonTitle($langs->trans('NewVATPayment', ($ltt + 1)), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer);
-print_barre_liste($langs->trans("VATPayments"), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
+print_barre_liste($langs->trans("VATDeclarations"), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 $varpage = empty($contextpage) ? $_SERVER['PHP_SELF'] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
@@ -257,7 +257,7 @@ if (!empty($arrayfields['t.datev']['checked'])) {
 }
 
 // Filter: Date payment
-if (!empty($arrayfields['t.datep']['checked'])) {
+/*if (!empty($arrayfields['t.datep']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
 	print $form->selectDate($search_datepayment_start ? $search_datepayment_start : -1, 'search_datepayment_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
@@ -266,7 +266,7 @@ if (!empty($arrayfields['t.datep']['checked'])) {
 	print $form->selectDate($search_datepayment_end ? $search_datepayment_end : -1, 'search_datepayment_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
-}
+}*/
 
 // Filter: Type
 if (!empty($arrayfields['t.fk_typepayment']['checked'])) {
@@ -275,26 +275,6 @@ if (!empty($arrayfields['t.fk_typepayment']['checked'])) {
 	print '</td>';
 }
 
-// Filter: Cheque number
-if (!empty($arrayfields['t.num_payment']['checked'])) {
-	print '<td class="liste_titre left">';
-	print '<input name="search_cheque" class="flat" type="text" size="8" value="'.$search_cheque.'">';
-	print '</td>';
-}
-
-// Filter: Bank transaction number (placeholder)
-if (!empty($arrayfields['transaction']['checked'])) {
-	print '<td class="liste_titre">';
-	print '</td>';
-}
-
-// Filter: Bank account
-if (!empty($arrayfields['ba.label']['checked'])) {
-	print '<td class="liste_titre">';
-	$form->select_comptes($search_account, 'search_account', 0, '', 1);
-	print '</td>';
-}
-
 // Filter: Amount
 if (!empty($arrayfields['t.amount']['checked'])) {
 	print '<td class="liste_titre right">';
@@ -302,6 +282,14 @@ if (!empty($arrayfields['t.amount']['checked'])) {
 	print '</td>';
 }
 
+// Status
+if (!empty($arrayfields['t.status']['checked'])) {
+	print '<td class="liste_titre maxwidthonsmartphone right">';
+	$liststatus = array('0' => $langs->trans("Unpaid"), '1' => $langs->trans("Paid"));
+	print $form->selectarray('search_status', $liststatus, $search_status, 1);
+	print '</td>';
+}
+
 // Fields from hook
 $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
@@ -319,12 +307,9 @@ if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST))	print_liste_field_titr
 if (!empty($arrayfields['t.rowid']['checked']))				print_liste_field_titre($arrayfields['t.rowid']['label'], $_SERVER['PHP_SELF'], 't.rowid', '', $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['t.label']['checked']))				print_liste_field_titre($arrayfields['t.label']['label'], $_SERVER['PHP_SELF'], 't.label', '', $param, 'align="left"', $sortfield, $sortorder);
 if (!empty($arrayfields['t.datev']['checked']))				print_liste_field_titre($arrayfields['t.datev']['label'], $_SERVER['PHP_SELF'], 't.datev', '', $param, 'align="center"', $sortfield, $sortorder);
-if (!empty($arrayfields['t.datep']['checked']))				print_liste_field_titre($arrayfields['t.datep']['label'], $_SERVER['PHP_SELF'], 't.datep', '', $param, 'align="center"', $sortfield, $sortorder);
 if (!empty($arrayfields['t.fk_typepayment']['checked']))	print_liste_field_titre($arrayfields['t.fk_typepayment']['label'], $_SERVER['PHP_SELF'], 't.fk_typepayment', '', $param, '', $sortfield, $sortorder, 'left ');
-if (!empty($arrayfields['t.num_payment']['checked']))		print_liste_field_titre($arrayfields['t.num_payment']['label'], $_SERVER['PHP_SELF'], 't.num_payment', '', $param, '', $sortfield, $sortorder, '', $arrayfields['t.num_payment']['tooltip']);
-if (!empty($arrayfields['transaction']['checked']))			print_liste_field_titre($arrayfields['transaction']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['ba.label']['checked']))			print_liste_field_titre($arrayfields['ba.label']['label'], $_SERVER['PHP_SELF'], 'ba.label', '', $param, '', $sortfield, $sortorder, 'left ');
 if (!empty($arrayfields['t.amount']['checked']))			print_liste_field_titre($arrayfields['t.amount']['label'], $_SERVER['PHP_SELF'], 't.amount', '', $param, '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['t.status']['checked'])) 			print_liste_field_titre($arrayfields['t.status']['label'], $_SERVER["PHP_SELF"], "t.paye", "", $param, 'class="right"', $sortfield, $sortorder);
 
 // Hook fields
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
@@ -341,6 +326,7 @@ while ($i < min($num, $limit)) {
 
 	$tva_static->id = $obj->rowid;
 	$tva_static->ref = $obj->rowid;
+	$tva_static->label = $obj->label;
 
 	print '<tr class="oddeven">';
 
@@ -369,10 +355,10 @@ while ($i < min($num, $limit)) {
 	}
 
 	// Date payment
-	if (!empty($arrayfields['t.datep']['checked'])) {
+	/*if (!empty($arrayfields['t.datep']['checked'])) {
 		print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
 		if (!$i) $totalarray['nbfield']++;
-	}
+	}*/
 
 	// Type
 	if (!empty($arrayfields['t.fk_typepayment']['checked']))
@@ -381,21 +367,8 @@ while ($i < min($num, $limit)) {
 		if (!$i) $totalarray['nbfield']++;
 	}
 
-	// Cheque number
-	if (!empty($arrayfields['t.num_payment']['checked'])) {
-		print '<td>'.$obj->num_payment.'</td>';
-		if (!$i) $totalarray['nbfield']++;
-	}
-
-	// Bank transaction
-	if (!empty($arrayfields['transaction']['checked'])) {
-		$bankline->fetch($obj->fk_bank);
-		print '<td>'.$bankline->getNomUrl(1, 0).'</td>';
-		if (!$i) $totalarray['nbfield']++;
-	}
-
 	// Account
-	if (!empty($arrayfields['ba.label']['checked'])) {
+	/*if (!empty($arrayfields['ba.label']['checked'])) {
 		print '<td>';
 		if ($obj->fk_bank > 0) {
 			$bankstatic->id = $obj->bid;
@@ -411,14 +384,22 @@ while ($i < min($num, $limit)) {
 		}
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
-	}
+	}*/
 
 	// Amount
-	$total = $total + $obj->amount;
-	print '<td class="nowrap right">'.price($obj->amount).'</td>';
-	if (!$i) $totalarray['nbfield']++;
-	$totalarray['pos'][$totalarray['nbfield']] = 'amount';
-	$totalarray['val']['amount'] += $objp->amount;
+	if (!empty($arrayfields['t.amount']['checked'])) {
+		$total = $total + $obj->amount;
+		print '<td class="nowrap right">' . price($obj->amount) . '</td>';
+		if (!$i) $totalarray['nbfield']++;
+		$totalarray['pos'][$totalarray['nbfield']] = 'amount';
+		$totalarray['val']['amount'] += $obj->amount;
+	}
+
+	if (!empty($arrayfields['t.status']['checked'])) {
+		print '<td class="nowrap right">' . $tva_static->LibStatut($obj->paye, 5, $obj->alreadypayed) . '</td>';
+		if (!$i) $totalarray['nbfield']++;
+		if (!empty($arrayfields['t.amount']['checked'])) $totalarray['pos'][$totalarray['nbfield']] = '';
+	}
 
 	// Buttons
 	print '<td></td>';
diff --git a/htdocs/compta/tva/payments.php b/htdocs/compta/tva/payments.php
new file mode 100644
index 00000000000..0cdf7e7086b
--- /dev/null
+++ b/htdocs/compta/tva/payments.php
@@ -0,0 +1,217 @@
+<?php
+/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2011-2016 Alexandre Spangaro   <aspangaro@open-dsi.fr>
+ * Copyright (C) 2011-2014 Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/tva/payments.php
+ *      \ingroup    compta
+ *		\brief      Page to list payments of special expenses
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.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';
+require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('compta', 'bills'));
+
+// Security check
+if ($user->socid) $socid = $user->socid;
+$result = restrictedArea($user, 'tax|salaries', '', '', 'charges|');
+
+$mode = GETPOST("mode", 'alpha');
+$year = GETPOST("year", 'int');
+$filtre = GETPOST("filtre", 'alpha');
+if (!$year && $mode != 'tvaonly') { $year = date("Y", time()); }
+
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortfield) $sortfield = "ptva.datep";
+if (!$sortorder) $sortorder = "DESC";
+
+
+/*
+ * View
+ */
+
+$tva_static = new Tva($db);
+$tva = new Tva($db);
+$payment_vat_static = new PaymentVAT($db);
+$sal_static = new PaymentSalary($db);
+
+llxHeader('', $langs->trans("VATExpensesArea"));
+
+$title = $langs->trans("VATPayments");
+
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+if ($sortfield) $param .= '&sortfield='.$sortfield;
+if ($sortorder) $param .= '&sortorder='.$sortorder;
+
+
+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="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'title_accountancy', 0, '', '', $limit);
+
+if ($year) $param .= '&year='.$year;
+
+if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
+{
+	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "ptva.rowid", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "ptva.datep", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "bank.ref", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("LabelContrib", $_SERVER["PHP_SELF"], "tva.label", "", $param, '', $sortfield, $sortorder);
+	//print_liste_field_titre("TypeContrib", $_SERVER["PHP_SELF"], "tva.fk_type", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "tva.datev", "", $param, 'width="140px"', $sortfield, $sortorder);
+	print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "tva.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "ptva.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+	print "</tr>\n";
+
+	$sql = "SELECT tva.rowid, tva.label as label, b.fk_account";
+	$sql .= ", tva.datev";
+	$sql .= ", tva.amount as total,";
+	$sql .= " ptva.rowid as pid, ptva.datep, ptva.amount as totalpaye, ptva.num_paiement as num_payment,";
+	$sql .= " pct.code as payment_code";
+	$sql .= " FROM ".MAIN_DB_PREFIX."tva as tva,";
+	$sql .= " ".MAIN_DB_PREFIX."payment_vat as ptva";
+	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."bank as b ON (b.rowid = ptva.fk_bank)";
+	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."bank_account as bank ON (bank.rowid = b.fk_account)";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON ptva.fk_typepaiement = pct.id";
+	$sql .= " WHERE ptva.fk_tva = tva.rowid";
+	$sql .= " AND tva.entity = ".$conf->entity;
+	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 .= "   (tva.datev IS NOT NULL AND tva.datev between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
+		$sql .= " OR (tva.datev IS NULL AND tva.datev between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
+		$sql .= ")";
+	}
+	if (preg_match('/^cs\./', $sortfield)
+		|| preg_match('/^tva\./', $sortfield)
+		|| preg_match('/^ptva\./', $sortfield)
+		|| preg_match('/^pct\./', $sortfield)
+		|| preg_match('/^bank\./', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
+	//$sql.= $db->plimit($limit+1,$offset);
+	//print $sql;
+
+	dol_syslog("compta/tva/payments.php: select payment", LOG_DEBUG);
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+		$total = 0;
+		$totalnb = 0;
+		$totalpaye = 0;
+
+		while ($i < min($num, $limit))
+		{
+			$obj = $db->fetch_object($resql);
+
+			$payment_vat_static->id = $obj->pid;
+			$payment_vat_static->ref = $obj->pid;
+
+			print '<tr class="oddeven">';
+			// Ref payment
+			print '<td>'.$payment_vat_static->getNomUrl(1)."</td>\n";
+			// Date payment
+			print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
+	        // Type payment
+    	    print '<td>';
+    	    if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
+    	    print $obj->num_payment.'</td>';
+    	    // Account
+			print '<td>';
+			$account = new Account($db);
+			$account->fetch($obj->fk_account);
+			print $account->getNomUrl(1);
+			print '</td>';
+			// Label
+			print '<td>';
+			$tva->id = $obj->rowid;
+			$tva->ref = $obj->rowid;
+			$tva->label = $obj->label;
+			print $tva->getNomUrl(1, '20');
+			print '</td>';
+			// Type
+			//print '<td><a href="../tva/list.php?filtre=tva.fk_type:'.$obj->type.'">'.$obj->type_label.'</a></td>';
+			// Date
+			$date = $obj->datev;
+			print '<td>'.dol_print_date($date, 'day').'</td>';
+			// Expected to pay
+			print '<td class="right">'.price($obj->total).'</td>';
+			// Paid
+			print '<td class="right">';
+			if ($obj->totalpaye) print price($obj->totalpaye);
+			print '</td>';
+			print '</tr>';
+
+			$total = $total + $obj->total;
+			$totalnb = $totalnb + $obj->nb;
+			$totalpaye = $totalpaye + $obj->totalpaye;
+			$i++;
+		}
+	    print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';
+	    print '<td class="liste_total right"></td>'; // A total here has no sense
+	    //print '<td align="center" class="liste_total">&nbsp;</td>';
+	    print '<td align="center" class="liste_total">&nbsp;</td>';
+		print '<td align="center" class="liste_total">&nbsp;</td>';
+		print '<td align="center" class="liste_total">&nbsp;</td>';
+	    print '<td class="liste_total right">'.price($totalpaye)."</td>";
+		print "</tr>";
+	}
+	else {
+		dol_print_error($db);
+	}
+	print '</table>';
+	print '</div>';
+}
+
+print '</form>';
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 1156e254e52..943c704b17f 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -54,6 +54,8 @@ $mesg = ''; $error = 0; $errors = array();
 $action = (GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view');
 $confirm = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
+$cancel = GETPOST('cancel', 'alpha');
+
 $id = GETPOST('id', 'int');
 $socid = GETPOST('socid', 'int');
 
@@ -200,7 +202,7 @@ if (empty($reshook))
 				}
 			}
 		}
-		$object->email = (string) GETPOST("email", 'alpha');
+		$object->email = (string) GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
 		$object->no_email = GETPOST("no_email", "int");
 		$object->phone_pro = (string) GETPOST("phone_pro", 'alpha');
 		$object->phone_perso = (string) GETPOST("phone_perso", 'alpha');
@@ -225,44 +227,59 @@ if (empty($reshook))
 			$action = 'create';
 		}
 
-		if (!GETPOST("lastname")) {
+		if (!empty($conf->mailing->enabled) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1 && $object->no_email==-1 && !empty($object->email)) {
+			$error++;
+			$errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email"));
+			$action = 'create';
+		}
+
+		if (!empty($object->email) && !isValidEMail($object->email))
+		{
+			$langs->load("errors");
+			$error++;
+			$errors[] = $langs->trans("ErrorBadEMail", GETPOST('email', 'alpha'));
+			$action = 'create';
+		}
+
+		if (empty($object->lastname)) {
 			$error++;
 			$errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Lastname").' / '.$langs->transnoentities("Label"));
 			$action = 'create';
 		}
 
-		if (!$error)
-		{
+		if (empty($error)) {
 			$id = $object->create($user);
-			if ($id <= 0)
-			{
+			if ($id <= 0) {
 				$error++;
 				$errors = array_merge($errors, ($object->error ? array($object->error) : $object->errors));
 				$action = 'create';
-			} else {
-				// Categories association
-				$contcats = GETPOST('contcats', 'array');
-				$object->setCategories($contcats);
+			}
+		}
 
-				// Add mass emailing flag into table mailing_unsubscribe
-				if (GETPOST('no_email', 'int') && $object->email)
-				{
-					$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE entity IN (".getEntity('mailing', 0).") AND email = '".$db->escape($object->email)."'";
-					$resql = $db->query($sql);
-					if ($resql)
-					{
-						$obj = $db->fetch_object($resql);
-						if (empty($obj->nb))
-						{
-							$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_unsubscribe(email, entity, date_creat) VALUES ('".$db->escape($object->email)."', ".$db->escape(getEntity('mailing', 0)).", '".$db->idate(dol_now())."')";
-							$resql = $db->query($sql);
-						}
-					}
+		if (empty($error)) {
+			// Categories association
+			$contcats = GETPOST('contcats', 'array');
+			if (count($contcats)>0) {
+				$result = $object->setCategories($contcats);
+				if ($result <= 0) {
+					$error++;
+					$errors = array_merge($errors, ($object->error ? array($object->error) : $object->errors));
+					$action = 'create';
 				}
 			}
 		}
 
-		if (!$error && $id > 0)
+		if (empty($error) && !empty($conf->mailing->enabled) && !empty($object->email)) {
+			// Add mass emailing flag into table mailing_unsubscribe
+			$result=$object->setNoEmail($object->no_email);
+			if ($result<0) {
+				$error++;
+				$errors = array_merge($errors, ($object->error ? array($object->error) : $object->errors));
+				$action = 'create';
+			}
+		}
+
+		if (empty($error) && $id > 0)
 		{
 			$db->commit();
 			if (!empty($backtopage)) $url = $backtopage;
@@ -296,18 +313,33 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'update' && !$_POST["cancel"] && $user->rights->societe->contact->creer)
+	if ($action == 'update' && empty($cancel) && $user->rights->societe->contact->creer)
 	{
-		if (empty($_POST["lastname"]))
+		if (!GETPOST("lastname", 'alpha'))
 		{
 			$error++; $errors = array($langs->trans("ErrorFieldRequired", $langs->transnoentities("Name").' / '.$langs->transnoentities("Label")));
 			$action = 'edit';
 		}
 
+		if (!empty($conf->mailing->enabled) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1 && GETPOST("no_email", "int")==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
+			$error++;
+			$errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email"));
+			$action = 'edit';
+		}
+
+		if (!empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL)) && !isValidEMail(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL)))
+		{
+			$langs->load("errors");
+			$error++;
+			$errors[] = $langs->trans("ErrorBadEMail", GETPOST('email', 'alpha'));
+			$action = 'edit';
+		}
+
 		if (!$error)
 		{
 			$contactid = GETPOST("contactid", 'int');
 			$object->fetch($contactid);
+			$object->fetchRoles($contactid);
 
 			// Photo save
 			$dir = $conf->societe->multidir_output[$object->entity]."/contact/".$object->id."/photos";
@@ -374,7 +406,7 @@ if (empty($reshook))
 			$object->state_id = GETPOST("state_id", 'int');
 			$object->country_id = GETPOST("country_id", 'int');
 
-			$object->email = (string) GETPOST("email", 'alpha');
+			$object->email = (string) GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
 			$object->no_email = GETPOST("no_email", "int");
 			//$object->jabberid		= GETPOST("jabberid", 'alpha');
 			//$object->skype		= GETPOST("skype", 'alpha');
@@ -396,7 +428,8 @@ if (empty($reshook))
 			$object->priv = (string) GETPOST("priv", 'int');
 			$object->note_public = (string) GETPOST("note_public", 'restricthtml');
 			$object->note_private = (string) GETPOST("note_private", 'restricthtml');
-			$object->roles = GETPOST("roles", 'array');
+
+			$object->roles = GETPOST("roles", 'array');		// Note GETPOSTISSET("role") is null when combo is empty
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
@@ -411,31 +444,15 @@ if (empty($reshook))
 					$categories = GETPOST('contcats', 'array');
 					$object->setCategories($categories);
 
-					$no_email = GETPOST('no_email', 'int');
-
 					// Update mass emailing flag into table mailing_unsubscribe
 					if (GETPOSTISSET('no_email') && $object->email)
 					{
-						if ($no_email)
-						{
-							$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE entity IN (".getEntity('mailing', 0).") AND email = '".$db->escape($object->email)."'";
-							$resql = $db->query($sql);
-							if ($resql)
-							{
-								$obj = $db->fetch_object($resql);
-								$noemail = $obj->nb;
-								if (empty($noemail))
-								{
-									$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_unsubscribe(email, entity, date_creat) VALUES ('".$db->escape($object->email)."', ".$db->escape(getEntity('mailing', 0)).", '".$db->idate(dol_now())."')";
-									$resql = $db->query($sql);
-								}
-							}
-						} else {
-							$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = '".$db->escape($object->email)."' AND entity = ".$db->escape(getEntity('mailing', 0));
-							$resql = $db->query($sql);
+						$no_email = GETPOST('no_email', 'int');
+						$result=$object->setNoEmail($no_email);
+						if ($result<0) {
+							setEventMessages($object->error, $object->errors, 'errors');
+							$action = 'edit';
 						}
-
-						$object->no_email = $no_email;
 					}
 
 					$object->old_lastname = '';
@@ -648,8 +665,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print $formcompany->select_civility(GETPOSTISSET("civility_code") ? GETPOST("civility_code", 'alpha') : $object->civility_code, 'civility_code');
 			print '</td></tr>';
 
+			// Job position
 			print '<tr><td><label for="title">'.$langs->trans("PostOrFunction").'</label></td>';
-			print '<td colspan="3"><input name="poste" id="title" type="text" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOST("poste", 'alpha') ?GETPOST("poste", 'alpha') : $object->poste).'"></td>';
+			print '<td colspan="3"><input name="poste" id="title" type="text" class="minwidth100" maxlength="255" value="'.dol_escape_htmltag(GETPOSTISSET("poste") ?GETPOST("poste", 'alphanohtml') : $object->poste).'"></td>';
 
 			$colspan = 3;
 			if ($conf->use_javascript_ajax && $socid > 0) $colspan = 2;
@@ -738,27 +756,36 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<input type="text" name="email" id="email" value="'.(GETPOSTISSET('email') ? GETPOST('email', 'alpha') : $object->email).'"></td>';
 			print '</tr>';
 
+			//Unsubscribe
 			if (!empty($conf->mailing->enabled))
 			{
-				$noemail = '';
-				if (empty($noemail) && !empty($object->email))
+				if ($conf->use_javascript_ajax && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1)
 				{
-					$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE entity IN (".getEntity('mailing').") AND email = '".$db->escape($object->email)."'";
-					//print $sql;
-					$resql = $db->query($sql);
-					if ($resql)
-					{
-						$obj = $db->fetch_object($resql);
-						$noemail = $obj->nb;
+					print "\n".'<script type="text/javascript" language="javascript">'."\n";
+					print '$(document).ready(function () {
+							$("#email").keyup(function() {
+								if ($(this).val()!="") {
+									$(".noemail").addClass("fieldrequired");
+								} else {
+									$(".noemail").removeClass("fieldrequired");
+								}
+							});
+						})'."\n";
+					print '</script>'."\n";
+				}
+				if (!GETPOSTISSET("no_email") && !empty($object->email))
+				{
+					$result=$object->getNoEmail();
+					if ($result<0) {
+						setEventMessages($object->error, $object->errors, 'errors');
 					}
 				}
-
 				print '<tr>';
-				print '<td><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
-				print '<td>'.$form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOST("no_email", 'alpha') : $noemail), 1).'</td>';
+				print '<td class="noemail"><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
+				print '<td>'.$form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOST("no_email", 'int') : $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS), 1, false, ($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1)).'</td>';
 				print '</tr>';
 			}
-			print '</tr>';
+
 
 			if (!empty($conf->socialnetworks->enabled)) {
 				foreach ($socialnetworks as $key => $value) {
@@ -774,39 +801,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 					}
 				}
 			}
-			// if (! empty($conf->socialnetworks->enabled))
-			// {
-			// 	// Jabber
-			// 	if (! empty($conf->global->SOCIALNETWORKS_JABBER))
-			// 	{
-			// 		print '<tr><td><label for="skype">'.$form->editfieldkey('Jabber', 'jabberid', '', $object, 0).'</label></td>';
-			// 		print '<td colspan="3"><input type="text" name="jabberid" id="jabberid" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("jabberid")?GETPOST("jabberid", 'alpha'):$object->jabberid).'"></td></tr>';
-			// 	}
-			// 	// Skype
-			// 	if (! empty($conf->global->SOCIALNETWORKS_SKYPE))
-			// 	{
-			// 		print '<tr><td><label for="skype">'.$form->editfieldkey('Skype', 'skype', '', $object, 0).'</label></td>';
-			// 		print '<td colspan="3"><input type="text" name="skype" id="skype" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("skype")?GETPOST("skype", 'alpha'):$object->skype).'"></td></tr>';
-			// 	}
-			// 	// Twitter
-			// 	if (! empty($conf->global->SOCIALNETWORKS_TWITTER))
-			// 	{
-			// 		print '<tr><td><label for="twitter">'.$form->editfieldkey('Twitter', 'twitter', '', $object, 0).'</label></td>';
-			// 		print '<td colspan="3"><input type="text" name="twitter" id="twitter" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("twitter")?GETPOST("twitter", 'alpha'):$object->twitter).'"></td></tr>';
-			// 	}
-			// 	// Facebook
-			// 	if (! empty($conf->global->SOCIALNETWORKS_FACEBOOK))
-			// 	{
-			// 		print '<tr><td><label for="facebook">'.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).'</label></td>';
-			// 		print '<td colspan="3"><input type="text" name="facebook" id="facebook" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("facebook")?GETPOST("facebook", 'alpha'):$object->facebook).'"></td></tr>';
-			// 	}
-			//     // LinkedIn
-			//     if (! empty($conf->global->SOCIALNETWORKS_LINKEDIN))
-			//     {
-			//         print '<tr><td><label for="linkedin">'.$form->editfieldkey('LinkedIn', 'linkedin', '', $object, 0).'</label></td>';
-			//         print '<td colspan="3"><input type="text" name="linkedin" id="linkedin" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("linkedin")?GETPOST("linkedin", 'alpha'):$object->linkedin).'"></td></tr>';
-			//     }
-			// }
 
 			// Visibility
 			print '<tr><td><label for="priv">'.$langs->trans("ContactVisibility").'</label></td><td colspan="3">';
@@ -975,8 +969,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print $formcompany->select_civility(GETPOSTISSET("civility_code") ? GETPOST("civility_code", "aZ09") : $object->civility_code, 'civility_code');
 			print '</td></tr>';
 
+			// Job position
 			print '<tr><td><label for="title">'.$langs->trans("PostOrFunction").'</label></td>';
-			print '<td colspan="3"><input name="poste" id="title" type="text" class="minwidth100" maxlength="80" value="'.(GETPOSTISSET("poste") ? GETPOST("poste") : $object->poste).'"></td></tr>';
+			print '<td colspan="3"><input name="poste" id="title" type="text" class="minwidth100" maxlength="255" value="'.dol_escape_htmltag(GETPOSTISSET("poste") ? GETPOST("poste", 'alphanohtml') : $object->poste).'"></td></tr>';
 
 			// Address
 			print '<tr><td><label for="address">'.$langs->trans("Address").'</label></td>';
@@ -1050,28 +1045,40 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '</tr>';
 
 			// Unsubscribe
-			print '<tr>';
 			if (!empty($conf->mailing->enabled))
 			{
-				$noemail = '';
-				if (empty($noemail) && !empty($object->email))
+				if ($conf->use_javascript_ajax && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1)
 				{
-					$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE entity IN (".getEntity('mailing').") AND email = '".$db->escape($object->email)."'";
-					//print $sql;
-					$resql = $db->query($sql);
-					if ($resql)
-					{
-						$obj = $db->fetch_object($resql);
-						$noemail = $obj->nb;
+					print "\n".'<script type="text/javascript" language="javascript">'."\n";
+
+					print '
+					jQuery(document).ready(function () {
+						function init_check_no_email(input) {
+							if (input.val()!="") {
+								$(".noemail").addClass("fieldrequired");
+							} else {
+								$(".noemail").removeClass("fieldrequired");
+							}
+						}
+						$("#email").keyup(function() {
+							init_check_no_email($(this));
+						});
+						init_check_no_email($("#email"));
+					})'."\n";
+					print '</script>'."\n";
+				}
+				if (!GETPOSTISSET("no_email") && !empty($object->email))
+				{
+					$result=$object->getNoEmail();
+					if ($result<0) {
+						setEventMessages($object->error, $object->errors, 'errors');
 					}
 				}
-
-				print '<td><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
-				print '<td>'.$form->selectyesno('no_email', (GETPOSTISSET("no_email") ?GETPOST("no_email", 'alpha') : $noemail), 1).'</td>';
-			} else {
-				print '<td colspan="2"></td>';
+				print '<tr>';
+				print '<td class="noemail"><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
+				print '<td>'.$form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOST("no_email", 'int') : $object->no_email), 1, false, ($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1)).'</td>';
+				print '</tr>';
 			}
-			print '</tr>';
 
 			if (!empty($conf->socialnetworks->enabled)) {
 				foreach ($socialnetworks as $key => $value) {
@@ -1300,20 +1307,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		// Unsubscribe opt-out
 		if (!empty($conf->mailing->enabled))
 		{
-			//print 'eee'.$object->email;
-			$noemail = $object->no_email;
-			if (empty($noemail) && !empty($object->email))
-			{
-				$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE entity IN (".getEntity('mailing').") AND email = '".$db->escape($object->email)."'";
-				//print $sql;
-				$resql = $db->query($sql);
-				if ($resql)
-				{
-					$obj = $db->fetch_object($resql);
-					$noemail = $obj->nb;
-				}
+			$result=$object->getNoEmail();
+			if ($result<0) {
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
-			print '<tr><td>'.$langs->trans("No_Email").'</td><td>'.yn($noemail).'</td></tr>';
+			print '<tr><td>'.$langs->trans("No_Email").'</td><td>'.yn($object->no_email).'</td></tr>';
 		}
 
 		print '<tr><td>'.$langs->trans("ContactVisibility").'</td><td>';
@@ -1382,7 +1380,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		if (!empty($object->socid)) {
 			print '<tr><td class="titlefield">'.$langs->trans("ContactByDefaultFor").'</td>';
 			print '<td colspan="3">';
-			print $formcompany->showRoles("roles", $object, 'view');
+			print $formcompany->showRoles("roles", $object, 'view', $object->roles);
 			print '</td></tr>';
 		}
 
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 8fe4943d267..94eb700ab92 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -145,14 +145,32 @@ class Contact extends CommonObject
 	 */
 	public $town;
 
-	public $state_id; // Id of department
-	public $state_code; // Code of department
-	public $state; // Label of department
+	/**
+	 * @var int // Id of department
+	 */
+	public $state_id;
+
+	/**
+	 * @var string // Code of department
+	 */
+	public $state_code;
+
+	/**
+	 * @var string // Label of department
+	 */
+	public $state;
 
 	public $poste; // Position
 
-	public $socid; // fk_soc
-	public $statut; // 0=inactif, 1=actif
+	/**
+	 * @var int Thirdparty ID
+	 */
+	public $socid;
+
+	/**
+	 * @var int 0=inactive, 1=active
+	 */
+	public $statut;
 
 	public $code;
 
@@ -247,7 +265,14 @@ class Contact extends CommonObject
 	public $ref_commande; // Nb de reference commande pour lequel il est contact
 	public $ref_propal; // Nb de reference propal pour lequel il est contact
 
+	/**
+	 * @var int user ID
+	 */
 	public $user_id;
+
+	/**
+	 * @var string user login
+	 */
 	public $user_login;
 
 	// END MODULEBUILDER PROPERTIES
@@ -259,12 +284,19 @@ class Contact extends CommonObject
 	 */
 	public $oldcopy; // To contains a clone of this when we need to save old properties of object
 
-	public $roles = array();
+	/**
+	 * @var array roles
+	 */
+	public $roles;
 
 	public $cacheprospectstatus = array();
 	public $fk_prospectlevel;
 	public $stcomm_id;
 	public $statut_commercial;
+
+	/**
+	 * @var string picto
+	 */
 	public $stcomm_picto;
 
 	/**
@@ -335,8 +367,7 @@ 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 (!$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 = ".$user->id;
@@ -344,13 +375,13 @@ class Contact extends CommonObject
 		}
 		$sql .= ' '.$clause.' sp.entity IN ('.getEntity($this->element).')';
 		$sql .= " AND (sp.priv='0' OR (sp.priv='1' AND sp.fk_user_creat=".$user->id."))";
-		if ($user->socid > 0) $sql .= " AND sp.fk_soc = ".$user->socid;
+		if ($user->socid > 0) {
+			$sql .= " AND sp.fk_soc = ".$user->socid;
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->nb["contacts"] = $obj->nb;
 			}
 			$this->db->free($resql);
@@ -402,8 +433,11 @@ class Contact extends CommonObject
 		$sql .= ", import_key";
 		$sql .= ") VALUES (";
 		$sql .= "'".$this->db->idate($now)."',";
-		if ($this->socid > 0) $sql .= " ".$this->db->escape($this->socid).",";
-		else $sql .= "null,";
+		if ($this->socid > 0) {
+			$sql .= " ".$this->db->escape($this->socid).",";
+		} else {
+			$sql .= "null,";
+		}
 		$sql .= "'".$this->db->escape($this->lastname)."',";
 		$sql .= "'".$this->db->escape($this->firstname)."',";
 		$sql .= " ".($user->id > 0 ? "'".$this->db->escape($user->id)."'" : "null").",";
@@ -721,8 +755,7 @@ class Contact extends CommonObject
 		if ($this->firstname && !empty($conf->global->LDAP_CONTACT_FIELD_FIRSTNAME)) $info[$conf->global->LDAP_CONTACT_FIELD_FIRSTNAME] = $this->firstname;
 
 		if ($this->poste) $info["title"] = $this->poste;
-		if ($this->socid > 0)
-		{
+		if ($this->socid > 0) {
 			$soc = new Societe($this->db);
 			$soc->fetch($this->socid);
 
@@ -757,8 +790,7 @@ class Contact extends CommonObject
 			$info["phpgwContactCatId"] = 0;
 			$info["phpgwContactAccess"] = "public";
 
-			if (dol_strlen($this->egroupware_id) == 0)
-			{
+			if (dol_strlen($this->egroupware_id) == 0) {
 				$this->egroupware_id = 1;
 			}
 
@@ -856,7 +888,7 @@ class Contact extends CommonObject
 	 *  @param      User	$user       	Load also alerts of this user (subscribing to alerts) that want alerts about this contact
 	 *  @param      string  $ref_ext    	External reference, not given by Dolibarr
 	 *  @param		string	$email			Email
-	 *  @param		int		$loadalsoroles	Load also roles
+	 *  @param		int		$loadalsoroles	Load also roles. Try to always 0 here and load roles with a separate call of fetchRoles().
 	 *  @return     int     		    	>0 if OK, <0 if KO or if two records found for same ref or idprof, 0 if not found.
 	 */
 	public function fetch($id, $user = null, $ref_ext = '', $email = '', $loadalsoroles = 0)
@@ -1180,6 +1212,20 @@ class Contact extends CommonObject
 			}
 		}
 
+		if (!$error)
+		{
+			// Remove Roles
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_contacts WHERE fk_socpeople = ".$this->id;
+			dol_syslog(__METHOD__, LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$error++;
+				$this->error .= $this->db->lasterror();
+				$errorflag = -1;
+			}
+		}
+
 		if (!$error)
 		{
 			// Remove category
@@ -1601,10 +1647,11 @@ class Contact extends CommonObject
 	}
 
 	/**
-	 * Fetch Roles for a contact
+	 * Fetch roles (default contact of some companies) for the current contact.
+	 * This load the array ->roles.
 	 *
-	 * @return float|int
-	 * @throws Exception
+	 * @return 	int			<0 if KO, Nb of roles found if OK
+	 * @see updateRoles()
 	 */
 	public function fetchRoles()
 	{
@@ -1612,25 +1659,23 @@ class Contact extends CommonObject
 		$error = 0;
 		$num = 0;
 
-		$sql = "SELECT tc.rowid, tc.element, tc.source, tc.code, tc.libelle, sc.rowid as contactroleid";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe_contacts as sc";
-		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."c_type_contact as tc";
-		$sql .= " ON tc.rowid = sc.fk_c_type_contact";
-		$sql .= " AND sc.fk_socpeople = ".$this->id;
+		$sql = "SELECT tc.rowid, tc.element, tc.source, tc.code, tc.libelle as label, sc.rowid as contactroleid, sc.fk_soc as socid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_contacts as sc, ".MAIN_DB_PREFIX."c_type_contact as tc";
+		$sql .= " WHERE tc.rowid = sc.fk_c_type_contact";
 		$sql .= " AND tc.source = 'external' AND tc.active=1";
+		$sql .= " AND sc.fk_socpeople = ".$this->id;
 		$sql .= " AND sc.entity IN (".getEntity('societe').')';
 
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$this->roles = array();
 		$resql = $this->db->query($sql);
 		if ($resql) {
+			$this->roles = array();
+
 			$num = $this->db->num_rows($resql);
 			if ($num > 0) {
 				while ($obj = $this->db->fetch_object($resql)) {
 					$transkey = "TypeContact_".$obj->element."_".$obj->source."_".$obj->code;
 					$libelle_element = $langs->trans('ContactDefault_'.$obj->element);
-					$this->roles[$obj->contactroleid] = array('id'=>$obj->rowid, 'element'=>$obj->element, 'source'=>$obj->source, 'code'=>$obj->code, 'label'=>$libelle_element.' - '.($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle));
+					$this->roles[$obj->contactroleid] = array('id'=>$obj->rowid, 'socid'=>$obj->socid, 'element'=>$obj->element, 'source'=>$obj->source, 'code'=>$obj->code, 'label'=>$libelle_element.' - '.($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->label));
 				}
 			}
 		} else {
@@ -1692,10 +1737,11 @@ class Contact extends CommonObject
 	}
 
 	/**
-	 * Updates Roles
+	 * Updates all roles (default contact for companies) according to values inside the ->roles array.
+	 * This is called by update of contact.
 	 *
 	 * @return float|int
-	 * @throws Exception
+	 * @see fetchRoles()
 	 */
 	public function updateRoles()
 	{
@@ -1703,11 +1749,12 @@ class Contact extends CommonObject
 
 		$error = 0;
 
+		if (!isset($this->roles)) return;	// Avoid to loose roles when property not set
+
 		$this->db->begin();
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_contacts WHERE fk_soc=".$this->socid." AND fk_socpeople=".$this->id; ;
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_contacts WHERE fk_socpeople=".$this->id." AND entity IN (".getEntity("societe_contact").")";
 
-		dol_syslog(__METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if (!$result) {
 			$this->errors[] = $this->db->lasterror().' sql='.$sql;
@@ -1715,25 +1762,40 @@ class Contact extends CommonObject
 		} else {
 			if (count($this->roles) > 0) {
 				foreach ($this->roles as $keyRoles => $valRoles) {
-					$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_contacts";
-					$sql .= " (entity,";
-					$sql .= "date_creation,";
-					$sql .= "fk_soc,";
-					$sql .= "fk_c_type_contact,";
-					$sql .= "fk_socpeople) ";
-					$sql .= " VALUES (".$conf->entity.",";
-					$sql .= "'".$this->db->idate(dol_now())."',";
-					$sql .= $this->socid.", ";
-					$sql .= $valRoles." , ";
-					$sql .= $this->id;
-					$sql .= ")";
-					dol_syslog(__METHOD__, LOG_DEBUG);
+					$idrole = 0;
+					if (is_array($valRoles)) {
+						$idrole = $valRoles['id'];
+					} else {
+						$idrole = $valRoles;
+					}
 
-					$result = $this->db->query($sql);
-					if (!$result)
-					{
-						$this->errors[] = $this->db->lasterror().' sql='.$sql;
-						$error++;
+					$socid = 0;
+					if (is_array($valRoles)) {
+						$socid = $valRoles['socid'];
+					} else {
+						$socid = $this->socid;
+					}
+
+					if ($socid > 0) {
+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_contacts";
+						$sql .= " (entity,";
+						$sql .= "date_creation,";
+						$sql .= "fk_soc,";
+						$sql .= "fk_c_type_contact,";
+						$sql .= "fk_socpeople) ";
+						$sql .= " VALUES (".$conf->entity.",";
+						$sql .= "'".$this->db->idate(dol_now())."',";
+						$sql .= $socid.", ";
+						$sql .= $idrole." , ";
+						$sql .= $this->id;
+						$sql .= ")";
+
+						$result = $this->db->query($sql);
+						if (!$result)
+						{
+							$this->errors[] = $this->db->lasterror().' sql='.$sql;
+							$error++;
+						}
 					}
 				}
 			}
@@ -1880,4 +1942,93 @@ class Contact extends CommonObject
 
 		return "Error, mode/status not found";
 	}
+
+
+	/**
+	 *  Set "blacklist" mailing status
+	 *
+	 *  @param	int		$no_email	1=Do not send mailing, 0=Ok to recieve mailling
+	 *  @return int					<0 if KO, >0 if OK
+	 */
+	public function setNoEmail($no_email)
+	{
+		$error = 0;
+
+		// Update mass emailing flag into table mailing_unsubscribe
+		if ($this->email)
+		{
+			$this->db->begin();
+
+			if ($no_email)
+			{
+				$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE entity IN (".getEntity('mailing', 0).") AND email = '".$this->db->escape($this->email)."'";
+				$resql = $this->db->query($sql);
+				if ($resql)
+				{
+					$obj = $this->db->fetch_object($resql);
+					$noemail = $obj->nb;
+					if (empty($noemail))
+					{
+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_unsubscribe(email, entity, date_creat) VALUES ('".$this->db->escape($this->email)."', ".$this->db->escape(getEntity('mailing', 0)).", '".$this->db->idate(dol_now())."')";
+						$resql = $this->db->query($sql);
+						if (!$resql)
+						{
+							$error++;
+							$this->error = $this->db->lasterror();
+							$this->errors[] = $this->error;
+						}
+					}
+				} else {
+					$error++;
+					$this->error = $this->db->lasterror();
+					$this->errors[] = $this->error;
+				}
+			} else {
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = '".$this->db->escape($this->email)."' AND entity = ".$this->db->escape(getEntity('mailing', 0));
+				$resql = $this->db->query($sql);
+				if (!$resql)
+				{
+					$error++;
+					$this->error = $this->db->lasterror();
+					$this->errors[] = $this->error;
+				}
+			}
+
+			if (empty($error)) {
+				$this->no_email = $no_email;
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->db->rollback();
+				return $error * -1;
+			}
+		}
+
+		return 0;
+	}
+
+	/**
+	 *  get "blacklist" mailing status
+	 * 	set no_email attribut to 1 or 0
+	 *
+	 *  @return int					<0 if KO, >0 if OK
+	 */
+	public function getNoEmail()
+	{
+		if ($this->email)
+		{
+			$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE entity IN (".getEntity('mailing').") AND email = '".$this->db->escape($this->email)."'";
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$obj = $this->db->fetch_object($resql);
+				$this->no_email = $obj->nb;
+				return 1;
+			} else {
+				$this->error = $this->db->lasterror();
+				$this->errors[] = $this->error;
+				return -1;
+			}
+		}
+		return 0;
+	}
 }
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 8d6b11e19f0..c33867fed7f 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -933,31 +933,31 @@ while ($i < min($num, $limit))
 	// Phone
 	if (!empty($arrayfields['p.phone']['checked']))
 	{
-		print '<td>'.dol_print_phone($obj->phone_pro, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL').'</td>';
+		print '<td>'.dol_print_phone($obj->phone_pro, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'phone').'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Phone perso
 	if (!empty($arrayfields['p.phone_perso']['checked']))
 	{
-		print '<td>'.dol_print_phone($obj->phone_perso, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL').'</td>';
+		print '<td>'.dol_print_phone($obj->phone_perso, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'phone').'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Phone mobile
 	if (!empty($arrayfields['p.phone_mobile']['checked']))
 	{
-		print '<td>'.dol_print_phone($obj->phone_mobile, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL').'</td>';
+		print '<td>'.dol_print_phone($obj->phone_mobile, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'mobile').'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Fax
 	if (!empty($arrayfields['p.fax']['checked']))
 	{
-		print '<td>'.dol_print_phone($obj->fax, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL').'</td>';
+		print '<td>'.dol_print_phone($obj->fax, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'fax').'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// EMail
 	if (!empty($arrayfields['p.email']['checked']))
 	{
-		print '<td>'.dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 18).'</td>';
+		print '<td>'.dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 18, 0, 1).'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// No EMail
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 678ed9bbbd6..8d78b410329 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -213,7 +213,7 @@ if (empty($reshook))
 			$object->note_private = GETPOST('note_private', 'alpha');
 			$object->note_public				= GETPOST('note_public', 'alpha');
 			$object->fk_project					= GETPOST('projectid', 'int');
-			$object->remise_percent = GETPOST('remise_percent', 'alpha');
+			$object->remise_percent = price2num(GETPOST('remise_percent'), 2);
 			$object->ref = GETPOST('ref', 'alpha');
 			$object->ref_customer				= GETPOST('ref_customer', 'alpha');
 			$object->ref_supplier				= GETPOST('ref_supplier', 'alpha');
@@ -385,7 +385,7 @@ if (empty($reshook))
 		$predef = '';
 		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$price_ht = price2num(GETPOST('price_ht'), 'MU');
-		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht', 'CR'));
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht', 'CU'));
 		if (GETPOST('prod_entry_mode', 'alpha') == 'free')
 		{
 			$idprod = 0;
@@ -395,8 +395,8 @@ if (empty($reshook))
 			$tva_tx = '';
 		}
 
-		$qty = price2num(GETPOST('qty'.$predef), 'alpha');
-		$remise_percent = ((GETPOST('remise_percent'.$predef) != '') ? GETPOST('remise_percent'.$predef) : 0);
+		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
+		$remise_percent = (GETPOSTISSET('remise_percent'.$predef) ? price2num(GETPOST('remise_percent'.$predef), 2) : 0);
 
 		if ($qty == '')
 		{
@@ -499,6 +499,12 @@ 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 (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) $desc = $product_desc;
 				else $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 
@@ -667,10 +673,10 @@ if (empty($reshook))
 
 			$objectline->fk_product = GETPOST('idprod', 'int');
 			$objectline->description = GETPOST('product_desc', 'restricthtml');
-			$objectline->price_ht = GETPOST('elprice');
-			$objectline->subprice = GETPOST('elprice');
-			$objectline->qty = GETPOST('elqty');
-			$objectline->remise_percent = GETPOST('elremise_percent');
+			$objectline->price_ht = price2num(GETPOST('elprice'), 'MU');
+			$objectline->subprice = price2num(GETPOST('elprice'), 'MU');
+			$objectline->qty = price2num(GETPOST('elqty'), 'MS');
+			$objectline->remise_percent = price2num(GETPOST('elremise_percent'), 2);
 			$objectline->tva_tx = ($txtva ? $txtva : 0); // Field may be disabled, so we use vat rate 0
 			$objectline->vat_src_code = $vat_src_code;
 			$objectline->localtax1_tx = is_numeric($localtax1_tx) ? $localtax1_tx : 0;
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 72a8ec2974d..1226d578f2f 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -33,6 +33,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 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.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
@@ -175,6 +176,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$sall = "";
 	$search_status = "";
 	$toselect = '';
+	$search_type_thirdparty = '';
 	$search_array_options = array();
 }
 
@@ -198,6 +200,7 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $formother = new FormOther($db);
 $socstatic = new Societe($db);
+$formcompany = new FormCompany($db);
 $contracttmp = new Contrat($db);
 
 $sql = 'SELECT';
@@ -235,6 +238,7 @@ if ($search_user > 0)
 }
 $sql .= " WHERE c.fk_soc = s.rowid ";
 $sql .= ' AND c.entity IN ('.getEntity('contract').')';
+if ($search_type_thirdparty != '' && $search_type_thirdparty > 0)	$sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';
 if ($search_product_category > 0) $sql .= " AND cp.fk_categorie = ".$search_product_category;
 if ($socid) $sql .= " AND s.rowid = ".$db->escape($socid);
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -275,7 +279,6 @@ if ($search_dfyear > 0 && $search_op2df)
 	else $sql .= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") <= '".$db->idate(dol_get_last_day($search_dfyear, $search_dfmonth, false))."' AND MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") >= '".$db->idate(dol_get_first_day($search_dfyear, $search_dfmonth, false))."'";
 }
 $sql .= $db->order($sortfield, $sortorder);
-//print $sql;
 
 $totalnboflines = 0;
 $result = $db->query($sql);
@@ -347,6 +350,7 @@ if ($search_dfyear != '')       $param .= '&search_dfyear='.urlencode($search_df
 if ($search_dfmonth != '')      $param .= '&search_dfmonth='.urlencode($search_dfmonth);
 if ($search_sale != '')         $param .= '&search_sale='.urlencode($search_sale);
 if ($search_user != '')			$param .= '&search_user='.urlencode($search_user);
+if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) $param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
 if ($search_product_category != '')	$param .= '&search_product_category='.urlencode($search_product_category);
 if ($show_files)                $param .= '&show_files='.urlencode($show_files);
 if ($optioncss != '')           $param .= '&optioncss='.urlencode($optioncss);
@@ -492,7 +496,7 @@ if (!empty($arrayfields['country.code_iso']['checked']))
 if (!empty($arrayfields['typent.code']['checked']))
 {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
-	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
+	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT),  '', 1);
 	print '</td>';
 }
 if (!empty($arrayfields['sale_representative']['checked']))
@@ -658,7 +662,7 @@ while ($i < min($num, $limit))
 	}
 	if (!empty($arrayfields['s.nom']['checked']))
 	{
-		print '<td>';
+		print '<td class="tdoverflowmax150">';
 		if ($obj->socid > 0) {
 			// TODO Use a cache for this string
 			print $socstatic->getNomUrl(1, '');
@@ -717,15 +721,13 @@ while ($i < min($num, $limit))
 			$listsalesrepresentatives = $socstatic->getSalesRepresentatives($user);
 			if ($listsalesrepresentatives < 0) dol_print_error($db);
 			$nbofsalesrepresentative = count($listsalesrepresentatives);
-			if ($nbofsalesrepresentative > 3) {
+			if ($nbofsalesrepresentative > 6) {
 				// We print only number
 				print $nbofsalesrepresentative;
-			} elseif ($nbofsalesrepresentative > 0)
-			{
+			} elseif ($nbofsalesrepresentative > 0) {
 				$userstatic = new User($db);
 				$j = 0;
-				foreach ($listsalesrepresentatives as $val)
-				{
+				foreach ($listsalesrepresentatives as $val) {
 					$userstatic->id = $val['id'];
 					$userstatic->lastname = $val['lastname'];
 					$userstatic->firstname = $val['firstname'];
@@ -733,17 +735,23 @@ while ($i < min($num, $limit))
 					$userstatic->statut = $val['statut'];
 					$userstatic->entity = $val['entity'];
 					$userstatic->photo = $val['photo'];
+					$userstatic->login = $val['login'];
+					$userstatic->phone = $val['phone'];
+					$userstatic->job = $val['job'];
+					$userstatic->gender = $val['gender'];
 
 					//print '<div class="float">':
-					print $userstatic->getNomUrl(-2);
+					print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);
 					$j++;
-					if ($j < $nbofsalesrepresentative) print ' ';
+					if ($j < $nbofsalesrepresentative) {
+						print ' ';
+					}
 					//print '</div>';
 				}
 			}
 			//else print $langs->trans("NoSalesRepresentativeAffected");
 		} else {
-			print '&nbsp';
+			print '&nbsp;';
 		}
 		print '</td>';
 	}
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 81cc4d81bd4..95c5037c5fb 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -304,7 +304,7 @@ if (!$error && $massaction == 'confirm_presend')
 				if ($_POST['addmaindocfile'])
 				{
 					// TODO Use future field $objectobj->fullpathdoc to know where is stored default file
-					// TODO If not defined, use $objectobj->modelpdf (or defaut invoice config) to know what is template to use to regenerate doc.
+					// TODO If not defined, use $objectobj->model_pdf (or defaut invoice config) to know what is template to use to regenerate doc.
 					$filename = dol_sanitizeFileName($objectobj->ref).'.pdf';
 					$subdir = '';
 					// TODO Set subdir to be compatible with multi levels dir trees
@@ -590,7 +590,8 @@ if (!$error && $massaction == 'confirm_presend')
 	}
 }
 
-if ($massaction == 'confirm_createbills')   // Create bills from orders
+// TODO Move this action into commande/list.php if called only by this page.
+if ($massaction == 'confirm_createbills')   // Create bills from orders.
 {
 	$orders = GETPOST('toselect', 'array');
 	$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
@@ -600,6 +601,8 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 	$TFactThird = array();
 
 	$nb_bills_created = 0;
+	$lastid= 0;
+	$lastref = '';
 
 	$db->begin();
 
@@ -609,8 +612,9 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 		if ($cmd->fetch($id_order) <= 0) continue;
 
 		$objecttmp = new Facture($db);
-		if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) $objecttmp = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
-		else {
+		if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) {
+			$objecttmp = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
+		} else {
 			// Load extrafields of order
 			$cmd->fetch_optionals();
 
@@ -636,7 +640,11 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 
 			$res = $objecttmp->create($user);
 
-			if ($res > 0) $nb_bills_created++;
+			if ($res > 0) {
+				$nb_bills_created++;
+				$lastref = $objecttmp->ref;
+				$lastid = $objecttmp->id;
+			}
 		}
 
 		if ($objecttmp->id > 0)
@@ -818,7 +826,14 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 	if (!$error)
 	{
 		$db->commit();
-		setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs');
+
+		if ($nb_bills_created == 1) {
+			$texttoshow = $langs->trans('BillXCreated', '{s1}');
+			$texttoshow = str_replace('{s1}', '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?id='.urlencode($lastid).'">'.$lastref.'</a>', $texttoshow);
+			setEventMessages($texttoshow, null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs');
+		}
 
 		// Make a redirect to avoid to bill twice if we make a refresh or back
 		$param = '';
@@ -1266,7 +1281,7 @@ if (!$error && $massaction == 'generate_doc' && $permissiontoread)
 			if (empty($hideref)) $hideref = 0;
 			if (empty($moreparams)) $moreparams = null;
 
-			$result = $objecttmp->generateDocument($objecttmp->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+			$result = $objecttmp->generateDocument($objecttmp->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 
 			if ($result <= 0)
 			{
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 929d35d9730..1bea255bda2 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -227,7 +227,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 		}
 		if (count($receivercc) > 0) {
 			foreach ($receivercc as $key => $val) {
-				if ($val == 'thirdparty') {	// Key selected means currentthird party (may be usd for current member or current user too)
+				if ($val == 'thirdparty') {	// Key selected means current thirdparty (may be usd for current member or current user too)
 					// Recipient was provided from combo list
 					$tmparray[] = dol_string_nospecial($thirdparty->name, ' ', array(",")).' <'.$thirdparty->email.'>';
 				} elseif ($val == 'contact') {	// Key selected means current contact
@@ -399,7 +399,6 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 								$error++;
 							}
 							// End call triggers
-
 							if ($error) {
 								setEventMessages($object->error, $object->errors, 'errors');
 							}
diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
index 24220f79f8c..d662d3c85c9 100644
--- a/htdocs/core/actions_setmoduleoptions.inc.php
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -21,7 +21,7 @@
  *  \brief			Code for actions on setting notes of object page
  */
 
-
+// $error must have been initialized to 0
 // $action must be defined
 // $arrayofparameters must be set for action 'update'
 // $nomessageinupdate can be set to 1
@@ -31,7 +31,6 @@ if ($action == 'update' && is_array($arrayofparameters))
 {
 	$db->begin();
 
-	$ok = true;
 	foreach ($arrayofparameters as $key => $val)
 	{
 		// Modify constant only if key was posted (avoid resetting key to the null value)
@@ -40,7 +39,7 @@ if ($action == 'update' && is_array($arrayofparameters))
 			$result = dolibarr_set_const($db, $key, GETPOST($key, 'alpha'), 'chaine', 0, '', $conf->entity);
 			if ($result < 0)
 			{
-				$ok = false;
+				$error++;
 				break;
 			}
 		}
@@ -74,7 +73,7 @@ if ($action == 'setModuleOptions')
 				if ($param)
 				{
 					$res = dolibarr_set_const($db, $param, $value, 'chaine', 0, '', $conf->entity);
-					if (!$res > 0) $error++;
+					if (!($res > 0)) $error++;
 				}
 			}
 		}
@@ -93,7 +92,11 @@ if ($action == 'setModuleOptions')
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			if (!is_dir($tmpdir)) {
+				if (empty($nomessageinsetmoduleoptions)) {
+					setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings');
+				}
+			}
 			else {
 				$upload_dir = $tmpdir;
 			}
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 41e23819266..9575208f485 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -201,6 +201,13 @@ if ($type == 'directory')
 		'mrp-mo'
 	);
 
+	$parameters = array('modulepart'=>$module);
+	$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
+	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;
 	elseif ($module == 'invoice') $upload_dir = $conf->facture->dir_output;
@@ -220,6 +227,13 @@ if ($type == 'directory')
 	elseif ($module == 'recruitment-recruitmentcandidature') $upload_dir = $conf->recruitment->dir_output.'/recruitmentcandidature';
 	elseif ($module == 'banque') $upload_dir = $conf->bank->dir_output;
 	elseif ($module == 'mrp-mo') $upload_dir = $conf->mrp->dir_output.'/mo';
+	else {
+		$parameters = array('modulepart'=>$module);
+		$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
+		if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray) > 0) {
+			$upload_dir = $hookmanager->resArray['directory'];
+		}
+	}
 
 	// Automatic list
 	if (in_array($module, $automodules))
diff --git a/htdocs/core/boxes/box_birthdays.php b/htdocs/core/boxes/box_birthdays.php
index 9a2ccd33cf7..ea83e022079 100644
--- a/htdocs/core/boxes/box_birthdays.php
+++ b/htdocs/core/boxes/box_birthdays.php
@@ -91,7 +91,7 @@ class box_birthdays extends ModeleBoxes
 			$sql .= " WHERE u.entity IN (".getEntity('user').")";
 			$sql .= " AND u.statut = 1";
 			$sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
-			$sql .= " ORDER BY u.birth ASC";
+			$sql .= " ORDER BY DAY(u.birth) ASC";
 			$sql .= $this->db->plimit($max, 0);
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
diff --git a/htdocs/core/boxes/box_birthdays_members.php b/htdocs/core/boxes/box_birthdays_members.php
index 02a315ea836..56619fac581 100644
--- a/htdocs/core/boxes/box_birthdays_members.php
+++ b/htdocs/core/boxes/box_birthdays_members.php
@@ -91,7 +91,7 @@ class box_birthdays_members extends ModeleBoxes
 			$sql .= " WHERE u.entity IN (".getEntity('adherent').")";
 	  		$sql .= " AND u.statut = 1";
 	  		$sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
-			$sql .= " ORDER BY u.birth ASC";
+			$sql .= " ORDER BY DAY(u.birth) ASC";
 			$sql .= $this->db->plimit($max, 0);
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 11e8b6a8f29..adcff0d158c 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2015      Frederic France      <frederic.france@free.fr>
+ * Copyright (C) 2015-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
@@ -79,7 +79,7 @@ class box_clients extends ModeleBoxes
 
 		$this->max = $max;
 
-		include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 		$thirdpartystatic = new Client($this->db);
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedCustomers", $max));
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index 3f7875ce7d4..9b020a05711 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -83,7 +83,7 @@ class box_commandes extends ModeleBoxes
 		$societestatic = new Societe($this->db);
 		$userstatic = new User($this->db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."CustomerOrders", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLast".(!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) ? "" : "Modified")."CustomerOrders", $max));
 
 		if ($user->rights->commande->lire)
 		{
@@ -108,7 +108,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) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
+			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
 			else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
 			$sql .= $this->db->plimit($max, 0);
 
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index 9350bae2da9..0fa10b43fd8 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -92,7 +92,7 @@ class box_contracts extends ModeleBoxes
 			$sql .= " AND c.entity = ".$conf->entity;
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_contrat DESC, c.ref DESC ";
+			if (! empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) $sql .= " ORDER BY c.date_contrat DESC, c.ref DESC ";
 			else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
 			$sql .= $this->db->plimit($max, 0);
 
diff --git a/htdocs/core/boxes/box_dolibarr_state_board.php b/htdocs/core/boxes/box_dolibarr_state_board.php
new file mode 100644
index 00000000000..c1a81bafbed
--- /dev/null
+++ b/htdocs/core/boxes/box_dolibarr_state_board.php
@@ -0,0 +1,321 @@
+<?php
+/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2015-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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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_dolibarr_state_board.php
+ *	\ingroup
+ *	\brief      Module Dolibarr state base
+ */
+
+include_once DOL_DOCUMENT_ROOT . '/core/boxes/modules_boxes.php';
+include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+
+
+/**
+ * Class to manage the box to show last thirdparties
+ */
+class box_dolibarr_state_board extends ModeleBoxes
+{
+	public $boxcode = "dolibarrstatebox";
+	public $boximg = "generic";
+	public $boxlabel = "BoxDolibarrStateBoard";
+	public $depends = array("user");
+
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+	public $enabled = 1;
+
+	public $info_box_head = array();
+	public $info_box_contents = array();
+
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB	$db      	Database handler
+	 *  @param	string	$param		More parameters
+	 */
+	public function __construct($db, $param = '')
+	{
+		global $conf, $user;
+
+		$this->db = $db;
+
+		// disable box for such cases
+		if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+			$this->enabled = 0; // disabled by this option
+		}
+
+		$this->hidden = !($user->rights->societe->lire && empty($user->socid));
+	}
+
+	/**
+	 *  Load data for box to show them later
+	 *
+	 *  @param	int		$max        Maximum number of records to load
+	 *  @return	void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $user, $langs, $conf;
+		$langs->load("boxes");
+
+		$this->max = $max;
+		$this->info_box_head = array('text' => $langs->trans("DolibarrStateBoard"));
+
+		if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS)) {
+			$hookmanager = new HookManager($this->db);
+			$hookmanager->initHooks(array('index'));
+			$boxstatItems = array();
+			$boxstatFromHook = '';
+			$boxstatFromHook = $hookmanager->resPrint;
+			$boxstat = '';
+
+			$keys = array(
+				'users',
+				'members',
+				'expensereports',
+				'holidays',
+				'customers',
+				'prospects',
+				'suppliers',
+				'contacts',
+				'products',
+				'services',
+				'projects',
+				'proposals',
+				'orders',
+				'invoices',
+				'donations',
+				'supplier_proposals',
+				'supplier_orders',
+				'supplier_invoices',
+				'contracts',
+				'interventions',
+				'ticket'
+			);
+			$conditions = array(
+				'users' => $user->rights->user->user->lire,
+				'members' => !empty($conf->adherent->enabled) && $user->rights->adherent->lire,
+				'customers' => !empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS),
+				'prospects' => !empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS),
+				'suppliers' => !empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS),
+				'contacts' => !empty($conf->societe->enabled) && $user->rights->societe->contact->lire,
+				'products' => !empty($conf->product->enabled) && $user->rights->produit->lire,
+				'services' => !empty($conf->service->enabled) && $user->rights->service->lire,
+				'proposals' => !empty($conf->propal->enabled) && $user->rights->propale->lire,
+				'orders' => !empty($conf->commande->enabled) && $user->rights->commande->lire,
+				'invoices' => !empty($conf->facture->enabled) && $user->rights->facture->lire,
+				'donations' => !empty($conf->don->enabled) && $user->rights->don->lire,
+				'contracts' => !empty($conf->contrat->enabled) && $user->rights->contrat->lire,
+				'interventions' => !empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire,
+				'supplier_orders' => !empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_ORDERS_STATS),
+				'supplier_invoices' => !empty($conf->supplier_invoice->enabled) && $user->rights->fournisseur->facture->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_INVOICES_STATS),
+				'supplier_proposals' => !empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_PROPOSAL_STATS),
+				'projects' => !empty($conf->projet->enabled) && $user->rights->projet->lire,
+				'expensereports' => !empty($conf->expensereport->enabled) && $user->rights->expensereport->lire,
+				'holidays' => !empty($conf->holiday->enabled) && $user->rights->holiday->read,
+				'ticket' => !empty($conf->ticket->enabled) && $user->rights->ticket->read
+			);
+			$classes = array(
+				'users' => 'User',
+				'members' => 'Adherent',
+				'customers' => 'Client',
+				'prospects' => 'Client',
+				'suppliers' => 'Fournisseur',
+				'contacts' => 'Contact',
+				'products' => 'Product',
+				'services' => 'ProductService',
+				'proposals' => 'Propal',
+				'orders' => 'Commande',
+				'invoices' => 'Facture',
+				'donations' => 'Don',
+				'contracts' => 'Contrat',
+				'interventions' => 'Fichinter',
+				'supplier_orders' => 'CommandeFournisseur',
+				'supplier_invoices' => 'FactureFournisseur',
+				'supplier_proposals' => 'SupplierProposal',
+				'projects' => 'Project',
+				'expensereports' => 'ExpenseReport',
+				'holidays' => 'Holiday',
+				'ticket' => 'Ticket',
+			);
+			$includes = array(
+				'users' => DOL_DOCUMENT_ROOT . "/user/class/user.class.php",
+				'members' => DOL_DOCUMENT_ROOT . "/adherents/class/adherent.class.php",
+				'customers' => DOL_DOCUMENT_ROOT . "/societe/class/client.class.php",
+				'prospects' => DOL_DOCUMENT_ROOT . "/societe/class/client.class.php",
+				'suppliers' => DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.class.php",
+				'contacts' => DOL_DOCUMENT_ROOT . "/contact/class/contact.class.php",
+				'products' => DOL_DOCUMENT_ROOT . "/product/class/product.class.php",
+				'services' => DOL_DOCUMENT_ROOT . "/product/class/product.class.php",
+				'proposals' => DOL_DOCUMENT_ROOT . "/comm/propal/class/propal.class.php",
+				'orders' => DOL_DOCUMENT_ROOT . "/commande/class/commande.class.php",
+				'invoices' => DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php",
+				'donations' => DOL_DOCUMENT_ROOT . "/don/class/don.class.php",
+				'contracts' => DOL_DOCUMENT_ROOT . "/contrat/class/contrat.class.php",
+				'interventions' => DOL_DOCUMENT_ROOT . "/fichinter/class/fichinter.class.php",
+				'supplier_orders' => DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.commande.class.php",
+				'supplier_invoices' => DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.facture.class.php",
+				'supplier_proposals' => DOL_DOCUMENT_ROOT . "/supplier_proposal/class/supplier_proposal.class.php",
+				'projects' => DOL_DOCUMENT_ROOT . "/projet/class/project.class.php",
+				'expensereports' => DOL_DOCUMENT_ROOT . "/expensereport/class/expensereport.class.php",
+				'holidays' => DOL_DOCUMENT_ROOT . "/holiday/class/holiday.class.php",
+				'ticket' => DOL_DOCUMENT_ROOT . "/ticket/class/ticket.class.php"
+			);
+			$links = array(
+				'users' => DOL_URL_ROOT . '/user/list.php',
+				'members' => DOL_URL_ROOT . '/adherents/list.php?statut=1&mainmenu=members',
+				'customers' => DOL_URL_ROOT . '/societe/list.php?type=c&mainmenu=companies',
+				'prospects' => DOL_URL_ROOT . '/societe/list.php?type=p&mainmenu=companies',
+				'suppliers' => DOL_URL_ROOT . '/societe/list.php?type=f&mainmenu=companies',
+				'contacts' => DOL_URL_ROOT . '/contact/list.php?mainmenu=companies',
+				'products' => DOL_URL_ROOT . '/product/list.php?type=0&mainmenu=products',
+				'services' => DOL_URL_ROOT . '/product/list.php?type=1&mainmenu=products',
+				'proposals' => DOL_URL_ROOT . '/comm/propal/list.php?mainmenu=commercial&leftmenu=propals',
+				'orders' => DOL_URL_ROOT . '/commande/list.php?mainmenu=commercial&leftmenu=orders',
+				'invoices' => DOL_URL_ROOT . '/compta/facture/list.php?mainmenu=billing&leftmenu=customers_bills',
+				'donations' => DOL_URL_ROOT . '/don/list.php?leftmenu=donations',
+				'contracts' => DOL_URL_ROOT . '/contrat/list.php?mainmenu=commercial&leftmenu=contracts',
+				'interventions' => DOL_URL_ROOT . '/fichinter/list.php?mainmenu=commercial&leftmenu=ficheinter',
+				'supplier_orders' => DOL_URL_ROOT . '/fourn/commande/list.php?mainmenu=commercial&leftmenu=orders_suppliers',
+				'supplier_invoices' => DOL_URL_ROOT . '/fourn/facture/list.php?mainmenu=billing&leftmenu=suppliers_bills',
+				'supplier_proposals' => DOL_URL_ROOT . '/supplier_proposal/list.php?mainmenu=commercial&leftmenu=',
+				'projects' => DOL_URL_ROOT . '/projet/list.php?mainmenu=project',
+				'expensereports' => DOL_URL_ROOT . '/expensereport/list.php?mainmenu=hrm&leftmenu=expensereport',
+				'holidays' => DOL_URL_ROOT . '/holiday/list.php?mainmenu=hrm&leftmenu=holiday',
+				'ticket' => DOL_URL_ROOT . '/ticket/list.php?leftmenu=ticket'
+			);
+			$titres = array(
+				'users' => "Users",
+				'members' => "Members",
+				'customers' => "ThirdPartyCustomersStats",
+				'prospects' => "ThirdPartyProspectsStats",
+				'suppliers' => "Suppliers",
+				'contacts' => "Contacts",
+				'products' => "Products",
+				'services' => "Services",
+				'proposals' => "CommercialProposalsShort",
+				'orders' => "CustomersOrders",
+				'invoices' => "BillsCustomers",
+				'donations' => "Donations",
+				'contracts' => "Contracts",
+				'interventions' => "Interventions",
+				'supplier_orders' => "SuppliersOrders",
+				'supplier_invoices' => "SuppliersInvoices",
+				'supplier_proposals' => "SupplierProposalShort",
+				'projects' => "Projects",
+				'expensereports' => "ExpenseReports",
+				'holidays' => "Holidays",
+				'ticket' => "Ticket",
+			);
+			$langfile = array(
+				'customers' => "companies",
+				'contacts' => "companies",
+				'services' => "products",
+				'proposals' => "propal",
+				'invoices' => "bills",
+				'supplier_orders' => "orders",
+				'supplier_invoices' => "bills",
+				'supplier_proposals' => 'supplier_proposal',
+				'expensereports' => "trips",
+				'holidays' => "holiday",
+			);
+			$boardloaded = array();
+
+			foreach ($keys as $val) {
+				if ($conditions[$val]) {
+					$boxstatItem = '';
+					$class = $classes[$val];
+					// Search in cache if load_state_board is already realized
+					$classkeyforcache = $class;
+					if ($classkeyforcache == 'ProductService') $classkeyforcache = 'Product'; // ProductService use same load_state_board than Product
+
+					if (!isset($boardloaded[$classkeyforcache]) || !is_object($boardloaded[$classkeyforcache])) {
+						include_once $includes[$val]; // Loading a class cost around 1Mb
+
+						$board = new $class($this->db);
+						$board->load_state_board();
+						$boardloaded[$class] = $board;
+					} else {
+						$board = $boardloaded[$classkeyforcache];
+					}
+
+					$langs->load(empty($langfile[$val]) ? $val : $langfile[$val]);
+
+					$text = $langs->trans($titres[$val]);
+					$boxstatItem .= '<a href="' . $links[$val] . '" class="boxstatsindicator thumbstat nobold nounderline">';
+					$boxstatItem .= '<div class="boxstats">';
+					$boxstatItem .= '<span class="boxstatstext" title="' . dol_escape_htmltag($text) . '">' . $text . '</span><br>';
+					$boxstatItem .= '<span class="boxstatsindicator">' . img_object("", $board->picto, 'class="inline-block"') . ' ' . ($board->nb[$val] ? $board->nb[$val] : 0) . '</span>';
+					$boxstatItem .= '</div>';
+					$boxstatItem .= '</a>';
+
+					$boxstatItems[$val] = $boxstatItem;
+				}
+			}
+
+			if (!empty($boxstatFromHook) || !empty($boxstatItems)) {
+				$boxstat .= $boxstatFromHook;
+
+				if (is_array($boxstatItems) && count($boxstatItems) > 0) {
+					$boxstat .= implode('', $boxstatItems);
+				}
+
+				$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+				$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+				$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+				$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+				$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+				$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+				$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+				$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+
+				$this->info_box_contents[0][0] = array(
+					'tr' => 'class="nohover"',
+					'td' => '',
+					'textnoformat' => $boxstat
+				);
+			}
+		} else {
+			$this->info_box_contents[0][0] = array(
+				'td' => '',
+				'text' => $langs->trans("ReadPermissionNotAllowed")
+			);
+		}
+	}
+
+
+	/**
+	 *	Method to show box
+	 *
+	 *	@param	array	$head       Array with properties of box title
+	 *	@param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No print, only return string
+	 *	@return	string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
+}
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 011342d8a30..20e83fb442c 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -81,7 +81,7 @@ class box_factures extends ModeleBoxes
 
 		$langs->load("bills");
 
-		$text = $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."CustomerBills", $max);
+		$text = $langs->trans("BoxTitleLast".(!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) ? "" : "Modified")."CustomerBills", $max);
 		$this->info_box_head = array(
 			'text' => $text,
 			'limit'=> dol_strlen($text)
@@ -106,7 +106,7 @@ class box_factures extends ModeleBoxes
 			$sql .= " AND f.entity IN (".getEntity('invoice').")";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($user->socid)	$sql .= " AND s.rowid = ".$user->socid;
-			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
+			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
 			else $sql .= " ORDER BY f.tms DESC, f.ref DESC ";
 			$sql .= $this->db->plimit($max, 0);
 
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index d3c1ccd9017..1858a308756 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -81,7 +81,7 @@ class box_factures_fourn extends ModeleBoxes
 		$thirdpartystatic = new Fournisseur($this->db);
 
 		$this->info_box_head = array(
-			'text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."SupplierBills", $max)
+			'text' => $langs->trans("BoxTitleLast".(!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) ? "" : "Modified")."SupplierBills", $max)
 		);
 
 		if ($user->rights->fournisseur->facture->lire)
@@ -104,7 +104,7 @@ class box_factures_fourn extends ModeleBoxes
 			$sql .= " AND f.entity = ".$conf->entity;
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
+			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
 			else $sql .= " ORDER BY f.tms DESC, f.ref DESC ";
 			$sql .= $this->db->plimit($max, 0);
 
@@ -133,7 +133,7 @@ class box_factures_fourn extends ModeleBoxes
 
 					$thirdpartystatic->id = $objp->socid;
 					$thirdpartystatic->name = $objp->name;
-					//$thirdpartystatic->name_alias = $objp->name_alias;
+					$thirdpartystatic->name_alias = $objp->name_alias;
 					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
 					$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
 					$thirdpartystatic->fournisseur = $objp->fournisseur;
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index b957e5bf0c1..99848d916f4 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -26,7 +26,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
 
 
 /**
- * Class to manage the box to show not payed suppliers invoices
+ * Class to manage the box to show not paid suppliers invoices
  */
 class box_factures_fourn_imp extends ModeleBoxes
 {
@@ -130,7 +130,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 
 					$thirdpartystatic->id = $objp->socid;
 					$thirdpartystatic->name = $objp->name;
-					//$thirdpartystatic->name_alias = $objp->name_alias;
+					$thirdpartystatic->name_alias = $objp->name_alias;
 					$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
 					$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
 					$thirdpartystatic->fournisseur = $objp->fournisseur;
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 08233ff754c..b47f948f4ca 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -110,7 +110,8 @@ class box_factures_imp extends ModeleBoxes
 			$sql .= " AND fk_statut = 1";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-			$sql .= " GROUP BY s.nom, s.rowid, s.email, s.code_client, s.logo, f.ref, f.date_lim_reglement,";
+			$sql .= " GROUP BY s.rowid, s.nom, s.name_alias, s.code_client, s.code_compta, s.client, s.logo, s.email, s.entity, s.tva_intra, s.siren, s.siret, s.ape, s.idprof4, s.idprof5, s.idprof6,";
+			$sql .= " f.ref, f.date_lim_reglement,";
 			$sql .= " f.type, f.datef, f.total, f.tva, f.total_ttc, f.paye, f.fk_statut, f.rowid";
 			//$sql.= " ORDER BY f.datef DESC, f.ref DESC ";
 			$sql .= " ORDER BY datelimite ASC, f.ref ASC ";
diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
index 5b6130d8eb2..519cb2cd306 100644
--- a/htdocs/core/boxes/box_funnel_of_prospection.php
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -96,6 +96,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 		$listofopplabel = array();
 		$listofoppcode = array();
 		$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 .= " WHERE active=1";
@@ -113,19 +114,24 @@ class box_funnel_of_prospection extends ModeleBoxes
 				$listofoppcode[$objp->rowid] = $objp->code;
 				switch ($objp->code) {
 					case 'PROSP':
-						$colorseriesstat[$objp->rowid] = "-" . $badgeStatus0;
+						$colorseriesstat[$objp->rowid] = '#FFFFFF';
+						$bordercolorseries[$objp->rowid] = $badgeStatus0;
 						break;
 					case 'QUAL':
-						$colorseriesstat[$objp->rowid] = "-" . $badgeStatus1;
+						$colorseriesstat[$objp->rowid] = '#FFFFFF';
+						$bordercolorseries[$objp->rowid] = $badgeStatus1;
 						break;
 					case 'PROPO':
 						$colorseriesstat[$objp->rowid] = $badgeStatus1;
+						$bordercolorseries[$objp->rowid] = $badgeStatus1;
 						break;
 					case 'NEGO':
 						$colorseriesstat[$objp->rowid] = $badgeStatus4;
+						$bordercolorseries[$objp->rowid] = $badgeStatus4;
 						break;
 					case 'WON':
 						$colorseriesstat[$objp->rowid] = $badgeStatus6;
+						$bordercolorseries[$objp->rowid] = $badgeStatus6;
 						break;
 					default:
 						break;
@@ -191,7 +197,10 @@ class box_funnel_of_prospection extends ModeleBoxes
 				$listofstatus = array_keys($listofoppstatus);
 				$liststatus = array();
 				$data = array('');
+				$customlabels = array();
+				$total=0;
 				foreach ($listofstatus as $status) {
+					$customlabel = '';
 					$labelStatus = '';
 					if ($status != 7) {
 						$code = dol_getIdFromCode($this->db, $status, 'c_lead_status', 'rowid', 'code');
@@ -201,8 +210,9 @@ class box_funnel_of_prospection extends ModeleBoxes
 						if (empty($labelStatus)) {
 							$labelStatus = $listofopplabel[$status];
 						}
-
-						$data[] = (isset($valsamount[$status]) ? (float) $valsamount[$status] : 0);
+						$amount = (isset($valsamount[$status]) ? (float) $valsamount[$status] : 0);
+						$data[] = $amount;
+						$customlabel = $amount;
 						$liststatus[] = $labelStatus;
 						if (!$conf->use_javascript_ajax) {
 							$stringtoprint .= '<tr class="oddeven">';
@@ -211,6 +221,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 							$stringtoprint .= "</tr>\n";
 						}
 					}
+					$customlabels[]=$customlabel;
 				}
 				$dataseries[] = $data;
 				if ($conf->use_javascript_ajax) {
@@ -219,13 +230,18 @@ class box_funnel_of_prospection extends ModeleBoxes
 					$dolgraph->SetMinValue(0);
 					$dolgraph->SetData($dataseries);
 					$dolgraph->SetLegend($liststatus);
+					$dolgraph->setHideXValues(true);
 					$dolgraph->SetDataColor(array_values($colorseriesstat));
+					$dolgraph->setBorderColor(array_values($bordercolorseries));
 					$dolgraph->setShowLegend(2);
 					$dolgraph->setShowPercent(1);
-					$dolgraph->setTitle('');
+					$dolgraph->setMirrorGraphValues(true);
+					$dolgraph->setBorderWidth(2);
 					$dolgraph->SetType(array('horizontalbars'));
 					$dolgraph->SetHeight('200');
 					$dolgraph->SetWidth('600');
+					$dolgraph->setTooltipsTitles($liststatus);
+					$dolgraph->setTooltipsLabels($customlabels);
 					$dolgraph->mode = 'depth';
 					$dolgraph->draw('idgraphleadfunnel');
 					$stringtoprint .= $dolgraph->show($totaloppnb ? 0 : 1);
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 983bb75cbc3..97ebbee1d85 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -112,15 +112,16 @@ class box_graph_invoices_permonth extends ModeleBoxes
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			} else {
-				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
-				$endyear = $tmparray['year'];
-				$shownb = $tmparray['shownb'];
-				$showtot = $tmparray['showtot'];
+			    $tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
+			    $endyear = (!empty($tmparray['year']) ? $tmparray['year'] : '');
+			    $shownb = (!empty($tmparray['shownb']) ? $tmparray['shownb'] : '');
+			    $showtot = (!empty($tmparray['showtot']) ? $tmparray['showtot'] : '');
 			}
 			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
 			$nowarray = dol_getdate(dol_now(), true);
 			if (empty($endyear)) $endyear = $nowarray['year'];
-			$startyear = $endyear - 1;
+			$startyear = $endyear - (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 1 : $conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH);
+
 			$mode = 'customer';
 			$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
 			$HEIGHT = '192';
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index 1490f5ea6e9..d044c65b9f0 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -109,15 +109,17 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			} else {
-				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
-				$endyear = $tmparray['year'];
-				$shownb = $tmparray['shownb'];
-				$showtot = $tmparray['showtot'];
+			    $tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
+			    $endyear = (!empty($tmparray['year']) ? $tmparray['year'] : '');
+			    $shownb = (!empty($tmparray['shownb']) ? $tmparray['shownb'] : '');
+			    $showtot = (!empty($tmparray['showtot']) ? $tmparray['showtot'] : '');
 			}
 			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
 			$nowarray = dol_getdate(dol_now(), true);
+			if (empty($year)) $year = $nowarray['year'];
 			if (empty($endyear)) $endyear = $nowarray['year'];
-			$startyear = $endyear - 1;
+			$startyear = $endyear - (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 1 : $conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH);
+
 			$mode = 'supplier';
 			$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
 			$HEIGHT = '192';
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index d9c26620553..9f0f5ece978 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -112,15 +112,16 @@ class box_graph_orders_permonth extends ModeleBoxes
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			} else {
-				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
-				$endyear = $tmparray['year'];
-				$shownb = $tmparray['shownb'];
-				$showtot = $tmparray['showtot'];
+			    $tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
+			    $endyear = (!empty($tmparray['year']) ? $tmparray['year'] : '');
+			    $shownb = (!empty($tmparray['shownb']) ? $tmparray['shownb'] : '');
+			    $showtot = (!empty($tmparray['showtot']) ? $tmparray['showtot'] : '');
 			}
 			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
 			$nowarray = dol_getdate(dol_now(), true);
 			if (empty($endyear)) $endyear = $nowarray['year'];
-			$startyear = $endyear - 1;
+			$startyear = $endyear - (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 1 : $conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH);
+
 			$mode = 'customer';
 			$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
 			$HEIGHT = '192';
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index 765c6324516..c16c0616fbc 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -111,15 +111,16 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			} else {
-				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
-				$endyear = $tmparray['year'];
-				$shownb = $tmparray['shownb'];
-				$showtot = $tmparray['showtot'];
+			    $tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
+				$endyear = (!empty($tmparray['year']) ? $tmparray['year'] : '');
+				$shownb = (!empty($tmparray['shownb']) ? $tmparray['shownb'] : '');
+				$showtot = (!empty($tmparray['showtot']) ? $tmparray['showtot'] : '');
 			}
 			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
 			$nowarray = dol_getdate(dol_now(), true);
 			if (empty($endyear)) $endyear = $nowarray['year'];
-			$startyear = $endyear - 1;
+			$startyear = $endyear - (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 1 : $conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH);
+
 			$mode = 'supplier';
 			$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
 			$HEIGHT = '192';
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 407c66177b5..8c6049c720b 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -95,11 +95,11 @@ class box_graph_product_distribution extends ModeleBoxes
 			$showpropalnb = GETPOST($param_showpropalnb, 'alpha');
 			$showordernb = GETPOST($param_showordernb, 'alpha');
 		} else {
-			$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
-			$year = $tmparray['year'];
-			$showinvoicenb = $tmparray['showinvoicenb'];
-			$showpropalnb = $tmparray['showpropalnb'];
-			$showordernb = $tmparray['showordernb'];
+		    $tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
+		    $year = (!empty($tmparray['year']) ? $tmparray['year'] : '');
+		    $showinvoicenb = (!empty($tmparray['showinvoicenb']) ? $tmparray['showinvoicenb'] : '');
+		    $showpropalnb = (!empty($tmparray['showpropalnb']) ? $tmparray['showpropalnb'] : '');
+		    $showordernb = (!empty($tmparray['showordernb']) ? $tmparray['showordernb'] : '');
 		}
 		if (empty($showinvoicenb) && empty($showpropalnb) && empty($showordernb)) { $showpropalnb = 1; $showinvoicenb = 1; $showordernb = 1; }
 		if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) $showinvoicenb = 0;
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index de1a1f8de83..29b7cab5a78 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -112,15 +112,16 @@ class box_graph_propales_permonth extends ModeleBoxes
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			} else {
-				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
-				$endyear = $tmparray['year'];
-				$shownb = $tmparray['shownb'];
-				$showtot = $tmparray['showtot'];
+			    $tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
+			    $endyear = (!empty($tmparray['year']) ? $tmparray['year'] : '');
+			    $shownb = (!empty($tmparray['shownb']) ? $tmparray['shownb'] : '');
+			    $showtot = (!empty($tmparray['showtot']) ? $tmparray['showtot'] : '');
 			}
 			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
 			$nowarray = dol_getdate(dol_now(), true);
 			if (empty($endyear)) $endyear = $nowarray['year'];
-			$startyear = $endyear - 1;
+			$startyear = $endyear - (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 1 : $conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH);
+
 			$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
 			$HEIGHT = '192';
 
@@ -176,8 +177,10 @@ class box_graph_propales_permonth extends ModeleBoxes
 				//$datatype2 = array('lines','bars');
 
 				$filenamenb = $dir."/".$prefix."propalsamountinyear-".$endyear.".png";
-				if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&amp;file=propalsamountinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstatssupplier&amp;file=propalsamountinyear-'.$endyear.'.png';
+				if (!empty($mode)) {
+				    if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&amp;file=propalsamountinyear-'.$endyear.'.png';
+				    if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstatssupplier&amp;file=propalsamountinyear-'.$endyear.'.png';
+				}
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
diff --git a/htdocs/core/boxes/box_last_ticket.php b/htdocs/core/boxes/box_last_ticket.php
index 268a6861524..dbc453eced6 100644
--- a/htdocs/core/boxes/box_last_ticket.php
+++ b/htdocs/core/boxes/box_last_ticket.php
@@ -134,7 +134,7 @@ class box_last_ticket extends ModeleBoxes
 						$thirdparty->name = $objp->company_name;
 						$link = $thirdparty->getNomUrl(1);
 					} else {
-						$link = dol_print_email($objp->origin_email);
+						$link = '<span title="'.$objp->origin_email.'">'.dol_print_email($objp->origin_email).'</span>';
 					}
 
 					$r = 0;
@@ -149,15 +149,15 @@ class box_last_ticket extends ModeleBoxes
 
 					// Subject
 					$this->info_box_contents[$i][$r] = array(
-						'td' => '',
-						'text' => $objp->subject, // Some event have no ref
+						'td' => 'class="tdoverflowmax200"',
+						'text' => '<span title="'.$objp->subject.'">'.$objp->subject.'</span>', // Some event have no ref
 						'url' => DOL_URL_ROOT."/ticket/card.php?track_id=".$objp->track_id,
 					);
 					$r++;
 
 					// Customer
 					$this->info_box_contents[$i][$r] = array(
-						'td' => '',
+						'td' => 'class="tdoverflowmax100"',
 						'text' => $link,
 						'asis' => 1,
 					);
diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php
index 2d0ad45a266..2a69c7b3a21 100644
--- a/htdocs/core/boxes/box_members.php
+++ b/htdocs/core/boxes/box_members.php
@@ -63,7 +63,9 @@ class box_members extends ModeleBoxes
 
 		// disable module for such cases
 		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
-		if (!in_array('adherent', $listofmodulesforexternal) && !empty($user->socid)) $this->enabled = 0; // disabled for external users
+		if (!in_array('adherent', $listofmodulesforexternal) && !empty($user->socid)) {
+			$this->enabled = 0; // disabled for external users
+		}
 
 		$this->hidden = !($user->rights->adherent->lire);
 	}
@@ -87,7 +89,7 @@ class box_members extends ModeleBoxes
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedMembers", $max));
 
 		if ($user->rights->adherent->lire) {
-			$sql = "SELECT a.rowid, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
+			$sql = "SELECT a.rowid, a.ref, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
 			$sql .= " a.datec, a.tms, a.statut as status, a.datefin as date_end_subscription,";
 			$sql .= ' a.photo, a.email, a.gender, a.morphy,';
 			$sql .= " t.subscription";
@@ -110,14 +112,15 @@ class box_members extends ModeleBoxes
 					$memberstatic->lastname = $objp->lastname;
 					$memberstatic->firstname = $objp->firstname;
 					$memberstatic->id = $objp->rowid;
-					$memberstatic->ref = $objp->rowid;
+					$memberstatic->ref = $objp->ref;
 					$memberstatic->photo = $objp->photo;
 					$memberstatic->gender = $objp->gender;
 					$memberstatic->email = $objp->email;
 					$memberstatic->morphy = $objp->morphy;
 					$memberstatic->company = $objp->company;
 					$memberstatic->statut = $objp->status;
-
+					$memberstatic->need_subscription = $objp->subscription;
+					$memberstatic->datefin = $this->db->jdate($objp->date_end_subscription);
 					if (!empty($objp->fk_soc)) {
 						$memberstatic->socid = $objp->fk_soc;
 						$memberstatic->fetch_thirdparty();
@@ -151,11 +154,12 @@ class box_members extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0)
+				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="center"',
 						'text'=>$langs->trans("NoRecordedCustomers"),
 					);
+				}
 
 				$this->db->free($result);
 			} else {
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index f36b0500655..44333683000 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2015      Frederic France      <frederic.france@free.fr>
+ * Copyright (C) 2015-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
@@ -196,7 +196,7 @@ class box_produits extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right" width="18"',
-						'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'<span>',
+						'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'</span>',
 						'asis' => 1
 					);
 
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 893bb2273ab..0c6752ec764 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2005-2012 Maxime Kohlhaas      <mko@atm-consulting.fr>
- * Copyright (C) 2015-2019 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2015-2021 Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2015      Juanjo Menent	    <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -64,7 +64,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 		$this->db = $db;
 
 		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
-		$tmpentry = array('enabled'=>((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && !empty($conf->stock->enabled)), 'perms'=>($user->rights->stock->lire), 'module'=>'product|service|stock');
+		$tmpentry = array('enabled'=>((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && !empty($conf->stock->enabled)), 'perms'=>!empty($user->rights->stock->lire), 'module'=>'product|service|stock');
 		$showmode = isVisibleToUserType(($user->socid > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
 		$this->hidden = ($showmode != 1);
 	}
@@ -206,23 +206,24 @@ class box_produits_alerte_stock extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right" width="18"',
-						'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'<span>',
+						'text' => '<span class="statusrefsell">'.$productstatic->LibStatut($objp->tosell, 3, 0).'</span>',
 						'asis' => 1
 					);
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right" width="18"',
-						'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 0).'<span>',
+						'text' => '<span class="statusrefbuy">'.$productstatic->LibStatut($objp->tobuy, 3, 0).'</span>',
 						'asis' => 1
 					);
 
 					$line++;
 				}
-				if ($num == 0)
+				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="center"',
 						'text'=>$langs->trans("NoTooLowStockProducts"),
 					);
+				}
 
 				$this->db->free($result);
 			} else {
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index f98e0f1e347..6efd56c01db 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -81,7 +81,7 @@ class box_propales extends ModeleBoxes
 		$propalstatic = new Propal($this->db);
 		$societestatic = new Societe($this->db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLast".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."Propals", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLast".(!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) ? "" : "Modified")."Propals", $max));
 
 		if ($user->rights->propale->lire)
 		{
@@ -96,7 +96,7 @@ class box_propales extends ModeleBoxes
 			$sql .= " AND p.entity IN (".getEntity('propal').")";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY p.datep DESC, p.ref DESC ";
+			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) $sql .= " ORDER BY p.datep DESC, p.ref DESC ";
 			else $sql .= " ORDER BY p.tms DESC, p.ref DESC ";
 			$sql .= $this->db->plimit($max, 0);
 
diff --git a/htdocs/core/boxes/box_shipments.php b/htdocs/core/boxes/box_shipments.php
index 5a1f093ce87..22b28d42761 100644
--- a/htdocs/core/boxes/box_shipments.php
+++ b/htdocs/core/boxes/box_shipments.php
@@ -105,6 +105,7 @@ class box_shipments extends ModeleBoxes
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
 			$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
 			if (!empty($conf->global->ORDER_BOX_LAST_SHIPMENTS_VALIDATED_ONLY)) $sql .= " AND e.fk_statut = 1";
+			if ($user->socid > 0) $sql.= " AND s.rowid = ".$user->socid;
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND sc.fk_user = ".$user->id;
 			else $sql .= " ORDER BY e.date_delivery, e.ref DESC ";
 			$sql .= $this->db->plimit($max, 0);
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 151c1df6bcb..5074d403231 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -79,7 +79,7 @@ class box_supplier_orders extends ModeleBoxes
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 		$thirdpartystatic = new Fournisseur($this->db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLatest".($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE ? "" : "Modified")."SupplierOrders", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLatest".(!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) ? "" : "Modified")."SupplierOrders", $max));
 
 		if ($user->rights->fournisseur->commande->lire)
 		{
@@ -98,7 +98,7 @@ class box_supplier_orders extends ModeleBoxes
 			$sql .= " AND c.entity IN (".getEntity('supplier_order').")";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
+			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
 			else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
 			$sql .= $this->db->plimit($max, 0);
 
diff --git a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
index 80fdbc2f4a2..22f669966f3 100644
--- a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
+++ b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
@@ -99,7 +99,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
 			$sql .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.")";
 			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-			if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC";
+			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC";
 			else $sql .= " ORDER BY c.date_livraison ASC, c.fk_statut ASC";
 			$sql .= $this->db->plimit($max, 0);
 
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index e96adea7531..0d235a21798 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -41,7 +41,10 @@ class CMailFile
 	public $sendmode;
 	public $sendsetup;
 
-	public $subject; // Topic:       Subject of email
+	/**
+	 * @var string Subject of email
+	 */
+	public $subject;
 	public $addr_from; // From:		Label and EMail of sender (must include '<>'). For example '<myemail@example.com>' or 'John Doe <myemail@example.com>' or '<myemail+trackingid@example.com>'). Note that with gmail smtps, value here is forced by google to account (but not the reply-to).
 	// Sender:      Who send the email ("Sender" has sent emails on behalf of "From").
 	//              Use it when the "From" is an email of a domain that is a SPF protected domain, and sending smtp server is not this domain. In such case, add Sender field with an email of the protected domain.
@@ -148,7 +151,7 @@ class CMailFile
 
 		// Add autocopy to if not already in $to (Note: Adding bcc for specific modules are also done from pages)
 		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO) && !preg_match('/'.preg_quote($conf->global->MAIN_MAIL_AUTOCOPY_TO, '/').'/i', $to)) {
-		    $addr_bcc .= ($addr_bcc ? ', ' : '').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+			$addr_bcc .= ($addr_bcc ? ', ' : '').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
 		}
 
 		$this->subject = $subject;
@@ -161,7 +164,9 @@ class CMailFile
 		$this->addr_cc = $addr_cc;
 		$this->addr_bcc = $addr_bcc;
 		$this->deliveryreceipt = $deliveryreceipt;
-		if (empty($replyto)) $replyto = $from;
+		if (empty($replyto)) {
+			$replyto = $from;
+		}
 		$this->reply_to = $replyto;
 		$this->errors_to = $errors_to;
 		$this->trackid = $trackid;
@@ -180,15 +185,18 @@ class CMailFile
 				$this->sendmode = $smtpContextSendMode;
 			}
 		}
-		if (empty($this->sendmode)) $this->sendmode = $conf->global->MAIN_MAIL_SENDMODE;
-		if (empty($this->sendmode)) $this->sendmode = 'mail';
+		if (empty($this->sendmode)) {
+			$this->sendmode = $conf->global->MAIN_MAIL_SENDMODE;
+		}
+		if (empty($this->sendmode)) {
+			$this->sendmode = 'mail';
+		}
 
 		// We define end of line (RFC 821).
 		$this->eol = "\r\n";
 		// We define end of line for header fields (RFC 822bis section 2.3 says header must contains \r\n).
 		$this->eol2 = "\r\n";
-		if (!empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
-		{
+		if (!empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)) {
 			$this->eol = "\n";
 			$this->eol2 = "\n";
 			$moreinheader = str_replace("\r\n", "\n", $moreinheader);
@@ -206,23 +214,22 @@ class CMailFile
 		dol_syslog("CMailFile::CMailfile: sendmode=".$this->sendmode." charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, replyto=$replyto trackid=$trackid sendcontext=$sendcontext", LOG_DEBUG);
 		dol_syslog("CMailFile::CMailfile: subject=".$subject.", deliveryreceipt=".$deliveryreceipt.", msgishtml=".$msgishtml, LOG_DEBUG);
 
-		if (empty($subject))
-		{
+		if (empty($subject)) {
 			dol_syslog("CMailFile::CMailfile: Try to send an email with empty subject");
 			$this->error = 'ErrorSubjectIsRequired';
 			return;
 		}
-		if (empty($msg))
-		{
+		if (empty($msg)) {
 			dol_syslog("CMailFile::CMailfile: Try to send an email with empty body");
 			$msg = '.'; // Avoid empty message (with empty message content, you will see a multipart structure)
 		}
 
 		// Detect if message is HTML (use fast method)
-		if ($msgishtml == -1)
-		{
+		if ($msgishtml == -1) {
 			$this->msgishtml = 0;
-			if (dol_textishtml($msg)) $this->msgishtml = 1;
+			if (dol_textishtml($msg)) {
+				$this->msgishtml = 1;
+			}
 		} else {
 			$this->msgishtml = $msgishtml;
 		}
@@ -237,26 +244,23 @@ class CMailFile
 		// Replace relative /viewimage to absolute path
 		$msg = preg_replace('/src="'.preg_quote(DOL_URL_ROOT, '/').'\/viewimage\.php/ims', 'src="'.$urlwithroot.'/viewimage.php', $msg, -1);
 
-		if (!empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) $this->msgishtml = 1; // To force to send everything with content type html.
+		if (!empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) {
+			$this->msgishtml = 1; // To force to send everything with content type html.
+		}
 
 		// Detect images
-		if ($this->msgishtml)
-		{
+		if ($this->msgishtml) {
 			$this->html = $msg;
 
 			$findimg = 0;
-			if (!empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS))
-			{
+			if (!empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS)) {
 				$findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
 			}
 
 			// Define if there is at least one file
-			if ($findimg)
-			{
-				foreach ($this->html_images as $i => $val)
-				{
-					if ($this->html_images[$i])
-					{
+			if ($findimg) {
+				foreach ($this->html_images as $i => $val) {
+					if ($this->html_images[$i]) {
 						$this->atleastoneimage = 1;
 						dol_syslog("CMailFile::CMailfile: html_images[$i]['name']=".$this->html_images[$i]['name'], LOG_DEBUG);
 					}
@@ -265,12 +269,9 @@ class CMailFile
 		}
 
 		// Define if there is at least one file
-		if (is_array($filename_list))
-		{
-			foreach ($filename_list as $i => $val)
-			{
-				if ($filename_list[$i])
-				{
+		if (is_array($filename_list)) {
+			foreach ($filename_list as $i => $val) {
+				if ($filename_list[$i]) {
 					$this->atleastonefile = 1;
 					dol_syslog("CMailFile::CMailfile: filename_list[$i]=".$filename_list[$i].", mimetype_list[$i]=".$mimetype_list[$i]." mimefilename_list[$i]=".$mimefilename_list[$i], LOG_DEBUG);
 				}
@@ -279,7 +280,7 @@ class CMailFile
 
 		// Add autocopy to if not already in $to (Note: Adding bcc for specific modules are also done from pages)
 		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO) && !preg_match('/'.preg_quote($conf->global->MAIN_MAIL_AUTOCOPY_TO, '/').'/i', $to)) {
-		    $addr_bcc .= ($addr_bcc ? ', ' : '').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+			$addr_bcc .= ($addr_bcc ? ', ' : '').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
 		}
 
 		$this->addr_to = $to;
@@ -292,8 +293,7 @@ class CMailFile
 		$this->deliveryreceipt = $deliveryreceipt;
 		$this->trackid = $trackid;
 
-		if (!empty($conf->global->MAIN_MAIL_FORCE_SENDTO))
-		{
+		if (!empty($conf->global->MAIN_MAIL_FORCE_SENDTO)) {
 			$this->addr_to = $conf->global->MAIN_MAIL_FORCE_SENDTO;
 			$this->addr_cc = '';
 			$this->addr_bcc = '';
@@ -311,8 +311,7 @@ class CMailFile
 
 		// We set all data according to choosed sending method.
 		// We also set a value for ->msgid
-		if ($this->sendmode == 'mail')
-		{
+		if ($this->sendmode == 'mail') {
 			// Use mail php function (default PHP method)
 			// ------------------------------------------
 
@@ -323,15 +322,15 @@ class CMailFile
 
 			// Define smtp_headers (this also set ->msgid)
 			$smtp_headers = $this->write_smtpheaders();
-			if (!empty($moreinheader)) $smtp_headers .= $moreinheader; // $moreinheader contains the \r\n
+			if (!empty($moreinheader)) {
+				$smtp_headers .= $moreinheader; // $moreinheader contains the \r\n
+			}
 
 			// Define mime_headers
 			$mime_headers = $this->write_mimeheaders($filename_list, $mimefilename_list);
 
-			if (!empty($this->html))
-			{
-				if (!empty($css))
-				{
+			if (!empty($this->html)) {
+				if (!empty($css)) {
 					$this->css = $css;
 					$this->buildCSS(); // Build a css style (mode = all) into this->styleCSS and this->bodyCSS
 				}
@@ -357,8 +356,7 @@ class CMailFile
 			$this->message = 'This is a message with multiple parts in MIME format.'.$this->eol;
 			$this->message .= $text_body.$files_encoded;
 			$this->message .= "--".$this->mixed_boundary."--".$this->eol;
-		} elseif ($this->sendmode == 'smtps')
-		{
+		} elseif ($this->sendmode == 'smtps') {
 			// Use SMTPS library
 			// ------------------------------------------
 
@@ -378,12 +376,12 @@ class CMailFile
 			$smtps->setTrackId($this->trackid);
 			$smtps->setReplyTo($this->getValidAddress($this->reply_to, 0, 1));
 
-			if (!empty($moreinheader)) $smtps->setMoreInHeader($moreinheader);
+			if (!empty($moreinheader)) {
+				$smtps->setMoreInHeader($moreinheader);
+			}
 
-			if (!empty($this->html))
-			{
-				if (!empty($css))
-				{
+			if (!empty($this->html)) {
+				if (!empty($css)) {
 					$this->css = $css;
 					$this->buildCSS();
 				}
@@ -394,21 +392,20 @@ class CMailFile
 			// Replace . alone on a new line with .. to avoid to have SMTP interpret this as end of message
 			$msg = preg_replace('/(\r|\n)\.(\r|\n)/ims', '\1..\2', $msg);
 
-			if ($this->msgishtml) $smtps->setBodyContent($msg, 'html');
-			else $smtps->setBodyContent($msg, 'plain');
+			if ($this->msgishtml) {
+				$smtps->setBodyContent($msg, 'html');
+			} else {
+				$smtps->setBodyContent($msg, 'plain');
+			}
 
-			if ($this->atleastoneimage)
-			{
-				foreach ($this->images_encoded as $img)
-				{
+			if ($this->atleastoneimage) {
+				foreach ($this->images_encoded as $img) {
 					$smtps->setImageInline($img['image_encoded'], $img['name'], $img['content_type'], $img['cid']);
 				}
 			}
 
-			if (!empty($this->atleastonefile))
-			{
-				foreach ($filename_list as $i => $val)
-				{
+			if (!empty($this->atleastonefile)) {
+				foreach ($filename_list as $i => $val) {
 					$content = file_get_contents($filename_list[$i]);
 					$smtps->setAttachment($content, $mimefilename_list[$i], $mimetype_list[$i]);
 				}
@@ -418,7 +415,9 @@ class CMailFile
 			$smtps->setBCC($this->addr_bcc);
 			$smtps->setErrorsTo($this->errors_to);
 			$smtps->setDeliveryReceipt($this->deliveryreceipt);
-			if (!empty($conf->global->$keyforsslseflsigned)) $smtps->setOptions(array('ssl' => array('verify_peer' => false, 'verify_peer_name' => false, 'allow_self_signed' => true)));
+			if (!empty($conf->global->$keyforsslseflsigned)) {
+				$smtps->setOptions(array('ssl' => array('verify_peer' => false, 'verify_peer_name' => false, 'allow_self_signed' => true)));
+			}
 
 			$host = dol_getprefix('email');
 			$this->msgid = time().'.SMTPs-dolibarr-'.$this->trackid.'@'.$host;
@@ -465,8 +464,7 @@ class CMailFile
 						$regexp = '/([a-z0-9_\.\-\+])+\@(([a-z0-9\-])+\.)+([a-z0-9]{2,4})+/i'; // This regular expression extracts all emails from a string
 						$emailMatchs = preg_match_all($regexp, $from, $adressEmailFrom);
 						$adressEmailFrom = reset($adressEmailFrom);
-						if ($emailMatchs !== false && filter_var($conf->global->MAIN_MAIL_SMTPS_ID, FILTER_VALIDATE_EMAIL) && $conf->global->MAIN_MAIL_SMTPS_ID !== $adressEmailFrom)
-						{
+						if ($emailMatchs !== false && filter_var($conf->global->MAIN_MAIL_SMTPS_ID, FILTER_VALIDATE_EMAIL) && $conf->global->MAIN_MAIL_SMTPS_ID !== $adressEmailFrom) {
 							$result = $this->message->setFrom($conf->global->MAIN_MAIL_SMTPS_ID);
 						} else {
 							$result = $this->message->setFrom($this->getArrayAddress($this->addr_from));
@@ -511,10 +509,8 @@ class CMailFile
 				$msg = $this->checkIfHTML($msg);
 			}
 
-			if ($this->atleastoneimage)
-			{
-				foreach ($this->images_encoded as $img)
-				{
+			if ($this->atleastoneimage) {
+				foreach ($this->images_encoded as $img) {
 					//$img['fullpath'],$img['image_encoded'],$img['name'],$img['content_type'],$img['cid']
 					$attachment = Swift_Image::fromPath($img['fullpath']);
 					// embed image
@@ -534,10 +530,8 @@ class CMailFile
 				$this->message->addPart(dol_nl2br($msg), 'text/html');
 			}
 
-			if (!empty($this->atleastonefile))
-			{
-				foreach ($filename_list as $i => $val)
-				{
+			if (!empty($this->atleastonefile)) {
+				foreach ($filename_list as $i => $val) {
 					//$this->message->attach(Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]));
 					$attachment = Swift_Attachment::fromPath($filename_list[$i], $mimetype_list[$i]);
 					if (!empty($mimefilename_list[$i])) {
@@ -547,10 +541,16 @@ class CMailFile
 				}
 			}
 
-			if (!empty($this->addr_cc)) $this->message->setCc($this->getArrayAddress($this->addr_cc));
-			if (!empty($this->addr_bcc)) $this->message->setBcc($this->getArrayAddress($this->addr_bcc));
+			if (!empty($this->addr_cc)) {
+				$this->message->setCc($this->getArrayAddress($this->addr_cc));
+			}
+			if (!empty($this->addr_bcc)) {
+				$this->message->setBcc($this->getArrayAddress($this->addr_bcc));
+			}
 			//if (! empty($this->errors_to)) $this->message->setErrorsTo($this->getArrayAddress($this->errors_to));
-			if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) $this->message->setReadReceiptTo($this->getArrayAddress($this->addr_from));
+			if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) {
+				$this->message->setReadReceiptTo($this->getArrayAddress($this->addr_from));
+			}
 		} else {
 			// Send mail method not correctly defined
 			// --------------------------------------
@@ -573,29 +573,25 @@ class CMailFile
 
 		$res = false;
 
-		if (empty($conf->global->MAIN_DISABLE_ALL_MAILS))
-		{
+		if (empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($db);
 			$hookmanager->initHooks(array('mail'));
 
 			$parameters = array(); $action = '';
 			$reshook = $hookmanager->executeHooks('sendMail', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-			if ($reshook < 0)
-			{
+			if ($reshook < 0) {
 				$this->error = "Error in hook maildao sendMail ".$reshook;
 				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 
 				return $reshook;
 			}
-			if ($reshook == 1)	// Hook replace standard code
-			{
+			if ($reshook == 1) {	// Hook replace standard code
 				return true;
 			}
 
 			$sendingmode = $this->sendmode;
-			if ($this->context == 'emailing' && !empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail')
-			{
+			if ($this->context == 'emailing' && !empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail') {
 				// List of sending methods
 				$listofmethods = array();
 				$listofmethods['mail'] = 'PHP mail function';
@@ -610,8 +606,7 @@ class CMailFile
 				$this->errors[] = $langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]);
 				$this->error .= '<br>'.$langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']);
 				$this->errors[] = $langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']);
-				if (!empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS))
-				{
+				if (!empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) {
 					$this->error .= '<br>'.$langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS);
 					$this->errors[] = $langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS);
 				}
@@ -619,33 +614,37 @@ class CMailFile
 			}
 
 			// Check number of recipient is lower or equal than MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL = 10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) {
+				$conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL = 10;
+			}
 			$tmparray1 = explode(',', $this->addr_to);
-			if (count($tmparray1) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)
-			{
+			if (count($tmparray1) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL) {
 				$this->error = 'Too much recipients in to:';
 				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL = 10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) {
+				$conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL = 10;
+			}
 			$tmparray2 = explode(',', $this->addr_cc);
-			if (count($tmparray2) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)
-			{
+			if (count($tmparray2) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL) {
 				$this->error = 'Too much recipients in cc:';
 				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL = 10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) {
+				$conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL = 10;
+			}
 			$tmparray3 = explode(',', $this->addr_bcc);
-			if (count($tmparray3) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)
-			{
+			if (count($tmparray3) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL) {
 				$this->error = 'Too much recipients in bcc:';
 				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL = 10;
-			if ((count($tmparray1) + count($tmparray2) + count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
-			{
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) {
+				$conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL = 10;
+			}
+			if ((count($tmparray1) + count($tmparray2) + count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL) {
 				$this->error = 'Too much recipients in to:, cc:, bcc:';
 				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_WARNING);
 				return false;
@@ -674,8 +673,7 @@ class CMailFile
 			}
 
 			// Action according to choosed sending method
-			if ($this->sendmode == 'mail')
-			{
+			if ($this->sendmode == 'mail') {
 				// Use mail php function (default PHP method)
 				// ------------------------------------------
 				dol_syslog("CMailFile::sendfile addr_to=".$this->addr_to.", subject=".$this->subject, LOG_DEBUG);
@@ -683,59 +681,67 @@ class CMailFile
 				//dol_syslog("CMailFile::sendfile message=\n".$message);
 
 				// If Windows, sendmail_from must be defined
-				if (isset($_SERVER["WINDIR"]))
-				{
-					if (empty($this->addr_from)) $this->addr_from = 'robot@example.com';
+				if (isset($_SERVER["WINDIR"])) {
+					if (empty($this->addr_from)) {
+						$this->addr_from = 'robot@example.com';
+					}
 					@ini_set('sendmail_from', $this->getValidAddress($this->addr_from, 2));
 				}
 
 				// Force parameters
 				//dol_syslog("CMailFile::sendfile conf->global->".$keyforsmtpserver."=".$conf->global->$keyforsmtpserver." cpnf->global->".$keyforsmtpport."=".$conf->global->$keyforsmtpport, LOG_DEBUG);
-				if (!empty($conf->global->$keyforsmtpserver)) ini_set('SMTP', $conf->global->$keyforsmtpserver);
-				if (!empty($conf->global->$keyforsmtpport))   ini_set('smtp_port', $conf->global->$keyforsmtpport);
+				if (!empty($conf->global->$keyforsmtpserver)) {
+					ini_set('SMTP', $conf->global->$keyforsmtpserver);
+				}
+				if (!empty($conf->global->$keyforsmtpport)) {
+					ini_set('smtp_port', $conf->global->$keyforsmtpport);
+				}
 
 				$res = true;
-				if ($res && !$this->subject)
-				{
+				if ($res && !$this->subject) {
 					$this->error = "Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Subject is empty";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res = false;
 				}
 				$dest = $this->getValidAddress($this->addr_to, 2);
-				if ($res && !$dest)
-				{
+				if ($res && !$dest) {
 					$this->error = "Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Recipient address '$dest' invalid";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res = false;
 				}
 
-				if ($res)
-				{
+				if ($res) {
 					$additionnalparam = ''; // By default
-					if (!empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F))
-					{
+					if (!empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) {
 						// le "Return-Path" (retour des messages bounced) dans les header ne fonctionne pas avec tous les MTA
 						// Le forcage de la valeur grace à l'option -f de sendmail est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie.
 						// Having this variable defined may create problems with some sendmail (option -f refused)
 						// Having this variable not defined may create problems with some other sendmail (option -f required)
 						$additionnalparam .= ($additionnalparam ? ' ' : '').(!empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f'.$this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO, 2) : ($this->addr_from != '' ? '-f'.$this->getValidAddress($this->addr_from, 2) : ''));
 					}
-					if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
-					{
+					if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) {    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
 						$additionnalparam .= ($additionnalparam ? ' ' : '').'-ba';
 					}
 
-					if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam ? ' ' : '').'-U '.$additionnalparam; // Use -U to add additionnal params
+					if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) {
+						$additionnalparam .= ($additionnalparam ? ' ' : '').'-U '.$additionnalparam; // Use -U to add additionnal params
+					}
 
 					$linuxlike = 1;
-					if (preg_match('/^win/i', PHP_OS)) $linuxlike = 0;
-					if (preg_match('/^mac/i', PHP_OS)) $linuxlike = 0;
+					if (preg_match('/^win/i', PHP_OS)) {
+						$linuxlike = 0;
+					}
+					if (preg_match('/^mac/i', PHP_OS)) {
+						$linuxlike = 0;
+					}
 
 					dol_syslog("CMailFile::sendfile: mail start".($linuxlike ? '' : " HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')).", additionnal_parameters=".$additionnalparam, LOG_DEBUG);
 
 					$this->message = stripslashes($this->message);
 
-					if (!empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+					if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
+						$this->dump_mail();
+					}
 
 					// Encode subject if required.
 					$subjecttouse = $this->subject;
@@ -743,11 +749,13 @@ class CMailFile
 						$subjecttouse = $this->encodetorfc2822($subjecttouse);
 					}
 
-					if (!empty($additionnalparam)) $res = mail($dest, $subjecttouse, $this->message, $this->headers, $additionnalparam);
-					else $res = mail($dest, $subjecttouse, $this->message, $this->headers);
+					if (!empty($additionnalparam)) {
+						$res = mail($dest, $subjecttouse, $this->message, $this->headers, $additionnalparam);
+					} else {
+						$res = mail($dest, $subjecttouse, $this->message, $this->headers);
+					}
 
-					if (!$res)
-					{
+					if (!$res) {
 						$langs->load("errors");
 						$this->error = "Failed to send mail with php mail";
 						if (!$linuxlike) {
@@ -761,18 +769,19 @@ class CMailFile
 					}
 				}
 
-				if (isset($_SERVER["WINDIR"]))
-				{
+				if (isset($_SERVER["WINDIR"])) {
 					@ini_restore('sendmail_from');
 				}
 
 				// Restore parameters
-				if (!empty($conf->global->$keyforsmtpserver))	ini_restore('SMTP');
-				if (!empty($conf->global->$keyforsmtpport)) 	ini_restore('smtp_port');
-			} elseif ($this->sendmode == 'smtps')
-			{
-				if (!is_object($this->smtps))
-				{
+				if (!empty($conf->global->$keyforsmtpserver)) {
+					ini_restore('SMTP');
+				}
+				if (!empty($conf->global->$keyforsmtpport)) {
+					ini_restore('smtp_port');
+				}
+			} elseif ($this->sendmode == 'smtps') {
+				if (!is_object($this->smtps)) {
 					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Constructor of object CMailFile was not initialized without errors.";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					return false;
@@ -783,14 +792,22 @@ class CMailFile
 				$this->smtps->setTransportType(0); // Only this method is coded in SMTPs library
 
 				// Clean parameters
-				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver = ini_get('SMTP');
-				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport = ini_get('smtp_port');
+				if (empty($conf->global->$keyforsmtpserver)) {
+					$conf->global->$keyforsmtpserver = ini_get('SMTP');
+				}
+				if (empty($conf->global->$keyforsmtpport)) {
+					$conf->global->$keyforsmtpport = ini_get('smtp_port');
+				}
 
 				// If we use SSL/TLS
 				$server = $conf->global->$keyforsmtpserver;
 				$secure = '';
-				if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure = 'ssl';
-				if (!empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure = 'tls';
+				if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) {
+					$secure = 'ssl';
+				}
+				if (!empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) {
+					$secure = 'tls';
+				}
 				$server = ($secure ? $secure.'://' : '').$server;
 
 				$port = $conf->global->$keyforsmtpport;
@@ -799,74 +816,87 @@ class CMailFile
 				$this->smtps->setPort($port); // 25, 465...;
 
 				$loginid = ''; $loginpass = '';
-				if (!empty($conf->global->$keyforsmtpid))
-				{
+				if (!empty($conf->global->$keyforsmtpid)) {
 					$loginid = $conf->global->$keyforsmtpid;
 					$this->smtps->setID($loginid);
 				}
-				if (!empty($conf->global->$keyforsmtppw))
-				{
+				if (!empty($conf->global->$keyforsmtppw)) {
 					$loginpass = $conf->global->$keyforsmtppw;
 					$this->smtps->setPW($loginpass);
 				}
 
 				$res = true;
 				$from = $this->smtps->getFrom('org');
-				if ($res && !$from)
-				{
+				if ($res && !$from) {
 					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport." - Sender address '$from' invalid";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res = false;
 				}
 				$dest = $this->smtps->getTo();
-				if ($res && !$dest)
-				{
+				if ($res && !$dest) {
 					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport." - Recipient address '$dest' invalid";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res = false;
 				}
 
-				if ($res)
-				{
-					if (!empty($conf->global->MAIN_MAIL_DEBUG)) $this->smtps->setDebug(true);
+				if ($res) {
+					if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
+						$this->smtps->setDebug(true);
+					}
 
 					$result = $this->smtps->sendMsg();
 					//print $result;
 
-					if (!empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+					if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
+						$this->dump_mail();
+					}
 
 					$result = $this->smtps->getErrors();
-					if (empty($this->error) && empty($result))
-					{
+					if (empty($this->error) && empty($result)) {
 						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 						$res = true;
 					} else {
-						if (empty($this->error)) $this->error = $result;
+						if (empty($this->error)) {
+							$this->error = $result;
+						}
 						dol_syslog("CMailFile::sendfile: mail end error with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport." - ".$this->error, LOG_ERR);
 						$res = false;
 					}
 				}
-			} elseif ($this->sendmode == 'swiftmailer')
-			{
+			} elseif ($this->sendmode == 'swiftmailer') {
 				// Use Swift Mailer library
 				// ------------------------------------------
 				require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
 
 				// Clean parameters
-				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver = ini_get('SMTP');
-				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport = ini_get('smtp_port');
+				if (empty($conf->global->$keyforsmtpserver)) {
+					$conf->global->$keyforsmtpserver = ini_get('SMTP');
+				}
+				if (empty($conf->global->$keyforsmtpport)) {
+					$conf->global->$keyforsmtpport = ini_get('smtp_port');
+				}
 
 				// If we use SSL/TLS
 				$server = $conf->global->$keyforsmtpserver;
 				$secure = '';
-				if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure = 'ssl';
-				if (!empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure = 'tls';
+				if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) {
+					$secure = 'ssl';
+				}
+				if (!empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) {
+					$secure = 'tls';
+				}
 
 				$this->transport = new Swift_SmtpTransport($server, $conf->global->$keyforsmtpport, $secure);
 
-				if (!empty($conf->global->$keyforsmtpid)) $this->transport->setUsername($conf->global->$keyforsmtpid);
-				if (!empty($conf->global->$keyforsmtppw)) $this->transport->setPassword($conf->global->$keyforsmtppw);
-				if (!empty($conf->global->$keyforsslseflsigned)) $this->transport->setStreamOptions(array('ssl' => array('allow_self_signed' => true, 'verify_peer' => false)));
+				if (!empty($conf->global->$keyforsmtpid)) {
+					$this->transport->setUsername($conf->global->$keyforsmtpid);
+				}
+				if (!empty($conf->global->$keyforsmtppw)) {
+					$this->transport->setPassword($conf->global->$keyforsmtppw);
+				}
+				if (!empty($conf->global->$keyforsslseflsigned)) {
+					$this->transport->setStreamOptions(array('ssl' => array('allow_self_signed' => true, 'verify_peer' => false)));
+				}
 				//$smtps->_msgReplyTo  = 'reply@web.com';
 
 				// Switch content encoding to base64 - avoid the doubledot issue with quoted-printable
@@ -898,7 +928,9 @@ class CMailFile
 				} catch (Exception $e) {
 					$this->error = $e->getMessage();
 				}
-				if (!empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+				if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
+					$this->dump_mail();
+				}
 
 				$res = true;
 				if (!empty($this->error) || !$result) {
@@ -916,8 +948,7 @@ class CMailFile
 
 			$parameters = array(); $action = '';
 			$reshook = $hookmanager->executeHooks('sendMailAfter', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-			if ($reshook < 0)
-			{
+			if ($reshook < 0) {
 				$this->error = "Error in hook maildao sendMailAfter ".$reshook;
 				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 
@@ -1014,9 +1045,13 @@ class CMailFile
 	{
 		if (!preg_match('/^[\s\t]*<html/i', $msg)) {
 			$out = "<html><head><title></title>";
-			if (!empty($this->styleCSS)) $out .= $this->styleCSS;
+			if (!empty($this->styleCSS)) {
+				$out .= $this->styleCSS;
+			}
 			$out .= "</head><body";
-			if (!empty($this->bodyCSS)) $out .= $this->bodyCSS;
+			if (!empty($this->bodyCSS)) {
+				$out .= $this->bodyCSS;
+			}
 			$out .= ">";
 			$out .= $msg;
 			$out .= "</body></html>";
@@ -1070,29 +1105,37 @@ class CMailFile
 		// Sender
 		//$out.= "Sender: ".getValidAddress($this->addr_from,2)).$this->eol2;
 		$out .= "From: ".$this->getValidAddress($this->addr_from, 3, 1).$this->eol2;
-		if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))
-		{
+		if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) {
 			$out .= "To: ".$this->getValidAddress($this->addr_to, 0, 1).$this->eol2;
 		}
 		// Return-Path is important because it is used by SPF. Some MTA does not read Return-Path from header but from command line. See option MAIN_MAIL_ALLOW_SENDMAIL_F for that.
 		$out .= "Return-Path: ".$this->getValidAddress($this->addr_from, 0, 1).$this->eol2;
-		if (isset($this->reply_to) && $this->reply_to)  $out .= "Reply-To: ".$this->getValidAddress($this->reply_to, 2).$this->eol2;
-		if (isset($this->errors_to) && $this->errors_to) $out .= "Errors-To: ".$this->getValidAddress($this->errors_to, 2).$this->eol2;
+		if (isset($this->reply_to) && $this->reply_to) {
+			$out .= "Reply-To: ".$this->getValidAddress($this->reply_to, 2).$this->eol2;
+		}
+		if (isset($this->errors_to) && $this->errors_to) {
+			$out .= "Errors-To: ".$this->getValidAddress($this->errors_to, 2).$this->eol2;
+		}
 
 		// Receiver
-		if (isset($this->addr_cc) && $this->addr_cc)   $out .= "Cc: ".$this->getValidAddress($this->addr_cc, 2).$this->eol2;
-		if (isset($this->addr_bcc) && $this->addr_bcc)  $out .= "Bcc: ".$this->getValidAddress($this->addr_bcc, 2).$this->eol2; // TODO Question: bcc must not be into header, only into SMTP command "RCPT TO". Does php mail support this ?
+		if (isset($this->addr_cc) && $this->addr_cc) {
+			$out .= "Cc: ".$this->getValidAddress($this->addr_cc, 2).$this->eol2;
+		}
+		if (isset($this->addr_bcc) && $this->addr_bcc) {
+			$out .= "Bcc: ".$this->getValidAddress($this->addr_bcc, 2).$this->eol2; // TODO Question: bcc must not be into header, only into SMTP command "RCPT TO". Does php mail support this ?
+		}
 
 		// Delivery receipt
-		if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) $out .= "Disposition-Notification-To: ".$this->getValidAddress($this->addr_from, 2).$this->eol2;
+		if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) {
+			$out .= "Disposition-Notification-To: ".$this->getValidAddress($this->addr_from, 2).$this->eol2;
+		}
 
 		//$out.= "X-Priority: 3".$this->eol2;
 
 		$out .= 'Date: '.date("r").$this->eol2;
 
 		$trackid = $this->trackid;
-		if ($trackid)
-		{
+		if ($trackid) {
 			// References is kept in response and Message-ID is returned into In-Reply-To:
 			$this->msgid = time().'.phpmail-dolibarr-'.$trackid.'@'.$host;
 			$out .= 'Message-ID: <'.$this->msgid.">".$this->eol2; // Uppercase seems replaced by phpmail
@@ -1103,7 +1146,9 @@ class CMailFile
 			$out .= 'Message-ID: <'.$this->msgid.">".$this->eol2;
 		}
 
-		if (!empty($_SERVER['REMOTE_ADDR'])) $out .= "X-RemoteAddr: ".$_SERVER['REMOTE_ADDR'].$this->eol2;
+		if (!empty($_SERVER['REMOTE_ADDR'])) {
+			$out .= "X-RemoteAddr: ".$_SERVER['REMOTE_ADDR'].$this->eol2;
+		}
 		$out .= "X-Mailer: Dolibarr version ".DOL_VERSION." (using php mail)".$this->eol2;
 		$out .= "Mime-Version: 1.0".$this->eol2;
 
@@ -1131,14 +1176,13 @@ class CMailFile
 		$mimedone = 0;
 		$out = "";
 
-		if (is_array($filename_list))
-		{
+		if (is_array($filename_list)) {
 			$filename_list_size = count($filename_list);
-			for ($i = 0; $i < $filename_list_size; $i++)
-			{
-				if ($filename_list[$i])
-				{
-					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
+			for ($i = 0; $i < $filename_list_size; $i++) {
+				if ($filename_list[$i]) {
+					if ($mimefilename_list[$i]) {
+						$filename_list[$i] = $mimefilename_list[$i];
+					}
 					$out .= "X-attachments: $filename_list[$i]".$this->eol2;
 				}
 			}
@@ -1164,8 +1208,7 @@ class CMailFile
 
 		$out .= "--".$this->mixed_boundary.$this->eol;
 
-		if ($this->atleastoneimage)
-		{
+		if ($this->atleastoneimage) {
 			$out .= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
 			$out .= $this->eol;
 			$out .= "--".$this->alternative_boundary.$this->eol;
@@ -1173,14 +1216,12 @@ class CMailFile
 
 		// Make RFC821 Compliant, replace bare linefeeds
 		$strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $msgtext); // PCRE modifier /s means new lines are common chars
-		if (!empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
-		{
+		if (!empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)) {
 			$strContent = preg_replace("/\r\n/si", "\n", $strContent); // PCRE modifier /s means new lines are common chars
 		}
 
 		$strContentAltText = '';
-		if ($this->msgishtml)
-		{
+		if ($this->msgishtml) {
 			// Similar code to forge a text from html is also in smtps.class.php
 			$strContentAltText = preg_replace("/<br\s*[^>]*>/", " ", $strContent);
 			$strContentAltText = html_entity_decode(strip_tags($strContentAltText));
@@ -1195,10 +1236,8 @@ class CMailFile
 		// TODO Encode main content into base64 and use the chunk_split, or quoted-printable
 		$strContent = rtrim(wordwrap($strContent, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA) ? "\r\n" : "\n")); // TODO Using this method creates unexpected line break on text/plain content.
 
-		if ($this->msgishtml)
-		{
-			if ($this->atleastoneimage)
-			{
+		if ($this->msgishtml) {
+			if ($this->atleastoneimage) {
 				$out .= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
 				//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
 				$out .= $this->eol.($strContentAltText ? $strContentAltText : strip_tags($strContent)).$this->eol; // Add plain text message
@@ -1208,8 +1247,7 @@ class CMailFile
 				$out .= "--".$this->related_boundary.$this->eol;
 			}
 
-			if (!$this->atleastoneimage && $strContentAltText && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part before html part
-			{
+			if (!$this->atleastoneimage && $strContentAltText && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {    // Add plain text message part before html part
 				$out .= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
 				$out .= $this->eol;
 				$out .= "--".$this->alternative_boundary.$this->eol;
@@ -1223,8 +1261,7 @@ class CMailFile
 			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;	// TODO Use base64
 			$out .= $this->eol.$strContent.$this->eol;
 
-			if (!$this->atleastoneimage && $strContentAltText && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part after html part
-			{
+			if (!$this->atleastoneimage && $strContentAltText && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {    // Add plain text message part after html part
 				$out .= "--".$this->alternative_boundary."--".$this->eol;
 			}
 		} else {
@@ -1236,8 +1273,7 @@ class CMailFile
 		$out .= $this->eol;
 
 		// Encode images
-		if ($this->atleastoneimage)
-		{
+		if ($this->atleastoneimage) {
 			$out .= $this->write_images($this->images_encoded);
 			// always end related and end alternative after inline images
 			$out .= "--".$this->related_boundary."--".$this->eol;
@@ -1263,15 +1299,14 @@ class CMailFile
 		$out = '';
 
 		$filename_list_size = count($filename_list);
-		for ($i = 0; $i < $filename_list_size; $i++)
-		{
-			if ($filename_list[$i])
-			{
+		for ($i = 0; $i < $filename_list_size; $i++) {
+			if ($filename_list[$i]) {
 				dol_syslog("CMailFile::write_files: i=$i");
 				$encoded = $this->_encode_file($filename_list[$i]);
-				if ($encoded >= 0)
-				{
-					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
+				if ($encoded >= 0) {
+					if ($mimefilename_list[$i]) {
+						$filename_list[$i] = $mimefilename_list[$i];
+					}
 					if (!$mimetype_list[$i]) {
 						$mimetype_list[$i] = "application/octet-stream";
 					}
@@ -1307,10 +1342,8 @@ class CMailFile
 		// phpcs:enable
 		$out = '';
 
-		if (is_array($images_list))
-		{
-			foreach ($images_list as $img)
-			{
+		if (is_array($images_list)) {
+			foreach ($images_list as $img) {
 				dol_syslog("CMailFile::write_images: ".$img["name"]);
 
 				$out .= "--".$this->related_boundary.$this->eol; // always related for an inline image
@@ -1344,16 +1377,14 @@ class CMailFile
 		$_retVal = 0;
 		$timeout = 5; // Timeout in seconds
 
-		if (function_exists('fsockopen'))
-		{
+		if (function_exists('fsockopen')) {
 			$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER';
 			$keyforsmtpport  = 'MAIN_MAIL_SMTP_PORT';
 			$keyforsmtpid    = 'MAIN_MAIL_SMTPS_ID';
 			$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW';
 			$keyfortls       = 'MAIN_MAIL_EMAIL_TLS';
 			$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS';
-			if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
-			{
+			if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default') {
 				$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER_EMAILING';
 				$keyforsmtpport  = 'MAIN_MAIL_SMTP_PORT_EMAILING';
 				$keyforsmtpid    = 'MAIN_MAIL_SMTPS_ID_EMAILING';
@@ -1363,26 +1394,32 @@ class CMailFile
 			}
 
 			// If we use SSL/TLS
-			if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) $host = 'ssl://'.$host;
+			if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) {
+				$host = 'ssl://'.$host;
+			}
 			// tls smtp start with no encryption
 			//if (! empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $host='tls://'.$host;
 
 			dol_syslog("Try socket connection to host=".$host." port=".$port);
 			//See if we can connect to the SMTP server
 			if ($socket = @fsockopen(
-					$host, // Host to test, IP or domain. Add ssl:// for SSL/TLS.
-					$port, // which Port number to use
-					$errno, // actual system level error
-					$errstr, // and any text that goes with the error
-					$timeout     // timeout for reading/writing data over the socket
+				$host, // Host to test, IP or domain. Add ssl:// for SSL/TLS.
+				$port, // which Port number to use
+				$errno, // actual system level error
+				$errstr, // and any text that goes with the error
+				$timeout     // timeout for reading/writing data over the socket
 			)) {
 				// Windows still does not have support for this timeout function
-				if (function_exists('stream_set_timeout')) stream_set_timeout($socket, $timeout, 0);
+				if (function_exists('stream_set_timeout')) {
+					stream_set_timeout($socket, $timeout, 0);
+				}
 
 				dol_syslog("Now we wait for answer 220");
 
 				// Check response from Server
-				if ($_retVal = $this->server_parse($socket, "220")) $_retVal = $socket;
+				if ($_retVal = $this->server_parse($socket, "220")) {
+					$_retVal = $socket;
+				}
 			} else {
 				$this->error = utf8_check('Error '.$errno.' - '.$errstr) ? 'Error '.$errno.' - '.$errstr : utf8_encode('Error '.$errno.' - '.$errstr);
 			}
@@ -1405,17 +1442,14 @@ class CMailFile
 		$_retVal = true; // Indicates if Object was created or not
 		$server_response = '';
 
-		while (substr($server_response, 3, 1) != ' ')
-		{
-			if (!($server_response = fgets($socket, 256)))
-			{
+		while (substr($server_response, 3, 1) != ' ') {
+			if (!($server_response = fgets($socket, 256))) {
 				$this->error = "Couldn't get mail server response codes";
 				return false;
 			}
 		}
 
-		if (!(substr($server_response, 0, 3) == $response))
-		{
+		if (!(substr($server_response, 0, 3) == $response)) {
 			$this->error = "Ran into problems sending Mail.\r\nResponse: $server_response";
 			$_retVal = false;
 		}
@@ -1437,17 +1471,13 @@ class CMailFile
 		$matches = array();
 		preg_match_all('/(?:"|\')([^"\']+\.('.implode('|', $extensions).'))(?:"|\')/Ui', $this->html, $matches); // If "xxx.ext" or 'xxx.ext' found
 
-		if (!empty($matches))
-		{
+		if (!empty($matches)) {
 			$i = 0;
-			foreach ($matches[1] as $full)
-			{
-				if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i', $full, $regs))   // If xxx is 'file=aaa'
-				{
+			foreach ($matches[1] as $full) {
+				if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i', $full, $regs)) {   // If xxx is 'file=aaa'
 					$img = $regs[1];
 
-					if (file_exists($images_dir.'/'.$img))
-					{
+					if (file_exists($images_dir.'/'.$img)) {
 						// Image path in src
 						$src = preg_quote($full, '/');
 
@@ -1458,8 +1488,7 @@ class CMailFile
 						$this->html_images[$i]["name"] = $img;
 
 						// Content type
-						if (preg_match('/^.+\.(\w{3,4})$/', $img, $reg))
-						{
+						if (preg_match('/^.+\.(\w{3,4})$/', $img, $reg)) {
 							$ext = strtolower($reg[1]);
 							$this->html_images[$i]["content_type"] = $this->image_types[$ext];
 						}
@@ -1472,22 +1501,18 @@ class CMailFile
 				}
 			}
 
-			if (!empty($this->html_images))
-			{
+			if (!empty($this->html_images)) {
 				$inline = array();
 
 				$i = 0;
 
-				foreach ($this->html_images as $img)
-				{
+				foreach ($this->html_images as $img) {
 					$fullpath = $images_dir.'/'.$img["name"];
 
 					// If duplicate images are embedded, they may show up as attachments, so remove them.
-					if (!in_array($fullpath, $inline))
-					{
+					if (!in_array($fullpath, $inline)) {
 						// Read image file
-						if ($image = file_get_contents($fullpath))
-						{
+						if ($image = file_get_contents($fullpath)) {
 							// On garde que le nom de l'image
 							preg_match('/([A-Za-z0-9_-]+[\.]?[A-Za-z0-9]+)?$/i', $img["name"], $regs);
 							$imgName = $regs[1];
@@ -1538,11 +1563,9 @@ class CMailFile
 
 		// Boucle sur chaque composant de l'adresse
 		$i = 0;
-		foreach ($arrayaddress as $val)
-		{
+		foreach ($arrayaddress as $val) {
 			$regs = array();
-			if (preg_match('/^(.*)<(.*)>$/i', trim($val), $regs))
-			{
+			if (preg_match('/^(.*)<(.*)>$/i', trim($val), $regs)) {
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
 			} else {
@@ -1550,8 +1573,7 @@ class CMailFile
 				$email = trim($val);
 			}
 
-			if ($email)
-			{
+			if ($email) {
 				$i++;
 
 				$newemail = '';
@@ -1559,31 +1581,32 @@ class CMailFile
 					$newemail = $name ? $name : $email;
 					$newemail = '<a href="mailto:'.$email.'">'.$newemail.'</a>';
 				}
-				if ($format == 4)
-				{
+				if ($format == 4) {
 					$newemail = $name ? $name : $email;
 				}
-				if ($format == 2)
-				{
+				if ($format == 2) {
 					$newemail = $email;
 				}
-				if ($format == 1 || $format == 3)
-				{
+				if ($format == 1 || $format == 3) {
 					$newemail = '<'.$email.'>';
 				}
-				if ($format == 0 || $format == 3)
-				{
-					if (!empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)) $newemail = '<'.$email.'>';
-					elseif (!$name) $newemail = '<'.$email.'>';
-					else $newemail = ($format == 3 ? '"' : '').($encode ?self::encodetorfc2822($name) : $name).($format == 3 ? '"' : '').' <'.$email.'>';
+				if ($format == 0 || $format == 3) {
+					if (!empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)) {
+						$newemail = '<'.$email.'>';
+					} elseif (!$name) {
+						$newemail = '<'.$email.'>';
+					} else {
+						$newemail = ($format == 3 ? '"' : '').($encode ?self::encodetorfc2822($name) : $name).($format == 3 ? '"' : '').' <'.$email.'>';
+					}
 				}
 
 				$ret = ($ret ? $ret.',' : '').$newemail;
 
 				// Stop if we have too much records
-				if ($maxnumberofemail && $i >= $maxnumberofemail)
-				{
-					if (count($arrayaddress) > $maxnumberofemail) $ret .= '...';
+				if ($maxnumberofemail && $i >= $maxnumberofemail) {
+					if (count($arrayaddress) > $maxnumberofemail) {
+						$ret .= '...';
+					}
 					break;
 				}
 			}
@@ -1608,10 +1631,8 @@ class CMailFile
 		$arrayaddress = explode(',', $address);
 
 		// Boucle sur chaque composant de l'adresse
-		foreach ($arrayaddress as $val)
-		{
-			if (preg_match('/^(.*)<(.*)>$/i', trim($val), $regs))
-			{
+		foreach ($arrayaddress as $val) {
+			if (preg_match('/^(.*)<(.*)>$/i', trim($val), $regs)) {
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
 			} else {
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 03a5154f23f..2340657ef4e 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -55,6 +55,11 @@ abstract class CommonDocGenerator
 	 */
 	public $extrafieldsCache;
 
+	/**
+	 * @var int	If set to 1, save the fullname of generated file with path as the main doc when generating a doc with this template.
+	 */
+	public $update_main_doc_field;
+
 	/**
 	 *	Constructor
 	 *
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 6afca0c8d35..cc67030ccf6 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -14,6 +14,7 @@
  * Copyright (C) 2017      Rui Strecht		    <rui.strecht@aliartalentos.com>
  * Copyright (C) 2018-2020 Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2018      Josep Lluís Amador   <joseplluis@lliuretic.cat>
+ * Copyright (C) 2021      Gauthier VERDOL   	<gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -221,6 +222,12 @@ abstract class CommonObject
 	 */
 	public $statut;
 
+	/**
+	 * @var int The object's status
+	 * @see setStatut()
+	 */
+	public $status;
+
 	/**
 	 * @var string
 	 * @see getFullAddress()
@@ -348,6 +355,13 @@ abstract class CommonObject
 	 */
 	public $model_pdf;
 
+	/**
+	 * @var string
+	 * @deprecated
+	 * @see model_pdf
+	 */
+	public $modelpdf;
+
 	/**
 	 * @var string
 	 * Contains relative path of last generated main file
@@ -601,7 +615,7 @@ abstract class CommonObject
 		if (empty($lastname))  $lastname = (isset($this->lastname) ? $this->lastname : (isset($this->name) ? $this->name : (isset($this->nom) ? $this->nom : (isset($this->societe) ? $this->societe : (isset($this->company) ? $this->company : '')))));
 
 		$ret = '';
-		if ($option && $this->civility_code)
+		if (!empty($option) && !empty($this->civility_code))
 		{
 			if ($langs->transnoentitiesnoconv("Civility".$this->civility_code) != "Civility".$this->civility_code) $ret .= $langs->transnoentitiesnoconv("Civility".$this->civility_code).' ';
 			else $ret .= $this->civility_code.' ';
@@ -720,7 +734,7 @@ abstract class CommonObject
 		$out = '';
 
 		$outdone = 0;
-		$coords = $this->getFullAddress(1, ', ', $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);
+		$coords = $this->getFullAddress(1, ', ', (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) ? $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT : 0));
 		if ($coords)
 		{
 			if (!empty($conf->use_javascript_ajax))
@@ -956,7 +970,7 @@ abstract class CommonObject
 	 *  @param 	int|string	$type_contact 		Type of contact (code or id). Must be id or code found into table llx_c_type_contact. For example: SALESREPFOLL
 	 *  @param  string		$source             external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)
 	 *  @param  int			$notrigger			Disable all triggers
-	 *  @return int         	        		<0 if KO, >0 if OK
+	 *  @return int         	        		<0 if KO, 0 if already added, >0 if OK
 	 */
 	public function add_contact($fk_socpeople, $type_contact, $source = 'external', $notrigger = 0)
 	{
@@ -1054,7 +1068,6 @@ abstract class CommonObject
 				{
 					$this->error = $this->db->errno();
 					$this->db->rollback();
-					echo 'err rollback';
 					return -2;
 				} else {
 					$this->error = $this->db->error();
@@ -1062,7 +1075,9 @@ abstract class CommonObject
 					return -1;
 				}
 			}
-		} else return 0;
+		} else {
+			return 0;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1407,7 +1422,7 @@ abstract class CommonObject
 					} elseif (strpos($obj->element, 'supplier') !== false && $obj->element != 'supplier_proposal') {
 						$modulename = 'fournisseur';
 					}
-					if ($conf->{$modulename}->enabled) {
+					if (!empty($conf->{$modulename}->enabled)) {
 						$libelle_element = $langs->trans('ContactDefault_'.$obj->element);
 						$transkey = "TypeContact_".$obj->element."_".$source."_".$obj->code;
 						$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
@@ -2065,6 +2080,7 @@ abstract class CommonObject
 			$fieldname = 'fk_mode_reglement';
 			if ($this->element == 'societe') $fieldname = 'mode_reglement';
 			if (get_class($this) == 'Fournisseur') $fieldname = 'mode_reglement_supplier';
+			if (get_class($this) == 'Tva') $fieldname = 'fk_typepayment';
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');
@@ -3257,14 +3273,18 @@ abstract class CommonObject
 	 *
 	 *	@param		string	$origin		Linked element type
 	 *	@param		int		$origin_id	Linked element id
+	 * 	@param		User	$f_user		User that create
+	 * 	@param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return		int					<=0 if KO, >0 if OK
 	 *	@see		fetchObjectLinked(), updateObjectLinked(), deleteObjectLinked()
 	 */
-	public function add_object_linked($origin = null, $origin_id = null)
+	public function add_object_linked($origin = null, $origin_id = null, $f_user = null, $notrigger = 0)
 	{
 		// phpcs:enable
+		global $user;
 		$origin = (!empty($origin) ? $origin : $this->origin);
 		$origin_id = (!empty($origin_id) ? $origin_id : $this->origin_id);
+		$f_user = isset($f_user) ? $f_user : $user;
 
 		// Special case
 		if ($origin == 'order') $origin = 'commande';
@@ -3272,26 +3292,41 @@ abstract class CommonObject
 		if ($origin == 'invoice_template') $origin = 'facturerec';
 		if ($origin == 'supplierorder') $origin = 'order_supplier';
 		$this->db->begin();
+		$error = 0;
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
+		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "element_element (";
 		$sql .= "fk_source";
 		$sql .= ", sourcetype";
 		$sql .= ", fk_target";
 		$sql .= ", targettype";
 		$sql .= ") VALUES (";
 		$sql .= $origin_id;
-		$sql .= ", '".$this->db->escape($origin)."'";
-		$sql .= ", ".$this->id;
-		$sql .= ", '".$this->db->escape($this->element)."'";
+		$sql .= ", '" . $this->db->escape($origin) . "'";
+		$sql .= ", " . $this->id;
+		$sql .= ", '" . $this->db->escape($this->element) . "'";
 		$sql .= ")";
 
-		dol_syslog(get_class($this)."::add_object_linked", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		dol_syslog(get_class($this) . "::add_object_linked", LOG_DEBUG);
+		if ($this->db->query($sql)) {
+			if (!$notrigger) {
+				// Call trigger
+				$this->context['link_origin'] = $origin;
+				$this->context['link_origin_id'] = $origin_id;
+				$result = $this->call_trigger('OBJECT_LINK_INSERT', $f_user);
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$error++;
+		}
+
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
-			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return 0;
 		}
@@ -3502,38 +3537,61 @@ abstract class CommonObject
 	 *	@param  string	$sourcetype		Object source type
 	 *	@param  int		$targetid		Object target id
 	 *	@param  string	$targettype		Object target type
+	 * 	@param	User	$f_user			User that create
+	 * 	@param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 *	@return							int	>0 if OK, <0 if KO
 	 *	@see	add_object_linked(), fetObjectLinked(), deleteObjectLinked()
 	 */
-	public function updateObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '')
+	public function updateObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $f_user = null, $notrigger = 0)
 	{
+		global $user;
 		$updatesource = false;
 		$updatetarget = false;
+		$f_user = isset($f_user) ? $f_user : $user;
 
 		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource = true;
 		elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $updatetarget = true;
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."element_element SET ";
-		if ($updatesource)
-		{
-			$sql .= "fk_source = ".$sourceid;
-			$sql .= ", sourcetype = '".$this->db->escape($sourcetype)."'";
-			$sql .= " WHERE fk_target = ".$this->id;
-			$sql .= " AND targettype = '".$this->db->escape($this->element)."'";
-		} elseif ($updatetarget)
-		{
-			$sql .= "fk_target = ".$targetid;
-			$sql .= ", targettype = '".$this->db->escape($targettype)."'";
-			$sql .= " WHERE fk_source = ".$this->id;
-			$sql .= " AND sourcetype = '".$this->db->escape($this->element)."'";
+		$this->db->begin();
+		$error = 0;
+
+		$sql = "UPDATE " . MAIN_DB_PREFIX . "element_element SET ";
+		if ($updatesource) {
+			$sql .= "fk_source = " . $sourceid;
+			$sql .= ", sourcetype = '" . $this->db->escape($sourcetype) . "'";
+			$sql .= " WHERE fk_target = " . $this->id;
+			$sql .= " AND targettype = '" . $this->db->escape($this->element) . "'";
+		} elseif ($updatetarget) {
+			$sql .= "fk_target = " . $targetid;
+			$sql .= ", targettype = '" . $this->db->escape($targettype) . "'";
+			$sql .= " WHERE fk_source = " . $this->id;
+			$sql .= " AND sourcetype = '" . $this->db->escape($this->element) . "'";
 		}
 
-		dol_syslog(get_class($this)."::updateObjectLinked", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
-			return 1;
+		dol_syslog(get_class($this) . "::updateObjectLinked", LOG_DEBUG);
+		if ($this->db->query($sql)) {
+			if (!$notrigger) {
+				// Call trigger
+				$this->context['link_source_id'] = $sourceid;
+				$this->context['link_source_type'] = $sourcetype;
+				$this->context['link_target_id'] = $targetid;
+				$this->context['link_target_type'] = $targettype;
+				$result = $this->call_trigger('OBJECT_LINK_UPDATE', $f_user);
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
+			}
 		} else {
 			$this->error = $this->db->lasterror();
+			$error++;
+		}
+
+		if (!$error) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
 			return -1;
 		}
 	}
@@ -3546,13 +3604,17 @@ abstract class CommonObject
 	 *	@param  int		$targetid		Object target id
 	 *	@param  string	$targettype		Object target type
 	 *  @param	int		$rowid			Row id of line to delete. If defined, other parameters are not used.
+	 * 	@param	User	$f_user			User that create
+	 * 	@param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 *	@return     					int	>0 if OK, <0 if KO
 	 *	@see	add_object_linked(), updateObjectLinked(), fetchObjectLinked()
 	 */
-	public function deleteObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $rowid = '')
+	public function deleteObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $rowid = '', $f_user = null, $notrigger = 0)
 	{
+		global $user;
 		$deletesource = false;
 		$deletetarget = false;
+		$f_user = isset($f_user) ? $f_user : $user;
 
 		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource = true;
 		elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $deletetarget = true;
@@ -3561,37 +3623,113 @@ abstract class CommonObject
 		$sourcetype = (!empty($sourcetype) ? $sourcetype : $this->element);
 		$targetid = (!empty($targetid) ? $targetid : $this->id);
 		$targettype = (!empty($targettype) ? $targettype : $this->element);
+		$this->db->begin();
+		$error = 0;
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_element";
-		$sql .= " WHERE";
-		if ($rowid > 0)
-		{
-			$sql .= " rowid = ".$rowid;
-		} else {
-			if ($deletesource)
-			{
-				$sql .= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
-				$sql .= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";
-			} elseif ($deletetarget)
-			{
-				$sql .= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
-				$sql .= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";
+		if (!$notrigger) {
+			// Call trigger
+			$this->context['link_id'] = $rowid;
+			$this->context['link_source_id'] = $sourceid;
+			$this->context['link_source_type'] = $sourcetype;
+			$this->context['link_target_id'] = $targetid;
+			$this->context['link_target_type'] = $targettype;
+			$result = $this->call_trigger('OBJECT_LINK_DELETE', $f_user);
+			if ($result < 0) {
+				$error++;
+			}
+			// End call triggers
+		}
+
+		if (!$error) {
+			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "element_element";
+			$sql .= " WHERE";
+			if ($rowid > 0) {
+				$sql .= " rowid = " . $rowid;
 			} else {
-				$sql .= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";
-				$sql .= " OR";
-				$sql .= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";
+				if ($deletesource) {
+					$sql .= " fk_source = " . $sourceid . " AND sourcetype = '" . $this->db->escape($sourcetype) . "'";
+					$sql .= " AND fk_target = " . $this->id . " AND targettype = '" . $this->db->escape($this->element) . "'";
+				} elseif ($deletetarget) {
+					$sql .= " fk_target = " . $targetid . " AND targettype = '" . $this->db->escape($targettype) . "'";
+					$sql .= " AND fk_source = " . $this->id . " AND sourcetype = '" . $this->db->escape($this->element) . "'";
+				} else {
+					$sql .= " (fk_source = " . $this->id . " AND sourcetype = '" . $this->db->escape($this->element) . "')";
+					$sql .= " OR";
+					$sql .= " (fk_target = " . $this->id . " AND targettype = '" . $this->db->escape($this->element) . "')";
+				}
+			}
+
+			dol_syslog(get_class($this) . "::deleteObjectLinked", LOG_DEBUG);
+			if (!$this->db->query($sql)) {
+				$this->error = $this->db->lasterror();
+				$this->errors[] = $this->error;
+				$error++;
 			}
 		}
 
-		dol_syslog(get_class($this)."::deleteObjectLinked", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if (!$error) {
+			$this->db->commit();
 			return 1;
 		} else {
-			$this->error = $this->db->lasterror();
-			$this->errors[] = $this->error;
+			$this->db->rollback();
+			return 0;
+		}
+	}
+
+	/**
+	 * Function used to get an array with all items linked to an object id in association table
+	 *
+	 * @param	int		$fk_object_where		id of object we need to get linked items
+	 * @param	string	$field_select			name of field we need to get a list
+	 * @param	string	$field_where			name of field of object we need to get linked items
+	 * @param	string	$table_element			name of association table
+	 * @return 	array							Array of record
+	 */
+	static public function getAllItemsLinkedByObjectID($fk_object_where, $field_select, $field_where, $table_element)
+	{
+		if (empty($fk_object_where) || empty($field_where) || empty($table_element)) {
 			return -1;
 		}
+
+		global $db;
+
+		$sql = 'SELECT '.$field_select.' FROM '.MAIN_DB_PREFIX.$table_element.' WHERE '.$field_where.' = '.((int) $fk_object_where);
+		$resql = $db->query($sql);
+
+		$TRes = array();
+		if (!empty($resql)) {
+			while ($res = $db->fetch_object($resql)) {
+				$TRes[] = $res->{$field_select};
+			}
+		}
+
+		return $TRes;
+	}
+
+	/**
+	 * Function used to remove all items linked to an object id in association table
+	 *
+	 * @param	int		$fk_object_where		id of object we need to remove linked items
+	 * @param	string	$field_where			name of field of object we need to delete linked items
+	 * @param	string	$table_element			name of association table
+	 * @return 	int								<0 if KO, 0 if nothing done, >0 if OK and something done
+	 */
+	static public function deleteAllItemsLinkedByObjectID($fk_object_where, $field_where, $table_element)
+	{
+		if (empty($fk_object_where) || empty($field_where) || empty($table_element)) {
+			return -1;
+		}
+
+		global $db;
+
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table_element.' WHERE '.$field_where.' = '.$fk_object_where;
+		$resql = $db->query($sql);
+
+		if (empty($resql)) {
+			return 0;
+		}
+
+		return 1;
 	}
 
 	/**
@@ -4786,7 +4924,7 @@ abstract class CommonObject
 						    $this->result['filename']=$ecmfile->filename;*/
 							//var_dump($obj->update_main_doc_field);exit;
 
-							// Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)
+							// Update 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))
@@ -5305,6 +5443,7 @@ abstract class CommonObject
 			   		$mandatorypb = false;
 			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb = true;
 			   		if ($this->array_options[$key] === '') $mandatorypb = true;
+					if ($attributeType == 'sellist' && $this->array_options[$key] == '0') $mandatorypb = true;
 			   		if ($mandatorypb)
 			   		{
 			   			dol_syslog("Mandatory extra field ".$key." is empty");
@@ -5881,8 +6020,14 @@ abstract class CommonObject
 		} elseif (preg_match('/^(integer|link):(.*):(.*)/i', $val['type'], $reg)) {
 			$param['options'] = array($reg[2].':'.$reg[3] => 'N');
 			$type = 'link';
-		} elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
-			$param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N');
+		} elseif (preg_match('/^(sellist):(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+			$param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4].':'.$reg[5] => 'N');
+			$type = 'sellist';
+		} elseif (preg_match('/^(sellist):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+			$param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4] => 'N');
+			$type = 'sellist';
+		} elseif (preg_match('/^(sellist):(.*):(.*)/i', $val['type'], $reg)) {
+			$param['options'] = array($reg[2].':'.$reg[3] => 'N');
 			$type = 'sellist';
 		} elseif (preg_match('/varchar\((\d+)\)/', $val['type'], $reg)) {
 			$param['options'] = array();
@@ -5913,8 +6058,7 @@ abstract class CommonObject
 
 		$objectid = $this->id;
 
-		if ($computed)
-		{
+		if ($computed) {
 			if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
 			else return '';
 		}
@@ -5923,26 +6067,20 @@ abstract class CommonObject
 		if (empty($morecss) && !empty($val['css'])) {
 			$morecss = $val['css'];
 		} elseif (empty($morecss)) {
-			if ($type == 'date')
-			{
+			if ($type == 'date') {
 				$morecss = 'minwidth100imp';
-			} elseif ($type == 'datetime' || $type == 'link')	// link means an foreign key to another primary id
-			{
+			} elseif ($type == 'datetime' || $type == 'link') {	// link means an foreign key to another primary id
 				$morecss = 'minwidth200imp';
-			} elseif (in_array($type, array('int', 'integer', 'price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
-			{
+			} elseif (in_array($type, array('int', 'integer', 'price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type)) {
 				$morecss = 'maxwidth75';
 			} elseif ($type == 'url') {
 				$morecss = 'minwidth400';
-			} elseif ($type == 'boolean')
-			{
+			} elseif ($type == 'boolean') {
 				$morecss = '';
 			} else {
-				if (round($size) < 12)
-				{
+				if (round($size) < 12) {
 					$morecss = 'minwidth100';
-				} elseif (round($size) <= 48)
-				{
+				} elseif (round($size) <= 48) {
 					$morecss = 'minwidth200';
 				} else {
 					$morecss = 'minwidth400';
@@ -6049,24 +6187,20 @@ abstract class CommonObject
 				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
 
-				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4]))
-				{
-					if (strpos($InfoFieldList[4], 'extra.') !== false)
-					{
+				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
+					if (strpos($InfoFieldList[4], 'extra.') !== false) {
 						$keyList = 'main.'.$InfoFieldList[2].' as rowid';
 					} else {
 						$keyList = $InfoFieldList[2].' as rowid';
 					}
 				}
-				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3]))
-				{
+				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
 					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
 					$keyList .= ', '.$parentField;
 				}
 
 				$fields_label = explode('|', $InfoFieldList[1]);
-				if (is_array($fields_label))
-				{
+				if (is_array($fields_label)) {
 					$keyList .= ', ';
 					$keyList .= implode(', ', $fields_label);
 				}
@@ -6343,13 +6477,13 @@ abstract class CommonObject
 
 			if (!preg_match('/search_/', $keyprefix)) {
 				if (!empty($param_list_array[2])) {		// If the entry into $fields is set to add a create button
-					if ($this->fields[$key]['picto']) {
+					if (!empty($this->fields[$key]['picto'])) {
 						$morecss .= ' widthcentpercentminusxx';
 					} else {
 						$morecss .= ' widthcentpercentminusx';
 					}
 				} else {
-					if ($this->fields[$key]['picto']) {
+					if (!empty($this->fields[$key]['picto'])) {
 						$morecss .= ' widthcentpercentminusx';
 					}
 				}
@@ -6461,13 +6595,18 @@ abstract class CommonObject
 		$param['options'] = array();
 
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];
-		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg))
-		{
+		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';
 		}
 
 		$langfile = $val['langfile'];
@@ -6558,8 +6697,7 @@ abstract class CommonObject
 			$selectkey = "rowid";
 			$keyList = 'rowid';
 
-			if (count($InfoFieldList) >= 3)
-			{
+			if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
 				$selectkey = $InfoFieldList[2];
 				$keyList = $InfoFieldList[2].' as rowid';
 			}
@@ -6753,9 +6891,10 @@ abstract class CommonObject
 	 * @param 	string      $keysuffix      Suffix string to add after name and id of field (can be used to avoid duplicate names)
 	 * @param 	string      $keyprefix      Prefix string to add before name and id of field (can be used to avoid duplicate names)
 	 * @param	string		$onetrtd		All fields in same tr td. Used by objectline_create.tpl.php for example.
+	 * @param	string		$display_type	"card" for form display, "line" for document line display (extrafields on propal line, order line, etc...)
 	 * @return 	string
 	 */
-	public function showOptionals($extrafields, $mode = 'view', $params = null, $keysuffix = '', $keyprefix = '', $onetrtd = 0)
+	public function showOptionals($extrafields, $mode = 'view', $params = null, $keysuffix = '', $keyprefix = '', $onetrtd = 0, $display_type = 'card')
 	{
 		global $db, $conf, $langs, $action, $form, $hookmanager;
 
@@ -6810,7 +6949,7 @@ abstract class CommonObject
 					}
 
 					$colspan = '';
-					if (is_array($params) && count($params) > 0) {
+					if (is_array($params) && count($params) > 0 && $display_type=='card') {
 						if (array_key_exists('cols', $params)) {
 							$colspan = $params['cols'];
 						} elseif (array_key_exists('colspan', $params)) {	// For backward compatibility. Use cols instead now.
@@ -6846,7 +6985,7 @@ abstract class CommonObject
 									$value = $getposttemp;
 								}
 							} else {
-								$value = $this->array_options["options_".$key]; // No GET, no POST, no default value, so we take value of object.
+							    $value = (!empty($this->array_options["options_".$key]) ? $this->array_options["options_".$key] : ''); // No GET, no POST, no default value, so we take value of object.
 							}
 							//var_dump($keyprefix.' - '.$key.' - '.$keysuffix.' - '.$keyprefix.'options_'.$key.$keysuffix.' - '.$this->array_options["options_".$key.$keysuffix].' - '.$getposttemp.' - '.$value);
 							break;
@@ -6869,7 +7008,7 @@ abstract class CommonObject
 							}
 						}
 
-						$out .= $extrafields->showSeparator($key, $this, ($colspan + 1));
+						$out .= $extrafields->showSeparator($key, $this, ($colspan + 1), $display_type);
 					} else {
 						$class = (!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
 						$csstyle = '';
@@ -6888,10 +7027,11 @@ abstract class CommonObject
 						$domData .= ' data-targetid="'.$this->id.'"';
 
 						$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'; }
 
-						if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) { $colspan = '0'; }
-
-						if ($action == 'selectlines') { $colspan++; }
+							if ($action == 'selectlines') { $colspan++; }
+						}
 
 						// Convert date into timestamp format (value in memory must be a timestamp)
 						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime')))
@@ -6918,11 +7058,13 @@ abstract class CommonObject
 						$labeltoshow = $langs->trans($label);
 						$helptoshow = $langs->trans($extrafields->attributes[$this->table_element]['help'][$key]);
 
-						$out .= '<tr '.($html_id ? 'id="'.$html_id.'" ' : '').$csstyle.' class="'.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$extrafields_collapse_num.'" '.$domData.' >';
-						if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER) && $action == 'view') {
-							$out .= '<td></td>';
+						if ($display_type == 'card') {
+							$out .= '<tr '.($html_id ? 'id="'.$html_id.'" ' : '').$csstyle.' class="'.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$extrafields_collapse_num.(!empty($this->id)?'_'.$this->id:'').'" '.$domData.' >';
+							$out .= '<td class="wordbreak';
+						} elseif ($display_type == 'line') {
+							$out .= '<div '.($html_id ? 'id="'.$html_id.'" ' : '').$csstyle.' class="'.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$extrafields_collapse_num.(!empty($this->id)?'_'.$this->id:'').'" '.$domData.' >';
+							$out .= '<div style="display: inline-block; padding-right:4px" class="wordbreak';
 						}
-						$out .= '<td class="wordbreak';
 						//$out .= "titlefield";
 						//if (GETPOST('action', 'restricthtml') == 'create') $out.='create';
 						// BUG #11554 : For public page, use red dot for required fields, instead of bold label
@@ -6938,11 +7080,15 @@ abstract class CommonObject
 							if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $helptoshow);
 							else $out .= $labeltoshow;
 						}
-						$out .= '</td>';
+
+						$out .= ($display_type == 'card' ? '</td>' : '</div>');
 
 						$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';
-
-						$out .= '<td '.($html_id ? 'id="'.$html_id.'" ' : '').'class="'.$this->element.'_extras_'.$key.'" '.($colspan ? ' colspan="'.$colspan.'"' : '').'>';
+						if ($display_type == 'card') {
+							$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.'">';
+						}
 
 						switch ($mode) {
 							case "view":
@@ -6956,15 +7102,18 @@ abstract class CommonObject
 								break;
 						}
 
-						$out .= '</td>';
+						$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 .= '</tr>';
-						else $out .= '</tr>';
+						if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) {
+							$out .= ($display_type=='card' ? '</tr>' : '</div>');
+						} else {
+							$out .= ($display_type=='card' ? '</tr>' : '</div>');
+						}
 						$e++;
 					}
 				}
@@ -6978,7 +7127,17 @@ abstract class CommonObject
 						{
 							var val = $("select[name=\""+parent_list+"\"]").val();
 							var parentVal = parent_list + ":" + val;
-							if(val > 0) {
+							if(typeof val == "string"){
+				    		    if(val != "") {
+					    			var options = orig_select.find("option[parent=\""+parentVal+"\"]").clone();
+									$("select[name=\""+child_list+"\"] option[parent]").remove();
+									$("select[name=\""+child_list+"\"]").append(options);
+								} else {
+									var options = orig_select.find("option[parent]").clone();
+									$("select[name=\""+child_list+"\"] option[parent]").remove();
+									$("select[name=\""+child_list+"\"]").append(options);
+								}
+				    		} else if(val > 0) {
 								var options = orig_select.find("option[parent=\""+parentVal+"\"]").clone();
 								$("select[name=\""+child_list+"\"] option[parent]").remove();
 								$("select[name=\""+child_list+"\"]").append(options);
@@ -6996,12 +7155,33 @@ abstract class CommonObject
 								var parent = $(this).find("option[parent]:first").attr("parent");
 								var infos = parent.split(":");
 								var parent_list = infos[0];
+
+								//Hide daughters lists
+								if ($("#"+child_list).val() == 0 && $("#"+parent_list).val() == 0){
+								    $("#"+child_list).hide();
+								//Show mother lists
+								} else if ($("#"+parent_list).val() != 0){
+								    $("#"+parent_list).show();
+								}
+								//Show the child list if the parent list value is selected
+								$("select[name=\""+parent_list+"\"]").click(function() {
+								    if ($(this).val() != 0){
+								        $("#"+child_list).show()
+									}
+								});
+
+								//When we change parent list
 								$("select[name=\""+parent_list+"\"]").change(function() {
 									showOptions(child_list, parent_list, orig_select[child_list]);
+									//Select the value 0 on child list after a change on the parent list
+									$("#"+child_list).val(0).trigger("change");
+									//Hide child lists if the parent value is set to 0
+									if ($(this).val() == 0){
+								   		$("#"+child_list).hide();
+									}
 								});
 							});
 						}
-
 						setListDependencies();
 					});
 					</script>'."\n";
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 3191e5edd47..1eb3b9911ba 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -697,6 +697,12 @@ class Conf
 
 		if (!empty($this->global->MAIN_TZUSERINPUTKEY)) $this->tzuserinputkey = $this->global->MAIN_TZUSERINPUTKEY;	// 'tzserver' or 'tzuserrel'
 
+		if (!empty($this->global->PRODUIT_AUTOFILL_DESC)) {
+			$this->global->MAIN_NO_CONCAT_DESCRIPTION = 1;
+		} else {
+			unset($this->global->MAIN_NO_CONCAT_DESCRIPTION);
+		}
+
 		// For backward compatibility
 		if (isset($this->product))   $this->produit = $this->product;
 		if (isset($this->facture))   $this->invoice = $this->facture;
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 5fcc7b00c91..033ddd8afe3 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -66,6 +66,7 @@ class DolGraph
 	public $labelInterval = -1;
 
 	public $hideXGrid = false;
+	public $hideXValues = false;
 	public $hideYGrid = false;
 
 	public $Legend = array();
@@ -75,6 +76,12 @@ class DolGraph
 	public $showpercent = 0;
 	public $combine = 0; // 0.05 if you want to combine records < 5% into "other"
 	public $graph; // Objet Graph (Artichow, Phplot...)
+	/**
+	 * @var boolean 					Mirrors graph values
+	 */
+	public $mirrorGraphValues = false;
+	public $tooltipsTitles = null;
+	public $tooltipsLabels = null;
 
 	/**
 	 * @var string Error code (or message)
@@ -85,6 +92,7 @@ class DolGraph
 	public $bgcolor; // array(R,G,B)
 	public $bgcolorgrid = array(255, 255, 255); // array(R,G,B)
 	public $datacolor; // array(array(R,G,B),...)
+	public $borderwidth = 1;
 
 	private $stringtoshow; // To store string to output graph into HTML page
 
@@ -175,6 +183,18 @@ class DolGraph
 		return true;
 	}
 
+	/**
+	 * Hide X Values
+	 *
+	 * @param	boolean		$bool	XValues or not
+	 * @return	boolean				true
+	 */
+	public function setHideXValues($bool)
+	{
+		$this->hideXValues = $bool;
+		return true;
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Hide Y grid
@@ -244,9 +264,9 @@ class DolGraph
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * Set data
+	 * Set data color
 	 *
-	 * @param 	array	$datacolor		Data color array(array(R,G,B),array(R,G,B)...)
+	 * @param 	array	$datacolor		Data color array(array(R,G,B),array(R,G,B)...) or array('#......','#......'...)
 	 * @return	void
 	 */
 	public function SetDataColor($datacolor)
@@ -255,6 +275,50 @@ class DolGraph
 		$this->datacolor = $datacolor;
 	}
 
+	/**
+	 * Set border color
+	 *
+	 * @param 	array	$bordercolor		Border Color array(array(R,G,B),array(R,G,B)...) or array('#FFFFFF','#......'...)
+	 * @return	void
+	 */
+	public function setBorderColor($bordercolor)
+	{
+		$this->bordercolor = $bordercolor;
+	}
+
+	/**
+	 * Set border width
+	 *
+	 * @param 	int     $borderwidth 	Border Width
+	 * @return	void
+	 */
+	public function setBorderWidth($borderwidth)
+	{
+		$this->borderwidth = $borderwidth;
+	}
+
+	/**
+	 * Set tooltips labels of the graph
+	 *
+	 * @param 	array	$tooltipsLabels		Tooltips Labels array('...','...'...)
+	 * @return	void
+	 */
+	public function setTooltipsLabels($tooltipsLabels)
+	{
+		$this->tooltipsLabels = $tooltipsLabels;
+	}
+
+	/**
+	 * Set tooltips titles of the graph
+	 *
+	 * @param 	array	$tooltipsTitles		Tooltips Titles array('...','...'...)
+	 * @return	void
+	 */
+	public function setTooltipsTitles($tooltipsTitles)
+	{
+		$this->tooltipsTitles = $tooltipsTitles;
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Set type
@@ -408,6 +472,17 @@ class DolGraph
 		unset($this->bgcolorgrid);
 	}
 
+	/**
+	 * Mirror Values of the graph
+	 *
+	 * @param	boolean 	$mirrorGraphValues	Mirror Values if true and doesn't if false
+	 * @return	void
+	 */
+	public function setMirrorGraphValues($mirrorGraphValues)
+	{
+		$this->mirrorGraphValues = $mirrorGraphValues;
+	}
+
 	/**
 	 * Is graph ko
 	 *
@@ -964,7 +1039,7 @@ class DolGraph
 				$array_of_ykeys = array_keys($valarray);
 				$alabelexists = 1;
 				$tmpykey = explode('_', ($array_of_ykeys[$i + ($alabelexists ? 1 : 0)]), 3);
-				if (!empty($tmpykey[2]) || $tmpykey[2] == '0') {		// This is a 'Group by' array
+				if (isset($tmpykey[2]) && (!empty($tmpykey[2]) || $tmpykey[2] == '0')) {		// This is a 'Group by' array
 					$tmpvalue = (array_key_exists('y_' . $tmpykey[1] . '_' . $tmpykey[2], $valarray) ? $valarray['y_' . $tmpykey[1] . '_' . $tmpykey[2]] : $valarray[$i + 1]);
 					$values[$x] = (is_numeric($tmpvalue) ? $tmpvalue : null);
 					$arrayofgroupslegend[$i] = array(
@@ -1129,9 +1204,6 @@ class DolGraph
 		else {
 			$type = 'bar';
 
-			$isfunnel = false;
-			if ($file == 'idgraphleadfunnel') $isfunnel = true;
-
 			if (!isset($this->type[$firstlot]) || $this->type[$firstlot] == 'bars') $type = 'bar';
 			if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'horizontalbars') $type = 'horizontalBar';
 			if (isset($this->type[$firstlot]) && ($this->type[$firstlot] == 'lines' || $this->type[$firstlot] == 'linesnopoint')) $type = 'line';
@@ -1141,7 +1213,7 @@ class DolGraph
 				$this->stringtoshow .= 'legend: { display: false }, ';
 			}
 			$this->stringtoshow .= 'scales: { xAxes: [{ ';
-			if ($isfunnel) {	// FIXME Remove isfunnel by introducing a method hideXValues() on dolgraph
+			if ($this->hideXValues) {
 				$this->stringtoshow .= ' ticks: { display: false }, display: true,';
 			}
 			//$this->stringtoshow .= 'type: \'time\', ';		// Need Moment.js
@@ -1156,17 +1228,23 @@ class DolGraph
 			}
 			$this->stringtoshow .= ' }] }';
 			// Add a callback to change label to show only positive value
-			if ($isfunnel) {
+			if (is_array($this->tooltipsLabels) || is_array($this->tooltipsTitles)) {
 				$this->stringtoshow .= ', tooltips: { mode: \'nearest\',
-					callbacks: {
-						title: function(tooltipItem, data) {
-							return data.datasets[tooltipItem[0].datasetIndex].label;
-						},
-						label: function(tooltipItem, data) {
-							return data.datasets[tooltipItem.datasetIndex].data[0][1];
-						}
-					}
-				},';
+					callbacks: {';
+				if (is_array($this->tooltipsTitles)) {
+					$this->stringtoshow .='
+							title: function(tooltipItem, data) {
+								var tooltipsTitle ='.json_encode($this->tooltipsTitles).'
+								return tooltipsTitle[tooltipItem[0].datasetIndex];
+							},';
+				}
+				if (is_array($this->tooltipsLabels)) {
+					$this->stringtoshow .= 'label: function(tooltipItem, data) {
+								var tooltipslabels ='.json_encode($this->tooltipsLabels).'
+								return tooltipslabels[tooltipItem.datasetIndex]
+							}';
+				}
+				$this->stringtoshow .='}},';
 			}
 			$this->stringtoshow .= '};';
 			$this->stringtoshow .= '
@@ -1180,13 +1258,11 @@ class DolGraph
 					labels: [';
 
 			$i = 0;
-			if (!$isfunnel) {
-				foreach ($legends as $val)	// Loop on each serie
-					{
-					if ($i > 0) $this->stringtoshow .= ', ';
-					$this->stringtoshow .= "'".dol_escape_js(dol_trunc($val, 32))."'";
-					$i++;
-				}
+			foreach ($legends as $val)	// Loop on each serie
+			{
+				if ($i > 0) $this->stringtoshow .= ', ';
+				$this->stringtoshow .= "'" . dol_escape_js(dol_trunc($val, 32)) . "'";
+				$i++;
 			}
 
 			//var_dump($arrayofgroupslegend);
@@ -1196,14 +1272,15 @@ class DolGraph
 
 			global $theme_datacolor;
 			//var_dump($arrayofgroupslegend);
-			$i = 0; $iinstack = 0;
+			$i = 0;
+			$iinstack = 0;
 			$oldstacknum = -1;
 			while ($i < $nblot)	// Loop on each serie
 			{
 				$foundnegativecolor = 0;
 				$usecolorvariantforgroupby = 0;
 				// We used a 'group by' and we have too many colors so we generated color variants per
-				if (is_array($arrayofgroupslegend[$i]) && count($arrayofgroupslegend[$i]) > 0) {	// If we used a group by.
+				if (!empty($arrayofgroupslegend) && is_array($arrayofgroupslegend[$i]) && count($arrayofgroupslegend[$i]) > 0) {	// If we used a group by.
 					$nbofcolorneeds = count($arrayofgroupslegend);
 					$nbofcolorsavailable = count($theme_datacolor);
 					if ($nbofcolorneeds > $nbofcolorsavailable) {
@@ -1242,34 +1319,15 @@ 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 ($isfunnel) {
-						$bordercolor == 'null';
-						if (is_array($this->datacolor[$i])) {
-							$color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ', 0.9)'; // If datacolor is array(R, G, B)
-						} else {
-							// TODO FIXME This logic must be in the caller that set $this->datacolor
-							$tmp = str_replace('#', '', $this->datacolor[$i]);
-							if (strpos($tmp, '-') !== false) {
-								$foundnegativecolor++;
-								$color = '#FFFFFF'; // If $val is '-123'
-							} else {
-								$color = "#" . $tmp; // If $val is '123' or '#123'
-								$bordercolor = $color;
-							}
-							if ($foundnegativecolor) {
-								if (is_array($this->datacolor[$i])) $color = 'null'; // If datacolor is array(R, G, B)
-								else {
-									$tmp = str_replace('#', '', $this->datacolor[$i]);
-									if (strpos($tmp, '-') !== false) $bordercolor = '#' . str_replace('-', '', $tmp); // If $val is '-123'
-									else $bordercolor = 'null'; // If $val is '123' or '#123'
-								}
-							}
-						}
-						$bordercolor == 'null' ? "'rgba(0,0,0,0.2)'" : "'" . $bordercolor . "'";
+					if (is_array($this->datacolor[$i])) {
+						$color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ', 0.9)';
 					} else {
-						$color = 'rgb('.$this->datacolor[$i][0].', '.$this->datacolor[$i][1].', '.$this->datacolor[$i][2].', 0.9)';
+						$color = $this->datacolor[$i];
+					}
+					if (is_array($this->bordercolor[$i])) {
 						$bordercolor = $color;
-						//$color = (!empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor));
+					} else {
+						$bordercolor = $this->bordercolor[$i];
 					}
 				}
 
@@ -1278,23 +1336,18 @@ class DolGraph
 				$this->stringtoshow .= '{';
 				$this->stringtoshow .= 'dolibarrinfo: \'y_' . $i . '\', ';
 				$this->stringtoshow .= 'label: \'' . dol_escape_js(dol_string_nohtmltag($textoflegend)) . '\', ';
-				$this->stringtoshow .= 'pointStyle: \'' . ($this->type[$i] == 'linesnopoint' ? 'line' : 'circle') . '\', ';
+				$this->stringtoshow .= 'pointStyle: \'' . ((!empty($this->type[$i]) && $this->type[$i] == 'linesnopoint') ? 'line' : 'circle') . '\', ';
 				$this->stringtoshow .= 'fill: ' . ($type == 'bar' ? 'true' : 'false') . ', ';
-				if ($isfunnel) {
-					$this->stringtoshow .= 'borderWidth: \'2\', ';
-				} elseif ($type == 'bar' || $type == 'horizontalBar') {
-					$this->stringtoshow .= 'borderWidth: \'1\', ';
+				if ($type == 'bar' || $type == 'horizontalBar') {
+					$this->stringtoshow .= 'borderWidth: \''.$this->borderwidth.'\', ';
 				}
 				$this->stringtoshow .= 'borderColor: \'' . $bordercolor . '\', ';
 				$this->stringtoshow .= 'backgroundColor: \'' . $color . '\', ';
-				if ($arrayofgroupslegend[$i]) $this->stringtoshow .= 'stack: \'' . $arrayofgroupslegend[$i]['stacknum'] . '\', ';
-				$this->stringtoshow .='data: [';
-				if ($isfunnel) {
-					$this->stringtoshow .= '['.-$serie[$i].','.$serie[$i].']';
-				} else {
-					$this->stringtoshow .= $serie[$i];
-				}
-				$this->stringtoshow .=']';
+				if (!empty($arrayofgroupslegend) && !empty($arrayofgroupslegend[$i])) $this->stringtoshow .= 'stack: \'' . $arrayofgroupslegend[$i]['stacknum'] . '\', ';
+				$this->stringtoshow .= 'data: [';
+
+				$this->stringtoshow .= $this->mirrorGraphValues ? '[' . -$serie[$i] . ',' . $serie[$i] . ']' : $serie[$i];
+				$this->stringtoshow .= ']';
 				$this->stringtoshow .= '}' . "\n";
 
 				$i++;
@@ -1318,7 +1371,7 @@ class DolGraph
 	{
 		$value = 0;
 		foreach ($this->data as $valarray)	// Loop on each x
-			{
+		{
 			$value += $valarray[1];
 		}
 		return $value;
@@ -1361,13 +1414,11 @@ class DolGraph
 	{
 		global $conf;
 
-		if ($direction == 'width')
-		{
+		if ($direction == 'width') {
 			if (empty($conf->dol_optimize_smallscreen)) return ($defaultsize ? $defaultsize : '500');
 			else return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width'] - 40));
 		}
-		if ($direction == 'height')
-		{
+		if ($direction == 'height') {
 			return (empty($conf->dol_optimize_smallscreen) ? ($defaultsize ? $defaultsize : '200') : '160');
 		}
 		return 0;
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index e075005b437..4dfca1186c0 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -634,13 +634,13 @@ class dolReceiptPrinter extends Printer
 							if ($line->fk_product)
 							{
 								$spacestoadd = $nbcharactbyline - strlen($line->ref) - strlen($line->qty) - 10 - 1;
-								$spaces = str_repeat(' ', $spacestoadd);
+								$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
 								$this->printer->text($line->ref.$spaces.$line->qty.' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
 								$this->printer->text(strip_tags(htmlspecialchars_decode($line->product_label))."\n");
 							}
 							else {
 								$spacestoadd = $nbcharactbyline - strlen($line->description) - strlen($line->qty) - 10 - 1;
-								$spaces = str_repeat(' ', $spacestoadd);
+								$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
 								$this->printer->text($line->description.$spaces.$line->qty.' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
 							}
 						}
@@ -653,7 +653,7 @@ class dolReceiptPrinter extends Printer
 						}
 						foreach ($vatarray as $vatkey => $vatvalue) {
 							 $spacestoadd = $nbcharactbyline - strlen($vatkey) - 12;
-							 $spaces = str_repeat(' ', $spacestoadd);
+							 $spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
 							 $this->printer->text($spaces.$vatkey.'% '.str_pad(price($vatvalue), 10, ' ', STR_PAD_LEFT)."\n");
 						}
 						break;
@@ -680,15 +680,15 @@ class dolReceiptPrinter extends Printer
 					case 'DOL_PRINT_OBJECT_TOTAL':
 						$title = $langs->trans('TotalHT');
 						$spacestoadd = $nbcharactbyline - strlen($title) - 10;
-						$spaces = str_repeat(' ', $spacestoadd);
+						$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
 						$this->printer->text($title.$spaces.str_pad(price($object->total_ht), 10, ' ', STR_PAD_LEFT)."\n");
 						$title = $langs->trans('TotalVAT');
 						$spacestoadd = $nbcharactbyline - strlen($title) - 10;
-						$spaces = str_repeat(' ', $spacestoadd);
+						$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
 						$this->printer->text($title.$spaces.str_pad(price($object->total_tva), 10, ' ', STR_PAD_LEFT)."\n");
 						$title = $langs->trans('TotalTTC');
 						$spacestoadd = $nbcharactbyline - strlen($title) - 10;
-						$spaces = str_repeat(' ', $spacestoadd);
+						$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
 						$this->printer->text($title.$spaces.str_pad(price($object->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
 						break;
 					case 'DOL_LINE_FEED':
@@ -778,7 +778,7 @@ class dolReceiptPrinter extends Printer
 							if ($line->special_code == $this->orderprinter)
 							{
 								$spacestoadd = $nbcharactbyline - strlen($line->ref) - strlen($line->qty) - 10 - 1;
-								$spaces = str_repeat(' ', $spacestoadd);
+								$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
 								$this->printer->text($line->ref.$spaces.$line->qty.' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
 								$this->printer->text(strip_tags(htmlspecialchars_decode($line->desc))."\n");
 							}
@@ -799,14 +799,14 @@ class dolReceiptPrinter extends Printer
 							while ($i < $num) {
 								$row = $this->db->fetch_object($resql);
 								$spacestoadd = $nbcharactbyline - strlen($langs->transnoentitiesnoconv("PaymentTypeShort".$row->code)) - 12;
-								$spaces = str_repeat(' ', $spacestoadd);
+								$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
 								$amount_payment = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount;
 								if ($row->code == "LIQ") $amount_payment = $amount_payment + $row->pos_change; // Show amount with excess received if is cash payment
 								$this->printer->text($spaces.$langs->transnoentitiesnoconv("PaymentTypeShort".$row->code).' '.str_pad(price($amount_payment), 10, ' ', STR_PAD_LEFT)."\n");
 								if ($row->code == "LIQ" && $row->pos_change > 0) // Print change only in cash payments
 								{
 									$spacestoadd = $nbcharactbyline - strlen($langs->trans("Change")) - 12;
-									$spaces = str_repeat(' ', $spacestoadd);
+									$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
 									$this->printer->text($spaces.$langs->trans("Change").' '.str_pad(price($row->pos_change), 10, ' ', STR_PAD_LEFT)."\n");
 								}
 								$i++;
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 2daf4c835e9..045ab92f08e 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -924,15 +924,15 @@ class ExtraFields
 	 * Return HTML string to put an input field into a page
 	 * Code very similar with showInputField of common object
 	 *
-	 * @param  string  $key            			Key of attribute
-	 * @param  string  $value          			Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
-	 * @param  string  $moreparam      			To add more parametes on html input tag
-	 * @param  string  $keysuffix      			Prefix string to add after name and id of field (can be used to avoid duplicate names)
-	 * @param  string  $keyprefix      			Suffix string to add before name and id of field (can be used to avoid duplicate names)
-	 * @param  string  $morecss        			More css (to defined size of field. Old behaviour: may also be a numeric)
-	 * @param  int     $objectid       			Current object id
-	 * @param  string  $extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
-	 * @param  string  $mode                    1=Used for search filters
+	 * @param  string        $key            		Key of attribute
+	 * @param  string|array  $value 			    Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value); for dates in filter mode, a range array('start'=><timestamp>, 'end'=><timestamp>) should be provided
+	 * @param  string        $moreparam      		To add more parameters on html input tag
+	 * @param  string        $keysuffix      		Prefix string to add after name and id of field (can be used to avoid duplicate names)
+	 * @param  string        $keyprefix      		Suffix string to add before name and id of field (can be used to avoid duplicate names)
+	 * @param  string        $morecss        		More css (to defined size of field. Old behaviour: may also be a numeric)
+	 * @param  int           $objectid       		Current object id
+	 * @param  string        $extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
+	 * @param  string        $mode                  1=Used for search filters
 	 * @return string
 	 */
 	public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '', $objectid = 0, $extrafieldsobjectkey = '', $mode = 0)
@@ -1024,8 +1024,21 @@ class ExtraFields
 			// Do not show current date when field not required (see selectDate() method)
 			if (!$required && $value == '') $value = '-1';
 
-			// TODO Must also support $moreparam
-			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
+			if ($mode == 1) {
+				// search filter on a date extrafield shows two inputs to select a date range
+				$prefill = array(
+					'start' => isset($value['start']) ? $value['start'] : '',
+					'end'   => isset($value['end'])   ? $value['end']   : ''
+				);
+				$out = '<div ' . ($moreparam ? $moreparam : '') . '><div class="nowrap">'
+					. $form->selectDate($prefill['start'], $keyprefix.$key.$keysuffix.'_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"))
+					. '</div><div class="nowrap">'
+					. $form->selectDate($prefill['end'], $keyprefix.$key.$keysuffix.'_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"))
+					. '</div></div>';
+			} else {
+				// TODO Must also support $moreparam
+				$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
+			}
 		} elseif (in_array($type, array('int', 'integer')))
 		{
 			$tmp = explode(',', $size);
@@ -1097,7 +1110,12 @@ class ExtraFields
 			foreach ($param['options'] as $key => $val)
 			{
 				if ((string) $key == '') continue;
-				list($val, $parent) = explode('|', $val);
+				$valarray = explode('|', $val);
+				$val = $valarray[0];
+				$parent = '';
+				if (!empty($valarray[1])) {
+				    $parent = $valarray[1];
+				}
 				$out .= '<option value="'.$key.'"';
 				$out .= (((string) $value == (string) $key) ? ' selected' : '');
 				$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
@@ -1902,15 +1920,29 @@ class ExtraFields
 	 * @param   string	$key            Key of attribute
 	 * @param	string	$object			Object
 	 * @param	int		$colspan		Value of colspan to use (it must includes the first column with title)
+	 * @param	string	$display_type	"card" for form display, "line" for document line display (extrafields on propal line, order line, etc...)
 	 * @return 	string					HTML code with line for separator
 	 */
-	public function showSeparator($key, $object, $colspan = 2)
+	public function showSeparator($key, $object, $colspan = 2, $display_type = 'card')
 	{
 		global $langs;
 
-		$out = '<tr id="trextrafieldseparator'.$key.'" class="trextrafieldseparator trextrafieldseparator'.$key.'"><td colspan="'.$colspan.'"><strong>';
+		if ($display_type=='card') {
+			$tagtype='tr';
+			$tagtype_dyn='td';
+		}elseif ($display_type=='line') {
+			$tagtype='div';
+			$tagtype_dyn='span';
+			$colspan=0;
+		}
+
+		$out = '<'.$tagtype.' id="trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').'" class="trextrafieldseparator trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').'">';
+		$out .= '<'.$tagtype_dyn.' '.(!empty($colspan)?'colspan="' . $colspan . '"':'').'>';
+		$out .='<strong>';
 		$out .= $langs->trans($this->attributes[$object->table_element]['label'][$key]);
-		$out .= '</strong></td></tr>';
+		$out .= '</strong>';
+		$out .= '</'.$tagtype_dyn.'>';
+		$out .= '</'.$tagtype.'>';
 
 		$extrafield_param = $this->attributes[$object->table_element]['param'][$key];
 		if (!empty($extrafield_param) && is_array($extrafield_param)) {
@@ -1921,31 +1953,32 @@ class ExtraFields
 				if ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {
 					// Set the collapse_display status to cookie in priority or if ignorecollapsesetup is 1, if cookie and ignorecollapsesetup not defined, use the setup.
 					$collapse_display = ((isset($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key]) || GETPOST('ignorecollapsesetup', 'int')) ? ($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key] ? true : false) : ($extrafield_collapse_display_value == 2 ? false : true));
-					$extrafields_collapse_num = $this->attributes[$object->table_element]['pos'][$key];
+					$extrafields_collapse_num = $this->attributes[$object->table_element]['pos'][$key].(!empty($object->id)?'_'.$object->id:'');
 
-					$out .= '<!-- Add js script to manage the collpase/uncollapse of extrafields separators '.$key.' -->';
-					$out .= '<script type="text/javascript">';
-					$out .= 'jQuery(document).ready(function(){';
+					$out .= '<!-- Add js script to manage the collapse/uncollapse of extrafields separators '.$key.' -->'."\n";
+					$out .= '<script type="text/javascript">'."\n";
+					$out .= 'jQuery(document).ready(function(){'."\n";
 					if ($collapse_display === false) {
-						$out .= '   jQuery("#trextrafieldseparator'.$key.' td").prepend("<span class=\"cursorpointer far fa-plus-square\"></span>&nbsp;");'."\n";
+						$out .= '   jQuery("#trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').' '.$tagtype_dyn.'").prepend("<span class=\"cursorpointer far fa-plus-square\"></span>&nbsp;");'."\n";
 						$out .= '   jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").hide();'."\n";
 					} else {
-						$out .= '   jQuery("#trextrafieldseparator'.$key.' td").prepend("<span class=\"cursorpointer far fa-minus-square\"></span>&nbsp;");'."\n";
+						$out .= '   jQuery("#trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').' '.$tagtype_dyn.'").prepend("<span class=\"cursorpointer far fa-minus-square\"></span>&nbsp;");'."\n";
 						$out .= '   document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
 					}
-					$out .= '   jQuery("#trextrafieldseparator'.$key.'").click(function(){'."\n";
+					$out .= '   jQuery("#trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').'").click(function(){'."\n";
+					$out .= '       console.log("We click on collapse/uncollapse .trextrafields_collapse'.$extrafields_collapse_num.'");'."\n";
 					$out .= '       jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").toggle(300, function(){'."\n";
 					$out .= '           if (jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").is(":hidden")) {'."\n";
-					$out .= '               jQuery("#trextrafieldseparator'.$key.' td span").addClass("fa-plus-square").removeClass("fa-minus-square");'."\n";
+					$out .= '               jQuery("#trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').' '.$tagtype_dyn.' span").addClass("fa-plus-square").removeClass("fa-minus-square");'."\n";
 					$out .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=0; path='.$_SERVER["PHP_SELF"].'"'."\n";
 					$out .= '           } else {'."\n";
-					$out .= '               jQuery("#trextrafieldseparator'.$key.' td span").addClass("fa-minus-square").removeClass("fa-plus-square");'."\n";
+					$out .= '               jQuery("#trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').' '.$tagtype_dyn.' span").addClass("fa-minus-square").removeClass("fa-plus-square");'."\n";
 					$out .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
 					$out .= '           }'."\n";
-					$out .= '       });';
-					$out .= '   });';
-					$out .= '});';
-					$out .= '</script>';
+					$out .= '       });'."\n";
+					$out .= '   });'."\n";
+					$out .= '});'."\n";
+					$out .= '</script>'."\n";
 				}
 			}
 		}
@@ -1998,9 +2031,12 @@ class ExtraFields
 
 				if ($this->attributes[$object->table_element]['required'][$key])	// Value is required
 				{
-					// Check if empty without using GETPOST, value can be alpha, int, array, etc...
-					if ((!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] != 'select' && $_POST["options_".$key] != '0')
-						|| (!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] == 'select')
+					// Check if functionally empty without using GETPOST (depending on the type of extrafield, a
+					// technically non-empty value may be treated as empty functionally).
+					// value can be alpha, int, array, etc...
+				    if ((!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] != 'select' && $_POST["options_".$key] != '0')
+				        || (!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] == 'select')
+				        || (!is_array($_POST["options_".$key]) && isset($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] == 'sellist' && $_POST['options_'.$key] == '0')
 						|| (is_array($_POST["options_".$key]) && empty($_POST["options_".$key])))
 					{
 						//print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];
@@ -2063,7 +2099,7 @@ class ExtraFields
 	{
 		global $_POST;
 
-		if (is_string($extrafieldsobjectkey) && is_array($this->attributes[$extrafieldsobjectkey]['label']))
+		if (is_string($extrafieldsobjectkey) && !empty($this->attributes[$extrafieldsobjectkey]['label']) && is_array($this->attributes[$extrafieldsobjectkey]['label']))
 		{
 			$extralabels = $this->attributes[$extrafieldsobjectkey]['label'];
 		} else {
@@ -2085,9 +2121,28 @@ class ExtraFields
 
 				if (in_array($key_type, array('date', 'datetime')))
 				{
-					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix."year")) continue; // Value was not provided, we should not set it.
-					// Clean parameters
-					$value_key = dol_mktime(GETPOST($keysuffix."options_".$key.$keyprefix."hour", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."min", 'int'), 0, GETPOST($keysuffix."options_".$key.$keyprefix."month", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."day", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."year", 'int'));
+					$dateparamname_start = $keysuffix . 'options_' . $key . $keyprefix . '_start';
+					$dateparamname_end   = $keysuffix . 'options_' . $key . $keyprefix . '_end';
+					if (GETPOSTISSET($dateparamname_start . 'year') && GETPOSTISSET($dateparamname_end . 'year')) {
+						// values provided as a date pair (start date + end date), each date being broken down as year, month, day, etc.
+						$value_key = array(
+							'start' => dol_mktime(
+								0, 0, 0,
+								GETPOST($dateparamname_start . 'month', 'int'),
+								GETPOST($dateparamname_start . 'day', 'int'),
+								GETPOST($dateparamname_start . 'year', 'int')),
+							'end' => dol_mktime(
+								23, 59, 59,
+								GETPOST($dateparamname_end . 'month', 'int'),
+								GETPOST($dateparamname_end . 'day', 'int'),
+								GETPOST($dateparamname_end . 'year', 'int'))
+						);
+					} elseif (GETPOSTISSET($keysuffix."options_".$key.$keyprefix."year")) {
+						// Clean parameters
+						$value_key = dol_mktime(GETPOST($keysuffix."options_".$key.$keyprefix."hour", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."min", 'int'), 0, GETPOST($keysuffix."options_".$key.$keyprefix."month", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."day", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."year", 'int'));
+					} else {
+						continue; // Value was not provided, we should not set it.
+					}
 				} elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
 				{
 					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 89b5a79df4b..9ecd6a659a1 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -156,10 +156,12 @@ class HookManager
 			$method,
 			array(
 				'addCalendarChoice',
+				'addCalendarView',
 				'addMoreActionsButtons',
 				'addMoreMassActions',
 				'addSearchEntry',
 				'addStatisticLine',
+				'addSectionECMAuto',
 				'createDictionaryFieldlist',
 				'editDictionaryFieldlist',
 				'getFormMail',
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6f2cbcd1955..f97ca3ca95b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -17,7 +17,7 @@
  * Copyright (C) 2012-2015  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2014-2020  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
- * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018       Nicolas ZABOURI	        <info@inovea-conseil.com>
  * Copyright (C) 2018       Christophe Battarel     <christophe@altairis.fr>
  * Copyright (C) 2018       Josep Lluis Amador      <joseplluis@lliuretic.cat>
@@ -668,7 +668,7 @@ class Form
 
 		$ret .= '</select>';
 
-				if (empty($conf->dol_optimize_smallscreen)) $ret .= ajax_combobox('.'.$name.'select');
+		if (empty($conf->dol_optimize_smallscreen)) $ret .= ajax_combobox('.'.$name.'select');
 
 		// Warning: if you set submit button to disabled, post using 'Enter' will no more work if there is no another input submit. So we add a hidden button
 		$ret .= '<input type="submit" name="confirmmassactioninvisible" style="display: none" tabindex="-1">'; // Hidden button BEFORE so it is the one used when we submit with ENTER.
@@ -1448,7 +1448,7 @@ class Form
 	 *  @param	string		$htmlid			Html id to use instead of htmlname
 	 *  @param	bool		$multiple		add [] in the name of element and add 'multiple' attribut
 	 *  @param	integer		$disableifempty Set tag 'disabled' on select if there is no choice
-	 *	@return	 int						<0 if KO, Nb of contact in list if OK
+	 *	@return	 int|string					<0 if KO, HTML with select string if OK.
 	 */
 	public function selectcontacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $moreclass = '', $options_only = false, $showsoc = 0, $forcecombo = 0, $events = array(), $moreparam = '', $htmlid = '', $multiple = false, $disableifempty = 0)
 	{
@@ -1479,7 +1479,7 @@ class Form
 		if (!empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql .= " AND sp.statut <> 0";
 		$sql .= " ORDER BY sp.lastname ASC";
 
-		dol_syslog(get_class($this)."::select_contacts", LOG_DEBUG);
+		dol_syslog(get_class($this)."::selectcontacts", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -1800,10 +1800,9 @@ class Form
 					}
 					$out .= ' data-html="';
 					$outhtml = '';
-					if (!empty($obj->photo))
-					{
-						$outhtml .= $userstatic->getNomUrl(-3, '', 0, 1, 24, 1, 'login', '', 1).' ';
-					}
+					// if (!empty($obj->photo)) {
+					$outhtml .= $userstatic->getNomUrl(-3, '', 0, 1, 24, 1, 'login', '', 1).' ';
+					// }
 					if ($showstatus >= 0 && $obj->status == 0) $outhtml .= '<strike class="opacitymediumxxx">';
 					$outhtml .= $labeltoshow;
 					if ($showstatus >= 0 && $obj->status == 0) $outhtml .= '</strike>';
@@ -1927,7 +1926,7 @@ class Form
 	 *  Return list of products for customer in Ajax if Ajax activated or go to select_produits_list
 	 *
 	 *  @param		int			$selected				Preselected products
-	 *  @param		string		$htmlname				Name of HTML select field (must be unique in page)
+	 *  @param		string		$htmlname				Name of HTML select field (must be unique in page).
 	 *  @param		int			$filtertype				Filter on product type (''=nofilter, 0=product, 1=service)
 	 *  @param		int			$limit					Limit on number of returned lines
 	 *  @param		int			$price_level			Level of price to show
@@ -1949,7 +1948,7 @@ class Form
 	 *  @param		string		$nooutput				No print, return the output into a string
 	 *  @return		void|string
 	 */
-	public function select_produits($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $status = 1, $finished = 2, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '', $selected_combinations = array(), $nooutput = 0)
+	public function select_produits($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 0, $price_level = 0, $status = 1, $finished = 2, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '', $selected_combinations = null, $nooutput = 0)
 	{
 		// phpcs:enable
 		global $langs, $conf;
@@ -1997,10 +1996,13 @@ class Form
 			}
 			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, $ajaxoptions);
 
-			if (!empty($conf->variants->enabled)) {
+			if (!empty($conf->variants->enabled) && is_array($selected_combinations)) {
+				// Code to automatically insert with javascript the select of attributes under the select of product
+				// when a parent of variant has been selected.
 				$out .= '
+				<!-- script to auto show attributes select tags if a variant was selected -->
 				<script>
-
+					// auto show attributes fields
 					selected = '.json_encode($selected_combinations).';
 					combvalues = {};
 
@@ -2019,6 +2021,8 @@ class Form
 								return;
 							}
 
+							console.log("A change has started. We get variants fields to inject html select");
+
 							jQuery.getJSON("'.DOL_URL_ROOT.'/variants/ajax/getCombinations.php", {
 								id: jQuery(this).val()
 							}, function (data) {
@@ -2035,8 +2039,7 @@ class Form
 									span.append(
 										jQuery(document.createElement(\'div\')).text(val.label).css({
 											\'font-weight\': \'bold\',
-											\'display\': \'table-cell\',
-											\'text-align\': \'right\'
+											\'display\': \'table-cell\'
 										})
 									);
 
@@ -2169,8 +2172,8 @@ class Form
 		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';
-			$selectFields .= ", idprodcustprice, custprice, custprice_ttc, custprice_base_type, custtva_tx";
+			$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";
 		}
 		// Units
 		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
@@ -2182,7 +2185,9 @@ class Form
 		if (!empty($conf->global->MAIN_MULTILANGS))
 		{
 			$sql .= ", pl.label as label_translated";
+			$sql .= ", pl.description as description_translated";
 			$selectFields .= ", label_translated";
+			$selectFields .= ", description_translated";
 		}
 		// Price by quantity
 		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
@@ -2222,7 +2227,19 @@ class Form
 		// Multilang : we add translation
 		if (!empty($conf->global->MAIN_MULTILANGS))
 		{
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang='".$this->db->escape($langs->getDefaultLang())."'";
+			$sql .= " LEFT JOIN ".MAIN_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);
+				$result = $soc->fetch($socid);
+				if ($result > 0 && !empty($soc->default_lang)) {
+					$sql .= " AND pl.lang='" . $this->db->escape($soc->default_lang) . "'";
+				} else {
+					$sql .= " AND pl.lang='".$this->db->escape($langs->getDefaultLang())."'";
+				}
+			} else {
+				$sql .= " AND pl.lang='".$this->db->escape($langs->getDefaultLang())."'";
+			}
 		}
 
 		if (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {
@@ -2267,6 +2284,7 @@ class Form
 				if ($i > 0) $sql .= " AND ";
 				$sql .= "(p.ref LIKE '".$this->db->escape($prefix.$crit)."%' OR p.label LIKE '".$this->db->escape($prefix.$crit)."%'";
 				if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " OR pl.label LIKE '".$this->db->escape($prefix.$crit)."%'";
+				if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && ! empty($socid)) $sql .= " OR pcp.ref_customer LIKE '".$this->db->escape($prefix.$crit)."%'";
 				if (!empty($conf->global->PRODUCT_AJAX_SEARCH_ON_DESCRIPTION))
 				{
 					$sql .= " OR p.description LIKE '".$this->db->escape($prefix.$crit)."%'";
@@ -2435,7 +2453,9 @@ class Form
 		$outval = '';
 		$outref = '';
 		$outlabel = '';
+		$outlabel_translated = '';
 		$outdesc = '';
+		$outdesc_translated = '';
 		$outbarcode = '';
 		$outorigin = '';
 		$outtype = '';
@@ -2454,8 +2474,14 @@ class Form
 
 		$outkey = $objp->rowid;
 		$outref = $objp->ref;
+		$outrefcust = empty($objp->custref) ? '' : $objp->custref;
 		$outlabel = $objp->label;
 		$outdesc = $objp->description;
+		if (!empty($conf->global->MAIN_MULTILANGS))
+		{
+			$outlabel_translated = $objp->label_translated;
+			$outdesc_translated = $objp->description_translated;
+		}
 		$outbarcode = $objp->barcode;
 		$outorigin = $objp->fk_country;
 		$outpbq = empty($objp->price_by_qty_rowid) ? '' : $objp->price_by_qty_rowid;
@@ -2517,13 +2543,19 @@ class Form
 		   		elseif ($objp->stock <= 0) $opt .= ' class="product_line_stock_too_low"';
 			}
 		}
+		if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+			$opt .= ' data-labeltrans="'.$outlabel_translated.'"';
+			$opt .= ' data-desctrans="'.dol_escape_htmltag($outdesc_translated).'"';
+		}
 		$opt .= '>';
 		$opt .= $objp->ref;
+		if (! empty($objp->custref)) $opt.= ' (' . $objp->custref . ')';
 		if ($outbarcode) $opt .= ' ('.$outbarcode.')';
 		$opt .= ' - '.dol_trunc($label, $maxlengtharticle);
 		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) $opt .= ' ('.getCountry($outorigin, 1).')';
 
 		$objRef = $objp->ref;
+		if (! empty($objp->custref)) $objRef .= ' (' . $objp->custref . ')';
 		if (!empty($filterkey) && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRef, 1);
 		$outval .= $objRef;
 		if ($outbarcode) $outval .= ' ('.$outbarcode.')';
@@ -2687,7 +2719,25 @@ class Form
 		}
 
 		$opt .= "</option>\n";
-		$optJson = array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'label2'=>$outlabel, 'desc'=>$outdesc, 'type'=>$outtype, 'price_ht'=>price2num($outprice_ht), 'price_ttc'=>price2num($outprice_ttc), 'pricebasetype'=>$outpricebasetype, 'tva_tx'=>$outtva_tx, 'qty'=>$outqty, 'discount'=>$outdiscount, 'duration_value'=>$outdurationvalue, 'duration_unit'=>$outdurationunit, 'pbq'=>$outpbq);
+		$optJson = array(
+			'key'=>$outkey,
+			'value'=>$outref,
+			'label'=>$outval,
+			'label2'=>$outlabel,
+			'desc'=>$outdesc,
+			'type'=>$outtype,
+			'price_ht'=>price2num($outprice_ht),
+			'price_ttc'=>price2num($outprice_ttc),
+			'pricebasetype'=>$outpricebasetype,
+			'tva_tx'=>$outtva_tx, 'qty'=>$outqty,
+			'discount'=>$outdiscount,
+			'duration_value'=>$outdurationvalue,
+			'duration_unit'=>$outdurationunit,
+			'pbq'=>$outpbq,
+			'labeltrans'=>$outlabel_translated,
+			'desctrans'=>$outdesc_translated,
+			'ref_customer'=>$outrefcust
+		);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2770,6 +2820,12 @@ class Form
 		$sql .= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.remise_percent, pfp.remise, pfp.unitprice,";
 		$sql .= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, pfp.fk_soc, s.nom as name,";
 		$sql .= " pfp.supplier_reputation";
+		// if we use supplier description of the products
+		if (!empty($conf->global->PRODUIT_FOURN_TEXTS)) {
+			$sql .= " ,pfp.desc_fourn as description";
+		} else {
+			$sql .= " ,p.description";
+		}
 		// Units
 		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
@@ -2799,7 +2855,11 @@ class Form
 			foreach ($scrit as $crit)
 			{
 				if ($i > 0) $sql .= " AND ";
-				$sql .= "(pfp.ref_fourn LIKE '".$this->db->escape($prefix.$crit)."%' OR p.ref LIKE '".$this->db->escape($prefix.$crit)."%' OR p.label LIKE '".$this->db->escape($prefix.$crit)."%')";
+				$sql .= "(pfp.ref_fourn LIKE '".$this->db->escape($prefix.$crit)."%' OR p.ref LIKE '".$this->db->escape($prefix.$crit)."%' OR p.label LIKE '".$this->db->escape($prefix.$crit)."%'";
+				if (!empty($conf->global->PRODUIT_FOURN_TEXTS)) {
+					$sql .= " OR pfp.desc_fourn LIKE '".$this->db->escape($prefix.$crit)."%'";
+				}
+				$sql .= ")";
 				$i++;
 			}
 			if (count($scrit) > 1) $sql .= ")";
@@ -3028,8 +3088,9 @@ class Form
 				if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice)) $opt .= ' disabled';
 				if (!empty($objp->idprodfournprice) && $objp->idprodfournprice > 0)
 				{
-					$opt .= ' pbq="'.$objp->idprodfournprice.'" data-pbq="'.$objp->idprodfournprice.'" data-pbqqty="'.$objp->quantity.'" data-pbqup="'.$objp->unitprice.'" data-pbqpercent="'.$objp->remise_percent.'"';
+					$opt .= ' data-qty="'.$objp->quantity.'" data-up="'.$objp->unitprice.'" data-discount="'.$outdiscount.'"';
 				}
+				$opt .= ' data-description="'.dol_escape_htmltag($objp->description).'"';
 				$opt .= ' data-html="'.dol_escape_htmltag($optlabel).'"';
 				$opt .= '>';
 
@@ -3043,7 +3104,20 @@ class Form
 				// "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, array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'qty'=>$outqty, 'up'=>$objp->unitprice, 'discount'=>$outdiscount, 'type'=>$outtype, 'duration_value'=>$outdurationvalue, 'duration_unit'=>$outdurationunit, 'disabled'=>(empty($objp->idprodfournprice) ?true:false)));
+				array_push($outarray,
+					array('key'=>$outkey,
+						'value'=>$outref,
+						'label'=>$outval,
+						'qty'=>$outqty,
+						'up'=>$objp->unitprice,
+						'discount'=>$outdiscount,
+						'type'=>$outtype,
+						'duration_value'=>$outdurationvalue,
+						'duration_unit'=>$outdurationunit,
+						'disabled'=>(empty($objp->idprodfournprice) ?true:false),
+						'description'=>$objp->description
+					)
+				);
 				// Exemple of var_dump $outarray
 				// array(1) {[0]=>array(6) {[key"]=>string(1) "2" ["value"]=>string(3) "ppp"
 				//           ["label"]=>string(76) "ppp (<strong>f</strong>ff2) - ppp - 20,00 Euros/1unité (20,00 Euros/unité)"
@@ -3749,9 +3823,10 @@ class Form
 	 *  @param  string	$filtre            To filter list
 	 *  @param  int		$useempty          1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
 	 *  @param  string	$moreattrib        To add more attribute on select
+	 *	@param	int		$noinfoadmin		0=Add admin info, 1=Disable admin info
 	 * 	@return	void
 	 */
-	public function selectShippingMethod($selected = '', $htmlname = 'shipping_method_id', $filtre = '', $useempty = 0, $moreattrib = '')
+	public function selectShippingMethod($selected = '', $htmlname = 'shipping_method_id', $filtre = '', $useempty = 0, $moreattrib = '', $noinfoadmin = 0)
 	{
 		global $langs, $conf, $user;
 
@@ -3786,7 +3861,7 @@ class Form
 					$i++;
 				}
 				print "</select>";
-				if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				if ($user->admin  && empty($noinfoadmin)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 
 				print ajax_combobox('select'.$htmlname);
 			} else {
@@ -3890,9 +3965,10 @@ class Form
 	 *      @param	string	$selected       Preselected Unit ID
 	 *      @param  string	$htmlname       Select name
 	 *      @param	int		$showempty		Add a nempty line
+	 *      @param  string  $unit_type      Restrict to one given unit type
 	 * 		@return	string                  HTML select
 	 */
-	public function selectUnits($selected = '', $htmlname = 'units', $showempty = 0)
+	public function selectUnits($selected = '', $htmlname = 'units', $showempty = 0, $unit_type = '')
 	{
 		global $langs;
 
@@ -3902,6 +3978,9 @@ class Form
 
 		$sql = 'SELECT rowid, label, code from '.MAIN_DB_PREFIX.'c_units';
 		$sql .= ' WHERE active > 0';
+		if (!empty($unit_type)) {
+			$sql .= " AND unit_type = '".$this->db->escape($unit_type)."'";
+		}
 
 		$resql = $this->db->query($sql);
 		if ($resql && $this->db->num_rows($resql) > 0)
@@ -3977,8 +4056,7 @@ class Form
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($result);
-					if ($selected == $obj->rowid || ($useempty == 2 && $num == 1 && empty($selected)))
-					{
+					if ($selected == $obj->rowid || ($useempty == 2 && $num == 1 && empty($selected))) {
 						$out .= '<option value="'.$obj->rowid.'" selected>';
 					} else {
 						$out .= '<option value="'.$obj->rowid.'">';
@@ -4171,7 +4249,7 @@ class Form
 				$output .= '<option value="-1">&nbsp;</option>';
 				foreach ($cate_arbo as $key => $value)
 				{
-					if ($cate_arbo[$key]['id'] == $selected || ($selected == 'auto' && count($cate_arbo) == 1))
+					if ($cate_arbo[$key]['id'] == $selected || ($selected === 'auto' && count($cate_arbo) == 1))
 					{
 						$add = 'selected ';
 					} else {
@@ -4230,7 +4308,7 @@ class Form
 	 *     @param	string			$question    	   	Question
 	 *     @param 	string			$action      	   	Action
 	 *	   @param  	array|string	$formquestion	   	An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , 'size'=>, 'morecss'=>, 'moreattr'=>))
-	 *													type can be 'hidden', 'text', 'password', 'checkbox', 'radio', 'date', 'morecss', ...
+	 *													type can be 'hidden', 'text', 'password', 'checkbox', 'radio', 'date', 'morecss', 'other' or 'onecolumn'...
 	 * 	   @param  	string			$selectedchoice  	'' or 'no', or 'yes' or '1' or '0'
 	 * 	   @param  	int|string		$useajax		   	0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No, 'xxx'=Yes and preoutput confirm box with div id=dialog-confirm-xxx
 	 *     @param  	int|string		$height          	Force height of box (0 = auto)
@@ -4344,6 +4422,8 @@ class Form
 						$moreonecolumn .= '<div class="margintoponly">';
 						$moreonecolumn .= $input['value'];
 						$moreonecolumn .= '</div>'."\n";
+					} else {
+						$more .= 'Error type '.$input['type'].' for the confirm box is not a supported type';
 					}
 				}
 			}
@@ -4371,16 +4451,24 @@ class Form
 			}
 			$pageyes = $page.(preg_match('/\?/', $page) ? '&' : '?').'action='.$action.'&confirm=yes';
 			$pageno = ($useajax == 2 ? $page.(preg_match('/\?/', $page) ? '&' : '?').'confirm=no' : '');
+
 			// Add input fields into list of fields to read during submit (inputok and inputko)
-			if (is_array($formquestion))
-			{
-				foreach ($formquestion as $key => $input)
-				{
+			if (is_array($formquestion)) {
+				foreach ($formquestion as $key => $input) {
 					//print "xx ".$key." rr ".is_array($input)."<br>\n";
-					if (is_array($input) && isset($input['name'])) array_push($inputok, $input['name']);
+					// Add name of fields to propagate with the GET when submitting the form with button OK.
+					if (is_array($input) && isset($input['name'])) {
+						if (strpos($input['name'], ',') > 0) {
+							$inputok = array_merge($inputok, explode(',', $input['name']));
+						} else {
+							array_push($inputok, $input['name']);
+						}
+					}
+					// Add name of fields to propagate with the GET when submitting the form with button KO.
 					if (isset($input['inputko']) && $input['inputko'] == 1) array_push($inputko, $input['name']);
 				}
 			}
+
 			// Show JQuery confirm box.
 			$formconfirm .= '<div id="'.$dialogconfirm.'" title="'.dol_escape_htmltag($title).'" style="display: none;">';
 			if (is_array($formquestion) && !empty($formquestion['text'])) {
@@ -4420,10 +4508,15 @@ class Form
                          	if (inputok.length>0) {
                          		$.each(inputok, function(i, inputname) {
                          			var more = "";
-                         			if ($("#" + inputname).attr("type") == "checkbox") { more = ":checked"; }
-                         		    if ($("#" + inputname).attr("type") == "radio") { more = ":checked"; }
-                         			var inputvalue = $("#" + inputname + more).val();
+									var inputvalue;
+                         			if ($("input[name=\'" + inputname + "\']").attr("type") == "radio") {
+										inputvalue = $("input[name=\'" + inputname + "\']").val();
+									} else {
+                         		    	if ($("#" + inputname).attr("type") == "checkbox") { more = ":checked"; }
+                         				inputvalue = $("#" + inputname + more).val();
+									}
                          			if (typeof inputvalue == "undefined") { inputvalue=""; }
+									console.log("check inputname="+inputname+" inputvalue="+inputvalue);
                          			options += "&" + inputname + "=" + encodeURIComponent(inputvalue);
                          		});
                          	}
@@ -4882,7 +4975,7 @@ class Form
 			print '<form method="POST" action="'.$page.'">';
 			print '<input type="hidden" name="action" value="setmulticurrencyrate">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
-			print '<input type="text" class="maxwidth100" name="'.$htmlname.'" value="'.(!empty($rate) ? price(price2num($rate, 'CR')) : 1).'" /> ';
+			print '<input type="text" class="maxwidth100" name="'.$htmlname.'" value="'.(!empty($rate) ? price(price2num($rate, 'CU')) : 1).'" /> ';
 			print '<select name="calculation_mode">';
 			print '<option value="1">'.$currency.' > '.$conf->currency.'</option>';
 			print '<option value="2">'.$conf->currency.' > '.$currency.'</option>';
@@ -5503,9 +5596,11 @@ class Form
 	 */
 	public function selectDateToDate($set_time = '', $set_time_end = '', $prefix = 're', $empty = 0)
 	{
-		$ret = $this->selectDate($set_time, $prefix.'_start', 0, 0, $empty);
-		$ret .= '<br/>';
-		$ret .= $this->selectDate($set_time_end, $prefix.'_end', 0, 0, $empty);
+		global $langs;
+
+		$ret = $this->selectDate($set_time, $prefix.'_start', 0, 0, $empty, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("from"), 'tzuserrel');
+		$ret .= '<br>';
+		$ret .= $this->selectDate($set_time_end, $prefix.'_end', 0, 0, $empty, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"), 'tzuserrel');
 		return $ret;
 	}
 
@@ -5532,7 +5627,7 @@ class Form
 	 *  @param  int         $stepminutes    Specify step for minutes between 1 and 30
 	 *  @param	string		$labeladddateof Label to use for the $adddateof parameter.
 	 *  @param	string 		$placeholder    Placeholder
-	 *  @param	mixed		$gm				'auto', 'gmt' or 'tzserver' or 'tzuserrel'
+	 *  @param	mixed		$gm				'auto' (for backward compatibility, avoid this), 'gmt' or 'tzserver' or 'tzuserrel'
 	 * 	@return string                      Html for selectDate
 	 *  @see    form_date(), select_month(), select_year(), select_dayofweek()
 	 */
@@ -5540,8 +5635,8 @@ class Form
 	{
 		global $conf, $langs;
 
-		if ($gm == 'auto') {
-			$gm = $conf->tzuserinputkey;
+		if ($gm === 'auto') {
+			$gm = (empty($conf) ? 'tzserver' : $conf->tzuserinputkey);
 		}
 
 		$retstring = '';
@@ -5620,7 +5715,7 @@ class Form
 				if (strval($set_time) != '' && $set_time != -1)
 				{
 					//$formated_date=dol_print_date($set_time,$conf->format_date_short);
-					$formated_date = dol_print_date($set_time, $langs->trans("FormatDateShortInput")); // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
+					$formated_date = dol_print_date($set_time, $langs->trans("FormatDateShortInput"), $gm); // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
 				}
 
 				// Calendrier popup version eldy
@@ -5632,14 +5727,17 @@ class Form
 					$retstring .= ' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
 					$retstring .= '>';
 
-					// Icone calendrier
-					if (!$disabled)
-					{
-						$retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons"';
+					// Icone calendar
+					$retstringbuttom = '';
+					if (!$disabled) {
+						$retstringbuttom = '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons"';
 						$base = DOL_URL_ROOT.'/core/';
-						$retstring .= ' onClick="showDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');"';
-						$retstring .= '>'.img_object($langs->trans("SelectDate"), 'calendarday', 'class="datecallink"').'</button>';
-					} else $retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
+						$retstringbuttom .= ' onClick="showDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');"';
+						$retstringbuttom .= '>'.img_object($langs->trans("SelectDate"), 'calendarday', 'class="datecallink"').'</button>';
+					} else {
+						$retstringbuttom = '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
+					}
+					$retstring = $retstringbuttom.$retstring;
 
 					$retstring .= '<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";
 					$retstring .= '<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";
@@ -5669,7 +5767,7 @@ class Form
 						if (empty($conf->global->MAIN_POPUP_CALENDAR_ON_FOCUS))
 						{
 							$retstring .= "
-								showOn: 'button',
+								showOn: 'button',	/* both has problem with autocompletion */
 								buttonImage: '".DOL_URL_ROOT."/theme/".$conf->theme."/img/object_calendarday.png',
 								buttonImageOnly: true";
 						}
@@ -5679,10 +5777,10 @@ class Form
 					}
 
 					// Zone de saisie manuelle de la date
-					$retstring .= '<div class="nowrap inline-block">';
+					$retstring .= '<div class="nowrap inline-block divfordateinput">';
 					$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidthdate" maxlength="11" value="'.$formated_date.'"';
 					$retstring .= ($disabled ? ' disabled' : '');
-					$retstring .= ($placeholder ? ' placeholder="'.$placeholder.'"' : '');
+					$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 .= '>';
 
@@ -5699,7 +5797,8 @@ class Form
                 		$retstring.='});';
                 		$retstring.="</script>";*/
 					} else {
-						$retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
+						$retstringbutton = '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
+						$retsring = $retstringbutton.$retstring;
 					}
 
 					$retstring .= '</div>';
@@ -6344,7 +6443,7 @@ class Form
 	 *	@param	string			$htmlname			Name of html select area. Must start with "multi" if this is a multiselect
 	 *	@param	array			$array				Array like array(key => value) or array(key=>array('label'=>..., 'data-...'=>..., 'disabled'=>..., 'css'=>...))
 	 *	@param	string|string[]	$id					Preselected key or preselected keys for multiselect
-	 *	@param	int|string		$show_empty			0 no empty value allowed, 1 or string to add an empty value into list (key is -1 and value is '' or '&nbsp;' if 1, key is -1 and value is text if string), <0 to add an empty value with key that is this value.
+	 *	@param	int|string		$show_empty			0 no empty value allowed, 1 or string to add an empty value into list (If 1: key is -1 and value is '' or '&nbsp;', If placeholder string: key is -1 and value is the string), <0 to add an empty value with key that is this value.
 	 *	@param	int				$key_in_label		1 to show key into label with format "[key] value"
 	 *	@param	int				$value_as_key		1 to use value as key
 	 *	@param  string			$moreparam			Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
@@ -6360,7 +6459,7 @@ class Form
 	 * 	@return	string								HTML select string.
 	 *  @see multiselectarray(), selectArrayAjax(), selectArrayFilter()
 	 */
-	public static function selectarray($htmlname, $array, $id = '', $show_empty = 0, $key_in_label = 0, $value_as_key = 0, $moreparam = '', $translate = 0, $maxlen = 0, $disabled = 0, $sort = '', $morecss = '', $addjscombo = 0, $moreparamonempty = '', $disablebademail = 0, $nohtmlescape = 0)
+	public static function selectarray($htmlname, $array, $id = '', $show_empty = 0, $key_in_label = 0, $value_as_key = 0, $moreparam = '', $translate = 0, $maxlen = 0, $disabled = 0, $sort = '', $morecss = '', $addjscombo = 1, $moreparamonempty = '', $disablebademail = 0, $nohtmlescape = 0)
 	{
 		global $conf, $langs;
 
@@ -6374,11 +6473,7 @@ class Form
 		$out = '';
 
 		// Add code for jquery to use multiselect
-		if ($addjscombo && $jsbeautify)
-		{
-			$minLengthToAutocomplete = 0;
-			$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ? (constant('REQUIRE_JQUERY_MULTISELECT') ?constant('REQUIRE_JQUERY_MULTISELECT') : 'select2') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
-
+		if ($addjscombo && $jsbeautify) {
 			// Enhance with select2
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 			$out .= ajax_combobox($htmlname);
@@ -6388,16 +6483,14 @@ class Form
 		$out .= ' name="'.preg_replace('/^\./', '', $htmlname).'" '.($moreparam ? $moreparam : '');
 		$out .= '>';
 
-		if ($show_empty)
-		{
+		if ($show_empty) {
 			$textforempty = ' ';
 			if (!empty($conf->use_javascript_ajax)) $textforempty = '&nbsp;'; // If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.
 			if (!is_numeric($show_empty)) $textforempty = $show_empty;
 			$out .= '<option class="optiongrey" '.($moreparamonempty ? $moreparamonempty.' ' : '').'value="'.($show_empty < 0 ? $show_empty : -1).'"'.($id == $show_empty ? ' selected' : '').'>'.$textforempty.'</option>'."\n";
 		}
 
-		if (is_array($array))
-		{
+		if (is_array($array)) {
 			// Translate
 			if ($translate)
 			{
@@ -6422,8 +6515,7 @@ class Form
 					$value = $tmpvalue;
 					$disabled = ''; $style = '';
 				}
-				if (!empty($disablebademail))
-				{
+				if (!empty($disablebademail)) {
 					if (($disablebademail == 1 && !preg_match('/&lt;.+@.+&gt;/', $value))
 						|| ($disablebademail == 2 && preg_match('/---/', $value)))
 					{
@@ -6432,8 +6524,7 @@ class Form
 					}
 				}
 
-				if ($key_in_label)
-				{
+				if ($key_in_label) {
 					if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value));
 					else $selectOptionValue = $key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value);
 				} else {
@@ -6716,8 +6807,8 @@ class Form
 
 		// Add code for jquery to use multiselect
 		if (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')) {
-			$out .= "\n".'<!-- JS CODE TO ENABLE select for id '.$htmlname.' -->
-						<script>'."\n";
+			$out .= "\n".'<!-- JS CODE TO ENABLE select for id '.$htmlname.', addjscombo='.$addjscombo.' -->';
+			$out .= "\n".'<script>'."\n";
 			if ($addjscombo == 1) {
 				$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
 				$out .= 'function formatResult(record) {'."\n";
@@ -6744,6 +6835,10 @@ class Form
 								formatSelection: formatSelection,
 							 	templateSelection: formatSelection		/* For 4.0 */
 							});
+
+							/* Add also morecss to the css .select2 that is after the #htmlname, for component that are show dynamically after load, because select2 set
+								 the size only if component is not hidden by default on load */
+							$(\'#'.$htmlname.' + .select2\').addClass(\''.$morecss.'\');
 						});'."\n";
 			} elseif ($addjscombo == 2 && !defined('DISABLE_MULTISELECT')) {
 				// Add other js lib
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 512e38072d0..b95f73506b9 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -427,7 +427,7 @@ class FormAccounting extends Form
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * Return list of auxilary thirdparty accounts
+	 * Return list of auxilary accounts. Cumulate list from customers, suppliers and users.
 	 *
 	 * @param string   $selectid       Preselected pcg_type
 	 * @param string   $htmlname       Name of field in html form
@@ -435,24 +435,27 @@ class FormAccounting extends Form
 	 * @param string   $morecss        More css
 	 * @return string                  String with HTML select
 	 */
-	public function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $morecss = 'maxwidth200')
+	public function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $morecss = 'maxwidth250')
 	{
 		// phpcs:enable
 
 		$aux_account = array();
 
-		// Auxiliary customer account
-		$sql = "SELECT DISTINCT code_compta, nom ";
+		// Auxiliary thirdparties account
+		$sql = "SELECT code_compta, code_compta_fournisseur, nom as name";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
 		$sql .= " WHERE entity IN (".getEntity('societe').")";
-		$sql .= " ORDER BY code_compta";
+		$sql .= " AND client IN (1,3) OR fournisseur = 1";
 
 		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {
 				if (!empty($obj->code_compta)) {
-					$aux_account[$obj->code_compta] = $obj->code_compta.' ('.$obj->nom.')';
+					$aux_account[$obj->code_compta] = $obj->code_compta.' <span class="opacitymedium">('.$obj->name.')</span>';
+				}
+				if (!empty($obj->code_compta_fournisseur)) {
+					$aux_account[$obj->code_compta_fournisseur] = $obj->code_compta_fournisseur.' <span class="opacitymedium">('.$obj->name.')</span>';
 				}
 			}
 		} else {
@@ -460,26 +463,9 @@ class FormAccounting extends Form
 			dol_syslog(get_class($this)."::select_auxaccount ".$this->error, LOG_ERR);
 			return -1;
 		}
-		$this->db->free($resql);
 
-		// Auxiliary supplier account
-		$sql = "SELECT DISTINCT code_compta_fournisseur, nom ";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql .= " WHERE entity IN (".getEntity('societe').")";
-		$sql .= " ORDER BY code_compta_fournisseur";
-		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			while ($obj = $this->db->fetch_object($resql)) {
-				if ($obj->code_compta_fournisseur != "") {
-					$aux_account[$obj->code_compta_fournisseur] = $obj->code_compta_fournisseur.' ('.$obj->nom.')';
-				}
-			}
-		} else {
-			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::select_auxaccount ".$this->error, LOG_ERR);
-			return -1;
-		}
+		ksort($aux_account);
+
 		$this->db->free($resql);
 
 		// Auxiliary user account
@@ -492,7 +478,7 @@ class FormAccounting extends Form
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {
 				if (!empty($obj->accountancy_code)) {
-					$aux_account[$obj->accountancy_code] = $obj->accountancy_code.' ('.dolGetFirstLastname($obj->firstname, $obj->lastname).')';
+					$aux_account[$obj->accountancy_code] = $obj->accountancy_code.' <span class="opacitymedium">('.dolGetFirstLastname($obj->firstname, $obj->lastname).')</span>';
 				}
 			}
 		} else {
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 843c9ec759f..0cccbe6ad8c 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -70,7 +70,7 @@ class FormActions
 		global $langs, $conf;
 
 		$listofstatus = array(
-			'-1' => $langs->trans("ActionNotApplicable"),
+			'na' => $langs->trans("ActionNotApplicable"),
 			'0' => $langs->trans("ActionsToDoShort"),
 			'50' => $langs->trans("ActionRunningShort"),
 			'100' => $langs->trans("ActionDoneShort")
@@ -130,7 +130,7 @@ class FormActions
 			//var_dump($selected);
 			if ($selected == 'done') $selected = '100';
 			print '<select '.($canedit ? '' : 'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'">';
-			if ($showempty) print '<option value=""'.($selected == '' ? ' selected' : '').'></option>';
+			if ($showempty) print '<option value=""'.($selected == '' ? ' selected' : '').'>&nbsp;</option>';
 			foreach ($listofstatus as $key => $val)
 			{
 				print '<option value="'.$key.'"'.(($selected == $key && strlen($selected) == strlen($key)) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected' : '').'>'.$val.'</option>';
@@ -142,6 +142,8 @@ class FormActions
 			print '</select>';
 			if ($selected == 0 || $selected == 100) $canedit = 0;
 
+			print ajax_combobox('select'.$htmlname);
+
 			if (empty($onlyselect))
 			{
 				print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit && ($selected >= 0) ? '' : ' disabled').'>';
@@ -202,10 +204,10 @@ class FormActions
 			$newcardbutton = '';
 			if (!empty($conf->agenda->enabled) && !empty($user->rights->agenda->myactions->create))
 			{
-				$newcardbutton .= dolGetButtonTitle($langs->trans("AddEvent"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog')).'&amp;origin='.urlencode($typeelement).'&amp;originid='.$object->id.($object->socid > 0 ? '&amp;socid='.$object->socid : ($socid > 0 ? '&amp;socid='.$socid : '')).($projectid > 0 ? '&amp;projectid='.$projectid : '').'&amp;backtopage='.urlencode($urlbacktopage));
+			    $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);
+			    $newcardbutton .= dolGetButtonTitle($langs->trans("AddEvent"), '', 'fa fa-plus-circle', $url);
 			}
 
-
 			print '<!-- formactions->showactions -->'."\n";
 			print load_fiche_titre($title, $newcardbutton, '', 0, 0, '', $morehtmlcenter);
 
@@ -244,7 +246,7 @@ class FormActions
 					print '<td class="nowraponall tdoverflowmax125">';
 					if (!empty($actioncomm->userownerid))
 					{
-						if (is_object($cacheusers[$actioncomm->userownerid]))
+					    if (isset($cacheusers[$actioncomm->userownerid]) && is_object($cacheusers[$actioncomm->userownerid]))
 						{
 							$tmpuser = $cacheusers[$actioncomm->userownerid];
 						} else {
diff --git a/htdocs/core/class/html.formcategory.class.php b/htdocs/core/class/html.formcategory.class.php
index f2f856144ff..767a064ab31 100644
--- a/htdocs/core/class/html.formcategory.class.php
+++ b/htdocs/core/class/html.formcategory.class.php
@@ -52,7 +52,8 @@ class FormCategory extends Form
 
 		$filter = '';
 		$filter .= '<div class="divsearchfield">';
-		$filter .= $langs->trans('Categories').": ";
+		$filter .= img_picto($langs->trans("Categories"), 'category', 'class="pictofixedwidth"');
+		//$filter .= $langs->trans('Categories').": ";
 		$filter .= Form::multiselectarray($htmlName, $categoryArray, $preSelected, 0, 0, "minwidth300");
 		$filter .= "</div>";
 
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 26e184eb614..e84a6716134 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -757,30 +757,37 @@ class FormCompany extends Form
 	 *  @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
 	 */
-	public function selectTypeContact($object, $selected, $htmlname = 'type', $source = 'internal', $sortorder = 'position', $showempty = 0, $morecss = '')
+	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);
 
-			print '<select class="flat valignmiddle'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-			if ($showempty) print '<option value="0"></option>';
+			$out .= '<select class="flat valignmiddle'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+			if ($showempty) $out .= '<option value="0"></option>';
 			foreach ($lesTypes as $key=>$value)
 			{
-				print '<option value="'.$key.'"';
-				if ($key == $selected) print ' selected';
-				print '>'.$value.'</option>';
+				$out .= '<option value="'.$key.'"';
+				if ($key == $selected) $out .= ' selected';
+				$out .= '>'.$value.'</option>';
 			}
-			print "</select>";
-			if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			$out .= "</select>";
+			if ($user->admin && empty($forcehidetooltip)) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 
-			print ajax_combobox($htmlname);
+			$out .= ajax_combobox($htmlname);
 
-			print "\n";
+			$out .= "\n";
+		}
+		if (empty($output)) {
+			return $out;
+		} else {
+			print $out;
 		}
 	}
 
@@ -829,7 +836,7 @@ class FormCompany extends Form
 	 *
 	 *    @param	string		$selected				Preselected value
 	 *    @param    string		$htmlname				HTML select name
-	 *    @param    string		$fields					Fields
+	 *    @param    array		$fields					Array with key of fields to refresh after selection
 	 *    @param    int			$fieldsize				Field size
 	 *    @param    int			$disableautocomplete    1 To disable ajax autocomplete features (browser autocomplete may still occurs)
 	 *    @param	string		$moreattrib				Add more attribute on HTML input field
@@ -1031,7 +1038,7 @@ class FormCompany extends Form
 			$out .= '<input type="hidden" name="action" value="set_thirdpartytype">';
 			$out .= '<input type="hidden" name="token" value="'.newToken().'">';
 			$sortparam = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
-			$out .= $this->selectarray($htmlname, $this->typent_array(0, $filter), $selected, 0, 0, 0, '', 0, 0, 0, $sortparam, '', 1);
+			$out .= $this->selectarray($htmlname, $this->typent_array(0, $filter), $selected, 1, 0, 0, '', 0, 0, 0, $sortparam, '', 1);
 			$out .= '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
 			$out .= '</form>';
 		} else {
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 6836b70fe2d..c9c895148bf 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -135,15 +135,39 @@ class FormFile
 
 			$max = $conf->global->MAIN_UPLOAD_DOC; // In Kb
 			$maxphp = @ini_get('upload_max_filesize'); // In unknown
-			if (preg_match('/k$/i', $maxphp)) $maxphp = $maxphp * 1;
-			if (preg_match('/m$/i', $maxphp)) $maxphp = $maxphp * 1024;
-			if (preg_match('/g$/i', $maxphp)) $maxphp = $maxphp * 1024 * 1024;
-			if (preg_match('/t$/i', $maxphp)) $maxphp = $maxphp * 1024 * 1024 * 1024;
+			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 = $maxphp2 * 1;
-			if (preg_match('/m$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024;
-			if (preg_match('/g$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024 * 1024;
-			if (preg_match('/t$/i', $maxphp2)) $maxphp2 = $maxphp2 * 1024 * 1024 * 1024;
+			if (preg_match('/k$/i', $maxphp2)) {
+			    $maxphp2 = preg_replace('/k$/i', '', $maxphp2);
+			    $maxphp2 = $maxphp2 * 1;
+			}
+			if (preg_match('/m$/i', $maxphp2)) {
+			    $maxphp2 = preg_replace('/m$/i', '', $maxphp2);
+			    $maxphp2 = $maxphp2 * 1024;
+			}
+			if (preg_match('/g$/i', $maxphp2)) {
+			    $maxphp2 = preg_replace('/g$/i', '', $maxphp2);
+			    $maxphp2 = $maxphp2 * 1024 * 1024;
+			}
+			if (preg_match('/t$/i', $maxphp2)) {
+			    $maxphp2 = preg_replace('/t$/i', '', $maxphp2);
+			    $maxphp2 = $maxphp2 * 1024 * 1024 * 1024;
+			}
 			// Now $max and $maxphp and $maxphp2 are in Kb
 			$maxmin = $max;
 			$maxphptoshow = $maxphptoshowparam = '';
@@ -1042,15 +1066,16 @@ class FormFile
 		if ($disablecrop == -1)
 		{
 			$disablecrop = 1;
-			if (in_array($modulepart, array('bank', 'bom', 'expensereport', 'holiday', 'medias', 'member', 'mrp', 'project', 'product', 'produit', 'propal', 'service', 'societe', 'tax', 'tax-vat', 'ticket', 'user'))) $disablecrop = 0;
+			// Values here must be supported by the photo_resize.php page.
+			if (in_array($modulepart, array('bank', 'bom', 'expensereport', 'facture', 'facture_fournisseur', 'holiday', 'medias', 'member', 'mrp', 'project', 'product', 'produit', 'propal', 'service', 'societe', 'tax', 'tax-vat', 'ticket', 'user'))) $disablecrop = 0;
 		}
 
 		// Define relative path used to store the file
 		if (empty($relativepath))
 		{
 			$relativepath = (!empty($object->ref) ?dol_sanitizeFileName($object->ref) : '').'/';
-			if ($object->element == 'invoice_supplier') $relativepath = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$relativepath; // TODO Call using a defined value for $relativepath
-			if ($object->element == 'project_task') $relativepath = 'Call_not_supported_._Call_function_using_a_defined_relative_path_.';
+			if (!empty($object->element) && $object->element == 'invoice_supplier') $relativepath = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$relativepath; // TODO Call using a defined value for $relativepath
+			if (!empty($object->element) && $object->element == 'project_task') $relativepath = 'Call_not_supported_._Call_function_using_a_defined_relative_path_.';
 		}
 		// For backward compatiblity, we detect file stored into an old path
 		if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $filearray[0]['level1name'] == 'photos')
@@ -1149,7 +1174,9 @@ class FormFile
 			print_liste_field_titre('Size', $url, "size", "", $param, '', $sortfield, $sortorder, 'right ');
 			print_liste_field_titre('Date', $url, "date", "", $param, '', $sortfield, $sortorder, 'center ');
 			if (empty($useinecm) || $useinecm == 4 || $useinecm == 5 || $useinecm == 6) print_liste_field_titre('', $url, "", "", $param, '', $sortfield, $sortorder, 'center '); // Preview
+			// Shared or not - Hash of file
 			print_liste_field_titre('');
+			// Action button
 			print_liste_field_titre('');
 			if (!$disablemove) print_liste_field_titre('');
 			print "</tr>\n";
@@ -1260,12 +1287,10 @@ class FormFile
 						print '</td>';
 					}
 
-					// Hash of file (only if we are in a mode where a scan of dir were done and we have id of file in ECM table)
+					// Shared or not - Hash of file
 					print '<td class="center">';
-					if ($relativedir && $filearray[$key]['rowid'] > 0)
-					{
-						if ($editline)
-						{
+					if ($relativedir && $filearray[$key]['rowid'] > 0) {	// only if we are in a mode where a scan of dir were done and we have id of file in ECM table
+						if ($editline) {
 							print $langs->trans("FileSharedViaALink").' ';
 							print '<input class="inline-block" type="checkbox" name="shareenabled"'.($file['share'] ? ' checked="checked"' : '').' /> ';
 						} else {
@@ -1293,7 +1318,7 @@ class FormFile
 					}
 					print '</td>';
 
-					// Actions buttons
+					// Actions buttons (1 column or 2 if !disablemove)
 					if (!$editline)
 					{
 						// Delete or view link
@@ -1381,6 +1406,7 @@ class FormFile
 				else print $textifempty;
 				print '</td></tr>';
 			}
+
 			print "</table>";
 			print '</div>';
 
@@ -1454,7 +1480,7 @@ class FormFile
 			print '<td class="liste_titre"></td>';
 			print '<td class="liste_titre"></td>';
 			// Action column
-			print '<td class="liste_titre center">';
+			print '<td class="liste_titre right">';
 			$searchpicto = $form->showFilterButtons();
 			print $searchpicto;
 			print '</td>';
@@ -1468,7 +1494,7 @@ class FormFile
 		print_liste_field_titre("Documents2", $url, "name", "", $param, '', $sortfield, $sortorder);
 		print_liste_field_titre("Size", $url, "size", "", $param, '', $sortfield, $sortorder, 'right ');
 		print_liste_field_titre("Date", $url, "date", "", $param, '', $sortfield, $sortorder, 'center ');
-		print_liste_field_titre('', '', '');
+		print_liste_field_titre("Shared", $url, 'share', '', $param, '', $sortfield, $sortorder, 'right ');
 		print '</tr>'."\n";
 
 		// To show ref or specific information according to view to show (defined by $module)
@@ -1544,6 +1570,20 @@ class FormFile
 		{
 			include_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 			$object_instance = new Mo($this->db);
+		} else {
+			$parameters = array('modulepart'=>$modulepart);
+			$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
+			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'])) {
+						if (class_exists($hookmanager->resArray['classname'])) {
+							$object_instance = new ${$hookmanager->resArray['classname']}($this->db);
+						}
+					}
+				}
+			}
 		}
 
 		//var_dump($filearray);
@@ -1557,7 +1597,7 @@ class FormFile
 			//var_dump($sortfield.' - '.$sortorder);
 			if ($sortfield && $sortorder)	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
 			{
-				$filearray = dol_sort_array($filearray, $sortfield, $sortorder);
+				$filearray = dol_sort_array($filearray, $sortfield, $sortorder, 1);
 			}
 		}
 
@@ -1597,6 +1637,17 @@ class FormFile
 					'banque'))) {
 					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : '');
 				} else {
+					$parameters = array('modulepart'=>$modulepart,'fileinfo'=>$file);
+					$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
+					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'];
+						}
+						if (array_key_exists('id', $hookmanager->resArray) && !empty($hookmanager->resArray['id'])) {
+							$id = $hookmanager->resArray['id'];
+						}
+					}
 					//print 'Error: Value for modulepart = '.$modulepart.' is not yet implemented in function list_of_autoecmfiles'."\n";
 				}
 
@@ -1689,7 +1740,7 @@ class FormFile
 					$fulllink = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
 
 					print img_picto($langs->trans("FileSharedViaALink"), 'globe').' ';
-					print '<input type="text" class="quatrevingtpercent width100" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
+					print '<input type="text" class="quatrevingtpercent width100 nopadding" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
 				}
 				//if (! empty($useinecm) && $useinecm != 6)  print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
 				//if ($forcedownload) print '&attachment=1';
@@ -1697,7 +1748,9 @@ class FormFile
 				//print img_view().'</a> &nbsp; ';
 				//if ($permissiontodelete) print '<a href="'.$url.'?id='.$object->id.'&section='.$_REQUEST["section"].'&action=delete&token='.newToken().'&urlfile='.urlencode($file['name']).'">'.img_delete().'</a>';
 				//else print '&nbsp;';
-				print "</td></tr>\n";
+				print "</td>";
+
+				print "</tr>\n";
 			}
 		}
 
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 59c6b2af273..d81d1ef2156 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -391,7 +391,9 @@ class FormMail extends Form
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $this->param['langsmodels'];
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+				$newlang = $this->param['langsmodels'];
+			}
 			if (!empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
@@ -423,13 +425,13 @@ class FormMail extends Form
 				}
 			}
 
-	   		if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+			if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) {
 				$listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
 			}
-	   		if (!empty($_SESSION["listofnames".$keytoavoidconflict])) {
+			if (!empty($_SESSION["listofnames".$keytoavoidconflict])) {
 				$listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
 			}
-	   		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+			if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) {
 				$listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
 			}
 
@@ -449,7 +451,7 @@ class FormMail extends Form
 					$out .= '<input type="hidden" id="frommail" name="frommail" value="'.$this->frommail.'" />';
 				}
 			}
-			foreach ($this->param as $key=>$value) {
+			foreach ($this->param as $key => $value) {
 				if (is_array($value)) {
 					$out .= "<!-- param key=".$key." is array, we do not output input filed for it -->\n";
 				} else {
@@ -475,18 +477,29 @@ class FormMail extends Form
 
 					// We escape the $labeltouse to store it into $modelmail_array.
 					$modelmail_array[$line->id] = dol_escape_htmltag($labeltouse);
-					if ($line->lang) $modelmail_array[$line->id] .= ' '.picto_from_langcode($line->lang);
-					if ($line->private) $modelmail_array[$line->id] .= ' - <span class="opacitymedium">'.dol_escape_htmltag($langs->trans("Private")).'</span>';
+					if ($line->lang) {
+						$modelmail_array[$line->id] .= ' '.picto_from_langcode($line->lang);
+					}
+					if ($line->private) {
+						$modelmail_array[$line->id] .= ' - <span class="opacitymedium">'.dol_escape_htmltag($langs->trans("Private")).'</span>';
+					}
 				}
 			}
 
 			// Zone to select email template
 			if (count($modelmail_array) > 0) {
+				$model_mail_selected_id = GETPOSTISSET('modelmailselected') ? GETPOST('modelmailselected', 'int') : $arraydefaultmessage->id;
+
 				// If list of template is filled
 				$out .= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
+
 				$out .= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> ';
-				$out .= $this->selectarray('modelmailselected', $modelmail_array, 0, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1, '', 0, 1);
-				if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')), 1);
+
+				$out .= $this->selectarray('modelmailselected', $modelmail_array, $model_mail_selected_id, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1, '', 0, 1);
+				if ($user->admin) {
+					$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" id="modelselected">';
 				$out .= ' &nbsp; ';
@@ -499,7 +512,9 @@ class FormMail extends Form
 				// If list of template is empty
 				$out .= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
 				$out .= $langs->trans('SelectMailModel').': <select name="modelmailselected" disabled="disabled"><option value="none">'.$langs->trans("NoTemplateDefined").'</option></select>'; // Do not put 'disabled' on 'option' tag, it is already on 'select' and it makes chrome crazy.
-				if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')), 1);
+				if ($user->admin) {
+					$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 .= ' &nbsp; ';
@@ -513,24 +528,24 @@ class FormMail extends Form
 
 			// Substitution array/string
 			$helpforsubstitution = '';
-			if (is_array($this->substit) && count($this->substit)) $helpforsubstitution .= $langs->trans('AvailableVariables').' :<br>'."\n";
+			if (is_array($this->substit) && count($this->substit)) {
+				$helpforsubstitution .= $langs->trans('AvailableVariables').' :<br>'."\n";
+			}
 			foreach ($this->substit as $key => $val) {
 				$helpforsubstitution .= $key.' -> '.$langs->trans(dol_string_nohtmltag(dolGetFirstLineOfText($val))).'<br>';
 			}
-			if (!empty($this->withsubstit))	{	// Unset or set ->withsubstit=0 to disable this.
+			if (!empty($this->withsubstit)) {	// Unset or set ->withsubstit=0 to disable this.
 				$out .= '<tr><td colspan="2" class="right">';
 				//$out.='<div class="floatright">';
-				if (is_numeric($this->withsubstit)) $out .= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip'); // Old usage
-				else $out .= $form->textwithpicto($langs->trans('AvailableVariables'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip'); // New usage
+				if (is_numeric($this->withsubstit)) {
+					$out .= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip'); // Old usage
+				} else {
+					$out .= $form->textwithpicto($langs->trans('AvailableVariables'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip'); // New usage
+				}
 				$out .= "</td></tr>\n";
 				//$out.='</div>';
 			}
 
-			/*var_dump(! empty($this->withfromreadonly));
-			var_dump($this->withfrom);
-			var_dump($this->fromtype);
-			var_dump($this->fromname);*/
-
 			// From
 			if (!empty($this->withfrom)) {
 				if (!empty($this->withfromreadonly)) {
@@ -609,7 +624,9 @@ class FormMail extends Form
 								if ($listaliasval) {
 									$listaliasval = preg_replace('/</', '&lt;', $listaliasval);
 									$listaliasval = preg_replace('/>/', '&gt;', $listaliasval);
-									if (!preg_match('/&lt;/', $listaliasval)) $listaliasval = '&lt;'.$listaliasval.'&gt;';
+									if (!preg_match('/&lt;/', $listaliasval)) {
+										$listaliasval = '&lt;'.$listaliasval.'&gt;';
+									}
 									$liste[$typealias.'_'.$posalias] = $listaliasval;
 								}
 							}
@@ -621,7 +638,9 @@ class FormMail extends Form
 						if (empty($reshook)) {
 							$defaultfrom = $this->fromtype;
 						}
-						if (!empty($hookmanager->resArray['defaultfrom'])) $defaultfrom = $hookmanager->resArray['defaultfrom'];
+						if (!empty($hookmanager->resArray['defaultfrom'])) {
+							$defaultfrom = $hookmanager->resArray['defaultfrom'];
+						}
 
 						// Using combo here make the '<email>' no more visible on list.
 						//$out.= ' '.$form->selectarray('fromtype', $liste, $this->fromtype, 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 1, '', $disablebademails);
@@ -639,11 +658,13 @@ class FormMail extends Form
 			}
 
 			// To
-			if (!empty($this->withto) || is_array($this->withto))
-			{
+			if (!empty($this->withto) || is_array($this->withto)) {
 				$out .= '<tr><td class="fieldrequired">';
-				if ($this->withtofree) $out .= $form->textwithpicto($langs->trans("MailTo"), $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
-				else $out .= $langs->trans("MailTo");
+				if ($this->withtofree) {
+					$out .= $form->textwithpicto($langs->trans("MailTo"), $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+				} else {
+					$out .= $langs->trans("MailTo");
+				}
 				$out .= '</td><td>';
 				if ($this->withtoreadonly) {
 					if (!empty($this->toname) && !empty($this->tomail)) {
@@ -675,7 +696,9 @@ class FormMail extends Form
 					}
 					// The select combo
 					if (!empty($this->withto) && is_array($this->withto)) {
-						if (!empty($this->withtofree)) $out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
+						if (!empty($this->withtofree)) {
+							$out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
+						}
 						// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 						$tmparray = $this->withto;
 						foreach ($tmparray as $key => $val) {
@@ -805,7 +828,8 @@ class FormMail extends Form
 
 				$out .= '<td>';
 
-				if ($this->withmaindocfile)	{ // withmaindocfile is set to 1 or -1 to show the checkbox (-1 = checked or 1 = not checked)
+				if ($this->withmaindocfile)	{
+					// withmaindocfile is set to 1 or -1 to show the checkbox (-1 = checked or 1 = not checked)
 					if (GETPOSTISSET('sendmail')) {
 						$this->withmaindocfile = (GETPOST('addmaindocfile', 'alpha') ? -1 : 1);
 					} elseif (is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
@@ -836,9 +860,16 @@ class FormMail extends Form
 					$out .= '</script>'."\n";
 					if (count($listofpaths)) {
 						foreach ($listofpaths as $key => $val) {
+							$relativepathtofile = substr($val, (strlen(DOL_DATA_ROOT) - strlen($val)));
+							if ($conf->entity > 1) {
+								$relativepathtofile = str_replace($conf->entity.'/', '', $relativepathtofile);
+							}
+							// Try to extract data from full path
+							$formfile_params = array();
+							preg_match('#^(/)(\w+)(/)(.+)$#', $relativepathtofile, $formfile_params);
+
 							$out .= '<div id="attachfile_'.$key.'">';
 							// Preview of attachment
-							preg_match('#^(/)(\w+)(/)(.+)$#', substr($val, (strlen(DOL_DATA_ROOT) - strlen($val))), $formfile_params);
 							$out .= img_mime($listofnames[$key]).' '.$listofnames[$key];
 							$out .= $formfile->showPreview(array(), $formfile_params[2], $formfile_params[4]);
 							if (!$this->withfilereadonly) {
@@ -847,12 +878,17 @@ class FormMail extends Form
 							}
 							$out .= '<br></div>';
 						}
-					} elseif (empty($this->withmaindocfile)) { // Do not show message if we asked to show the checkbox
+					} elseif (empty($this->withmaindocfile)) {
+						// Do not show message if we asked to show the checkbox
 						$out .= $langs->trans("NoAttachedFiles").'<br>';
 					}
-					if ($this->withfile == 2) {	// Can add other files
-						if (!empty($conf->global->FROM_MAIL_USE_INPUT_FILE_MULTIPLE)) $out .= '<input type="file" class="flat" id="addedfile" name="addedfile[]" value="'.$langs->trans("Upload").'" multiple />';
-						else $out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
+					if ($this->withfile == 2) {
+						// Can add other files
+						if (!empty($conf->global->FROM_MAIL_USE_INPUT_FILE_MULTIPLE)) {
+							$out .= '<input type="file" class="flat" id="addedfile" name="addedfile[]" value="'.$langs->trans("Upload").'" multiple />';
+						} else {
+							$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").'" />';
 					}
@@ -972,8 +1008,11 @@ class FormMail extends Form
 					// Editor wysiwyg
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 					if ($this->withfckeditor == -1) {
-						if (!empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $this->withfckeditor = 1;
-						else $this->withfckeditor = 0;
+						if (!empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
+							$this->withfckeditor = 1;
+						} else {
+							$this->withfckeditor = 0;
+						}
 					}
 
 					$doleditor = new DolEditor('message', $defaultmessage, '', 280, $this->ckeditortoolbar, 'In', true, true, $this->withfckeditor, 8, '95%');
@@ -1105,7 +1144,7 @@ class FormMail extends Form
 	}
 
 	/**
-	 * get Html For Asking for Deliveriy Receipt
+	 * get Html For Asking for Delivery Receipt
 	 *
 	 * @return string html
 	 */
@@ -1118,10 +1157,18 @@ class FormMail extends Form
 			$out .= yn($this->withdeliveryreceipt);
 		} else {
 			$defaultvaluefordeliveryreceipt = 0;
-			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_PROPAL) && !empty($this->param['models']) && $this->param['models'] == 'propal_send') $defaultvaluefordeliveryreceipt = 1;
-			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_PROPOSAL) && !empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') $defaultvaluefordeliveryreceipt = 1;
-			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_ORDER) && !empty($this->param['models']) && $this->param['models'] == 'order_send') $defaultvaluefordeliveryreceipt = 1;
-			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_INVOICE) && !empty($this->param['models']) && $this->param['models'] == 'facture_send') $defaultvaluefordeliveryreceipt = 1;
+			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_PROPAL) && !empty($this->param['models']) && $this->param['models'] == 'propal_send') {
+				$defaultvaluefordeliveryreceipt = 1;
+			}
+			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_PROPOSAL) && !empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') {
+				$defaultvaluefordeliveryreceipt = 1;
+			}
+			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_ORDER) && !empty($this->param['models']) && $this->param['models'] == 'order_send') {
+				$defaultvaluefordeliveryreceipt = 1;
+			}
+			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_INVOICE) && !empty($this->param['models']) && $this->param['models'] == 'facture_send') {
+				$defaultvaluefordeliveryreceipt = 1;
+			}
 			$out .= $form->selectyesno('deliveryreceipt', (GETPOSTISSET("deliveryreceipt") ? GETPOST("deliveryreceipt") : $defaultvaluefordeliveryreceipt), 1);
 		}
 		$out .= "</td></tr>\n";
@@ -1200,11 +1247,21 @@ class FormMail extends Form
 		$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 = ".$user->id.")"; // Get all public or private owned
-		if ($active >= 0) $sql .= " AND active = ".$active;
-		if ($label) $sql .= " AND label ='".$db->escape($label)."'";
-		if (!($id > 0) && $languagetosearch) $sql .= " AND (lang = '".$db->escape($languagetosearch)."'".($languagetosearchmain ? " OR lang = '".$db->escape($languagetosearchmain)."'" : "")." OR lang IS NULL OR lang = '')";
-		if ($id > 0)   $sql .= " AND rowid=".$id;
-		if ($id == -1) $sql .= " AND position=0";
+		if ($active >= 0) {
+			$sql .= " AND active = ".$active;
+		}
+		if ($label) {
+			$sql .= " AND label ='".$db->escape($label)."'";
+		}
+		if (!($id > 0) && $languagetosearch) {
+			$sql .= " AND (lang = '".$db->escape($languagetosearch)."'".($languagetosearchmain ? " OR lang = '".$db->escape($languagetosearchmain)."'" : "")." OR lang IS NULL OR lang = '')";
+		}
+		if ($id > 0) {
+			$sql .= " AND rowid=".$id;
+		}
+		if ($id == -1) {
+			$sql .= " AND position=0";
+		}
 		if ($languagetosearch) {
 			$sql .= $db->order("position,lang,label", "ASC,DESC,ASC"); // We want line with lang set first, then with lang null or ''
 		} else {
@@ -1229,7 +1286,8 @@ class FormMail extends Form
 			} elseif ($id == -2) {
 				// Not found with the provided label
 				return -1;
-			} else {	// If there is no template at all
+			} else {
+				// If there is no template at all
 				$defaultmessage = '';
 
 				if ($type_template == 'body') {
@@ -1257,8 +1315,6 @@ class FormMail extends Form
 					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendActionComm");
 				} elseif ($type_template == 'thirdparty') {
 					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentThirdparty");
-				} elseif ($type_template == 'user') {
-					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentUser");
 				} elseif (!empty($type_template)) {
 					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentGeneric");
 				}
@@ -1401,7 +1457,9 @@ class FormMail extends Form
 
 				// Create dynamic tags for __PRODUCT_EXTRAFIELD_FIELD__
 				if (!empty($line->fk_product)) {
-					if (!is_object($extrafields)) $extrafields = new ExtraFields($this->db);
+					if (!is_object($extrafields)) {
+						$extrafields = new ExtraFields($this->db);
+					}
 					$extrafields->fetch_name_optionals_label('product', true);
 					$product = new Product($this->db);
 					$product->fetch($line->fk_product, '', '', 1);
@@ -1462,19 +1520,33 @@ class FormMail extends Form
 			$tmparray['__USER_SIGNATURE__'] = 'TagSignature';
 			$tmparray['__CHECK_READ__'] = 'TagCheckMail';
 			$tmparray['__UNSUBSCRIBE__'] = 'TagUnsubscribe';
-				//,'__PERSONALIZED__' => 'Personalized'	// Hidden because not used yet in mass emailing
+			//,'__PERSONALIZED__' => 'Personalized'	// Hidden because not used yet in mass emailing
 
 			$onlinepaymentenabled = 0;
-			if (!empty($conf->paypal->enabled)) $onlinepaymentenabled++;
-			if (!empty($conf->paybox->enabled)) $onlinepaymentenabled++;
-			if (!empty($conf->stripe->enabled)) $onlinepaymentenabled++;
+			if (!empty($conf->paypal->enabled)) {
+				$onlinepaymentenabled++;
+			}
+			if (!empty($conf->paybox->enabled)) {
+				$onlinepaymentenabled++;
+			}
+			if (!empty($conf->stripe->enabled)) {
+				$onlinepaymentenabled++;
+			}
 			if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 				$tmparray['__SECUREKEYPAYMENT__'] = $conf->global->PAYMENT_SECURITY_TOKEN;
 				if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-					if ($conf->adherent->enabled) $tmparray['__SECUREKEYPAYMENT_MEMBER__'] = 'SecureKeyPAYMENTUniquePerMember';
-					if ($conf->facture->enabled)  $tmparray['__SECUREKEYPAYMENT_INVOICE__'] = 'SecureKeyPAYMENTUniquePerInvoice';
-					if ($conf->commande->enabled) $tmparray['__SECUREKEYPAYMENT_ORDER__'] = 'SecureKeyPAYMENTUniquePerOrder';
-					if ($conf->contrat->enabled)  $tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = 'SecureKeyPAYMENTUniquePerContractLine';
+					if ($conf->adherent->enabled) {
+						$tmparray['__SECUREKEYPAYMENT_MEMBER__'] = 'SecureKeyPAYMENTUniquePerMember';
+					}
+					if ($conf->facture->enabled) {
+						$tmparray['__SECUREKEYPAYMENT_INVOICE__'] = 'SecureKeyPAYMENTUniquePerInvoice';
+					}
+					if ($conf->commande->enabled) {
+						$tmparray['__SECUREKEYPAYMENT_ORDER__'] = 'SecureKeyPAYMENTUniquePerOrder';
+					}
+					if ($conf->contrat->enabled) {
+						$tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = 'SecureKeyPAYMENTUniquePerContractLine';
+					}
 				}
 			} else {
 				/* No need to show into tooltip help, option is not enabled
@@ -1488,7 +1560,9 @@ class FormMail extends Form
 		}
 
 		foreach ($tmparray as $key => $val) {
-			if (empty($val)) $tmparray[$key] = $key;
+			if (empty($val)) {
+				$tmparray[$key] = $key;
+			}
 		}
 
 		return $tmparray;
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index c71029769f2..dc6820c56fc 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -332,13 +332,13 @@ class FormOther
 	/**
 	 * Return select list for categories (to use in form search selectors)
 	 *
-	 * @param	int		$type			Type of category ('customer', 'supplier', 'contact', 'product', 'member'). Old mode (0, 1, 2, ...) is deprecated.
-	 * @param   integer	$selected     	Preselected value
-	 * @param   string	$htmlname      	Name of combo list
-	 * @param	int		$nocateg		Show also an entry "Not categorized"
-	 * @param   int     $showempty      Add also an empty line
-	 * @param   string  $morecss        More CSS
-	 * @return  string		        	Html combo list code
+	 * @param	int			$type			Type of category ('customer', 'supplier', 'contact', 'product', 'member'). Old mode (0, 1, 2, ...) is deprecated.
+	 * @param   integer		$selected     	Preselected value
+	 * @param   string		$htmlname      	Name of combo list
+	 * @param	int			$nocateg		Show also an entry "Not categorized"
+	 * @param   int|string  $showempty      Add also an empty line
+	 * @param   string  	$morecss        More CSS
+	 * @return  string			        	Html combo list code
 	 * @see	select_all_categories()
 	 */
 	public function select_categories($type, $selected = 0, $htmlname = 'search_categ', $nocateg = 0, $showempty = 1, $morecss = '')
@@ -368,7 +368,13 @@ class FormOther
 
 		// Print a select with each of them
 		$moreforfilter .= '<select class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';
-		if ($showempty) $moreforfilter .= '<option value="0">&nbsp;</option>'; // Should use -1 to say nothing
+		if ($showempty) {
+			$textforempty = ' ';
+			if (!empty($conf->use_javascript_ajax)) $textforempty = '&nbsp;'; // If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.
+			if (!is_numeric($showempty)) $textforempty = $showempty;
+			$moreforfilter .= '<option class="optiongrey" '.($moreparamonempty ? $moreparamonempty.' ' : '').'value="'.($showempty < 0 ? $showempty : -1).'"'.($selected == $showempty ? ' selected' : '').'>'.$textforempty.'</option>'."\n";
+			//$moreforfilter .= '<option value="0" '.($moreparamonempty ? $moreparamonempty.' ' : '').' class="optiongrey">'.(is_numeric($showempty) ? '&nbsp;' : $showempty).'</option>'; // Should use -1 to say nothing
+		}
 
 		if (is_array($tab_categs))
 		{
@@ -394,14 +400,14 @@ class FormOther
 	/**
 	 *  Return select list for categories (to use in form search selectors)
 	 *
-	 *  @param	string	$selected     		Preselected value
-	 *  @param  string	$htmlname      		Name of combo list (example: 'search_sale')
-	 *  @param  User	$user           	Object user
-	 *  @param	int		$showstatus			0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
-	 *  @param	int		$showempty			1=show also an empty value
-	 *  @param	string	$morecss			More CSS
-	 *  @param	int		$norepresentative	Show also an entry "Not categorized"
-	 *  @return string						Html combo list code
+	 *  @param	string		$selected     		Preselected value
+	 *  @param  string		$htmlname      		Name of combo list (example: 'search_sale')
+	 *  @param  User		$user           	Object user
+	 *  @param	int			$showstatus			0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
+	 *  @param	int|string	$showempty			1=show also an empty value
+	 *  @param	string		$morecss			More CSS
+	 *  @param	int			$norepresentative	Show also an entry "Not categorized"
+	 *  @return string							Html combo list code
 	 */
 	public function select_salesrepresentatives($selected, $htmlname, $user, $showstatus = 0, $showempty = 1, $morecss = '', $norepresentative = 0)
 	{
@@ -427,7 +433,12 @@ class FormOther
 
 		// Select each sales and print them in a select input
 		$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
-		if ($showempty) $out .= '<option value="0">&nbsp;</option>';
+		if ($showempty) {
+			$textforempty = ' ';
+			if (!empty($conf->use_javascript_ajax)) $textforempty = '&nbsp;'; // If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.
+			if (!is_numeric($showempty)) $textforempty = $showempty;
+			$out .= '<option class="optiongrey" value="'.($showempty < 0 ? $showempty : -1).'"'.($selected == $showempty ? ' selected' : '').'>'.$textforempty.'</option>'."\n";
+		}
 
 		// 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";
@@ -499,11 +510,7 @@ class FormOther
 				$out .= '<option value="'.$obj_usr->rowid.'"';
 				if ($obj_usr->rowid == $selected) $out .= ' selected';
 				$out .= ' data-html="';
-				$outhtml = '';
-				if (!empty($obj_usr->photo))
-				{
-					$outhtml .= $userstatic->getNomUrl(-3, '', 0, 1, 24, 1, 'login', '', 1).' ';
-				}
+				$outhtml = $userstatic->getNomUrl(-3, '', 0, 1, 24, 1, 'login', '', 1).' ';
 				if ($showstatus >= 0 && $obj_usr->status == 0) $outhtml .= '<strike class="opacitymediumxxx">';
 				$outhtml .= $labeltoshow;
 				if ($showstatus >= 0 && $obj_usr->status == 0) $outhtml .= '</strike>';
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 9ebc3a4c307..f246342a17e 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -352,7 +352,7 @@ class FormProjets
 			if (empty($option_only) && !empty($conf->use_javascript_ajax))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-			   	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
+				$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
 				$out .= $comboenhancement;
 				$morecss = 'minwidth200 maxwidth500';
 			}
@@ -388,7 +388,7 @@ class FormProjets
 							continue;
 						}
 
-						$labeltoshow = '';
+						$labeltoshow = ''; $titletoshow = '';
 
 						$disabled = 0;
 						if ($obj->fk_statut == Project::STATUS_DRAFT)
@@ -408,32 +408,39 @@ class FormProjets
 							//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 							//else $labeltoshow.=' ('.$langs->trans("Private").')';
 							$labeltoshow .= ' '.dol_trunc($obj->title, $maxlength);
+							$titletoshow = $labeltoshow;
 
-							if ($obj->name) $labeltoshow .= ' ('.$obj->name.')';
+							if ($obj->name) {
+								$labeltoshow .= ' ('.$obj->name.')';
+								$titletoshow .= ' <span class="opacitymedium">('.$obj->name.')</span>';
+							}
 
 							$disabled = 0;
-							if ($obj->fk_statut == Project::STATUS_DRAFT)
-							{
+							if ($obj->fk_statut == Project::STATUS_DRAFT) {
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("Draft");
-							} elseif ($obj->fk_statut == Project::STATUS_CLOSED)
-							{
+								$titletoshow .= ' -  <span class="opacitymedium">'.$langs->trans("Draft").'</span>';
+							} elseif ($obj->fk_statut == Project::STATUS_CLOSED) {
 								if ($discard_closed == 2) $disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("Closed");
-							} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
-							{
+								$titletoshow .= ' - <span class="opacitymedium">'.$langs->trans("Closed").'</span>';
+							} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) {
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
+								$titletoshow .= ' - <span class="opacitymedium">'.$langs->trans("LinkedToAnotherCompany").'</span>';
 							}
 							$labeltoshow .= ' - ';
+							$titletoshow .= ' - ';
 						}
 
 						// Label for task
 						$labeltoshow .= $obj->tref.' '.dol_trunc($obj->tlabel, $maxlength);
+						$titletoshow .= $obj->tref.' '.dol_trunc($obj->tlabel, $maxlength);
 
 						if (!empty($selected) && $selected == $obj->rowid)
 						{
 							$out .= '<option value="'.$obj->rowid.'" selected';
+							$out .= ' data-html="'.dol_escape_htmltag($titletoshow).'"';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out .= '>'.$labeltoshow.'</option>';
 						} else {
@@ -445,6 +452,7 @@ class FormProjets
 								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
 								//else $labeltoshow.=' ('.$langs->trans("Private").')';
+								$resultat .= ' data-html="'.dol_escape_htmltag($titletoshow).'"';
 								$resultat .= '>';
 								$resultat .= $labeltoshow;
 								$resultat .= '</option>';
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 60debed9f2d..d7cf03c41e0 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -408,7 +408,7 @@ class FormTicket
 		{
 			$formproject = new FormProjets($this->db);
 			print '<tr><td><label for="project"><span class="">'.$langs->trans("Project").'</span></label></td><td>';
-			print $formproject->select_projects(-1, GETPOST('projectid', 'int'), 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
+			print img_picto('', 'project').$formproject->select_projects(-1, GETPOST('projectid', 'int'), 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
 			print '</td></tr>';
 		}
 
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index a4cb7a603dd..cedcebbd7cf 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -37,8 +37,7 @@ class InfoBox
 	{
 		global $conf;
 
-		if (empty($conf->global->MAIN_FEATURES_LEVEL) || $conf->global->MAIN_FEATURES_LEVEL < 2)
-		{
+		if (empty($conf->global->MAIN_FEATURES_LEVEL) || $conf->global->MAIN_FEATURES_LEVEL < 2) {
 			return array(
 				0 => 'Home',
 				27 => 'AccountancyHome'
@@ -95,19 +94,22 @@ class InfoBox
 		$boxes = array();
 
 		$confuserzone = 'MAIN_BOXES_'.$zone;
-		if ($mode == 'activated')	// activated
-		{
+		if ($mode == 'activated') {	// activated
 			$sql = "SELECT b.rowid, b.position, b.box_order, b.fk_user,";
 			$sql .= " d.rowid as box_id, d.file, d.note, d.tms";
 			$sql .= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as d";
 			$sql .= " WHERE b.box_id = d.rowid";
 			$sql .= " AND b.entity IN (0,".$conf->entity.")";
-			if ($zone >= 0) $sql .= " AND b.position = ".$zone;
-			if (is_object($user)) $sql .= " AND b.fk_user IN (0,".$user->id.")";
-			else $sql .= " AND b.fk_user = 0";
+			if ($zone >= 0) {
+				$sql .= " AND b.position = ".$zone;
+			}
+			if (is_object($user)) {
+				$sql .= " AND b.fk_user IN (0,".$user->id.")";
+			} else {
+				$sql .= " AND b.fk_user = 0";
+			}
 			$sql .= " ORDER BY b.box_order";
-		} else // available
-		{
+		} else { // available
 			$sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";
 			$sql .= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
 			$sql .= " WHERE d.entity IN (0,".$conf->entity.")";
@@ -115,19 +117,15 @@ class InfoBox
 
 		dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user) ? $user->id : '')."", LOG_DEBUG);
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$j = 0;
-			while ($j < $num)
-			{
+			while ($j < $num) {
 				$obj = $db->fetch_object($resql);
 
-				if (!in_array($obj->box_id, $excludelist))
-				{
+				if (!in_array($obj->box_id, $excludelist)) {
 					$regs = array();
-					if (preg_match('/^([^@]+)@([^@]+)$/i', $obj->file, $regs))
-					{
+					if (preg_match('/^([^@]+)@([^@]+)$/i', $obj->file, $regs)) {
 						$boxname = preg_replace('/\.php$/i', '', $regs[1]);
 						$module = $regs[2];
 						$relsourcefile = "/".$module."/core/boxes/".$boxname.".php";
@@ -142,15 +140,14 @@ class InfoBox
 					// the "enabled" condition for modules forbidden for external users and the depends condition can be done.
 					// Goal is to avoid making a "new" done for each boxes returned by select.
 					dol_include_once($relsourcefile);
-					if (class_exists($boxname))
-					{
+					if (class_exists($boxname)) {
 						$box = new $boxname($db, $obj->note); // Constructor may set properties like box->enabled. obj->note is note into box def, not user params.
 						//$box=new stdClass();
 
 						// box properties
 						$box->rowid = (empty($obj->rowid) ? '' : $obj->rowid);
 						$box->id = (empty($obj->box_id) ? '' : $obj->box_id);
-						$box->position = ($obj->position == '' ? '' : $obj->position); // '0' must stay '0'
+						$box->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->fk_user = (empty($obj->fk_user) ? 0 : $obj->fk_user);
 						$box->sourcefile = $relsourcefile;
@@ -158,8 +155,7 @@ class InfoBox
 
 						if ($mode == 'activated' && !is_object($user))	// List of activated box was not yet personalized into database
 						{
-							if (is_numeric($box->box_order))
-							{
+							if (is_numeric($box->box_order)) {
 								if ($box->box_order % 2 == 1) $box->box_order = 'A'.$box->box_order;
 								elseif ($box->box_order % 2 == 0) $box->box_order = 'B'.$box->box_order;
 							}
@@ -171,14 +167,11 @@ class InfoBox
 						// Filter on box->enabled (used for example by box_comptes)
 						// Filter also on box->depends. Example: array("product|service") or array("contrat", "service")
 						$enabled = $box->enabled;
-						if (isset($box->depends) && count($box->depends) > 0)
-						{
-							foreach ($box->depends as $moduleelem)
-							{
+						if (isset($box->depends) && count($box->depends) > 0) {
+							foreach ($box->depends as $moduleelem) {
 								$arrayelem = explode('|', $moduleelem);
 								$tmpenabled = 0; // $tmpenabled is used for the '|' test (OR)
-								foreach ($arrayelem as $module)
-								{
+								foreach ($arrayelem as $module) {
 									$tmpmodule = preg_replace('/@[^@]+/', '', $module);
 									if (!empty($conf->$tmpmodule->enabled)) $tmpenabled = 1;
 									//print $boxname.'-'.$module.'-module enabled='.(empty($conf->$tmpmodule->enabled)?0:1).'<br>';
@@ -240,8 +233,7 @@ class InfoBox
 		$tab = array();
 		$confuserzone = 'MAIN_BOXES_'.$zone;
 		$tab[$confuserzone] = 1;
-		if (dol_set_user_param($db, $conf, $user, $tab) < 0)
-		{
+		if (dol_set_user_param($db, $conf, $user, $tab) < 0) {
 			$error = $db->lasterror();
 			$db->rollback();
 			return -3;
@@ -287,8 +279,7 @@ class InfoBox
 
 						dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);
 						$result = $db->query($sql);
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$error++;
 							break;
 						}
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 19965250727..534d6b5803e 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -179,20 +179,29 @@ class Interfaces
 			$objMod = new $modName($this->db);
 			if ($objMod)
 			{
+				$dblevelbefore = $this->db->transaction_opened;
+
 				$result = 0;
 
-				if (method_exists($objMod, 'runTrigger'))	// New method to implement
-				{
+				if (method_exists($objMod, 'runTrigger')) {	// New method to implement
 					//dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_DEBUG);
 					$result = $objMod->runTrigger($action, $object, $user, $langs, $conf);
-				} elseif (method_exists($objMod, 'run_trigger'))	// Deprecated method
-				{
+				} elseif (method_exists($objMod, 'run_trigger')) {	// Deprecated method
 					dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);
 					$result = $objMod->run_trigger($action, $object, $user, $langs, $conf);
 				} else {
 					dol_syslog(get_class($this)."::run_triggers action=".$action." A trigger was declared for class ".get_class($objMod)." but method runTrigger was not found", LOG_ERR);
 				}
 
+				$dblevelafter = $this->db->transaction_opened;
+
+				if ($dblevelbefore != $dblevelafter) {
+					$errormessage = "Error, the balance begin/close of db transactions has been broken into trigger ".$modName." with action=".$action." before=".$dblevelbefore." after=".$dblevelafter;
+					$this->errors[] = $errormessage;
+					dol_syslog($errormessage, LOG_ERR);
+					$result = -1;
+				}
+
 				if ($result > 0)
 				{
 					// Action OK
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 8695ef88ef4..a31c5245ce0 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -111,6 +111,11 @@ class Menubase
 	 */
 	public $title;
 
+	/**
+	 * @var string Prefix
+	 */
+	public $prefix;
+
 	/**
 	 * @var string Lang file to load for translation
 	 */
@@ -248,6 +253,7 @@ class Menubase
 				$sql .= "url,";
 				$sql .= "target,";
 				$sql .= "titre,";
+				$sql .= "prefix,";
 				$sql .= "langs,";
 				$sql .= "perms,";
 				$sql .= "enabled,";
@@ -266,6 +272,7 @@ class Menubase
 				$sql .= " '".$this->db->escape($this->url)."',";
 				$sql .= " '".$this->db->escape($this->target)."',";
 				$sql .= " '".$this->db->escape($this->title)."',";
+				$sql .= " '".$this->db->escape($this->prefix)."',";
 				$sql .= " '".$this->db->escape($this->langs)."',";
 				$sql .= " '".$this->db->escape($this->perms)."',";
 				$sql .= " '".$this->db->escape($this->enabled)."',";
@@ -319,6 +326,7 @@ class Menubase
 		$this->url = trim($this->url);
 		$this->target = trim($this->target);
 		$this->title = trim($this->title);
+		$this->prefix = trim($this->prefix);
 		$this->langs = trim($this->langs);
 		$this->perms = trim($this->perms);
 		$this->enabled = trim($this->enabled);
@@ -341,6 +349,7 @@ class Menubase
 		$sql .= " url='".$this->db->escape($this->url)."',";
 		$sql .= " target='".$this->db->escape($this->target)."',";
 		$sql .= " titre='".$this->db->escape($this->title)."',";
+		$sql .= " prefix='".$this->db->escape($this->prefix)."',";
 		$sql .= " langs='".$this->db->escape($this->langs)."',";
 		$sql .= " perms='".$this->db->escape($this->perms)."',";
 		$sql .= " enabled='".$this->db->escape($this->enabled)."',";
@@ -385,6 +394,7 @@ class Menubase
 		$sql .= " t.url,";
 		$sql .= " t.target,";
 		$sql .= " t.titre as title,";
+		$sql .= " t.prefix,";
 		$sql .= " t.langs,";
 		$sql .= " t.perms,";
 		$sql .= " t.enabled,";
@@ -416,6 +426,7 @@ class Menubase
 				$this->url = $obj->url;
 				$this->target = $obj->target;
 				$this->title = $obj->title;
+				$this->prefix = $obj->prefix;
 				$this->langs = $obj->langs;
 				$this->perms = $obj->perms;
 				$this->enabled = str_replace("\"", "'", $obj->enabled);
@@ -505,8 +516,7 @@ class Menubase
 		$leftmenu = $myleftmenu; // To export to dol_eval function
 
 		$newTabMenu = array();
-		foreach ($tabMenu as $val)
-		{
+		foreach ($tabMenu as $val) {
 			if ($val['type'] == 'top') $newTabMenu[] = $val;
 		}
 
@@ -554,15 +564,13 @@ class Menubase
 		// Now complete $this->newmenu->list when fk_menu value is -1 (left menu added by modules with no top menu)
 		foreach ($tabMenu as $key => $val)
 		{
-			//var_dump($tabMenu);
 			if ($val['fk_menu'] == -1 && $val['fk_mainmenu'] == $mainmenu)    // We found a menu entry not linked to parent with good mainmenu
 			{
 				//print 'Try to add menu (current is mainmenu='.$mainmenu.' leftmenu='.$leftmenu.') for '.join(',',$val).' fk_mainmenu='.$val['fk_mainmenu'].' fk_leftmenu='.$val['fk_leftmenu'].'<br>';
 				//var_dump($this->newmenu->liste);exit;
 
-				if (empty($val['fk_leftmenu']))
-				{
-					$this->newmenu->add($val['url'], $val['titre'], 0, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
+				if (empty($val['fk_leftmenu'])) {
+					$this->newmenu->add($val['url'], $val['titre'], 0, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position'], '', '', '', $val['prefix']);
 					//var_dump($this->newmenu->liste);
 				} else {
 					// Search first menu with this couple (mainmenu,leftmenu)=(fk_mainmenu,fk_leftmenu)
@@ -579,8 +587,7 @@ class Menubase
 								break;
 							}
 						}
-						if ($valparent['mainmenu'] == $val['fk_mainmenu'] && $valparent['leftmenu'] == $val['fk_leftmenu'])
-						{
+						if ($valparent['mainmenu'] == $val['fk_mainmenu'] && $valparent['leftmenu'] == $val['fk_leftmenu']) {
 							//print "We found parent: keyparent='.$keyparent.' - level=".$valparent['level'].' - '.join(',',$valparent).'<br>';
 							// Now we look to find last subelement of this parent (we add at end)
 							$searchlastsub = ($valparent['level'] + 1);
@@ -589,8 +596,9 @@ class Menubase
 						}
 					}
 					//print 'We must insert menu entry between entry '.$lastid.' and '.$nextid.'<br>';
-					if ($found) $this->newmenu->insert($lastid, $val['url'], $val['titre'], $searchlastsub, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
-					else {
+					if ($found) {
+						$this->newmenu->insert($lastid, $val['url'], $val['titre'], $searchlastsub, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position'], '', '', '', $val['prefix']);
+					} else {
 						dol_syslog("Error. Modules ".$val['module']." has defined a menu entry with a parent='fk_mainmenu=".$val['fk_leftmenu'].",fk_leftmenu=".$val['fk_leftmenu']."' and position=".$val['position'].'. The parent was not found. May be you forget it into your definition of menu, or may be the parent has a "position" that is after the child (fix field "position" of parent or child in this case).', LOG_WARNING);
 						//print "Parent menu not found !!<br>";
 					}
@@ -620,7 +628,7 @@ class Menubase
 		$mainmenu = $mymainmenu; // To export to dol_eval function
 		$leftmenu = $myleftmenu; // To export to dol_eval function
 
-		$sql = "SELECT m.rowid, m.type, m.module, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu, m.url, m.titre, m.langs, m.perms, m.enabled, m.target, m.mainmenu, m.leftmenu, m.position";
+		$sql = "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 .= " WHERE m.entity IN (0,".$conf->entity.")";
 		$sql .= " AND m.menu_handler IN ('".$this->db->escape($menu_handler)."','all')";
@@ -700,12 +708,15 @@ class Menubase
 					$tabMenu[$b]['module']      = $menu['module'];
 					$tabMenu[$b]['fk_menu']     = $menu['fk_menu'];
 					$tabMenu[$b]['url']         = $menu['url'];
-					if (!preg_match("/^(http:\/\/|https:\/\/)/i", $tabMenu[$b]['url']))
-					{
-						if (preg_match('/\?/', $tabMenu[$b]['url'])) $tabMenu[$b]['url'] .= '&amp;idmenu='.$menu['rowid'];
-						else $tabMenu[$b]['url'] .= '?idmenu='.$menu['rowid'];
+					if (!preg_match("/^(http:\/\/|https:\/\/)/i", $tabMenu[$b]['url'])) {
+						if (preg_match('/\?/', $tabMenu[$b]['url'])) {
+							$tabMenu[$b]['url'] .= '&amp;idmenu='.$menu['rowid'];
+						} else {
+							$tabMenu[$b]['url'] .= '?idmenu='.$menu['rowid'];
+						}
 					}
 					$tabMenu[$b]['titre']       = $title;
+					$tabMenu[$b]['prefix'] = $menu['prefix'];
 					$tabMenu[$b]['target']      = $menu['target'];
 					$tabMenu[$b]['mainmenu']    = $menu['mainmenu'];
 					$tabMenu[$b]['leftmenu']    = $menu['leftmenu'];
@@ -750,9 +761,8 @@ class Menubase
 		for ($x = 0; $x < $num; $x++)
 		{
 			//si un element a pour pere : $pere
-			if ((($tab[$x]['fk_menu'] >= 0 && $tab[$x]['fk_menu'] == $pere)) && $tab[$x]['enabled'])
-			{
-				$this->newmenu->add($tab[$x]['url'], $tab[$x]['titre'], ($level - 1), $tab[$x]['perms'], $tab[$x]['target'], $tab[$x]['mainmenu'], $tab[$x]['leftmenu']);
+			if ((($tab[$x]['fk_menu'] >= 0 && $tab[$x]['fk_menu'] == $pere)) && $tab[$x]['enabled']) {
+				$this->newmenu->add($tab[$x]['url'], $tab[$x]['titre'], ($level - 1), $tab[$x]['perms'], $tab[$x]['target'], $tab[$x]['mainmenu'], $tab[$x]['leftmenu'], 0, '', '', '', $tab[$x]['prefix']);
 				$this->recur($tab, $tab[$x]['rowid'], ($level + 1));
 			}
 		}
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 7cd38233eb3..86380651658 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -81,7 +81,8 @@ class Notify
 		'EXPENSE_REPORT_VALIDATE',
 		'EXPENSE_REPORT_APPROVE',
 		'HOLIDAY_VALIDATE',
-		'HOLIDAY_APPROVE'
+		'HOLIDAY_APPROVE',
+        'ACTION_CREATE'
 	);
 
 
@@ -530,12 +531,18 @@ class Notify
 								$object_type = 'holiday';
 								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayValidated", $link);
 								break;
-							case 'HOLIDAY_APPROVE':
-								$link = '<a href="'.$urlwithroot.'/holiday/card.php?id='.$object->id.'">'.$newref.'</a>';
-								$dir_output = $conf->holiday->dir_output;
-								$object_type = 'holiday';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayApproved", $link);
-								break;
+                            case 'HOLIDAY_APPROVE':
+                                $link = '<a href="'.$urlwithroot.'/holiday/card.php?id='.$object->id.'">'.$newref.'</a>';
+                                $dir_output = $conf->holiday->dir_output;
+                                $object_type = 'holiday';
+                                $mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayApproved", $link);
+                                break;
+                            case 'ACTION_CREATE':
+                                $link = '<a href="'.$urlwithroot.'/comm/action/card.php?id='.$object->id.'">'.$newref.'</a>';
+                                $dir_output = $conf->agenda->dir_output;
+                                $object_type = 'action';
+                                $mesg = $outputlangs->transnoentitiesnoconv("EMailTextActionAdded", $link);
+                                break;
 						}
 						$ref = dol_sanitizeFileName($newref);
 						$pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
@@ -749,6 +756,12 @@ class Notify
 						$object_type = 'holiday';
 						$mesg = $langs->transnoentitiesnoconv("EMailTextHolidayApproved", $link);
 						break;
+                    case 'ACTION_CREATE':
+                        $link = '<a href="'.$urlwithroot.'/comm/action/card.php?id='.$object->id.'">'.$newref.'</a>';
+                        $dir_output = $conf->agenda->dir_output;
+                        $object_type = 'action';
+                        $mesg = $langs->transnoentitiesnoconv("EMailTextActionAdded", $link);
+                        break;
 				}
 				$ref = dol_sanitizeFileName($newref);
 				$pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 11e67104f9a..ac9285363d7 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -731,7 +731,7 @@ class Translate
 	 */
 	public function transcountry($str, $countrycode)
 	{
-		if ($this->tab_translate["$str$countrycode"]) return $this->trans("$str$countrycode");
+		if (!empty($this->tab_translate["$str$countrycode"])) return $this->trans("$str$countrycode");
 		else return $this->trans($str);
 	}
 
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 07b67e30062..2b239a90d98 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -290,7 +290,7 @@ class Utils
 			if (!empty($dolibarr_main_db_pass))
 			{
 				$paramcrypted .= ' -p"'.preg_replace('/./i', '*', $dolibarr_main_db_pass).'"';
-				$paramclear .= ' -p"'.str_replace(array('"', '`'), array('\"', '\`'), $dolibarr_main_db_pass).'"';
+				$paramclear .= ' -p"'.str_replace(array('"', '`', '$'), array('\"', '\`', '\$'), $dolibarr_main_db_pass).'"';
 			}
 
 			$handle = '';
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index fe80f1ad28e..6ceb39b7080 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -37,20 +37,26 @@ class DoliDBPgsql extends DoliDB
 {
 	//! Database type
 	public $type = 'pgsql'; // Name of manager
+
 	//! Database label
 	const LABEL = 'PostgreSQL'; // Label of manager
+
 	//! Charset
 	public $forcecharset = 'UTF8'; // Can't be static as it may be forced with a dynamic value
+
 	//! Collate used to force collate when creating database
 	public $forcecollate = ''; // Can't be static as it may be forced with a dynamic value
+
 	//! Version min database
 	const VERSIONMIN = '9.0.0'; // Version min database
-	/** @var resource Resultset of last query */
+
+	/** @var resource|boolean Resultset of last query */
 	private $_results;
 
 	public $unescapeslashquot;
 	public $standard_conforming_strings;
 
+
 	/**
 	 *	Constructor.
 	 *	This create an opened connexion to a database server and eventually to a database
diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index de19f674659..356b0aba5e7 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -65,29 +65,29 @@ print "jQuery(document).ready(function () {\n";
 
 if (empty($conf->dol_no_mouse_hover)) {
 	print 'jQuery(".classfortooltip").tooltip({
-				show: { collision: "flipfit", effect:"toggle", delay:75, duration:150 },
-				hide: { delay: 250, duration: 20 },
-				tooltipClass: "mytooltip",
-				content: function () {
-                    console.log("Return title for popup");
-            		return $(this).prop("title");		/* To force to get title as is */
-          		}
-			});'."\n";
+		show: { collision: "flipfit", effect:"toggle", delay:50, duration: 20 },
+		hide: { delay: 250, duration: 20 },
+		tooltipClass: "mytooltip",
+		content: function () {
+    		console.log("Return title for popup");
+            return $(this).prop("title");		/* To force to get title as is */
+   		}
+	});'."\n";
 }
 
 print '
-jQuery(".classfortooltiponclicktext").dialog(
-    { closeOnEscape: true, classes: { "ui-dialog": "highlight" },
+jQuery(".classfortooltiponclicktext").dialog({
+    closeOnEscape: true, classes: { "ui-dialog": "highlight" },
     maxHeight: window.innerHeight-60, width: '.($conf->browser->layout == 'phone' ? max($_SESSION['dol_screenwidth'] - 20, 320) : 700).',
     modal: true,
-    autoOpen: false }).css("z-index: 5000");
+    autoOpen: false
+    }).css("z-index: 5000");
 jQuery(".classfortooltiponclick").click(function () {
     console.log("We click on tooltip for element with dolid="+$(this).attr(\'dolid\'));
-    if ($(this).attr(\'dolid\'))
-    {
+    if ($(this).attr(\'dolid\')) {
         obj=$("#idfortooltiponclick_"+$(this).attr(\'dolid\'));		/* obj is a div component */
         obj.dialog("open");
-		return false;
+        return false;
     }
 });'."\n";
 
@@ -210,3 +210,36 @@ print '
 					}
 				});
 			});'."\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\').click(function() {
+		/* console.log(this.parentNode); */
+		console.log("We click on a clipboardCPButton tag");
+		if (window.getSelection) {
+			selection = window.getSelection();
+
+			range = document.createRange();
+			range.selectNodeContents(this.parentNode.firstChild);
+
+			selection.removeAllRanges();
+			selection.addRange( range );
+		}
+		document.execCommand( \'copy\' );
+		window.getSelection().removeAllRanges();
+
+		/* 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";
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index f3faeda4b3a..ce9ffb31697 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1870,11 +1870,6 @@ function email_admin_prepare_head()
 		}
 	}
 
-	$head[$h][0] = DOL_URL_ROOT."/admin/mails_templates.php";
-	$head[$h][1] = $langs->trans("EMailTemplates");
-	$head[$h][2] = 'templates';
-	$h++;
-
 	if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/mails_senderprofile_list.php";
 		$head[$h][1] = $langs->trans("EmailSenderProfiles");
@@ -1882,6 +1877,11 @@ function email_admin_prepare_head()
 		$h++;
 	}
 
+	$head[$h][0] = DOL_URL_ROOT."/admin/mails_templates.php";
+	$head[$h][1] = $langs->trans("EMailTemplates");
+	$head[$h][2] = 'templates';
+	$h++;
+
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'email_admin', 'remove');
 
 	return $head;
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 8e25deb21cb..c30d0c3d392 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -73,8 +73,7 @@ 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;"></span>';
-		print '<span class="hideonsmartphone">'.$langs->trans("Type").'</span>';
+		print '<span class="fas fa-square inline-block fawidth30" style=" color: #ddd;" title="'.$langs->trans("Type").'"></span>';
 		$multiselect = 0;
 		if (!empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE))     // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
 		{
@@ -85,13 +84,11 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 
 		// Assigned to
 		print '<div class="divsearchfield">';
-		print img_picto('', 'user', 'class="fawidth30 inline-block"');
-		print '<span class="hideonsmartphone">'.$langs->trans("ActionsToDoBy").'</span>';
+		print img_picto($langs->trans("ActionsToDoBy"), 'user', 'class="fawidth30 inline-block"');
 		print $form->select_dolusers($filtert, 'search_filtert', 1, '', !$canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth500 widthcentpercentminusxx');
 		print '</div>';
 		print '<div class="divsearchfield">';
-		print img_picto('', 'object_group', 'class="fawidth30 inline-block"');
-		print '<span class="hideonsmartphone">'.$langs->trans("ToUserOfGroup").'</span>';
+		print img_picto($langs->trans("ToUserOfGroup"), 'object_group', 'class="fawidth30 inline-block"');
 		print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', !$canedit, '', '', '0', false, 'maxwidth500');
 		print '</div>';
 
@@ -102,8 +99,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 
 			// Resource
 			print '<div class="divsearchfield">';
-			print img_picto('', 'object_resource', 'class="fawidth30 inline-block"');
-			print '<span class="hideonsmartphone">'.$langs->trans("Resource").'</span>';
+			print img_picto($langs->trans("Resource"), 'object_resource', 'class="fawidth30 inline-block"');
 			print $formresource->select_resource_list($resourceid, "search_resourceid", '', 1, 0, 0, null, '', 2, 0, 'maxwidth500');
 			print '</div>';
 		}
@@ -112,8 +108,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 	if (!empty($conf->societe->enabled) && $user->rights->societe->lire)
 	{
 		print '<div class="divsearchfield">';
-		print img_picto('', 'company', 'class="fawidth30 inline-block"');
-		print '<span class="hideonsmartphone">'.$langs->trans("ThirdParty").'</span>';
+		print img_picto($langs->trans("ThirdParty"), 'company', 'class="fawidth30 inline-block"');
 		print $form->select_company($socid, 'search_socid', '', '&nbsp;', 0, 0, null, 0, 'minwidth100 maxwidth500');
 		print '</div>';
 	}
@@ -124,8 +119,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		$formproject = new FormProjets($db);
 
 		print '<div class="divsearchfield">';
-		print img_picto('', 'project', 'class="fawidth30 inline-block"');
-		print '<span class="hideonsmartphone">'.$langs->trans("Project").'</span>';
+		print img_picto($langs->trans("Project"), 'project', 'class="fawidth30 inline-block"');
 		print $formproject->select_projects($socid ? $socid : -1, $pid, 'search_projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'maxwidth500');
 		print '</div>';
 	}
@@ -134,8 +128,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 	{
 		// Status
 		print '<div class="divsearchfield">';
-		print img_picto('', 'setup', 'class="fawidth30 inline-block"');
-		print '<span class="hideonsmartphone">'.$langs->trans("Status").'</span>';
+		print img_picto($langs->trans("Status"), 'setup', 'class="fawidth30 inline-block"');
 		$formactions->form_select_status_action('formaction', $status, 1, 'search_status', 1, 2, 'minwidth100');
 		print '</div>';
 	}
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index d1c1540cb8a..f8dd34ce0ac 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -135,7 +135,12 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
 										}
 										return { label: label, value: item.value, id: item.key, disabled: item.disabled,
 												 update: update, textarea: textarea,
-												 pbq: item.pbq, type: item.type, qty: item.qty, discount: item.discount, pricebasetype: item.pricebasetype, price_ht: item.price_ht, price_ttc: item.price_ttc }
+												 pbq: item.pbq,
+												 type: item.type, qty: item.qty, discount: item.discount,
+												 pricebasetype: item.pricebasetype, price_ht: item.price_ht,
+												 price_ttc: item.price_ttc,
+												 up: item.up, description : item.description,
+												 ref_customer: item.ref_customer }
 									}));
 								}
 								else console.error("Error: Ajax url '.$url.($urloption ? '?'.$urloption : '').' has returned an empty page. Should be an empty json array.");
@@ -144,17 +149,40 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
 						dataType: "json",
     					minLength: '.$minLength.',
     					select: function( event, ui ) {		// Function ran once new value has been selected into javascript combo
-    						console.log("Call change on input '.$htmlname.' because of select definition of autocomplete select call on input#search_'.$htmlname.'");
+    						console.log("We will trigger change on input '.$htmlname.' because of the select definition of autocomplete code for input#search_'.$htmlname.'");
     					    console.log("Selected id = "+ui.item.id+" - If this value is null, it means you select a record with key that is null so selection is not effective");
 
-							//console.log(ui.item);
-							$("#'.$htmlname.'").attr("data-pbq", ui.item.pbq);
-							$("#'.$htmlname.'").attr("data-pbqup", ui.item.price_ht);
-							$("#'.$htmlname.'").attr("data-pbqbase", ui.item.pricebasetype);
-							$("#'.$htmlname.'").attr("data-pbqqty", ui.item.qty);
-							$("#'.$htmlname.'").attr("data-pbqpercent", ui.item.discount);
+							console.log("Propagate before some properties");
+
+							//console.log(ui.item);
+							//For supplier price
+							$("#'.$htmlname.'").attr("data-up", ui.item.up);
+							$("#'.$htmlname.'").attr("data-discount", ui.item.discount);
+							$("#'.$htmlname.'").attr("data-qty", ui.item.qty);
+							$("#'.$htmlname.'").attr("data-description", ui.item.description);
+							$("#'.$htmlname.'").attr("data-ref-customer", ui.item.ref_customer);
+
+							//For customer price
+		';
+	if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
+		$script .= '
+							$("#' . $htmlname . '").attr("data-pbq", ui.item.pbq);
+							$("#' . $htmlname . '").attr("data-pbqup", ui.item.price_ht);
+							$("#' . $htmlname . '").attr("data-pbqbase", ui.item.pricebasetype);
+							$("#' . $htmlname . '").attr("data-pbqqty", ui.item.qty);
+							$("#' . $htmlname . '").attr("data-pbqpercent", ui.item.discount);
+		';
+	} else {
+		$script .= '
+							$("#' . $htmlname . '").attr("data-up", ui.item.price_ht);
+							$("#' . $htmlname . '").attr("data-base", ui.item.pricebasetype);
+							$("#' . $htmlname . '").attr("data-qty", ui.item.qty);
+							$("#' . $htmlname . '").attr("data-discount", ui.item.discount);
+		';
+	}
+	$script .= '
+							$("#'.$htmlname.'").val(ui.item.id).trigger("change");	// Select new value
 
-    						$("#'.$htmlname.'").val(ui.item.id).trigger("change");	// Select new value
     						// Disable an element
     						if (options.option_disabled) {
     							console.log("Make action option_disabled on #"+options.option_disabled+" with disabled="+ui.item.disabled)
@@ -170,6 +198,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
     								$("#" + options.option_disabled).removeAttr("disabled");
     							}
     						}
+
     						if (options.disabled) {
     							console.log("Make action disabled on each "+options.option_disabled)
     							$.each(options.disabled, function(key, value) {
@@ -182,6 +211,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
     								$("#" + value).show().trigger("show");
     							});
     						}
+
     						// Update an input
     						if (ui.item.update) {
     							console.log("Make action update on each ui.item.update")
@@ -202,7 +232,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
 									}
     							});
     						}
-    						console.log("ajax_autocompleter new value selected, we trigger change on original component so field #search_'.$htmlname.'");
+    						console.log("ajax_autocompleter new value selected, we trigger change also on original component so on field #search_'.$htmlname.'");
 
     						$("#search_'.$htmlname.'").trigger("change");	// We have changed value of the combo select, we must be sure to trigger all js hook binded on this event. This is required to trigger other javascript change method binded on original field by other code.
     					}
@@ -227,7 +257,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
  *  This use the jQuery "autocomplete" function.
  *
  *	@param	string	$htmlname           HTML name of input field
- *	@param	string	$fields				Other fields to autocomplete
+ *	@param	array	$fields				Array of key of fields to autocomplete
  *	@param	string	$url                URL for ajax request : /chemin/fichier.php
  *	@param	string	$option				More parameters on URL request
  *	@param	int		$minLength			Minimum number of chars to trigger that Ajax search
@@ -408,14 +438,17 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
 					minimumInputLength: '.$minLengthToAutocomplete.',
 					language: select2arrayoflanguage,
     				containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */
+					selectionCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */
 					templateResult: function (data, container) {	/* Format visible output into combo list */
 	 					/* Code to add class of origin OPTION propagated to the new select2 <li> tag */
 						if (data.element) { $(container).addClass($(data.element).attr("class")); }
 					    //console.log(data.html);
+					    if (data.id == -1) return \'&nbsp;\';
 						if ($(data.element).attr("data-html") != undefined) return htmlEntityDecodeJs($(data.element).attr("data-html"));		// If property html set, we decode html entities and use this
-					    return data.text;
+						return data.text;
 					},
 					templateSelection: function (selection) {		/* Format visible output of selected value */
+						if (selection.id == -1) return \'<span class="placeholder">\'+selection.text+\'</span>\';
 						return selection.text;
 					},
 					escapeMarkup: function(markup) {
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 1e2be9e856d..a424657e206 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -302,7 +302,7 @@ function societe_prepare_head(Societe $object)
 	}
 
 	$head[$h][0] = DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id;
-	$head[$h][1] .= $langs->trans("Events");
+	$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");
@@ -862,7 +862,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 
 	// Definition of fields for list
 	$arrayfields = array(
-		't.rowid'=>array('label'=>"TechnicalID", 'checked'=>($conf->global->MAIN_SHOW_TECHNICAL_ID ? 1 : 0), 'enabled'=>($conf->global->MAIN_SHOW_TECHNICAL_ID ? 1 : 0), 'position'=>1),
+		't.rowid'=>array('label'=>"TechnicalID", 'checked'=>(!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) ? 1 : 0), 'enabled'=>(!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) ? 1 : 0), 'position'=>1),
 		't.name'=>array('label'=>"Name", 'checked'=>1, 'position'=>10),
 		't.poste'=>array('label'=>"PostOrFunction", 'checked'=>1, 'position'=>20),
 		't.address'=>array('label'=>(empty($conf->dol_optimize_smallscreen) ? $langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email") : $langs->trans("Address")), 'checked'=>1, 'position'=>30),
@@ -870,7 +870,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 		't.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>50, 'class'=>'center'),
 	);
 	// Extra fields
-	if (is_array($extrafields->attributes[$contactstatic->table_element]['label']) && count($extrafields->attributes[$contactstatic->table_element]['label'])) {
+	if (!empty($extrafields->attributes[$contactstatic->table_element]['label']) && is_array($extrafields->attributes[$contactstatic->table_element]['label']) && count($extrafields->attributes[$contactstatic->table_element]['label'])) {
 		foreach ($extrafields->attributes[$contactstatic->table_element]['label'] as $key => $val) {
 			if (!empty($extrafields->attributes[$contactstatic->table_element]['list'][$key])) {
 				$arrayfields["ef.".$key] = array(
@@ -989,7 +989,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 			} elseif (in_array($key, array('role'))) {
 				print $formcompany->showRoles("search_roles", $contactstatic, 'edit', $search_roles);
 			} else {
-				print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+			    print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.(!empty($search[$key]) ? dol_escape_htmltag($search[$key]) : '').'">';
 			}
 			print '</td>';
 		}
@@ -1204,26 +1204,25 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 {
 	global $user, $conf;
 	global $form;
-
 	global $param, $massactionbutton;
-	$start_year = GETPOST('dateevent_startyear');
-	$start_month = GETPOST('dateevent_startmonth');
-	$start_day = GETPOST('dateevent_startday');
-	$end_year = GETPOST('dateevent_endyear');
-	$end_month = GETPOST('dateevent_endmonth');
-	$end_day = GETPOST('dateevent_endday');
+
+	$start_year = GETPOST('dateevent_startyear', 'int');
+	$start_month = GETPOST('dateevent_startmonth', 'int');
+	$start_day = GETPOST('dateevent_startday', 'int');
+	$end_year = GETPOST('dateevent_endyear', 'int');
+	$end_month = GETPOST('dateevent_endmonth', 'int');
+	$end_day = GETPOST('dateevent_endday', 'int');
+	$tms_start = '';
+	$tms_end = '';
+
 	if (!empty($start_year) && !empty($start_month) && !empty($start_day)) {
-		$search_start = $start_year.'-'.$start_month.'-'.$start_day;
-		$tms_start = strtotime($search_start);
+		$tms_start = dol_mktime(0, 0, 0, $start_month, $start_day, $start_year, 'tzuserrel');
 	}
 	if (!empty($end_year) && !empty($end_month) && !empty($end_day)) {
-		$search_end = $end_year.'-'.$end_month.'-'.$end_day.' 23:59:59';
-		$tms_end = strtotime($search_end);
+		$tms_end = dol_mktime(23, 59, 59, $end_month, $end_day, $end_year, 'tzuserrel');
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
-		$search_start = '';
 		$tms_start = '';
-		$search_end = '';
 		$tms_end = '';
 	}
 	dol_include_once('/comm/action/class/actioncomm.class.php');
@@ -1325,14 +1324,14 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			}
 		}
 
-		if (!empty($search_start) && !empty($search_end)) {
-			$sql .= " AND ((a.datep BETWEEN '$search_start' AND '$search_end') OR (a.datep2 BETWEEN '$search_start' AND '$search_end'))";
+		if (!empty($tms_start) && !empty($tms_end)) {
+			$sql .= " AND ((a.datep BETWEEN '".$db->idate($tms_start)."' AND '".$db->idate($tms_end)."') OR (a.datep2 BETWEEN '".$db->idate($tms_start)."' AND '".$db->idate($tms_end)."'))";
 		}
-		elseif (empty($search_start) && !empty($search_end)) {
-			$sql .= " AND ((a.datep <= '$search_end') OR (a.datep2 <= '$search_end'))";
+		elseif (empty($tms_start) && !empty($tms_end)) {
+			$sql .= " AND ((a.datep <= '".$db->idate($tms_end)."') OR (a.datep2 <= '".$db->idate($tms_end)."'))";
 		}
-		elseif (!empty($search_start) && empty($search_end)) {
-			$sql .= " AND ((a.datep >= '$search_start') OR (a.datep2 >= '$search_start'))";
+		elseif (!empty($tms_start) && empty($tms_end)) {
+			$sql .= " AND ((a.datep >= '".$db->idate($tms_start)."') OR (a.datep2 >= '".$db->idate($tms_start)."'))";
 		}
 
 		if (is_array($actioncode) && !empty($actioncode)) {
@@ -1391,7 +1390,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 					//if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
 					//elseif ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
 					$tododone = '';
-					if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && $obj->datep > $now)) $tododone = 'todo';
+					if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && (!empty($obj->datep) && $obj->datep > $now))) $tododone = 'todo';
 
 					$histo[$numaction] = array(
 						'type'=>$obj->type,
@@ -1488,7 +1487,9 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		$out .= $formactions->select_type_actions($actioncode, "actioncode", '', empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1, 0, (empty($conf->global->AGENDA_USE_MULTISELECT_TYPE) ? 0 : 1), 1);
 		$out .= '</td>';
 		$out .= '<td class="liste_titre maxwidth100onsmartphone"><input type="text" class="maxwidth100onsmartphone" name="search_agenda_label" value="'.$filters['search_agenda_label'].'"></td>';
-		$out .= '<td class="liste_titre center">'.$form->selectDateToDate($tms_start, $tms_end, 'dateevent', 1).'</td>';
+		$out .= '<td class="liste_titre center">';
+		$out .= $form->selectDateToDate($tms_start, $tms_end, 'dateevent', 1);
+		$out .= '</td>';
 		$out .= '<td class="liste_titre"></td>';
 		$out .= '<td class="liste_titre"></td>';
 		$out .= '<td class="liste_titre"></td>';
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 3a889367dc1..b632bf44110 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -356,7 +356,8 @@ function dol_stringtotime($string, $gm = 1)
 }
 
 
-/** Return previous day
+/**
+ *  Return previous day
  *
  *  @param      int			$day     	Day
  *  @param      int			$month   	Month
@@ -371,7 +372,8 @@ function dol_get_prev_day($day, $month, $year)
 	return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
 }
 
-/** Return next day
+/**
+ *  Return next day
  *
  *  @param      int			$day    	Day
  *  @param      int			$month  	Month
@@ -386,7 +388,8 @@ function dol_get_next_day($day, $month, $year)
 	return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
 }
 
-/**	Return previous month
+/**
+ *  Return previous month
  *
  *	@param		int			$month		Month
  *	@param		int			$year		Year
@@ -405,7 +408,8 @@ function dol_get_prev_month($month, $year)
 	return array('year' => $prev_year, 'month' => $prev_month);
 }
 
-/**	Return next month
+/**
+ *  Return next month
  *
  *	@param		int			$month		Month
  *	@param		int			$year		Year
@@ -424,7 +428,8 @@ function dol_get_next_month($month, $year)
 	return array('year' => $next_year, 'month' => $next_month);
 }
 
-/**	Return previous week
+/**
+ *  Return previous week
  *
  *  @param      int			$day     	Day
  *  @param      int			$week    	Week
@@ -442,7 +447,8 @@ function dol_get_prev_week($day, $week, $month, $year)
 	return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
 }
 
-/**	Return next week
+/**
+ *  Return next week
  *
  *  @param      int			$day     	Day
  *  @param      int			$week    	Week
@@ -461,7 +467,8 @@ function dol_get_next_week($day, $week, $month, $year)
 	return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']);
 }
 
-/**	Return GMT time for first day of a month or year
+/**
+ *  Return GMT time for first day of a month or year
  *
  *	@param		int			$year		Year
  * 	@param		int			$month		Month
@@ -478,7 +485,9 @@ function dol_get_first_day($year, $month = 1, $gm = false)
 }
 
 
-/**	Return GMT time for last day of a month or year
+/**
+ * Return GMT time for last day of a month or year.
+ * Note: The timestamp contains last day and last hours (23:59:59)
  *
  *	@param		int			$year		Year
  * 	@param		int			$month		Month
@@ -504,9 +513,10 @@ function dol_get_last_day($year, $month = 12, $gm = false)
 	return $datelim;
 }
 
-/**	Return GMT time for last hour of a given GMT date (it removes hours, min and second part)
+/**
+ *  Return GMT time for last hour of a given GMT date (it replaces hours, min and second part to 23:59:59)
  *
- *	@param		int			$date		Date
+ *	@param		int			$date		Date GMT
  *  @return		int						Date for last hour of a given date
  */
 function dol_get_last_hour($date)
@@ -515,7 +525,8 @@ function dol_get_last_hour($date)
 	return dol_mktime(23, 59, 59, $tmparray['mon'], $tmparray['mday'], $tmparray['year'], false);
 }
 
-/**	Return GMT time for first hour of a given GMT date (it removes hours, min and second part)
+/**
+ *  Return GMT time for first hour of a given GMT date (it removes hours, min and second part)
  *
  *	@param		int			$date		Date
  *  @return		int						Date for last hour of a given date
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 6a590b44368..1bdaeef13ef 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1513,6 +1513,7 @@ function dol_init_file_process($pathtoscan = '', $trackid = '')
  * @param	int		$generatethumbs			1=Generate also thumbs for uploaded image files
  * @param   Object  $object                 Object used to set 'src_object_*' fields
  * @return	int                             <=0 if KO, >0 if OK
+ * @see dol_remove_file_process()
  */
 function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesession = 0, $varfiles = 'addedfile', $savingdocmask = '', $link = null, $trackid = '', $generatethumbs = 1, $object = null)
 {
@@ -1673,6 +1674,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
  * @param   int		$donotdeletefile        1=Do not delete physically file
  * @param   string  $trackid                Track id (used to prefix name of session vars to avoid conflict)
  * @return	void
+ * @see dol_add_file_process()
  */
 function dol_remove_file_process($filenb, $donotupdatesession = 0, $donotdeletefile = 1, $trackid = '')
 {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3bf47b7da7a..7192a887526 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -16,6 +16,7 @@
  * Copyright (C) 2018-2020  Frédéric France             <frederic.france@netlogic.fr>
  * Copyright (C) 2019       Thibault Foucart            <support@ptibogxiv.net>
  * Copyright (C) 2020       Open-Dsi         			<support@open-dsi.fr>
+ * 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
@@ -672,19 +673,28 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 				if (preg_match('/[^a-z0-9_\-\.,]+/i', $out)) $out = '';
 			}
 			break;
-		case 'nohtml':
+		case 'nohtml':		// No html
 			$out = dol_string_nohtmltag($out, 0);
 			break;
-		case 'alpha':		// No html and no " and no ../
+		case 'alpha':		// No html and no ../ and "
 		case 'alphanohtml':	// Recommended for most scalar parameters and search parameters
 			if (!is_array($out)) {
 				// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
 				// '../' is dangerous because it allows dir transversals
-				$out = str_replace(array('&quot;', '"', '../'), '', trim($out));
+				$out = str_replace(array('&quot;', '"'), '', trim($out));
+				$out = str_replace(array('../'), '', $out);
 				// keep lines feed
 				$out = dol_string_nohtmltag($out, 0);
 			}
 			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>"
+			if (!is_array($out)) {
+				// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
+				// '../' is dangerous because it allows dir transversals
+				$out = str_replace(array('&quot;', '"'), '', trim($out));
+				$out = str_replace(array('../'), '', $out);
+			}
+			break;
 		case 'restricthtml':		// Recommended for most html textarea
 			$out = dol_string_onlythesehtmltags($out, 0, 1, 1);
 			break;
@@ -1762,7 +1772,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		} else {
 			$morehtmlstatus .= '<span class="statusrefbuy">'.$object->getLibStatut(6, 1).'</span>';
 		}
-	} elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan'))) {
+	} elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan', 'tva'))) {
 		$tmptxt = $object->getLibStatut(6, $object->totalpaye);
 		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) $tmptxt = $object->getLibStatut(5, $object->totalpaye);
 		$morehtmlstatus .= $tmptxt;
@@ -1975,8 +1985,8 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 {
 	global $conf, $langs;
 
-	if ($tzoutput == 'auto') {
-		$tzoutput = $conf->tzuserinputkey;
+	if ($tzoutput === 'auto') {
+		$tzoutput = (empty($conf) ? 'tzserver' : $conf->tzuserinputkey);
 	}
 
 	// Clean parameters
@@ -2200,9 +2210,10 @@ function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = 'auto',
 {
 	global $conf;
 	//print "- ".$hour.",".$minute.",".$second.",".$month.",".$day.",".$year.",".$_SERVER["WINDIR"]." -";
+	//print 'gm:'.$gm.' gm==auto:'.($gm == 'auto').'<br>';
 
-	if ($gm == 'auto') {
-		$gm = $conf->tzuserinputkey;
+	if ($gm === 'auto') {
+		$gm = (empty($conf) ? 'tzserver' : $conf->tzuserinputkey);
 	}
 
 	// Clean parameters
@@ -2264,7 +2275,7 @@ function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = 'auto',
 /**
  *  Return date for now. In most cases, we use this function without parameters (that means GMT time).
  *
- *  @param	string		$mode	'auto'
+ *  @param	string		$mode	'auto' => for backward compatibility (avoid this),
  *  							'gmt' => we return GMT timestamp,
  * 								'tzserver' => we add the PHP server timezone
  *  							'tzref' => we add the company timezone. Not implemented.
@@ -2275,8 +2286,8 @@ function dol_now($mode = 'auto')
 {
 	$ret = 0;
 
-	if ($mode == 'auto') {
-		$mode = 'tzserver';
+	if ($mode === 'auto') {
+		$mode = 'gmt';
 	}
 
 	if ($mode == 'gmt') $ret = time(); // Time for now at greenwich.
@@ -3256,10 +3267,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'edit', 'ellipsis-h', 'email', 'eraser', 'external-link-alt', 'external-link-square-alt',
 				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title', 'group',
 				'help', 'holiday',
-				'intervention', 'label', 'language', 'link', 'list', 'listlight', 'lot',
-				'map-marker-alt', 'member', 'money-bill-alt', 'mrp', 'note', 'next',
+				'intervention', 'label', 'language', 'link', 'list', 'listlight', 'loan', 'lot',
+				'margin', 'map-marker-alt', 'member', 'money-bill-alt', 'mrp', 'note', 'next',
 				'object_accounting', 'object_account', 'object_accountline', 'object_action', 'object_barcode', 'object_bill', 'object_billa', 'object_billd', 'object_bom',
-				'object_category', 'object_conversation', 'object_bookmark', 'object_bug', 'object_dolly', 'object_dollyrevert', 'object_generic', 'object_folder',
+				'object_category', 'object_conversation', 'object_bookmark', 'object_bug', 'object_clock', 'object_dolly', 'object_dollyrevert', 'object_generic', 'object_folder',
 				'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
 				'object_cash-register', 'object_company', 'object_contact', 'object_contract', 'object_donation', 'object_dynamicprice',
 				'object_globe', 'object_holiday', 'object_hrm', 'object_invoice', 'object_intervention', 'object_label',
@@ -3268,19 +3279,19 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'object_payment', 'object_pdf', 'object_product', 'object_propal',
 				'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
 				'object_recruitmentjobposition', 'object_recruitmentcandidature',
-				'object_shipment', 'object_share-alt', 'object_supplier_invoice', 'object_supplier_invoicea', 'object_supplier_invoiced', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock',
+				'object_salary', 'object_shipment', 'object_share-alt', 'object_supplier_invoice', 'object_supplier_invoicea', 'object_supplier_invoiced', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock',
 				'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member',
-				'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email', 'object_website',
+				'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email', 'object_website', 'object_movement',
 				'off', 'on', 'order',
 				'paiment', 'play', 'pdf', 'playdisabled', 'previous', 'poll', 'printer', 'product', 'propal', 'projecttask', 'stock', 'resize', 'service', 'stats', 'trip',
 				'setup', 'share-alt', 'sign-out', 'split', 'stripe-s', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
 				'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top', 'commercial', 'companies',
 				'generic', 'home', 'hrm', 'members', 'products', 'invoicing',
-				'payment', 'pencil-ruler', 'preview', 'project', 'projectpub', 'refresh', 'supplier_invoice', 'ticket',
+				'payment', 'pencil-ruler', 'preview', 'project', 'projectpub', 'refresh', 'salary', 'supplier_invoice', 'ticket',
 				'error', 'warning',
 				'recruitmentcandidature', 'recruitmentjobposition', 'resource',
-				'supplier_proposal', 'supplier_order', 'supplier_invoice',
+				'shapes', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
 				'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda'
 			)
 		)) {
@@ -3298,16 +3309,17 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 			$arrayconvpictotofa = array(
 				'account'=>'university', 'accountline'=>'receipt', 'accountancy'=>'money-check-alt', 'action'=>'calendar-alt', 'add'=>'plus-circle', 'address'=> 'address-book',
-				'bank_account'=>'university', 'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'supplier_invoicea'=>'file-excel', 'billd'=>'file-medical', 'supplier_invoiced'=>'file-medical', 'bom'=>'cubes',
+				'bank_account'=>'university', 'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'supplier_invoicea'=>'file-excel', 'billd'=>'file-medical', 'supplier_invoiced'=>'file-medical',
+				'bom'=>'shapes',
 				'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'conversation'=>'comments', 'donation'=>'file-alt', 'dynamicprice'=>'hand-holding-usd',
 				'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins',
 				'accounting'=>'chart-line', 'category'=>'tag', 'dollyrevert'=>'dolly',
 				'hrm'=>'user-tie', 'margin'=>'calculator', 'members'=>'users', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt', 'lot'=>'barcode',
 				'email'=>'at',
 				'edit'=>'pencil-alt', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'question-circle',
-				'generic'=>'file', 'holiday'=>'umbrella-beach', 'label'=>'layer-group',
+				'generic'=>'file', 'holiday'=>'umbrella-beach', 'label'=>'layer-group', 'loan'=>'money-bill-alt',
 				'member'=>'users', 'mrp'=>'cubes', 'next'=>'arrow-alt-circle-right',
-				'trip'=>'wallet', 'group'=>'users',
+				'trip'=>'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',
@@ -3320,7 +3332,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'recruitmentjobposition'=>'id-card-alt', 'recruitmentcandidature'=>'id-badge',
 				'resize'=>'crop', 'supplier_order'=>'dol-order_supplier', 'supplier_proposal'=>'file-signature',
 				'refresh'=>'redo', 'resource'=>'laptop-house',
-				'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
+				'salary'=>'wallet', 'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
 				'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
 				'title_agenda'=>'calendar-alt',
 				'uparrow'=>'mail-forward', 'vcard'=>'address-card',
@@ -3353,6 +3365,13 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				$fakey = 'fa-'.$pictowithouttext;
 			}
 
+			if (in_array($pictowithouttext, array('member', 'contract'))) {
+				$fasize = '0.92em';
+			}
+			if (in_array($pictowithouttext, array('intervention', 'payment', 'loan'))) {
+				$fasize = '0.80em';
+			}
+
 			// Define $marginleftonlyshort
 			$arrayconvpictotomarginleftonly = array(
 				'bank', 'check', 'delete', 'generic', 'grip', 'grip_title', 'jabber',
@@ -3376,11 +3395,11 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'order'=>'infobox-commande',
 				'user'=>'infobox-adherent', 'users'=>'infobox-adherent',
 				'error'=>'pictoerror', 'warning'=>'pictowarning', 'switch_on'=>'font-status4',
-				'holiday'=>'infobox-holiday', 'invoice'=>'infobox-commande',
+				'holiday'=>'infobox-holiday', 'invoice'=>'infobox-commande', 'loan'=>'infobox-bank_account',
 				'payment'=>'infobox-bank_account', 'poll'=>'infobox-adherent', 'project'=>'infobox-project', 'projecttask'=>'infobox-project', 'propal'=>'infobox-propal',
 				'recruitmentjobposition'=>'infobox-adherent', 'recruitmentcandidature'=>'infobox-adherent',
 				'resource'=>'infobox-action',
-				'supplier_invoice'=>'infobox-order_supplier', 'supplier_invoicea'=>'infobox-order_supplier', 'supplier_invoiced'=>'infobox-order_supplier',
+				'salary'=>'infobox-bank_account', 'supplier_invoice'=>'infobox-order_supplier', 'supplier_invoicea'=>'infobox-order_supplier', 'supplier_invoiced'=>'infobox-order_supplier',
 				'supplier_order'=>'infobox-order_supplier', 'supplier_proposal'=>'infobox-supplier_proposal',
 				'ticket'=>'infobox-contrat', 'title_accountancy'=>'infobox-bank_account', 'title_hrm'=>'infobox-holiday', 'trip'=>'infobox-expensereport', 'title_agenda'=>'infobox-action',
 				//'title_setup'=>'infobox-action', 'tools'=>'infobox-action',
@@ -3396,7 +3415,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'companies'=>'#6c6aa8', 'company'=>'#6c6aa8', 'contact'=>'#6c6aa8', 'dynamicprice'=>'#a69944',
 				'edit'=>'#444', 'note'=>'#999', 'error'=>'', 'help'=>'#bbb', 'listlight'=>'#999',
 				'dolly'=>'#a69944', 'dollyrevert'=>'#a69944', 'lot'=>'#a69944',
-				'map-marker-alt'=>'#aaa', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'stock'=>'#a69944',
+				'map-marker-alt'=>'#aaa', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'stock'=>'#a69944', 'movement'=>'#a69944',
 				'other'=>'#ddd',
 				'playdisabled'=>'#ccc', 'printer'=>'#444', 'projectpub'=>'#986c6a', 'resize'=>'#444', 'rss'=>'#cba',
 				'shipment'=>'#a69944', 'stats'=>'#444', 'switch_off'=>'#999', 'uparrow'=>'#555', 'globe-americas'=>'#aaa',
@@ -4090,21 +4109,21 @@ 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> ".$conf->global->MAIN_FEATURES_LEVEL."<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";
 		if (function_exists("phpversion"))
 		{
 			$out .= "<b>".$langs->trans("PHP").":</b> ".phpversion()."<br>\n";
 		}
-		$out .= "<b>".$langs->trans("Server").":</b> ".dol_htmlentities($_SERVER["SERVER_SOFTWARE"])."<br>\n";
+		$out .= "<b>".$langs->trans("Server").":</b> ".(isset($_SERVER["SERVER_SOFTWARE"]) ? dol_htmlentities($_SERVER["SERVER_SOFTWARE"], ENT_COMPAT) : '')."<br>\n";
 		if (function_exists("php_uname"))
 		{
 			$out .= "<b>".$langs->trans("OS").":</b> ".php_uname()."<br>\n";
 		}
-		$out .= "<b>".$langs->trans("UserAgent").":</b> ".dol_htmlentities($_SERVER["HTTP_USER_AGENT"], ENT_COMPAT, 'UTF-8')."<br>\n";
+		$out .= "<b>".$langs->trans("UserAgent").":</b> ".(isset($_SERVER["HTTP_USER_AGENT"]) ? dol_htmlentities($_SERVER["HTTP_USER_AGENT"], ENT_COMPAT) : '')."<br>\n";
 		$out .= "<br>\n";
-		$out .= "<b>".$langs->trans("RequestedUrl").":</b> ".dol_htmlentities($_SERVER["REQUEST_URI"], ENT_COMPAT, 'UTF-8')."<br>\n";
-		$out .= "<b>".$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"]) ? dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8') : '')."<br>\n";
-		$out .= "<b>".$langs->trans("MenuManager").":</b> ".(isset($conf->standard_menu) ? dol_htmlentities($conf->standard_menu) : '')."<br>\n";
+		$out .= "<b>".$langs->trans("RequestedUrl").":</b> ".dol_htmlentities($_SERVER["REQUEST_URI"], ENT_COMPAT)."<br>\n";
+		$out .= "<b>".$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"]) ? dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT) : '')."<br>\n";
+		$out .= "<b>".$langs->trans("MenuManager").":</b> ".(isset($conf->standard_menu) ? dol_htmlentities($conf->standard_menu, ENT_COMPAT) : '')."<br>\n";
 		$out .= "<br>\n";
 		$syslog .= "url=".dol_escape_htmltag($_SERVER["REQUEST_URI"]);
 		$syslog .= ", query_string=".dol_escape_htmltag($_SERVER["QUERY_STRING"]);
@@ -4490,7 +4509,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 	//print 'totalnboflines='.$totalnboflines.'-savlimit='.$savlimit.'-limit='.$limit.'-num='.$num.'-nextpage='.$nextpage;
 
 	print "\n";
-	print "<!-- Begin title '".$titre."' -->\n";
+	print "<!-- Begin title -->\n";
 	print '<table class="centpercent notopnoleftnoright table-fiche-title'.($morecss ? ' '.$morecss : '').'"><tr>'; // maring bottom must be same than into load_fiche_tire
 
 	// Left
@@ -4821,12 +4840,13 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
  *  should be roundtext2num().
  *
  *	@param	string|float	$amount			Amount to convert/clean or round
- *	@param	string			$rounding		''=No rounding
+ *	@param	string|int		$rounding		''=No rounding
  * 											'MU'=Round to Max unit price (MAIN_MAX_DECIMALS_UNIT)
  *											'MT'=Round to Max for totals with Tax (MAIN_MAX_DECIMALS_TOT)
  *											'MS'=Round to Max for stock quantity (MAIN_MAX_DECIMALS_STOCK)
- *      		                            'CR'=Foreign currency accurancy
- *											Numeric = Nb of digits for rounding
+ *      		                            'CU'=Round to Max unit price of foreign currency accuracy
+ *      		                            '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).
  *	@return	string							Amount with universal numeric format (Example: '99.99999').
@@ -4853,7 +4873,7 @@ function price2num($amount, $rounding = '', $option = 0)
 	if ($option != 1) {	// If not a PHP number or unknown, we change or clean format
 		//print 'PP'.$amount.' - '.$dec.' - '.$thousand.' - '.intval($amount).'<br>';
 		if (!is_numeric($amount)) {
-			$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
+			$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_]/', '', $amount);
 		}
 
 		if ($option == 2 && $thousand == '.' && preg_match('/\.(\d\d\d)$/', (string) $amount)) {	// It means the . is used as a thousand separator and string come frominput data, so 1.123 is 1123
@@ -4895,10 +4915,13 @@ function price2num($amount, $rounding = '', $option = 0)
 		elseif ($rounding == 'MS') {
 			$nbofdectoround = empty($conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : $conf->global->MAIN_MAX_DECIMALS_STOCK;
 		}
-		elseif ($rounding == 'CR') {
-			$nbofdectoround = max($conf->global->MAIN_MAX_DECIMALS_TOT, 8);
+		elseif ($rounding == 'CU') {
+			$nbofdectoround = max($conf->global->MAIN_MAX_DECIMALS_UNIT, 8);	// TODO Use param of currency
 		}
-		elseif (is_numeric($rounding))  $nbofdectoround = $rounding;
+		elseif ($rounding == 'CT') {
+			$nbofdectoround = max($conf->global->MAIN_MAX_DECIMALS_TOT, 8);		// TODO Use param of currency
+		}
+		elseif (is_numeric($rounding))  $nbofdectoround = (int) $rounding;
 		//print "RR".$amount.' - '.$nbofdectoround.'<br>';
 		if (dol_strlen($nbofdectoround)) $amount = round(is_string($amount) ? (float) $amount : $amount, $nbofdectoround); // $nbofdectoround can be 0.
 		else return 'ErrorBadParameterProvidedToFunction';
@@ -5475,6 +5498,10 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 		$isacompany = $thirdparty_buyer->isACompany();
 		if ($isacompany)
 		{
+			if (!empty($conf->global->MAIN_USE_VAT_OF_PRODUCT_FOR_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID) && !isValidVATID($thirdparty_buyer)) {
+				//print 'VATRULE 6';
+				return get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);
+			}
 			//print 'VATRULE 3';
 			return 0;
 		} else {
@@ -5635,7 +5662,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart = '
 	$arrayforoldpath = array('cheque', 'category', 'holiday', 'supplier_invoice', 'invoice_supplier', 'mailing', 'supplier_payment');
 	if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[] = 'product';
 	if (!empty($level) && in_array($modulepart, $arrayforoldpath)) {
-		// This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided.
+		// This part should be removed once all code is using "get_exdir" to forge path, with parameter $object and $modulepart provided.
 		if (empty($alpha)) $num = preg_replace('/([^0-9])/i', '', $num);
 		else $num = preg_replace('/^.*\-/i', '', $num);
 		$num = substr("000".$num, -$level);
@@ -5745,7 +5772,7 @@ function picto_required()
  *	@param	string	$stringtoclean		String to clean
  *	@param	integer	$removelinefeed		1=Replace all new lines by 1 space, 0=Only ending new lines are removed others are replaced with \n, 2=Ending new lines are removed but others are kept with a same number of \n than nb of <br> when there is both "...<br>\n..."
  *  @param  string	$pagecodeto      	Encoding of input/output string
- *  @param	integer	$strip_tags			0=Use internal strip, 1=Use strip_tags() php function (bugged when text contains a < char that is not for a html tag)
+ *  @param	integer	$strip_tags			0=Use internal strip, 1=Use strip_tags() php function (bugged when text contains a < char that is not for a html tag or when tags is not closed like '<img onload=aaa')
  *  @param	integer	$removedoublespaces	Replace double space into one space
  *	@return string	    				String cleaned
  *
@@ -5766,10 +5793,10 @@ function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto =
 	} else {
 		$pattern = "/<[^<>]+>/";
 		// Example of $temp: <a href="/myurl" title="<u>A title</u>">0000-021</a>
-		$temp = preg_replace($pattern, "", $temp); // pass 1
-		// $temp after pass 1: <a href="/myurl" title="A title">0000-021
-		$temp = preg_replace($pattern, "", $temp); // pass 2
-		// $temp after pass 2: 0000-021
+		$temp = preg_replace($pattern, "", $temp); // pass 1 - $temp after pass 1: <a href="/myurl" title="A title">0000-021
+		$temp = preg_replace($pattern, "", $temp); // pass 2 - $temp after pass 2: 0000-021
+		// Remove '<' into remainging, so non closing html tags like '<abc'. Note: '<123abc' is not a html tag (can be kept), but '<abc123' is (must be removed).
+		$temp = preg_replace('/<([a-z]+)/i', '\1', $temp);
 	}
 
 	$temp = dol_html_entity_decode($temp, ENT_COMPAT, $pagecodeto);
@@ -7127,7 +7154,7 @@ function dol_htmloutput_errors($mesgstring = '', $mesgarray = array(), $keepembe
  *  @param      array		$array      		Array to sort (array of array('key1'=>val1,'key2'=>val2,'key3'...) or array of objects)
  *  @param      string		$index				Key in array to use for sorting criteria
  *  @param      int			$order				Sort order ('asc' or 'desc')
- *  @param      int			$natsort			1=use "natural" sort (natsort), 0=use "standard" sort (asort)
+ *  @param      int			$natsort			1=use "natural" sort (natsort) for a search criteria thats is strings or unknown, 0=use "standard" sort (asort) for numbers
  *  @param      int			$case_sensitive		1=sort is case sensitive, 0=not case sensitive
  *  @param		int			$keepindex			If 0 and index key of array to sort is a numeric, than index will be rewrote. If 1 or index key is not numeric, key for index is kept after sorting.
  *  @return     array							Sorted array
@@ -7153,9 +7180,17 @@ function dol_sort_array(&$array, $index, $order = 'asc', $natsort = 0, $case_sen
 			}
 
 			if (!$natsort) {
-				($order == 'asc') ? asort($temp) : arsort($temp);
+				if ($order == 'asc') {
+					asort($temp);
+				} else {
+					arsort($temp);
+				}
 			} else {
-				($case_sensitive) ? natsort($temp) : natcasesort($temp);
+				if ($case_sensitive) {
+					natsort($temp);
+				} else {
+					natcasesort($temp);	// natecasesort is not sensible to case
+				}
 				if ($order != 'asc') $temp = array_reverse($temp, true);
 			}
 
@@ -7374,6 +7409,7 @@ function picto_from_langcode($codelang, $moreatt = '')
 		'da_DA' => 'dk',
 		'fr_CA' => 'mq',
 		'sv_SV' => 'se',
+		'sw_SW' => 'unknown',
 		'AQ' => 'unknown',
 		'CW' => 'unknown',
 		'IM' => 'unknown',
@@ -9214,3 +9250,16 @@ function readfileLowMemory($fullpath_original_file_osencoded, $method = -1)
 		fclose($handle2);
 	}
 }
+
+/**
+ * Create a button to copy $valuetoprint in the clipboard
+ *
+ * @param 	string 	$valuetoprint 		The value to print
+ * @param	int		$showonlyonhover	Show the copypaste button only on hover
+ * @return 	string 						The string to print for the button
+ */
+function showValueWithClipboardCPButton($valuetoprint, $showonlyonhover = 1)
+{
+	$result = '<span class="clipboardCP'.($showonlyonhover ? ' clipboardCPShowOnHover' : '').'"><span class="clipboardCPValue">'.$valuetoprint.'</span><span class="clipboardCPButton far fa-clipboard opacitymedium paddingleft paddingright"></span><span class="clipboardCPText opacitymedium"></span></span>';
+	return $result;
+}
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index ffc79b8f4b4..fcac069183e 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -315,7 +315,7 @@ function dol_print_object_info($object, $usetable = 0)
 		if ($usetable) print '</td><td>';
 		else print ': ';
 		print dol_print_date($object->date_validation, 'dayhour', 'tzserver');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation, "dayhour", 'tzserver').' &nbsp;'.$langs->trans("ClientHour");
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
 		if ($usetable) print '</td></tr>';
 		else print '<br>';
 	}
@@ -349,7 +349,7 @@ function dol_print_object_info($object, $usetable = 0)
 		if ($usetable) print '</td><td>';
 		else print ': ';
 		print dol_print_date($object->date_approve, 'dayhour', 'tzserver');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve, "dayhour", 'tzserver').' &nbsp;'.$langs->trans("ClientHour");
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
 		if ($usetable) print '</td></tr>';
 		else print '<br>';
 	}
@@ -377,7 +377,7 @@ function dol_print_object_info($object, $usetable = 0)
 		if ($usetable) print '</td><td>';
 		else print ': ';
 		print dol_print_date($object->date_approve2, 'dayhour', 'tzserver');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2, "dayhour", 'tzserver').' &nbsp;'.$langs->trans("ClientHour");
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
 		if ($usetable) print '</td></tr>';
 		else print '<br>';
 	}
@@ -413,7 +413,7 @@ function dol_print_object_info($object, $usetable = 0)
 		if ($usetable) print '</td><td>';
 		else print ': ';
 		print dol_print_date($object->date_closing, 'dayhour', 'tzserver');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_closing, "dayhour", 'tzserver').' &nbsp;'.$langs->trans("ClientHour");
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_closing, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
 		if ($usetable) print '</td></tr>';
 		else print '<br>';
 	}
@@ -447,7 +447,7 @@ function dol_print_object_info($object, $usetable = 0)
 		if ($usetable) print '</td><td>';
 		else print ': ';
 		print dol_print_date($object->date_rappro, 'dayhour', 'tzserver');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro, "dayhour", 'tzserver').' &nbsp;'.$langs->trans("ClientHour");
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
 		if ($usetable) print '</td></tr>';
 		else print '<br>';
 	}
@@ -460,7 +460,7 @@ function dol_print_object_info($object, $usetable = 0)
 		if ($usetable) print '</td><td>';
 		else print ': ';
 		print dol_print_date($object->date_envoi, 'dayhour', 'tzserver');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi, "dayhour", 'tzserver').' &nbsp;'.$langs->trans("ClientHour");
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
 		if ($usetable) print '</td></tr>';
 		else print '<br>';
 	}
diff --git a/htdocs/core/lib/holiday.lib.php b/htdocs/core/lib/holiday.lib.php
index f5297f6fd89..7b9c5d46da2 100644
--- a/htdocs/core/lib/holiday.lib.php
+++ b/htdocs/core/lib/holiday.lib.php
@@ -51,6 +51,11 @@ function holiday_prepare_head($object)
 	$head[$h][2] = 'documents';
 	$h++;
 
+	$head[$h][0] = DOL_URL_ROOT.'/holiday/info.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Info");
+	$head[$h][2] = 'info';
+	$h++;
+
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
diff --git a/htdocs/core/lib/import.lib.php b/htdocs/core/lib/import.lib.php
index 8fa6a995331..385dee32a86 100644
--- a/htdocs/core/lib/import.lib.php
+++ b/htdocs/core/lib/import.lib.php
@@ -43,7 +43,11 @@ function import_prepare_head($param, $maxstep = 0)
 	$i = 1;
 	while ($i <= $maxstep)
 	{
-		$head[$h][0] = DOL_URL_ROOT.'/imports/import.php?step='.$i.$param;
+		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][1] = $langs->trans("Step")." ".$i;
 		$head[$h][2] = 'step'.$i;
 		$h++;
diff --git a/htdocs/core/lib/invoice2.lib.php b/htdocs/core/lib/invoice2.lib.php
index 1357bfb2417..f38292cb50d 100644
--- a/htdocs/core/lib/invoice2.lib.php
+++ b/htdocs/core/lib/invoice2.lib.php
@@ -175,7 +175,7 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 					if ($regenerate || !dol_is_file($filename))
 					{
 						if ($usestdout) print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n";
-						$result = $fac->generateDocument($regenerate ? $regenerate : $fac->modelpdf, $outputlangs);
+						$result = $fac->generateDocument($regenerate ? $regenerate : $fac->model_pdf, $outputlangs);
 					} else {
 						if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n";
 					}
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 6e4cc60ce53..613a68b56d8 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1236,6 +1236,10 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 	} else {
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		$prodser = new Product($db);
+
+		if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+		    include_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+		}
 	}
 
 	if ($idprod)
@@ -1375,6 +1379,32 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			}
 		} else {
 			$ref_prodserv = $prodser->ref; // Show local ref only
+
+			if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+                $productCustomerPriceStatic = new Productcustomerprice($db);
+			    $filter = array('fk_product' => $idprod, 'fk_soc' => $object->socid);
+
+			    $nbCustomerPrices = $productCustomerPriceStatic->fetch_all('', '', 1, 0, $filter);
+
+			    if ($nbCustomerPrices > 0) {
+			        $productCustomerPrice = $productCustomerPriceStatic->lines[0];
+
+			        if (! empty($productCustomerPrice->ref_customer)) {
+			            switch ($conf->global->PRODUIT_CUSTOMER_PRICES_PDF_REF_MODE) {
+			                case 1:
+			                    $ref_prodserv = $productCustomerPrice->ref_customer;
+			                    break;
+
+			                case 2:
+			                    $ref_prodserv = $productCustomerPrice->ref_customer . ' (' . $outputlangs->transnoentitiesnoconv('InternalRef') . ' ' . $ref_prodserv . ')';
+			                    break;
+
+			                default:
+			                    $ref_prodserv = $ref_prodserv . ' (' . $outputlangs->transnoentitiesnoconv('RefCustomer') . ' ' . $productCustomerPrice->ref_customer . ')';
+			            }
+			        }
+			    }
+			}
 		}
 
 		if (!empty($libelleproduitservice) && !empty($ref_prodserv)) $ref_prodserv .= " - ";
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 3c8a79a9249..9bbfe1322e9 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -476,6 +476,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				$projectstatic->public = $lines[$i]->public;
 				$projectstatic->title = $lines[$i]->projectlabel;
 				$projectstatic->usage_bill_time = $lines[$i]->usage_bill_time;
+				$projectstatic->status = $lines[$i]->projectstatus;
 
 				$taskstatic->id = $lines[$i]->id;
 				$taskstatic->ref = $lines[$i]->ref;
@@ -881,6 +882,7 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
 			$projectstatic->ref = $lines[$i]->project_ref;
 			$projectstatic->title = $lines[$i]->project_label;
 			$projectstatic->public = $lines[$i]->public;
+			$projectstatic->status = $lines[$i]->project_status;
 
 			$taskstatic->id = $lines[$i]->task_id;
 			$taskstatic->ref = ($lines[$i]->task_ref ? $lines[$i]->task_ref : $lines[$i]->task_id);
@@ -1116,6 +1118,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				$projectstatic->ref = $lines[$i]->projectref;
 				$projectstatic->title = $lines[$i]->projectlabel;
 				$projectstatic->public = $lines[$i]->public;
+				$projectstatic->status = $lines[$i]->projectstatus;
 
 				$taskstatic->id = $lines[$i]->id;
 				$taskstatic->ref = ($lines[$i]->ref ? $lines[$i]->ref : $lines[$i]->id);
@@ -1489,6 +1492,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				$projectstatic->title = $lines[$i]->projectlabel;
 				$projectstatic->public = $lines[$i]->public;
 				$projectstatic->thirdparty_name = $lines[$i]->thirdparty_name;
+				$projectstatic->status = $lines[$i]->projectstatus;
 
 				$taskstatic->id = $lines[$i]->id;
 				$taskstatic->ref = ($lines[$i]->ref ? $lines[$i]->ref : $lines[$i]->id);
@@ -1843,6 +1847,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 				$projectstatic->title = $lines[$i]->projectlabel;
 				$projectstatic->public = $lines[$i]->public;
 				$projectstatic->thirdparty_name = $lines[$i]->thirdparty_name;
+				$projectstatic->status = $lines[$i]->projectstatus;
 
 				$taskstatic->id = $lines[$i]->id;
 				$taskstatic->ref = ($lines[$i]->ref ? $lines[$i]->ref : $lines[$i]->id);
@@ -2180,7 +2185,8 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 	$sql2 .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
 	$sql2 .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
 	$sql2 .= " WHERE p.rowid IN (".join(',', $arrayidofprojects).")";
-	$sql2 .= " GROUP BY p.rowid, p.ref, p.title, p.fk_soc, s.nom, p.fk_user_creat, p.public, p.fk_statut, p.fk_opp_status, p.opp_percent, p.opp_amount, p.dateo, p.datee";
+	$sql2 .= " GROUP BY p.rowid, p.ref, p.title, p.fk_soc, s.rowid, s.nom, s.name_alias, s.code_client, s.code_compta, s.client, s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur,";
+	$sql2 .= " s.logo, s.email, s.entity, p.fk_user_creat, p.public, p.fk_statut, p.fk_opp_status, p.opp_percent, p.opp_amount, p.dateo, p.datee";
 	$sql2 .= " ORDER BY p.title, p.ref";
 
 	$resql = $db->query($sql2);
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 9667a67d360..2f1e3d5596b 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -444,7 +444,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 		$checksoc = array('societe'); // Test for societe object
 		$checkother = array('contact', 'agenda'); // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).
 		$checkproject = array('projet', 'project'); // Test for project object
-		$checktask = array('projet_task');
+		$checktask = array('projet_task');	// Test for task object
 		$nocheck = array('barcode', 'stock'); // No test
 		//$checkdefault = 'all other not already defined'; // Test on entity and link to third party. Not allowed if link is empty (Ex: invoice, orders...).
 
@@ -582,29 +582,35 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		} elseif (!in_array($feature, $nocheck))		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
-		{
+		} elseif (!in_array($feature, $nocheck)) {		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
 			// If external user: Check permission for external users
-			if ($user->socid > 0)
-			{
+			if ($user->socid > 0) {
 				if (empty($dbt_keyfield)) dol_print_error('', 'Param dbt_keyfield is required but not defined');
 				$sql = "SELECT COUNT(dbt.".$dbt_keyfield.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.rowid IN (".$objectid.")";
 				$sql .= " AND dbt.".$dbt_keyfield." = ".$user->socid;
-			} // If internal user: Check permission for internal users that are restricted on their objects
-			elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
-			{
-				if (empty($dbt_keyfield)) dol_print_error('', 'Param dbt_keyfield is required but not defined');
-				$sql = "SELECT COUNT(sc.fk_soc) as nb";
-				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql .= " AND sc.fk_soc = dbt.".$dbt_keyfield;
-				$sql .= " AND dbt.".$dbt_keyfield." = s.rowid";
-				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-				$sql .= " AND sc.fk_user = ".$user->id;
+			} elseif (!empty($conf->societe->enabled)) {
+				// If internal user: Check permission for internal users that are restricted on their objects
+				if ($feature != 'ticket' && !$user->rights->societe->client->voir) {
+					if (empty($dbt_keyfield)) dol_print_error('', 'Param dbt_keyfield is required but not defined');
+					$sql = "SELECT COUNT(sc.fk_soc) as nb";
+					$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+					$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+					$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+					$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+					$sql .= " AND sc.fk_soc = dbt.".$dbt_keyfield;
+					$sql .= " AND sc.fk_user = ".$user->id;
+				}
+				// On ticket, the thirdparty is not mandatory, so we need a special test to accept record with no thirdparties.
+				if ($feature == 'ticket' && !$user->rights->societe->client->voir) {
+					$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+					$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+					$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = dbt.".$dbt_keyfield." AND sc.fk_user = ".$user->id;
+					$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+					$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+					$sql .= " AND (sc.fk_user = ".$user->id." OR sc.fk_user IS NULL)";
+				}
 			} // If multicompany and internal users with all permissions, check user is in correct entity
 			elseif (!empty($conf->multicompany->enabled))
 			{
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index fefe0aa19d5..3527d132cde 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -219,15 +219,14 @@ if (!function_exists('dol_loginfunction'))
 		$width = 0;
 		$urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';
 
-		if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
-		{
+		if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
 			$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
-		} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
-		{
+		} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))	{
 			$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
 			$width = 128;
-		} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
-		{
+		} elseif (!empty($mysoc->logo_squarred_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_small)) {
+			$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_small);
+		} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg')) {
 			$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
 		}
 
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 92fdfa21aff..c90892d603c 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -283,7 +283,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 	$out = '';
 	$histo = array();
 	$numaction = 0;
-	$now = dol_now('tzuser');
+	$now = dol_now();
 
 	// Open DSI -- Fix order by -- Begin
 	$sortfield_list = explode(',', $sortfield);
@@ -622,7 +622,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 				$out .= '<!-- timeline time label -->';
 				$out .= '<li class="time-label">';
 				$out .= '<span class="timeline-badge-date">';
-				$out .= dol_print_date($histo[$key]['datestart'], 'daytext', 'tzserver', $langs);
+				$out .= dol_print_date($histo[$key]['datestart'], 'daytext', 'tzuserrel', $langs);
 				$out .= '</span>';
 				$out .= '</li>';
 				$out .= '<!-- /.timeline-label -->';
@@ -660,14 +660,14 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 			$out .= '</span>';
 			// Date
 			$out .= '<span class="time"><i class="fa fa-clock-o"></i> ';
-			$out .= dol_print_date($histo[$key]['datestart'], 'dayhour');
+			$out .= dol_print_date($histo[$key]['datestart'], 'dayhour', 'tzuserrel');
 			if ($histo[$key]['dateend'] && $histo[$key]['dateend'] != $histo[$key]['datestart']) {
 				$tmpa = dol_getdate($histo[$key]['datestart'], true);
 				$tmpb = dol_getdate($histo[$key]['dateend'], true);
 				if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {
-					$out .= '-'.dol_print_date($histo[$key]['dateend'], 'hour');
+					$out .= '-'.dol_print_date($histo[$key]['dateend'], 'hour', 'tzuserrel');
 				} else {
-					$out .= '-'.dol_print_date($histo[$key]['dateend'], 'dayhour');
+					$out .= '-'.dol_print_date($histo[$key]['dateend'], 'dayhour', 'tzuserrel');
 				}
 			}
 			$late = 0;
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index e4de8b0c833..9df0f8d9ddf 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -163,7 +163,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 
 				print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;
 			}
-			print "\n".'<li '.($tab[$x]['statut'] ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
+			print "\n".'<li '.(!empty($tab[$x]['statut']) ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
 			if ($showfk)
 			{
 				print '<table class="nobordernopadding centpercent"><tr><td>';
@@ -194,7 +194,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 
 				print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;
 			}
-			print "\n".'<li '.($tab[$x]['statut'] ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
+			print "\n".'<li '.(!empty($tab[$x]['statut']) ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
 			if ($showfk)
 			{
 				print '<table class="nobordernopadding centpercent"><tr><td>';
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 913112e04e6..0cf23e0593f 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -498,7 +498,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td colspan="'.($colspan - 1).'">';
 		//var_dump($conf->global->THEME_ELDY_BACKBODY);
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), ''), 'THEME_ELDY_BACKBODY', '', 1, '', '', 'colorbackbody').' ';
+		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_BACKBODY) ? $conf->global->THEME_ELDY_BACKBODY : ''), array()), ''), 'THEME_ELDY_BACKBODY', '', 1, '', '', 'colorbackbody').' ';
 		} else {
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -539,7 +539,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), ''), 'THEME_ELDY_TOPMENU_BACK1', '', 1, '', '', 'colorbackhmenu1').' ';
+		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TOPMENU_BACK1) ? $conf->global->THEME_ELDY_TOPMENU_BACK1 : ''), array()), ''), 'THEME_ELDY_TOPMENU_BACK1', '', 1, '', '', 'colorbackhmenu1').' ';
 		} else {
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -580,7 +580,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("LeftMenuBackgroundColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), ''), 'THEME_ELDY_VERMENU_BACK1', '', 1, '', '', 'colorbackvmenu1').' ';
+		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_VERMENU_BACK1) ? $conf->global->THEME_ELDY_VERMENU_BACK1 : ''), array()), ''), 'THEME_ELDY_VERMENU_BACK1', '', 1, '', '', 'colorbackvmenu1').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -601,7 +601,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("TextTitleColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB, array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', '', 1, '', '', 'colortexttitlenotab').' ';
+		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTTITLENOTAB) ? $conf->global->THEME_ELDY_TEXTTITLENOTAB : ''), array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', '', 1, '', '', 'colortexttitlenotab').' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
 		}
@@ -621,7 +621,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1, array()), ''), 'THEME_ELDY_BACKTITLE1', '', 1, '', '', 'colorbacktitle1').' ';
+		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_BACKTITLE1) ? $conf->global->THEME_ELDY_BACKTITLE1 : ''), array()), ''), 'THEME_ELDY_BACKTITLE1', '', 1, '', '', 'colorbacktitle1').' ';
 		} else {
 	   		print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
 	   	}
@@ -641,7 +641,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundTableTitleTextColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLE, array()), ''), 'THEME_ELDY_TEXTTITLE', '', 1, '', '', 'colortexttitle').' ';
+		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTTITLE) ? $conf->global->THEME_ELDY_TEXTTITLE : ''), array()), ''), 'THEME_ELDY_TEXTTITLE', '', 1, '', '', 'colortexttitle').' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLE, $langs->trans("Default"));
 		}
@@ -661,7 +661,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundTableTitleTextlinkColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLELINK, array()), ''), 'THEME_ELDY_TEXTTITLELINK', '', 1, '', '', 'colortexttitlelink').' ';
+		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $conf->global->THEME_ELDY_TEXTTITLELINK : ''), array()), ''), 'THEME_ELDY_TEXTTITLELINK', '', 1, '', '', 'colortexttitlelink').' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLELINK, $langs->trans("Default"));
 		}
@@ -682,7 +682,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundTableLineOddColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), ''), 'THEME_ELDY_LINEIMPAIR1', '', 1, '', '', 'colorbacklinepair2').' ';
+		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_LINEIMPAIR1) ? $conf->global->THEME_ELDY_LINEIMPAIR1 : ''), array()), ''), 'THEME_ELDY_LINEIMPAIR1', '', 1, '', '', 'colorbacklinepair2').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -703,7 +703,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundTableLineEvenColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), ''), 'THEME_ELDY_LINEPAIR1', '', 1, '', '', 'colorbacklineimpair2').' ';
+		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_LINEPAIR1) ? $conf->global->THEME_ELDY_LINEPAIR1 : ''), array()), ''), 'THEME_ELDY_LINEPAIR1', '', 1, '', '', 'colorbacklineimpair2').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -744,7 +744,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("LinkColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), ''), 'THEME_ELDY_TEXTLINK', '', 1, '', '', 'colortextlink').' ';
+		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTLINK) ? $conf->global->THEME_ELDY_TEXTLINK : ''), array()), ''), 'THEME_ELDY_TEXTLINK', '', 1, '', '', 'colortextlink').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -781,12 +781,12 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		//print '<input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
 		//print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 		if ($edit) {
-			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
-			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
+		    if (!empty($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
+			else $color = colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_USE_HOVER) ? $conf->global->THEME_ELDY_USE_HOVER : ''), array()), '');
 			print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', '', 1, '', '', 'colorbacklinepairhover').' ';
 		} else {
 			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
-			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
+			else $color = colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_USE_HOVER) ? $conf->global->THEME_ELDY_USE_HOVER : ''), array()), '');
 			if ($color) {
 				if ($color != colorArrayToHex(colorStringToArray($colorbacklinepairhover))) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 				else print $langs->trans("Default");
@@ -818,12 +818,12 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		//print '<input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
 		//print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 		if ($edit) {
-			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
-			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');
+		    if (!empty($conf->global->THEME_ELDY_USE_CHECKED) && $conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
+			else $color = colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_USE_CHECKED) ? $conf->global->THEME_ELDY_USE_CHECKED : ''), array()), '');
 			print $formother->selectColor($color, 'THEME_ELDY_USE_CHECKED', '', 1, '', '', 'colorbacklinepairchecked').' ';
 		} else {
 			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
-			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');
+			else $color = colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_USE_CHECKED) ? $conf->global->THEME_ELDY_USE_CHECKED : ''), array()), '');
 			if ($color) {
 				if ($color != 'e6edf0') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 				else print $langs->trans("Default");
diff --git a/htdocs/core/lib/vat.lib.php b/htdocs/core/lib/vat.lib.php
index 5cd2203a393..abe7d3c7993 100644
--- a/htdocs/core/lib/vat.lib.php
+++ b/htdocs/core/lib/vat.lib.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2016	Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2018   Philippe Grand      <philippe.grand@atoo-net.com>
+ * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,7 +38,7 @@ function vat_prepare_head($object)
 	$head = array();
 
 	$head[$tab][0] = DOL_URL_ROOT.'/compta/tva/card.php?id='.$object->id;
-	$head[$tab][1] = $langs->trans('VATPayment');
+	$head[$tab][1] = $langs->trans('VATDeclaration');
 	$head[$tab][2] = 'card';
 	$tab++;
 
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 3462212ee25..380a7c0dc12 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -52,8 +52,8 @@ function dolSaveMasterFile($filemaster)
 }
 
 /**
- * Save content of a page on disk.
- * It can save file into root directory or into language subdirectory.
+ * Save an alias page on disk (A page that include the reference page).
+ * It saves file into the root directory but also into language subdirectory.
  *
  * @param	string		$filealias			Full path of filename to generate
  * @param	Website		$object				Object website
@@ -82,11 +82,11 @@ function dolSavePageAlias($filealias, $object, $objectpage)
 		@chmod($filealias, octdec($conf->global->MAIN_UMASK));
 	}
 
-	// Save also alias into language subdirectory if we have to
+	// Save also alias into language subdirectory if it is not a main language
 	if ($objectpage->lang && in_array($objectpage->lang, explode(',', $object->otherlang))) {
 		$dirname = dirname($filealias);
 		$filename = basename($filealias);
-		$filealias = $dirname.'/'.$objectpage->lang.'/'.$filename;
+		$filealiassub = $dirname.'/'.$objectpage->lang.'/'.$filename;
 
 		$aliascontent = '<?php'."\n";
 		$aliascontent .= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page\n";
@@ -94,12 +94,36 @@ function dolSavePageAlias($filealias, $object, $objectpage)
 		$aliascontent .= 'if (empty($dolibarr_main_data_root)) require \'../page'.$objectpage->id.'.tpl.php\'; ';
 		$aliascontent .= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
 		$aliascontent .= '?>'."\n";
-		$result = file_put_contents($filealias, $aliascontent);
+		$result = file_put_contents($filealiassub, $aliascontent);
 		if ($result === false) {
-			dol_syslog("Failed to write file ".$filealias, LOG_WARNING);
+			dol_syslog("Failed to write file ".$filealiassub, LOG_WARNING);
 		}
 		if (!empty($conf->global->MAIN_UMASK)) {
-			@chmod($filealias, octdec($conf->global->MAIN_UMASK));
+			@chmod($filealiassub, octdec($conf->global->MAIN_UMASK));
+		}
+	}
+	// Save also alias into all language subdirectories if it is a main language
+	elseif (empty($objectpage->lang) || !in_array($objectpage->lang, explode(',', $object->otherlang))) {
+		if (empty($conf->global->WEBSITE_DISABLE_MAIN_LANGUAGE_INTO_LANGSUBDIR)) {
+			$dirname = dirname($filealias);
+			$filename = basename($filealias);
+			foreach (explode(',', $object->otherlang) as $sublang) {
+				$filealiassub = $dirname.'/'.$sublang.'/'.$filename;
+
+				$aliascontent = '<?php'."\n";
+				$aliascontent .= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page\n";
+				$aliascontent .= 'global $dolibarr_main_data_root;'."\n";
+				$aliascontent .= 'if (empty($dolibarr_main_data_root)) require \'../page'.$objectpage->id.'.tpl.php\'; ';
+				$aliascontent .= 'else require $dolibarr_main_data_root.\'/website/\'.$website->ref.\'/page'.$objectpage->id.'.tpl.php\';'."\n";
+				$aliascontent .= '?>'."\n";
+				$result = file_put_contents($filealiassub, $aliascontent);
+				if ($result === false) {
+					dol_syslog("Failed to write file ".$filealiassub, LOG_WARNING);
+				}
+				if (!empty($conf->global->MAIN_UMASK)) {
+					@chmod($filealiassub, octdec($conf->global->MAIN_UMASK));
+				}
+			}
 		}
 	}
 
@@ -108,8 +132,8 @@ function dolSavePageAlias($filealias, $object, $objectpage)
 
 
 /**
- * Save content of a page on disk.
- * Page contents are always saved into root directory.
+ * Save content of a page on disk (page name is generally ID_of_page.php).
+ * Page contents are always saved into "root" directory. Only aliases pages saved with dolSavePageAlias() can be in root or language subdir.
  *
  * @param	string		$filetpl			Full path of filename to generate
  * @param	Website		$object				Object website
@@ -230,10 +254,11 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
 
 	//var_dump($filetpl);exit;
 	$result = file_put_contents($filetpl, $tplcontent);
-	if (!empty($conf->global->MAIN_UMASK))
+	if (!empty($conf->global->MAIN_UMASK)) {
 		@chmod($filetpl, octdec($conf->global->MAIN_UMASK));
+	}
 
-		return $result;
+	return $result;
 }
 
 
diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index 41ce8a67316..c62c6add140 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -148,8 +148,11 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 		{
 			if ($result == 2)	// Connection is ok for user/pass into LDAP
 			{
-				dol_syslog("functions_ldap::check_user_password_ldap Authentification ok");
 				$login = $usertotest;
+				if (!empty($conf->global->LDAP_FIELD_LOGIN)) {
+					$login = $ldap->login;
+				}
+				dol_syslog("functions_ldap::check_user_password_ldap $login authentication ok");
 
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 5082f230b0c..eb1b965f555 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2018      Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -206,9 +207,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	$menu_arr[] = array(
 		'name' => 'Projet',
 		'link' => '/projet/index.php?mainmenu=project&amp;leftmenu=',
-		'title' => (empty($conf->global->PROJECT_USE_OPPORTUNITIES) || $conf->global->PROJECT_USE_OPPORTUNITIES == 2)
-					? (($conf->global->PROJECT_USE_OPPORTUNITIES == 2) ? "Leads" : "Projects")
-					: "Projects",
+		'title' => (! empty($conf->global->PROJECT_USE_OPPORTUNITIES) && $conf->global->PROJECT_USE_OPPORTUNITIES == 2 ? "Leads" : "Projects"),
 		'level' => 0,
 		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
 		'target' => $atarget,
@@ -709,10 +708,10 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			$langs->load("users");
 
 			// Home - dashboard
-			$newmenu->add("/index.php?mainmenu=home&amp;leftmenu=home", $langs->trans("MyDashboard"), 0, 1, '', $mainmenu, 'home', 0, '', '', '', '<i class="fa fa-bar-chart fa-fw paddingright"></i>');
+			$newmenu->add("/index.php?mainmenu=home&amp;leftmenu=home", $langs->trans("MyDashboard"), 0, 1, '', $mainmenu, 'home', 0, '', '', '', '<i class="fa fa-bar-chart fa-fw paddingright pictofixedwidth"></i>');
 
 			// Setup
-			$newmenu->add("/admin/index.php?mainmenu=home&amp;leftmenu=setup", $langs->trans("Setup"), 0, $user->admin, '', $mainmenu, 'setup', 0, '', '', '', '<i class="fa fa-wrench fa-fw paddingright"></i>');
+			$newmenu->add("/admin/index.php?mainmenu=home&amp;leftmenu=setup", $langs->trans("Setup"), 0, $user->admin, '', $mainmenu, 'setup', 0, '', '', '', '<i class="fa fa-wrench fa-fw paddingright pictofixedwidth"></i>');
 
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "setup") {
 				// Load translation files required by the page
@@ -743,11 +742,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"), 1);
 
 				$warnpicto = '';
-				if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {
+				if (!empty($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {
 					$langs->load("errors");
 					$warnpicto = img_warning($langs->trans("WarningPHPMailD"));
 				}
-				if (in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmail')) && empty($conf->global->MAIN_MAIL_SMTP_SERVER)) {
+				if (!empty($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmail')) && empty($conf->global->MAIN_MAIL_SMTP_SERVER)) {
 					$langs->load("errors");
 					$warnpicto = img_warning($langs->trans("ErrorSetupOfEmailsNotComplete"));
 				}
@@ -759,7 +758,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// System tools
-			$newmenu->add("/admin/tools/index.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("AdminTools"), 0, $user->admin, '', $mainmenu, 'admintools', 0, '', '', '', '<i class="fa fa-server fa-fw paddingright"></i>');
+			$newmenu->add("/admin/tools/index.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("AdminTools"), 0, $user->admin, '', $mainmenu, 'admintools', 0, '', '', '', '<i class="fa fa-server fa-fw paddingright pictofixedwidth"></i>');
 			if ($usemenuhider || empty($leftmenu) || preg_match('/^admintools/', $leftmenu)) {
 				// Load translation files required by the page
 				$langs->loadLangs(array('admin', 'help'));
@@ -793,7 +792,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				}
 			}
 
-			$newmenu->add("/user/home.php?leftmenu=users", $langs->trans("MenuUsersAndGroups"), 0, $user->rights->user->user->lire, '', $mainmenu, 'users', 0, '', '', '', '<i class="fa fa-users fa-fw paddingright"></i>');
+			$newmenu->add("/user/home.php?leftmenu=users", $langs->trans("MenuUsersAndGroups"), 0, $user->rights->user->user->lire, '', $mainmenu, 'users', 0, '', '', '', img_picto('', 'user', 'class="paddingright pictofixedwidth"'));
 			if ($user->rights->user->user->lire) {
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "users") {
 					$newmenu->add("", $langs->trans("Users"), 1, $user->rights->user->user->lire || $user->admin);
@@ -805,8 +804,8 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 						$newmenu->add("/categories/index.php?leftmenu=users&type=7", $langs->trans("UsersCategoriesShort"), 2, $user->rights->categorie->lire, '', $mainmenu, 'cat');
 					}
 					$newmenu->add("", $langs->trans("Groups"), 1, ($user->rights->user->user->lire || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
-					$newmenu->add("/user/group/card.php?leftmenu=users&action=create", $langs->trans("NewGroup"), 2, (($conf->global->MAIN_USE_ADVANCED_PERMS ? $user->rights->user->group_advance->write : $user->rights->user->user->creer) || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
-					$newmenu->add("/user/group/list.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, (($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));
+					$newmenu->add("/user/group/card.php?leftmenu=users&action=create", $langs->trans("NewGroup"), 2, ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) ? $user->rights->user->group_advance->write : $user->rights->user->user->creer) || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
+					$newmenu->add("/user/group/list.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) ? $user->rights->user->group_advance->read : $user->rights->user->user->lire) || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
 				}
 			}
 		}
@@ -819,7 +818,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			// Societes
 			if (!empty($conf->societe->enabled)) {
 				$langs->load("companies");
-				$newmenu->add("/societe/index.php?leftmenu=thirdparties", $langs->trans("ThirdParty"), 0, $user->rights->societe->lire, '', $mainmenu, 'thirdparties');
+				$newmenu->add("/societe/index.php?leftmenu=thirdparties", $langs->trans("ThirdParty"), 0, $user->rights->societe->lire, '', $mainmenu, 'thirdparties', 0, '', '', '', img_picto('', 'company', 'class="paddingright pictofixedwidth"'));
 
 				if ($user->rights->societe->creer) {
 					$newmenu->add("/societe/card.php?action=create", $langs->trans("MenuNewThirdParty"), 1);
@@ -881,7 +880,8 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Contacts
-			$newmenu->add("/societe/index.php?leftmenu=thirdparties", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts');
+			$newmenu->add("/societe/index.php?leftmenu=thirdparties", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts', 0, '', '', '', img_picto('', 'contact', 'class="paddingright pictofixedwidth"'));
+
 			$newmenu->add("/contact/card.php?leftmenu=contacts&amp;action=create", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->rights->societe->contact->creer);
 			$newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->contact->lire);
 			if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
@@ -913,7 +913,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			// Customer proposal
 			if (!empty($conf->propal->enabled)) {
 				$langs->load("propal");
-				$newmenu->add("/comm/propal/index.php?leftmenu=propals", $langs->trans("Proposals"), 0, $user->rights->propale->lire, '', $mainmenu, 'propals', 100);
+				$newmenu->add("/comm/propal/index.php?leftmenu=propals", $langs->trans("Proposals"), 0, $user->rights->propale->lire, '', $mainmenu, 'propals', 100, '', '', '', img_picto('', 'propal', 'class="paddingright pictofixedwidth"'));
 				$newmenu->add("/comm/propal/card.php?action=create&amp;leftmenu=propals", $langs->trans("NewPropal"), 1, $user->rights->propale->creer);
 				$newmenu->add("/comm/propal/list.php?leftmenu=propals", $langs->trans("List"), 1, $user->rights->propale->lire);
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "propals") {
@@ -930,7 +930,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			// Customers orders
 			if (!empty($conf->commande->enabled)) {
 				$langs->load("orders");
-				$newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders', 200);
+				$newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders', 200, '', '', '', img_picto('', 'order', 'class="paddingright pictofixedwidth"'));
 				$newmenu->add("/commande/card.php?action=create&amp;leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);
 				$newmenu->add("/commande/list.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire);
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders") {
@@ -949,7 +949,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			// Supplier proposal
 			if (!empty($conf->supplier_proposal->enabled)) {
 				$langs->load("supplier_proposal");
-				$newmenu->add("/supplier_proposal/index.php?leftmenu=propals_supplier", $langs->trans("SupplierProposalsShort"), 0, $user->rights->supplier_proposal->lire, '', $mainmenu, 'propals_supplier', 300);
+				$newmenu->add("/supplier_proposal/index.php?leftmenu=propals_supplier", $langs->trans("SupplierProposalsShort"), 0, $user->rights->supplier_proposal->lire, '', $mainmenu, 'propals_supplier', 300, '', '', '', img_picto('', 'supplier_proposal', 'class="paddingright pictofixedwidth"'));
 				$newmenu->add("/supplier_proposal/card.php?action=create&amp;leftmenu=supplier_proposals", $langs->trans("SupplierProposalNew"), 1, $user->rights->supplier_proposal->creer);
 				$newmenu->add("/supplier_proposal/list.php?leftmenu=supplier_proposals", $langs->trans("List"), 1, $user->rights->supplier_proposal->lire);
 				$newmenu->add("/comm/propal/stats/index.php?leftmenu=supplier_proposals&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->rights->supplier_proposal->lire);
@@ -958,7 +958,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			// Suppliers orders
 			if (!empty($conf->supplier_order->enabled)) {
 				$langs->load("orders");
-				$newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers", $langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers', 400);
+				$newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers", $langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers', 400, '', '', '', img_picto('', 'supplier_order', 'class="paddingright pictofixedwidth"'));
 				$newmenu->add("/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers", $langs->trans("NewOrder"), 1, $user->rights->fournisseur->commande->creer);
 				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire);
 
@@ -983,7 +983,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			// Contrat
 			if (!empty($conf->contrat->enabled)) {
 				$langs->load("contracts");
-				$newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("ContractsSubscriptions"), 0, $user->rights->contrat->lire, '', $mainmenu, 'contracts', 2000);
+				$newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("ContractsSubscriptions"), 0, $user->rights->contrat->lire, '', $mainmenu, 'contracts', 2000, '', '', '', img_picto('', 'contract', 'class="paddingright pictofixedwidth"'));
 				$newmenu->add("/contrat/card.php?action=create&amp;leftmenu=contracts", $langs->trans("NewContractSubscription"), 1, $user->rights->contrat->creer);
 				$newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->rights->contrat->lire);
 				$newmenu->add("/contrat/services_list.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->rights->contrat->lire);
@@ -998,7 +998,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			// Interventions
 			if (!empty($conf->ficheinter->enabled)) {
 				$langs->load("interventions");
-				$newmenu->add("/fichinter/index.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->ficheinter->lire, '', $mainmenu, 'ficheinter', 2200);
+				$newmenu->add("/fichinter/index.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->ficheinter->lire, '', $mainmenu, 'ficheinter', 2200, '', '', '', img_picto('', 'intervention', 'class="paddingright pictofixedwidth"'));
 				$newmenu->add("/fichinter/card.php?action=create&amp;leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->rights->ficheinter->creer, '', '', '', 201);
 				$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("List"), 1, $user->rights->ficheinter->lire, '', '', '', 202);
 				if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
@@ -1018,7 +1018,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			// Customers invoices
 			if (!empty($conf->facture->enabled)) {
 				$langs->load("bills");
-				$newmenu->add("/compta/facture/index.php?leftmenu=customers_bills", $langs->trans("BillsCustomers"), 0, $user->rights->facture->lire, '', $mainmenu, 'customers_bills');
+				$newmenu->add("/compta/facture/index.php?leftmenu=customers_bills", $langs->trans("BillsCustomers"), 0, $user->rights->facture->lire, '', $mainmenu, 'customers_bills', 0, '', '', '', img_picto('', 'bill', 'class="paddingright pictofixedwidth"'));
 				$newmenu->add("/compta/facture/card.php?action=create", $langs->trans("NewBill"), 1, $user->rights->facture->creer);
 				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills", $langs->trans("List"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_list');
 
@@ -1043,7 +1043,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			// Suppliers invoices
 			if (!empty($conf->societe->enabled) && !empty($conf->supplier_invoice->enabled)) {
 				$langs->load("bills");
-				$newmenu->add("/fourn/facture/index.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"), 0, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills');
+				$newmenu->add("/fourn/facture/index.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"), 0, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills', 0, '', '', '', img_picto('', 'supplier_invoice', 'class="paddingright pictofixedwidth"'));
 				$newmenu->add("/fourn/facture/card.php?leftmenu=suppliers_bills&amp;action=create", $langs->trans("NewBill"), 1, $user->rights->fournisseur->facture->creer, '', $mainmenu, 'suppliers_bills_create');
 				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("List"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_list');
 
@@ -1064,7 +1064,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			if (!empty($conf->commande->enabled)) {
 				$langs->load("orders");
 				if (!empty($conf->facture->enabled)) {
-					$newmenu->add("/commande/list.php?leftmenu=orders&amp;search_status=-3&amp;billed=0&amp;contextpage=billableorders", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
+					$newmenu->add("/commande/list.php?leftmenu=orders&amp;search_status=-3&amp;billed=0&amp;contextpage=billableorders", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders', 0, '', '', '', img_picto('', 'order', 'class="paddingright pictofixedwidth"'));
 				}
 				//if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
 			}
@@ -1073,7 +1073,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			if (!empty($conf->supplier_invoice->enabled)) {
 				if (!empty($conf->global->SUPPLIER_MENU_ORDER_RECEIVED_INTO_INVOICE)) {
 					$langs->load("supplier");
-					$newmenu->add("/fourn/commande/list.php?leftmenu=orders&amp;search_status=5&amp;billed=0", $langs->trans("MenuOrdersSupplierToBill"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
+					$newmenu->add("/fourn/commande/list.php?leftmenu=orders&amp;search_status=5&amp;billed=0", $langs->trans("MenuOrdersSupplierToBill"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders', 0, '', '', '', img_picto('', 'supplier_order', 'class="paddingright pictofixedwidth"'));
 					//if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
 				}
 			}
@@ -1082,7 +1082,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			// Donations
 			if (!empty($conf->don->enabled)) {
 				$langs->load("donations");
-				$newmenu->add("/don/index.php?leftmenu=donations&amp;mainmenu=billing", $langs->trans("Donations"), 0, $user->rights->don->lire, '', $mainmenu, 'donations');
+				$newmenu->add("/don/index.php?leftmenu=donations&amp;mainmenu=billing", $langs->trans("Donations"), 0, $user->rights->don->lire, '', $mainmenu, 'donations', 0, '', '', '', img_picto('', 'donation', 'class="paddingright pictofixedwidth"'));
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "donations") {
 					$newmenu->add("/don/card.php?leftmenu=donations&amp;action=create", $langs->trans("NewDonation"), 1, $user->rights->don->creer);
 					$newmenu->add("/don/list.php?leftmenu=donations", $langs->trans("List"), 1, $user->rights->don->lire);
@@ -1092,7 +1092,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 			// Taxes and social contributions
 			if (!empty($conf->tax->enabled)) {
-				$newmenu->add("/compta/charges/index.php?leftmenu=tax&amp;mainmenu=billing", $langs->trans("MenuTaxesAndSpecialExpenses"), 0, $user->rights->tax->charges->lire, '', $mainmenu, 'tax');
+				$newmenu->add("/compta/charges/index.php?leftmenu=tax&amp;mainmenu=billing", $langs->trans("MenuTaxesAndSpecialExpenses"), 0, $user->rights->tax->charges->lire, '', $mainmenu, 'tax', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
 
 				$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("MenuSocialContributions"), 1, $user->rights->tax->charges->lire);
 				if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_social/i', $leftmenu)) {
@@ -1108,6 +1108,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_vat/i', $leftmenu)) {
 						$newmenu->add("/compta/tva/card.php?leftmenu=tax_vat&action=create", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
 						$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
+						$newmenu->add("/compta/tva/payments.php?mode=tvaonly&amp;leftmenu=tax_vat", $langs->trans("Payments"), 2, $user->rights->tax->charges->lire);
 						$newmenu->add("/compta/tva/index.php?leftmenu=tax_vat", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
 						$newmenu->add("/compta/tva/clients.php?leftmenu=tax_vat", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
 						$newmenu->add("/compta/tva/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
@@ -1141,7 +1142,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			// Salaries
 			if (!empty($conf->salaries->enabled)) {
 				$langs->load("salaries");
-				$newmenu->add("/salaries/list.php?leftmenu=tax_salary&amp;mainmenu=billing", $langs->trans("Salaries"), 0, $user->rights->salaries->read, '', $mainmenu, 'tax_salary');
+				$newmenu->add("/salaries/list.php?leftmenu=tax_salary&amp;mainmenu=billing", $langs->trans("Salaries"), 0, $user->rights->salaries->read, '', $mainmenu, 'tax_salary', 0, '', '', '', img_picto('', 'salary', 'class="paddingright pictofixedwidth"'));
 				if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_salary/i', $leftmenu)) {
 					$newmenu->add("/salaries/card.php?leftmenu=tax_salary&action=create", $langs->trans("NewPayment"), 1, $user->rights->salaries->write);
 					$newmenu->add("/salaries/list.php?leftmenu=tax_salary", $langs->trans("Payments"), 1, $user->rights->salaries->read);
@@ -1152,7 +1153,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			// Loan
 			if (!empty($conf->loan->enabled)) {
 				$langs->load("loan");
-				$newmenu->add("/loan/list.php?leftmenu=tax_loan&amp;mainmenu=billing", $langs->trans("Loans"), 0, $user->rights->loan->read, '', $mainmenu, 'tax_loan');
+				$newmenu->add("/loan/list.php?leftmenu=tax_loan&amp;mainmenu=billing", $langs->trans("Loans"), 0, $user->rights->loan->read, '', $mainmenu, 'tax_loan', 0, '', '', '', img_picto('', 'loan', 'class="paddingright pictofixedwidth"'));
 				if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_loan/i', $leftmenu)) {
 					$newmenu->add("/loan/card.php?leftmenu=tax_loan&action=create", $langs->trans("NewLoan"), 1, $user->rights->loan->write);
 					//$newmenu->add("/loan/payment/list.php?leftmenu=tax_loan",$langs->trans("Payments"),2,$user->rights->loan->read);
@@ -1162,7 +1163,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			// Various payment
 			if (!empty($conf->banque->enabled) && empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)) {
 				$langs->load("banks");
-				$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various&amp;mainmenu=billing", $langs->trans("MenuVariousPayment"), 0, $user->rights->banque->lire, '', $mainmenu, 'tax_various');
+				$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various&amp;mainmenu=billing", $langs->trans("MenuVariousPayment"), 0, $user->rights->banque->lire, '', $mainmenu, 'tax_various', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
 				if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_various/i', $leftmenu)) {
 					$newmenu->add("/compta/bank/various_payment/card.php?leftmenu=tax_various&action=create", $langs->trans("New"), 1, $user->rights->banque->modifier);
 					$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various", $langs->trans("List"), 1, $user->rights->banque->lire);
@@ -1656,7 +1657,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			if (!empty($conf->bom->enabled) || !empty($conf->mrp->enabled)) {
 				$langs->load("mrp");
 
-				$newmenu->add("", $langs->trans("MenuBOM"), 0, $user->rights->bom->read, '', $mainmenu, 'bom');
+				$newmenu->add("", $langs->trans("MenuBOM"), 0, $user->rights->bom->read, '', $mainmenu, 'bom', 0, '', '', '', img_picto('', 'bom', 'class="paddingrightonly pictofixedwidth"'));
 				$newmenu->add("/bom/bom_card.php?leftmenu=bom&amp;action=create", $langs->trans("NewBOM"), 1, $user->rights->bom->write, '', $mainmenu, 'bom');
 				$newmenu->add("/bom/bom_list.php?leftmenu=bom", $langs->trans("List"), 1, $user->rights->bom->read, '', $mainmenu, 'bom');
 			}
@@ -1664,7 +1665,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			if (!empty($conf->mrp->enabled)) {
 				$langs->load("mrp");
 
-				$newmenu->add("", $langs->trans("MenuMRP"), 0, $user->rights->mrp->read, '', $mainmenu, 'mo');
+				$newmenu->add("", $langs->trans("MenuMRP"), 0, $user->rights->mrp->read, '', $mainmenu, 'mo', 0, '', '', '', img_picto('', 'mrp', 'class="paddingrightonly pictofixedwidth"'));
 				$newmenu->add("/mrp/mo_card.php?leftmenu=mo&amp;action=create", $langs->trans("NewMO"), 1, $user->rights->mrp->write, '', $mainmenu, 'mo');
 				$newmenu->add("/mrp/mo_list.php?leftmenu=mo", $langs->trans("List"), 1, $user->rights->mrp->read, '', $mainmenu, 'mo');
 			}
@@ -1808,11 +1809,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		if ($mainmenu == 'tools') {
 			if (empty($user->socid)) { // limit to internal users
 				$langs->load("mails");
-				$newmenu->add("/admin/mails_templates.php?leftmenu=email_templates", $langs->trans("EMailTemplates"), 0, 1, '', $mainmenu, 'email_templates');
+				$newmenu->add("/admin/mails_templates.php?leftmenu=email_templates", $langs->trans("EMailTemplates"), 0, 1, '', $mainmenu, 'email_templates', 0, '', '', '', img_picto('', 'email', 'class="paddingright pictofixedwidth"'));
 			}
 
 			if (!empty($conf->mailing->enabled)) {
-				$newmenu->add("/comm/mailing/index.php?leftmenu=mailing", $langs->trans("EMailings"), 0, $user->rights->mailing->lire, '', $mainmenu, 'mailing');
+				$newmenu->add("/comm/mailing/index.php?leftmenu=mailing", $langs->trans("EMailings"), 0, $user->rights->mailing->lire, '', $mainmenu, 'mailing', 0, '', '', '', img_picto('', 'email', 'class="paddingright pictofixedwidth"'));
 				$newmenu->add("/comm/mailing/card.php?leftmenu=mailing&amp;action=create", $langs->trans("NewMailing"), 1, $user->rights->mailing->creer);
 				$newmenu->add("/comm/mailing/list.php?leftmenu=mailing", $langs->trans("List"), 1, $user->rights->mailing->lire);
 			}
@@ -1839,7 +1840,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				// Load translation files required by the page
 				$langs->loadLangs(array("members", "compta"));
 
-				$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members", $langs->trans("Members"), 0, $user->rights->adherent->lire, '', $mainmenu, 'members');
+				$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members", $langs->trans("Members"), 0, $user->rights->adherent->lire, '', $mainmenu, 'members', 0, '', '', '', img_picto('', 'member', 'class="paddingright pictofixedwidth"'));
 				$newmenu->add("/adherents/card.php?leftmenu=members&amp;action=create", $langs->trans("NewMember"), 1, $user->rights->adherent->creer);
 				$newmenu->add("/adherents/list.php?leftmenu=members", $langs->trans("List"), 1, $user->rights->adherent->lire);
 				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=-1", $langs->trans("MenuMembersToValidate"), 2, $user->rights->adherent->lire);
@@ -1889,7 +1890,6 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				//print $paramkey;
 				if (!empty($conf->global->$paramkey)) {
 					$link = "/ftp/index.php?idmenu=".$_SESSION["idmenu"]."&numero_ftp=".$i;
-
 					$newmenu->add($link, dol_trunc($conf->global->$paramkey, 24));
 				}
 				$i++;
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 1ab7778bb01..5ab8ff24f9f 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -198,8 +198,8 @@ class MenuManager
 					$submenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"), 1);
 					$submenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"), 1);
 
-					$submenu->add("/admin/boxes.php", $langs->trans("Boxes"), 1);
-					$submenu->add("/admin/delais.php", $langs->trans("Alerts"), 1);
+					$submenu->add("/admin/boxes.php?mainmenu=home", $langs->trans("Boxes"), 1);
+					$submenu->add("/admin/delais.php?mainmenu=home", $langs->trans("Alerts"), 1);
 					$submenu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"), 1);
 					$submenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"), 1);
 					$submenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"), 1);
@@ -340,8 +340,8 @@ class MenuManager
 			$this->menu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"), 1);
 			$this->menu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"), 1);
 
-			$this->menu->add("/admin/boxes.php", $langs->trans("Boxes"), 1);
-			$this->menu->add("/admin/delais.php", $langs->trans("Alerts"), 1);
+			$this->menu->add("/admin/boxes.php?mainmenu=home", $langs->trans("Boxes"), 1);
+			$this->menu->add("/admin/delais.php?mainmenu=home", $langs->trans("Alerts"), 1);
 			$this->menu->add("/admin/proxy.php?mainmenu=home", $langs->trans("Security"), 1);
 			$this->menu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"), 1);
 			$this->menu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"), 1);
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 510ec8ef55a..485b079d1cd 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -316,7 +316,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 	/**
 	 * @var array Minimum version of PHP required by module.
-	 * e.g.: PHP ≥ 5.4 = array(5, 4)
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
 	 */
 	public $phpmin;
 
@@ -353,15 +353,13 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Enables a module.
-	 * Inserts all informations into database
+	 * Inserts all informations into database.
 	 *
-	 * @param array  $array_sql SQL requests to be executed when enabling module
-	 * @param string $options   String with options when disabling module:
-	 *                          - 'noboxes' = Do not insert boxes -
-	 *                          'newboxdefonly' = For boxes, insert def of
-	 *                          boxes only and not boxes activation
-	 *
-	 * @return int                         1 if OK, 0 if KO
+	 * @param array  $array_sql 	SQL requests to be executed when enabling module
+	 * @param string $options   	String with options when disabling module:
+	 *                          	- 'noboxes' = Do not insert boxes
+	 *                          	- 'newboxdefonly' = For boxes, insert def of boxes only and not boxes activation
+	 * @return int                  1 if OK, 0 if KO
 	 */
 	protected function _init($array_sql, $options = '')
 	{
@@ -622,6 +620,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
+		$content='';
 		$pathoffile = $this->getDescLongReadmeFound();
 
 		if ($pathoffile)     // Mostly for external modules
@@ -1868,8 +1867,9 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 			$menu->mainmenu = isset($this->menu[$key]['mainmenu']) ? $this->menu[$key]['mainmenu'] : (isset($menu->fk_mainmenu) ? $menu->fk_mainmenu : '');
 			$menu->leftmenu = isset($this->menu[$key]['leftmenu']) ? $this->menu[$key]['leftmenu'] : '';
 			$menu->title = $this->menu[$key]['titre'];
+			$menu->prefix = isset($this->menu[$key]['prefix']) ? $this->menu[$key]['prefix'] : '';
 			$menu->url = $this->menu[$key]['url'];
-			$menu->langs = $this->menu[$key]['langs'];
+			$menu->langs = isset($this->menu[$key]['langs']) ? $this->menu[$key]['langs'] : '';
 			$menu->position = $this->menu[$key]['position'];
 			$menu->perms = $this->menu[$key]['perms'];
 			$menu->target = isset($this->menu[$key]['target']) ? $this->menu[$key]['target'] : '';
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index 3f18d536122..c09239a8d68 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -99,9 +99,9 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("BarCode"), $langs->transnoentities("BarCode"));
 		$tooltip .= $langs->trans("GenericMaskCodes3");
 		$tooltip .= '<strong>'.$langs->trans("Example").':</strong><br>';
-		$tooltip .= '020{000000000} (for internal use)<br>';
-		$tooltip .= '9771234{00000} (example of ISSN code with prefix 1234)<br>';
-		$tooltip .= '9791234{00000} (example of ISMN code with prefix 1234)<br>';
+		$tooltip .= '020{000000000}? (for internal use)<br>';
+		$tooltip .= '9771234{00000}? (example of ISSN code with prefix 1234)<br>';
+		$tooltip .= '9791234{00000}? (example of ISMN code with prefix 1234)<br>';
 		//$tooltip.=$langs->trans("GenericMaskCodes5");
 
 		// Mask parameter
@@ -140,7 +140,37 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 
 		return $examplebarcode;
 	}
+    /**
+     *  Return literal barcode type code from numerical rowid type of barcode
+     *
+	 *	@param	Database    $db         Database
+     *  @param  int  		$type       Type of barcode (EAN, ISBN, ...) as rowid
+     *  @return string
+     */
+    public function literalBarcodeType($db, $type = '')
+    {
+        global $conf;
+        $out = '';
 
+        $sql = "SELECT rowid, code, libelle as label";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
+        $sql .= " WHERE rowid = '".$db->escape($type)."'";
+        $sql .= " AND entity = ".((int) $conf->entity);
+        $result = $db->query($sql);
+        if ($result) {
+            $num = $db->num_rows($result);
+
+            if ($num > 0) {
+                $obj = $db->fetch_object($result);
+                $out .= $obj->label; //take the label corresponding to the type rowid in the database
+            }
+        }
+        else {
+            dol_print_error($db);
+        }
+
+        return $out;
+    }
 	/**
 	 * Return next value
 	 *
@@ -153,6 +183,11 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/barcode.lib.php'; // to be able to call function barcode_gen_ean_sum($ean)
+
+		if (empty($type)) {
+			$type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+		} //get barcode type configuration for products if $type not set
 
 		// TODO
 
@@ -171,7 +206,28 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		$now = dol_now();
 
 		$numFinal = get_next_value($db, $mask, 'product', $field, $where, '', $now);
-
+		//Begin barcode with key: for barcode with key (EAN13...) calculate and substitute the last  character (* or ?) used in the mask by the key
+		if ((substr($numFinal, -1)=='*') or (substr($numFinal, -1)=='?')) // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...)
+		{
+			$literaltype = '';
+			$literaltype = $this->literalBarcodeType($db, $type);//get literal_Barcode_Type
+			switch ($literaltype)
+			{
+				case 'EAN13': //EAN13 rowid = 2
+					if (strlen($numFinal)==13)// be sure that the mask length is correct for EAN13
+					{
+							$ean = substr($numFinal, 0, 12); //take first 12 digits
+							$eansum = barcode_gen_ean_sum($ean);
+							$ean .= $eansum; //substitute the las character by the key
+							$numFinal = $ean;
+					}
+					break;
+				// Other barcode cases with key could be written here
+				default:
+					break;
+			}
+		}
+		//End barcode with key
 		return  $numFinal;
 	}
 
diff --git a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
index f3ea817fa73..ee00a98b039 100644
--- a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
+++ b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
@@ -101,7 +101,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "companies", "bills", "products", "compta"));
 
-		$dir = $_dir."/".get_exdir($number, 0, 1, 0, $object, 'cheque').$number;
+		$dir = $_dir."/".get_exdir($number, 0, 1, 0, $object, 'checkdeposits');
 
 		if (!is_dir($dir))
 		{
diff --git a/htdocs/core/modules/cheque/modules_chequereceipts.php b/htdocs/core/modules/cheque/modules_chequereceipts.php
index 66b2f9f7d82..bc552aec070 100644
--- a/htdocs/core/modules/cheque/modules_chequereceipts.php
+++ b/htdocs/core/modules/cheque/modules_chequereceipts.php
@@ -142,14 +142,14 @@ abstract class ModeleChequeReceipts extends CommonDocGenerator
 		global $conf;
 
 		$type = 'chequereceipt';
-		$liste = array();
+		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste = getListOfModels($db, $type, $maxfilenamelength);
+		$list = getListOfModels($db, $type, $maxfilenamelength);
 		// TODO Remove this to use getListOfModels only
-		$liste = array('blochet'=>'blochet');
+		$list = array('blochet'=>'blochet');
 
-		return $liste;
+		return $list;
 	}
 }
 
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 0b99583e08e..f02f04728cd 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -47,6 +47,11 @@ class pdf_einstein extends ModelePDFCommandes
 	 */
 	public $db;
 
+	/**
+	 * @var int The environment ID when using a multicompany module
+	 */
+	public $entity;
+
 	/**
 	 * @var string model name
 	 */
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index d1492dbc5eb..3daa5288d7e 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -47,6 +47,11 @@ class pdf_eratosthene extends ModelePDFCommandes
 	 */
 	public $db;
 
+	/**
+	 * @var int The environment ID when using a multicompany module
+	 */
+	public $entity;
+
 	/**
 	 * @var string model name
 	 */
@@ -79,9 +84,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 	 */
 	public $version = 'dolibarr';
 
-	 /**
-	  * @var int page_largeur
-	  */
+	/**
+	 * @var int page_largeur
+	 */
 	public $page_largeur;
 
 	/**
@@ -121,7 +126,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 	public $emetteur;
 
 	/**
-	 * @var array of document table collumns
+	 * @var array of document table columns
 	 */
 	public $cols;
 
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index e28cd62efae..619dcdf84d3 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -55,6 +55,11 @@ class pdf_strato extends ModelePDFContract
 	 */
 	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
 	 */
@@ -131,6 +136,7 @@ class pdf_strato extends ModelePDFContract
 		$this->db = $db;
 		$this->name = 'strato';
 		$this->description = $langs->trans("StandardContractsTemplate");
+		$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';
@@ -340,13 +346,12 @@ class pdf_strato extends ModelePDFContract
 							$datere = $langs->trans("Unknown");
 						}
 
-						$txtpredefinedservice = '';
-						$txtpredefinedservice = $objectligne->product_label;
-						if ($objectligne->product_label)
-						{
-							$txtpredefinedservice .= ' - ';
-							$txtpredefinedservice .= $objectligne->product_label;
-						}
+                        $txtpredefinedservice = $objectligne->product_ref;
+                        if ($objectligne->product_label)
+                        {
+                        	$txtpredefinedservice .= ' - ';
+                        	$txtpredefinedservice .= $objectligne->product_label;
+                        }
 
 						$desc = dol_htmlentitiesbr($objectligne->desc, 1); // Desc (not empty for free lines)
 						$txt = '';
diff --git a/htdocs/core/modules/contract/modules_contract.php b/htdocs/core/modules/contract/modules_contract.php
index c259c247304..5e39dd7d587 100644
--- a/htdocs/core/modules/contract/modules_contract.php
+++ b/htdocs/core/modules/contract/modules_contract.php
@@ -57,12 +57,12 @@ abstract class ModelePDFContract extends CommonDocGenerator
 		global $conf;
 
 		$type = 'contract';
-		$liste = array();
+		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste = getListOfModels($db, $type, $maxfilenamelength);
+		$list = getListOfModels($db, $type, $maxfilenamelength);
 
-		return $liste;
+		return $list;
 	}
 }
 
diff --git a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
index d6376e6cd17..f6275386cff 100644
--- a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2014 Regis Houssin         <regis.houssin@inodbox.com>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
  * Copyright (C) 2008      Chiptronik
- * Copyright (C) 2011-2019 Philippe Grand        <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2021 Philippe Grand        <philippe.grand@atoo-net.com>
  * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2020      John BOTELLA
 
@@ -54,6 +54,11 @@ class pdf_storm extends ModelePDFDeliveryOrder
 	 */
 	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
 	 */
@@ -61,9 +66,9 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 	/**
 	 * @var array Minimum version of PHP required by module.
-	 * e.g.: PHP ≥ 5.5 = array(5, 5)
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
 	 */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
 	 * Dolibarr version of the loaded document
@@ -127,6 +132,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 		$this->db = $db;
 		$this->name = "Storm";
 		$this->description = $langs->trans("DocumentModelStorm");
+		$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';
diff --git a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
index 3b8baa107ad..41ed6b22554 100644
--- a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2014 Regis Houssin         <regis.houssin@inodbox.com>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
  * Copyright (C) 2008      Chiptronik
- * Copyright (C) 2011-2020 Philippe Grand        <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2021 Philippe Grand        <philippe.grand@atoo-net.com>
  * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
 
  * This program is free software; you can redistribute it and/or modify
@@ -53,6 +53,11 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	 */
 	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
 	 */
@@ -126,6 +131,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		$this->db = $db;
 		$this->name = "Typhon";
 		$this->description = $langs->trans("DocumentModelTyphon");
+		$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';
diff --git a/htdocs/core/modules/delivery/modules_delivery.php b/htdocs/core/modules/delivery/modules_delivery.php
index 80e2b092d42..a0d2da43494 100644
--- a/htdocs/core/modules/delivery/modules_delivery.php
+++ b/htdocs/core/modules/delivery/modules_delivery.php
@@ -55,12 +55,12 @@ abstract class ModelePDFDeliveryOrder extends CommonDocGenerator
 		global $conf;
 
 		$type = 'delivery';
-		$liste = array();
+		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste = getListOfModels($db, $type, $maxfilenamelength);
+		$list = getListOfModels($db, $type, $maxfilenamelength);
 
-		return $liste;
+		return $list;
 	}
 }
 
diff --git a/htdocs/core/modules/dons/modules_don.php b/htdocs/core/modules/dons/modules_don.php
index 73186354285..92982d91404 100644
--- a/htdocs/core/modules/dons/modules_don.php
+++ b/htdocs/core/modules/dons/modules_don.php
@@ -53,12 +53,12 @@ abstract class ModeleDon extends CommonDocGenerator
 		global $conf;
 
 		$type = 'donation';
-		$liste = array();
+		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste = getListOfModels($db, $type, $maxfilenamelength);
+		$list = getListOfModels($db, $type, $maxfilenamelength);
 
-		return $liste;
+		return $list;
 	}
 }
 
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 165e83a8e87..8441597a967 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -51,6 +51,11 @@ class pdf_espadon extends ModelePdfExpedition
 	 */
 	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
 	 */
@@ -122,6 +127,7 @@ class pdf_espadon extends ModelePdfExpedition
 		$this->db = $db;
 		$this->name = "espadon";
 		$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->type = 'pdf';
 		$formatarray = pdf_getFormat();
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index bad252bf799..144167e8912 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -52,6 +52,11 @@ class pdf_merou extends ModelePdfExpedition
 	 */
 	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
 	 */
@@ -123,6 +128,7 @@ class pdf_merou extends ModelePdfExpedition
 		$this->db = $db;
 		$this->name = "merou";
 		$this->description = $langs->trans("DocumentModelMerou");
+		$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';
 		$formatarray = pdf_getFormat();
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 6698495f983..62213127951 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -52,6 +52,11 @@ class pdf_rouget extends ModelePdfExpedition
 	 */
 	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
 	 */
@@ -123,6 +128,7 @@ class pdf_rouget extends ModelePdfExpedition
 		$this->db = $db;
 		$this->name = "rouget";
 		$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->type = 'pdf';
 		$formatarray = pdf_getFormat();
@@ -365,14 +371,15 @@ class pdf_rouget extends ModelePdfExpedition
 					$tab_top_alt = $tab_top;
 
 					$pdf->SetFont('', 'B', $default_font_size - 2);
-					$pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L');
 
-					$tab_top_alt = $pdf->GetY();
 					//$tab_top_alt += 1;
 
 					// Tracking number
 					if (!empty($object->tracking_number))
 					{
+						$pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L');
+						$tab_top_alt = $pdf->GetY();
+
 						$object->getUrlTrackingStatus($object->tracking_number);
 						if (!empty($object->tracking_url))
 						{
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index 176b09264d4..8495aba945d 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -59,6 +59,11 @@ class pdf_standard extends ModeleExpenseReport
 	 */
 	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
 	 */
@@ -133,6 +138,7 @@ class pdf_standard extends ModeleExpenseReport
 		$this->db = $db;
 		$this->name = "";
 		$this->description = $langs->trans('PDFStandardExpenseReports');
+		$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';
diff --git a/htdocs/core/modules/export/export_excel2007new.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php
similarity index 98%
rename from htdocs/core/modules/export/export_excel2007new.modules.php
rename to htdocs/core/modules/export/export_excel2007.modules.php
index eb111ebb985..b93a0a0c8de 100644
--- a/htdocs/core/modules/export/export_excel2007new.modules.php
+++ b/htdocs/core/modules/export/export_excel2007.modules.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *	\file       htdocs/core/modules/export/export_excel2007new.modules.php
+ *	\file       htdocs/core/modules/export/export_excel2007.modules.php
  *	\ingroup    export
  *	\brief      File of class to generate export file with Excel format
  */
@@ -32,7 +32,7 @@ use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 /**
  *	Class to build export files with Excel format
  */
-class ExportExcel2007new extends ModeleExports
+class ExportExcel2007 extends ModeleExports
 {
 	/**
 	 * @var string ID
@@ -79,7 +79,7 @@ class ExportExcel2007new extends ModeleExports
 		global $conf, $langs;
 		$this->db = $db;
 
-		$this->id = 'excel2007new'; // Same value then xxx in file name export_xxx.modules.php
+		$this->id = 'excel2007'; // Same value then xxx in file name export_xxx.modules.php
 		$this->label = 'Excel 2007'; // Label of driver
 		$this->desc = $langs->trans('Excel2007FormatDesc');
 		$this->extension = 'xlsx'; // Extension for generated file by this driver
@@ -199,7 +199,7 @@ class ExportExcel2007new extends ModeleExports
 		require_once DOL_DOCUMENT_ROOT.'/includes/Psr/autoloader.php';
 		require_once PHPEXCELNEW_PATH.'Spreadsheet.php';
 
-		if ($this->id == 'excel2007new')
+		if ($this->id == 'excel2007')
 		{
 			if (!class_exists('ZipArchive'))	// For Excel2007, PHPSpreadSheet may need ZipArchive
 			{
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 423aa5b79d1..0edcdec536b 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -80,9 +80,9 @@ class pdf_sponge extends ModelePDFFactures
 	 */
 	public $version = 'dolibarr';
 
-	 /**
-	  * @var int page_largeur
-	  */
+	/**
+	 * @var int page_largeur
+	 */
 	public $page_largeur;
 
 	/**
@@ -128,7 +128,7 @@ class pdf_sponge extends ModelePDFFactures
 
 
 	/**
-	 * @var array of document table collumns
+	 * @var array of document table columns
 	 */
 	public $cols;
 
diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php
index 775864eec52..03c65f3595c 100644
--- a/htdocs/core/modules/facture/modules_facture.php
+++ b/htdocs/core/modules/facture/modules_facture.php
@@ -60,12 +60,12 @@ abstract class ModelePDFFactures extends CommonDocGenerator
 		global $conf;
 
 		$type = 'invoice';
-		$liste = array();
+		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste = getListOfModels($db, $type, $maxfilenamelength);
+		$list = getListOfModels($db, $type, $maxfilenamelength);
 
-		return $liste;
+		return $list;
 	}
 }
 
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 622cd0b2250..844e468a69d 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -54,6 +54,11 @@ class pdf_soleil extends ModelePDFFicheinter
 	 */
 	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
 	 */
@@ -124,6 +129,7 @@ class pdf_soleil extends ModelePDFFicheinter
 		$this->db = $db;
 		$this->name = 'soleil';
 		$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';
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 36dc3ca8f13..e7386f0b7e4 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -618,6 +618,7 @@ class ImportCsv extends ModeleImports
 							if (!empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
 							{
 								// If test is "Must exist in a field@table or field@table:..."
+								$reg = array();
 								if (preg_match('/^(.+)@([^:]+)(:.+)?$/', $objimport->array_import_regex[0][$val], $reg))
 								{
 									$field = $reg[1];
@@ -844,7 +845,7 @@ class ImportCsv extends ModeleImports
 								$sqlend .= ', '.$user->id;
 							}
 							$sql = $sqlstart.$sqlend.')';
-							dol_syslog("import_csv.modules", LOG_DEBUG);
+							//dol_syslog("import_csv.modules", LOG_DEBUG);
 
 							// Run insert request
 							if ($sql)
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index c427e01a758..6c0bcc0f4b1 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -636,6 +636,7 @@ class ImportXlsx extends ModeleImports
 							// Test regexp
 							if (!empty($objimport->array_import_regex[0][$val]) && ($newval != '')) {
 								// If test is "Must exist in a field@table or field@table:..."
+								$reg = array();
 								if (preg_match('/^(.+)@([^:]+)(:.+)?$/', $objimport->array_import_regex[0][$val], $reg)) {
 									$field = $reg[1];
 									$table = $reg[2];
@@ -845,7 +846,7 @@ class ImportXlsx extends ModeleImports
 								$sqlend .= ', ' . $user->id;
 							}
 							$sql = $sqlstart . $sqlend . ')';
-							dol_syslog("import_xlsx.modules", LOG_DEBUG);
+							//dol_syslog("import_xlsx.modules", LOG_DEBUG);
 
 							// Run insert request
 							if ($sql) {
diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php
index a6de637b24f..0f4a04bcaf0 100644
--- a/htdocs/core/modules/member/modules_cards.php
+++ b/htdocs/core/modules/member/modules_cards.php
@@ -54,12 +54,12 @@ class ModelePDFCards
 		global $conf;
 
 		$type = 'member';
-		$liste = array();
+		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste = getListOfModels($db, $type, $maxfilenamelength);
+		$list = getListOfModels($db, $type, $maxfilenamelength);
 
-		return $liste;
+		return $list;
 	}
 }
 
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 811dd57544e..4ba6c61c5e3 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -66,7 +66,7 @@ class modAccounting extends DolibarrModules
 		$this->depends = array("modFacture", "modBanque", "modTax"); // List of modules id that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of modules id to disable if this one is disabled
 		$this->conflictwith = array("modComptabilite"); // List of modules are in conflict with this module
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$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->langfiles = array("accountancy", "compta");
 
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 1db3e2b7d50..ca2dac95b78 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -74,7 +74,7 @@ class modAdherent extends DolibarrModules
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array('modMailmanSpip'); // List of module class names as string this module is in conflict with
 		$this->langfiles = array("members", "companies");
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 
 		// Constants
 		$this->const = array();
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 559260a77c2..d5167dcd030 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -73,7 +73,7 @@ class modAgenda extends DolibarrModules
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->langfiles = array("companies");
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 
 		// Module parts
 		$this->module_parts = array();
@@ -221,6 +221,7 @@ class modAgenda extends DolibarrModules
 			'fk_menu'=>'r=0',
 			'type'=>'left',
 			'titre'=>'Actions',
+			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
 			'mainmenu'=>'agenda',
 			'url'=>'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda',
 			'langs'=>'agenda',
diff --git a/htdocs/core/modules/modApi.class.php b/htdocs/core/modules/modApi.class.php
index 32b16a74703..f578c9084c2 100644
--- a/htdocs/core/modules/modApi.class.php
+++ b/htdocs/core/modules/modApi.class.php
@@ -83,7 +83,7 @@ class modApi extends DolibarrModules
 		$this->depends = array(); // List of modules id that must be enabled if this module is enabled
 		$this->requiredby = array('modZapier'); // List of modules id to disable if this one is disabled
 		$this->conflictwith = array(); // List of modules id this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->langfiles = array("other");
 
 		// Constants
diff --git a/htdocs/core/modules/modAsset.class.php b/htdocs/core/modules/modAsset.class.php
index 50fe71ef390..505ed444f55 100644
--- a/htdocs/core/modules/modAsset.class.php
+++ b/htdocs/core/modules/modAsset.class.php
@@ -90,7 +90,7 @@ class modAsset extends DolibarrModules
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->langfiles = array("assets");
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(7, 0); // Minimum version of Dolibarr required by module
 		$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
 		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
diff --git a/htdocs/core/modules/modBarcode.class.php b/htdocs/core/modules/modBarcode.class.php
index 6a894972eb7..93c67f63b3c 100644
--- a/htdocs/core/modules/modBarcode.class.php
+++ b/htdocs/core/modules/modBarcode.class.php
@@ -93,30 +93,35 @@ class modBarcode extends DolibarrModules
 
 		// Main menu entries
 		$r = 0;
-		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-								'mainmenu'=>'tools',
-								'leftmenu'=>'barcodeprint',
-								'type'=>'left', // This is a Left menu entry
-								'titre'=>'BarCodePrintsheet',
-								'url'=>'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint',
-								'langs'=>'products', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-								'position'=>200,
-								'enabled'=>'$conf->barcode->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-								'perms'=>'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-								'target'=>'',
-								'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+		$this->menu[$r] = array(
+			'fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'mainmenu'=>'tools',
+			'leftmenu'=>'barcodeprint',
+			'type'=>'left', // This is a Left menu entry
+			'titre'=>'BarCodePrintsheet',
+			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
+			'url'=>'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint',
+			'langs'=>'products', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>200,
+			'enabled'=>'$conf->barcode->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+		);
 		$r++;
 
-		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-								'type'=>'left', // This is a Left menu entry
-								'titre'=>'MassBarcodeInit',
-								'url'=>'/barcode/codeinit.php?mainmenu=home&leftmenu=admintools',
-								'langs'=>'products', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-								'position'=>300,
-								'enabled'=>'$conf->barcode->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu)', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-								'perms'=>'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->creer_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-								'target'=>'',
-								'user'=>0); // 0=Menu for internal users, 1=external users, 2=both
+		$this->menu[$r] = array(
+			'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left', // This is a Left menu entry
+			'titre'=>'MassBarcodeInit',
+			'url'=>'/barcode/codeinit.php?mainmenu=home&leftmenu=admintools',
+			'langs'=>'products', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>300,
+			'enabled'=>'$conf->barcode->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu)', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->creer_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>0, // 0=Menu for internal users, 1=external users, 2=both
+		);
 		$r++;
 	}
 
@@ -135,14 +140,14 @@ class modBarcode extends DolibarrModules
 		$this->remove($options);
 
 		$sql = array(
-				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('EAN8', 'EAN8', 0, '1234567', __ENTITY__)", 'ignoreerror'=>1),
-				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('EAN13', 'EAN13', 0, '123456789012', __ENTITY__)", 'ignoreerror'=>1),
-				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('UPC', 'UPC', 0, '123456789012', __ENTITY__)", 'ignoreerror'=>1),
-				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('ISBN', 'ISBN', 0, '123456789', __ENTITY__)", 'ignoreerror'=>1),
-				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('C39', 'Code 39', 0, '1234567890', __ENTITY__)", 'ignoreerror'=>1),
-				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('C128', 'Code 128', 0, 'ABCD1234567890', __ENTITY__)", 'ignoreerror'=>1),
-				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('DATAMATRIX', 'Datamatrix', 0, '1234567xyz', __ENTITY__)", 'ignoreerror'=>1),
-				array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('QRCODE', 'Qr Code', 0, 'www.dolibarr.org', __ENTITY__)", 'ignoreerror'=>1)
+			array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('EAN8', 'EAN8', 0, '1234567', __ENTITY__)", 'ignoreerror'=>1),
+			array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('EAN13', 'EAN13', 0, '123456789012', __ENTITY__)", 'ignoreerror'=>1),
+			array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('UPC', 'UPC', 0, '123456789012', __ENTITY__)", 'ignoreerror'=>1),
+			array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('ISBN', 'ISBN', 0, '123456789', __ENTITY__)", 'ignoreerror'=>1),
+			array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('C39', 'Code 39', 0, '1234567890', __ENTITY__)", 'ignoreerror'=>1),
+			array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('C128', 'Code 128', 0, 'ABCD1234567890', __ENTITY__)", 'ignoreerror'=>1),
+			array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('DATAMATRIX', 'Datamatrix', 0, '1234567xyz', __ENTITY__)", 'ignoreerror'=>1),
+			array('sql'=>"INSERT INTO ".MAIN_DB_PREFIX."c_barcode_type (code, libelle, coder, example, entity) VALUES ('QRCODE', 'Qr Code', 0, 'www.dolibarr.org', __ENTITY__)", 'ignoreerror'=>1)
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index 6a3cd4767f7..e36827f2dee 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -47,7 +47,7 @@ class modBlockedLog extends DolibarrModules
 		// It is used to group modules in module setup page
 		$this->family = "base";
 		// Module position in the family on 2 digits ('01', '10', '20', ...)
-		$this->module_position = '75';
+		$this->module_position = '76';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Enable a log on some business events into a non reversible log. This module may be mandatory for some countries.";
@@ -124,18 +124,20 @@ class modBlockedLog extends DolibarrModules
 		// -----------------
 		$r = 0;
 		$this->menu[$r] = array(
-		'fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-		'mainmenu'=>'tools',
-		'leftmenu'=>'blockedlogbrowser',
-		'type'=>'left', // This is a Left menu entry
-		'titre'=>'BrowseBlockedLog',
-		'url'=>'/blockedlog/admin/blockedlog_list.php?mainmenu=tools&leftmenu=blockedlogbrowser',
-		'langs'=>'blockedlog', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		'position'=>200,
-		'enabled'=>'$conf->blockedlog->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-		'perms'=>'$user->rights->blockedlog->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-		'target'=>'',
-		'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+			'fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'mainmenu'=>'tools',
+			'leftmenu'=>'blockedlogbrowser',
+			'type'=>'left', // This is a Left menu entry
+			'titre'=>'BrowseBlockedLog',
+			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
+			'url'=>'/blockedlog/admin/blockedlog_list.php?mainmenu=tools&leftmenu=blockedlogbrowser',
+			'langs'=>'blockedlog', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>200,
+			'enabled'=>'$conf->blockedlog->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'$user->rights->blockedlog->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+		);
 		$r++;
 	}
 
diff --git a/htdocs/core/modules/modBom.class.php b/htdocs/core/modules/modBom.class.php
index 092ceb17d79..f79d353edc7 100644
--- a/htdocs/core/modules/modBom.class.php
+++ b/htdocs/core/modules/modBom.class.php
@@ -108,7 +108,7 @@ class modBom extends DolibarrModules
 		$this->requiredby = array('modMrp'); // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
 		$this->langfiles = array("mrp");
-		//$this->phpmin = array(5,4);					// Minimum version of PHP required by module
+		//$this->phpmin = array(5, 6));					// Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(9, 0); // Minimum version of Dolibarr required by module
 		$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
 		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
diff --git a/htdocs/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php
index e3368fb636f..ca9ffa87d53 100644
--- a/htdocs/core/modules/modCashDesk.class.php
+++ b/htdocs/core/modules/modCashDesk.class.php
@@ -66,7 +66,7 @@ class modCashDesk extends DolibarrModules
 		$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, 4); // Minimum version of PHP required by module
+		$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')
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index ac4d26725bc..f257c6e3132 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -271,7 +271,7 @@ class modCommande extends DolibarrModules
 
 		$r++;
 		$this->import_code[$r] = 'commande_'.$r;
-		$this->import_label[$r] = 'Sales Orders';
+		$this->import_label[$r] = 'CustomersOrders';
 		$this->import_icon[$r] = $this->picto;
 		$this->import_entities_array[$r] = [];
 		$this->import_tables_array[$r] = ['c' => MAIN_DB_PREFIX.'commande', 'extra' => MAIN_DB_PREFIX.'commande_extrafields'];
@@ -357,7 +357,7 @@ class modCommande extends DolibarrModules
 		//Import CPV Lines
 		$r++;
 		$this->import_code[$r] = 'commande_lines_'.$r;
-		$this->import_label[$r] = 'Order Details';
+		$this->import_label[$r] = 'OrderLine';
 		$this->import_icon[$r] = $this->picto;
 		$this->import_entities_array[$r] = [];
 		$this->import_tables_array[$r] = ['cd' => MAIN_DB_PREFIX.'commandedet', 'extra' => MAIN_DB_PREFIX.'commandedet_extrafields'];
diff --git a/htdocs/core/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php
index d83edc6cf96..847200adc4f 100644
--- a/htdocs/core/modules/modECM.class.php
+++ b/htdocs/core/modules/modECM.class.php
@@ -123,59 +123,68 @@ class modECM extends DolibarrModules
 		$r = 0;
 
 		// Top menu
-		$this->menu[$r] = array('fk_menu'=>0,
-							  'type'=>'top',
-							  'titre'=>'MenuECM',
-							  'mainmenu'=>'ecm',
-							  'url'=>'/ecm/index.php',
-							  'langs'=>'ecm',
-							  'position'=>82,
-							  'perms'=>'$user->rights->ecm->read || $user->rights->ecm->upload || $user->rights->ecm->setup',
-							  'enabled'=>'$conf->ecm->enabled',
-							  'target'=>'',
-							  'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+		$this->menu[$r] = array(
+			'fk_menu'=>0,
+			'type'=>'top',
+			'titre'=>'MenuECM',
+			'mainmenu'=>'ecm',
+			'url'=>'/ecm/index.php',
+			'langs'=>'ecm',
+			'position'=>82,
+			'perms'=>'$user->rights->ecm->read || $user->rights->ecm->upload || $user->rights->ecm->setup',
+			'enabled'=>'$conf->ecm->enabled',
+			'target'=>'',
+			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+		);
 		$r++;
 
 		// Left menu linked to top menu
-		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=ecm',
-							  'type'=>'left',
-							  'titre'=>'ECMArea',
-							  'mainmenu'=>'ecm',
-							  'leftmenu'=>'ecm',
-							  'url'=>'/ecm/index.php?mainmenu=ecm&leftmenu=ecm',
-							  'langs'=>'ecm',
-							  'position'=>101,
-							  'perms'=>'$user->rights->ecm->read || $user->rights->ecm->upload',
-							  'enabled'=>'$user->rights->ecm->read || $user->rights->ecm->upload',
-							  'target'=>'',
-							  'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+		$this->menu[$r] = array(
+			'fk_menu'=>'fk_mainmenu=ecm',
+			'type'=>'left',
+			'titre'=>'ECMArea',
+			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
+			'mainmenu'=>'ecm',
+			'leftmenu'=>'ecm',
+			'url'=>'/ecm/index.php?mainmenu=ecm&leftmenu=ecm',
+			'langs'=>'ecm',
+			'position'=>101,
+			'perms'=>'$user->rights->ecm->read || $user->rights->ecm->upload',
+			'enabled'=>'$user->rights->ecm->read || $user->rights->ecm->upload',
+			'target'=>'',
+			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+		);
 		$r++;
 
-		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=ecm,fk_leftmenu=ecm',
-							  'type'=>'left',
-							  'titre'=>'ECMSectionsManual',
-							  'mainmenu'=>'ecm',
-							  'leftmenu'=>'ecm_manual',
-							  'url'=>'/ecm/index.php?action=file_manager&mainmenu=ecm&leftmenu=ecm',
-							  'langs'=>'ecm',
-							  'position'=>102,
-							  'perms'=>'$user->rights->ecm->read || $user->rights->ecm->upload',
-							  'enabled'=>'$user->rights->ecm->read || $user->rights->ecm->upload',
-							  'target'=>'',
-							  'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+		$this->menu[$r] = array(
+			'fk_menu'=>'fk_mainmenu=ecm,fk_leftmenu=ecm',
+			'type'=>'left',
+			'titre'=>'ECMSectionsManual',
+			'mainmenu'=>'ecm',
+			'leftmenu'=>'ecm_manual',
+			'url'=>'/ecm/index.php?action=file_manager&mainmenu=ecm&leftmenu=ecm',
+			'langs'=>'ecm',
+			'position'=>102,
+			'perms'=>'$user->rights->ecm->read || $user->rights->ecm->upload',
+			'enabled'=>'$user->rights->ecm->read || $user->rights->ecm->upload',
+			'target'=>'',
+			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+		);
 		$r++;
 
-		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=ecm,fk_leftmenu=ecm',
-							  'type'=>'left',
-							  'titre'=>'ECMSectionsAuto',
-							  'mainmenu'=>'ecm',
-							  'url'=>'/ecm/index_auto.php?action=file_manager&mainmenu=ecm&leftmenu=ecm',
-							  'langs'=>'ecm',
-							  'position'=>103,
-							  'perms'=>'$user->rights->ecm->read || $user->rights->ecm->upload',
-							  'enabled'=>'($user->rights->ecm->read || $user->rights->ecm->upload) && ! empty($conf->global->ECM_AUTO_TREE_ENABLED)',
-							  'target'=>'',
-							  'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+		$this->menu[$r] = array(
+			'fk_menu'=>'fk_mainmenu=ecm,fk_leftmenu=ecm',
+			'type'=>'left',
+			'titre'=>'ECMSectionsAuto',
+			'mainmenu'=>'ecm',
+			'url'=>'/ecm/index_auto.php?action=file_manager&mainmenu=ecm&leftmenu=ecm',
+			'langs'=>'ecm',
+			'position'=>103,
+			'perms'=>'$user->rights->ecm->read || $user->rights->ecm->upload',
+			'enabled'=>'($user->rights->ecm->read || $user->rights->ecm->upload) && ! empty($conf->global->ECM_AUTO_TREE_ENABLED)',
+			'target'=>'',
+			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+		);
 		$r++;
 	}
 }
diff --git a/htdocs/core/modules/modEmailCollector.class.php b/htdocs/core/modules/modEmailCollector.class.php
index f71932c93b9..ac4b55011c9 100644
--- a/htdocs/core/modules/modEmailCollector.class.php
+++ b/htdocs/core/modules/modEmailCollector.class.php
@@ -91,7 +91,7 @@ class modEmailCollector extends DolibarrModules
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->langfiles = array("admin");
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(7, 0); // Minimum version of Dolibarr required by module
 		$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
 		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
index befafbc6767..2d0036faef9 100644
--- a/htdocs/core/modules/modExpenseReport.class.php
+++ b/htdocs/core/modules/modExpenseReport.class.php
@@ -65,7 +65,7 @@ class modExpenseReport extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		// $this->conflictwith = array("modDeplacement"); // Deactivate for access on old information
 		$this->requiredby = array(); // List of modules id to disable if this one is disabled
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3, 7); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("companies", "trips");
 
diff --git a/htdocs/core/modules/modGeoIPMaxmind.class.php b/htdocs/core/modules/modGeoIPMaxmind.class.php
index 10515a78449..06438eefab8 100644
--- a/htdocs/core/modules/modGeoIPMaxmind.class.php
+++ b/htdocs/core/modules/modGeoIPMaxmind.class.php
@@ -69,7 +69,7 @@ class modGeoIPMaxmind extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4);
+		$this->phpmin = array(5, 6);
 		$this->phpmax = array();
 		$this->need_dolibarr_version = array(2, 7, -1); // Minimum version of Dolibarr required by module
 		$this->need_javascript_ajax = 1;
diff --git a/htdocs/core/modules/modGravatar.class.php b/htdocs/core/modules/modGravatar.class.php
index 5aa0c2de5c6..a7d8899b0c2 100644
--- a/htdocs/core/modules/modGravatar.class.php
+++ b/htdocs/core/modules/modGravatar.class.php
@@ -77,7 +77,7 @@ class modGravatar extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(2, 7); // Minimum version of Dolibarr required by module
 		$this->langfiles = array();
 
diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index ad36253fe22..edaa872a369 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -71,7 +71,7 @@ class modHRM extends DolibarrModules
 		$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->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->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->langfiles = array("hrm");
 
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 6c6eaba69e0..79a4280017c 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -87,7 +87,7 @@ class modHoliday extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("holiday");
 
diff --git a/htdocs/core/modules/modImport.class.php b/htdocs/core/modules/modImport.class.php
index 094e4a87aca..d2a636e2ca6 100644
--- a/htdocs/core/modules/modImport.class.php
+++ b/htdocs/core/modules/modImport.class.php
@@ -64,7 +64,7 @@ class modImport extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module - Need auto_detect_line_endings php option to solve MAC pbs.
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module - Need auto_detect_line_endings php option to solve MAC pbs.
 		$this->phpmax = array();
 		$this->need_dolibarr_version = array(2, 7, -1); // Minimum version of Dolibarr required by module
 		$this->need_javascript_ajax = 1;
diff --git a/htdocs/core/modules/modIncoterm.class.php b/htdocs/core/modules/modIncoterm.class.php
index 70e6c738801..e33dbdd8236 100644
--- a/htdocs/core/modules/modIncoterm.class.php
+++ b/htdocs/core/modules/modIncoterm.class.php
@@ -68,7 +68,7 @@ class modIncoterm extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("incoterm");
 
diff --git a/htdocs/core/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php
index 88e044f0444..58e735666ab 100644
--- a/htdocs/core/modules/modLabel.class.php
+++ b/htdocs/core/modules/modLabel.class.php
@@ -61,7 +61,7 @@ class modLabel extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 
 		// Config pages
 		// $this->config_page_url = array("label.php");
diff --git a/htdocs/core/modules/modLdap.class.php b/htdocs/core/modules/modLdap.class.php
index f6004f18410..5f4860d0149 100644
--- a/htdocs/core/modules/modLdap.class.php
+++ b/htdocs/core/modules/modLdap.class.php
@@ -67,7 +67,7 @@ class modLdap extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 
 		// Constants
 		$this->const = array(
diff --git a/htdocs/core/modules/modLoan.class.php b/htdocs/core/modules/modLoan.class.php
index c29658ae0a7..d45987e840d 100644
--- a/htdocs/core/modules/modLoan.class.php
+++ b/htdocs/core/modules/modLoan.class.php
@@ -67,7 +67,7 @@ class modLoan extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->langfiles = array("loan");
 
 		// Constants
diff --git a/htdocs/core/modules/modMailing.class.php b/htdocs/core/modules/modMailing.class.php
index 22cc75689a5..1db638e782f 100644
--- a/htdocs/core/modules/modMailing.class.php
+++ b/htdocs/core/modules/modMailing.class.php
@@ -66,7 +66,7 @@ class modMailing extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->langfiles = array("mails");
 
 		// Config pages
@@ -74,6 +74,14 @@ class modMailing extends DolibarrModules
 
 		// Constants
 		$this->const = array();
+		$r = 0;
+
+		$this->const[$r][0] = "MAILING_CONTACT_DEFAULT_BULK_STATUS";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "0";
+		$this->const[$r][3] = 'Default black list mailing';
+		$this->const[$r][4] = 0;
+		$r++;
 
 		// Boxes
 		$this->boxes = array();
diff --git a/htdocs/core/modules/modMailmanSpip.class.php b/htdocs/core/modules/modMailmanSpip.class.php
index f8a74072bdd..bfd2e25493a 100644
--- a/htdocs/core/modules/modMailmanSpip.class.php
+++ b/htdocs/core/modules/modMailmanSpip.class.php
@@ -66,7 +66,7 @@ class modMailmanSpip extends DolibarrModules
 		$this->depends = array('modAdherent'); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 
 		// Config pages
 		$this->config_page_url = array('mailman.php');
diff --git a/htdocs/core/modules/modMargin.class.php b/htdocs/core/modules/modMargin.class.php
index 3051b68f570..185a86a86aa 100644
--- a/htdocs/core/modules/modMargin.class.php
+++ b/htdocs/core/modules/modMargin.class.php
@@ -72,7 +72,7 @@ class modMargin extends DolibarrModules
 		$this->depends = array("modPropale", "modProduct"); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3, 2); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("margins");
 
@@ -104,18 +104,20 @@ class modMargin extends DolibarrModules
 
 		// left menu entry
 		$this->menu[$r] = array(
-				'fk_menu'=>'fk_mainmenu=billing', // Put 0 if this is a top menu
-				'type'=>'left', // This is a Top menu entry
-				'titre'=>'Margins',
-				'mainmenu'=>'billing',
-				'leftmenu'=>'margins',
-				'url'=>'/margin/index.php',
-				'langs'=>'margins', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-				'position'=>100,
-				'enabled'=>'$conf->margin->enabled', // Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled.
-				'perms'=>'$user->rights->margins->liretous', // Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules
-				'target'=>'',
-				'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+			'fk_menu'=>'fk_mainmenu=billing', // Put 0 if this is a top menu
+			'type'=>'left', // This is a Top menu entry
+			'titre'=>'Margins',
+			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
+			'mainmenu'=>'billing',
+			'leftmenu'=>'margins',
+			'url'=>'/margin/index.php',
+			'langs'=>'margins', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>100,
+			'enabled'=>'$conf->margin->enabled', // Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled.
+			'perms'=>'$user->rights->margins->liretous', // Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+		);
 		$r++;
 
 		// Permissions
diff --git a/htdocs/core/modules/modMrp.class.php b/htdocs/core/modules/modMrp.class.php
index 012bb2d576a..46090c4c5d5 100644
--- a/htdocs/core/modules/modMrp.class.php
+++ b/htdocs/core/modules/modMrp.class.php
@@ -122,7 +122,7 @@ class modMrp extends DolibarrModules
 		$this->requiredby = array(); // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
 		$this->langfiles = array("mrp");
-		$this->phpmin = array(5, 5); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(8, 0); // Minimum version of Dolibarr required by module
 		$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
 		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
diff --git a/htdocs/core/modules/modMultiCurrency.class.php b/htdocs/core/modules/modMultiCurrency.class.php
index 605276dee0e..e20c5c77f9d 100644
--- a/htdocs/core/modules/modMultiCurrency.class.php
+++ b/htdocs/core/modules/modMultiCurrency.class.php
@@ -88,7 +88,7 @@ class modMultiCurrency extends DolibarrModules
 		$this->depends = array(); // List of modules id that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of modules id to disable if this one is disabled
 		$this->conflictwith = array(); // List of modules id this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("multicurrency");
 
diff --git a/htdocs/core/modules/modNotification.class.php b/htdocs/core/modules/modNotification.class.php
index dbc355ce53e..f9191ce3c8d 100644
--- a/htdocs/core/modules/modNotification.class.php
+++ b/htdocs/core/modules/modNotification.class.php
@@ -63,7 +63,7 @@ class modNotification extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->langfiles = array("mails");
 
 		// Config pages
diff --git a/htdocs/core/modules/modOauth.class.php b/htdocs/core/modules/modOauth.class.php
index 48c31b15d24..394d1e00655 100644
--- a/htdocs/core/modules/modOauth.class.php
+++ b/htdocs/core/modules/modOauth.class.php
@@ -71,7 +71,7 @@ class modOauth extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module                    // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module                    // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3, 7, -2); // Minimum version of Dolibarr required by module
 		$this->conflictwith = array();
 		$this->langfiles = array("oauth");
diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php
index 623c6d7c43e..2c01672ac42 100644
--- a/htdocs/core/modules/modOpenSurvey.class.php
+++ b/htdocs/core/modules/modOpenSurvey.class.php
@@ -76,7 +76,7 @@ class modOpenSurvey extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3, 4, 0); // Minimum version of Dolibarr required by module
 
 		// Constants
@@ -126,6 +126,7 @@ class modOpenSurvey extends DolibarrModules
 			'fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'type'=>'left',
 			'titre'=>'Survey',
+			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
 			'mainmenu'=>'tools',
 			'leftmenu'=>'opensurvey',
 			'url'=>'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey',
diff --git a/htdocs/core/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php
index a5cda052656..1dfe76f471a 100644
--- a/htdocs/core/modules/modPaybox.class.php
+++ b/htdocs/core/modules/modPaybox.class.php
@@ -73,7 +73,7 @@ class modPayBox extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(2, 6); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("paybox");
 
diff --git a/htdocs/core/modules/modPaymentByBankTransfer.class.php b/htdocs/core/modules/modPaymentByBankTransfer.class.php
index 0eab52fcdec..5704badf854 100644
--- a/htdocs/core/modules/modPaymentByBankTransfer.class.php
+++ b/htdocs/core/modules/modPaymentByBankTransfer.class.php
@@ -68,7 +68,7 @@ class modPaymentByBankTransfer extends DolibarrModules
 		$this->depends = array("modFournisseur", "modBanque"); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 
 		// Config pages
 		$this->config_page_url = array("paymentbybanktransfer.php");
diff --git a/htdocs/core/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php
index 15a92020062..cdf25d24359 100644
--- a/htdocs/core/modules/modPaypal.class.php
+++ b/htdocs/core/modules/modPaypal.class.php
@@ -74,7 +74,7 @@ class modPaypal extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array('modPaypalPlus'); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("paypal");
 
diff --git a/htdocs/core/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php
index 4ffa8358a06..4bee933376f 100644
--- a/htdocs/core/modules/modPrelevement.class.php
+++ b/htdocs/core/modules/modPrelevement.class.php
@@ -67,7 +67,7 @@ class modPrelevement extends DolibarrModules
 		$this->depends = array("modFacture", "modBanque"); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 
 		// Config pages
 		$this->config_page_url = array("prelevement.php");
diff --git a/htdocs/core/modules/modPrinting.class.php b/htdocs/core/modules/modPrinting.class.php
index b918a8b1158..373ca131d2b 100644
--- a/htdocs/core/modules/modPrinting.class.php
+++ b/htdocs/core/modules/modPrinting.class.php
@@ -70,7 +70,7 @@ class modPrinting extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3, 7, -2); // Minimum version of Dolibarr required by module
 		$this->conflictwith = array();
 		$this->langfiles = array("printing");
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index f92d9b30890..27d44160949 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -70,7 +70,7 @@ class modProduct extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array("modStock", "modBarcode", "modProductBatch", "modVariants"); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 
 		// Config pages
 		$this->config_page_url = array("product.php@product");
diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php
index 92bfb9b66a5..e82bdbbd638 100644
--- a/htdocs/core/modules/modProductBatch.class.php
+++ b/htdocs/core/modules/modProductBatch.class.php
@@ -72,7 +72,7 @@ class modProductBatch extends DolibarrModules
 		$this->depends = array("modProduct", "modStock", "modExpedition", "modFournisseur"); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("productbatch");
 
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index ff2edd3c787..7f2e695b8a4 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -68,7 +68,7 @@ class modProjet extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->langfiles = array('projects');
 
 		// Constants
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index c0ffa6f0811..bb4ba6c1744 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -69,7 +69,7 @@ class modPropale extends DolibarrModules
 		$this->depends = array("modSociete"); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->config_page_url = array("propal.php");
 		$this->langfiles = array("propal", "bills", "companies", "deliveries", "products");
 
diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php
index 7143dd0d614..fe95a89d9ce 100644
--- a/htdocs/core/modules/modReceiptPrinter.class.php
+++ b/htdocs/core/modules/modReceiptPrinter.class.php
@@ -71,7 +71,7 @@ class modReceiptPrinter extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3, 9, -2); // Minimum version of Dolibarr required by module
 		$this->conflictwith = array();
 		$this->langfiles = array("receiptprinter");
diff --git a/htdocs/core/modules/modRecruitment.class.php b/htdocs/core/modules/modRecruitment.class.php
index 8e282a9513d..03f2ea2668e 100644
--- a/htdocs/core/modules/modRecruitment.class.php
+++ b/htdocs/core/modules/modRecruitment.class.php
@@ -122,7 +122,7 @@ class modRecruitment extends DolibarrModules
 		$this->requiredby = array(); // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
 		$this->langfiles = array("recruitment");
-		$this->phpmin = array(5, 5); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(11, -3); // Minimum version of Dolibarr required by module
 		$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'...)
@@ -270,6 +270,7 @@ class modRecruitment extends DolibarrModules
 			'fk_menu'=>'fk_mainmenu=hrm', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'type'=>'left', // This is a Top menu entry
 			'titre'=>'Recruitment',
+			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
 			'mainmenu'=>'hrm',
 			'leftmenu'=>'recruitmentjobposition',
 			'url'=>'/recruitment/recruitmentindex.php',
diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index 0d1353076ec..7a72d3967e0 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -95,7 +95,7 @@ class modResource extends DolibarrModules
 		// List of modules id to disable if this one is disabled
 		$this->requiredby = array('modPlace');
 		// Minimum version of PHP required by module
-		$this->phpmin = array(5, 4);
+		$this->phpmin = array(5, 6);
 
 		$this->langfiles = array("resource"); // langfiles@resource
 		// Constants
@@ -188,6 +188,7 @@ class modResource extends DolibarrModules
 			'fk_menu'=>'fk_mainmenu=tools',
 			'type'=>'left',
 			'titre'=> 'MenuResourceIndex',
+			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
 			'mainmenu'=>'tools',
 			'leftmenu'=> 'resource',
 			'url'=> '/resource/list.php',
diff --git a/htdocs/core/modules/modSalaries.class.php b/htdocs/core/modules/modSalaries.class.php
index 23c892333d8..131b0f2945f 100644
--- a/htdocs/core/modules/modSalaries.class.php
+++ b/htdocs/core/modules/modSalaries.class.php
@@ -75,7 +75,7 @@ class modSalaries extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->langfiles = array("salaries", "bills");
 
 		// Constants
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index b4dd93ff3e0..66a8dc76691 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -68,7 +68,7 @@ class modService extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 
 		// Config pages
 		$this->config_page_url = array("product.php@product");
diff --git a/htdocs/core/modules/modSocialNetworks.class.php b/htdocs/core/modules/modSocialNetworks.class.php
index bf7573a912b..368634083ee 100644
--- a/htdocs/core/modules/modSocialNetworks.class.php
+++ b/htdocs/core/modules/modSocialNetworks.class.php
@@ -69,7 +69,7 @@ class modSocialNetworks extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->langfiles = array();
 
 		// Constants
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 1bb0c61b83e..2d32ae3f0c4 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -70,7 +70,7 @@ class modSociete extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array("modExpedition", "modFacture", "modFournisseur", "modFicheinter", "modPropale", "modContrat", "modCommande"); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->langfiles = array("companies", 'bills', "compta", "admin", "banks");
 
 		// Constants
@@ -197,15 +197,25 @@ class modSociete extends DolibarrModules
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'export';
 
-		// 262 : Resteindre l'acces des commerciaux
+		// 262 : Restrict access to sales representative
 		$r++;
 		$this->rights[$r][0] = 262;
-		$this->rights[$r][1] = 'Read all third parties by internal users (otherwise only if commercial contact). Not effective for external users (limited to themselves).';
+		$this->rights[$r][1] = 'Read all third parties (and their objects) by internal users (otherwise only if commercial contact). Not effective for external users (limited to themselves).';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'client';
 		$this->rights[$r][5] = 'voir';
 
+		/*
+		$r++;
+		$this->rights[$r][0] = 263;
+		$this->rights[$r][1] = 'Read all third parties (without their objects) by internal users (otherwise only if commercial contact). Not effective for external users (limited to themselves).';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'client';
+		$this->rights[$r][5] = 'readallthirdparties_advance';
+		*/
+
 		$r++;
 		$this->rights[$r][0] = 281; // id de la permission
 		$this->rights[$r][1] = 'Read contacts'; // libelle de la permission
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index c15f041d21d..0b390b55dc2 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -69,7 +69,7 @@ class modStock extends DolibarrModules
 		$this->depends = array("modProduct"); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array("modProductBatch"); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->langfiles = array("stocks");
 
 		// Constants
@@ -254,7 +254,7 @@ class modStock extends DolibarrModules
 		$this->export_sql_end[$r] .= ' AND e.entity IN ('.getEntity('stock').')';
 
 		// Export stock including batch number
-		if ($conf->productbatch->enabled)
+		if (!empty($conf->productbatch->enabled))
 		{
 			$langs->load("productbatch");
 
@@ -327,7 +327,7 @@ class modStock extends DolibarrModules
 			'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'
 		);	// We define here only fields that use another icon that the one defined into export_icon
-		if ($conf->productbatch->enabled)
+		if (!empty($conf->productbatch->enabled))
 		{
 			$this->export_fields_array[$r]['sm.batch'] = 'Batch';
 			$this->export_TypeFields_array[$r]['sm.batch'] = 'Text';
diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index 4d95a6329ba..a207e0ef03c 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -72,7 +72,7 @@ class modStripe extends DolibarrModules
 		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of modules id that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of modules id to disable if this one is disabled
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(5, 0); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("stripe");
 
@@ -112,6 +112,7 @@ class modStripe extends DolibarrModules
 			'fk_menu'=>'fk_mainmenu=bank',
 			'type'=>'left',
 			'titre'=>'StripeAccount',
+			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
 			'mainmenu'=>'bank',
 			'leftmenu'=>'stripe',
 			'url' => '',
diff --git a/htdocs/core/modules/modSupplierProposal.class.php b/htdocs/core/modules/modSupplierProposal.class.php
index 6074966b4b1..9fe6df1ae1f 100644
--- a/htdocs/core/modules/modSupplierProposal.class.php
+++ b/htdocs/core/modules/modSupplierProposal.class.php
@@ -70,7 +70,7 @@ class modSupplierProposal extends DolibarrModules
 		$this->depends = array('modFournisseur'); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->langfiles = array("supplier_proposal");
 
 		// Constants
diff --git a/htdocs/core/modules/modSyslog.class.php b/htdocs/core/modules/modSyslog.class.php
index 01079310e4b..d003108726e 100644
--- a/htdocs/core/modules/modSyslog.class.php
+++ b/htdocs/core/modules/modSyslog.class.php
@@ -71,7 +71,7 @@ class modSyslog extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 
 		// Constants
 		$this->const = array();
diff --git a/htdocs/core/modules/modTakePos.class.php b/htdocs/core/modules/modTakePos.class.php
index e8162ebf570..8a3d4a73776 100644
--- a/htdocs/core/modules/modTakePos.class.php
+++ b/htdocs/core/modules/modTakePos.class.php
@@ -102,7 +102,7 @@ class modTakePos extends DolibarrModules
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->langfiles = array("cashdesk");
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(4, 0); // Minimum version of Dolibarr required by module
 		$this->warnings_activation = array('FR'=>'WarningNoteModulePOSForFrenchLaw'); // Warning to show when we activate module. array('always'='text') or array('FR'='text')
 		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
diff --git a/htdocs/core/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php
index 3e2a62e099a..bf064d743f8 100644
--- a/htdocs/core/modules/modTax.class.php
+++ b/htdocs/core/modules/modTax.class.php
@@ -71,7 +71,7 @@ class modTax extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->langfiles = array("compta", "bills");
 
 		// Constants
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index 448d1eb694b..2d7a6c7c4e6 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -96,7 +96,7 @@ class modTicket extends DolibarrModules
 		$this->depends = array('modAgenda'); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->langfiles = array("ticket");
 
 		// Constants
@@ -177,6 +177,7 @@ class modTicket extends DolibarrModules
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'manage';
 
+		/* Seems not used and in conflict with societe->client->voir (see all thirdparties)
 		$r++;
 		$this->rights[$r][0] = 56005; // id de la permission
 		$this->rights[$r][1] = 'See all tickets, even if not assigned to (not effective for external users, always restricted to the thirdpardy they depends on)'; // libelle de la permission
@@ -184,6 +185,7 @@ class modTicket extends DolibarrModules
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'view';
 		$this->rights[$r][5] = 'all';
+		*/
 
 		// Main menu entries
 		$this->menus = array(); // List of menus to add
@@ -206,6 +208,7 @@ class modTicket extends DolibarrModules
 		$this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket',
 			'type' => 'left',
 			'titre' => 'Ticket',
+			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth"'),
 			'mainmenu' => 'ticket',
 			'leftmenu' => 'ticket',
 			'url' => '/ticket/index.php',
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index 4b397df65e4..df376a6ee61 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -68,7 +68,7 @@ class modUser extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->langfiles = array("main", "users", "companies", "members", "salaries", "hrm");
 		$this->always_enabled = true; // Can't be disabled
 
@@ -78,7 +78,8 @@ class modUser extends DolibarrModules
 		// Boxes
 		$this->boxes = array(
 			0=>array('file'=>'box_lastlogin.php', 'enabledbydefaulton'=>'Home'),
-			1=>array('file'=>'box_birthdays.php', 'enabledbydefaulton'=>'Home')
+			1=>array('file'=>'box_birthdays.php', 'enabledbydefaulton'=>'Home'),
+			2=>array('file'=>'box_dolibarr_state_board.php', 'enabledbydefaulton'=>'Home')
 		);
 
 		// Permissions
diff --git a/htdocs/core/modules/modVariants.class.php b/htdocs/core/modules/modVariants.class.php
index 72b29230def..b40bd60f786 100644
--- a/htdocs/core/modules/modVariants.class.php
+++ b/htdocs/core/modules/modVariants.class.php
@@ -83,7 +83,7 @@ class modVariants extends DolibarrModules
 		$this->depends = array('modProduct'); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("products");
 
diff --git a/htdocs/core/modules/modWebServices.class.php b/htdocs/core/modules/modWebServices.class.php
index e61ed5dc689..a6362a175cc 100644
--- a/htdocs/core/modules/modWebServices.class.php
+++ b/htdocs/core/modules/modWebServices.class.php
@@ -63,7 +63,7 @@ class modWebServices extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->langfiles = array("other");
 
 		// Constants
diff --git a/htdocs/core/modules/modWebServicesClient.class.php b/htdocs/core/modules/modWebServicesClient.class.php
index 52a8889fbbb..b59e6cb9e13 100644
--- a/htdocs/core/modules/modWebServicesClient.class.php
+++ b/htdocs/core/modules/modWebServicesClient.class.php
@@ -63,7 +63,7 @@ class modWebServicesClient extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->langfiles = array("other");
 
 		// Constants
diff --git a/htdocs/core/modules/modWebsite.class.php b/htdocs/core/modules/modWebsite.class.php
index c452ed9ded2..295e7ccefa4 100644
--- a/htdocs/core/modules/modWebsite.class.php
+++ b/htdocs/core/modules/modWebsite.class.php
@@ -68,7 +68,7 @@ class modWebsite extends DolibarrModules
 		$this->depends = array('modFckeditor'); // List of modules id that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of modules id to disable if this one is disabled
 		$this->conflictwith = array(); // List of modules id this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->langfiles = array("website");
 
 		// Constants
diff --git a/htdocs/core/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php
index c7bd464b9d1..ec1c458ce00 100644
--- a/htdocs/core/modules/modWorkflow.class.php
+++ b/htdocs/core/modules/modWorkflow.class.php
@@ -72,7 +72,7 @@ class modWorkflow extends DolibarrModules
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
-		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(2, 8); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("@workflow");
 
diff --git a/htdocs/core/modules/modWorkstation.class.php b/htdocs/core/modules/modWorkstation.class.php
new file mode 100755
index 00000000000..797f7c8c5e0
--- /dev/null
+++ b/htdocs/core/modules/modWorkstation.class.php
@@ -0,0 +1,520 @@
+<?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) 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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   workstation     Module Workstation
+ *  \brief      Workstation module descriptor.
+ *
+ *  \file       htdocs/workstation/core/modules/modWorkstation.class.php
+ *  \ingroup    workstation
+ *  \brief      Description and activation file for module Workstation
+ */
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
+
+/**
+ *  Description and activation class for module Workstation
+ */
+class modWorkstation extends DolibarrModules
+{
+	/**
+	 * Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
+		$this->db = $db;
+
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 500000; // TODO Go on page https://wiki.dolibarr.org/index.php/List_of_modules_id to reserve an id number for your module
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'workstation';
+		// Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
+		// It is used to group modules by family in module setup page
+		$this->family = "other";
+		// Module position in the family on 2 digits ('01', '10', '20', ...)
+		$this->module_position = '90';
+		// Gives the possibility for the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
+		//$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
+		// Module label (no space allowed), used if translation string 'ModuleWorkstationName' not found (Workstation is name of module).
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Module description, used if translation string 'ModuleWorkstationDesc' not found (Workstation is name of module).
+		$this->description = "WorkstationsDescription";
+		// 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';
+		// Url to the file with your last numberversion of this module
+		//$this->url_last_version = 'http://www.example.com/versionmodule.txt';
+
+		// Key used in llx_const table to save module status enabled/disabled (where WORKSTATION is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto = 'mrp';
+		// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
+		$this->module_parts = array(
+			// Set this to 1 if module has its own trigger directory (core/triggers)
+			'triggers' => 0,
+			// Set this to 1 if module has its own login method file (core/login)
+			'login' => 0,
+			// Set this to 1 if module has its own substitution function file (core/substitutions)
+			'substitutions' => 0,
+			// Set this to 1 if module has its own menus handler directory (core/menus)
+			'menus' => 0,
+			// Set this to 1 if module overwrite template dir (core/tpl)
+			'tpl' => 0,
+			// Set this to 1 if module has its own barcode directory (core/modules/barcode)
+			'barcode' => 0,
+			// Set this to 1 if module has its own models directory (core/modules/xxx)
+			'models' => 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(
+				//    '/workstation/css/workstation.css.php',
+			),
+			// Set this to relative path of js file if module must load a js on all pages
+			'js' => array(
+				//   '/workstation/js/workstation.js.php',
+			),
+			// Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context to 'all'
+			'hooks' => array(
+				//   'data' => array(
+				//       'hookcontext1',
+				//       'hookcontext2',
+				//   ),
+				//   'entity' => '0',
+			),
+			// Set this to 1 if features of module are opened to external users
+			'moduleforexternal' => 0,
+		);
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/workstation/temp","/workstation/subdir");
+		$this->dirs = array("/workstation/temp");
+		// Config pages. Put here list of php page, stored into workstation/admin directory, to use to setup module.
+		$this->config_page_url = array("workstation.php");
+		// Dependencies
+		// A condition to hide module
+		$this->hidden = false;
+		// List of module class names as string that must be enabled if this module is enabled. Example: array('always1'=>'modModuleToEnable1','always2'=>'modModuleToEnable2', 'FR1'=>'modModuleToEnableFR'...)
+		$this->depends = array();
+		$this->requiredby = array(); // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
+		$this->langfiles = array("mrp");
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(11, -3); // Minimum version of Dolibarr required by module
+		$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		//$this->automatic_activation = array('FR'=>'WorkstationWasAutomaticallyActivatedBecauseOfYourCountryChoice');
+		//$this->always_enabled = true;								// If true, can't be disabled
+
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(1 => array('WORKSTATION_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
+		//                             2 => array('WORKSTATION_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
+		// );
+		$this->const = array();
+
+		// Some keys to add into the overwriting translation tables
+		/*$this->overwrite_translation = array(
+			'en_US:ParentCompany'=>'Parent company or reseller',
+			'fr_FR:ParentCompany'=>'Maison mère ou revendeur'
+		)*/
+
+		if (!isset($conf->workstation) || !isset($conf->workstation->enabled)) {
+			$conf->workstation = new stdClass();
+			$conf->workstation->enabled = 0;
+		}
+
+		// Array to add new pages in new tabs
+		$this->tabs = array();
+		// Example:
+		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@workstation:$user->rights->workstation->read:/workstation/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
+		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@workstation:$user->rights->othermodule->read:/workstation/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+		// $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		//
+		// Where objecttype can be
+		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+		// 'contact'          to add a tab in contact view
+		// 'contract'         to add a tab in contract view
+		// 'group'            to add a tab in group view
+		// 'intervention'     to add a tab in intervention view
+		// 'invoice'          to add a tab in customer invoice view
+		// 'invoice_supplier' to add a tab in supplier invoice view
+		// 'member'           to add a tab in fundation member view
+		// 'opensurveypoll'	  to add a tab in opensurvey poll view
+		// 'order'            to add a tab in customer order view
+		// 'order_supplier'   to add a tab in supplier order view
+		// 'payment'		  to add a tab in payment view
+		// 'payment_supplier' to add a tab in supplier payment view
+		// 'product'          to add a tab in product view
+		// 'propal'           to add a tab in propal view
+		// 'project'          to add a tab in project view
+		// 'stock'            to add a tab in stock view
+		// 'thirdparty'       to add a tab in third party view
+		// 'user'             to add a tab in user view
+
+		// Dictionaries
+		$this->dictionaries = array();
+		/* Example:
+		$this->dictionaries=array(
+			'langs'=>'workstation@workstation',
+			// List of tables we want to see into dictonnary editor
+			'tabname'=>array(MAIN_DB_PREFIX."table1", MAIN_DB_PREFIX."table2", MAIN_DB_PREFIX."table3"),
+			// Label of tables
+			'tablib'=>array("Table1", "Table2", "Table3"),
+			// Request to select fields
+			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),
+			// Sort order
+			'tabsqlsort'=>array("label ASC", "label ASC", "label ASC"),
+			// List of fields (result of select to show dictionary)
+			'tabfield'=>array("code,label", "code,label", "code,label"),
+			// List of fields (list of fields to edit a record)
+			'tabfieldvalue'=>array("code,label", "code,label", "code,label"),
+			// List of fields (list of fields for insert)
+			'tabfieldinsert'=>array("code,label", "code,label", "code,label"),
+			// Name of columns with primary key (try to always name it 'rowid')
+			'tabrowid'=>array("rowid", "rowid", "rowid"),
+			// Condition to show each dictionary
+			'tabcond'=>array($conf->workstation->enabled, $conf->workstation->enabled, $conf->workstation->enabled)
+		);
+		*/
+
+		// Boxes/Widgets
+		// Add here list of php file(s) stored in workstation/core/boxes that contains a class to show a widget.
+		$this->boxes = array(
+			//  0 => array(
+			//      'file' => 'workstationwidget1.php@workstation',
+			//      'note' => 'Widget provided by Workstation',
+			//      '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' => '/workstation/class/workstation.class.php',
+			//      'objectname' => 'Workstation',
+			//      'method' => 'doScheduledJob',
+			//      'parameters' => '',
+			//      'comment' => 'Comment',
+			//      'frequency' => 2,
+			//      'unitfrequency' => 3600,
+			//      'status' => 0,
+			//      'test' => '$conf->workstation->enabled',
+			//      'priority' => 50,
+			//  ),
+		);
+		// Example: $this->cronjobs=array(
+		//    0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>'$conf->workstation->enabled', 'priority'=>50),
+		//    1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>'$conf->workstation->enabled', 'priority'=>50)
+		// );
+
+		// Permissions provided by this module
+		$this->rights = array();
+		$r = 0;
+		// Add here entries to declare new permissions
+		/* BEGIN MODULEBUILDER PERMISSIONS */
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read objects of Workstation'; // Permission label
+		$this->rights[$r][4] = 'workstation'; // In php code, permission will be checked by test if ($user->rights->workstation->level1->level2)
+		$this->rights[$r][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->workstation->level1->level2)
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Create/Update objects of Workstation'; // Permission label
+		$this->rights[$r][4] = 'workstation'; // In php code, permission will be checked by test if ($user->rights->workstation->level1->level2)
+		$this->rights[$r][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->workstation->level1->level2)
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Delete objects of Workstation'; // Permission label
+		$this->rights[$r][4] = 'workstation'; // In php code, permission will be checked by test if ($user->rights->workstation->level1->level2)
+		$this->rights[$r][5] = 'delete'; // In php code, permission will be checked by test if ($user->rights->workstation->level1->level2)
+		$r++;
+		/* END MODULEBUILDER PERMISSIONS */
+
+		// Main menu entries to add
+		$this->menu = array();
+		$r = 0;
+		// Add here entries to declare new menus
+		/* BEGIN MODULEBUILDER TOPMENU */
+		/*$this->menu[$r++] = array(
+			'fk_menu'=>'', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'top', // This is a Top menu entry
+			'titre'=>$langs->trans('GPAO'),
+			'mainmenu'=>'gpao',
+			'leftmenu'=>'',
+			'url'=>'/workstation/workstationindex.php',
+			'langs'=>'workstation@workstation', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000 + $r,
+			'enabled'=>'$conf->workstation->enabled', // Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled.
+			'perms'=>'1', // Use 'perms'=>'$user->rights->workstation->workstation->read' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+		);*/
+		/* END MODULEBUILDER TOPMENU */
+		/* BEGIN MODULEBUILDER LEFTMENU WORKSTATION
+		$this->menu[$r++]=array(
+			'fk_menu'=>'fk_mainmenu=workstation',      // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left',                          // This is a Top menu entry
+			'titre'=>'Workstation',
+			'mainmenu'=>'workstation',
+			'leftmenu'=>'workstation',
+			'url'=>'/workstation/workstationindex.php',
+			'langs'=>'workstation@workstation',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000+$r,
+			'enabled'=>'$conf->workstation->enabled',  // Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled.
+			'perms'=>'$user->rights->workstation->workstation->read',			                // Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
+		);
+		$this->menu[$r++]=array(
+			'fk_menu'=>'fk_mainmenu=workstation,fk_leftmenu=workstation',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left',			                // This is a Left menu entry
+			'titre'=>'List_Workstation',
+			'mainmenu'=>'workstation',
+			'leftmenu'=>'workstation_workstation_list',
+			'url'=>'/workstation/workstation_list.php',
+			'langs'=>'workstation@workstation',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000+$r,
+			'enabled'=>'$conf->workstation->enabled',  // Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'$user->rights->workstation->workstation->read',			                // Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
+		);
+		$this->menu[$r++]=array(
+			'fk_menu'=>'fk_mainmenu=workstation,fk_leftmenu=workstation',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left',			                // This is a Left menu entry
+			'titre'=>'New_Workstation',
+			'mainmenu'=>'workstation',
+			'leftmenu'=>'workstation_workstation_new',
+			'url'=>'/workstation/workstation_card.php?action=create',
+			'langs'=>'workstation@workstation',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000+$r,
+			'enabled'=>'$conf->workstation->enabled',  // Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'$user->rights->workstation->workstation->write',			                // Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
+		);
+		*/
+
+        $this->menu[$r++]=array(
+            // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+            'fk_menu'=>'fk_mainmenu=mrp',
+            // This is a Left menu entry
+            'type'=>'left',
+            'titre'=>$langs->trans('Workstations'),
+            'mainmenu'=>'mrp',
+            'leftmenu'=>'workstation_workstation',
+            'url'=>'',
+            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'langs'=>'mrp',
+            'position'=>1100+$r,
+            // Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+            'enabled'=>'$conf->workstation->enabled',
+            // Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
+            'perms'=>'$user->rights->workstation->workstation->read',
+            'target'=>'',
+            // 0=Menu for internal users, 1=external users, 2=both
+            'user'=>2,
+        );
+		$this->menu[$r++]=array(
+			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'fk_menu'=>'fk_mainmenu=mrp,fk_leftmenu=workstation_workstation',
+			// This is a Left menu entry
+			'type'=>'left',
+			'titre'=>$langs->trans('WorkstationCreate'),
+			'mainmenu'=>'mrp',
+			'leftmenu'=>'workstation_workstation_left_create',
+			'url'=>'/workstation/workstation_card.php?action=create',
+			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs'=>'mrp',
+			'position'=>1100+$r,
+			// Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'enabled'=>'$conf->workstation->enabled',
+			// Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
+			'perms'=>'$user->rights->workstation->workstation->write',
+			'target'=>'',
+			// 0=Menu for internal users, 1=external users, 2=both
+			'user'=>2
+		);
+		$this->menu[$r++]=array(
+			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'fk_menu'=>'fk_mainmenu=mrp,fk_leftmenu=workstation_workstation',
+			// This is a Left menu entry
+			'type'=>'left',
+			'titre'=>$langs->trans('List'),
+			'mainmenu'=>'mrp',
+			'leftmenu'=>'workstation_workstation_left_list',
+			'url'=>'/workstation/workstation_list.php',
+			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs'=>'mrp',
+			'position'=>1101+$r,
+			// Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'enabled'=>'$conf->workstation->enabled',
+			// Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
+			'perms'=>'$user->rights->workstation->workstation->read',
+			'target'=>'',
+			// 0=Menu for internal users, 1=external users, 2=both
+			'user'=>2
+		);
+
+		/* END MODULEBUILDER LEFTMENU WORKSTATION */
+		// Exports profiles provided by this module
+		$r = 1;
+		/* BEGIN MODULEBUILDER EXPORT WORKSTATION */
+		/*
+		$langs->load("workstation@workstation");
+		$this->export_code[$r]=$this->rights_class.'_'.$r;
+		$this->export_label[$r]='WorkstationLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_icon[$r]='workstation@workstation';
+		// Define $this->export_fields_array, $this->export_TypeFields_array and $this->export_entities_array
+		$keyforclass = 'Workstation'; $keyforclassfile='/workstation/class/workstation.class.php'; $keyforelement='workstation@workstation';
+		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
+		//$this->export_fields_array[$r]['t.fieldtoadd']='FieldToAdd'; $this->export_TypeFields_array[$r]['t.fieldtoadd']='Text';
+		//unset($this->export_fields_array[$r]['t.fieldtoremove']);
+		//$keyforclass = 'WorkstationLine'; $keyforclassfile='/workstation/class/workstation.class.php'; $keyforelement='workstationline@workstation'; $keyforalias='tl';
+		//include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
+		$keyforselect='workstation'; $keyforaliasextra='extra'; $keyforelement='workstation@workstation';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		//$keyforselect='workstationline'; $keyforaliasextra='extraline'; $keyforelement='workstationline@workstation';
+		//include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		//$this->export_dependencies_array[$r] = array('workstationline'=>array('tl.rowid','tl.ref')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
+		//$this->export_special_array[$r] = array('t.field'=>'...');
+		//$this->export_examplevalues_array[$r] = array('t.field'=>'Example');
+		//$this->export_help_array[$r] = array('t.field'=>'FieldDescHelp');
+		$this->export_sql_start[$r]='SELECT DISTINCT ';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'workstation as t';
+		//$this->export_sql_end[$r]  =' LEFT JOIN '.MAIN_DB_PREFIX.'workstation_line as tl ON tl.fk_workstation = t.rowid';
+		$this->export_sql_end[$r] .=' WHERE 1 = 1';
+		$this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('workstation').')';
+		$r++; */
+		/* END MODULEBUILDER EXPORT WORKSTATION */
+
+		// Imports profiles provided by this module
+		$r = 1;
+		/* BEGIN MODULEBUILDER IMPORT WORKSTATION */
+		/*
+		 $langs->load("workstation@workstation");
+		 $this->export_code[$r]=$this->rights_class.'_'.$r;
+		 $this->export_label[$r]='WorkstationLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		 $this->export_icon[$r]='workstation@workstation';
+		 $keyforclass = 'Workstation'; $keyforclassfile='/workstation/class/workstation.class.php'; $keyforelement='workstation@workstation';
+		 include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
+		 $keyforselect='workstation'; $keyforaliasextra='extra'; $keyforelement='workstation@workstation';
+		 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.'workstation as t';
+		 $this->export_sql_end[$r] .=' WHERE 1 = 1';
+		 $this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('workstation').')';
+		 $r++; */
+		/* END MODULEBUILDER IMPORT WORKSTATION */
+	}
+
+	/**
+	 *  Function called when module is enabled.
+	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *  It also creates data directories
+	 *
+	 *  @param      string  $options    Options when enabling module ('', 'noboxes')
+	 *  @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf, $langs;
+
+		$result = $this->_load_tables('/workstation/sql/');
+		if ($result < 0) return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
+
+		// Create extrafields during init
+		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		//$extrafields = new ExtraFields($this->db);
+		//$result1=$extrafields->addExtraField('workstation_myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'workstation@workstation', '$conf->workstation->enabled');
+		//$result2=$extrafields->addExtraField('workstation_myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'workstation@workstation', '$conf->workstation->enabled');
+		//$result3=$extrafields->addExtraField('workstation_myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'workstation@workstation', '$conf->workstation->enabled');
+		//$result4=$extrafields->addExtraField('workstation_myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'workstation@workstation', '$conf->workstation->enabled');
+		//$result5=$extrafields->addExtraField('workstation_myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'workstation@workstation', '$conf->workstation->enabled');
+
+		// Permissions
+		$this->remove($options);
+
+		$sql = array();
+
+		// Document templates
+		$moduledir = 'workstation';
+		$myTmpObjects = array();
+		$myTmpObjects['Workstation'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
+
+		foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
+			if ($myTmpObjectKey == 'Workstation') continue;
+			if ($myTmpObjectArray['includerefgeneration']) {
+				$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/workstation/template_workstations.odt';
+				$dirodt = DOL_DATA_ROOT.'/doctemplates/workstation';
+				$dest = $dirodt.'/template_workstations.odt';
+
+				if (file_exists($src) && !file_exists($dest))
+				{
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+					dol_mkdir($dirodt);
+					$result = dol_copy($src, $dest, 0, 0);
+					if ($result < 0)
+					{
+						$langs->load("errors");
+						$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
+						return 0;
+					}
+				}
+
+				$sql = array_merge($sql, array(
+					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard_".strtolower($myTmpObjectKey)."' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".$conf->entity,
+					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard_".strtolower($myTmpObjectKey)."','".strtolower($myTmpObjectKey)."',".$conf->entity.")",
+					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'generic_".strtolower($myTmpObjectKey)."_odt' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".$conf->entity,
+					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('generic_".strtolower($myTmpObjectKey)."_odt', '".strtolower($myTmpObjectKey)."', ".$conf->entity.")"
+				));
+			}
+		}
+
+		return $this->_init($sql, $options);
+	}
+
+	/**
+	 *  Function called when module is disabled.
+	 *  Remove from database constants, boxes and permissions from Dolibarr database.
+	 *  Data directories are not deleted
+	 *
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @return     int                 1 if OK, 0 if KO
+	 */
+	public function remove($options = '')
+	{
+		$sql = array();
+		return $this->_remove($sql, $options);
+	}
+}
diff --git a/htdocs/core/modules/modZapier.class.php b/htdocs/core/modules/modZapier.class.php
index ee7589c6537..09abd0e9dc7 100644
--- a/htdocs/core/modules/modZapier.class.php
+++ b/htdocs/core/modules/modZapier.class.php
@@ -123,7 +123,7 @@ class modZapier extends DolibarrModules
 		$this->conflictwith = array();
 		$this->langfiles = array("zapier");
 		// Minimum version of PHP required by module
-		//$this->phpmin = array(5, 5);
+		//$this->phpmin = array(5, 6);
 		// Minimum version of Dolibarr required by module
 		$this->need_dolibarr_version = array(10, 0);
 		// Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
diff --git a/htdocs/core/modules/movement/modules_movement.php b/htdocs/core/modules/movement/modules_movement.php
index 80a61c75074..0116a87ff38 100644
--- a/htdocs/core/modules/movement/modules_movement.php
+++ b/htdocs/core/modules/movement/modules_movement.php
@@ -50,11 +50,11 @@ abstract class ModelePDFMovement extends CommonDocGenerator
 		global $conf;
 
 		$type = 'movement';
-		$liste = array();
+		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste = getListOfModels($db, $type, $maxfilenamelength);
+		$list = getListOfModels($db, $type, $maxfilenamelength);
 
-		return $liste;
+		return $list;
 	}
 }
diff --git a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
index 90836ca4fd9..0b4db8c2619 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
@@ -321,24 +321,6 @@ class pdf_standardlabel extends CommonStickerGenerator
 		if (!empty($conf->global->MAIN_UMASK))
 			@chmod($file, octdec($conf->global->MAIN_UMASK));
 
-		// Output to http stream
-		clearstatcache();
-
-		$attachment = true;
-		if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment = false;
-		$type = dol_mimetype($filename);
-
-		//if ($encoding)   header('Content-Encoding: '.$encoding);
-		if ($type)		 header('Content-Type: '.$type);
-		if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
-		else header('Content-Disposition: inline; filename="'.$filename.'"');
-
-		// Ajout directives pour resoudre bug IE
-		header('Cache-Control: Public, must-revalidate');
-		header('Pragma: public');
-
-		readfile($file);
-
 		$this->result = array('fullpath'=>$file);
 
 		return 1;
diff --git a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
index 1540fc29e8e..e4f46d269e2 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
@@ -359,23 +359,6 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 		if (!empty($conf->global->MAIN_UMASK))
 			@chmod($file, octdec($conf->global->MAIN_UMASK));
 
-		// Output to http stream
-		clearstatcache();
-
-		$attachment = true;
-		if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment = false;
-		$type = dol_mimetype($filename);
-
-		//if ($encoding)   header('Content-Encoding: '.$encoding);
-		if ($type)		 header('Content-Type: '.$type);
-		if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
-		else header('Content-Disposition: inline; filename="'.$filename.'"');
-
-		// Ajout directives pour resoudre bug IE
-		header('Cache-Control: Public, must-revalidate');
-		header('Pragma: public');
-
-		readfile($file);
 
 		$this->result = array('fullpath'=>$file);
 
diff --git a/htdocs/core/modules/printsheet/modules_labels.php b/htdocs/core/modules/printsheet/modules_labels.php
index 3320b4ff928..9106c8f4eac 100644
--- a/htdocs/core/modules/printsheet/modules_labels.php
+++ b/htdocs/core/modules/printsheet/modules_labels.php
@@ -54,12 +54,12 @@ class ModelePDFLabels
 		global $conf;
 
 		$type = 'members_labels';
-		$liste = array();
+		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste = getListOfModels($db, $type, $maxfilenamelength);
+		$list = getListOfModels($db, $type, $maxfilenamelength);
 
-		return $liste;
+		return $list;
 	}
 }
 
@@ -150,6 +150,27 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 		if ($obj->write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir, $filename) > 0)
 		{
 			$outputlangs->charset_output = $sav_charset_output;
+
+			$fullpath = $obj->result['fullpath'];
+
+			// Output to http stream
+			clearstatcache();
+
+			$attachment = true;
+			if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment = false;
+			$type = dol_mimetype($filename);
+
+			//if ($encoding)   header('Content-Encoding: '.$encoding);
+			if ($type)		 header('Content-Type: '.$type);
+			if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
+			else header('Content-Disposition: inline; filename="'.$filename.'"');
+
+			// Ajout directives pour resoudre bug IE
+			header('Cache-Control: Public, must-revalidate');
+			header('Pragma: public');
+
+			readfile($fullpath);
+
 			return 1;
 		} else {
 			$outputlangs->charset_output = $sav_charset_output;
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index ceb1819df37..cf3c1c057da 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -172,7 +172,11 @@ class pdf_standard extends ModelePDFProduct
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
 
-		$nblines = count($object->lines);
+		if (is_array($object->lines)) {
+			$nblines = count($object->lines);
+		} else {
+			$nblines = 0;
+		}
 
 		if ($conf->product->dir_output)
 		{
diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
index 79950e4f14f..e0141348568 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -53,11 +53,11 @@ abstract class ModelePDFProduct extends CommonDocGenerator
 		global $conf;
 
 		$type = 'product';
-		$liste = array();
+		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste = getListOfModels($db, $type, $maxfilenamelength);
-		return $liste;
+		$list = getListOfModels($db, $type, $maxfilenamelength);
+		return $list;
 	}
 }
 
@@ -163,7 +163,7 @@ abstract class ModeleProductCode
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		$liste = array();
+		$list = array();
 		$sql = "";
 
 		$resql = $db->query($sql);
@@ -172,13 +172,13 @@ abstract class ModeleProductCode
 			$i = 0;
 			while ($i < $num) {
 				$row = $db->fetch_row($resql);
-				$liste[$row[0]] = $row[1];
+				$list[$row[0]] = $row[1];
 				$i++;
 			}
 		} else {
 			return -1;
 		}
-		return $liste;
+		return $list;
 	}
 
 	/**
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index 6baf416ed64..431e7b6e85c 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -38,6 +38,31 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 class pdf_baleine extends ModelePDFProjects
 {
+	/**
+	 * @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)
@@ -50,6 +75,41 @@ class pdf_baleine extends ModelePDFProjects
 	 */
 	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
@@ -71,6 +131,7 @@ class pdf_baleine extends ModelePDFProjects
 		$this->db = $db;
 		$this->name = "baleine";
 		$this->description = $langs->trans("DocumentModelBaleine");
+		$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';
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 0f877428052..80862ba32d8 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -54,6 +54,78 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
 class pdf_beluga extends ModelePDFProjects
 {
+	/**
+	 * @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;
+
 	/**
 	 * Page orientation
 	 * @var string 'P' or 'Portait' (default), 'L' or 'Landscape'
@@ -81,6 +153,7 @@ class pdf_beluga extends ModelePDFProjects
 		$this->db = $db;
 		$this->name = "beluga";
 		$this->description = $langs->trans("DocumentModelBeluga");
+		$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';
diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
index 5426e076d33..e6fe76cba16 100644
--- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
@@ -37,6 +37,31 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 class pdf_timespent extends ModelePDFProjects
 {
+	/**
+	 * @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)
@@ -49,6 +74,41 @@ class pdf_timespent extends ModelePDFProjects
 	 */
 	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
@@ -70,6 +130,7 @@ class pdf_timespent extends ModelePDFProjects
 		$this->db = $db;
 		$this->name = "timespent";
 		$this->description = $langs->trans("DocumentModelTimeSpent");
+		$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';
diff --git a/htdocs/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php
index 6f174a27d7a..c2d546348ff 100644
--- a/htdocs/core/modules/project/modules_project.php
+++ b/htdocs/core/modules/project/modules_project.php
@@ -106,12 +106,12 @@ abstract class ModelePDFProjects extends CommonDocGenerator
 		global $conf;
 
 		$type = 'project';
-		$liste = array();
+		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste = getListOfModels($db, $type, $maxfilenamelength);
+		$list = getListOfModels($db, $type, $maxfilenamelength);
 
-		return $liste;
+		return $list;
 	}
 }
 
diff --git a/htdocs/core/modules/project/task/modules_task.php b/htdocs/core/modules/project/task/modules_task.php
index 2600538f273..9addc4bc56e 100644
--- a/htdocs/core/modules/project/task/modules_task.php
+++ b/htdocs/core/modules/project/task/modules_task.php
@@ -52,12 +52,12 @@ abstract class ModelePDFTask extends CommonDocGenerator
 		global $conf;
 
 		$type = 'project_task';
-		$liste = array();
+		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste = getListOfModels($db, $type, $maxfilenamelength);
+		$list = getListOfModels($db, $type, $maxfilenamelength);
 
-		return $liste;
+		return $list;
 	}
 }
 
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 7b2ac19a016..caaa92f8238 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
@@ -183,24 +183,24 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
 			{
 				// Model for creation
-				$liste = ModelePDFPropales::liste_modeles($this->db);
+				$list = ModelePDFPropales::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->PROPALE_ADDON_PDF_ODT_DEFAULT);
+				$texte .= $form->selectarray('value2', $list, $conf->global->PROPALE_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->PROPALE_ADDON_PDF_ODT_TOBILL);
+				$texte .= $form->selectarray('value3', $list, $conf->global->PROPALE_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->PROPALE_ADDON_PDF_ODT_CLOSED);
+				$texte .= $form->selectarray('value4', $list, $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED);
 				$texte .= "</td></tr>";
 				$texte .= '</table>';
 			}
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 3b09d639bf0..be3f53847bf 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -243,7 +243,7 @@ class pdf_azur extends ModelePDFPropales
 					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 				} else {
-					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
+					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product'); // default
 					$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 				}
 
@@ -257,7 +257,6 @@ class pdf_azur extends ModelePDFPropales
 						} else {
 							$dir = $conf->product->dir_output.'/'.$midir; //Check repertory of the current product
 						}
-
 						foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
 						{
 							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 80433eb2201..bc71116081e 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -78,9 +78,9 @@ class pdf_cyan extends ModelePDFPropales
 	 */
 	public $version = 'dolibarr';
 
-	 /**
-	  * @var int page_largeur
-	  */
+	/**
+	 * @var int page_largeur
+	 */
 	public $page_largeur;
 
 	/**
@@ -120,7 +120,7 @@ class pdf_cyan extends ModelePDFPropales
 	public $emetteur;
 
 	/**
-	 * @var array of document table collumns
+	 * @var array of document table columns
 	 */
 	public $cols;
 
@@ -242,7 +242,7 @@ class pdf_cyan extends ModelePDFPropales
 					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 				} else {
-					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
+					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product'); // default
 					$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 				}
 
diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php
index 2127ff1f70c..ffcc13dc269 100644
--- a/htdocs/core/modules/propale/modules_propale.php
+++ b/htdocs/core/modules/propale/modules_propale.php
@@ -56,12 +56,12 @@ abstract class ModelePDFPropales extends CommonDocGenerator
 		global $conf;
 
 		$type = 'propal';
-		$liste = array();
+		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste = getListOfModels($db, $type, $maxfilenamelength);
+		$list = getListOfModels($db, $type, $maxfilenamelength);
 
-		return $liste;
+		return $list;
 	}
 }
 
diff --git a/htdocs/core/modules/reception/modules_reception.php b/htdocs/core/modules/reception/modules_reception.php
index 28b0bce6500..a7b7cae7344 100644
--- a/htdocs/core/modules/reception/modules_reception.php
+++ b/htdocs/core/modules/reception/modules_reception.php
@@ -46,12 +46,12 @@ abstract class ModelePdfReception extends CommonDocGenerator
 		global $conf;
 
 		$type = 'reception';
-		$liste = array();
+		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste = getListOfModels($db, $type, $maxfilenamelength);
+		$list = getListOfModels($db, $type, $maxfilenamelength);
 
-		return $liste;
+		return $list;
 	}
 }
 
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index 03463f364bd..28d0120da72 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -51,12 +51,12 @@ abstract class ModeleThirdPartyDoc extends CommonDocGenerator
 		global $conf;
 
 		$type = 'company';
-		$liste = array();
+		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste = getListOfModels($db, $type, $maxfilenamelength);
+		$list = getListOfModels($db, $type, $maxfilenamelength);
 
-		return $liste;
+		return $list;
 	}
 }
 
@@ -168,7 +168,7 @@ abstract class ModeleThirdPartyCode
 	public static function liste_modeles($db, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		$liste = array();
+		$list = array();
 		$sql = "";
 
 		$resql = $db->query($sql);
@@ -177,13 +177,13 @@ abstract class ModeleThirdPartyCode
 			$i = 0;
 			while ($i < $num) {
 				$row = $db->fetch_row($resql);
-				$liste[$row[0]] = $row[1];
+				$list[$row[0]] = $row[1];
 				$i++;
 			}
 		} else {
 			return -1;
 		}
-		return $liste;
+		return $list;
 	}
 
 	/**
diff --git a/htdocs/core/modules/stock/modules_stock.php b/htdocs/core/modules/stock/modules_stock.php
index cd4fed5665f..2c9f9e82591 100644
--- a/htdocs/core/modules/stock/modules_stock.php
+++ b/htdocs/core/modules/stock/modules_stock.php
@@ -43,11 +43,11 @@ abstract class ModelePDFStock extends CommonDocGenerator
 		global $conf;
 
 		$type = 'stock';
-		$liste = array();
+		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste = getListOfModels($db, $type, $maxfilenamelength);
+		$list = getListOfModels($db, $type, $maxfilenamelength);
 
-		return $liste;
+		return $list;
 	}
 }
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 7a3ecf88e19..9ac43fd1625 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -133,6 +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
 
 		// Page dimensions
 		$this->type = 'pdf';
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 22bc80e161d..275b4672109 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -56,6 +56,11 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	 */
 	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
 	 */
@@ -130,6 +135,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$this->db = $db;
 		$this->name = "cornas";
 		$this->description = $langs->trans('SuppliersCommandModel');
+		$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';
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 b48cb60df45..2094eab8c3a 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -56,6 +56,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 */
 	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
 	 */
@@ -130,6 +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
 
 		// Page size for A4 format
 		$this->type = 'pdf';
diff --git a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
index dcd48b25913..d7d28afa9e8 100644
--- a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
+++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
@@ -57,12 +57,12 @@ abstract class ModelePDFSuppliersOrders extends CommonDocGenerator
 		global $conf;
 
 		$type = 'order_supplier';
-		$liste = array();
+		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste = getListOfModels($db, $type, $maxfilenamelength);
+		$list = getListOfModels($db, $type, $maxfilenamelength);
 
-		return $liste;
+		return $list;
 	}
 }
 
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 19e78eb4ff9..0dbe2d84614 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -53,6 +53,11 @@ class pdf_standard extends ModelePDFSuppliersPayments
 	 */
 	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
 	 */
@@ -127,6 +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
 
 		// Page size for A4 format
 		$this->type = 'pdf';
@@ -748,7 +754,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
 
-			// Payed
+			// Paid
 			$thirdparty = $object->thirdparty;
 
 			$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
diff --git a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
index c5c5fd489f9..0d4cbaff529 100644
--- a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
+++ b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
@@ -42,12 +42,12 @@ abstract class ModelePDFSuppliersPayments extends CommonDocGenerator
 		global $conf;
 
 		$type = 'supplier_payment';
-		$liste = array();
+		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste = getListOfModels($db, $type, $maxfilenamelength);
+		$list = getListOfModels($db, $type, $maxfilenamelength);
 
-		return $liste;
+		return $list;
 	}
 }
 
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 8c42681e986..e54d9db3076 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
@@ -184,24 +184,24 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 			if ($conf->global->MAIN_SUPPLIER_PROPOSAL_CHOOSE_ODT_DOCUMENT > 0)
 			{
 				// Model for creation
-				$liste = ModelePDFSupplierProposal::liste_modeles($this->db);
+				$list = ModelePDFSupplierProposal::liste_modeles($this->db);
 				$texte .= '<table width="50%;">';
 				$texte .= '<tr>';
 				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelSupplierProposalCreate").'</td>';
 				$texte .= '<td colspan="">';
-				$texte .= $form->selectarray('value2', $liste, $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT);
+				$texte .= $form->selectarray('value2', $list, $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT);
 				$texte .= "</td></tr>";
 
 				$texte .= '<tr>';
 				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelSupplierProposalToBill").'</td>';
 				$texte .= '<td colspan="">';
-				$texte .= $form->selectarray('value3', $liste, $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL);
+				$texte .= $form->selectarray('value3', $list, $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL);
 				$texte .= "</td></tr>";
 				$texte .= '<tr>';
 
 				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelSupplierProposalClosed").'</td>';
 				$texte .= '<td colspan="">';
-				$texte .= $form->selectarray('value4', $liste, $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED);
+				$texte .= $form->selectarray('value4', $list, $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED);
 				$texte .= "</td></tr>";
 				$texte .= '</table>';
 			}
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 d8307226e41..3d3990c06b4 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -53,6 +53,11 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	 */
 	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
 	 */
@@ -127,6 +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
 
 		// Page size for A4 format
 		$this->type = 'pdf';
diff --git a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
index 4e32817ff19..195533b1ce1 100644
--- a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
+++ b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
@@ -56,12 +56,12 @@ abstract class ModelePDFSupplierProposal extends CommonDocGenerator
 		global $conf;
 
 		$type = 'supplier_proposal';
-		$liste = array();
+		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste = getListOfModels($db, $type, $maxfilenamelength);
+		$list = getListOfModels($db, $type, $maxfilenamelength);
 
-		return $liste;
+		return $list;
 	}
 }
 
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 2e39bf53ea2..47e9e8bccc5 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
@@ -166,24 +166,24 @@ class doc_generic_user_odt extends ModelePDFUser
 			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
 			{
 				// Model for creation
-				$liste = ModelePDFUser::liste_modeles($this->db);
+				$list = ModelePDFUser::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->USER_ADDON_PDF_ODT_DEFAULT);
+				$texte .= $form->selectarray('value2', $list, $conf->global->USER_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->USER_ADDON_PDF_ODT_TOBILL);
+				$texte .= $form->selectarray('value3', $list, $conf->global->USER_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->USER_ADDON_PDF_ODT_CLOSED);
+				$texte .= $form->selectarray('value4', $list, $conf->global->USER_ADDON_PDF_ODT_CLOSED);
 				$texte .= "</td></tr>";
 				$texte .= '</table>';
 			}
diff --git a/htdocs/core/modules/user/modules_user.class.php b/htdocs/core/modules/user/modules_user.class.php
index 2269d530c97..b0142687ce5 100644
--- a/htdocs/core/modules/user/modules_user.class.php
+++ b/htdocs/core/modules/user/modules_user.class.php
@@ -58,10 +58,10 @@ abstract class ModelePDFUser extends CommonDocGenerator
 		global $conf;
 
 		$type = 'user';
-		$liste = array();
+		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$liste = getListOfModels($db, $type, $maxfilenamelength);
-		return $liste;
+		$list = getListOfModels($db, $type, $maxfilenamelength);
+		return $list;
 	}
 }
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 6fcc6160a97..4c718db5654 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
@@ -169,24 +169,24 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
 			{
 				// Model for creation
-				$liste = ModelePDFUserGroup::liste_modeles($this->db);
+				$list = ModelePDFUserGroup::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->USERGROUP_ADDON_PDF_ODT_DEFAULT);
+				$texte .= $form->selectarray('value2', $list, $conf->global->USERGROUP_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->USERGROUP_ADDON_PDF_ODT_TOBILL);
+				$texte .= $form->selectarray('value3', $list, $conf->global->USERGROUP_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->USERGROUP_ADDON_PDF_ODT_CLOSED);
+				$texte .= $form->selectarray('value4', $list, $conf->global->USERGROUP_ADDON_PDF_ODT_CLOSED);
 				$texte .= "</td></tr>";
 				$texte .= '</table>';
 			}
diff --git a/htdocs/core/modules/workstation/mod_workstation_advanced.php b/htdocs/core/modules/workstation/mod_workstation_advanced.php
new file mode 100755
index 00000000000..cf9a1247e2b
--- /dev/null
+++ b/htdocs/core/modules/workstation/mod_workstation_advanced.php
@@ -0,0 +1,151 @@
+<?php
+/* Copyright (C) 2003-2007  Rodolphe Quiedeville        <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2007  Laurent Destailleur         <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009  Regis Houssin               <regis.houssin@inodbox.com>
+ * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
+ * Copyright (C) 2019       Frédéric France             <frederic.france@netlogic.fr>
+ * Copyright (C) 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/workstation/mod_workstation_advanced.php
+ * \ingroup    workstation
+ * \brief      File containing class for advanced numbering model of Workstation
+ */
+
+require_once DOL_DOCUMENT_ROOT . '/core/modules/workstation/modules_workstation.php';
+
+
+/**
+ *	Class to manage customer Bom numbering rules advanced
+ */
+class mod_workstation_advanced extends ModeleNumRefWorkstation
+{
+	/**
+	 * 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="maskconstWorkstation" value="WORKSTATION_WORKSTATION_ADVANCED_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Workstation"), $langs->transnoentities("Workstation"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Workstation"), $langs->transnoentities("Workstation"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
+
+		// Parametrage du prefix
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="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 .= '</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 Workstation($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->WORKSTATION_WORKSTATION_ADVANCED_MASK;
+
+		if (!$mask)
+		{
+			$this->error = 'NotConfigured';
+			return 0;
+		}
+
+		$date = $object->date;
+
+		$numFinal = get_next_value($db, $mask, 'workstation_workstation', 'ref', '', null, $date);
+
+		return  $numFinal;
+	}
+}
diff --git a/htdocs/core/modules/workstation/mod_workstation_standard.php b/htdocs/core/modules/workstation/mod_workstation_standard.php
new file mode 100755
index 00000000000..0e793953f46
--- /dev/null
+++ b/htdocs/core/modules/workstation/mod_workstation_standard.php
@@ -0,0 +1,152 @@
+<?php
+/* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/workstation/mod_workstation_standard.php
+ *  \ingroup    workstation
+ *  \brief      File of class to manage Workstation numbering rules standard
+ */
+require_once DOL_DOCUMENT_ROOT . '/core/modules/workstation/modules_workstation.php';
+
+/**
+ *	Class to manage customer order numbering rules standard
+ */
+class mod_workstation_standard extends ModeleNumRefWorkstation
+{
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+
+	public $prefix = 'WORKSTATION';
+
+	/**
+	 * @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."workstation_workstation";
+		$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."workstation_workstation";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		//$sql .= " AND entity = ".$conf->entity;
+
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj) $max = intval($obj->max);
+			else $max = 0;
+		} else {
+			dol_syslog("mod_workstation_standard::getNextValue", LOG_DEBUG);
+			return -1;
+		}
+
+		//$date=time();
+		$date = dol_now();
+		$yymm = strftime("%y%m", $date);
+
+		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		else $num = sprintf("%04s", $max + 1);
+
+		dol_syslog("mod_workstation_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
+		return $this->prefix.$yymm."-".$num;
+	}
+}
diff --git a/htdocs/core/modules/workstation/modules_workstation.php b/htdocs/core/modules/workstation/modules_workstation.php
new file mode 100755
index 00000000000..ec6c2fc945b
--- /dev/null
+++ b/htdocs/core/modules/workstation/modules_workstation.php
@@ -0,0 +1,151 @@
+<?php
+/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
+ * Copyright (C) 2012      Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/workstation/modules_workstation.php
+ *  \ingroup		workstation
+ *  \brief			File that contains parent class for workstations document models and parent class for workstations 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 ModelePDFWorkstation 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 = 'workstation';
+		$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 Workstation
+ */
+abstract class ModeleNumRefWorkstation
+{
+	/**
+	 * @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("workstation@workstation");
+		return $langs->trans("NoDescription");
+	}
+
+	/**
+	 *	Returns an example of numbering
+	 *
+	 *	@return     string      Example
+	 */
+	public function getExample()
+	{
+		global $langs;
+		$langs->load("workstation@workstation");
+		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/photos_resize.php b/htdocs/core/photos_resize.php
index 0dacab15f3f..f1b5a109230 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -42,6 +42,7 @@ $file = GETPOST('file', 'alpha');
 $num = GETPOST('num', 'alpha'); // Used for document on bank statement
 $website = GETPOST('website', 'alpha');
 
+
 // Security check
 if (empty($modulepart)) accessforbidden('Bad value for modulepart');
 $accessallowed = 0;
@@ -85,6 +86,11 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
 	$permtoadd = ($user->rights->mailing->creer || $user->rights->website->write);
 	if (!$permtoadd) accessforbidden();
 	$accessallowed = 1;
+} elseif ($modulepart == 'facture_fourn' || $modulepart == 'facture_fournisseur')
+{
+	$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
+	if (!$user->rights->fournisseur->facture->lire) accessforbidden();
+	$accessallowed = 1;
 } else // ticket, holiday, expensereport, societe...
 {
 	$result = restrictedArea($user, $modulepart, $id, $modulepart);
@@ -230,10 +236,28 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->bank->dir_output; // By default
 	}
+} elseif ($modulepart == 'facture') {
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+	$object = new Facture($db);
+	if ($id > 0)
+	{
+		$result = $object->fetch($id);
+		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		$dir = $conf->$modulepart->dir_output; // By default
+	}
+} elseif ($modulepart == 'facture_fourn' || $modulepart == 'facture_fournisseur') {
+	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+	$object = new FactureFournisseur($db);
+	if ($id > 0)
+	{
+		$result = $object->fetch($id);
+		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		$dir = $conf->fournisseur->dir_output.'/facture'; // By default
+	}
 } elseif ($modulepart == 'medias') {
 	$dir = $dolibarr_main_data_root.'/'.$modulepart;
 } else {
-	print 'Action crop for modulepart = '.$modulepart.' is not supported yet by photos_resize.php.';
+	print 'Bug: Action crop for modulepart = '.$modulepart.' is not supported yet by photos_resize.php.';
 }
 
 if (empty($backtourl))
@@ -250,6 +274,8 @@ if (empty($backtourl))
 	elseif (in_array($modulepart, array('tax')))           $backtourl = DOL_URL_ROOT."/compta/sociales/document.php?id=".$id.'&file='.urldecode($file);
 	elseif (in_array($modulepart, array('ticket')))        $backtourl = DOL_URL_ROOT."/ticket/document.php?id=".$id.'&file='.urldecode($file);
 	elseif (in_array($modulepart, array('user')))          $backtourl = DOL_URL_ROOT."/user/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('facture')))       $backtourl = DOL_URL_ROOT."/compta/facture/document.php?id=".$id.'&file='.urldecode($file);
+	elseif (in_array($modulepart, array('facture_fourn', 'facture_fournisseur'))) $backtourl = DOL_URL_ROOT."/fourn/facture/document.php?id=".$id.'&file='.urldecode($file);
 	elseif (in_array($modulepart, array('bank')) && preg_match('/\/statement\/([^\/]+)\//', $file, $regs)) {
 		$num = $regs[1];
 		$backtourl = DOL_URL_ROOT."/compta/bank/account_statement_document.php?id=".$id.'&num='.urlencode($num).'&file='.urldecode($file);
@@ -269,10 +295,8 @@ if (empty($backtourl))
  * Actions
  */
 
-if ($cancel)
-{
-	if ($backtourl)
-	{
+if ($cancel) {
+	if ($backtourl) {
 		header("Location: ".$backtourl);
 		exit;
 	} else {
@@ -283,6 +307,10 @@ if ($cancel)
 
 if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex") && GETPOSTISSET("sizey"))
 {
+	if (empty($dir)) {
+		print 'Bug: Value for $dir could not be defined.';
+	}
+
 	$fullpath = $dir."/".$original_file;
 
 	$result = dol_imageResizeOrCrop($fullpath, 0, GETPOST('sizex', 'int'), GETPOST('sizey', 'int'));
@@ -350,9 +378,13 @@ if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex")
 // Crop d'une image
 if ($action == 'confirm_crop')
 {
+	if (empty($dir)) {
+		print 'Bug: Value for $dir could not be defined.';
+	}
+
 	$fullpath = $dir."/".$original_file;
 
-	//var_dump($_POST['w'].'x'.$_POST['h'].'-'.$_POST['x'].'x'.$_POST['y']);exit;
+	//var_dump($fullpath.' '.$_POST['w'].'x'.$_POST['h'].'-'.$_POST['x'].'x'.$_POST['y']);exit;
 	$result = dol_imageResizeOrCrop($fullpath, 1, GETPOST('w', 'int'), GETPOST('h', 'int'), GETPOST('x', 'int'), GETPOST('y', 'int'));
 
 	if ($result == $fullpath)
@@ -399,8 +431,7 @@ if ($action == 'confirm_crop')
 			$result = $ecmfile->create($user);
 		}
 
-		if ($backtourl)
-		{
+		if ($backtourl) {
 			header("Location: ".$backtourl);
 			exit;
 		} else {
@@ -419,10 +450,12 @@ if ($action == 'confirm_crop')
  * View
  */
 
-llxHeader($head, $langs->trans("Image"), '', '', 0, 0, array('/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js', '/core/js/lib_photosresize.js'), array('/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css'));
+$title= $langs->trans("ImageEditor");
+
+llxHeader($head, $title, '', '', 0, 0, array('/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js', '/core/js/lib_photosresize.js'), array('/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css'));
 
 
-print load_fiche_titre($langs->trans("ImageEditor"));
+print load_fiche_titre($title);
 
 $infoarray = dol_getImageSize($dir."/".GETPOST("file", 'alpha'));
 $height = $infoarray['height'];
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 92a767a23ea..5d3381b2719 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -196,7 +196,7 @@ if ($action == 'presend')
 	}
 
 	$formmail->withto = $liste;
-	$formmail->withtofree = (GETPOSTISSET('sendto') ? (GETPOST('sendto') ? GETPOST('sendto') : '1') : '1');
+	$formmail->withtofree = (GETPOSTISSET('sendto') ? (GETPOST('sendto', 'alphawithlgt') ? GETPOST('sendto', 'alphawithlgt') : '1') : '1');
 	$formmail->withtocc = $liste;
 	$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
 	$formmail->withtopic = $topicmail;
diff --git a/htdocs/core/tpl/commonfields_add.tpl.php b/htdocs/core/tpl/commonfields_add.tpl.php
index c7069b3d2aa..388b4b63926 100644
--- a/htdocs/core/tpl/commonfields_add.tpl.php
+++ b/htdocs/core/tpl/commonfields_add.tpl.php
@@ -55,8 +55,12 @@ foreach ($object->fields as $key => $val)
 	print '<td>';
 	if (!empty($val['picto'])) { print img_picto('', $val['picto']); }
 	if (in_array($val['type'], array('int', 'integer'))) $value = GETPOST($key, 'int');
+	elseif ($val['type'] == 'double') $value = price2num(GETPOST($key, 'alphanohtml'));
 	elseif ($val['type'] == 'text' || $val['type'] == 'html') $value = GETPOST($key, 'restricthtml');
-	else $value = GETPOST($key, 'alpha');
+	elseif ($val['type'] == 'date') $value = dol_mktime(12, 0, 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'));
+	elseif ($val['type'] == 'datetime') $value = dol_mktime(GETPOST($key.'hour', 'int'), GETPOST($key.'min', 'int'), 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'));
+	elseif ($val['type'] == 'boolean') $value = (GETPOST($key) == 'on' ? 1 : 0);
+	else $value = GETPOST($key, 'alphanohtml');
 	if ($val['noteditable']) print $object->showOutputField($val, $key, $value, '', '', '', 0);
 	else print $object->showInputField($val, $key, $value, '', '', '', 0);
 	print '</td>';
diff --git a/htdocs/core/tpl/commonfields_edit.tpl.php b/htdocs/core/tpl/commonfields_edit.tpl.php
index 946d8c0b504..76a9fafe417 100644
--- a/htdocs/core/tpl/commonfields_edit.tpl.php
+++ b/htdocs/core/tpl/commonfields_edit.tpl.php
@@ -53,6 +53,7 @@ foreach ($object->fields as $key => $val)
 	print '<td>';
 	if (!empty($val['picto'])) { print img_picto('', $val['picto']); }
 	if (in_array($val['type'], array('int', 'integer'))) $value = GETPOSTISSET($key) ?GETPOST($key, 'int') : $object->$key;
+	elseif ($val['type'] == 'double') $value = GETPOSTISSET($key) ? price2num(GETPOST($key, 'alphanohtml')) : $object->$key;
 	elseif (preg_match('/^(text|html)/', $val['type'])) {
 		$tmparray = explode(':', $val['type']);
 		if (!empty($tmparray[1])) {
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index a1abc3a9240..e3c45b788c6 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -82,9 +82,8 @@ if ($permission)
 
 	?>
 	<form class="tagtr liste_titre">
-		<div class="tagtd liste_titre"><?php echo $langs->trans("NatureOfContact"); ?></div>
 		<div class="tagtd liste_titre"><?php echo $langs->trans("ThirdParty"); ?></div>
-		<div class="tagtd liste_titre"><?php echo $langs->trans("Users").'/'.$langs->trans("Contacts"); ?></div>
+		<div class="tagtd liste_titre"><?php echo $langs->trans("Users").' | '.$langs->trans("Contacts"); ?></div>
 		<div class="tagtd liste_titre"><?php echo $langs->trans("ContactType"); ?></div>
 		<div class="tagtd liste_titre">&nbsp;</div>
 		<div class="tagtd liste_titre">&nbsp;</div>
@@ -96,14 +95,15 @@ if ($permission)
 	{
 		?>
 	<form class="tagtr impair nohover" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id; ?>" method="POST">
-	<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
-	<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
-	<input type="hidden" name="action" value="addcontact" />
-	<input type="hidden" name="source" value="internal" />
+		<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
+		<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
+		<input type="hidden" name="action" value="addcontact" />
+		<input type="hidden" name="source" value="internal" />
 	    <?php if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">'; ?>
-		<div class="nowrap tagtd"><?php echo img_object('', 'user').' '.$langs->trans("Users"); ?></div>
+
 		<div class="tagtd"><?php echo $conf->global->MAIN_INFO_SOCIETE_NOM; ?></div>
-		<div class="tagtd maxwidthonsmartphone"><?php echo $form->select_dolusers($user->id, 'userid', 0, (!empty($userAlreadySelected) ? $userAlreadySelected : null), 0, null, null, 0, 56, '', 0, '', 'minwidth200imp'); ?></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
 		$tmpobject = $object;
@@ -121,12 +121,12 @@ if ($permission)
 		?>
 
 	<form class="tagtr pair nohover" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id; ?>" method="POST">
-	<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
-	<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
-	<input type="hidden" name="action" value="addcontact" />
-	<input type="hidden" name="source" value="external" />
+		<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
+		<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
+		<input type="hidden" name="action" value="addcontact" />
+		<input type="hidden" name="source" value="external" />
 	    <?php if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">'; ?>
-		<div class="tagtd nowrap noborderbottom"><?php echo img_object('', 'contact').' '.$langs->trans("ThirdPartyContacts"); ?></div>
+
 		<div class="tagtd nowrap maxwidthonsmartphone noborderbottom">
 			<?php $selectedCompany = isset($_GET["newcompany"]) ? $_GET["newcompany"] : $object->socid; ?>
 			<?php
@@ -138,9 +138,10 @@ if ($permission)
 			?>
 			<?php $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp'); ?>
 		</div>
+		<!--  <div class="tagtd nowrap noborderbottom"><?php echo img_object('', 'contact').' '.$langs->trans("ThirdPartyContacts"); ?></div>-->
 		<div class="tagtd maxwidthonsmartphone noborderbottom">
 			<?php
-			print $form->selectcontacts(($selectedCompany > 0 ? $selectedCompany : -1), '', 'contactid', 3, '', '', 1, 'minwidth100imp');
+			print img_object('', 'contact', 'class="pictofixedwidth"').$form->selectcontacts(($selectedCompany > 0 ? $selectedCompany : -1), '', 'contactid', 3, '', '', 1, 'minwidth100imp');
 			$nbofcontacts = $form->num;
 
 			$newcardbutton = '';
@@ -277,9 +278,9 @@ print '<table class="tagtable nobottomiftotal liste">';
 //print '</tr>';
 
 print '<tr class="liste_titre">';
-print_liste_field_titre($arrayfields['nature']['label'], $_SERVER["PHP_SELF"], "nature", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($arrayfields['thirdparty']['label'], $_SERVER["PHP_SELF"], "thirdparty_name", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($arrayfields['contact']['label'], $_SERVER["PHP_SELF"], "contact_name", "", $param, "", $sortfield, $sortorder);
+print_liste_field_titre($arrayfields['nature']['label'], $_SERVER["PHP_SELF"], "nature", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], "type", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre($arrayfields['status']['label'], $_SERVER["PHP_SELF"], "statut", "", $param, "", $sortfield, $sortorder, 'center ');
 print_liste_field_titre('', $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder, 'center maxwidthsearch ');
@@ -289,9 +290,9 @@ foreach ($list as $entry)
 {
 	print '<tr class="oddeven">';
 
-	print '<td class="nowrap">'.$entry->nature.'</td>';
 	print '<td class="tdoverflowmax200">'.$entry->thirdparty_html.'</td>';
 	print '<td class="tdoverflowmax200">'.$entry->contact_html.'</td>';
+	print '<td class="nowrap"><span class="opacitymedium">'.$entry->nature.'</span></td>';
 	print '<td class="tdoverflowmax200">'.$entry->type.'</td>';
 	print '<td class="tdoverflowmax200 center">'.$entry->status.'</td>';
 
diff --git a/htdocs/core/tpl/extrafields_list_search_input.tpl.php b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
index bf31ff34ad7..d69c045641d 100644
--- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
@@ -14,7 +14,7 @@ if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey =
 // Loop to show all columns of extrafields for the search title line
 if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
-	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
+    if (!empty($extrafields->attributes[$extrafieldsobjectkey]['label']) && is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
 	{
 		if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
 		if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';
@@ -35,8 +35,8 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
 					print '<input class="flat'.($searchclass ? ' '.$searchclass : '').'" size="4" type="text" name="'.$search_options_pattern.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options[$search_options_pattern.$tmpkey]).'">';
 				} elseif (in_array($typeofextrafield, array('datetime', 'timestamp')))
 				{
-					// TODO
-					// Use showInputField in a particular manner to have input with a comparison operator, not input for a specific value date-hour-minutes
+					$morecss = '';
+					echo $extrafields->showInputField($key, $search_array_options[$search_options_pattern.$tmpkey], '', '', $search_options_pattern, $morecss, 0, $extrafieldsobjectkey, 1);
 				} else {
 					// for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')
 					$morecss = '';
diff --git a/htdocs/core/tpl/extrafields_list_search_param.tpl.php b/htdocs/core/tpl/extrafields_list_search_param.tpl.php
index 224066d57ce..5fca6bc70a9 100644
--- a/htdocs/core/tpl/extrafields_list_search_param.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_param.tpl.php
@@ -16,6 +16,22 @@ if (!empty($search_array_options) && is_array($search_array_options))	// $extraf
 	{
 		$crit = $val;
 		$tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);
+		if (is_array($val) && array_key_exists('start', $val) && array_key_exists('end', $val)) {
+			// date range from list filters is stored as array('start' => <timestamp>, 'end' => <timestamp>)
+			// start date
+			$param .= '&' . $search_options_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');
+			$val = '';
+		}
 		if ($val != '') $param .= '&'.$search_options_pattern.$tmpkey.'='.urlencode($val);
 	}
 }
diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index 5ef86f3b79d..b0fb03f2709 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -23,7 +23,17 @@ if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($
 
 		if ($crit != '' && in_array($typ, array('date', 'datetime', 'timestamp')))
 		{
-			$sql .= " AND ".$extrafieldsobjectprefix.$tmpkey." = '".$db->idate($crit)."'";
+			if (is_numeric($crit)) {
+				$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']) . "')";
+				} elseif ($crit['start'] !== '') {
+					$sql .= ' AND ('.$extrafieldsobjectprefix.$tmpkey." >= '". $db->idate($crit['start'])."')";
+				} elseif ($crit['end'] !== '') {
+					$sql .= ' AND ('.$extrafieldsobjectprefix.$tmpkey." <= '". $db->idate($crit['end'])."')";
+				}
+			}
 		} elseif (in_array($typ, array('boolean')))
 		{
 			if ($crit !== '-1' && $crit !== '') {
@@ -36,6 +46,7 @@ if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($
 			$mode_search = 0;
 			if (in_array($typ, array('int', 'double', 'real', 'price'))) $mode_search = 1; // Search on a numeric
 			if (in_array($typ, array('sellist', 'link')) && $crit != '0' && $crit != '-1') $mode_search = 2; // Search on a foreign key int
+			if (in_array($typ, array('sellist')) && !is_numeric($crit)) $mode_search = 0;// Search on a foreign key string
 			if (in_array($typ, array('chkbxlst', 'checkbox'))) $mode_search = 4; // Search on a multiselect field with sql type = text
 			if (is_array($crit)) $crit = implode(' ', $crit); // natural_search() expects a string
 			elseif ($typ === 'select' and is_string($crit) and strpos($crit, ' ') === false) {
diff --git a/htdocs/core/tpl/extrafields_list_search_title.tpl.php b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
index 1c071ac64c1..f1ea80871b8 100644
--- a/htdocs/core/tpl/extrafields_list_search_title.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
@@ -13,7 +13,7 @@ if (!isset($disablesortlink)) $disablesortlink = 0;
 // Loop to show all columns of extrafields for the title line
 if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
-	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
+    if (!empty($extrafields->attributes[$extrafieldsobjectkey]['label']) && is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
 	{
 		if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
 
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 9db0ae13824..f8d86f2abee 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -87,7 +87,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 		{
 			$value = (GETPOSTISSET("options_".$tmpkeyextra) ? GETPOST("options_".$tmpkeyextra) : $object->array_options["options_".$tmpkeyextra]);
 		} else {
-			$value = $object->array_options["options_".$tmpkeyextra];
+		    $value = (!empty($object->array_options["options_".$tmpkeyextra]) ? $object->array_options["options_".$tmpkeyextra] : '');
 			//var_dump($tmpkeyextra.' - '.$value);
 		}
 
@@ -112,7 +112,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 
 			$lastseparatorkeyfound = $tmpkeyextra;
 		} else {
-			print '<tr class="trextrafields_collapse'.$extrafields_collapse_num;
+			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';
 			}*/
@@ -165,7 +165,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 
 			$html_id = !empty($object->id) ? $object->element.'_extras_'.$tmpkeyextra.'_'.$object->id : '';
 
-			print '<td id="'.$html_id.'" class="'.$object->element.'_extras_'.$tmpkeyextra.' wordbreak"'.($cols ? ' colspan="'.$cols.'"' : '').'>';
+			print '<td id="'.$html_id.'" class="'.$object->element.'_extras_'.$tmpkeyextra.' wordbreak"'.(!empty($cols) ? ' colspan="'.$cols.'"' : '').'>';
 
 			// Convert date into timestamp format
 			if (in_array($extrafields->attributes[$object->table_element]['type'][$tmpkeyextra], array('date', 'datetime')))
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 821b423aab3..8d9c79f807d 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2009-2015 Regis Houssin <regis.houssin@inodbox.com>
- * Copyright (C) 2011-2013 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2009-2015 Regis Houssin       <regis.houssin@inodbox.com>
+ * Copyright (C) 2011-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
@@ -16,7 +16,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-// Need global variable $title to be defined by caller (like dol_loginfunction)
+// Need global variable $urllogo, $title and $titletruedolibarrversion to be defined by caller (like dol_loginfunction in security2.lib.php)
 // Caller can also set 	$morelogincontent = array(['options']=>array('js'=>..., 'table'=>...);
 
 
@@ -177,7 +177,7 @@ if ($captcha) {
 
 	<span class="fa fa-unlock"></span>
 	<span class="span-icon-security inline-block">
-	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security width150" type="text" maxlength="5" name="code" tabindex="3" />
+	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security width150" type="text" maxlength="5" name="code" tabindex="3" autocomplete="off" />
 	</span>
 	<span class="nowrap inline-block">
 	<img class="inline-block valignmiddle" src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" />
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 1c526f225aa..6ce323433dd 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -214,8 +214,7 @@ if ($nolinesbefore) {
 			if (empty($senderissupplier))
 			{
 				$statustoshow = 1;
-				if (!empty($conf->global->ENTREPOT_EXTRA_STATUS))
-				{
+				if (!empty($conf->global->ENTREPOT_EXTRA_STATUS)) {
 					// hide products in closed warehouse, but show products for internal transfer
 					$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
 				} else {
@@ -319,6 +318,14 @@ if ($nolinesbefore) {
 			echo $form->selectyesno('date_end_fill', $line->date_end_fill, 1);
 			echo '</div>';
 		}
+		if (is_object($objectline)) {
+			$temps = $objectline->showOptionals($extrafields, 'create', array(), '', '', 1, 'line');;
+			if (!empty($temps)) {
+				print '<div style="padding-top: 10px" id="extrafield_lines_area_create" name="extrafield_lines_area_create">';
+				print $temps;
+				print '</div>';
+			}
+		}
 		echo '</td>';
 		if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
 		{
@@ -412,10 +419,6 @@ if ($nolinesbefore) {
 </tr>
 
 <?php
-if (is_object($objectline)) {
-	print $objectline->showOptionals($extrafields, 'edit', array('colspan'=>$coldisplay), '', '', 1);
-}
-
 if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dateSelector && GETPOST('type') != '0')	// We show date field if required
 {
 	print '<tr id="trlinefordates" class="oddeven">'."\n";
@@ -516,13 +519,13 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 	<?php
 	if (!empty($conf->global->DISPLAY_MARGIN_RATES)) { ?>
 		$("input[name='np_marginRate']:first").blur(function(e) {
-		return checkFreeLine(e, "np_marginRate");
+			return checkFreeLine(e, "np_marginRate");
 		});
 		<?php
 	}
 	if (!empty($conf->global->DISPLAY_MARK_RATES)) { ?>
 		$("input[name='np_markRate']:first").blur(function(e) {
-		return checkFreeLine(e, "np_markRate");
+			return checkFreeLine(e, "np_markRate");
 		});
 		<?php
 	}
@@ -537,21 +540,21 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 
 	var rate = $("input[name='"+npRate+"']:first");
 	if (rate.val() == '')
-	return true;
+		return true;
 
 	if (! $.isNumeric(rate.val().replace(',','.')))
 	{
-	alert('<?php echo dol_escape_js($langs->trans("rateMustBeNumeric")); ?>');
-	e.stopPropagation();
-	setTimeout(function () { rate.focus() }, 50);
-	return false;
+		alert('<?php echo dol_escape_js($langs->trans("rateMustBeNumeric")); ?>');
+		e.stopPropagation();
+		setTimeout(function () { rate.focus() }, 50);
+		return false;
 	}
 	if (npRate == "np_markRate" && rate.val() >= 100)
 	{
-	alert('<?php echo dol_escape_js($langs->trans("markRateShouldBeLesserThan100")); ?>');
-	e.stopPropagation();
-	setTimeout(function () { rate.focus() }, 50);
-	return false;
+		alert('<?php echo dol_escape_js($langs->trans("markRateShouldBeLesserThan100")); ?>');
+		e.stopPropagation();
+		setTimeout(function () { rate.focus() }, 50);
+		return false;
 	}
 
 	var price = 0;
@@ -604,39 +607,39 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 	});
 
 	$("#prod_entry_mode_free").on( "click", function() {
-	setforfree();
+		setforfree();
 	});
 	$("#select_type").change(function()
 	{
-	setforfree();
+		setforfree();
 	if (jQuery('#select_type').val() >= 0)
 	{
 	/* focus work on a standard textarea but not if field was replaced with CKEDITOR */
-	jQuery('#dp_desc').focus();
-	/* focus if CKEDITOR */
-	if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
-	{
-	var editor = CKEDITOR.instances['dp_desc'];
-	if (editor) { editor.focus(); }
-	}
+		jQuery('#dp_desc').focus();
+		/* focus if CKEDITOR */
+		if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
+		{
+			var editor = CKEDITOR.instances['dp_desc'];
+			if (editor) { editor.focus(); }
+		}
 	}
 	console.log("Hide/show date according to product type");
 	if (jQuery('#select_type').val() == '0')
 	{
-	jQuery('#trlinefordates').hide();
-	jQuery('.divlinefordates').hide();
+		jQuery('#trlinefordates').hide();
+		jQuery('.divlinefordates').hide();
 	}
 	else
 	{
-	jQuery('#trlinefordates').show();
-	jQuery('.divlinefordates').show();
+		jQuery('#trlinefordates').show();
+		jQuery('.divlinefordates').show();
 	}
 	});
 
 	$("#prod_entry_mode_predef").on( "click", function() {
-	console.log("click prod_entry_mode_predef");
-	setforpredef();
-	jQuery('#trlinefordates').show();
+		console.log("click prod_entry_mode_predef");
+		setforpredef();
+		jQuery('#trlinefordates').show();
 	});
 
 	<?php
@@ -661,7 +664,6 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 			?>
 			var pbq = parseInt($('option:selected', this).attr('data-pbq'));	/* If product was selected with a HTML select */
 			if (isNaN(pbq)) { pbq = jQuery('#idprod').attr('data-pbq'); } 		/* If product was selected with a HTML input with autocomplete */
-			//console.log(pbq);
 
 			if ((jQuery('#idprod').val() > 0 || jQuery('#idprodfournprice').val()) && ! isNaN(pbq) && pbq > 0)
 			{
@@ -677,6 +679,39 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 					function(data) {
 						console.log("Load unit price end, we got value "+data.price_ht);
 						jQuery("#price_ht").val(data.price_ht);
+						<?php
+						if (!empty($conf->global->PRODUIT_AUTOFILL_DESC) && $conf->global->PRODUIT_AUTOFILL_DESC == 1) {
+							if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) { ?>
+						var proddesc = data.desc_trans;
+								<?php
+							} else { ?>
+						var proddesc = data.desc;
+								<?php
+							} ?>
+						console.log("Load desciption into text area : "+proddesc);
+							<?php
+							if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) { ?>
+						if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
+						{
+							var editor = CKEDITOR.instances['dp_desc'];
+							if (editor) {
+								editor.setData(proddesc);
+							}
+						}
+								<?php
+							} else { ?>
+						jQuery('#dp_desc').text(proddesc);
+								<?php
+							} ?>
+							<?php
+						} ?>
+						<?php
+						if (!empty($conf->global->PRODUCT_LOAD_EXTRAFIELD_INTO_OBJECTLINES)) { ?>
+							jQuery.each(data.array_options, function( key, value ) {
+								jQuery('div[class$="det'+key.replace('options_','_extras_')+'"] > #'+key).val(value);
+							});
+							<?php
+						} ?>
 					},
 					'json'
 				);
@@ -791,7 +826,10 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 		}
 		?>
 
-		/* To process customer price per quantity (CUSTOMER_PRICE_PER_QTY works only if combo product is not an ajax after x key pressed) */
+		<?php
+		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
+		{?>
+		/* To process customer price per quantity (PRODUIT_CUSTOMER_PRICES_BY_QTY works only if combo product is not an ajax after x key pressed) */
 		var pbq = parseInt($('option:selected', this).attr('data-pbq'));				// When select is done from HTML select
 		if (isNaN(pbq)) { pbq = jQuery('#idprod').attr('data-pbq');	}					// When select is done from HTML input with autocomplete
 		var pbqup = parseFloat($('option:selected', this).attr('data-pbqup'));
@@ -803,7 +841,7 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 		var pbqpercent = parseFloat($('option:selected', this).attr('data-pbqpercent'));
 		if (isNaN(pbqpercent)) { pbqpercent = jQuery('#idprod').attr('data-pbqpercent');	}
 
-		if ((jQuery('#idprod').val() > 0 || jQuery('#idprodfournprice').val()) && ! isNaN(pbq) && pbq > 0)
+		if ((jQuery('#idprod').val() > 0) && ! isNaN(pbq) && pbq > 0)
 		{
 			var pbqupht = pbqup;	/* TODO support of price per qty TTC not yet available */
 
@@ -818,12 +856,76 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 			{
 				jQuery("#remise_percent").val(pbqpercent);
 			}
+		} else { jQuery("#pbq").val(''); }
+			<?php
 		}
-		else
+		?>
+		//Deal with supplier
+		if (jQuery('#idprodfournprice').val() >0)
 		{
-			jQuery("#pbq").val('');
+			var up = parseFloat($('option:selected', this).attr('data-up')); 							// When select is done from HTML select
+			if (isNaN(up)) { up = parseFloat(jQuery('#idprodfournprice').attr('data-up'));}				// When select is done from HTML input with autocomplete
+
+			var qty = parseFloat($('option:selected', this).attr('data-qty'));
+			if (isNaN(qty)) { qty = parseFloat(jQuery('#idprodfournprice').attr('data-qty'));}
+
+			var discount = parseFloat($('option:selected', this).attr('data-discount'));
+			if (isNaN(discount)) { discount = parseFloat(jQuery('#idprodfournprice').attr('data-discount'));}
+
+			console.log("We find supplier price :"+up+" qty: "+qty+" discount: "+discount+" for product "+jQuery('#idprodfournprice').val());
+
+			jQuery("#price_ht").val(up);
+			if (jQuery("#qty").val() < qty)
+			{
+				jQuery("#qty").val(qty);
+			}
+			if (jQuery("#remise_percent").val() < discount)
+			{
+				jQuery("#remise_percent").val(discount);
+			}
+
+			<?php
+			if (!empty($conf->global->PRODUIT_AUTOFILL_DESC) && $conf->global->PRODUIT_AUTOFILL_DESC == 1) {
+				?>
+			var description = $('option:selected', this).attr('data-description');
+			if (typeof description == 'undefined') { description = jQuery('#idprodfournprice').attr('data-description');	}
+
+			console.log("Load desciption into text area : "+description);
+				<?php
+				if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) { ?>
+			if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
+			{
+				var editor = CKEDITOR.instances['dp_desc'];
+				if (editor) {
+					editor.setData(description);
+				}
+			}
+					<?php
+				} else { ?>
+			jQuery('#dp_desc').text(description);
+					<?php
+				}
+			}?>
+		} else if (jQuery('#idprodfournprice').length > 0) {
+			<?php
+			if (!empty($conf->global->PRODUIT_AUTOFILL_DESC) && $conf->global->PRODUIT_AUTOFILL_DESC == 1) {
+				if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) { ?>
+			if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
+			{
+				var editor = CKEDITOR.instances['dp_desc'];
+				if (editor) {
+					editor.setData('');
+				}
+			}
+					<?php
+				} else { ?>
+			jQuery('#dp_desc').text('');
+					<?php
+				}
+			}?>
 		}
 
+
 		/* To set focus */
 		if (jQuery('#idprod').val() > 0 || jQuery('#idprodfournprice').val() > 0)
 		{
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index bc6b87a3353..d5eac3e83c2 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -125,6 +125,17 @@ $coldisplay++;
 		print '<textarea id="product_desc" class="flat" name="product_desc" readonly style="width: 200px; height:80px;">'.$line->description.'</textarea>';
 	}
 
+	//Line extrafield
+	if (!empty($extrafields))
+	{
+		$temps = $line->showOptionals($extrafields, 'edit', array('class'=>'tredited'), '', '', 1, 'line');
+		if (!empty($temps)) {
+			print '<div style="padding-top: 10px" id="extrafield_lines_area_edit" name="extrafield_lines_area_edit">';
+			print $temps;
+			print '</div>';
+		}
+	}
+
 	// Show autofill date for recuring invoices
 	if (!empty($conf->service->enabled) && $line->product_type == 1 && $line->element == 'facturedetrec')
 	{
@@ -189,11 +200,21 @@ $coldisplay++;
 	</td>
 
 	<?php
-	if (!empty($conf->global->PRODUCT_USE_UNITS))
-	{
+	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		$unit_type = false;
+		// limit unit select to unit type
+		if (!empty($line->fk_unit) && empty($conf->global->MAIN_EDIT_LINE_ALLOW_ALL_UNIT_TYPE)) {
+			include_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
+			$cUnit = new CUnits($line->db);
+			if ($cUnit->fetch($line->fk_unit) > 0) {
+				if (!empty($cUnit->unit_type)) {
+					$unit_type = $cUnit->unit_type;
+				}
+			}
+		}
 		$coldisplay++;
 		print '<td class="left">';
-		print $form->selectUnits($line->fk_unit, "units");
+		print $form->selectUnits($line->fk_unit, "units", 0, $unit_type);
 		print '</td>';
 	}
 	?>
@@ -260,14 +281,6 @@ $coldisplay++;
 	</td>
 </tr>
 
-<?php
-//Line extrafield
-if (!empty($extrafields))
-{
-	print $line->showOptionals($extrafields, 'edit', array('class'=>'tredited', 'colspan'=>$coldisplay), '', '', 1);
-}
-?>
-
 <?php if (!empty($conf->service->enabled) && $line->product_type == 1 && $dateSelector) { ?>
 <tr id="service_duration_area" class="treditedlinefordate">
 	<?php if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php
index bfced08e5c8..8a7c38f8ada 100644
--- a/htdocs/core/tpl/objectline_title.tpl.php
+++ b/htdocs/core/tpl/objectline_title.tpl.php
@@ -65,6 +65,7 @@ if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || !empty($conf->global->FA
 } else {
 	print $langs->trans('VAT');
 }
+
 if (in_array($object->element, array('propal', 'commande', 'facture')) && $object->status == $object::STATUS_DRAFT)
 {
 	global $mysoc;
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index cba0b0b3e53..e3516b8b2fc 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -119,8 +119,7 @@ if (($line->info_bits & 2) == 2) {
 } else {
 	$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE ? 'dayhour' : 'day';
 
-	if ($line->fk_product > 0)
-	{
+	if ($line->fk_product > 0) {
 		print $form->textwithtooltip($text, $description, 3, '', '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
 	} else {
 		$type = (!empty($line->product_type) ? $line->product_type : $line->fk_product_type);
@@ -158,9 +157,19 @@ if (($line->info_bits & 2) == 2) {
 	{
 		print (!empty($line->description) && $line->description != $line->product_label) ? '<br>'.dol_htmlentitiesbr($line->description) : '';
 	}
+	//Line extrafield
+	if (!empty($extrafields))
+	{
+		$temps = $line->showOptionals($extrafields, 'view', array(), '', '', 1, 'line');
+		if (!empty($temps)) {
+			print '<div style="padding-top: 10px" id="extrafield_lines_area_'.$line->id.'" name="extrafield_lines_area_'.$line->id.'">';
+			print $temps;
+			print '</div>';
+		}
+	}
 }
 
-if ($user->rights->fournisseur->lire && $line->fk_fournprice > 0)
+if ($user->rights->fournisseur->lire && $line->fk_fournprice > 0 && empty($conf->global->SUPPLIER_HIDE_SUPPLIER_OBJECTLINES))
 {
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 	$productfourn = new ProductFournisseur($this->db);
@@ -361,10 +370,4 @@ if ($action == 'selectlines') { ?>
 
 print "</tr>\n";
 
-//Line extrafield
-if (!empty($extrafields))
-{
-	print $line->showOptionals($extrafields, 'view', array('style'=>'class="drag drop oddeven"', 'colspan'=>$coldisplay), '', '', 1);
-}
-
 print "<!-- END PHP TEMPLATE objectline_view.tpl.php -->\n";
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 937ee63a68c..2fb21094b4d 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -81,9 +81,9 @@ $(document).ready(function () {
 <!-- Title with version -->
 <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">';
+if (!empty($disablenofollow)) echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
 echo dol_escape_htmltag($title);
-if ($disablenofollow) echo '</a>';
+if (!empty($disablenofollow)) echo '</a>';
 ?>
 </div>
 
@@ -113,7 +113,7 @@ if ($disablenofollow) echo '</a>';
 </div>
 
 <?php
-if ($captcha) {
+if (!empty($captcha)) {
 	// Add a variable param to force not using cache (jmobile)
 	$php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time
 	if (preg_match('/\?/', $php_self)) $php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog');
@@ -126,7 +126,7 @@ if ($captcha) {
 
 	<span class="fa fa-unlock"></span>
 	<span class="nofa inline-block">
-	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security width150" type="text" maxlength="5" name="code" tabindex="3" />
+	<input id="securitycode" placeholder="<?php echo $langs->trans("SecurityCode"); ?>" class="flat input-icon-security width150" type="text" maxlength="5" name="code" tabindex="3" autocomplete="off" />
 	</span>
 	<span class="nowrap inline-block">
 	<img class="inline-block valignmiddle" src="<?php echo DOL_URL_ROOT ?>/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" />
@@ -200,7 +200,7 @@ if (!empty($morelogincontent)) {
 
 <br>
 
-<?php if ($message) { ?>
+<?php if (!empty($message)) { ?>
 	<div class="center login_main_message">
 	<?php echo dol_htmloutput_mesg($message, '', '', 1); ?>
 	</div>
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index 9793022319e..d4bd29838e8 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -158,6 +158,18 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				}
 			}
 
+			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)) {
+					/** @var Expedition $shipment */
+					$shipment = array_shift($object->linkedObjects['shipping']);
+
+					$ret = $shipment->setClosed();
+				}
+			}
+
 			return $ret;
 		}
 
@@ -259,9 +271,10 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 					}
 				}
 
-				//Build array of quantity ordered by product
+				//Build array of quantity ordered to be shipped
 				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;
 					}
@@ -294,7 +307,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 					dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
 					if ($totalonlinkedelements == $object->total_ht) {
 						foreach ($object->linkedObjects['reception'] as $element) {
-							$ret = $element->set_billed();
+							$ret = $element->setBilled();
 						}
 					}
 				}
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 221c1d70846..94d64886012 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -69,6 +69,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 
 		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 		$b = new BlockedLog($this->db);
+		$b->loadTrackedEvents();
 
 		// Tracked events
 		if (!in_array($action, array_keys($b->trackedevents))) {
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index c5a4f450e42..a6078796478 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -46,7 +46,8 @@ class InterfaceNotification extends DolibarrTriggers
 		'EXPENSE_REPORT_VALIDATE',
 		'EXPENSE_REPORT_APPROVE',
 		'HOLIDAY_VALIDATE',
-		'HOLIDAY_APPROVE'
+		'HOLIDAY_APPROVE',
+        'ACTION_CREATE'
 	);
 
 	/**
diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 7bb8988e18e..55c128c2f0f 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -198,11 +198,21 @@ class InterfaceTicketEmail extends DolibarrTriggers
 
 				if (empty($conf->global->TICKET_DISABLE_CUSTOMER_MAILS) && empty($object->context['disableticketemail']) && $object->notify_tiers_at_create) {
 					$sendto = '';
-					if (empty($user->socid) && empty($user->email)) {
-							  $object->fetch_thirdparty();
-							  $sendto = $object->thirdparty->email;
-					} else {
-						$sendto = $user->email;
+
+					//if contact selected send to email's contact else send to email's thirdparty
+
+					$contactid = GETPOST('contactid', 'alpha');
+
+					if (!empty($contactid)) {
+						$contact = new Contact($this->db);
+						$res = $contact->fetch($contactid);
+					}
+
+					if ($res > 0 && !empty($contact->email) && !empty($contact->statut)) {
+						$sendto = $contact->email;
+					} elseif (!empty($object->fk_soc)) {
+						$object->fetch_thirdparty();
+						$sendto = $object->thirdparty->email;
 					}
 
 					if ($sendto) {
diff --git a/htdocs/debugbar/class/TraceableDB.php b/htdocs/debugbar/class/TraceableDB.php
index 0cb380f39a1..af11f4c1d67 100644
--- a/htdocs/debugbar/class/TraceableDB.php
+++ b/htdocs/debugbar/class/TraceableDB.php
@@ -80,12 +80,13 @@ class TraceableDB extends DoliDB
 	 * Convert (by PHP) a GM Timestamp date into a string date with PHP server TZ to insert into a date field.
 	 * Function to use to build INSERT, UPDATE or WHERE predica
 	 *
-	 * @param   int		$param 		Date TMS to convert
-	 * @return  string            	Date in a string YYYYMMDDHHMMSS
+	 *   @param	    int		$param      Date TMS to convert
+	 *	 @param		mixed	$gm			'gmt'=Input informations are GMT values, 'tzserver'=Local to server TZ
+	 *   @return	string      		Date in a string YYYY-MM-DD HH:MM:SS
 	 */
-	public function idate($param)
+	public function idate($param, $gm = 'tzserver')
 	{
-		return $this->db->idate($param);
+		return $this->db->idate($param, $gm);
 	}
 
 	/**
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index 78a3d50dfcc..7b0896134e0 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -118,7 +118,7 @@ if ($action == 'set_DONATION_ACCOUNTINGACCOUNT')
 
 	$res = dolibarr_set_const($db, "DONATION_ACCOUNTINGACCOUNT", $account, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -134,7 +134,7 @@ if ($action == 'set_DONATION_MESSAGE')
 
 	$res = dolibarr_set_const($db, "DONATION_MESSAGE", $freemessage, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index cd3175cdce0..1f0835ee80b 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -255,7 +255,7 @@ if ($action == 'set_cancel') {
 }
 if ($action == 'set_paid') {
 	$object->fetch($id);
-	if ($object->set_paid($id, $modepayment) >= 0) {
+	if ($object->setPaid($id, $modepayment) >= 0) {
 		$action = '';
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index be9426415fe..7e9b913312a 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -761,13 +761,28 @@ class Don extends CommonObject
 	/**
 	 *    Classify the donation as paid, the donation was received
 	 *
-	 *    @param	int		$id           	    id of donation
-	 *    @param    int		$modepayment   	    mode of payment
-	 *    @return   int      					<0 if KO, >0 if OK
+	 *	@deprecated
+	 *  @see setPaid()
+	 *  @param	int		$id           	    id of donation
+	 *  @param    int		$modepayment   	    mode of payment
+	 *  @return   int      					<0 if KO, >0 if OK
 	 */
 	public function set_paid($id, $modepayment = 0)
 	{
 		// phpcs:enable
+		dol_syslog(get_class($this)."::set_paid is deprecated, use setPaid instead", LOG_NOTICE);
+		return $this->setPaid($id, $modepayment);
+	}
+
+	/**
+	 *    Classify the donation as paid, the donation was received
+	 *
+	 *    @param	int		$id           	    id of donation
+	 *    @param    int		$modepayment   	    mode of payment
+	 *    @return   int      					<0 if KO, >0 if OK
+	 */
+	public function setPaid($id, $modepayment = 0)
+	{
 		$sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2";
 		if ($modepayment)
 		{
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index c7c16ee970b..e827bca338d 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -184,7 +184,7 @@ if ($resql)
 			print '<td class="right">'.price($objp->d_amount).'</td>';
 			// Status
 			print '<td class="center">'.$don->getLibStatut(4, $objp->amount).'</td>';
-			// Amount payed
+			// Amount paid
 			print '<td class="right">'.price($objp->amount).'</td>';
 			print "</tr>\n";
 			if ($objp->paid == 1) {
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 452f06efb0a..ae7aa840ab9 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -81,6 +81,9 @@ $error = 0;
  *	Actions
  */
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('ecmautocard', 'globalcard'));
+
 // 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
 {
@@ -327,6 +330,14 @@ if (!empty($conf->global->ECM_AUTO_TREE_ENABLED))
 	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"))); }
 	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"))); }
 	$rowspan++; $sectionauto[] = array('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;
+		$rowspan += count($hookmanager->resArray);
+	}
 }
 
 $head = ecm_prepare_dasboard_head('');
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 1a05017c1d3..3d07d52506b 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -202,7 +202,6 @@ class EmailCollector extends CommonObject
 
 	public $debuginfo;
 
-
 	const STATUS_DISABLED = 0;
 	const STATUS_ENABLED = 1;
 
@@ -252,6 +251,15 @@ class EmailCollector extends CommonObject
 	 */
 	public function create(User $user, $notrigger = false)
 	{
+		global $langs;
+
+		// Check parameters
+		if ($this->host && preg_match('/^http:/i', trim($this->host))) {
+			$langs->load("errors");
+			$this->error = $langs->trans("ErrorHostMustNotStartWithHttp", $this->host);
+			return -1;
+		}
+
 		$id = $this->createCommon($user, $notrigger);
 
 		if (is_array($this->filters) && count($this->filters)) {
@@ -450,6 +458,15 @@ class EmailCollector extends CommonObject
 	 */
 	public function update(User $user, $notrigger = false)
 	{
+		global $langs;
+
+		// Check parameters
+		if ($this->host && preg_match('/^http:/i', trim($this->host))) {
+			$langs->load("errors");
+			$this->error = $langs->trans("ErrorHostMustNotStartWithHttp", $this->host);
+			return -1;
+		}
+
 		return $this->updateCommon($user, $notrigger);
 	}
 
@@ -716,11 +733,15 @@ class EmailCollector extends CommonObject
 
 		// Connect to IMAP
 		$flags = '/service=imap'; // IMAP
-		if ($ssl) $flags .= '/ssl'; // '/tls'
+		if (!empty($conf->global->IMAP_FORCE_TLS)) {
+			$flags .= '/tls';
+		} elseif (empty($conf->global->IMAP_FORCE_NOSSL)) {
+			if ($ssl) $flags .= '/ssl';
+		}
 		$flags .= '/novalidate-cert';
 		//$flags.='/readonly';
 		//$flags.='/debug';
-		if ($norsh || !empty($conf->global->IMPA_FORCE_NORSH)) $flags .= '/norsh';
+		if ($norsh || !empty($conf->global->IMAP_FORCE_NORSH)) $flags .= '/norsh';
 
 		$connectstringserver = '{'.$this->host.':993'.$flags.'}';
 
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 31ea04c1fdf..0652424d919 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -188,7 +188,6 @@ if (empty($reshook))
 	if ($action == 'add' && $user->rights->expedition->creer)
 	{
 		$error = 0;
-		$predef = '';
 
 		$db->begin();
 
@@ -215,7 +214,6 @@ if (empty($reshook))
 		$object->fk_delivery_address	= $objectsrc->fk_delivery_address;
 		$object->shipping_method_id		= GETPOST('shipping_method_id', 'int');
 		$object->tracking_number = GETPOST('tracking_number', 'alpha');
-		$object->ref_int = GETPOST('ref_int', 'alpha');
 		$object->note_private = GETPOST('note_private', 'restricthtml');
 		$object->note_public = GETPOST('note_public', 'restricthtml');
 		$object->fk_incoterms = GETPOST('incoterm_id', 'int');
@@ -525,7 +523,7 @@ if (empty($reshook))
 	} elseif ($action == 'classifybilled')
 	{
 		$object->fetch($id);
-		$result = $object->set_billed();
+		$result = $object->setBilled();
 		if ($result >= 0) {
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit();
@@ -1015,12 +1013,12 @@ if ($action == 'create')
 
 			// Document model
 			include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
-			$liste = ModelePdfExpedition::liste_modeles($db);
-			if (count($liste) > 1)
+			$list = ModelePdfExpedition::liste_modeles($db);
+			if (count($list) > 1)
 			{
 				print "<tr><td>".$langs->trans("DefaultModel")."</td>";
 				print '<td colspan="3">';
-				print $form->selectarray('model', $liste, $conf->global->EXPEDITION_ADDON_PDF);
+				print $form->selectarray('model', $list, $conf->global->EXPEDITION_ADDON_PDF);
 				print "</td></tr>\n";
 			}
 
@@ -1261,7 +1259,7 @@ if ($action == 'create')
 										}
 										print "<tr class=\"oddeven\"><td>&nbsp; &nbsp; &nbsp; ->
 											<a href=\"".DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
-											</a> (".$value['nb'].")</td><td class=\"center\"> ".$value['nb_total']."</td><td>&nbsp</td><td>&nbsp</td>
+											</a> (".$value['nb'].")</td><td class=\"center\"> ".$value['nb_total']."</td><td>&nbsp;</td><td>&nbsp;</td>
 											<td class=\"center\">".$value['stock']." ".$img."</td></tr>";
 									}
 								}
@@ -1414,7 +1412,7 @@ if ($action == 'create')
 										print '<tr class"oddeven"><td>';
 										print "&nbsp; &nbsp; &nbsp; ->
 										<a href=\"".DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
-										</a> (".$value['nb'].")</td><td class=\"center\"> ".$value['nb_total']."</td><td>&nbsp</td><td>&nbsp</td>
+										</a> (".$value['nb'].")</td><td class=\"center\"> ".$value['nb_total']."</td><td>&nbsp;</td><td>&nbsp;</td>
 										<td class=\"center\">".$value['stock']." ".$img."</td>";
 										print "</tr>";
 									}
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index e4722cabb4d..df2e3f347e0 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -499,8 +499,8 @@ class Expedition extends CommonObject
 		// create shipment lines
 		foreach ($stockLocationQty as $stockLocation => $qty)
 		{
-			if (($line_id = $this->create_line($stockLocation, $line_ext->origin_line_id, $qty, $line_ext->rang, $array_options)) < 0)
-			{
+			$line_id = $this->create_line($stockLocation, $line_ext->origin_line_id, $qty, $line_ext->rang, $array_options);
+			if ($line_id < 0) {
 				$error++;
 			} else {
 				// create shipment batch lines for stockLocation
@@ -581,7 +581,7 @@ class Expedition extends CommonObject
 				$this->date_delivery        = $this->db->jdate($obj->date_delivery); // Date planed
 				$this->fk_delivery_address  = $obj->fk_address;
 				$this->model_pdf            = $obj->model_pdf;
-				$this->modelpdf             = $obj->model_pdf;
+				$this->modelpdf             = $obj->model_pdf; // deprecated
 				$this->shipping_method_id   = $obj->fk_shipping_method;
 				$this->shipping_method = $obj->shipping_method;
 				$this->tracking_number      = $obj->tracking_number;
@@ -629,7 +629,7 @@ class Expedition extends CommonObject
 				if (!empty($conf->multicurrency->enabled))
 				{
 					if (!empty($this->multicurrency_code)) $this->multicurrency_code = $this->thirdparty->multicurrency_code;
-					if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx))	$this->multicurrency_tx = $this->thirdparty->multicurrency_tx;
+					if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($this->thirdparty->multicurrency_tx))	$this->multicurrency_tx = $this->thirdparty->multicurrency_tx;
 				}
 
 				/*
@@ -671,7 +671,7 @@ class Expedition extends CommonObject
 		// Protection
 		if ($this->statut)
 		{
-			dol_syslog(get_class($this)."::valid no draft status", LOG_WARNING);
+			dol_syslog(get_class($this)."::valid not in draft status", LOG_WARNING);
 			return 0;
 		}
 
@@ -757,7 +757,7 @@ class Expedition extends CommonObject
 
 					//var_dump($this->lines[$i]);
 					$mouvS = new MouvementStock($this->db);
-					$mouvS->origin = &$this;
+					$mouvS->origin = dol_clone($this, 1);
 
 					if (empty($obj->edbrowid))
 					{
@@ -765,6 +765,7 @@ class Expedition extends CommonObject
 
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
 						$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr", $numref));
+
 						if ($result < 0) {
 							$error++;
 							$this->error = $mouvS->error;
@@ -794,7 +795,6 @@ class Expedition extends CommonObject
 
 		// Change status of order to "shipment in process"
 		$ret = $this->setStatut(Commande::STATUS_SHIPMENTONPROCESS, $this->origin_id, $this->origin);
-
 		if (!$ret)
 		{
 			$error++;
@@ -1081,8 +1081,8 @@ class Expedition extends CommonObject
 		if (isset($this->size_units)) $this->size_units = trim($this->size_units);
 		if (isset($this->weight_units)) $this->weight_units = trim($this->weight_units);
 		if (isset($this->trueWeight)) $this->weight = trim($this->trueWeight);
-		if (isset($this->note_private)) $this->note = trim($this->note_private);
-		if (isset($this->note_public)) $this->note = trim($this->note_public);
+		if (isset($this->note_private)) $this->note_private = trim($this->note_private);
+		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
 		if (isset($this->model_pdf)) $this->model_pdf = trim($this->model_pdf);
 
 
@@ -1093,7 +1093,6 @@ class Expedition extends CommonObject
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."expedition SET";
 
-		$sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
 		$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "null").",";
 		$sql .= " ref_ext=".(isset($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null").",";
 		$sql .= " ref_customer=".(isset($this->ref_customer) ? "'".$this->db->escape($this->ref_customer)."'" : "null").",";
@@ -1117,7 +1116,7 @@ class Expedition 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 .= " model_pdf=".(isset($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null").",";
 		$sql .= " entity=".$conf->entity;
 
 		$sql .= " WHERE rowid=".$this->id;
@@ -2308,11 +2307,24 @@ class Expedition extends CommonObject
 	/**
 	 *	Classify the shipping as invoiced (used when WORKFLOW_BILL_ON_SHIPMENT is on)
 	 *
+	 *	@deprecated
+	 *  @see setBilled()
 	 *	@return     int     <0 if ko, >0 if ok
 	 */
 	public function set_billed()
 	{
 		// phpcs:enable
+		dol_syslog(get_class($this)."::set_billed is deprecated, use setBilled instead", LOG_NOTICE);
+		return $this->setBilled();
+	}
+
+	/**
+	 *	Classify the shipping as invoiced (used when WORKFLOW_BILL_ON_SHIPMENT is on)
+	 *
+	 *	@return     int     <0 if ko, >0 if ok
+	 */
+	public function setBilled()
+	{
 		global $user;
 		$error = 0;
 
@@ -2751,7 +2763,7 @@ class ExpeditionLigne extends CommonObjectLine
 		$ranktouse = $this->rang;
 		if ($ranktouse == -1)
 		{
-			$rangmax = $this->line_max($fk_expedition);
+			$rangmax = $this->line_max($this->fk_expedition);
 			$ranktouse = $rangmax + 1;
 		}
 
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 28c0673ef17..a21ad170b09 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -211,8 +211,9 @@ $helpurl = 'EN:Module_Shipments|FR:Module_Exp&eacute;ditions|ES:M&oacute;dulo_Ex
 llxHeader('', $langs->trans('ListOfSendings'), $helpurl);
 
 $sql = 'SELECT';
-if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
-$sql .= " e.rowid, e.ref, e.ref_customer, e.date_expedition as date_expedition, e.weight, e.weight_units, e.date_delivery as delivery_date, l.date_delivery as date_reception, e.fk_statut, e.billed, e.tracking_number,";
+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 .= " 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,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
@@ -242,11 +243,12 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid =
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'shipping' AND ee.targettype = 'delivery'";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.rowid = ee.fk_target";
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON e.fk_user_author = u.rowid';
-
+if ($search_user > 0) {		// Get link to order to get the order id in eesource.fk_source
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as eesource ON eesource.fk_target = e.rowid AND eesource.targettype = 'shipping' AND eesource.sourcetype = 'commande'";
+}
 // We'll need this table joined to the select in order to filter by sale
 if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-if ($search_user > 0)
-{
+if ($search_user > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
@@ -272,8 +274,13 @@ if ($search_zip)   $sql .= natural_search("s.zip", $search_zip);
 if ($search_state) $sql .= natural_search("state.nom", $search_state);
 if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
 if ($search_tracking)   $sql .= natural_search("e.tracking_number", $search_tracking);
-if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
+if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
 if ($search_sale > 0)                        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;
+if ($search_user > 0)
+{
+	// The contact on a shipment is also the contact of the order.
+	$sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='commande' AND tc.source='internal' AND ec.element_id = eesource.fk_source AND ec.fk_socpeople = ".$db->escape($search_user);
+}
 if ($search_ref_exp) $sql .= natural_search('e.ref', $search_ref_exp);
 if ($search_ref_liv) $sql .= natural_search('l.ref', $search_ref_liv);
 if ($search_company) $sql .= natural_search('s.nom', $search_company);
@@ -332,6 +339,7 @@ if ($resql)
 	if ($search_tracking)   $param .= "&amp;search_tracking=".urlencode($search_tracking);
 	if ($search_town)      $param .= '&search_town='.urlencode($search_town);
 	if ($search_zip)       $param .= '&search_zip='.urlencode($search_zip);
+	if ($search_type_thirdparty != '' && $search_type_thirdparty > 0)   $param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
 
 	if ($search_datedelivery_start)	$param .= '&search_datedelivery_start='.urlencode($search_datedelivery_start);
 	if ($search_datedelivery_end)	$param .= '&search_datedelivery_end='.urlencode($search_datedelivery_end);
@@ -483,7 +491,7 @@ if ($resql)
 	if (!empty($arrayfields['typent.code']['checked']))
 	{
 		print '<td class="liste_titre maxwidthonsmartphone center">';
-		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
+		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 		print '</td>';
 	}
 	// Weight
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 39772360227..1c4e5bf5c25 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -813,8 +813,8 @@ if ($id > 0 || !empty($ref))
 								}
 								print '<tr class="oddeven"><td>&nbsp; &nbsp; &nbsp; -> <a href="'.DOL_URL_ROOT."/product/card.php?id=".$value['id'].'">'.$value['fullpath'].'</a> ('.$value['nb'].')</td>';
 								print '<td class="center"> '.$value['nb_total'].'</td>';
-								print '<td>&nbsp</td>';
-								print '<td>&nbsp</td>';
+								print '<td>&nbsp;</td>';
+								print '<td>&nbsp;</td>';
 								print '<td class="center">'.$value['stock'].' '.$img.'</td></tr>'."\n";
 							}
 						}
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 71f190a08f9..6ff4c418988 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -953,35 +953,7 @@ if (empty($reshook))
 		$object = new ExpenseReport($db);
 		$object->fetch($id);
 
-		$result = $object->set_unpaid($user);
-
-		if ($result > 0)
-		{
-			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
-				$outputlangs = $langs;
-				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-				if (!empty($newlang)) {
-					$outputlangs = new Translate("", $conf);
-					$outputlangs->setDefaultLang($newlang);
-				}
-				$model = $object->model_pdf;
-				$ret = $object->fetch($id); // Reload to get new records
-
-				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			}
-		}
-	}
-
-	if ($action == 'set_unpaid' && $id > 0 && $user->rights->expensereport->to_paid)
-	{
-		$object = new ExpenseReport($db);
-		$object->fetch($id);
-
-		$result = $object->set_unpaid($user);
+		$result = $object->setUnpaid($user);
 
 		if ($result > 0)
 		{
@@ -1009,7 +981,7 @@ if (empty($reshook))
 		$object = new ExpenseReport($db);
 		$object->fetch($id);
 
-		$result = $object->set_paid($id, $user);
+		$result = $object->setPaid($id, $user);
 
 		if ($result > 0)
 		{
@@ -1492,8 +1464,7 @@ if ($action == 'create')
 
 	print '</form>';
 } else {
-	if ($id > 0 || $ref)
-	{
+	if ($id > 0 || $ref) {
 		$result = $object->fetch($id, $ref);
 
 		$res = $object->fetch_optionals();
@@ -1755,6 +1726,7 @@ if ($action == 'create')
 				}
 				print '</td></tr>';
 
+				// Period
 				print '<tr>';
 				print '<td class="titlefield">'.$langs->trans("Period").'</td>';
 				print '<td>';
@@ -1772,9 +1744,9 @@ if ($action == 'create')
 				// Validation date
 				print '<tr>';
 				print '<td>'.$langs->trans("DATE_SAVE").'</td>';
-				print '<td>'.dol_print_date($object->date_valid, 'dayhour');
-				if ($object->status == 2 && $object->hasDelay('toapprove')) print ' '.img_warning($langs->trans("Late"));
-				if ($object->status == 5 && $object->hasDelay('topay')) print ' '.img_warning($langs->trans("Late"));
+				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>';
 
@@ -1815,7 +1787,7 @@ if ($action == 'create')
 					print '</tr>';
 					print '<tr>';
 					print '<td>'.$langs->trans("DATE_CANCEL").'</td>';
-					print '<td>'.dol_print_date($object->date_cancel, 'dayhour').'</td></tr>';
+					print '<td>'.dol_print_date($object->date_cancel, 'dayhour', 'tzuser').'</td></tr>';
 					print '</tr>';
 				} else {
 					print '<tr>';
@@ -1831,7 +1803,7 @@ if ($action == 'create')
 
 					print '<tr>';
 					print '<td>'.$langs->trans("DateApprove").'</td>';
-					print '<td>'.dol_print_date($object->date_approve, 'dayhour').'</td></tr>';
+					print '<td>'.dol_print_date($object->date_approve, 'dayhour', 'tzuser').'</td></tr>';
 					print '</tr>';
 				}
 
@@ -1847,7 +1819,7 @@ if ($action == 'create')
 
 					print '<tr>';
 					print '<td>'.$langs->trans("DATE_REFUS").'</td>';
-					print '<td>'.dol_print_date($object->date_refuse, 'dayhour');
+					print '<td>'.dol_print_date($object->date_refuse, 'dayhour', 'tzuser');
 					if ($object->detail_refuse) print ' - '.$object->detail_refuse;
 					print '</td>';
 					print '</tr>';
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 8d5cbd3c2cc..cdc4fe4da5d 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -66,14 +66,14 @@ class ExpenseReport extends CommonObject
 	public $date_fin;
 
 	/**
-	 * 0=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=payed, 99=denied
+	 * 0=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=paid, 99=denied
 	 *
 	 * @var int		Status
 	 */
 	public $status;
 
 	/**
-	 * 0=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=payed, 99=denied
+	 * 0=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=paid, 99=denied
 	 *
 	 * @var int		Status
 	 * @deprecated
@@ -256,6 +256,7 @@ class ExpenseReport extends CommonObject
 		$sql .= ",date_debut";
 		$sql .= ",date_fin";
 		$sql .= ",date_create";
+		$sql .= ",fk_user_creat";
 		$sql .= ",fk_user_author";
 		$sql .= ",fk_user_validator";
 		$sql .= ",fk_user_approve";
@@ -274,6 +275,7 @@ class ExpenseReport extends CommonObject
 		$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");
@@ -335,6 +337,7 @@ class ExpenseReport extends CommonObject
 						if ($result < 0)
 						{
 							$this->error = $newndfline->error;
+							$this->errors = $newndfline->errors;
 							$error++;
 							break;
 						}
@@ -419,6 +422,7 @@ class ExpenseReport extends CommonObject
 		$this->fk_statut = 0; // deprecated
 
 		// Clear fields
+		$this->fk_user_creat      = $user->id;
 		$this->fk_user_author     = $fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
 		$this->fk_user_valid      = '';
 		$this->date_create = '';
@@ -548,7 +552,7 @@ class ExpenseReport extends CommonObject
 		$sql .= " d.date_refuse, d.date_cancel,"; // ACTIONS
 		$sql .= " d.total_ht, d.total_ttc, d.total_tva,"; // TOTAUX (int)
 		$sql .= " d.date_debut, d.date_fin, d.date_create, d.tms as date_modif, d.date_valid, d.date_approve,"; // DATES (datetime)
-		$sql .= " d.fk_user_author, d.fk_user_modif, d.fk_user_validator,";
+		$sql .= " d.fk_user_creat, d.fk_user_author, d.fk_user_modif, d.fk_user_validator,";
 		$sql .= " d.fk_user_valid, d.fk_user_approve,";
 		$sql .= " d.fk_statut as status, d.fk_c_paiement, d.paid";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as d";
@@ -585,6 +589,7 @@ class ExpenseReport extends CommonObject
 				$this->date_refuse      = $this->db->jdate($obj->date_refuse);
 				$this->date_cancel      = $this->db->jdate($obj->date_cancel);
 
+				$this->fk_user_creat            = $obj->fk_user_creat;
 				$this->fk_user_author           = $obj->fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
 				$this->fk_user_modif            = $obj->fk_user_modif;
 				$this->fk_user_validator        = $obj->fk_user_validator;
@@ -630,6 +635,23 @@ class ExpenseReport extends CommonObject
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Classify the expense report as paid
+	 *
+	 *	@deprecated
+	 *  @see setPaid()
+	 *  @param    int     $id                 Id of expense report
+	 *  @param    user    $fuser              User making change
+	 *  @param    int     $notrigger          Disable triggers
+	 *  @return   int                         <0 if KO, >0 if OK
+	 */
+	public function set_paid($id, $fuser, $notrigger = 0)
+	{
+		// phpcs:enable
+		dol_syslog(get_class($this)."::set_paid is deprecated, use setPaid instead", LOG_NOTICE);
+		return $this->setPaid($id, $fuser, $notrigger);
+	}
+
 	/**
 	 *    Classify the expense report as paid
 	 *
@@ -638,9 +660,8 @@ class ExpenseReport extends CommonObject
 	 *    @param    int     $notrigger          Disable triggers
 	 *    @return   int                         <0 if KO, >0 if OK
 	 */
-	public function set_paid($id, $fuser, $notrigger = 0)
+	public function setPaid($id, $fuser, $notrigger = 0)
 	{
-		// phpcs:enable
 		$error = 0;
 		$this->db->begin();
 
@@ -733,7 +754,7 @@ class ExpenseReport extends CommonObject
 		$sql .= " f.tms as date_modification,";
 		$sql .= " f.date_valid as datev,";
 		$sql .= " f.date_approve as datea,";
-		//$sql.= " f.fk_user_author as fk_user_creation,";      // This is not user of creation but user the expense is for.
+		$sql .= " f.fk_user_creat as fk_user_creation,";
 		$sql .= " f.fk_user_modif as fk_user_modification,";
 		$sql .= " f.fk_user_valid,";
 		$sql .= " f.fk_user_approve";
@@ -1488,6 +1509,8 @@ class ExpenseReport extends CommonObject
 	/**
 	 * set_unpaid
 	 *
+	 *	@deprecated
+	 *  @see setUnpaid()
 	 * @param   User    $fuser      User
 	 * @param   int     $notrigger  Disable triggers
 	 * @return  int                 <0 if KO, >0 if OK
@@ -1495,6 +1518,19 @@ class ExpenseReport extends CommonObject
 	public function set_unpaid($fuser, $notrigger = 0)
 	{
 		// phpcs:enable
+		dol_syslog(get_class($this)."::set_unpaid is deprecated, use setUnpaid instead", LOG_NOTICE);
+		return $this->setUnpaid($fuser, $notrigger);
+	}
+
+	/**
+	 * set_unpaid
+	 *
+	 * @param   User    $fuser      User
+	 * @param   int     $notrigger  Disable triggers
+	 * @return  int                 <0 if KO, >0 if OK
+	 */
+	public function setUnpaid($fuser, $notrigger = 0)
+	{
 		$error = 0;
 
 		if ($this->paid)
@@ -2319,7 +2355,7 @@ class ExpenseReport extends CommonObject
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($result);
-				$ret[$obj->code] = (($langs->trans($obj->code) != $obj->code) ? $langs->trans($obj->code) : $obj->label);
+				$ret[$obj->code] = (($langs->transnoentitiesnoconv($obj->code) != $obj->code) ? $langs->transnoentitiesnoconv($obj->code) : $obj->label);
 				$i++;
 			}
 		} else {
@@ -2454,10 +2490,11 @@ class ExpenseReport extends CommonObject
 		if ($option == 'topay' && $this->status != 5) return false;
 
 		$now = dol_now();
-		if ($option == 'toapprove')
-		{
+		if ($option == 'toapprove') {
 			return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->approve->warning_delay);
-		} else return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->payment->warning_delay);
+		} else {
+			return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->payment->warning_delay);
+		}
 	}
 
 	/**
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index fdaeaf68977..b66103f38f5 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -144,7 +144,7 @@ if ($action == 'add_payment')
 			if (!$error) {
 				$payment->fetch($paymentid);
 				if ($expensereport->total_ttc - $payment->amount == 0) {
-					$result = $expensereport->set_paid($expensereport->id, $user);
+					$result = $expensereport->setPaid($expensereport->id, $user);
 					if (!$result > 0) {
 						setEventMessages($payment->error, $payment->errors, 'errors');
 						$error++;
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index c9db970cd0b..c80ee4d248f 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -270,11 +270,12 @@ if ($step == 1 || $action == 'cleanselect')
 
 if ($action == 'builddoc')
 {
-	$max_execution_time_for_export = (empty($conf->global->EXPORT_MAX_EXECUTION_TIME) ? 300 : $conf->global->EXPORT_MAX_EXECUTION_TIME); // 5mn if not defined
+	$max_execution_time_for_importexport = (empty($conf->global->EXPORT_MAX_EXECUTION_TIME) ? 300 : $conf->global->EXPORT_MAX_EXECUTION_TIME); // 5mn if not defined
 	$max_time = @ini_get("max_execution_time");
-	if ($max_time && $max_time < $max_execution_time_for_export)
+	if ($max_time && $max_time < $max_execution_time_for_importexport)
 	{
-		@ini_set("max_execution_time", $max_execution_time_for_export); // This work only if safe mode is off. also web servers has timeout of 300
+		dol_syslog("max_execution_time=".$max_time." is lower than max_execution_time_for_importexport=".$max_execution_time_for_importexport.". We try to increase it dynamically.");
+		@ini_set("max_execution_time", $max_execution_time_for_importexport); // This work only if safe mode is off. also web servers has timeout of 300
 	}
 
 	// Build export file
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index f96bab63e2f..6c1dd4ddeb2 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -200,6 +200,7 @@ if (empty($reshook))
 			$mesg = $object->error;
 		}
 	} elseif ($action == 'add' && $user->rights->ficheinter->creer) {
+		$selectedLines = GETPOST('toselect', 'array');
 		$object->socid = $socid;
 		$object->duration = (int) GETPOST('duration', 'int');
 		$object->fk_project = (int) GETPOST('projectid', 'int');
@@ -217,8 +218,9 @@ if (empty($reshook))
 			if (!empty($origin) && !empty($originid))
 			{
 				// Parse element/subelement (ex: project_task)
-				$element = $subelement = $_POST['origin'];
-				if (preg_match('/^([^_]+)_([^_]+)/i', $_POST['origin'], $regs))
+				$regs = array();
+				$element = $subelement = GETPOST('origin', 'alphanohtml');
+				if (preg_match('/^([^_]+)_([^_]+)/i', GETPOST('origin', 'alphanohtml'), $regs))
 				{
 					$element = $regs[1];
 					$subelement = $regs[2];
@@ -246,7 +248,13 @@ if (empty($reshook))
 				}
 
 				// Extrafields
-				$extrafields = new ExtraFields($db);
+
+				// Fill array 'array_options' with data from add form
+				$ret = $extrafields->setOptionalsFromPost(null, $object);
+				if ($ret < 0) {
+					$error++;
+					$action = 'create';
+				}
 				$array_options = $extrafields->getOptionalsFromPost($object->table_element);
 
 				$object->array_options = $array_options;
@@ -277,6 +285,8 @@ if (empty($reshook))
 
 							for ($i = 0; $i < $num; $i++)
 							{
+								if (!in_array($lines[$i]->id, $selectedLines)) continue; // Skip unselected lines
+
 								$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : Product::TYPE_PRODUCT);
 
 								if ($product_type == Product::TYPE_SERVICE || !empty($conf->global->FICHINTER_PRINT_PRODUCTS)) { //only services except if config includes products
@@ -472,8 +482,7 @@ if (empty($reshook))
 
 			$desc = GETPOST('np_desc', 'restricthtml');
 			$date_intervention = dol_mktime(GETPOST('dihour', 'int'), GETPOST('dimin', 'int'), 0, GETPOST('dimonth', 'int'), GETPOST('diday', 'int'), GETPOST('diyear', 'int'));
-			$duration = empty($conf->global->FICHINTER_WITHOUT_DURATION) ?convertTime2Seconds(GETPOST('durationhour', 'int'), GETPOST('durationmin', 'int')) : 0;
-
+			$duration = empty($conf->global->FICHINTER_WITHOUT_DURATION) ? convertTime2Seconds(GETPOST('durationhour', 'int'), GETPOST('durationmin', 'int')) : 0;
 
 			// Extrafields
 			$extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -1017,8 +1026,6 @@ if ($action == 'create')
 		print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 		print '</div>';
 
-		print '</form>';
-
 		// Show origin lines
 		if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
 			$title = $langs->trans('Services');
@@ -1030,6 +1037,8 @@ if ($action == 'create')
 
 			print '</table>';
 		}
+
+		print '</form>';
 	} else {
 		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -1329,8 +1338,7 @@ if ($action == 'create')
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" name="addinter" method="post">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
-		if ($action == 'editline')
-		{
+		if ($action == 'editline') {
 			print '<input type="hidden" name="action" value="updateline">';
 			print '<input type="hidden" name="line_id" value="'.GETPOST('line_id', 'int').'">';
 		} else {
@@ -1342,8 +1350,9 @@ if ($action == 'create')
 		$sql .= ' ft.date as date_intervention';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'fichinterdet as ft';
 		$sql .= ' WHERE ft.fk_fichinter = '.$object->id;
-		if (!empty($conf->global->FICHINTER_HIDE_EMPTY_DURATION))
+		if (!empty($conf->global->FICHINTER_HIDE_EMPTY_DURATION)) {
 			$sql .= ' AND ft.duree <> 0';
+		}
 		$sql .= ' ORDER BY ft.rang ASC, ft.date ASC, ft.rowid';
 
 		$resql = $db->query($sql);
@@ -1370,13 +1379,11 @@ if ($action == 'create')
 				print '<td class="liste_titre">&nbsp;</td>';
 				print "</tr>\n";
 			}
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$objp = $db->fetch_object($resql);
 
 				// Ligne en mode visu
-				if ($action != 'editline' || GETPOST('line_id', 'int') != $objp->rowid)
-				{
+				if ($action != 'editline' || GETPOST('line_id', 'int') != $objp->rowid) {
 					print '<tr class="oddeven">';
 
 					// No.
@@ -1396,8 +1403,7 @@ if ($action == 'create')
 
 					print "</td>\n";
 
-
-					// Econ to edit and delete
+					// Icon to edit and delete
 					if ($object->statut == 0 && $user->rights->ficheinter->creer)
 					{
 						print '<td class="center">';
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 807996ddd1c..9d18f3cfd1a 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -179,6 +179,11 @@ if ($object->id > 0)
 	print '<div class="underbanner clearboth"></div>';
 	print '<table width="100%" class="border">';
 
+	// Type Prospect/Customer/Supplier
+	print '<tr><td class="titlefield">'.$langs->trans('NatureOfThirdParty').'</td><td>';
+	print $object->getTypeUrl(1);
+	print '</td></tr>';
+
 	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
 	{
 		print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 5464116c1ed..598f19ee0a0 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -891,11 +891,17 @@ class CommandeFournisseur extends CommonOrder
 	 *	Class invoiced the supplier order
 	 *
 	 *  @param      User        $user       Object user making the change
-	 *	@return     int     	            <0 if KO, >0 if KO
+	 *	@return     int     	            <0 if KO, 0 if already billed,  >0 if OK
 	 */
 	public function classifyBilled(User $user)
 	{
 		$error = 0;
+
+		if ($this->billed)
+		{
+			return 0;
+		}
+
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur SET billed = 1';
@@ -3063,8 +3069,10 @@ class CommandeFournisseur extends CommonOrder
 
 	/**
 	 * Is the supplier order delayed?
+	 * We suppose a purchase ordered as late if a the purchase order has been sent and the delivery date is set and before the delay.
+	 * If order has not been sent, we use the order date.
 	 *
-	 * @return bool
+	 * @return 	bool					True if object is delayed
 	 */
 	public function hasDelay()
 	{
@@ -3072,14 +3080,28 @@ class CommandeFournisseur extends CommonOrder
 
 		if (empty($this->delivery_date) && !empty($this->date_livraison)) $this->delivery_date = $this->date_livraison; // For backward compatibility
 
-		$now = dol_now();
-		$date_to_test = empty($this->delivery_date) ? $this->date_commande : $this->delivery_date;
+		if ($this->statut == self::STATUS_ORDERSENT || $this->statut == self::STATUS_RECEIVED_PARTIALLY) {
+			$now = dol_now();
+			if (!empty($this->delivery_date)) {
+				$date_to_test = $this->delivery_date;
+				return $date_to_test && $date_to_test < ($now - $conf->commande->fournisseur->warning_delay);
+			} else {
+				//$date_to_test = $this->date_commande;
+				//return $date_to_test && $date_to_test < ($now - $conf->commande->fournisseur->warning_delay);
+				return false;
+			}
+		} else {
+			$now = dol_now();
+			$date_to_test = $this->date_commande;
 
-		return ($this->statut > 0 && $this->statut < 5) && $date_to_test && $date_to_test < ($now - $conf->commande->fournisseur->warning_delay);
+			return ($this->statut > 0 && $this->statut < 5) && $date_to_test && $date_to_test < ($now - $conf->commande->fournisseur->warning_delay);
+		}
 	}
 
 	/**
-	 * Show the customer delayed info
+	 * Show the customer delayed info.
+	 * We suppose a purchase ordered as late if a the purchase order has been sent and the delivery date is set and before the delay.
+	 * If order has not been sent, we use the order date.
 	 *
 	 * @return string       Show delayed information
 	 */
@@ -3089,12 +3111,20 @@ class CommandeFournisseur extends CommonOrder
 
 		if (empty($this->delivery_date) && !empty($this->date_livraison)) $this->delivery_date = $this->date_livraison; // For backward compatibility
 
-		if (empty($this->delivery_date)) {
-			$text = $langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
+		$text = '';
+
+		if ($this->statut == self::STATUS_ORDERSENT || $this->statut == self::STATUS_RECEIVED_PARTIALLY) {
+			if (!empty($this->delivery_date)) {
+				$text = $langs->trans("DeliveryDate").' '.dol_print_date($this->delivery_date, 'day');
+			} else {
+				$text = $langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
+			}
 		} else {
-			$text = $langs->trans("DeliveryDate").' '.dol_print_date($this->delivery_date, 'day');
+			$text = $langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
+		}
+		if ($text) {
+			$text .= ' '.($conf->commande->fournisseur->warning_delay > 0 ? '+' : '-').' '.round(abs($conf->commande->fournisseur->warning_delay) / 3600 / 24, 1).' '.$langs->trans("days").' < '.$langs->trans("Today");
 		}
-		$text .= ' '.($conf->commande->fournisseur->warning_delay > 0 ? '+' : '-').' '.round(abs($conf->commande->fournisseur->warning_delay) / 3600 / 24, 1).' '.$langs->trans("days").' < '.$langs->trans("Today");
 
 		return $text;
 	}
@@ -3126,13 +3156,12 @@ class CommandeFournisseur extends CommonOrder
 			}
 
 			$ret = $supplierorderdispatch->fetchAll('', '', 0, 0, $filter);
-			if ($ret < 0)
-			{
+			if ($ret < 0) {
 				$this->error = $supplierorderdispatch->error; $this->errors = $supplierorderdispatch->errors;
 				return $ret;
 			} else {
-				if (is_array($supplierorderdispatch->lines) && count($supplierorderdispatch->lines) > 0)
-				{
+				if (is_array($supplierorderdispatch->lines) && count($supplierorderdispatch->lines) > 0) {
+					require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 					$date_liv = dol_now();
 
 					// Build array with quantity deliverd by product
@@ -3140,13 +3169,17 @@ class CommandeFournisseur extends CommonOrder
 						$qtydelivered[$line->fk_product] += $line->qty;
 					}
 					foreach ($this->lines as $line) {
+						// Exclude lines not qualified for shipment, similar code is found into interface_20_modWrokflow for customers
+						if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $line->product_type > 0) continue;
 						$qtywished[$line->fk_product] += $line->qty;
 					}
+
 					//Compare array
 					$diff_array = array_diff_assoc($qtydelivered, $qtywished); // Warning: $diff_array is done only on common keys.
 					$keysinwishednotindelivered = array_diff(array_keys($qtywished), array_keys($qtydelivered)); // To check we also have same number of keys
 					$keysindeliverednotinwished = array_diff(array_keys($qtydelivered), array_keys($qtywished)); // To check we also have same number of keys
 					/*var_dump(array_keys($qtydelivered));
+
     				var_dump(array_keys($qtywished));
     				var_dump($diff_array);
     				var_dump($keysinwishednotindelivered);
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index c8ae31398c0..67070b99c57 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1248,8 +1248,10 @@ class FactureFournisseur extends CommonInvoice
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Tag invoice as a payed invoice
+	 *  Tag invoice as a paid invoice
 	 *
+	 *	@deprecated
+	 *  @see setPaid()
 	 *	@param  User	$user       Object user
 	 *	@param  string	$close_code	Code indicates whether the class has paid in full while payment is incomplete. Not implementd yet.
 	 *	@param  string	$close_note	Comment informs if the class has been paid while payment is incomplete. Not implementd yet.
@@ -1258,6 +1260,20 @@ class FactureFournisseur extends CommonInvoice
 	public function set_paid($user, $close_code = '', $close_note = '')
 	{
 		// phpcs:enable
+		dol_syslog(get_class($this)."::set_paid is deprecated, use setPaid instead", LOG_NOTICE);
+		return $this->setPaid($user, $close_code, $close_note);
+	}
+
+	/**
+	 *  Tag invoice as a paid invoice
+	 *
+	 *	@param  User	$user       Object user
+	 *	@param  string	$close_code	Code indicates whether the class has paid in full while payment is incomplete. Not implementd yet.
+	 *	@param  string	$close_note	Comment informs if the class has been paid while payment is incomplete. Not implementd yet.
+	 *	@return int         		<0 si ko, >0 si ok
+	 */
+	public function setPaid($user, $close_code = '', $close_note = '')
+	{
 		global $conf, $langs;
 		$error = 0;
 
@@ -1291,8 +1307,24 @@ class FactureFournisseur extends CommonInvoice
 		}
 	}
 
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Tag the invoice as not fully paid + trigger call BILL_UNPAYED
+	 *	Function used when a direct debit payment is refused,
+	 *	or when the invoice was canceled and reopened.
+	 *
+	 *	@deprecated
+	 *  @see setUnpaid()
+	 *	@param      User	$user       Object user that change status
+	 *	@return     int         		<0 si ok, >0 si ok
+	 */
+	public function set_unpaid($user)
+	{
+		// phpcs:enable
+		dol_syslog(get_class($this)."::set_unpaid is deprecated, use setUnpaid instead", LOG_NOTICE);
+		return $this->setUnpaid($user);
+	}
+
 	/**
 	 *	Tag the invoice as not fully paid + trigger call BILL_UNPAYED
 	 *	Function used when a direct debit payment is refused,
@@ -1301,9 +1333,8 @@ class FactureFournisseur extends CommonInvoice
 	 *	@param      User	$user       Object user that change status
 	 *	@return     int         		<0 si ok, >0 si ok
 	 */
-	public function set_unpaid($user)
+	public function setUnpaid($user)
 	{
-		// phpcs:enable
 		global $conf, $langs;
 		$error = 0;
 
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 927e7e33b09..6ae9a3491ab 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2012		Christophe Battarel	  <christophe.battarel@altairis.fr>
  * Copyright (C) 2015		Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2016		Charlie Benke         <charlie@patas-monkey.com>
- * Copyright (C) 2019       Frédéric France       <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2021  Frédéric France       <frederic.france@netlogic.fr>
  * Copyright (C) 2020       Pierre Ardoin         <mapiolca@me.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -280,13 +280,10 @@ class ProductFournisseur extends Product
 		}
 
 		// Multicurrency
-		$multicurrency_buyprice = null;
 		$multicurrency_unitBuyPrice = null;
 		$fk_multicurrency = null;
 		if (!empty($conf->multicurrency->enabled)) {
 			if (empty($multicurrency_tx)) $multicurrency_tx = 1;
-			if (empty($multicurrency_buyprice)) $multicurrency_buyprice = 0;
-
 			if (empty($multicurrency_buyprice)) $multicurrency_buyprice = 0;
 			if ($multicurrency_price_base_type == 'TTC')
 			{
@@ -1071,15 +1068,89 @@ class ProductFournisseur extends Product
 	{
 		global $db, $conf, $langs;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
+		$label = '';
 
-		$label = '<u>'.$langs->trans("SupplierRef").'</u>';
-		$label .= '<br>';
-		$label .= '<b>'.$langs->trans('Product').':</b> '.$this->product_ref;
+		if (!empty($this->entity)) {
+			$tmpphoto = $this->show_photos('product', $conf->product->multidir_output[$this->entity], 1, 1, 0, 0, 0, 80);
+			if ($this->nbphoto > 0) {
+				$label .= '<div class="photointooltip">';
+				$label .= $tmpphoto;
+				$label .= '</div><div style="clear: both;"></div>';
+			}
+		}
+
+		if ($this->type == Product::TYPE_PRODUCT) {
+			$label .= img_picto('', 'product').' <u class="paddingrightonly">'.$langs->trans("Product").'</u>';
+		} elseif ($this->type == Product::TYPE_SERVICE) {
+			$label .= img_picto('', 'service').' <u class="paddingrightonly">'.$langs->trans("Service").'</u>';
+		}
+		if (isset($this->status) && isset($this->status_buy)) {
+			$label .= ' '.$this->getLibStatut(5, 0);
+			$label .= ' '.$this->getLibStatut(5, 1);
+		}
+
+		if (!empty($this->ref)) {
+			$label .= '<br><b>'.$langs->trans('ProductRef').':</b> '.($this->ref ? $this->ref : $this->product_ref);
+		}
+		if (!empty($this->label)) {
+			$label .= '<br><b>'.$langs->trans('ProductLabel').':</b> '.$this->label;
+		}
 		$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
 
+		if ($this->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+			if (!empty($conf->productbatch->enabled)) {
+				$langs->load("productbatch");
+				$label .= "<br><b>".$langs->trans("ManageLotSerial").'</b>: '.$this->getLibStatut(0, 2);
+			}
+		}
+		if (!empty($conf->barcode->enabled)) {
+			$label .= '<br><b>'.$langs->trans('BarCode').':</b> '.$this->barcode;
+		}
+
+		if ($this->type == Product::TYPE_PRODUCT) {
+			if ($this->weight) {
+				$label .= "<br><b>".$langs->trans("Weight").'</b>: '.$this->weight.' '.measuringUnitString(0, "weight", $this->weight_units);
+			}
+			$labelsize = "";
+			if ($this->length) {
+				$labelsize .= ($labelsize ? " - " : "")."<b>".$langs->trans("Length").'</b>: '.$this->length.' '.measuringUnitString(0, 'size', $this->length_units);
+			}
+			if ($this->width) {
+				$labelsize .= ($labelsize ? " - " : "")."<b>".$langs->trans("Width").'</b>: '.$this->width.' '.measuringUnitString(0, 'size', $this->width_units);
+			}
+			if ($this->height) {
+				$labelsize .= ($labelsize ? " - " : "")."<b>".$langs->trans("Height").'</b>: '.$this->height.' '.measuringUnitString(0, 'size', $this->height_units);
+			}
+			if ($labelsize) $label .= "<br>".$labelsize;
+
+			$labelsurfacevolume = "";
+			if ($this->surface) {
+				$labelsurfacevolume .= ($labelsurfacevolume ? " - " : "")."<b>".$langs->trans("Surface").'</b>: '.$this->surface.' '.measuringUnitString(0, 'surface', $this->surface_units);
+			}
+			if ($this->volume) {
+				$labelsurfacevolume .= ($labelsurfacevolume ? " - " : "")."<b>".$langs->trans("Volume").'</b>: '.$this->volume.' '.measuringUnitString(0, 'volume', $this->volume_units);
+			}
+			if ($labelsurfacevolume) $label .= "<br>".$labelsurfacevolume;
+		}
+
+		if (!empty($conf->accounting->enabled) && $this->status) {
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+			$label .= '<br><b>'.$langs->trans('ProductAccountancySellCode').':</b> '.length_accountg($this->accountancy_code_sell);
+			$label .= '<br><b>'.$langs->trans('ProductAccountancySellIntraCode').':</b> '.length_accountg($this->accountancy_code_sell_intra);
+			$label .= '<br><b>'.$langs->trans('ProductAccountancySellExportCode').':</b> '.length_accountg($this->accountancy_code_sell_export);
+		}
+		if (!empty($conf->accounting->enabled) && $this->status_buy) {
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+			$label .= '<br><b>'.$langs->trans('ProductAccountancyBuyCode').':</b> '.length_accountg($this->accountancy_code_buy);
+			$label .= '<br><b>'.$langs->trans('ProductAccountancyBuyIntraCode').':</b> '.length_accountg($this->accountancy_code_buy_intra);
+			$label .= '<br><b>'.$langs->trans('ProductAccountancyBuyExportCode').':</b> '.length_accountg($this->accountancy_code_buy_export);
+		}
+
 		$logPrices = $this->listProductFournisseurPriceLog($this->product_fourn_price_id, 'pfpl.datec', 'DESC'); // set sort order here
 		if (is_array($logPrices) && count($logPrices) > 0) {
 			$label .= '<br><br>';
@@ -1089,33 +1160,40 @@ class ProductFournisseur extends Product
 
 		$url = dol_buildpath('/product/fournisseurs.php', 1).'?id='.$this->id.'&action=add_price&socid='.$this->fourn_id.'&rowid='.$this->product_fourn_price_id;
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($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))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("SupplierRef");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref.($this->ref_supplier ? ' ('.$this->ref_supplier.')' : '');
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref.($this->ref_supplier ? ' ('.$this->ref_supplier.')' : '');
+		}
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 56d4af045f4..cd172d08345 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -229,7 +229,7 @@ class PaiementFourn extends Paiement
 							$invoice = new FactureFournisseur($this->db);
 							$invoice->fetch($facid);
 
-							// If we want to closed payed invoices
+							// If we want to closed paid invoices
 							if ($closepaidinvoices)
 							{
 								$paiement = $invoice->getSommePaiement();
@@ -241,7 +241,7 @@ class PaiementFourn extends Paiement
 								$remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
 								if ($remaintopay == 0)
 								{
-									$result = $invoice->set_paid($user, '', '');
+									$result = $invoice->setPaid($user, '', '');
 								} else dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing.");
 							}
 
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 80ebb13eb6c..2ed7ccab8ef 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -371,9 +371,9 @@ if (empty($reshook))
 			$tva_tx = '';
 		}
 
-		$qty = price2num(GETPOST('qty'.$predef), 'alpha');
-		$remise_percent = GETPOST('remise_percent'.$predef);
-		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CR');
+		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
+		$remise_percent = price2num(GETPOST('remise_percent'.$predef), 2);
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU');
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -475,7 +475,7 @@ if (empty($reshook))
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
 					}
-					$desc = (!empty($productsupplier->multilangs [$outputlangs->defaultlang] ["description"])) ? $productsupplier->multilangs [$outputlangs->defaultlang] ["description"] : $productsupplier->description;
+					$desc = (!empty($productsupplier->multilangs[$outputlangs->defaultlang]["description"])) ? $productsupplier->multilangs[$outputlangs->defaultlang]["description"] : $productsupplier->description;
 				} else {
 					$desc = $productsupplier->description;
 				}
@@ -484,7 +484,13 @@ if (empty($reshook))
 					$desc = $productsupplier->desc_supplier;
 				}
 
-				if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_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 (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) $desc = $product_desc;
+				if (!empty($product_desc) && trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 
 				$type = $productsupplier->type;
 				if ($price_ht != '' || $price_ht_devise != '') {
@@ -715,21 +721,21 @@ if (empty($reshook))
 
 		$result = $object->updateline(
 			$lineid,
-			$_POST['product_desc'],
+			GETPOST('product_desc', 'restricthtml'),
 			$ht,
-			GETPOST('qty', 'int'),
-			$_POST['remise_percent'],
+			price2num(GETPOST('qty'), 'MS'),
+			price2num(GETPOST('remise_percent'), 2),
 			$vat_rate,
 			$localtax1_rate,
 			$localtax2_rate,
 			$price_base_type,
 			0,
-			isset($_POST["type"]) ? $_POST["type"] : $line->product_type,
+			GETPOSTISSET("type") ? GETPOST("type") : $line->product_type,
 			false,
 			$date_start,
 			$date_end,
 			$array_options,
-			$_POST['units'],
+			GETPOST('units'),
 			$pu_ht_devise,
 			GETPOST('fourn_ref', 'alpha')
 		);
@@ -1604,7 +1610,7 @@ if ($action == 'create')
 		print $societe->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$socid.'">';
 	} else {
-		print $form->select_company((empty($socid) ? '' : $socid), 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
+		print img_picto('', 'company').$form->select_company((empty($socid) ? '' : $socid), 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve customer informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE))
 		{
@@ -1666,6 +1672,7 @@ if ($action == 'create')
 	{
 		$langs->load("bank");
 		print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
+		print img_picto('', 'bank_account', 'class="paddingrightonly"');
 		$form->select_comptes($fk_account, 'fk_account', 0, '', 1);
 		print '</td></tr>';
 	}
@@ -1677,7 +1684,7 @@ if ($action == 'create')
 
 		$langs->load('projects');
 		print '<tr><td>'.$langs->trans('Project').'</td><td>';
-		$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, '', 0, 0, 'maxwidth500');
+		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 '</td></tr>';
 	}
@@ -2146,6 +2153,12 @@ if ($action == 'create')
 		print '</tr>';
 	}
 
+	// Delivery delay (in days)
+	print '<tr>';
+	print '<td>'.$langs->trans('NbDaysToDelivery').'&nbsp;'.img_picto($langs->trans('DescNbDaysToDelivery'), 'info', 'style="cursor:help"').'</td>';
+	print '<td>'.$object->getMaxDeliveryTimeDay($langs).'</td>';
+	print '</tr>';
+
 	// Delivery date planed
 	print '<tr><td>';
 	print '<table class="nobordernopadding centpercent"><tr><td>';
@@ -2174,12 +2187,6 @@ if ($action == 'create')
 	}
 	print '</td></tr>';
 
-	// Delivery delay (in days)
-	print '<tr>';
-	print '<td>'.$langs->trans('NbDaysToDelivery').'&nbsp;'.img_picto($langs->trans('DescNbDaysToDelivery'), 'info', 'style="cursor:help"').'</td>';
-	print '<td>'.$object->getMaxDeliveryTimeDay($langs).'</td>';
-	print '</tr>';
-
 	// Incoterms
 	if (!empty($conf->incoterm->enabled))
 	{
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index d739f70e76e..acfa5a54e16 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2010-2019 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2010-2021 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2014      Cedric Gross         <c.gross@kreiz-it.fr>
  * Copyright (C) 2016      Florian Henry        <florian.henry@atm-consulting.fr>
  * Copyright (C) 2017-2020 Ferran Marcet        <fmarcet@2byte.es>
@@ -228,6 +228,7 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 	foreach ($_POST as $key => $value)
 	{
 		// without batch module enabled
+		$reg = array();
 		if (preg_match('/^product_([0-9]+)_([0-9]+)$/i', $key, $reg))
 		{
 			$pos++;
@@ -269,16 +270,20 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 
 					if (!$error && !empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
 						if (empty($conf->multicurrency->enabled) && empty($conf->dynamicprices->enabled)) {
-							$dto = GETPOST("dto_".$reg[1].'_'.$reg[2], 'int');
+							$dto = price2num(GETPOST("dto_".$reg[1].'_'.$reg[2], 'int'), '');
+							if (empty($dto)) {
+								$dto = 0;
+							}
+
 							//update supplier price
 							if (GETPOSTISSET($saveprice)) {
 								// TODO Use class
 								$sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price";
-								$sql .= " SET unitprice='".GETPOST($pu)."'";
-								$sql .= ", price=".GETPOST($pu)."*quantity";
-								$sql .= ", remise_percent='".(!empty($dto) ? $dto : 0)."'";
-								$sql .= " WHERE fk_soc=".$object->socid;
-								$sql .= " AND fk_product=".GETPOST($prod, 'int');
+								$sql .= " SET unitprice='".price2num(GETPOST($pu), 'MU')."'";
+								$sql .= ", price=".price2num(GETPOST($pu), 'MU')."*quantity";
+								$sql .= ", remise_percent = ".((float) $dto);
+								$sql .= " WHERE fk_soc=".((int) $object->socid);
+								$sql .= " AND fk_product=".((int) GETPOST($prod, 'int'));
 
 								$resql = $db->query($sql);
 							}
@@ -719,7 +724,7 @@ if ($id > 0 || !empty($ref)) {
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 		$sql .= $hookmanager->resPrint;
 
-		$sql .= " GROUP BY p.ref, p.label, p.tobatch, l.rowid, l.fk_product, l.subprice, l.remise_percent, p.fk_default_warehouse"; // Calculation of amount dispatched is done per fk_product so we must group by fk_product
+		$sql .= " GROUP BY p.ref, p.label, p.tobatch, p.fk_default_warehouse, l.rowid, l.fk_product, l.subprice, l.remise_percent, l.ref"; // Calculation of amount dispatched is done per fk_product so we must group by fk_product
 		$sql .= " ORDER BY p.ref, p.label";
 
 		$resql = $db->query($sql);
@@ -920,7 +925,7 @@ if ($id > 0 || !empty($ref)) {
 								print $form->selectDate($dluodatesuffix, 'dluo'.$suffix, '', '', 1, '');
 								print '</td>';
 							}
-							print '<td colspan="3">&nbsp</td>'; // Supplier ref + Qty ordered + qty already dispatched
+							print '<td colspan="3">&nbsp;</td>'; // Supplier ref + Qty ordered + qty already dispatched
 						} else {
 							$type = 'dispatch';
 							$colspan = 7;
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 2b77801fee3..aa5f7c3ddc5 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -142,30 +142,30 @@ if (empty($user->socid)) $fieldstosearchall["cf.note_private"] = "NotePrivate";
 
 $checkedtypetiers = 0;
 $arrayfields = array(
-	'cf.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-	'cf.ref_supplier'=>array('label'=>$langs->trans("RefOrderSupplierShort"), 'checked'=>1, 'enabled'=>1),
-	'p.project_ref'=>array('label'=>$langs->trans("ProjectRef"), 'checked'=>0, 'enabled'=>1),
-	'u.login'=>array('label'=>$langs->trans("AuthorRequest"), '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),
-	'cf.date_commande'=>array('label'=>$langs->trans("OrderDateShort"), 'checked'=>1),
-	'cf.date_delivery'=>array('label'=>$langs->trans("DateDeliveryPlanned"), 'checked'=>1, 'enabled'=>empty($conf->global->ORDER_DISABLE_DELIVERY_DATE)),
-	'cf.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
-	'cf.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0),
-	'cf.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>0),
+	'cf.ref'=>array('label'=>"Ref", 'checked'=>1),
+	'cf.ref_supplier'=>array('label'=>"RefOrderSupplierShort", 'checked'=>1, 'enabled'=>1),
+	'p.project_ref'=>array('label'=>"ProjectRef", 'checked'=>0, 'enabled'=>1),
+	'u.login'=>array('label'=>"AuthorRequest", 'checked'=>1),
+	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
+	's.town'=>array('label'=>"Town", 'checked'=>1),
+	's.zip'=>array('label'=>"Zip", 'checked'=>1),
+	'state.nom'=>array('label'=>"StateShort", 'checked'=>0),
+	'country.code_iso'=>array('label'=>"Country", 'checked'=>0),
+	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers),
+	'cf.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1),
+	'cf.date_livraison'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>empty($conf->global->ORDER_DISABLE_DELIVERY_DATE)),
+	'cf.total_ht'=>array('label'=>"AmountHT", 'checked'=>1),
+	'cf.total_vat'=>array('label'=>"AmountVAT", 'checked'=>0),
+	'cf.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0),
 	'cf.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
 	'cf.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
 	'cf.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
 	'cf.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
 	'cf.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'cf.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-	'cf.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-	'cf.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
-	'cf.billed'=>array('label'=>$langs->trans("Billed"), 'checked'=>1, 'position'=>1000, 'enabled'=>1)
+	'cf.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
+	'cf.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
+	'cf.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
+	'cf.billed'=>array('label'=>"Billed", 'checked'=>1, 'position'=>1000, 'enabled'=>1)
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -244,7 +244,7 @@ if (empty($reshook))
 	$uploaddir = $conf->fournisseur->commande->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
-	// TODO Move this into mass action include
+	// Mass action to generate vendor bills
 	if ($massaction == 'confirm_createsupplierbills')
 	{
 		$orders = GETPOST('toselect', 'array');
@@ -255,6 +255,8 @@ if (empty($reshook))
 		$TFactThird = array();
 
 		$nb_bills_created = 0;
+		$lastid = 0;
+		$lastref = '';
 
 		$db->begin();
 
@@ -263,8 +265,9 @@ if (empty($reshook))
 			if ($cmd->fetch($id_order) <= 0) continue;
 
 			$objecttmp = new FactureFournisseur($db);
-			if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) $objecttmp = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
-			else {
+			if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) {
+				$objecttmp = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
+			} else {
 				$objecttmp->socid = $cmd->socid;
 				$objecttmp->type = $objecttmp::TYPE_STANDARD;
 				$objecttmp->cond_reglement_id	= $cmd->cond_reglement_id;
@@ -285,7 +288,11 @@ if (empty($reshook))
 
 				$res = $objecttmp->create($user);
 
-				if ($res > 0) $nb_bills_created++;
+				if ($res > 0) {
+					$nb_bills_created++;
+					$lastref = $objecttmp->ref;
+					$lastid = $objecttmp->id;
+				}
 			}
 
 			if ($objecttmp->id > 0)
@@ -442,7 +449,14 @@ if (empty($reshook))
 		if (!$error)
 		{
 			$db->commit();
-			setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs');
+
+			if ($nb_bills_created == 1) {
+				$texttoshow = $langs->trans('BillXCreated', '{s1}');
+				$texttoshow = str_replace('{s1}', '<a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?id='.urlencode($lastid).'">'.$lastref.'</a>', $texttoshow);
+				setEventMessages($texttoshow, null, 'mesgs');
+			} else {
+				setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs');
+			}
 
 			// Make a redirect to avoid to bill twice if we make a refresh or back
 			$param = '';
@@ -459,7 +473,7 @@ if (empty($reshook))
 			if ($search_deliveryyear)    		$param .= '&search_deliveryyear='.urlencode($search_deliveryyear);
 			if ($search_ref)      		$param .= '&search_ref='.urlencode($search_ref);
 			if ($search_company)  		$param .= '&search_company='.urlencode($search_company);
-			if ($search_ref_customer)	$param .= '&search_ref_customer='.urlencode($search_ref_customer);
+			//if ($search_ref_customer)	$param .= '&search_ref_customer='.urlencode($search_ref_customer);
 			if ($search_user > 0) 		$param .= '&search_user='.urlencode($search_user);
 			if ($search_sale > 0) 		$param .= '&search_sale='.urlencode($search_sale);
 			if ($search_total_ht != '') $param .= '&search_total_ht='.urlencode($search_total_ht);
@@ -521,11 +535,11 @@ $help_url = '';
 // llxHeader('',$title,$help_url);
 
 $sql = 'SELECT';
-if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
+if ($sall || $search_product_category > 0 || $search_user > 0) $sql = 'SELECT DISTINCT';
 $sql .= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, 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.tva as total_tva, cf.total_ttc, cf.fk_user_author, cf.date_commande as date_commande, cf.date_livraison as date_delivery,";
+$sql .= " cf.rowid, cf.ref, cf.ref_supplier, cf.fk_statut, cf.billed, cf.total_ht, cf.tva as total_tva, cf.total_ttc, cf.fk_user_author, cf.date_commande as date_commande, cf.date_livraison as date_livraison,";
 $sql .= ' cf.fk_multicurrency, cf.multicurrency_code, cf.multicurrency_tx, cf.multicurrency_total_ht, cf.multicurrency_total_tva as multicurrency_total_vat, cf.multicurrency_total_ttc,';
 $sql .= ' cf.date_creation as date_creation, cf.tms as date_update,';
 $sql .= ' cf.note_public, cf.note_private,';
@@ -581,7 +595,7 @@ if ($search_town)  $sql .= natural_search('s.town', $search_town);
 if ($search_zip)   $sql .= natural_search("s.zip", $search_zip);
 if ($search_state) $sql .= natural_search("state.nom", $search_state);
 if ($search_country) $sql .= " AND s.fk_pays IN (".$db->sanitize($db->escape($search_country)).')';
-if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';
+if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) $sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';
 if ($search_company) $sql .= natural_search('s.nom', $search_company);
 if ($search_sale > 0) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$db->escape($search_sale);
 if ($search_user > 0) $sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='supplier_order' AND tc.source='internal' AND ec.element_id = cf.rowid AND ec.fk_socpeople = ".$db->escape($search_user);
@@ -666,6 +680,8 @@ if ($resql)
 	if ($search_billed != '')   $param .= "&search_billed=".urlencode($search_billed);
 	if ($show_files)            $param .= '&show_files='.urlencode($show_files);
 	if ($optioncss != '')       $param .= '&optioncss='.urlencode($optioncss);
+	if ($search_type_thirdparty != '' && $search_type_thirdparty > 0)   $param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -861,7 +877,7 @@ if ($resql)
 	if (!empty($arrayfields['typent.code']['checked']))
 	{
 		print '<td class="liste_titre maxwidthonsmartphone center">';
-		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
+		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 		print '</td>';
 	}
 	// Date order
@@ -874,7 +890,7 @@ if ($resql)
 		print '</td>';
 	}
 	// Date delivery
-	if (!empty($arrayfields['cf.date_delivery']['checked']))
+	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.'">';
@@ -993,7 +1009,7 @@ if ($resql)
 	if (!empty($arrayfields['typent.code']['checked']))       print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['cf.fk_author']['checked']))      print_liste_field_titre($arrayfields['cf.fk_author']['label'], $_SERVER["PHP_SELF"], "cf.fk_author", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['cf.date_commande']['checked']))  print_liste_field_titre($arrayfields['cf.date_commande']['label'], $_SERVER["PHP_SELF"], "cf.date_commande", "", $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['cf.date_delivery']['checked']))  print_liste_field_titre($arrayfields['cf.date_delivery']['label'], $_SERVER["PHP_SELF"], 'cf.date_livraison', '', $param, '', $sortfield, $sortorder, 'center ');
+	if (!empty($arrayfields['cf.date_livraison']['checked'])) print_liste_field_titre($arrayfields['cf.date_livraison']['label'], $_SERVER["PHP_SELF"], 'cf.date_livraison', '', $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['cf.total_ht']['checked']))       print_liste_field_titre($arrayfields['cf.total_ht']['label'], $_SERVER["PHP_SELF"], "cf.total_ht", "", $param, '', $sortfield, $sortorder, 'right ');
 	if (!empty($arrayfields['cf.total_vat']['checked']))      print_liste_field_titre($arrayfields['cf.total_vat']['label'], $_SERVER["PHP_SELF"], "cf.tva", "", $param, '', $sortfield, $sortorder, 'right ');
 	if (!empty($arrayfields['cf.total_ttc']['checked']))      print_liste_field_titre($arrayfields['cf.total_ttc']['label'], $_SERVER["PHP_SELF"], "cf.total_ttc", "", $param, '', $sortfield, $sortorder, 'right ');
@@ -1043,7 +1059,7 @@ if ($resql)
 		$objectstatic->total_tva = $obj->total_tva;
 		$objectstatic->total_ttc = $obj->total_ttc;
 		$objectstatic->date_commande = $db->jdate($obj->date_commande);
-		$objectstatic->date_delivery = $db->jdate($obj->date_delivery);
+		$objectstatic->delivery_date = $db->jdate($obj->date_livraison);
 		$objectstatic->note_public = $obj->note_public;
 		$objectstatic->note_private = $obj->note_private;
 		$objectstatic->statut = $obj->fk_statut;
@@ -1153,19 +1169,23 @@ if ($resql)
 		{
 			print '<td class="center">';
 			print dol_print_date($db->jdate($obj->date_commande), 'day');
-			if ($objectstatic->hasDelay() && !empty($objectstatic->date_delivery)) {
-				print ' '.img_picto($langs->trans("Late").' : '.$objectstatic->showDelay(), "warning");
+			if ($objectstatic->statut != $objectstatic::STATUS_ORDERSENT && $objectstatic->statut != $objectstatic::STATUS_RECEIVED_PARTIALLY) {
+				if ($objectstatic->hasDelay()) {
+					print ' '.img_picto($langs->trans("Late").' : '.$objectstatic->showDelay(), "warning");
+				}
 			}
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
 		// Plannned date of delivery
-		if (!empty($arrayfields['cf.date_delivery']['checked']))
+		if (!empty($arrayfields['cf.date_livraison']['checked']))
 		{
 			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->date_delivery), 'day');
-			if ($objectstatic->hasDelay() && !empty($objectstatic->date_delivery)) {
-				print ' '.img_picto($langs->trans("Late").' : '.$objectstatic->showDelay(), "warning");
+			print dol_print_date($db->jdate($obj->date_livraison), 'day');
+			if ($objectstatic->statut == $objectstatic::STATUS_ORDERSENT || $objectstatic->statut == $objectstatic::STATUS_RECEIVED_PARTIALLY) {
+				if ($objectstatic->hasDelay()) {
+					print ' '.img_picto($langs->trans("Late").' : '.$objectstatic->showDelay(), "warning");
+				}
 			}
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 154db9db29f..a8f7fa2cc42 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -277,7 +277,7 @@ if (empty($reshook))
 		$discount->unlink_invoice();
 	} elseif ($action == 'confirm_paid' && $confirm == 'yes' && $usercancreate) {
 		$object->fetch($id);
-		$result = $object->set_paid($user);
+		$result = $object->setPaid($user);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -489,7 +489,7 @@ if (empty($reshook))
 		$result = $discountcheck->fetch(0, 0, $object->id);
 
 		$canconvert = 0;
-		if ($object->type == FactureFournisseur::TYPE_DEPOSIT && empty($discountcheck->id)) $canconvert = 1; // we can convert deposit into discount if deposit is payed (completely, partially or not at all) and not already converted (see real condition into condition used to show button converttoreduc)
+		if ($object->type == FactureFournisseur::TYPE_DEPOSIT && empty($discountcheck->id)) $canconvert = 1; // we can convert deposit into discount if deposit is paid (completely, partially or not at all) and not already converted (see real condition into condition used to show button converttoreduc)
 		if (($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_STANDARD) && $object->paye == 0 && empty($discountcheck->id)) $canconvert = 1; // we can convert credit note into discount if credit note is not refunded completely and not already converted and amount of payment is 0 (see also the real condition used as the condition to show button converttoreduc)
 		if ($canconvert)
 		{
@@ -605,7 +605,7 @@ if (empty($reshook))
 			{
 				if ($object->type != FactureFournisseur::TYPE_DEPOSIT) {
 					// Classe facture
-					$result = $object->set_paid($user);
+					$result = $object->setPaid($user);
 					if ($result >= 0)
 					{
 						$db->commit();
@@ -655,19 +655,23 @@ if (empty($reshook))
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
 		if ($ret < 0) $error++;
 
-		$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-		$datedue = dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']);
+		$dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$datedue = dol_mktime(12, 0, 0, GETPOST('echmonth', 'int'), GETPOST('echday', 'int'), GETPOST('echyear', 'int'));
 
 		// Replacement invoice
-		if ($_POST['type'] == FactureFournisseur::TYPE_REPLACEMENT)
+		if (GETPOST('type') == FactureFournisseur::TYPE_REPLACEMENT)
 		{
-			if ($datefacture == '')
-			{
+			if (empty($dateinvoice)) {
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('DateInvoice')), null, 'errors');
 				$action = 'create';
 				$_GET['socid'] = $_POST['socid'];
 				$error++;
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now()) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+				$error++;
+				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
+				$action = 'create';
 			}
+
 			if (!(GETPOST('fac_replacement', 'int') > 0)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ReplaceInvoice")), null, 'errors');
@@ -682,7 +686,7 @@ if (empty($reshook))
 				$object->ref_supplier = GETPOST('ref_supplier', 'alpha');
 				$object->socid = GETPOST('socid', 'int');
 				$object->libelle = GETPOST('label', 'nohtml');
-				$object->date = $datefacture;
+				$object->date = $dateinvoice;
 				$object->date_echeance = $datedue;
 				$object->note_public = GETPOST('note_public', 'restricthtml');
 				$object->note_private = GETPOST('note_private', 'restricthtml');
@@ -709,7 +713,7 @@ if (empty($reshook))
 		}
 
 		// Credit note invoice
-		if ($_POST['type'] == FactureFournisseur::TYPE_CREDIT_NOTE)
+		if (GETPOST('type') == FactureFournisseur::TYPE_CREDIT_NOTE)
 		{
 			$sourceinvoice = GETPOST('fac_avoir', 'int');
 			if (!($sourceinvoice > 0) && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE))
@@ -723,13 +727,18 @@ if (empty($reshook))
 				$action = 'create';
 				$error++;
 			}
-			if ($datefacture == '')
-			{
+
+			if (empty($dateinvoice)) {
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('DateInvoice')), null, 'errors');
 				$action = 'create';
 				$_GET['socid'] = $_POST['socid'];
 				$error++;
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now()) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+				$error++;
+				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
+				$action = 'create';
 			}
+
 			if (!GETPOST('ref_supplier'))
 			{
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('RefSupplier')), null, 'errors');
@@ -748,7 +757,7 @@ if (empty($reshook))
 				$object->socid				= GETPOST('socid', 'int');
 				$object->libelle = GETPOST('label', 'nohtml');
 				$object->label				= GETPOST('label', 'nohtml');
-				$object->date = $datefacture;
+				$object->date = $dateinvoice;
 				$object->date_echeance = $datedue;
 				$object->note_public = GETPOST('note_public', 'restricthtml');
 				$object->note_private = GETPOST('note_private', 'restricthtml');
@@ -828,7 +837,7 @@ if (empty($reshook))
 		}
 
 		// Standard or deposit
-		if ($_POST['type'] == FactureFournisseur::TYPE_STANDARD || $_POST['type'] == FactureFournisseur::TYPE_DEPOSIT)
+		if (GETPOST('type') == FactureFournisseur::TYPE_STANDARD || GETPOST('type') == FactureFournisseur::TYPE_DEPOSIT)
 		{
 			if (GETPOST('socid', 'int') < 1)
 			{
@@ -837,13 +846,17 @@ if (empty($reshook))
 				$error++;
 			}
 
-			if ($datefacture == '')
-			{
+			if (empty($dateinvoice)) {
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('DateInvoice')), null, 'errors');
 				$action = 'create';
 				$_GET['socid'] = $_POST['socid'];
 				$error++;
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now()) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+				$error++;
+				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
+				$action = 'create';
 			}
+
 			if (!GETPOST('ref_supplier'))
 			{
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('RefSupplier')), null, 'errors');
@@ -856,12 +869,13 @@ if (empty($reshook))
 			{
 				$tmpproject = GETPOST('projectid', 'int');
 
-				// Creation facture
-				$object->ref           = $_POST['ref'];
-				$object->ref_supplier  = $_POST['ref_supplier'];
-				$object->socid         = $_POST['socid'];
-				$object->libelle       = $_POST['label'];
-				$object->date          = $datefacture;
+				// Creation invoice
+				$object->ref           = GETPOST('ref', 'nohtml');
+				$object->ref_supplier  = GETPOST('ref_supplier', 'nohtml');
+				$object->socid         = GETPOST('socid', 'int');
+				$object->libelle       = GETPOST('label', 'nohtml');	// deprecated
+				$object->label         = GETPOST('label', 'nohtml');
+				$object->date          = $dateinvoice;
 				$object->date_echeance = $datedue;
 				$object->note_public   = GETPOST('note_public', 'restricthtml');
 				$object->note_private  = GETPOST('note_private', 'restricthtml');
@@ -881,7 +895,7 @@ if (empty($reshook))
 				$object->fetch_thirdparty();
 
 				// If creation from another object of another module
-				if (!$error && $_POST['origin'] && $_POST['originid'])
+				if (!$error && GETPOST('origin', 'alpha') && GETPOST('originid'))
 				{
 					// Parse element/subelement (ex: project_task)
 					$element = $subelement = GETPOST('origin', 'alpha');
@@ -1079,7 +1093,7 @@ if (empty($reshook))
 
 		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 
-		if (GETPOST('price_ht') != '')
+		if (GETPOST('price_ht') != '' || GETPOST('multicurrency_subprice') != '')
 		{
 			$up = price2num(GETPOST('price_ht'));
 			$price_base_type = 'HT';
@@ -1123,8 +1137,8 @@ if (empty($reshook))
 		$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty);
 		$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty);
 
-		$remise_percent = GETPOST('remise_percent');
-		$pu_ht_devise = GETPOST('multicurrency_subprice');
+		$remise_percent = price2num(GETPOST('remise_percent'), 2);
+		$pu_ht_devise = price2num(GETPOST('multicurrency_subprice'), 'CU');
 
 		// Extrafields Lines
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -1136,7 +1150,7 @@ if (empty($reshook))
 			}
 		}
 
-		$result = $object->updateline(GETPOST('lineid'), $label, $up, $tva_tx, $localtax1_tx, $localtax2_tx, GETPOST('qty'), GETPOST('productid'), $price_base_type, $info_bits, $type, $remise_percent, 0, $date_start, $date_end, $array_options, $_POST['units'], $pu_ht_devise, GETPOST('fourn_ref', 'alpha'));
+		$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'));
 		if ($result >= 0)
 		{
 			unset($_POST['label']);
@@ -1191,9 +1205,9 @@ if (empty($reshook))
 			$tva_tx = '';
 		}
 
-		$qty = price2num(GETPOST('qty'.$predef), 'alpha');
-		$remise_percent = GETPOST('remise_percent'.$predef);
-		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CR');
+		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
+		$remise_percent = price2num(GETPOST('remise_percent'.$predef), 2);
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU');
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -1289,13 +1303,18 @@ if (empty($reshook))
 					$desc = $productsupplier->desc_supplier;
 				} else $desc = $productsupplier->description;
 
-				if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+				//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 (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) $desc = $product_desc;
+				if (!empty($product_desc) && trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 
 				$type = $productsupplier->type;
-				if ($price_ht != '' || $price_ht_devise != '') {
+				if (GETPOST('price_ht') != '' || GETPOST('price_ht_devise') != '') {
 					$price_base_type = 'HT';
 					$pu = price2num($price_ht, 'MU');
-					$pu_ht_devise = price2num($price_ht_devise, 'MU');
+					$pu_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
@@ -1367,21 +1386,22 @@ if (empty($reshook))
 
 			$fk_unit = GETPOST('units', 'alpha');
 
-			$tva_tx = price2num($tva_tx); // When vat is text input field
+			if (!preg_match('/\((.*)\)/', $tva_tx)) {
+				$tva_tx = price2num($tva_tx); // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
+			}
 
 			// Local Taxes
 			$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty);
 			$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty);
 
-			if ($price_ht !== '')
-			{
+			if (GETPOST('price_ht') != '' || GETPOST('price_ht_devise') != '') {
 				$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
 			} else {
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 				$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
 			}
 			$price_base_type = 'HT';
-			$pu_ht_devise = price2num($price_ht_devise, 'MU');
+			$pu_ht_devise = price2num($price_ht_devise, 'CU');
 
 			$result = $object->addline($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);
 		}
@@ -1525,7 +1545,7 @@ if (empty($reshook))
 		if ($object->statut == FactureFournisseur::STATUS_CLOSED
 		|| ($object->statut == FactureFournisseur::STATUS_ABANDONED && $object->close_code != 'replaced'))
 		{
-			$result = $object->set_unpaid($user);
+			$result = $object->setUnpaid($user);
 			if ($result > 0)
 			{
 				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
@@ -1788,7 +1808,7 @@ if ($action == 'create')
 		print $societe->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$societe->id.'">';
 	} else {
-		print $form->select_company($societe->id, 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
+		print img_picto('', 'company').$form->select_company($societe->id, 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve supplier informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE))
 		{
@@ -2003,7 +2023,7 @@ if ($action == 'create')
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 			$tmp = '<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
 			$text = $tmp.$langs->trans("InvoiceAvoir").' ';
-			$text .= '('.$langs->trans("YouMustCreateInvoiceFromSupplierThird").') ';
+			$text .= '<span class="opacitymedium">('.$langs->trans("YouMustCreateInvoiceFromSupplierThird").')</span> ';
 			$desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceAvoirDesc"), 1, 'help', '', 0, 3);
 			print $desc;
 			print '</div></div>'."\n";
@@ -2054,17 +2074,7 @@ if ($action == 'create')
 	if (!empty($conf->banque->enabled))
 	{
 		print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
-		$form->select_comptes((GETPOSTISSET('fk_account') ?GETPOST('fk_account', 'alpha') : $fk_account), 'fk_account', 0, '', 1);
-		print '</td></tr>';
-	}
-
-	// Multicurrency
-	if (!empty($conf->multicurrency->enabled))
-	{
-		print '<tr>';
-		print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
-		print '<td class="maxwidthonsmartphone">';
-		print $form->selectMultiCurrency((GETPOSTISSET('multicurrency_code') ?GETPOST('multicurrency_code', 'alpha') : $currency_code), 'multicurrency_code');
+		print img_picto('', 'bank_account').$form->select_comptes((GETPOSTISSET('fk_account') ?GETPOST('fk_account', 'alpha') : $fk_account), 'fk_account', 0, '', 1, '', 0, '', 1);
 		print '</td></tr>';
 	}
 
@@ -2075,7 +2085,7 @@ if ($action == 'create')
 
 		$langs->load('projects');
 		print '<tr><td>'.$langs->trans('Project').'</td><td>';
-		$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, '', 0, 0, 'maxwidth500');
+		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 '</td></tr>';
 	}
 
@@ -2089,12 +2099,22 @@ if ($action == 'create')
 		print '</td></tr>';
 	}
 
+	// Multicurrency
+	if (!empty($conf->multicurrency->enabled))
+	{
+		print '<tr>';
+		print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
+		print '<td class="maxwidthonsmartphone">';
+		print $form->selectMultiCurrency((GETPOSTISSET('multicurrency_code') ?GETPOST('multicurrency_code', 'alpha') : $currency_code), 'multicurrency_code');
+		print '</td></tr>';
+	}
+
 	// Intracomm report
 	if (!empty($conf->intracommreport->enabled))
 	{
 		$langs->loadLangs(array("intracommreport"));
 		print '<tr><td>'.$langs->trans('IntracommReportTransportMode').'</td><td>';
-		$form->selectModeTransport(isset($_POST['transport_mode_id']) ? $_POST['transport_mode_id'] : $transport_mode_id, 'transport_mode_id');
+		$form->selectTransportMode(isset($_POST['transport_mode_id']) ? $_POST['transport_mode_id'] : $transport_mode_id, 'transport_mode_id');
 		print '</td></tr>';
 	}
 
@@ -2210,11 +2230,9 @@ if ($action == 'create')
 	}
 } else {
 	if ($id > 0 || !empty($ref)) {
-		/* *************************************************************************** */
-		/*                                                                             */
-		/* Fiche en mode visu ou edition                                               */
-		/*                                                                             */
-		/* *************************************************************************** */
+		//
+		// View or edit mode
+		//
 
 		$now = dol_now();
 
@@ -3084,8 +3102,9 @@ if ($action == 'create')
 		if (!empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY)) $senderissupplier = 1;
 
 		// Show object lines
-		if (!empty($object->lines))
+		if (!empty($object->lines)) {
 			$ret = $object->printObjectLines($action, $societe, $mysoc, $lineid, 1);
+		}
 
 		$num = count($object->lines);
 
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 357abd029fa..d655b97c74f 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -136,7 +136,7 @@ if ($id > 0 || !empty($ref))
 
 		print dol_get_fiche_head($head, 'contact', $langs->trans('SupplierInvoice'), -1, 'supplier_invoice');
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 		$morehtmlref = '<div class="refidno">';
 		// Ref supplier
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index 656cd3c5553..69ea8839cfb 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -67,7 +67,7 @@ $head = facturefourn_prepare_head($object);
 $titre = $langs->trans('SupplierInvoice');
 print dol_get_fiche_head($head, 'info', $langs->trans('SupplierInvoice'), -1, 'supplier_invoice');
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 $morehtmlref = '<div class="refidno">';
 // Ref supplier
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index eef93849c8b..99ab93ca973 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -532,7 +532,7 @@ if ($search_town)  $sql .= natural_search('s.town', $search_town);
 if ($search_zip)   $sql .= natural_search("s.zip", $search_zip);
 if ($search_state) $sql .= natural_search("state.nom", $search_state);
 if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
-if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
+if ($search_type_thirdparty != '' && $search_type_thirdparty >= 0) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
 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_localtax1 != '') $sql .= natural_search('f.localtax1', $search_montant_localtax1, 1);
@@ -583,7 +583,9 @@ if (!$search_all)
 	$sql .= " GROUP BY f.rowid, f.ref, f.ref_supplier, f.type, f.datef, f.date_lim_reglement, f.fk_mode_reglement, f.fk_cond_reglement,";
 	$sql .= " f.total_ht, f.total_ttc, f.total_tva, f.paye, f.fk_statut, f.libelle, f.datec, f.tms,";
 	$sql .= " f.localtax1, f.localtax2,";
+	$sql .= ' f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc,';
 	$sql .= " f.note_public, f.note_private,";
+	$sql .= " f.fk_user_author,";
 	$sql .= ' s.rowid, s.nom, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,';
 	$sql .= " typent.code,";
 	$sql .= " state.code_departement, state.nom,";
@@ -675,6 +677,7 @@ if ($resql)
 	if ($option)                $param .= "&option=".urlencode($option);
 	if ($optioncss != '')       $param .= '&optioncss='.urlencode($optioncss);
 	if ($search_categ_sup > 0) $param .= '&search_categ_sup='.urlencode($search_categ_sup);
+	if ($search_type_thirdparty != '' && $search_type_thirdparty > 0)   $param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
 
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -917,7 +920,7 @@ if ($resql)
 	if (!empty($arrayfields['typent.code']['checked']))
 	{
 		print '<td class="liste_titre maxwidthonsmartphone center">';
-		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
+		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 		print '</td>';
 	}
 	// Condition of payment
@@ -1298,7 +1301,7 @@ if ($resql)
 			if (!empty($arrayfields['typent.code']['checked']))
 			{
 				print '<td class="center">';
-				if (count($typenArray) == 0) $typenArray = $formcompany->typent_array(1);
+				if (empty($typenArray)) $typenArray = $formcompany->typent_array(1);
 				print $typenArray[$obj->typent_code];
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index f88e6dfd834..0592084f042 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -409,6 +409,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 						}
 						function callForResult(imgId)
 						{
+							console.log("callForResult Calculate total of payment");
 							var json = {};
 							var form = $("#payment_form");
 
@@ -445,6 +446,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 								}
 							});
 						}
+						callForResult();
 						$("#payment_form").find("input.amount").change(function() {
 							callForResult();
 						});
@@ -511,7 +513,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 			if (empty($reshook))
 			{
 				/*
-	             * All unpayed supplier invoices
+	             * All unpaid supplier invoices
 	             */
 				$sql = 'SELECT f.rowid as facid, f.ref, f.ref_supplier, f.type, f.total_ht, f.total_ttc,';
 				$sql .= ' f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc,';
@@ -690,10 +692,10 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 								if (!empty($conf->use_javascript_ajax))
 									print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
 									print '<input type="hidden" class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
-									print '<input type="text" size="8" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
+									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" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
+								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>";
 
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index 06cff4b5c9e..355b84796f2 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -305,7 +305,7 @@ if ($result > 0)
 				print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$objp->socid.'">'.img_object($langs->trans('ShowCompany'), 'company').' '.$objp->name.'</a></td>';
 				// Expected to pay
 				print '<td class="right">'.price($objp->total_ttc).'</td>';
-				// Payed
+				// Paid
 				print '<td class="right">'.price($objp->amount).'</td>';
 				// Status
 				print '<td class="right">'.$facturestatic->LibStatut($objp->paye, $objp->status, 6, 1).'</td>';
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 09165ee89d1..bbd5a1ac9d4 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -1369,24 +1369,24 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 
 				print '<tr>';
 				print '<td>'.$langs->trans('DateCreation').'</td>';
-				print '<td>'.dol_print_date($object->date_create, 'dayhour').'</td>';
+				print '<td>'.dol_print_date($object->date_create, 'dayhour', 'tzuser').'</td>';
 				print '</tr>';
 				if ($object->statut == Holiday::STATUS_APPROVED || $object->statut == Holiday::STATUS_CANCELED) {
 					print '<tr>';
 					print '<td>'.$langs->trans('DateValidCP').'</td>';
-					print '<td>'.dol_print_date($object->date_valid, 'dayhour').'</td>'; // warning: date_valid is approval date on holiday module
+					print '<td>'.dol_print_date($object->date_valid, 'dayhour', 'tzuser').'</td>'; // warning: date_valid is approval date on holiday module
 					print '</tr>';
 				}
 				if ($object->statut == Holiday::STATUS_CANCELED) {
 					print '<tr>';
 					print '<td>'.$langs->trans('DateCancelCP').'</td>';
-					print '<td>'.dol_print_date($object->date_cancel, 'dayhour').'</td>';
+					print '<td>'.dol_print_date($object->date_cancel, 'dayhour', 'tzuser').'</td>';
 					print '</tr>';
 				}
 				if ($object->statut == Holiday::STATUS_REFUSED) {
 					print '<tr>';
 					print '<td>'.$langs->trans('DateRefusCP').'</td>';
-					print '<td>'.dol_print_date($object->date_refuse, 'dayhour').'</td>';
+					print '<td>'.dol_print_date($object->date_refuse, 'dayhour', 'tzuser').'</td>';
 					print '</tr>';
 				}
 				print '</tbody>';
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 2030ab1d636..f61c0a66ca8 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -2073,6 +2073,81 @@ class Holiday extends CommonObject
 	}
 
 
+	/**
+	 *  Load information on object
+	 *
+	 *  @param  int     $id      Id of object
+	 *  @return void
+	 */
+	public function info($id)
+	{
+		global $conf;
+
+		$sql = "SELECT f.rowid,";
+		$sql .= " f.date_create as datec,";
+		$sql .= " f.tms as date_modification,";
+		$sql .= " f.date_valid as datev,";
+		//$sql .= " f.date_approve as datea,";
+		$sql .= " f.date_refuse as dater,";
+		$sql .= " f.fk_user_create as fk_user_creation,";
+		$sql .= " f.fk_user_modif as fk_user_modification,";
+		$sql .= " f.fk_user_valid,";
+		$sql .= " f.fk_validator as fk_user_approve,";
+		$sql .= " f.fk_user_refuse as fk_user_refuse";
+		$sql .= " FROM ".MAIN_DB_PREFIX."holiday as f";
+		$sql .= " WHERE f.rowid = ".$id;
+		$sql .= " AND f.entity = ".$conf->entity;
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id = $obj->rowid;
+
+				$this->date_creation = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->date_modification);
+				$this->date_validation = $this->db->jdate($obj->datev);
+				$this->date_approbation = $this->db->jdate($obj->datea);
+
+				$cuser = new User($this->db);
+				$cuser->fetch($obj->fk_user_author);
+				$this->user_creation = $cuser;
+
+				if ($obj->fk_user_creation)
+				{
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_creation);
+					$this->user_creation = $cuser;
+				}
+				if ($obj->fk_user_valid)
+				{
+					$vuser = new User($this->db);
+					$vuser->fetch($obj->fk_user_valid);
+					$this->user_validation = $vuser;
+				}
+				if ($obj->fk_user_modification)
+				{
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modification);
+					$this->user_modification = $muser;
+				}
+				if ($obj->fk_user_approve)
+				{
+					$auser = new User($this->db);
+					$auser->fetch($obj->fk_user_approve);
+					$this->user_approve = $auser;
+				}
+			}
+			$this->db->free($resql);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+
 	/**
 	 *  Initialise an instance with random values.
 	 *  Used to build previews or test instances.
diff --git a/htdocs/holiday/info.php b/htdocs/holiday/info.php
new file mode 100644
index 00000000000..2209143001c
--- /dev/null
+++ b/htdocs/holiday/info.php
@@ -0,0 +1,106 @@
+<?php
+/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ * 	\file       htdocs/holiday/info.php
+ * 	\ingroup    holiday
+ * 	\brief      Page to show a leave information
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/holiday.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
+
+// Load translation files required by the page
+$langs->load("holiday");
+
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+
+$childids = $user->getAllChildIds(1);
+
+// Security check
+if ($user->socid) $socid = $user->socid;
+$result = restrictedArea($user, 'holiday', $id, 'holiday');
+
+$object = new Holiday($db);
+if (!$object->fetch($id, $ref) > 0)
+{
+	dol_print_error($db);
+}
+
+if ($object->id > 0)
+{
+	// Check current user can read this expense report
+	$canread = 0;
+	if (!empty($user->rights->holiday->readall)) $canread = 1;
+	if (!empty($user->rights->holiday->lire) && in_array($object->fk_user_author, $childids)) $canread = 1;
+	if (!$canread)
+	{
+		accessforbidden();
+	}
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$title = $langs->trans("Holiday")." - ".$langs->trans("Info");
+$helpurl = "";
+llxHeader("", $title, $helpurl);
+
+if ($id > 0 || !empty($ref))
+{
+	$object = new Holiday($db);
+	$object->fetch($id, $ref);
+	$object->info($object->id);
+
+	$head = holiday_prepare_head($object);
+
+	print dol_get_fiche_head($head, 'info', $langs->trans("Holiday"), -1, 'holiday');
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/holiday/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+
+	print '<br>';
+
+	print '<table width="100%"><tr><td>';
+	dol_print_object_info($object);
+	print '</td></tr></table>';
+
+	print '</div>';
+
+	print dol_get_fiche_end();
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index cbd9b76e45e..cb8da24052b 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -106,7 +106,7 @@ $search_month_end    = GETPOST('search_month_end', 'int');
 $search_year_end     = GETPOST('search_year_end', 'int');
 $search_employee     = GETPOST('search_employee', 'int');
 $search_valideur     = GETPOST('search_valideur', 'int');
-$search_status       = GETPOST('search_status', 'int');
+$search_status       = GETPOST('search_statut', 'int');
 $search_type         = GETPOST('search_type', 'int');
 
 // Initialize technical objects
diff --git a/htdocs/hrm/admin/admin_hrm.php b/htdocs/hrm/admin/admin_hrm.php
index 4648c2d690a..c4081e1d454 100644
--- a/htdocs/hrm/admin/admin_hrm.php
+++ b/htdocs/hrm/admin/admin_hrm.php
@@ -88,9 +88,7 @@ print '<td colspan="3">'.$langs->trans('Parameters').'</td>';
 print "</tr>\n";
 
 foreach ($list as $key) {
-	$var = !$var;
-
-	print '<tr '.$bc[$var].' class="value">';
+	print '<tr class="oddeven value">';
 
 	// Param
 	$label = $langs->trans($key);
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index fbb17e15280..1f8e6bb0bea 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -502,8 +502,8 @@ if ($step == 2 && $datatoimport)
 	print '<tr class="liste_titre"><td colspan="6">';
 	print $langs->trans("FileMustHaveOneOfFollowingFormat");
 	print '</td></tr>';
-	$liste = $objmodelimport->liste_modeles($db);
-	foreach ($liste as $key)
+	$list = $objmodelimport->liste_modeles($db);
+	foreach ($list as $key)
 	{
 		print '<tr class="oddeven">';
 		print '<td width="16">'.img_picto_common($key, $objmodelimport->getPictoForKey($key)).'</td>';
@@ -533,7 +533,7 @@ if ($step == 3 && $datatoimport)
 	if ($separator) $param .= '&separator='.urlencode($separator);
 	if ($enclosure) $param .= '&enclosure='.urlencode($enclosure);
 
-	$liste = $objmodelimport->liste_modeles($db);
+	$list = $objmodelimport->liste_modeles($db);
 
 	llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:M&oacute;dulo_Importaciones');
 
@@ -731,7 +731,7 @@ if ($step == 3 && $datatoimport)
 if ($step == 4 && $datatoimport)
 {
 	$model = $format;
-	$liste = $objmodelimport->liste_modeles($db);
+	$list = $objmodelimport->liste_modeles($db);
 
 	// Create classe to use for import
 	$dir = DOL_DOCUMENT_ROOT."/core/modules/import/";
@@ -1255,8 +1255,16 @@ if ($step == 4 && $datatoimport)
 // STEP 5: Summary of choices and launch simulation
 if ($step == 5 && $datatoimport)
 {
+	$max_execution_time_for_importexport = (empty($conf->global->IMPORT_MAX_EXECUTION_TIME) ? 300 : $conf->global->IMPORT_MAX_EXECUTION_TIME); // 5mn if not defined
+	$max_time = @ini_get("max_execution_time");
+	if ($max_time && $max_time < $max_execution_time_for_importexport)
+	{
+		dol_syslog("max_execution_time=".$max_time." is lower than max_execution_time_for_importexport=".$max_execution_time_for_importexport.". We try to increase it dynamically.");
+		@ini_set("max_execution_time", $max_execution_time_for_importexport); // This work only if safe mode is off. also web servers has timeout of 300
+	}
+
 	$model = $format;
-	$liste = $objmodelimport->liste_modeles($db);
+	$list = $objmodelimport->liste_modeles($db);
 
 	// Create classe to use for import
 	$dir = DOL_DOCUMENT_ROOT."/core/modules/import/";
@@ -1595,8 +1603,10 @@ if ($step == 5 && $datatoimport)
 		// Show OK
 		if (!count($arrayoferrors) && !count($arrayofwarnings)) {
 			print '<div class="center">'.img_picto($langs->trans("OK"), 'tick').' <b>'.$langs->trans("NoError").'</b></div><br><br>';
-			print $langs->trans("NbInsert", $obj->nbinsert).'<br>';
-			print $langs->trans("NbUpdate", $obj->nbupdate).'<br><br>';
+			print '<div class="ok">';
+			print $langs->trans("NbInsert", empty($obj->nbinsert) ? 0 : $obj->nbinsert).'<br>';
+			print $langs->trans("NbUpdate", empty($obj->nbupdate) ? 0 : $obj->nbupdate).'<br><br>';
+			print '</div>';
 		} else print $langs->trans("NbOfLinesOK", $nbok).'<br><br>';
 
 		// Show Errors
@@ -1684,9 +1694,17 @@ if ($step == 5 && $datatoimport)
 // STEP 6: Real import
 if ($step == 6 && $datatoimport)
 {
+	$max_execution_time_for_importexport = (empty($conf->global->IMPORT_MAX_EXECUTION_TIME) ? 300 : $conf->global->IMPORT_MAX_EXECUTION_TIME); // 5mn if not defined
+	$max_time = @ini_get("max_execution_time");
+	if ($max_time && $max_time < $max_execution_time_for_importexport)
+	{
+		dol_syslog("max_execution_time=".$max_time." is lower than max_execution_time_for_importexport=".$max_execution_time_for_importexport.". We try to increase it dynamically.");
+		@ini_set("max_execution_time", $max_execution_time_for_importexport); // This work only if safe mode is off. also web servers has timeout of 300
+	}
+
 	$model = $format;
-	$liste = $objmodelimport->liste_modeles($db);
-	$importid = $_REQUEST["importid"];
+	$list = $objmodelimport->liste_modeles($db);
+	$importid = GETPOST("importid", 'alphanohtml');
 
 
 	// Create classe to use for import
@@ -1962,12 +1980,14 @@ if ($step == 6 && $datatoimport)
 
 	// Show result
 	print '<br>';
-	print '<div class="center">';
+	print '<div class="ok">';
 	print $langs->trans("NbOfLinesImported", $nbok).'</b><br>';
-	print $langs->trans("NbInsert", $obj->nbinsert).'<br>';
-	print $langs->trans("NbUpdate", $obj->nbupdate).'<br><br>';
+	print $langs->trans("NbInsert", empty($obj->nbinsert) ? 0 : $obj->nbinsert).'<br>';
+	print $langs->trans("NbUpdate", empty($obj->nbupdate) ? 0 : $obj->nbupdate).'<br><br>';
+	print '</div>';
+	print '<div class="center">';
 	print $langs->trans("FileWasImported", $importid).'<br>';
-	print $langs->trans("YouCanUseImportIdToFindRecord", $importid).'<br>';
+	print '<span class="opacitymedium">'.$langs->trans("YouCanUseImportIdToFindRecord", $importid).'</span><br>';
 	print '</div>';
 }
 
diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php
index 4c556325b05..e27712a5e56 100644
--- a/htdocs/imports/index.php
+++ b/htdocs/imports/index.php
@@ -68,9 +68,9 @@ print '</tr>';
 
 include_once DOL_DOCUMENT_ROOT.'/core/modules/import/modules_import.php';
 $model = new ModeleImports();
-$liste = $model->liste_modeles($db);
+$list = $model->liste_modeles($db);
 
-foreach ($liste as $key)
+foreach ($list as $key)
 {
 	print '<tr class="oddeven">';
 	print '<td width="16">'.img_picto_common($model->getDriverLabelForKey($key), $model->getPictoForKey($key)).'</td>';
diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index 5012337daf8..800b29a918d 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -136,9 +136,9 @@ class Odf
 		// instead of {aaa} so we should enhance this function.
 		//print $key.'-'.$value.'-'.strpos($this->contentXml, $this->config['DELIMITER_LEFT'] . $key . $this->config['DELIMITER_RIGHT']).'<br>';
 		if (strpos($this->contentXml, $tag) === false && strpos($this->stylesXml, $tag) === false) {
-			//if (strpos($this->contentXml, '">'. $key . '</text;span>') === false) {
-			throw new OdfException("var $key not found in the document");
-			//}
+			// Add the throw only for development. In most cases, it is normal to not having the key into the document (only few keys are presents).
+			//throw new OdfException("var $key not found in the document");
+			return $this;
 		}
 
 		$this->vars[$tag] = $this->convertVarToOdf($value, $encode, $charset);
@@ -820,10 +820,17 @@ IMG;
 		// Export to PDF using 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
+			dol_delete_dir_recursive($conf->user->dir_temp.'/odtaspdf');
+			dol_mkdir($conf->user->dir_temp.'/odtaspdf');
+
+			// Install prerequisites: apt install soffice libreoffice-common libreoffice-writer
 			// using windows libreoffice that must be in path
 			// 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.'" --convert-to pdf --outdir '. escapeshellarg(dirname($name)). " ".escapeshellarg($name);
+			$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))
 		{
@@ -856,7 +863,7 @@ IMG;
 		}
 		else
 		{
-			// deprecated old method
+			// deprecated old method using odt2pdf.sh (native, jodconverter, ...)
 			$tmpname=preg_replace('/\.odt/i', '', $name);
 
 			if (!empty($conf->global->MAIN_DOL_SCRIPTS_ROOT))
diff --git a/htdocs/includes/parsedown/Parsedown.php b/htdocs/includes/parsedown/Parsedown.php
index df718bce111..cc110c318c8 100644
--- a/htdocs/includes/parsedown/Parsedown.php
+++ b/htdocs/includes/parsedown/Parsedown.php
@@ -1182,7 +1182,7 @@ class Parsedown
                     'src' => $Link['element']['attributes']['href'],
                 	'alt' => $Link['element']['text'],
                 	// @CHANGE LDR
-                	'class' => $Link['element']['attributes']['class']
+                    'class' => (!empty($Link['element']['attributes']['class']) ? $Link['element']['attributes']['class'] : '')
                 ),
             ),
         );
diff --git a/htdocs/index.php b/htdocs/index.php
index 7bfab28a0f2..92914b96e83 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -112,219 +112,6 @@ $boxstatFromHook = '';
 // Load translation files required by page
 $langs->loadLangs(array('commercial', 'bills', 'orders', 'contracts'));
 
-// Load global statistics of objects
-if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
-{
-	$object = new stdClass();
-	$parameters = array();
-	$action = '';
-	$reshook = $hookmanager->executeHooks('addStatisticLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-	$boxstatFromHook = $hookmanager->resPrint;
-
-	if (empty($reshook))
-	{
-		// Cle array returned by the method load_state_board for each line
-		$keys = array(
-			'users',
-			'members',
-			'expensereports',
-			'holidays',
-			'customers',
-			'prospects',
-			'suppliers',
-			'contacts',
-			'products',
-			'services',
-			'projects',
-			'proposals',
-			'orders',
-			'invoices',
-			'donations',
-			'supplier_proposals',
-			'supplier_orders',
-			'supplier_invoices',
-			'contracts',
-			'interventions',
-			'ticket'
-		);
-
-		// Condition to be checked for each display line dashboard
-		$conditions = array(
-			'users' => $user->rights->user->user->lire,
-			'members' => !empty($conf->adherent->enabled) && $user->rights->adherent->lire,
-			'customers' => !empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS),
-			'prospects' => !empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS),
-			'suppliers' => !empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS),
-			'contacts' => !empty($conf->societe->enabled) && $user->rights->societe->contact->lire,
-			'products' => !empty($conf->product->enabled) && $user->rights->produit->lire,
-			'services' => !empty($conf->service->enabled) && $user->rights->service->lire,
-			'proposals' => !empty($conf->propal->enabled) && $user->rights->propale->lire,
-			'orders' => !empty($conf->commande->enabled) && $user->rights->commande->lire,
-			'invoices' => !empty($conf->facture->enabled) && $user->rights->facture->lire,
-			'donations' => !empty($conf->don->enabled) && $user->rights->don->lire,
-			'contracts' => !empty($conf->contrat->enabled) && $user->rights->contrat->lire,
-			'interventions' => !empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire,
-			'supplier_orders' => !empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_ORDERS_STATS),
-			'supplier_invoices' => !empty($conf->supplier_invoice->enabled) && $user->rights->fournisseur->facture->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_INVOICES_STATS),
-			'supplier_proposals' => !empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_PROPOSAL_STATS),
-			'projects' => !empty($conf->projet->enabled) && $user->rights->projet->lire,
-			'expensereports' => !empty($conf->expensereport->enabled) && $user->rights->expensereport->lire,
-			'holidays' => !empty($conf->holiday->enabled) && $user->rights->holiday->read,
-			'ticket' => !empty($conf->ticket->enabled) && $user->rights->ticket->read
-		);
-		// Class file containing the method load_state_board for each line
-		$includes = array(
-			'users' => DOL_DOCUMENT_ROOT."/user/class/user.class.php",
-			'members' => DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php",
-			'customers' => DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
-			'prospects' => DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
-			'suppliers' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php",
-			'contacts' => DOL_DOCUMENT_ROOT."/contact/class/contact.class.php",
-			'products' => DOL_DOCUMENT_ROOT."/product/class/product.class.php",
-			'services' => DOL_DOCUMENT_ROOT."/product/class/product.class.php",
-			'proposals' => DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php",
-			'orders' => DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",
-			'invoices' => DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php",
-			'donations' => DOL_DOCUMENT_ROOT."/don/class/don.class.php",
-			'contracts' => DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php",
-			'interventions' => DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php",
-			'supplier_orders' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php",
-			'supplier_invoices' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php",
-			'supplier_proposals' => DOL_DOCUMENT_ROOT."/supplier_proposal/class/supplier_proposal.class.php",
-			'projects' => DOL_DOCUMENT_ROOT."/projet/class/project.class.php",
-			'expensereports' => DOL_DOCUMENT_ROOT."/expensereport/class/expensereport.class.php",
-			'holidays' => DOL_DOCUMENT_ROOT."/holiday/class/holiday.class.php",
-			'ticket' => DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php"
-		);
-		// Name class containing the method load_state_board for each line
-		$classes = array(
-			'users' => 'User',
-			'members' => 'Adherent',
-			'customers' => 'Client',
-			'prospects' => 'Client',
-			'suppliers' => 'Fournisseur',
-			'contacts' => 'Contact',
-			'products' => 'Product',
-			'services' => 'ProductService',
-			'proposals' => 'Propal',
-			'orders' => 'Commande',
-			'invoices' => 'Facture',
-			'donations' => 'Don',
-			'contracts' => 'Contrat',
-			'interventions' => 'Fichinter',
-			'supplier_orders' => 'CommandeFournisseur',
-			'supplier_invoices' => 'FactureFournisseur',
-			'supplier_proposals' => 'SupplierProposal',
-			'projects' => 'Project',
-			'expensereports' => 'ExpenseReport',
-			'holidays' => 'Holiday',
-			'ticket' => 'Ticket',
-		);
-		// Translation keyword
-		$titres = array(
-			'users' => "Users",
-			'members' => "Members",
-			'customers' => "ThirdPartyCustomersStats",
-			'prospects' => "ThirdPartyProspectsStats",
-			'suppliers' => "Suppliers",
-			'contacts' => "Contacts",
-			'products' => "Products",
-			'services' => "Services",
-			'proposals' => "CommercialProposalsShort",
-			'orders' => "CustomersOrders",
-			'invoices' => "BillsCustomers",
-			'donations' => "Donations",
-			'contracts' => "Contracts",
-			'interventions' => "Interventions",
-			'supplier_orders' => "SuppliersOrders",
-			'supplier_invoices' => "SuppliersInvoices",
-			'supplier_proposals' => "SupplierProposalShort",
-			'projects' => "Projects",
-			'expensereports' => "ExpenseReports",
-			'holidays' => "Holidays",
-			'ticket' => "Ticket",
-		);
-		// Dashboard Link lines
-		$links = array(
-			'users' => DOL_URL_ROOT.'/user/list.php',
-			'members' => DOL_URL_ROOT.'/adherents/list.php?statut=1&mainmenu=members',
-			'customers' => DOL_URL_ROOT.'/societe/list.php?type=c&mainmenu=companies',
-			'prospects' => DOL_URL_ROOT.'/societe/list.php?type=p&mainmenu=companies',
-			'suppliers' => DOL_URL_ROOT.'/societe/list.php?type=f&mainmenu=companies',
-			'contacts' => DOL_URL_ROOT.'/contact/list.php?mainmenu=companies',
-			'products' => DOL_URL_ROOT.'/product/list.php?type=0&mainmenu=products',
-			'services' => DOL_URL_ROOT.'/product/list.php?type=1&mainmenu=products',
-			'proposals' => DOL_URL_ROOT.'/comm/propal/list.php?mainmenu=commercial&leftmenu=propals',
-			'orders' => DOL_URL_ROOT.'/commande/list.php?mainmenu=commercial&leftmenu=orders',
-			'invoices' => DOL_URL_ROOT.'/compta/facture/list.php?mainmenu=billing&leftmenu=customers_bills',
-			'donations' => DOL_URL_ROOT.'/don/list.php?leftmenu=donations',
-			'contracts' => DOL_URL_ROOT.'/contrat/list.php?mainmenu=commercial&leftmenu=contracts',
-			'interventions' => DOL_URL_ROOT.'/fichinter/list.php?mainmenu=commercial&leftmenu=ficheinter',
-			'supplier_orders' => DOL_URL_ROOT.'/fourn/commande/list.php?mainmenu=commercial&leftmenu=orders_suppliers',
-			'supplier_invoices' => DOL_URL_ROOT.'/fourn/facture/list.php?mainmenu=billing&leftmenu=suppliers_bills',
-			'supplier_proposals' => DOL_URL_ROOT.'/supplier_proposal/list.php?mainmenu=commercial&leftmenu=',
-			'projects' => DOL_URL_ROOT.'/projet/list.php?mainmenu=project',
-			'expensereports' => DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&leftmenu=expensereport',
-			'holidays' => DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm&leftmenu=holiday',
-			'ticket' => DOL_URL_ROOT.'/ticket/list.php?leftmenu=ticket'
-		);
-		// Translation lang files
-		$langfile = array(
-			'customers' => "companies",
-			'contacts' => "companies",
-			'services' => "products",
-			'proposals' => "propal",
-			'invoices' => "bills",
-			'supplier_orders' => "orders",
-			'supplier_invoices' => "bills",
-			'supplier_proposals' => 'supplier_proposal',
-			'expensereports' => "trips",
-			'holidays' => "holiday",
-		);
-
-
-		// Loop and displays each line of table
-		$boardloaded = array();
-		foreach ($keys as $val)
-		{
-			if ($conditions[$val])
-			{
-				$boxstatItem = '';
-				$class = $classes[$val];
-				// Search in cache if load_state_board is already realized
-				$classkeyforcache = $class;
-				if ($classkeyforcache == 'ProductService') $classkeyforcache = 'Product'; // ProductService use same load_state_board than Product
-
-				if (!isset($boardloaded[$classkeyforcache]) || !is_object($boardloaded[$classkeyforcache]))
-				{
-					include_once $includes[$val]; // Loading a class cost around 1Mb
-
-					$board = new $class($db);
-					$board->load_state_board();
-					$boardloaded[$class] = $board;
-				} else {
-					$board = $boardloaded[$classkeyforcache];
-				}
-
-				$langs->load(empty($langfile[$val]) ? $val : $langfile[$val]);
-
-				$text = $langs->trans($titres[$val]);
-				$boxstatItem .= '<a href="'.$links[$val].'" class="boxstatsindicator thumbstat nobold nounderline">';
-				$boxstatItem .= '<div class="boxstats">';
-				$boxstatItem .= '<span class="boxstatstext" title="'.dol_escape_htmltag($text).'">'.$text.'</span><br>';
-				$boxstatItem .= '<span class="boxstatsindicator">'.img_object("", $board->picto, 'class="inline-block"').' '.($board->nb[$val] ? $board->nb[$val] : 0).'</span>';
-				$boxstatItem .= '</div>';
-				$boxstatItem .= '</a>';
-
-				$boxstatItems[$val] = $boxstatItem;
-			}
-		}
-	}
-}
-
-
-
-
 // Dolibarr Working Board with weather
 
 if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
@@ -675,7 +462,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 						// get key index of stats used in $includes, $classes, $keys, $icons, $titres, $links
 						$keyIndex = array_search($globalStatsKey, $keys);
 
-						$classe = $classes[$keyIndex];
+						$classe = (!empty($classes[$keyIndex]) ? $classes[$keyIndex] : '');
 						if (isset($boardloaded[$classe]) && is_object($boardloaded[$classe]))
 						{
 							$groupElement['globalStats']['total'] = $boardloaded[$classe]->nb[$globalStatsKey] ? $boardloaded[$classe]->nb[$globalStatsKey] : 0;
@@ -762,7 +549,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 		}
 
 		if ($showweather && !empty($isIntopOpenedDashBoard)) {
-			$appendClass = $conf->global->MAIN_DISABLE_METEO == 2 ? ' hideonsmartphone' : '';
+		    $appendClass = (!empty($conf->global->MAIN_DISABLE_METEO) && $conf->global->MAIN_DISABLE_METEO == 2 ? ' hideonsmartphone' : '');
 			$weather = getWeatherStatus($totallate);
 
 			$text = '';
@@ -889,7 +676,7 @@ print '<div class="fichecenter fichecenterbis">';
  * Show widgets (boxes)
  */
 
-$boxlist .= '<div class="twocolumns">';
+$boxlist = '<div class="twocolumns">';
 
 $boxlist .= '<div class="firstcolumn fichehalfleft boxhalfleft" id="boxhalfleft">';
 if (!empty($nbworkboardcount))
@@ -901,54 +688,8 @@ $boxlist .= $resultboxes['boxlista'];
 
 $boxlist .= '</div>';
 
-
-if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
-{
-	// Remove allready present info in new dash board
-	if (!empty($conf->global->MAIN_INCLUDE_GLOBAL_STATS_IN_OPENED_DASHBOARD) && is_array($boxstatItems) && count($boxstatItems) > 0) {
-		foreach ($boxstatItems as $boxstatItemKey => $boxstatItemHtml) {
-			if (in_array($boxstatItemKey, $globalStatInTopOpenedDashBoard)) {
-				unset($boxstatItems[$boxstatItemKey]);
-			}
-		}
-	}
-
-	if (!empty($boxstatFromHook) || !empty($boxstatItems)) {
-		$boxstat .= '<!-- Database statistics -->'."\n";
-		$boxstat .= '<div class="box">';
-		$boxstat .= '<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom nohover widgetstats" width="100%">';
-		$boxstat .= '<tr class="liste_titre box_titre">';
-		$boxstat .= '<td>';
-		$boxstat .= '<div class="inline-block valignmiddle">'.$langs->trans("DolibarrStateBoard").'</div>';
-		$boxstat .= '</td>';
-		$boxstat .= '</tr>';
-		$boxstat .= '<tr class="nobottom nohover"><td class="tdboxstats nohover flexcontainer">';
-
-		$boxstat .= $boxstatFromHook;
-
-		if (is_array($boxstatItems) && count($boxstatItems) > 0)
-		{
-			$boxstat .= implode('', $boxstatItems);
-		}
-
-		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
-		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
-		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
-		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
-		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
-		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
-		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
-		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
-
-		$boxstat .= '</td></tr>';
-		$boxstat .= '</table>';
-		$boxstat .= '</div>';
-	}
-}
-
 $boxlist .= '<div class="secondcolumn fichehalfright boxhalfright" id="boxhalfright">';
 
-$boxlist .= $boxstat;
 $boxlist .= $resultboxes['boxlistb'];
 
 $boxlist .= '</div>';
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index daab7a7296a..0a3e49c9600 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -122,7 +122,7 @@ if (!function_exists("imagecreate"))
 	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportGD")."<br>\n";
 	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
 } else {
-	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportGD")."<br>\n";
+	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupport", "GD")."<br>\n";
 }
 
 
@@ -133,7 +133,7 @@ if (!function_exists("curl_init"))
 	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportCurl")."<br>\n";
 	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
 } else {
-	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportCurl")."<br>\n";
+	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupport", "Curl")."<br>\n";
 }
 
 // Check if PHP calendar extension is available
@@ -141,7 +141,7 @@ if (!function_exists("easter_date"))
 {
 	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportCalendar")."<br>\n";
 } else {
-	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportCalendar")."<br>\n";
+	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupport", "Calendar")."<br>\n";
 }
 
 
@@ -152,7 +152,7 @@ if (!function_exists("utf8_encode"))
 	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportUTF8")."<br>\n";
 	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
 } else {
-	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportUTF8")."<br>\n";
+	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupport", "UTF8")."<br>\n";
 }
 
 
@@ -165,7 +165,7 @@ if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@loc
 		print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportIntl")."<br>\n";
 		// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
 	} else {
-		print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportIntl")."<br>\n";
+		print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupport", "Intl")."<br>\n";
 	}
 }
 
diff --git a/htdocs/install/doctemplates/websites/website_template-corporate.zip b/htdocs/install/doctemplates/websites/website_template-corporate.zip
index 473d7377fc2..dc0065bc12c 100644
Binary files a/htdocs/install/doctemplates/websites/website_template-corporate.zip and b/htdocs/install/doctemplates/websites/website_template-corporate.zip differ
diff --git a/htdocs/install/mysql/data/llx_accounting_abc.sql b/htdocs/install/mysql/data/llx_accounting_abc.sql
index 9118b7a4651..b5e94449988 100644
--- a/htdocs/install/mysql/data/llx_accounting_abc.sql
+++ b/htdocs/install/mysql/data/llx_accounting_abc.sql
@@ -173,3 +173,8 @@ INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUE
 -- Description of chart of account TG SYSCOHADA
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 15,'SYSCOHADA-TG', 'Plan comptable Ouest-Africain', 1);
 
+-- Description of chart of account USA US-BASE
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  11, 'US-BASE', 'USA basic chart of accounts', 1);
+
+-- Description of chart of account Canada CA-ENG-BASE
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (  14, 'CA-ENG-BASE', 'Canadian basic chart of accounts - English', 1);
diff --git a/htdocs/install/mysql/data/llx_accounting_account_us.sql b/htdocs/install/mysql/data/llx_accounting_account_us.sql
index a051453b42c..f0ca038ca08 100644
--- a/htdocs/install/mysql/data/llx_accounting_account_us.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_us.sql
@@ -33,141 +33,141 @@
 -- ID 1000 - 9999
 -- ADD 1100000 to rowid # Do no remove this comment --
 
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1000,'US-BASE','ASSETS',         'XXXXXX',   '1',   '0', 'Assets', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 2000,'US-BASE','LIABILITIES',    'XXXXXX',   '2',   '0', 'Liabilities', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 3000,'US-BASE','EQUITY',         'XXXXXX',   '3',   '0', 'Equity', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 4000,'US-BASE','INCOME',         'XXXXXX',   '4',   '0', 'Revenue', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 5000,'US-BASE','COGS',           'XXXXXX',   '5',   '0', 'Cost of Goods Sold', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 6000,'US-BASE','EXPENSE',        'XXXXXX',   '6',   '0', 'Expenses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 7000,'US-BASE','OTHER_REVENUE',  'XXXXXX',   '7',   '0', 'Other Revenue', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 8000,'US-BASE','OTHER_EXPENSES', 'XXXXXX',   '8',   '0', 'Other Expenses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1000, 'US-BASE', 'ASSETS',         '1', '0', 'Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 2000, 'US-BASE', 'LIABILITIES',    '2', '0', 'Liabilities', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 3000, 'US-BASE', 'EQUITY',         '3', '0', 'Equity', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4000, 'US-BASE', 'INCOME',         '4', '0', 'Revenue', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 5000, 'US-BASE', 'COGS',           '5', '0', 'Cost of Goods Sold', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 6000, 'US-BASE', 'EXPENSE',        '6', '0', 'Expenses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7000, 'US-BASE', 'OTHER_REVENUE',  '7', '0', 'Other Revenue', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8000, 'US-BASE', 'OTHER_EXPENSES', '8', '0', 'Other Expenses', 1);
 
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1010, 'US-BASE', 'ASSETS', 'CASH', '1010', '1000', 'Cash on Hand', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1011, 'US-BASE', 'ASSETS', 'CASH', '1020', '1000', 'Checking Account', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1012, 'US-BASE', 'ASSETS', 'CASH', '1030', '1000', 'Savings Account', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1013, 'US-BASE', 'ASSETS', 'XXXXXX', '1040', '1000', 'Investments and Securities', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1014, 'US-BASE', 'ASSETS', 'XXXXXX', '1100', '1000', 'Accounts Receivable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1015, 'US-BASE', 'ASSETS', 'XXXXXX', '1140', '1000', 'Other Receivables', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1016, 'US-BASE', 'ASSETS', 'XXXXXX', '1150', '1000', 'Allowance for Doubtful Accounts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1017, 'US-BASE', 'ASSETS', 'XXXXXX', '1200', '1000', 'Raw Materials Inventory', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1018, 'US-BASE', 'ASSETS', 'XXXXXX', '1205', '1000', 'Supplies Inventory', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1019, 'US-BASE', 'ASSETS', 'XXXXXX', '1210', '1000', 'Work in Progress Inventory', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1020, 'US-BASE', 'ASSETS', 'XXXXXX', '1215', '1000', 'Finished Goods Inventory', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1021, 'US-BASE', 'ASSETS', 'XXXXXX', '1400', '1000', 'Prepaid Expenses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1022, 'US-BASE', 'ASSETS', 'XXXXXX', '1410', '1000', 'Employee Advances', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1023, 'US-BASE', 'ASSETS', 'XXXXXX', '1420', '1000', 'Notes Receivable - Current', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1024, 'US-BASE', 'ASSETS', 'XXXXXX', '1430', '1000', 'Prepaid Interest', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1025, 'US-BASE', 'ASSETS', 'XXXXXX', '1470', '1000', 'Other Current Assets', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1026, 'US-BASE', 'ASSETS', 'XXXXXX', '1500', '1000', 'Furniture and Fixtures', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1027, 'US-BASE', 'ASSETS', 'XXXXXX', '1510', '1000', 'Equipment', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1028, 'US-BASE', 'ASSETS', 'XXXXXX', '1520', '1000', 'Vehicles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1029, 'US-BASE', 'ASSETS', 'XXXXXX', '1530', '1000', 'Other Depreciable Property', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1030, 'US-BASE', 'ASSETS', 'XXXXXX', '1550', '1000', 'Buildings', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1031, 'US-BASE', 'ASSETS', 'XXXXXX', '1560', '1000', 'Building Improvements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1032, 'US-BASE', 'ASSETS', 'XXXXXX', '1690', '1000', 'Land', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1033, 'US-BASE', 'ASSETS', 'XXXXXX', '1700', '1000', 'Accumulated Depreciation, Furniture and Fixtures', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1034, 'US-BASE', 'ASSETS', 'XXXXXX', '1710', '1000', 'Accumulated Depreciation, Equipment', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1035, 'US-BASE', 'ASSETS', 'XXXXXX', '1720', '1000', 'Accumulated Depreciation, Vehicles', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1036, 'US-BASE', 'ASSETS', 'XXXXXX', '1730', '1000', 'Accumulated Depreciation, Buildings', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1037, 'US-BASE', 'ASSETS', 'XXXXXX', '1740', '1000', 'Accumulated Depreciation, Building Improvements', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1038, 'US-BASE', 'ASSETS', 'XXXXXX', '1750', '1000', 'Accumulated Depreciation, Other', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1039, 'US-BASE', 'ASSETS', 'XXXXXX', '1900', '1000', 'Deposits', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1040, 'US-BASE', 'ASSETS', 'XXXXXX', '1910', '1000', 'Accumulated Amortization', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1041, 'US-BASE', 'ASSETS', 'XXXXXX', '1920', '1000', 'Notes Receivable - Non-current', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1042, 'US-BASE', 'ASSETS', 'XXXXXX', '1990', '1000', 'Other Non-current Assets', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1043, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2100', '2000', 'Accounts Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1044, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2300', '2000', 'Accrued Expenses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1045, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2310', '2000', 'Sales Tax Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1046, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2320', '2000', 'Wages Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1047, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2330', '2000', '401-K Deductions Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1048, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2335', '2000', 'Health Insurance Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1049, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2340', '2000', 'Federal Payroll Taxes Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1050, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2350', '2000', 'Federal Unemployment Tax Act - Tax Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1051, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2360', '2000', 'State Payroll Taxes Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1052, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2370', '2000', 'State Unemployment Tax Act - Tax Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1053, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2380', '2000', 'Local Payroll Taxes Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1054, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2390', '2000', 'Income Taxes Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1055, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2400', '2000', 'Other Taxes Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1056, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2410', '2000', 'Employee Benefits Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1057, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2420', '2000', 'Current Portion of Long-term Debt', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1058, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2440', '2000', 'Deposits from Customers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1059, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2480', '2000', 'Other Current Liabilities', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1060, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2700', '2000', 'Notes Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1061, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2702', '2000', 'Land Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1062, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2704', '2000', 'Equipment Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1063, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2706', '2000', 'Vehicles Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1064, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2708', '2000', 'Bank Loans Payable', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1065, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2710', '2000', 'Deferred Revenue', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1066, 'US-BASE', 'LIABILITIES', 'XXXXXX', '2740', '2000', 'Other Long-term Liabilities', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1067, 'US-BASE', 'CAPITAL', 'XXXXXX', '3010', '3000', 'Stated Capital', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1068, 'US-BASE', 'CAPITAL', 'XXXXXX', '3020', '3000', 'Capital Surplus', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1069, 'US-BASE', 'CAPITAL', 'XXXXXX', '3030', '3000', 'Retained Earnings', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1070, 'US-BASE', 'INCOME', 'XXXXXX', '4010', '4000', 'Product Sales', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1071, 'US-BASE', 'INCOME', 'XXXXXX', '4060', '4000', 'Reimbursible Expenses', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1072, 'US-BASE', 'INCOME', 'XXXXXX', '4061', '4000', 'Reimbursible Expenses - Meals and Entertainment ', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1073, 'US-BASE', 'INCOME', 'XXXXXX', '4540', '4000', 'Finance Charge Income', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1074, 'US-BASE', 'INCOME', 'XXXXXX', '4550', '4000', 'Shipping Charges Reimbursed', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1075, 'US-BASE', 'INCOME', 'XXXXXX', '4800', '4000', 'Sales Returns and Allowances', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1076, 'US-BASE', 'INCOME', 'XXXXXX', '4900', '4000', 'Sales Discounts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1077, 'US-BASE', 'COGS', 'XXXXXX', '5010', '5000', 'Product Cost', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1078, 'US-BASE', 'COGS', 'XXXXXX', '5050', '5000', 'Raw Material Purchases', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1079, 'US-BASE', 'COGS', 'XXXXXX', '5100', '5000', 'Direct Labor Costs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1080, 'US-BASE', 'COGS', 'XXXXXX', '5150', '5000', 'Indirect Labor Costs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1081, 'US-BASE', 'COGS', 'XXXXXX', '5200', '5000', 'Heat and Power', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1082, 'US-BASE', 'COGS', 'XXXXXX', '5250', '5000', 'Commissions', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1083, 'US-BASE', 'COGS', 'XXXXXX', '5300', '5000', 'Miscellaneous Factory Costs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1084, 'US-BASE', 'COGS', 'XXXXXX', '5700', '5000', 'Cost of Goods Sold, Salaries and Wages', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1085, 'US-BASE', 'COGS', 'XXXXXX', '5730', '5000', 'Cost of Goods Sold, Contract Labor', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1086, 'US-BASE', 'COGS', 'XXXXXX', '5750', '5000', 'Cost of Goods Sold, Freight', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1087, 'US-BASE', 'COGS', 'XXXXXX', '5800', '5000', 'Cost of Goods Sold, Other', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1088, 'US-BASE', 'COGS', 'XXXXXX', '5850', '5000', 'Inventory Adjustments', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1089, 'US-BASE', 'COGS', 'XXXXXX', '5900', '5000', 'Purchase Returns and Allowances', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1090, 'US-BASE', 'COGS', 'XXXXXX', '5950', '5000', 'Purchase Discounts', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1091, 'US-BASE', 'EXPENSE', 'XXXXXX', '6010', '6000', 'Default Purchase Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1092, 'US-BASE', 'EXPENSE', 'XXXXXX', '6020', '6000', 'Advertising Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1093, 'US-BASE', 'EXPENSE', 'XXXXXX', '6050', '6000', 'Amortization Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1094, 'US-BASE', 'EXPENSE', 'XXXXXX', '6100', '6000', 'Auto EXPENSE', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1095, 'US-BASE', 'EXPENSE', 'XXXXXX', '6150', '6000', 'Bad Debt Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1096, 'US-BASE', 'EXPENSE', 'XXXXXX', '6200', '6000', 'Bank Fees', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1097, 'US-BASE', 'EXPENSE', 'XXXXXX', '6250', '6000', 'Cash Over and Short', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1098, 'US-BASE', 'EXPENSE', 'XXXXXX', '6300', '6000', 'Charitable Contributions Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1099, 'US-BASE', 'EXPENSE', 'XXXXXX', '6350', '6000', 'Commissions and Fees Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1100, 'US-BASE', 'EXPENSE', 'XXXXXX', '6450', '6000', 'Dues and Subscriptions Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1101, 'US-BASE', 'EXPENSE', 'XXXXXX', '6500', '6000', 'Employee Benefit Expense, Health Insurance', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1102, 'US-BASE', 'EXPENSE', 'XXXXXX', '6510', '6000', 'Employee Benefit Expense, Pension Plans', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1103, 'US-BASE', 'EXPENSE', 'XXXXXX', '6520', '6000', 'Employee Benefit Expense, Profit Sharing Plan', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1104, 'US-BASE', 'EXPENSE', 'XXXXXX', '6530', '6000', 'Employee Benefit Expense, Other', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1105, 'US-BASE', 'EXPENSE', 'XXXXXX', '6550', '6000', 'Freight Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1106, 'US-BASE', 'EXPENSE', 'XXXXXX', '6600', '6000', 'Gifts Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1107, 'US-BASE', 'EXPENSE', 'XXXXXX', '6650', '6000', 'Income Tax Expense, Federal', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1108, 'US-BASE', 'EXPENSE', 'XXXXXX', '6660', '6000', 'Income Tax Expense, State', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1109, 'US-BASE', 'EXPENSE', 'XXXXXX', '6670', '6000', 'Income Tax Expense, Local', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1110, 'US-BASE', 'EXPENSE', 'XXXXXX', '6700', '6000', 'Insurance Expense, Product Liability', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1111, 'US-BASE', 'EXPENSE', 'XXXXXX', '6710', '6000', 'Insurance Expense, Vehicle', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1112, 'US-BASE', 'EXPENSE', 'XXXXXX', '6800', '6000', 'Laundry and Dry Cleaning Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1113, 'US-BASE', 'EXPENSE', 'XXXXXX', '6850', '6000', 'Legal and Professional Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1114, 'US-BASE', 'EXPENSE', 'XXXXXX', '6900', '6000', 'Licenses Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1115, 'US-BASE', 'EXPENSE', 'XXXXXX', '6950', '6000', 'Loss on Non-sufficient Funds Checks', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1116, 'US-BASE', 'OTHER_REVENUE', 'XXXXXX', '7010', '7000', 'Interest Income', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1117, 'US-BASE', 'OTHER_REVENUE', 'XXXXXX', '7030', '7000', 'Other Income', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1118, 'US-BASE', 'OTHER_EXPENSES', 'XXXXXX', '8010', '8000', 'Depreciation Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1119, 'US-BASE', 'OTHER_EXPENSES', 'XXXXXX', '8020', '8000', 'Interest Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1120, 'US-BASE', 'OTHER_EXPENSES', 'XXXXXX', '8030', '8000', 'Maintenance Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1121, 'US-BASE', 'OTHER_EXPENSES', 'XXXXXX', '8050', '8000', 'Meals and Entertainment Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1122, 'US-BASE', 'OTHER_EXPENSES', 'XXXXXX', '8100', '8000', 'Office Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1123, 'US-BASE', 'OTHER_EXPENSES', 'XXXXXX', '8200', '8000', 'Payroll Tax Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1124, 'US-BASE', 'OTHER_EXPENSES', 'XXXXXX', '8250', '8000', 'Penalties and Fines Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1125, 'US-BASE', 'OTHER_EXPENSES', 'XXXXXX', '8300', '8000', 'Other Taxes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1126, 'US-BASE', 'OTHER_EXPENSES', 'XXXXXX', '8350', '8000', 'Postage Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1127, 'US-BASE', 'OTHER_EXPENSES', 'XXXXXX', '8400', '8000', 'Rent or Lease Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1128, 'US-BASE', 'OTHER_EXPENSES', 'XXXXXX', '8450', '8000', 'Repair and Maintenance Expense, Office', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1129, 'US-BASE', 'OTHER_EXPENSES', 'XXXXXX', '8460', '8000', 'Repair and Maintenance Expense, Vehicle', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1130, 'US-BASE', 'OTHER_EXPENSES', 'XXXXXX', '8550', '8000', 'Supplies Expense, Office', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1131, 'US-BASE', 'OTHER_EXPENSES', 'XXXXXX', '8600', '8000', 'Telephone Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1132, 'US-BASE', 'OTHER_EXPENSES', 'XXXXXX', '8620', '8000', 'Training Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1133, 'US-BASE', 'OTHER_EXPENSES', 'XXXXXX', '8650', '8000', 'Travel Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1134, 'US-BASE', 'OTHER_EXPENSES', 'XXXXXX', '8700', '8000', 'Salaries Expense, Officers', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1135, 'US-BASE', 'OTHER_EXPENSES', 'XXXXXX', '8750', '8000', 'Wages Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1136, 'US-BASE', 'OTHER_EXPENSES', 'XXXXXX', '8800', '8000', 'Utilities Expense', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1137, 'US-BASE', 'OTHER_EXPENSES', 'XXXXXX', '8900', '8000', 'Gain/Loss on Sale of Assets', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1138, 'US-BASE', 'OTHER_EXPENSES', 'XXXXXX', '8950', '8000', 'Other Expense', 1);
\ No newline at end of file
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1010, 'US-BASE', 'ASSETS', '1010', '1000', 'Cash on Hand', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1011, 'US-BASE', 'ASSETS', '1020', '1000', 'Checking Account', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1012, 'US-BASE', 'ASSETS', '1030', '1000', 'Savings Account', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1013, 'US-BASE', 'ASSETS', '1040', '1000', 'Investments and Securities', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1014, 'US-BASE', 'ASSETS', '1100', '1000', 'Accounts Receivable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1015, 'US-BASE', 'ASSETS', '1140', '1000', 'Other Receivables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1016, 'US-BASE', 'ASSETS', '1150', '1000', 'Allowance for Doubtful Accounts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1017, 'US-BASE', 'ASSETS', '1200', '1000', 'Raw Materials Inventory', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1018, 'US-BASE', 'ASSETS', '1205', '1000', 'Supplies Inventory', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1019, 'US-BASE', 'ASSETS', '1210', '1000', 'Work in Progress Inventory', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1020, 'US-BASE', 'ASSETS', '1215', '1000', 'Finished Goods Inventory', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1021, 'US-BASE', 'ASSETS', '1400', '1000', 'Prepaid Expenses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1022, 'US-BASE', 'ASSETS', '1410', '1000', 'Employee Advances', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1023, 'US-BASE', 'ASSETS', '1420', '1000', 'Notes Receivable - Current', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1024, 'US-BASE', 'ASSETS', '1430', '1000', 'Prepaid Interest', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1025, 'US-BASE', 'ASSETS', '1470', '1000', 'Other Current Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1026, 'US-BASE', 'ASSETS', '1500', '1000', 'Furniture and Fixtures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1027, 'US-BASE', 'ASSETS', '1510', '1000', 'Equipment', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1028, 'US-BASE', 'ASSETS', '1520', '1000', 'Vehicles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1029, 'US-BASE', 'ASSETS', '1530', '1000', 'Other Depreciable Property', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1030, 'US-BASE', 'ASSETS', '1550', '1000', 'Buildings', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1031, 'US-BASE', 'ASSETS', '1560', '1000', 'Building Improvements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1032, 'US-BASE', 'ASSETS', '1690', '1000', 'Land', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1033, 'US-BASE', 'ASSETS', '1700', '1000', 'Accumulated Depreciation, Furniture and Fixtures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1034, 'US-BASE', 'ASSETS', '1710', '1000', 'Accumulated Depreciation, Equipment', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1035, 'US-BASE', 'ASSETS', '1720', '1000', 'Accumulated Depreciation, Vehicles', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1036, 'US-BASE', 'ASSETS', '1730', '1000', 'Accumulated Depreciation, Buildings', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1037, 'US-BASE', 'ASSETS', '1740', '1000', 'Accumulated Depreciation, Building Improvements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1038, 'US-BASE', 'ASSETS', '1750', '1000', 'Accumulated Depreciation, Other', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1039, 'US-BASE', 'ASSETS', '1900', '1000', 'Deposits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1040, 'US-BASE', 'ASSETS', '1910', '1000', 'Accumulated Amortization', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1041, 'US-BASE', 'ASSETS', '1920', '1000', 'Notes Receivable - Non-current', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1042, 'US-BASE', 'ASSETS', '1990', '1000', 'Other Non-current Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1043, 'US-BASE', 'LIABILITIES', '2100', '2000', 'Accounts Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1044, 'US-BASE', 'LIABILITIES', '2300', '2000', 'Accrued Expenses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1045, 'US-BASE', 'LIABILITIES', '2310', '2000', 'Sales Tax Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1046, 'US-BASE', 'LIABILITIES', '2320', '2000', 'Wages Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1047, 'US-BASE', 'LIABILITIES', '2330', '2000', '401-K Deductions Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1048, 'US-BASE', 'LIABILITIES', '2335', '2000', 'Health Insurance Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1049, 'US-BASE', 'LIABILITIES', '2340', '2000', 'Federal Payroll Taxes Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1050, 'US-BASE', 'LIABILITIES', '2350', '2000', 'Federal Unemployment Tax Act - Tax Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1051, 'US-BASE', 'LIABILITIES', '2360', '2000', 'State Payroll Taxes Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1052, 'US-BASE', 'LIABILITIES', '2370', '2000', 'State Unemployment Tax Act - Tax Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1053, 'US-BASE', 'LIABILITIES', '2380', '2000', 'Local Payroll Taxes Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1054, 'US-BASE', 'LIABILITIES', '2390', '2000', 'Income Taxes Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1055, 'US-BASE', 'LIABILITIES', '2400', '2000', 'Other Taxes Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1056, 'US-BASE', 'LIABILITIES', '2410', '2000', 'Employee Benefits Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1057, 'US-BASE', 'LIABILITIES', '2420', '2000', 'Current Portion of Long-term Debt', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1058, 'US-BASE', 'LIABILITIES', '2440', '2000', 'Deposits from Customers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1059, 'US-BASE', 'LIABILITIES', '2480', '2000', 'Other Current Liabilities', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1060, 'US-BASE', 'LIABILITIES', '2700', '2000', 'Notes Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1061, 'US-BASE', 'LIABILITIES', '2702', '2000', 'Land Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1062, 'US-BASE', 'LIABILITIES', '2704', '2000', 'Equipment Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1063, 'US-BASE', 'LIABILITIES', '2706', '2000', 'Vehicles Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1064, 'US-BASE', 'LIABILITIES', '2708', '2000', 'Bank Loans Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1065, 'US-BASE', 'LIABILITIES', '2710', '2000', 'Deferred Revenue', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1066, 'US-BASE', 'LIABILITIES', '2740', '2000', 'Other Long-term Liabilities', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1067, 'US-BASE', 'CAPITAL', '3010', '3000', 'Stated Capital', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1068, 'US-BASE', 'CAPITAL', '3020', '3000', 'Capital Surplus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1069, 'US-BASE', 'CAPITAL', '3030', '3000', 'Retained Earnings', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1070, 'US-BASE', 'INCOME', '4010', '4000', 'Product Sales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1071, 'US-BASE', 'INCOME', '4060', '4000', 'Reimbursible Expenses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1072, 'US-BASE', 'INCOME', '4061', '4000', 'Reimbursible Expenses - Meals and Entertainment ', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1073, 'US-BASE', 'INCOME', '4540', '4000', 'Finance Charge Income', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1074, 'US-BASE', 'INCOME', '4550', '4000', 'Shipping Charges Reimbursed', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1075, 'US-BASE', 'INCOME', '4800', '4000', 'Sales Returns and Allowances', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1076, 'US-BASE', 'INCOME', '4900', '4000', 'Sales Discounts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1077, 'US-BASE', 'COGS', '5010', '5000', 'Product Cost', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1078, 'US-BASE', 'COGS', '5050', '5000', 'Raw Material Purchases', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1079, 'US-BASE', 'COGS', '5100', '5000', 'Direct Labor Costs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1080, 'US-BASE', 'COGS', '5150', '5000', 'Indirect Labor Costs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1081, 'US-BASE', 'COGS', '5200', '5000', 'Heat and Power', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1082, 'US-BASE', 'COGS', '5250', '5000', 'Commissions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1083, 'US-BASE', 'COGS', '5300', '5000', 'Miscellaneous Factory Costs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1084, 'US-BASE', 'COGS', '5700', '5000', 'Cost of Goods Sold, Salaries and Wages', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1085, 'US-BASE', 'COGS', '5730', '5000', 'Cost of Goods Sold, Contract Labor', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1086, 'US-BASE', 'COGS', '5750', '5000', 'Cost of Goods Sold, Freight', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1087, 'US-BASE', 'COGS', '5800', '5000', 'Cost of Goods Sold, Other', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1088, 'US-BASE', 'COGS', '5850', '5000', 'Inventory Adjustments', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1089, 'US-BASE', 'COGS', '5900', '5000', 'Purchase Returns and Allowances', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1090, 'US-BASE', 'COGS', '5950', '5000', 'Purchase Discounts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1091, 'US-BASE', 'EXPENSE', '6010', '6000', 'Default Purchase Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1092, 'US-BASE', 'EXPENSE', '6020', '6000', 'Advertising Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1093, 'US-BASE', 'EXPENSE', '6050', '6000', 'Amortization Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1094, 'US-BASE', 'EXPENSE', '6100', '6000', 'Auto EXPENSE', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1095, 'US-BASE', 'EXPENSE', '6150', '6000', 'Bad Debt Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1096, 'US-BASE', 'EXPENSE', '6200', '6000', 'Bank Fees', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1097, 'US-BASE', 'EXPENSE', '6250', '6000', 'Cash Over and Short', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1098, 'US-BASE', 'EXPENSE', '6300', '6000', 'Charitable Contributions Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1099, 'US-BASE', 'EXPENSE', '6350', '6000', 'Commissions and Fees Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1100, 'US-BASE', 'EXPENSE', '6450', '6000', 'Dues and Subscriptions Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1101, 'US-BASE', 'EXPENSE', '6500', '6000', 'Employee Benefit Expense, Health Insurance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1102, 'US-BASE', 'EXPENSE', '6510', '6000', 'Employee Benefit Expense, Pension Plans', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1103, 'US-BASE', 'EXPENSE', '6520', '6000', 'Employee Benefit Expense, Profit Sharing Plan', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1104, 'US-BASE', 'EXPENSE', '6530', '6000', 'Employee Benefit Expense, Other', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1105, 'US-BASE', 'EXPENSE', '6550', '6000', 'Freight Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1106, 'US-BASE', 'EXPENSE', '6600', '6000', 'Gifts Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1107, 'US-BASE', 'EXPENSE', '6650', '6000', 'Income Tax Expense, Federal', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1108, 'US-BASE', 'EXPENSE', '6660', '6000', 'Income Tax Expense, State', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1109, 'US-BASE', 'EXPENSE', '6670', '6000', 'Income Tax Expense, Local', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1110, 'US-BASE', 'EXPENSE', '6700', '6000', 'Insurance Expense, Product Liability', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1111, 'US-BASE', 'EXPENSE', '6710', '6000', 'Insurance Expense, Vehicle', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1112, 'US-BASE', 'EXPENSE', '6800', '6000', 'Laundry and Dry Cleaning Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1113, 'US-BASE', 'EXPENSE', '6850', '6000', 'Legal and Professional Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1114, 'US-BASE', 'EXPENSE', '6900', '6000', 'Licenses Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1115, 'US-BASE', 'EXPENSE', '6950', '6000', 'Loss on Non-sufficient Funds Checks', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1116, 'US-BASE', 'OTHER_REVENUE', '7010', '7000', 'Interest Income', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1117, 'US-BASE', 'OTHER_REVENUE', '7030', '7000', 'Other Income', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1118, 'US-BASE', 'OTHER_EXPENSES', '8010', '8000', 'Depreciation Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1119, 'US-BASE', 'OTHER_EXPENSES', '8020', '8000', 'Interest Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1120, 'US-BASE', 'OTHER_EXPENSES', '8030', '8000', 'Maintenance Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1121, 'US-BASE', 'OTHER_EXPENSES', '8050', '8000', 'Meals and Entertainment Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1122, 'US-BASE', 'OTHER_EXPENSES', '8100', '8000', 'Office Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1123, 'US-BASE', 'OTHER_EXPENSES', '8200', '8000', 'Payroll Tax Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1124, 'US-BASE', 'OTHER_EXPENSES', '8250', '8000', 'Penalties and Fines Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1125, 'US-BASE', 'OTHER_EXPENSES', '8300', '8000', 'Other Taxes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1126, 'US-BASE', 'OTHER_EXPENSES', '8350', '8000', 'Postage Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1127, 'US-BASE', 'OTHER_EXPENSES', '8400', '8000', 'Rent or Lease Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1128, 'US-BASE', 'OTHER_EXPENSES', '8450', '8000', 'Repair and Maintenance Expense, Office', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1129, 'US-BASE', 'OTHER_EXPENSES', '8460', '8000', 'Repair and Maintenance Expense, Vehicle', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1130, 'US-BASE', 'OTHER_EXPENSES', '8550', '8000', 'Supplies Expense, Office', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1131, 'US-BASE', 'OTHER_EXPENSES', '8600', '8000', 'Telephone Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1132, 'US-BASE', 'OTHER_EXPENSES', '8620', '8000', 'Training Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1133, 'US-BASE', 'OTHER_EXPENSES', '8650', '8000', 'Travel Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1134, 'US-BASE', 'OTHER_EXPENSES', '8700', '8000', 'Salaries Expense, Officers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1135, 'US-BASE', 'OTHER_EXPENSES', '8750', '8000', 'Wages Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1136, 'US-BASE', 'OTHER_EXPENSES', '8800', '8000', 'Utilities Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1137, 'US-BASE', 'OTHER_EXPENSES', '8900', '8000', 'Gain/Loss on Sale of Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1138, 'US-BASE', 'OTHER_EXPENSES', '8950', '8000', 'Other Expense', 1);
diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index eeca137dbc0..34cef4c94d4 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -101,8 +101,8 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_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_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_PAYED','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_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 ('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_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_VALIDATE','Project validation','Executed when a project is validated','project',141);
@@ -145,4 +145,4 @@ 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_CREATE','Task created','Executed when a project task is created','project',150);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_MODIFY','Task modified','Executed when a project task is modified','project',151);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_DELETE','Task deleted','Executed when a project task is deleted','project',152);
-
+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);
diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql
index ef725f43d98..d55d8fc67c2 100644
--- a/htdocs/install/mysql/data/llx_c_typent.sql
+++ b/htdocs/install/mysql/data/llx_c_typent.sql
@@ -32,7 +32,6 @@
 
 delete from llx_c_typent;
 -- Entries for all countries
-insert into llx_c_typent (id,code,libelle,fk_country,active) values (  0, 'TE_UNKNOWN', '-',             NULL, 1);
 insert into llx_c_typent (id,code,libelle,fk_country,active) values (  1, 'TE_STARTUP', 'Start-up',      NULL, 0);
 insert into llx_c_typent (id,code,libelle,fk_country,active) values (  2, 'TE_GROUP',   'Grand groupe',  NULL, 1);
 insert into llx_c_typent (id,code,libelle,fk_country,active) values (  3, 'TE_MEDIUM',  'PME/PMI',       NULL, 1);
diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 3e2a9b37278..f11fa826fac 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -343,6 +343,7 @@ ALTER TABLE llx_commande_fournisseurdet ADD INDEX idx_commande_fournisseurdet_fk
 
 
 -- VMYSQL4.3 ALTER TABLE llx_c_shipment_mode MODIFY COLUMN tracking varchar(255) NULL;
+-- VPGSQL8.2 ALTER TABLE llx_c_shipment_mode ALTER COLUMN tracking DROP NOT NULL;
 
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (9,'INPERSON', 'In person at your site', NULL, NULL, 0);
 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (10,'FEDEX', 'Fedex', NULL, 'https://www.fedex.com/apps/fedextrack/index.html?tracknumbers={TRACKID}', 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 26ec6377cc3..9658d6c3051 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
@@ -122,6 +122,7 @@ CREATE TABLE llx_c_transport_mode (
   label     varchar(255) NOT NULL,
   active    tinyint DEFAULT 1  NOT NULL
 ) ENGINE=innodb;
+ALTER TABLE llx_c_transport_mode ADD UNIQUE INDEX uk_c_transport_mode (code, entity);
 
 INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('MAR', 'Transport maritime (y compris camions ou wagons sur bateau)', 1);
 INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('TRA', 'Transport par chemin de fer (y compris camions sur wagon)', 1);
@@ -419,8 +420,10 @@ ALTER TABLE llx_website_page ADD COLUMN fk_object varchar(255);
 
 DELETE FROM llx_const WHERE name in ('MAIN_INCLUDE_ZERO_VAT_IN_REPORTS');
 
-UPDATE llx_projet_task_time SET tms = null WHERE tms = 0;
-ALTER TABLE llx_projet_task_time MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
+
+-- VMYSQL4.1 UPDATE llx_projet_task_time SET tms = null WHERE tms = 0;
+
+ALTER TABLE llx_projet_task_time CHANGE COLUMN tms tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 ALTER TABLE llx_projet_task_time MODIFY COLUMN datec datetime;
 
@@ -436,12 +439,19 @@ CREATE TABLE llx_c_product_nature (
       active tinyint DEFAULT 1  NOT NULL
 ) ENGINE=innodb;
 
-ALTER TABLE llx_c_product_nature ADD UNIQUE INDEX uk_c_product_nature(code, active);
+
+ALTER TABLE llx_product DROP FOREIGN KEY fk_product_finished;
+
+-- VMYSQL4.1 DROP INDEX uk_c_product_nature on llx_c_product_nature;
+-- VPGSQL8.2 DROP INDEX uk_c_product_nature;
+
+ALTER TABLE llx_c_product_nature ADD UNIQUE INDEX uk_c_product_nature(code);
 
 INSERT INTO llx_c_product_nature (code, label, active) VALUES (0, 'RowMaterial', 1);
 INSERT INTO llx_c_product_nature (code, label, active) VALUES (1, 'Finished', 1);
 
 ALTER TABLE llx_product MODIFY COLUMN finished tinyint DEFAULT NULL;
+
 ALTER TABLE llx_product ADD CONSTRAINT fk_product_finished FOREIGN KEY (finished) REFERENCES llx_c_product_nature (code);
 
 -- MIGRATION TO DO AFTER RENAMING AN OBJECT
@@ -559,3 +569,14 @@ ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging varchar(64);
 
 ALTER TABLE llx_projet ADD COLUMN fk_opp_status_end integer DEFAULT NULL;
 
+UPDATE llx_c_action_trigger SET elementtype = 'expensereport' where elementtype = 'expense_report' AND code like 'EXPENSE_%';
+UPDATE llx_c_action_trigger SET code = 'EXPENSE_REPORT_PAID' where code = 'EXPENSE_REPORT_PAYED';
+UPDATE llx_c_action_trigger SET code = 'EXPENSE_REPORT_DELETE' where code = 'EXPENSE_DELETE';
+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_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);
+
+-- Removed no more used function
+-- VPGSQL8.2 DROP FUNCTION IF EXISTS update_modified_column_date_m CASCADE;
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 7b9cb8c9ef8..0aa6804daf6 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
@@ -30,6 +30,11 @@
 
 -- Missing in v13 or lower
 
+ALTER TABLE llx_supplier_proposal_extrafields ADD INDEX idx_supplier_proposal_extrafields (fk_object);
+ALTER TABLE llx_supplier_proposaldet_extrafields ADD INDEX idx_supplier_proposaldet_extrafields (fk_object);
+
+ALTER TABLE llx_asset_extrafields ADD INDEX idx_asset_extrafields (fk_object);
+
 -- For v14
 
 ALTER TABLE llx_c_availability ADD COLUMN position integer NOT NULL DEFAULT 0;
@@ -39,7 +44,119 @@ UPDATE llx_adherent SET ref = rowid WHERE ref = '' or ref IS NULL;
 ALTER TABLE llx_adherent MODIFY COLUMN ref varchar(30) NOT NULL;
 ALTER TABLE llx_adherent ADD UNIQUE INDEX uk_adherent_ref (ref, entity);
 
+ALTER TABLE llx_societe ADD COLUMN accountancy_code_sell varchar(32) AFTER webservices_key;
+ALTER TABLE llx_societe ADD COLUMN accountancy_code_buy varchar(32) AFTER accountancy_code_sell;
+
 ALTER TABLE llx_bank_account ADD COLUMN ics varchar(32) NULL;
 ALTER TABLE llx_bank_account ADD COLUMN ics_transfer varchar(32) NULL;
 
 ALTER TABLE llx_facture MODIFY COLUMN date_valid DATETIME NULL DEFAULT NULL;
+
+
+-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_dolibarr_state_board.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_dolibarr_state_board.php' AND entity = 1);
+
+
+ALTER TABLE llx_website ADD COLUMN lastaccess datetime NULL;
+ALTER TABLE llx_website ADD COLUMN pageviews_month BIGINT UNSIGNED DEFAULT 0;
+ALTER TABLE llx_website ADD COLUMN pageviews_total BIGINT UNSIGNED DEFAULT 0;
+
+
+-- Drop foreign key with bad name or not required
+ALTER TABLE llx_workstation_workstation DROP FOREIGN KEY llx_workstation_workstation_fk_user_creat;
+ALTER TABLE llx_propal DROP FOREIGN KEY llx_propal_fk_warehouse;
+
+
+CREATE TABLE llx_workstation_workstation(
+	-- BEGIN MODULEBUILDER FIELDS
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+	ref varchar(128) DEFAULT '(PROV)' NOT NULL,
+    label varchar(255),
+    type varchar(7),
+    note_public text,
+	entity int DEFAULT 1,
+	note_private text,
+	date_creation datetime NOT NULL,
+	tms timestamp,
+	fk_user_creat integer NOT NULL,
+	fk_user_modif integer,
+	import_key varchar(14),
+	status smallint NOT NULL,
+	nb_operators_required integer,
+	thm_operator_estimated double,
+	thm_machine_estimated double
+	-- END MODULEBUILDER FIELDS
+) ENGINE=innodb;
+
+ALTER TABLE llx_workstation_workstation ADD INDEX idx_workstation_workstation_rowid (rowid);
+ALTER TABLE llx_workstation_workstation ADD INDEX idx_workstation_workstation_ref (ref);
+ALTER TABLE llx_workstation_workstation ADD CONSTRAINT fk_workstation_workstation_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
+ALTER TABLE llx_workstation_workstation ADD INDEX idx_workstation_workstation_status (status);
+
+CREATE TABLE llx_workstation_workstation_resource(
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+	tms 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,
+	fk_usergroup integer,
+	fk_workstation integer
+) ENGINE=innodb;
+
+
+ALTER TABLE llx_product_customer_price ADD COLUMN ref_customer varchar(30);
+ALTER TABLE llx_product_customer_price_log ADD COLUMN ref_customer varchar(30);
+
+ALTER TABLE llx_propal ADD COLUMN fk_warehouse integer DEFAULT NULL AFTER fk_shipping_method;
+--ALTER TABLE llx_propal ADD CONSTRAINT fk_propal_fk_warehouse FOREIGN KEY (fk_warehouse) REFERENCES llx_entrepot(rowid);
+ALTER TABLE llx_propal ADD INDEX idx_propal_fk_warehouse(fk_warehouse);
+
+ALTER TABLE llx_societe DROP INDEX idx_societe_entrepot;
+ALTER TABLE llx_societe CHANGE fk_entrepot fk_warehouse INTEGER DEFAULT NULL;
+--ALTER TABLE llx_societe ADD CONSTRAINT fk_propal_fk_warehouse FOREIGN KEY (fk_warehouse) REFERENCES llx_entrepot(rowid);
+ALTER TABLE llx_societe ADD INDEX idx_societe_warehouse(fk_warehouse);
+
+-- VMYSQL4.3 ALTER TABLE llx_societe MODIFY COLUMN fk_typent integer NULL;
+-- VPGSQL8.2 ALTER TABLE llx_societe ALTER COLUMN fk_typent DROP NOT NULL;
+UPDATE llx_societe SET fk_typent=NULL WHERE fk_typent=0;
+DELETE FROM llx_c_typent WHERE code='TE_UNKNOWN';
+
+ALTER TABLE llx_socpeople MODIFY poste varchar(255);
+
+ALTER TABLE llx_menu ADD COLUMN prefix varchar(255) NULL AFTER titre;
+
+ALTER TABLE llx_chargesociales ADD COLUMN fk_user integer DEFAULT NULL;
+
+ALTER TABLE llx_fichinter ADD COLUMN last_main_doc varchar(255) AFTER model_pdf;
+ALTER TABLE llx_projet ADD COLUMN last_main_doc varchar(255) AFTER model_pdf;
+
+create table llx_payment_vat
+(
+  rowid           integer AUTO_INCREMENT PRIMARY KEY,
+  fk_tva          integer,
+  datec           datetime,           -- date de creation
+  tms             timestamp,
+  datep           datetime,           -- payment date
+  amount          double(24,8) DEFAULT 0,
+  fk_typepaiement integer NOT NULL,
+  num_paiement    varchar(50),
+  note            text,
+  fk_bank         integer NOT NULL,
+  fk_user_creat   integer,            -- creation user
+  fk_user_modif   integer             -- last modification user
+
+)ENGINE=innodb;
+
+ALTER TABLE llx_tva ADD COLUMN paye smallint default 1 NOT NULL;
+ALTER TABLE llx_tva ADD COLUMN fk_account integer;
+
+--INSERT INTO llx_payment_vat (fk_tva, datec, datep, amount, fk_typepaiement, num_paiement, note, fk_bank, fk_user_creat, fk_user_modif) SELECT rowid, NOW(), datep, amount, COALESCE(fk_typepayment, 0), num_payment, '', fk_bank, fk_user_creat, fk_user_modif FROM llx_tva;
+--UPDATE llx_bank_url as url INNER JOIN llx_tva tva ON tva.rowid = url.url_id SET url.type = 'vat', url.label = CONCAT('(', tva.label, ')') WHERE type = 'payment_vat';
+--INSERT INTO llx_bank_url (fk_bank, url_id, url, label, type) SELECT b.fk_bank, ptva.rowid, REPLACE(b.url, 'tva/card.php', 'payment_vat/card.php'), '(paiement)', 'payment_vat' FROM llx_bank_url b INNER JOIN llx_tva tva ON (tva.fk_bank = b.fk_bank) INNER JOIN llx_payment_vat ptva on (ptva.fk_bank = b.fk_bank) WHERE type = 'vat';
+
+--ALTER TABLE llx_tva DROP COLUMN fk_bank;
+
+ALTER TABLE llx_tva ALTER COLUMN paye SET DEFAULT 0;
diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index 00bf30f6672..c6325454b86 100644
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -248,7 +248,7 @@ CREATE TABLE llx_expensereport (
   fk_user_approve   integer DEFAULT NULL,
   fk_user_refuse 	integer DEFAULT NULL,
   fk_user_cancel 	integer DEFAULT NULL,
-  fk_statut			integer NOT NULL,		-- 1=brouillon, 2=validé (attente approb), 4=annulé, 5=approuvé, 6=payed, 99=refusé
+  fk_statut			integer NOT NULL,		-- 1=draft, 2=validate (waiting approbation), 4=cancel, 5=approved, 6=paid, 99=refused
   fk_c_paiement 	integer DEFAULT NULL,
   paid 				smallint DEFAULT 0 NOT NULL,
   note_public		text,
@@ -524,13 +524,13 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 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 ('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 ('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 ('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_PAYED','Customer invoice paid','Executed when a customer invoice is paid','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 ('ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11);
 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 ('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_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_PAYED','Supplier invoice paid','Executed when a supplier invoice is paid','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 ('SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20);
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 6d662e64893..6e9ea4601f8 100644
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -509,7 +509,7 @@ UPDATE llx_facturedet SET situation_percent = 100 WHERE situation_percent IS NUL
 -- from llx_facturedet as fd, llx_facture as f where fd.fk_facture = f.rowid AND (total_ht - situation_percent  / 100 * subprice * qty * (1 - (fd.remise_percent / 100))) > 0.01 and f.type = 5;
 
 
--- Note to make all deposit as payed when there is already a discount generated from it.
+-- Note to make all deposit as paid when there is already a discount generated from it.
 --drop table tmp_invoice_deposit_mark_as_available;
 --create table tmp_invoice_deposit_mark_as_available as select * from llx_facture as f where f.type = 3 and f.paye = 0 and f.rowid in (select fk_facture_source from llx_societe_remise_except);
 --update llx_facture set paye = 1, fk_statut = 2 where rowid in (select rowid from tmp_invoice_deposit_mark_as_available);
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
index 3a612623298..dae9eb79c42 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
@@ -51,6 +51,6 @@ CREATE TABLE llx_accounting_bookkeeping
   journal_label         varchar(255),				-- FEC:JournalLib
   date_validated        datetime,					-- FEC:ValidDate	| if empty: movement not validated / if not empty: movement validated (No deleting / No modification)
   date_export	      	datetime DEFAULT NULL,		--
-  import_key            varchar(14),
+  import_key            varchar(14),				-- ID of import when data was inserted by a mass import
   extraparams           varchar(255)				-- for other parameters with json format
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_asset_extrafields.key.sql b/htdocs/install/mysql/tables/llx_asset_extrafields.key.sql
new file mode 100644
index 00000000000..fe6bb053ed6
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_asset_extrafields.key.sql
@@ -0,0 +1,20 @@
+-- ===================================================================
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_asset_extrafields ADD INDEX idx_asset_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_c_product_nature.key.sql b/htdocs/install/mysql/tables/llx_c_product_nature.key.sql
index b6a3d2130bf..e1190e5ab19 100644
--- a/htdocs/install/mysql/tables/llx_c_product_nature.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_product_nature.key.sql
@@ -1 +1,19 @@
-ALTER TABLE llx_c_product_nature ADD UNIQUE INDEX uk_c_product_nature(code, active);
+-- ========================================================================
+-- 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_product_nature ADD UNIQUE INDEX uk_c_product_nature(code);
diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql
index db9e82ac779..220c85410ce 100644
--- a/htdocs/install/mysql/tables/llx_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_chargesociales.sql
@@ -2,6 +2,7 @@
 -- Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
 -- Copyright (C) 2017      Alexandre Spangaro   <aspangaro@open-dsi.fr>
+-- Copyright (C) 2021      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -28,6 +29,7 @@ create table llx_chargesociales
   tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   date_creation     datetime,                       -- date de creation 
   date_valid        datetime,                       -- date de validation
+  fk_user integer   DEFAULT NULL,		    -- utilisateur concerné
   fk_user_author    integer,                        -- user making creation
   fk_user_modif     integer,                        -- user making last change
   fk_user_valid     integer,                        -- user validating
diff --git a/htdocs/install/mysql/tables/llx_expensereport.sql b/htdocs/install/mysql/tables/llx_expensereport.sql
index 772888620fb..36bd5efb50c 100644
--- a/htdocs/install/mysql/tables/llx_expensereport.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport.sql
@@ -43,7 +43,7 @@ CREATE TABLE llx_expensereport (
   fk_user_approve   integer DEFAULT NULL,
   fk_user_refuse 	integer DEFAULT NULL,
   fk_user_cancel 	integer DEFAULT NULL,
-  fk_statut			integer NOT NULL,				-- 1=brouillon, 2=validated (waiting approval), 4=canceled, 5=approved, 6=payed, 99=refused
+  fk_statut			integer NOT NULL,				-- 1=brouillon, 2=validated (waiting approval), 4=canceled, 5=approved, 6=paid, 99=refused
   fk_c_paiement 	integer DEFAULT NULL,			-- deprecated
   paid              smallint default 0 NOT NULL,	-- deprecated (status is used instead)
   note_public		text,
@@ -53,6 +53,7 @@ CREATE TABLE llx_expensereport (
   integration_compta integer DEFAULT NULL,			-- not used
   fk_bank_account 	integer DEFAULT NULL,
   model_pdf 		varchar(50) DEFAULT NULL,
+  last_main_doc		varchar(255),					-- relative filepath+filename of last main generated document
   
   fk_multicurrency        integer,
   multicurrency_code      varchar(255),
diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql
index 9cff110981a..52b576411cb 100644
--- a/htdocs/install/mysql/tables/llx_menu.sql
+++ b/htdocs/install/mysql/tables/llx_menu.sql
@@ -30,17 +30,17 @@ CREATE TABLE llx_menu
 	mainmenu      varchar(100) NOT NULL,					-- Name family/module for top menu (home, companies, ...)
     leftmenu      varchar(100) NULL,						-- Name family/module for left menu (setup, info, ...)
 	fk_menu       integer NOT NULL,							-- 0 or Id of mother menu line, or -1 if we use fk_mainmenu and fk_leftmenu
-    fk_mainmenu   varchar(100),								-- 
-    fk_leftmenu   varchar(100),								-- 
+    fk_mainmenu   varchar(100),								--
+    fk_leftmenu   varchar(100),								--
 	position      integer NOT NULL,							-- Sort order of entry
 	url           varchar(255) NOT NULL,					-- Relative (or absolute) url to go
 	target        varchar(100) NULL,						-- Target of Url link
-	titre         varchar(255) NOT NULL,					-- Key for menu translation 
+	titre         varchar(255) NOT NULL,					-- Key for menu translation
+	prefix        varchar(255) NULL,					    -- prefix
 	langs         varchar(100),								-- Lang file to load for translation
 	level         smallint,									-- Deprecated. Not used.
 	perms         text,										-- Condition to show enabled or disabled
 	enabled       text NULL, 					            -- Condition to show or hide
 	usertype      integer NOT NULL DEFAULT 0,				-- 0 if menu for all users, 1 for external only, 2 for internal only
 	tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
-	
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_mrp_production.sql b/htdocs/install/mysql/tables/llx_mrp_production.sql
index bd0cd722f1a..36129a54aea 100644
--- a/htdocs/install/mysql/tables/llx_mrp_production.sql
+++ b/htdocs/install/mysql/tables/llx_mrp_production.sql
@@ -16,7 +16,7 @@
 
 CREATE TABLE llx_mrp_production(
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
-	fk_mo integer NOT NULL, 
+	fk_mo integer NOT NULL,
 	position integer NOT NULL DEFAULT 0,
 	fk_product integer NOT NULL, 
 	fk_warehouse integer,
diff --git a/htdocs/install/mysql/tables/llx_payment_vat.sql b/htdocs/install/mysql/tables/llx_payment_vat.sql
new file mode 100644
index 00000000000..4ebb5bb4af3
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_payment_vat.sql
@@ -0,0 +1,35 @@
+-- ===================================================================
+-- Copyright (C) 2004      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+create table llx_payment_vat
+(
+  rowid           integer AUTO_INCREMENT PRIMARY KEY,
+  fk_tva          integer,
+  datec           datetime,           -- date de creation
+  tms             timestamp,
+  datep           datetime,           -- payment date
+  amount          double(24,8) DEFAULT 0,
+  fk_typepaiement integer NOT NULL,
+  num_paiement    varchar(50),
+  note            text,
+  fk_bank         integer NOT NULL,
+  fk_user_creat   integer,            -- creation user
+  fk_user_modif   integer             -- last modification user
+
+)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 7cd481c3c75..f0d5edf9c2f 100644
--- a/htdocs/install/mysql/tables/llx_product_customer_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_customer_price.sql
@@ -27,7 +27,8 @@ create table llx_product_customer_price
   datec					datetime,
   tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product			integer NOT NULL,
-  fk_soc				integer NOT NULL,	   
+  fk_soc				integer NOT NULL,
+  ref_customer			varchar(30),
   price						double(24,8) DEFAULT 0,
   price_ttc					double(24,8) DEFAULT 0,
   price_min					double(24,8) DEFAULT 0,
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 4d79353e884..29906fe7ff2 100644
--- a/htdocs/install/mysql/tables/llx_product_customer_price_log.sql
+++ b/htdocs/install/mysql/tables/llx_product_customer_price_log.sql
@@ -26,7 +26,8 @@ create table llx_product_customer_price_log
   entity				integer DEFAULT 1 NOT NULL,	   -- multi company id
   datec                       datetime,
   fk_product			integer NOT NULL,
-  fk_soc				integer DEFAULT 0 NOT NULL,	
+  fk_soc				integer DEFAULT 0 NOT NULL,
+  ref_customer			varchar(30),
   price						double(24,8) DEFAULT 0,
   price_ttc					double(24,8) DEFAULT 0,
   price_min					double(24,8) DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql
index 1b95444b3a1..76d254aafd3 100644
--- a/htdocs/install/mysql/tables/llx_projet.sql
+++ b/htdocs/install/mysql/tables/llx_projet.sql
@@ -44,10 +44,11 @@ create table llx_projet
   --budget_days      real,                      -- budget in days is sum of field planned_workload of tasks
   opp_amount       double(24,8),
   budget_amount    double(24,8),
-  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_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				
   model_pdf        varchar(255),
+  last_main_doc	   varchar(255),				-- relative filepath+filename of last main generated document
   import_key	   varchar(14)					-- Import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql
index c47da982ab4..89a0c54ad83 100644
--- a/htdocs/install/mysql/tables/llx_propal.key.sql
+++ b/htdocs/install/mysql/tables/llx_propal.key.sql
@@ -28,9 +28,11 @@ ALTER TABLE llx_propal ADD INDEX idx_propal_fk_user_cloture (fk_user_cloture);
 ALTER TABLE llx_propal ADD INDEX idx_propal_fk_projet (fk_projet);
 ALTER TABLE llx_propal ADD INDEX idx_propal_fk_account(fk_account);
 ALTER TABLE llx_propal ADD INDEX idx_propal_fk_currency(fk_currency);
+ALTER TABLE llx_propal ADD INDEX idx_propal_fk_warehouse(fk_warehouse);
 
 ALTER TABLE llx_propal ADD CONSTRAINT fk_propal_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
 ALTER TABLE llx_propal ADD CONSTRAINT fk_propal_fk_user_author	FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid);
 ALTER TABLE llx_propal ADD CONSTRAINT fk_propal_fk_user_valid	FOREIGN KEY (fk_user_valid)  REFERENCES llx_user (rowid);
 ALTER TABLE llx_propal ADD CONSTRAINT fk_propal_fk_user_cloture	FOREIGN KEY (fk_user_cloture) REFERENCES llx_user (rowid);
 ALTER TABLE llx_propal ADD CONSTRAINT fk_propal_fk_projet		FOREIGN KEY (fk_projet) REFERENCES llx_projet (rowid);
+--ALTER TABLE llx_propal ADD CONSTRAINT fk_propal_fk_warehouse 	FOREIGN KEY (fk_warehouse) REFERENCES llx_entrepot(rowid);
diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql
index 662db791094..6e3e38dffd6 100644
--- a/htdocs/install/mysql/tables/llx_propal.sql
+++ b/htdocs/install/mysql/tables/llx_propal.sql
@@ -66,6 +66,7 @@ create table llx_propal
   
   date_livraison		date DEFAULT NULL,				-- delivery date
   fk_shipping_method    integer,                        -- shipping method id
+  fk_warehouse		    integer DEFAULT NULL,           -- warehouse id
   fk_availability		integer NULL,
   fk_input_reason		integer,
   fk_incoterms          integer,										-- for incoterms
diff --git a/htdocs/install/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql
index 5e5bf73dcac..b681343fe38 100644
--- a/htdocs/install/mysql/tables/llx_societe.key.sql
+++ b/htdocs/install/mysql/tables/llx_societe.key.sql
@@ -33,7 +33,7 @@ ALTER TABLE llx_societe ADD INDEX idx_societe_prospectlevel(fk_prospectlevel);
 ALTER TABLE llx_societe ADD INDEX idx_societe_typent(fk_typent);
 ALTER TABLE llx_societe ADD INDEX idx_societe_forme_juridique(fk_forme_juridique);
 ALTER TABLE llx_societe ADD INDEX idx_societe_shipping_method(fk_shipping_method);
-ALTER TABLE llx_societe ADD INDEX idx_societe_entrepot(fk_entrepot);
+ALTER TABLE llx_societe ADD INDEX idx_societe_warehouse(fk_warehouse);
 
 -- ALTER TABLE llx_societe ADD FOREIGN KEY fk_prospectlevel llx_c_prospectlevel(code);
 
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index ea02b7be8ad..201114c7863 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -63,7 +63,7 @@ create table llx_societe
   whatsapp                 varchar(255),                        		-- deprecated
 
   fk_effectif              integer        DEFAULT 0,            		--
-  fk_typent                integer        DEFAULT 0,            		--
+  fk_typent                integer        DEFAULT NULL,                 -- type ent
   fk_forme_juridique       integer        DEFAULT 0,            		-- juridical status
   fk_currency			   varchar(3),									-- default currency
   siren	                   varchar(128),                         		-- IDProf1: depends on country (example: siren or RCS for france, ...)
@@ -112,10 +112,13 @@ create table llx_societe
   logo                     varchar(255)   DEFAULT NULL,
   logo_squarred            varchar(255)   DEFAULT NULL,
   canvas				   varchar(32)    DEFAULT NULL,	                -- type of canvas if used (null by default)
-  fk_entrepot 			   integer DEFAULT 0,							-- if we need a link between third party and warehouse
+  fk_entrepot 			   integer DEFAULT NULL,						-- if we need a link between third party and warehouse
   webservices_url          varchar(255),                            	-- supplier webservice url
   webservices_key          varchar(128),                            	-- supplier webservice key
 
+  accountancy_code_sell         varchar(32),                            -- Selling accountancy code
+  accountancy_code_buy          varchar(32),                            -- Buying accountancy code
+
   tms                      timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,									-- last modification date
   datec	                   datetime,                            		-- creation date
   fk_user_creat            integer NULL,                        		-- utilisateur qui a cree l'info
diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql
index decc229e3e7..1f28534d5d3 100644
--- a/htdocs/install/mysql/tables/llx_socpeople.sql
+++ b/htdocs/install/mysql/tables/llx_socpeople.sql
@@ -36,7 +36,7 @@ create table llx_socpeople
   fk_departement	integer,
   fk_pays			integer        DEFAULT 0,
   birthday			date,
-  poste				varchar(80),
+  poste				varchar(255),
   phone				varchar(30),
   phone_perso		varchar(30),
   phone_mobile		varchar(30),
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.key.sql b/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.key.sql
new file mode 100644
index 00000000000..4f365d85f55
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.key.sql
@@ -0,0 +1,20 @@
+-- ===================================================================
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- 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_supplier_proposal_extrafields ADD INDEX idx_supplier_proposal_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.key.sql
new file mode 100644
index 00000000000..278bda52c63
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.key.sql
@@ -0,0 +1,20 @@
+-- ===================================================================
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- 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_supplier_proposaldet_extrafields ADD INDEX idx_supplier_proposaldet_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql
index 6cf97e6b4c6..938e6aa5626 100644
--- a/htdocs/install/mysql/tables/llx_tva.sql
+++ b/htdocs/install/mysql/tables/llx_tva.sql
@@ -30,7 +30,8 @@ create table llx_tva
   label           varchar(255),
   entity          integer DEFAULT 1 NOT NULL,	-- multi company id
   note            text,
-  fk_bank         integer,  
+  paye            smallint default 0 NOT NULL,
+  fk_account      integer,
   fk_user_creat   integer,                    -- utilisateur who create record
   fk_user_modif   integer,                    -- utilisateur who modify record
   import_key      varchar(14)
diff --git a/htdocs/install/mysql/tables/llx_website.sql b/htdocs/install/mysql/tables/llx_website.sql
index b2103177972..0df6ccf8ef3 100644
--- a/htdocs/install/mysql/tables/llx_website.sql
+++ b/htdocs/install/mysql/tables/llx_website.sql
@@ -36,6 +36,9 @@ CREATE TABLE llx_website
     fk_user_modif integer,
     date_creation datetime,
     position      integer DEFAULT 0,
+    lastaccess    datetime NULL,
+    pageviews_month BIGINT UNSIGNED DEFAULT 0,
+    pageviews_total BIGINT UNSIGNED DEFAULT 0,
 	tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     import_key    varchar(14)      -- import key	
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_workstation_workstation.key.sql b/htdocs/install/mysql/tables/llx_workstation_workstation.key.sql
new file mode 100755
index 00000000000..d1d7bd915fe
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_workstation_workstation.key.sql
@@ -0,0 +1,27 @@
+-- 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
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- 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_workstation_workstation ADD INDEX idx_workstation_workstation_rowid (rowid);
+ALTER TABLE llx_workstation_workstation ADD INDEX idx_workstation_workstation_ref (ref);
+ALTER TABLE llx_workstation_workstation ADD CONSTRAINT fk_workstation_workstation_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
+ALTER TABLE llx_workstation_workstation ADD INDEX idx_workstation_workstation_status (status);
+-- END MODULEBUILDER INDEXES
+
+--ALTER TABLE llx_workstation_workstation ADD UNIQUE INDEX uk_workstation_workstation_fieldxy(fieldx, fieldy);
+
+--ALTER TABLE llx_workstation_workstation ADD CONSTRAINT fk_workstation_workstation_fk_field FOREIGN KEY (fk_field) REFERENCES llx_workstation_myotherobject(rowid);
+
diff --git a/htdocs/install/mysql/tables/llx_workstation_workstation.sql b/htdocs/install/mysql/tables/llx_workstation_workstation.sql
new file mode 100755
index 00000000000..a4d9fd4dbc8
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_workstation_workstation.sql
@@ -0,0 +1,36 @@
+-- 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
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- 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_workstation_workstation(
+	-- BEGIN MODULEBUILDER FIELDS
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
+	ref varchar(128) DEFAULT '(PROV)' NOT NULL,
+    label varchar(255),
+    type varchar(7),
+    note_public text,
+	entity int DEFAULT 1,
+	note_private text, 
+	date_creation datetime NOT NULL, 
+	tms timestamp, 
+	fk_user_creat integer NOT NULL, 
+	fk_user_modif integer, 
+	import_key varchar(14), 
+	status smallint NOT NULL, 
+	nb_operators_required integer, 
+	thm_operator_estimated double, 
+	thm_machine_estimated double
+	-- END MODULEBUILDER FIELDS
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_workstation_workstation_resource.sql b/htdocs/install/mysql/tables/llx_workstation_workstation_resource.sql
new file mode 100755
index 00000000000..92463ade696
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_workstation_workstation_resource.sql
@@ -0,0 +1,22 @@
+-- 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
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- 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_workstation_workstation_resource(
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
+	tms timestamp, 
+	fk_resource integer, 
+	fk_workstation integer
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_workstation_workstation_user_group.sql b/htdocs/install/mysql/tables/llx_workstation_workstation_user_group.sql
new file mode 100755
index 00000000000..9ecccc88d82
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_workstation_workstation_user_group.sql
@@ -0,0 +1,22 @@
+-- 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
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- 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_workstation_workstation_usergroup(
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
+	tms timestamp, 
+	fk_usergroup integer, 
+	fk_workstation integer
+) ENGINE=innodb;
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 3a2b8889d96..07c68a498b2 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -477,6 +477,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 			'MAIN_MODULE_FACTURE'=>'newboxdefonly',
 			'MAIN_MODULE_FOURNISSEUR'=>'newboxdefonly',
 			'MAIN_MODULE_HOLIDAY'=>'newboxdefonly',
+			'MAIN_MODULE_MARGIN'=>'menuonly',
 			'MAIN_MODULE_OPENSURVEY'=>'newboxdefonly',
 			'MAIN_MODULE_PAYBOX'=>'newboxdefonly',
 			'MAIN_MODULE_PRINTING'=>'newboxdefonly',
@@ -486,6 +487,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 			'MAIN_MODULE_SYSLOG'=>'newboxdefonly',
 			'MAIN_MODULE_SOCIETE'=>'newboxdefonly',
 			'MAIN_MODULE_SERVICE'=>'newboxdefonly',
+			'MAIN_MODULE_TICKET'=>'newboxdefonly',
 			'MAIN_MODULE_TAKEPOS'=>'newboxdefonly',
 			'MAIN_MODULE_USER'=>'newboxdefonly', //This one must be always done and only into last targeted version)
 			'MAIN_MODULE_VARIANTS'=>'newboxdefonly',
@@ -4204,6 +4206,8 @@ function migrate_delete_old_files($db, $langs, $conf)
 		'/core/modules/mailings/kiwi.modules.php',
 		'/core/modules/facture/pdf_crabe.modules.php',
 		'/core/modules/facture/pdf_oursin.modules.php',
+		'/core/modules/export/export_excel.modules.php',
+		'/core/modules/export/export_excel2007new.modules.php',
 
 		'/api/class/api_generic.class.php',
 		'/categories/class/api_category.class.php',
diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php
index 077f793d649..0226848bd48 100644
--- a/htdocs/intracommreport/card.php
+++ b/htdocs/intracommreport/card.php
@@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/intracommreport/class/intracommreport.class.php';
 
 $langs->loadLangs(array("intracommreport"));
-var_dump($_POST);
+
 $action = GETPOST('action');
 $exporttype = GETPOSTISSET('exporttype') ? GETPOST('exporttype', 'alphanohtml') : 'deb'; // DEB ou DES
 $year = GETPOSTINT('year');
diff --git a/htdocs/langs/am_ET/accountancy.lang b/htdocs/langs/am_ET/accountancy.lang
index 3211a0b62df..9e084932477 100644
--- a/htdocs/langs/am_ET/accountancy.lang
+++ b/htdocs/langs/am_ET/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/am_ET/admin.lang b/htdocs/langs/am_ET/admin.lang
index f1c41a3b62b..f9a6468d94a 100644
--- a/htdocs/langs/am_ET/admin.lang
+++ b/htdocs/langs/am_ET/admin.lang
@@ -56,6 +56,8 @@ 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.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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.
@@ -256,6 +257,7 @@ 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.
@@ -375,7 +377,7 @@ 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:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+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
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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
+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 the language of the third party
+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
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+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
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/am_ET/banks.lang b/htdocs/langs/am_ET/banks.lang
index 9500a5b8b2e..81a23238550 100644
--- a/htdocs/langs/am_ET/banks.lang
+++ b/htdocs/langs/am_ET/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/am_ET/blockedlog.lang b/htdocs/langs/am_ET/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/am_ET/blockedlog.lang
+++ b/htdocs/langs/am_ET/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/am_ET/boxes.lang b/htdocs/langs/am_ET/boxes.lang
index d6fd298a3a7..9a751483fb1 100644
--- a/htdocs/langs/am_ET/boxes.lang
+++ b/htdocs/langs/am_ET/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+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.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/am_ET/cashdesk.lang b/htdocs/langs/am_ET/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/am_ET/cashdesk.lang
+++ b/htdocs/langs/am_ET/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+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
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/am_ET/categories.lang b/htdocs/langs/am_ET/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/am_ET/categories.lang
+++ b/htdocs/langs/am_ET/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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
diff --git a/htdocs/langs/am_ET/companies.lang b/htdocs/langs/am_ET/companies.lang
index dadff6a7894..8dc815b522e 100644
--- a/htdocs/langs/am_ET/companies.lang
+++ b/htdocs/langs/am_ET/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/am_ET/compta.lang b/htdocs/langs/am_ET/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/am_ET/compta.lang
+++ b/htdocs/langs/am_ET/compta.lang
@@ -111,7 +111,7 @@ 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 ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/am_ET/cron.lang b/htdocs/langs/am_ET/cron.lang
index 1de1251831a..2ebdda1e685 100644
--- a/htdocs/langs/am_ET/cron.lang
+++ b/htdocs/langs/am_ET/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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
@@ -46,6 +47,7 @@ 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
@@ -56,7 +58,7 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
@@ -82,3 +84,8 @@ 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/am_ET/errors.lang b/htdocs/langs/am_ET/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/am_ET/errors.lang
+++ b/htdocs/langs/am_ET/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 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.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/am_ET/exports.lang b/htdocs/langs/am_ET/exports.lang
index 3549e3f8b23..a0eb7161ef2 100644
--- a/htdocs/langs/am_ET/exports.lang
+++ b/htdocs/langs/am_ET/exports.lang
@@ -133,3 +133,4 @@ 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/am_ET/mails.lang b/htdocs/langs/am_ET/mails.lang
index 1235eef3b27..2d02c5ddcf9 100644
--- a/htdocs/langs/am_ET/mails.lang
+++ b/htdocs/langs/am_ET/mails.lang
@@ -92,6 +92,7 @@ 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
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/am_ET/main.lang b/htdocs/langs/am_ET/main.lang
index 96c68cdcfa3..f8ba6f4073c 100644
--- a/htdocs/langs/am_ET/main.lang
+++ b/htdocs/langs/am_ET/main.lang
@@ -28,7 +28,9 @@ 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
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Value
 PersonalValue=Personal value
 NewObject=New %s
 NewValue=New value
+OldValue=Old value %s
 CurrentValue=Current value
 Code=Code
 Type=Type
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ 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
@@ -671,7 +678,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/am_ET/modulebuilder.lang b/htdocs/langs/am_ET/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/am_ET/modulebuilder.lang
+++ b/htdocs/langs/am_ET/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/am_ET/mrp.lang b/htdocs/langs/am_ET/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/am_ET/mrp.lang
+++ b/htdocs/langs/am_ET/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/am_ET/other.lang b/htdocs/langs/am_ET/other.lang
index 54c0572d453..7a895bb1ca5 100644
--- a/htdocs/langs/am_ET/other.lang
+++ b/htdocs/langs/am_ET/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/am_ET/products.lang b/htdocs/langs/am_ET/products.lang
index 18af7f2f252..9ecc11ed93d 100644
--- a/htdocs/langs/am_ET/products.lang
+++ b/htdocs/langs/am_ET/products.lang
@@ -108,7 +108,8 @@ 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 other products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/am_ET/projects.lang b/htdocs/langs/am_ET/projects.lang
index baf0ecde17f..05aa1f5a560 100644
--- a/htdocs/langs/am_ET/projects.lang
+++ b/htdocs/langs/am_ET/projects.lang
@@ -76,15 +76,16 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/am_ET/recruitment.lang b/htdocs/langs/am_ET/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/am_ET/recruitment.lang
+++ b/htdocs/langs/am_ET/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/am_ET/sendings.lang b/htdocs/langs/am_ET/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/am_ET/sendings.lang
+++ b/htdocs/langs/am_ET/sendings.lang
@@ -30,6 +30,7 @@ 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
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/am_ET/stocks.lang b/htdocs/langs/am_ET/stocks.lang
index 660443bcded..a1f55010139 100644
--- a/htdocs/langs/am_ET/stocks.lang
+++ b/htdocs/langs/am_ET/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/am_ET/ticket.lang b/htdocs/langs/am_ET/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/am_ET/ticket.lang
+++ b/htdocs/langs/am_ET/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/am_ET/website.lang b/htdocs/langs/am_ET/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/am_ET/website.lang
+++ b/htdocs/langs/am_ET/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/am_ET/withdrawals.lang b/htdocs/langs/am_ET/withdrawals.lang
index 114a8d9dd6c..059b3451c11 100644
--- a/htdocs/langs/am_ET/withdrawals.lang
+++ b/htdocs/langs/am_ET/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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/am_ET/workflow.lang b/htdocs/langs/am_ET/workflow.lang
index 299be277e1d..494a0424a75 100644
--- a/htdocs/langs/am_ET/workflow.lang
+++ b/htdocs/langs/am_ET/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index 0809eff3c9f..e0817d618cb 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=هذه الخدمة
 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=التاريخ
 Docref=مرجع
 LabelAccount=حساب التسمية
 LabelOperation=Label operation
-Sens=السيناتور
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=دفتر اليومية
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ 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 has 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
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=لم يتم تسويتة
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +345,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 6b8e53c6c3b..65d484ec842 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -56,6 +56,8 @@ GUISetup=العرض
 SetupArea=التثبيت
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=نموذج لاختبار تحميل ملف (وفقا لبرنامج الإعداد)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=ملاحظة : نعم فعالة فقط في حال كان النموذج <b>%s</b> مفعل
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=آظهر المعاينة
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=المعاينة غير متاحة
 ThemeCurrentlyActive=الثيم النشط حالياً
-CurrentTimeZone=حسب توقيت خادم البي إتش بي
 MySQLTimeZone=والوقت مسقل (قاعدة بيانات)
 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=فراغ
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=أحذف
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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=إحذف الآن
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=الشركاء المفضلين
 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>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=قائمة الدلائل المفتوحة قوالب
 ListOfDirectoriesForModelGenODT=قائمة الدلائل التي تحتوي على قوالب ملفات مع شكل المفتوحة. <br><br> ضع هنا المسار الكامل من الدلائل. <br> إضافة إرجاع بين الدليل ايه. <br> لإضافة دليل وحدة GED، أضيف هنا <b>DOL_DATA_ROOT / ECM / yourdirectoryname.</b> <br><br> الملفات في هذه الدلائل يجب أن ينتهي <b>.odt</b> أو <b>.ods.</b>
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=أمثلة على بناء الجملة : <br> ج : mydir \\ <br> / الوطن / mydir <br> DOL_DATA_ROOT / إدارة المحتوى في المؤسسة / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> لمعرفة كيفية إنشاء قوالب المستند ODT، قبل تخزينها في تلك الدلائل، وقراءة وثائق ويكي:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=موقف الإسم / اسم
@@ -406,7 +408,7 @@ UrlGenerationParameters=المعلمات لتأمين عناوين المواق
 SecurityTokenIsUnique=استخدام معلمة securekey فريدة لكل URL
 EnterRefToBuildUrl=أدخل مرجع لكائن %s
 GetSecuredUrl=الحصول على عنوان محسوب
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=معدل ضريبة القيمة المضافة القديم
 NewVATRates=معدل ضريبة القيمة المضافة الجديد
 PriceBaseTypeToChange=تعديل على الأسعار مع القيمة المرجعية قاعدة المعرفة على
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=استطلاع للرأي، أو مسح التصويت
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=هوامش
-Module59000Desc=وحدة لإدارة الهوامش
+Module59000Desc=Module to follow margins
 Module60000Name=العمولات
 Module60000Desc=وحدة لإدارة اللجان
 Module62000Name=شروط التجارة الدولية
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=البحث الأمثل
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ ServiceSetup=خدمات وحدة الإعداد
 ProductServiceSetup=منتجات وخدمات إعداد وحدات
 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
+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 دازور إذا كان المنتج / الخدمة في الاقتراح
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in the language of the third party
+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=النوع الافتراضي لاستخدام الباركود للمنتجات
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=قائمة جديدة
 MenuHandler=قائمة مناول
 MenuModule=مصدر في وحدة
-HideUnauthorizedMenu= إخفاء القوائم غير المصرح به (الرمادي)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=معرف القائمة
 DetailMenuHandler=قائمة المعالج حيث تظهر قائمة جديدة
 DetailMenuModule=اسم وحدة قائمة في حال الدخول من وحدة
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=الرمز البريدي
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang
index 5b82860bea7..93d286a4a27 100644
--- a/htdocs/langs/ar_SA/banks.lang
+++ b/htdocs/langs/ar_SA/banks.lang
@@ -173,10 +173,11 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=تفويض سيبا الخاص بك
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/ar_SA/blockedlog.lang b/htdocs/langs/ar_SA/blockedlog.lang
index 5f6dd79f6f5..2f01fbe9817 100644
--- a/htdocs/langs/ar_SA/blockedlog.lang
+++ b/htdocs/langs/ar_SA/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/ar_SA/boxes.lang b/htdocs/langs/ar_SA/boxes.lang
index 58b9e904429..9d993910c15 100644
--- a/htdocs/langs/ar_SA/boxes.lang
+++ b/htdocs/langs/ar_SA/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=النشاط العالمي (الفواتير والمقترحات والطلبات)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=المهام المجدولة
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=أية إشارات محددة.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=المحاسبة
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/ar_SA/cashdesk.lang b/htdocs/langs/ar_SA/cashdesk.lang
index bdad092c1c5..0fdc5513233 100644
--- a/htdocs/langs/ar_SA/cashdesk.lang
+++ b/htdocs/langs/ar_SA/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=ملاحظة : من الفواتير
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang
index fa97cbaba63..ffc098c9333 100644
--- a/htdocs/langs/ar_SA/categories.lang
+++ b/htdocs/langs/ar_SA/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=منطقة علامات / فئات المشاريع
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=قائمة العلامات / الفئات
+CatListAll=List of tags/categories (all types)
 NewCategory=علامة / فئة جديدة
 ModifCat=تعديل العلامة / الفئة
 CatCreated=تم إنشاء العلامة / الفئة
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=معرف العلامة / الفئة 
-CatSupList=List of vendor tags/categories
-CatCusList=قائمة  علامات / فئات العملاء / احتمال
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=قائمة علامات / فئات المنتجات 
 CatMemberList=قائمة علامات / فئات الأعضاء 
-CatContactList=قائمة  اتصال العلامات / الفئات 
-CatSupLinks=الروابط بين الموردين والعلامات / الفئات
+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=الروابط بين العملاء / احتمال والعلامات / فئات
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=الروابط بين المنتجات / الخدمات والعلامات / الفئات
-CatProJectLinks=الروابط بين المشاريع والعلامات / الفئات
+CatMembersLinks=الروابط بين أفراد والعلامات / فئات
+CatProjectsLinks=الروابط بين المشاريع والعلامات / الفئات
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=إزالة من العلامة / الفئة
 ExtraFieldsCategories=سمات تكميلية
 CategoriesSetup=إعداد العلامات / الفئات 
diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
index a17eed9cf32..4c65642bdba 100644
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=وليس من الممكن التحقق. تأكد من خدمة لا تقدمها دولة عضو (في المائة).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=الموظفين
 ProspectLevelShort=المحتملة
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index b83bfef9a8a..7b8dd642c33 100644
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -111,7 +111,7 @@ Refund=رد
 SocialContributionsPayments=الاجتماعية المدفوعات / الضرائب المالية
 ShowVatPayment=وتظهر دفع ضريبة القيمة المضافة
 TotalToPay=على دفع ما مجموعه
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+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=الزبون. حساب. رمز
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=هل أنت متأكد أنك تريد حذف /
 ExportDataset_tax_1=الضرائب والمدفوعات الاجتماعية والمالية
 CalcModeVATDebt=<b>الوضع٪ SVAT بشأن المحاسبة الالتزام٪ الصورة.</b>
 CalcModeVATEngagement=وضع <b>SVAT٪ على مداخيل مصاريف٪ الصورة.</b>
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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= <b>الوضع٪ زارة العلاقات الخارجية على فواتير العملاء - فواتير الموردين٪ الصورة</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=ميزان الإيرادات والمصروفات
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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=- المبالغ المبينة لمع جميع الضرائب المدرجة
 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> - لأنه يقوم على مواعيد دفع الفواتير والمصاريف والضريبة على القيمة المضافة والرواتب. تاريخ التبرع للتبرع.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=تقرير RE طرف ثالث
 LT2ReportByCustomersES=تقرير من قبل طرف ثالث IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/ar_SA/cron.lang b/htdocs/langs/ar_SA/cron.lang
index 36980f15406..338d3adb957 100644
--- a/htdocs/langs/ar_SA/cron.lang
+++ b/htdocs/langs/ar_SA/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = إنشاء / تحديث المجدولة وظيفة
 Permission23103 = حذف مهمة مجدولة
 Permission23104 = تنفيذ مهمة مجدولة
 # Admin
-CronSetup= من المقرر إعداد إدارة العمل
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=أو لفحص وإطلاق وظيفة محددة
+CronSetup=من المقرر إعداد إدارة العمل
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=مفتاح أمان للURL لإطلاق كرون الوظائف
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=على بيئة يونكس يجب عليك استخدام دخول كرونتاب التالي لتشغيل سطر الأوامر كل 5 دقائق
-CronExplainHowToRunWin=على مايكروسوفت (TM) ويندوز environement يمكنك استخدام أدوات مهمة مجدولة لتشغيل سطر الأوامر كل 5 دقائق
+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
@@ -42,10 +43,11 @@ CronModule=وحدة
 CronNoJobs=أي وظيفة سجلت
 CronPriority=الأولوية
 CronLabel=ملصق
-CronNbRun=ملحوظة. إطلاق
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=كل
 JobFinished=العمل بدأ وانتهى
+Scheduled=Scheduled
 #Page card
 CronAdd= إضافة وظائف
 CronEvery=العمل كل تنفيذ
@@ -56,16 +58,16 @@ CronNote=التعليق
 CronFieldMandatory=الحقول%s إلزامي
 CronErrEndDateStartDt=تاريخ نهاية لا يمكن أن يكون قبل تاريخ البدء
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=تمكين
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=يعطل
 CronTaskInactive=تم تعطيل هذه الوظائف
 CronId=هوية شخصية
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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=سطر الأوامر لتنفيذ النظام.
 CronCreateJob=إنشاء مهمة مجدولة جديدة
 CronFrom=من عند
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=الأمر Shell
 CronCannotLoadClass=Cannot load class file %s (to use class %s)
 CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=تعطيل وظيفة
 MakeLocalDatabaseDumpShort=Local database backup
-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
+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_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index 8348252dd0b..bf46cf3364d 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=أي خطأ، ونحن نلزم
 # Errors
 ErrorButCommitIsDone=تم العثور على أخطاء لكننا تحقق على الرغم من هذا
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=عنوان الموقع هو الخطأ %s
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=ادخل ٪ ق موجود بالفعل.
 ErrorGroupAlreadyExists=المجموعة ٪ ق موجود بالفعل.
 ErrorRecordNotFound=لم يتم العثور على السجل.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=تتطلب بعض المجالات لم تملأ.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=فشل إنشاء دليل. تأكد من أن خادم الويب المستخدم أذونات لكتابة وثائق Dolibarr في الدليل. إذا تم تمكين المعلم <b>safe_mode</b> على هذا PHP ، تحقق من أن ملفات Dolibarr php تملك لخدمة الويب المستخدم (أو مجموعة).
 ErrorNoMailDefinedForThisUser=البريد لا يعرف لهذا المستخدم
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=هذه الميزة تحتاج إلى تفعيل جافا سكريبت في العمل. هذا التغيير في البنية -- عرض.
 ErrorTopMenuMustHaveAParentWithId0=وهناك قائمة من نوع 'توب' لا يمكن أن يكون أحد الوالدين القائمة. 0 وضعت في القائمة أو الأم في اختيار قائمة من نوع 'اليسار'.
 ErrorLeftMenuMustHaveAParentId=وهناك قائمة من نوع 'اليسار' يجب أن يكون لها هوية الوالد.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=هذا الاسم الشخصي موجود مسبقا
 ErrorLDAPSetupNotComplete=Dolibarr - LDAP المطابقة وليس كاملا.
 ErrorLDAPMakeManualTest=ألف. ldif الملف قد ولدت في الدليل ٪ s. انها محاولة لتحميل يدويا من سطر في الحصول على مزيد من المعلومات عن الأخطاء.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=المرجع المستخدمة لإنشاء موجود بالفعل.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=تم تعيين كلمة مرور لهذا العضو. ومع ذلك، تم إنشاء أي حساب المستخدم. لذلك يتم تخزين كلمة المرور هذه ولكن لا يمكن استخدامها للدخول إلى Dolibarr. ويمكن استخدامه من قبل وحدة / واجهة خارجية ولكن إذا كنت لا تحتاج إلى تعريف أي تسجيل دخول أو كلمة المرور لأحد أفراد، يمكنك تعطيل خيار "إدارة تسجيل دخول لكل عضو" من إعداد وحدة الأعضاء. إذا كنت بحاجة إلى إدارة تسجيل الدخول ولكن لا تحتاج إلى أي كلمة المرور، يمكنك الحفاظ على هذا الحقل فارغا لتجنب هذا التحذير. ملاحظة: يمكن أيضا أن تستخدم البريد الإلكتروني لتسجيل الدخول إذا تم ربط عضو إلى المستخدم.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/ar_SA/exports.lang b/htdocs/langs/ar_SA/exports.lang
index d839282e9de..53ce1753324 100644
--- a/htdocs/langs/ar_SA/exports.lang
+++ b/htdocs/langs/ar_SA/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=حقل العنوان
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=المكتبة
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 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.
@@ -131,3 +133,4 @@ 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_SA/mails.lang b/htdocs/langs/ar_SA/mails.lang
index 8e4e3308318..384cda2c563 100644
--- a/htdocs/langs/ar_SA/mails.lang
+++ b/htdocs/langs/ar_SA/mails.lang
@@ -92,6 +92,7 @@ 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=خط المستندات في ملف ٪
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=لا ترسل البريد الإلكتروني. مرسل سيئة أو البريد الإلكتروني المستلم. تحقق ملف تعريف المستخدم.
 # Module Notifications
 Notifications=الإخطارات
-NoNotificationsWillBeSent=إشعارات البريد الإلكتروني لا يجري التخطيط لهذا الحدث ، وشركة
-ANotificationsWillBeSent=1 سيتم إرسال الإشعار عن طريق البريد الإلكتروني
-SomeNotificationsWillBeSent=ق ٪ سوف يتم إرسال الإخطارات عبر البريد الإلكتروني
-AddNewNotification=تفعيل هدفا إشعار البريد الإلكتروني الجديد
-ListOfActiveNotifications=List all active targets for email notification
-ListOfNotificationsDone=أرسلت قائمة جميع اشعارات بالبريد الالكتروني
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=وقد تم تكوين إرسال البريد الإلكتروني الإعداد ل'٪ ق'. هذا الوضع لا يمكن أن تستخدم لإرسال إرساله عبر البريد الإلكتروني الشامل.
 MailSendSetupIs2=يجب عليك أولا الذهاب، مع حساب مشرف، في القائمة٪ sHome - إعداد - رسائل البريد الإلكتروني٪ s إلى تغيير المعلمة <strong>'٪ ق'</strong> لاستخدام وضع '٪ ق'. مع هذا الوضع، يمكنك إدخال الإعداد خادم SMTP المقدمة من قبل موفر خدمة الإنترنت واستخدام قداس ميزة البريد الإلكتروني.
 MailSendSetupIs3=إذا كان لديك أي أسئلة حول كيفية إعداد ملقم SMTP الخاص بك، يمكنك أن تطلب إلى٪ s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=معلومات
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index 7e4057e374a..22d691bfb23 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=لا يوجد ترجمة
 Translation=الترجمة
+CurrentTimeZone=حسب توقيت خادم البي إتش بي
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=لا يوجد سجلات
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=يتم اختيار ملف لمرفق ولكن لم تحمي
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Read online help (Internet access needed)
 GoToHelpPage=قراءة المساعدة
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=سجل حفظ
 RecordDeleted=سجل محذوف
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=القيمة
 PersonalValue=قيمة الشخصية
 NewObject=New %s
 NewValue=القيمة الجديدة
+OldValue=Old value %s
 CurrentValue=القيمة الحالية
 Code=رمز
 Type=اكتب
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=خيار
+Filters=Filters
 List=قائمة
 FullList=القائمة الكاملة
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ SupplierPreview=Vendor preview
 ShowCustomerPreview=وتبين للعملاء معاينة
 ShowSupplierPreview=Show vendor preview
 RefCustomer=المرجع. العميل
+InternalRef=Internal ref.
 Currency=العملة
 InfoAdmin=معلومات للإداريين
 Undo=تراجع
@@ -671,7 +678,7 @@ SendMail=إرسال بريد إلكتروني
 Email=Email
 NoEMail=أي بريد إلكتروني
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=لا هاتف المحمول
 Owner=مالك
 FollowingConstantsWillBeSubstituted=الثوابت التالية ستكون بديلا المقابلة القيمة.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=في الانتظار
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/ar_SA/modulebuilder.lang b/htdocs/langs/ar_SA/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/ar_SA/modulebuilder.lang
+++ b/htdocs/langs/ar_SA/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/ar_SA/mrp.lang b/htdocs/langs/ar_SA/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/ar_SA/mrp.lang
+++ b/htdocs/langs/ar_SA/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
index cd09294d71d..95f31ac01c8 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -5,8 +5,6 @@ Tools=أدوات
 TMenuTools=أدوات
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=عيد ميلاد
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=عيد ميلاد النشطة في حالة تأهب
 BirthdayAlertOff=عيد الميلاد فى حالة تأهب الخاملة
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=انظر إعداد وحدة٪ الصورة
 NbOfAttachedFiles=عدد الملفات المرفقة / وثائق
 TotalSizeOfAttachedFiles=اجمالى حجم الملفات المرفقة / وثائق
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=حق
 CalculatedWeight=يحسب الوزن
 CalculatedVolume=يحسب حجم
 Weight=وزن
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=كجم
 WeightUnitg=ز
 WeightUnitmg=مغلم
@@ -214,6 +216,7 @@ 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=استيراد مجموعة البيانات
 DolibarrNotification=إشعار تلقائي
 ResizeDesc=أدخل عرض جديدة <b>أو</b> ارتفاع جديد. وستبقى نسبة خلال تغيير حجم...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=صادرات المنطقة
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index 0db9c6d5673..37d70e8534c 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=عدد من السعر
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+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=عدد منتج التعبئة الاب
@@ -167,8 +168,10 @@ BuyingPrices=شراء أسعار
 CustomerPrices=أسعار العميل
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=بلد المنشأ
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=استخدم السعر الثابت
 PriceByQuantity=أسعار مختلفة حسب الكمية
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=مدى الكمية
-MultipriceRules=Price segment rules
+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=٪٪ الاختلاف على الصورة٪
 PercentDiscountOver=٪٪ خصم أكثر من٪ الصورة
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index 044268aa210..466976a6edb 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -76,15 +76,16 @@ MyActivities=بلدي المهام والأنشطة
 MyProjects=بلدي المشاريع
 MyProjectsArea=My projects Area
 DurationEffective=فعالة لمدة
-ProgressDeclared=أعلن التقدم
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=تقدم تحسب
+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=وقت
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/ar_SA/recruitment.lang b/htdocs/langs/ar_SA/recruitment.lang
index 9c348486cdb..43d1e0fbc55 100644
--- a/htdocs/langs/ar_SA/recruitment.lang
+++ b/htdocs/langs/ar_SA/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/ar_SA/sendings.lang b/htdocs/langs/ar_SA/sendings.lang
index 64db057f549..b18d5eb4842 100644
--- a/htdocs/langs/ar_SA/sendings.lang
+++ b/htdocs/langs/ar_SA/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=الإرسال الأخرى لهذا النظام
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=للمصادقة على إرسال
 StatusSendingCanceled=ألغيت
+StatusSendingCanceledShort=ألغيت
 StatusSendingDraft=مسودة
 StatusSendingValidated=صادق (لشحن المنتجات أو شحنها بالفعل)
 StatusSendingProcessed=معالجة
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=أكمل نموذج لتسليم وثيقة من وثائق الإيصالات (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER ثابت لم تحدد
 SumOfProductVolumes=مجموع أحجام المنتج
 SumOfProductWeights=مجموع الأوزان المنتج
diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
index 09cf9dbae0b..d5a935cf50a 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=قيمة المستودعات
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/ar_SA/ticket.lang b/htdocs/langs/ar_SA/ticket.lang
index bbaece1060f..307fdeb1792 100644
--- a/htdocs/langs/ar_SA/ticket.lang
+++ b/htdocs/langs/ar_SA/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=الآخر
 TicketSeverityShortLOW=منخفض
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=عال
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=قرأ
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang
index f271ef38fe8..7bf9189512a 100644
--- a/htdocs/langs/ar_SA/website.lang
+++ b/htdocs/langs/ar_SA/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=صفحة
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/ar_SA/withdrawals.lang b/htdocs/langs/ar_SA/withdrawals.lang
index bbf352bb2b2..de0c72a1e64 100644
--- a/htdocs/langs/ar_SA/withdrawals.lang
+++ b/htdocs/langs/ar_SA/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=تصنيف حساب
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=لم يتم تعيين خيار الوضع الحقيقي، ونحن بعد توقف هذه المحاكاة
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+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_SA/workflow.lang b/htdocs/langs/ar_SA/workflow.lang
index 30d0fdd1c87..a01d11731e2 100644
--- a/htdocs/langs/ar_SA/workflow.lang
+++ b/htdocs/langs/ar_SA/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=إنشاء تلقائي
 AutomaticClassification=التصنيف التلقائي
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/az_AZ/accountancy.lang b/htdocs/langs/az_AZ/accountancy.lang
index 3211a0b62df..9e084932477 100644
--- a/htdocs/langs/az_AZ/accountancy.lang
+++ b/htdocs/langs/az_AZ/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/az_AZ/admin.lang b/htdocs/langs/az_AZ/admin.lang
index f1c41a3b62b..f9a6468d94a 100644
--- a/htdocs/langs/az_AZ/admin.lang
+++ b/htdocs/langs/az_AZ/admin.lang
@@ -56,6 +56,8 @@ 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.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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.
@@ -256,6 +257,7 @@ 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.
@@ -375,7 +377,7 @@ 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:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+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
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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
+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 the language of the third party
+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
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+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
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/az_AZ/banks.lang b/htdocs/langs/az_AZ/banks.lang
index 9500a5b8b2e..81a23238550 100644
--- a/htdocs/langs/az_AZ/banks.lang
+++ b/htdocs/langs/az_AZ/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/az_AZ/blockedlog.lang b/htdocs/langs/az_AZ/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/az_AZ/blockedlog.lang
+++ b/htdocs/langs/az_AZ/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/az_AZ/boxes.lang b/htdocs/langs/az_AZ/boxes.lang
index d6fd298a3a7..9a751483fb1 100644
--- a/htdocs/langs/az_AZ/boxes.lang
+++ b/htdocs/langs/az_AZ/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+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.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/az_AZ/cashdesk.lang b/htdocs/langs/az_AZ/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/az_AZ/cashdesk.lang
+++ b/htdocs/langs/az_AZ/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+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
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/az_AZ/categories.lang b/htdocs/langs/az_AZ/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/az_AZ/categories.lang
+++ b/htdocs/langs/az_AZ/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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
diff --git a/htdocs/langs/az_AZ/companies.lang b/htdocs/langs/az_AZ/companies.lang
index dadff6a7894..8dc815b522e 100644
--- a/htdocs/langs/az_AZ/companies.lang
+++ b/htdocs/langs/az_AZ/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/az_AZ/compta.lang b/htdocs/langs/az_AZ/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/az_AZ/compta.lang
+++ b/htdocs/langs/az_AZ/compta.lang
@@ -111,7 +111,7 @@ 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 ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/az_AZ/cron.lang b/htdocs/langs/az_AZ/cron.lang
index 1de1251831a..2ebdda1e685 100644
--- a/htdocs/langs/az_AZ/cron.lang
+++ b/htdocs/langs/az_AZ/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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
@@ -46,6 +47,7 @@ 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
@@ -56,7 +58,7 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
@@ -82,3 +84,8 @@ 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/az_AZ/errors.lang b/htdocs/langs/az_AZ/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/az_AZ/errors.lang
+++ b/htdocs/langs/az_AZ/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 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.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/az_AZ/exports.lang b/htdocs/langs/az_AZ/exports.lang
index 3549e3f8b23..a0eb7161ef2 100644
--- a/htdocs/langs/az_AZ/exports.lang
+++ b/htdocs/langs/az_AZ/exports.lang
@@ -133,3 +133,4 @@ 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/az_AZ/mails.lang b/htdocs/langs/az_AZ/mails.lang
index 1235eef3b27..2d02c5ddcf9 100644
--- a/htdocs/langs/az_AZ/mails.lang
+++ b/htdocs/langs/az_AZ/mails.lang
@@ -92,6 +92,7 @@ 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
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/az_AZ/main.lang b/htdocs/langs/az_AZ/main.lang
index 96c68cdcfa3..f8ba6f4073c 100644
--- a/htdocs/langs/az_AZ/main.lang
+++ b/htdocs/langs/az_AZ/main.lang
@@ -28,7 +28,9 @@ 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
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Value
 PersonalValue=Personal value
 NewObject=New %s
 NewValue=New value
+OldValue=Old value %s
 CurrentValue=Current value
 Code=Code
 Type=Type
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ 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
@@ -671,7 +678,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/az_AZ/modulebuilder.lang b/htdocs/langs/az_AZ/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/az_AZ/modulebuilder.lang
+++ b/htdocs/langs/az_AZ/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/az_AZ/mrp.lang b/htdocs/langs/az_AZ/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/az_AZ/mrp.lang
+++ b/htdocs/langs/az_AZ/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/az_AZ/other.lang b/htdocs/langs/az_AZ/other.lang
index 54c0572d453..7a895bb1ca5 100644
--- a/htdocs/langs/az_AZ/other.lang
+++ b/htdocs/langs/az_AZ/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/az_AZ/products.lang b/htdocs/langs/az_AZ/products.lang
index 97db059594f..9ecc11ed93d 100644
--- a/htdocs/langs/az_AZ/products.lang
+++ b/htdocs/langs/az_AZ/products.lang
@@ -108,7 +108,8 @@ 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=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/az_AZ/projects.lang b/htdocs/langs/az_AZ/projects.lang
index baf0ecde17f..05aa1f5a560 100644
--- a/htdocs/langs/az_AZ/projects.lang
+++ b/htdocs/langs/az_AZ/projects.lang
@@ -76,15 +76,16 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/az_AZ/recruitment.lang b/htdocs/langs/az_AZ/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/az_AZ/recruitment.lang
+++ b/htdocs/langs/az_AZ/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/az_AZ/sendings.lang b/htdocs/langs/az_AZ/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/az_AZ/sendings.lang
+++ b/htdocs/langs/az_AZ/sendings.lang
@@ -30,6 +30,7 @@ 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
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/az_AZ/stocks.lang b/htdocs/langs/az_AZ/stocks.lang
index 660443bcded..a1f55010139 100644
--- a/htdocs/langs/az_AZ/stocks.lang
+++ b/htdocs/langs/az_AZ/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/az_AZ/ticket.lang b/htdocs/langs/az_AZ/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/az_AZ/ticket.lang
+++ b/htdocs/langs/az_AZ/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/az_AZ/website.lang b/htdocs/langs/az_AZ/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/az_AZ/website.lang
+++ b/htdocs/langs/az_AZ/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/az_AZ/withdrawals.lang b/htdocs/langs/az_AZ/withdrawals.lang
index 114a8d9dd6c..059b3451c11 100644
--- a/htdocs/langs/az_AZ/withdrawals.lang
+++ b/htdocs/langs/az_AZ/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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/az_AZ/workflow.lang b/htdocs/langs/az_AZ/workflow.lang
index 299be277e1d..494a0424a75 100644
--- a/htdocs/langs/az_AZ/workflow.lang
+++ b/htdocs/langs/az_AZ/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index 89ff86ac06d..61935e71771 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=Тази услуга
 ThisProduct=Този продукт
 DefaultForService=По подразбиране за услуга
 DefaultForProduct=По подразбиране за продукт
+ProductForThisThirdparty=Product for this thirdparty
+ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Не може да се предложи
 AccountancySetupDoneFromAccountancyMenu=Повечето настройки на счетоводството се извършват от менюто %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -48,6 +50,7 @@ CountriesExceptMe=Всички държави с изключение на %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Основна счетоводна сметка за клиенти, която не е дефинирана в настройката
 MainAccountForSuppliersNotDefined=Основна счетоводна сметка за доставчици, която не е дефинирана в настройката
@@ -144,7 +147,7 @@ NotVentilatedinAccount=Не е свързан със счетоводната с
 XLineSuccessfullyBinded=%s продукти / услуги успешно са свързани към счетоводна сметка
 XLineFailedToBeBinded=%s продукти / услуги, които не са свързани с нито една счетоводна сметка
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Брой елементи за свързване, показани на страница (препоръчително: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Започнете сортирането на страницата „За свързване“, използвайки най-новите елементи
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Започнете сортирането на страницата „Извършено свързване“, използвайки най-новите елементи
 
@@ -198,7 +201,8 @@ Docdate=Дата
 Docref=Референция
 LabelAccount=Име на сметка
 LabelOperation=Име на операция
-Sens=Значение
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Буквен код
 Lettering=Означение
 Codejournal=Журнал
@@ -206,7 +210,8 @@ JournalLabel=Име на журнал
 NumPiece=Пореден номер
 TransactionNumShort=Транзакция №
 AccountingCategory=Персонализирани групи
-GroupByAccountAccounting=Групиране по счетоводна сметка
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Тук може да определите някои групи счетоводни сметки. Те ще бъдат използвани за персонализирани счетоводни отчети.
 ByAccounts=По сметки
 ByPredefinedAccountGroups=По предварително определени групи
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Плащането не е свързано с нит
 OpeningBalance=Начално салдо
 ShowOpeningBalance=Показване на баланс при откриване
 HideOpeningBalance=Скриване на баланс при откриване
-ShowSubtotalByGroup=Показване на междинна сума по групи
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Група от сметки
 PcgtypeDesc=Групата от сметки се използва като предварително зададен критерий за филтриране и групиране за някои счетоводни отчети. Например 'Приход' или 'Разход' се използват като групи за счетоводни сметки на продукти за съставяне на отчет за разходи / приходи.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Преглед на списъка с редове на
 DescVentilExpenseReportMore=Ако настроите счетоводна сметка за видовете разходен отчет, то системата ще може да извърши всички свързвания между редовете на разходния отчет и счетоводната сметка във вашия сметкоплан, просто с едно щракване с бутона <strong>"%s"</strong>. Ако сметката не е зададена в речника с таксите или ако все още имате някои редове, които не са свързани с нито една сметка ще трябва да направите ръчно свързване от менюто "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Преглед на списъка с редове на разходни отчети и тяхната счетоводна сметка за такса
 
+Closure=Annual closure
 DescClosure=Преглед на броя движения за месец, които не са валидирани за активните фискални години
 OverviewOfMovementsNotValidated=Стъпка 1 / Преглед на движенията, които не са валидирани (необходимо за приключване на фискална година)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Валидиране на движения
 DescValidateMovements=Всякакви промени или изтриване на написаното ще бъдат забранени. Всички записи за изпълнение трябва да бъдат валидирани, в противен случай приключването няма да е възможно.
-SelectMonthAndValidate=Изберете месец и валидирайте движенията
 
 ValidateHistory=Автоматично свързване
 AutomaticBindingDone=Автоматичното свързване завърши
@@ -293,6 +300,7 @@ Accounted=Осчетоводено в книгата
 NotYetAccounted=Все още не е осчетоводено в книгата
 ShowTutorial=Показване на урок
 NotReconciled=Не е съгласувано
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +345,7 @@ Modelcsv_LDCompta10=Експортиране за LD Compta (v10 и по-нов
 Modelcsv_openconcerto=Експортиране за OpenConcerto (Тест)
 Modelcsv_configurable=Експортиране в конфигурируем CSV
 Modelcsv_FEC=Експортиране за FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Експортиране за Sage 50 Швейцария
 Modelcsv_winfic=Експортиране за Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index d40a4f22556..6e7129f0a22 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Интерфейс
 SetupArea=Настройки
 UploadNewTemplate=Качване на нов(и) шаблон(и)
 FormToTestFileUploadForm=Формуляр за тестване на качването на файлове (според настройката)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Забележка: Ефективно е само ако модула <b>%s</b> е активиран
 RemoveLock=Премахнете / преименувайте файла <b>%s</b>, ако съществува, за да разрешите използването на инструмента за инсталиране / актуализиране.
 RestoreLock=Възстановете файла <b>%s</b> с права само за четене, за да забраните по-нататъшното използване на инструмента за инсталиране / актуализиране.
@@ -85,7 +87,6 @@ ShowPreview=Показване на преглед
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Прегледът не е налице
 ThemeCurrentlyActive=Темата е активна в момента
-CurrentTimeZone=Времева зона на PHP (сървър)
 MySQLTimeZone=Времева зона на MySql (база данни)
 TZHasNoEffect=Датите се съхраняват и връщат от сървъра на базата данни така, сякаш се съхраняват като подаден низ. Часовата зона има ефект само когато се използва функцията UNIX_TIMESTAMP (която не трябва да се използва от Dolibarr, така че базата данни TZ не трябва да има ефект, дори ако бъде променена след въвеждането на данните).
 Space=Пространство
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Тази секция осигурява администр
 Purge=Разчистване
 PurgeAreaDesc=Тази страница ви позволява да изтриете всички файлове, генерирани или съхранени от Dolibarr (временни файлове или всички файлове в директорията <b>%s</b>). Използването на тази функция обикновено не е необходимо. Той се предоставя като решение за потребители, чиито Dolibarr се хоства от доставчик, който не предлага разрешения за изтриване на файлове, генерирани от уеб сървъра.
 PurgeDeleteLogFile=Изтриване на лог файлове, включително <b>%s</b> генериран от Debug Logs модула (няма риск от загуба на данни)
-PurgeDeleteTemporaryFiles=Изтриване на всички временни файлове (няма риск от загуба на данни). Забележка: Изтриването се извършва, само ако директорията temp е създадена преди 24 часа.
-PurgeDeleteTemporaryFilesShort=Изтриване на временни файлове
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 PurgeDeleteAllFilesInDocumentsDir=Изтриване на  всички файлове в директорията: <b>%s</b>.<br>Това ще изтрие всички генерирани документи, свързани с елементи (контрагенти, фактури и т.н.), файлове, качени чрез ECM модула, архиви на базата данни и временни файлове.
 PurgeRunNow=Разчисти сега
 PurgeNothingToDelete=Няма директория или файлове за изтриване.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Предпочитани партньори
 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>
 HelpCenterDesc1=Ресурси за получаване на помощ и поддръжка относно Dolibarr
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Примери с текуща конфигурация
 ListOfDirectories=Списък на директории с OpenDocument шаблони
 ListOfDirectoriesForModelGenODT=Списък на директории, съдържащи файлове с шаблони във формат OpenDocument. <br><br> Попълнете тук пълния път на директориите. <br> Добавете нов ред за всяка директория. <br> За да включите директория на GED модула, добавете тук <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br> Файловете в тези директории трябва да завършват на <b>.odt</b> или <b>.ods</b>.
 NumberOfModelFilesFound=Брой файлове с шаблони за ODT/ODS, намерени в тези директории
-ExampleOfDirectoriesForModelGen=Примери за синтаксис: <br> C:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>За да узнаете как да създадете вашите ODT шаблони за документи преди да ги съхраните в тези директории прочетете Wiki документацията:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Позиция на име / фамилия
@@ -406,7 +408,7 @@ UrlGenerationParameters=Параметри за защитени URL адрес
 SecurityTokenIsUnique=Използвайте уникален параметър за защитен ключ за всеки URL адрес
 EnterRefToBuildUrl=Въведете референция за обект %s
 GetSecuredUrl=Получете изчисления URL адрес
-ButtonHideUnauthorized=Скриване на бутоните за потребители, които не са администратори, вместо показване на сиви бутони.
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Първоначална ставка на ДДС
 NewVATRates=Нова ставка на ДДС
 PriceBaseTypeToChange=Променяне на цените с базова референтна стойност, определена на
@@ -668,7 +670,7 @@ Module54000Desc=Директен печат (без отваряне на док
 Module55000Name=Анкети, проучвания и гласоподаване
 Module55000Desc=Създаване на онлайн анкети, проучвания или гласувания (като Doodle, Studs, RDVz и др.)
 Module59000Name=Маржове
-Module59000Desc=Управление на маржове
+Module59000Desc=Module to follow margins
 Module60000Name=Комисионни
 Module60000Desc=Управление на комисионни
 Module62000Name=Условия на доставка
@@ -1306,7 +1308,7 @@ YouUseBestDriver=Използвате драйвер %s, който е най-д
 YouDoNotUseBestDriver=Използвате драйвер %s, но драйвер %s е препоръчителен.
 NbOfObjectIsLowerThanNoPb=Имате само %s %s в базата данни. Това не изисква особена оптимизация.
 SearchOptim=Оптимизация на търсене
-YouHaveXObjectUseSearchOptim=Имате %s %s в базата данни. Трябва да добавите константата %s със стойност 1 в Начало -> Настройка -> Други настройки. Ограничете търсенето до началото на низове, което прави възможно базата данни да използва индекси и ще получите незабавен отговор.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=Имате %s %s в базата данни и константата %s е със стойност 1 в Начало -> Настройка -> Други настройки.
 BrowserIsOK=Използвате уеб браузъра %s. Този браузър е добър от гледна точка на сигурност и производителност.
 BrowserIsKO=Използвате уеб браузъра %s. Известно е, че този браузър е лош избор от гледна точка на сигурност, производителност и надеждност. Препоръчително е да използвате Firefox, Chrome, Opera или Safari.
@@ -1596,8 +1598,13 @@ ServiceSetup=Настройка на модулa за услуги
 ProductServiceSetup=Настройка на модула за продукти и услуги
 NumberOfProductShowInSelect=Максимален брой продукти за показване в комбинирани списъци за избор (0 = без ограничение)
 ViewProductDescInFormAbility=Показване на описанията на продуктите във формуляри (в противен случай се показват в изскачащи подсказки)
+DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
+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 документи налични в секцията "Прикачени файлове и документи" в раздела "Свързани файлове"  на търговско предложение, ако се продукт / услуга в предложението и модел за документи Azur
-ViewProductDescInThirdpartyLanguageAbility=Показване на описанията на продуктите в езика на контрагента
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 UseSearchToSelectProductTooltip=Също така, ако имате голям брой продукти (> 100 000) може да увеличите скоростта като зададете константата PRODUCT_DONOTSEARCH_ANYWHERE да бъде със стойност "1" в Настройки - Други настройки. След това търсенето ще бъде ограничено до началото на низ.
 UseSearchToSelectProduct=Изчакване, докато бъде натиснат клавиш преди да се зареди съдържанието на комбинирания списък с продукти (това може да увеличи производителността, ако имате голям брой продукти, но е по-малко удобно)
 SetDefaultBarcodeTypeProducts=Тип баркод по подразбиране, който да се използва за продукти
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Персонализирани менюта, коит
 NewMenu=Ново меню
 MenuHandler=Манипулатор на меню
 MenuModule=Модул източник
-HideUnauthorizedMenu= Скриване на неоторизирани (сиви) менюта
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Идентификатор на меню
 DetailMenuHandler=Манипулатор на меню, в който да се покаже новото меню
 DetailMenuModule=Име на модула, ако входните данни на менюто идват от модул
@@ -1983,11 +1990,12 @@ EMailHost=Адрес на IMAP сървър
 MailboxSourceDirectory=Директория / Източник в пощенската кутия
 MailboxTargetDirectory=Директория / Цел в пощенската кутия
 EmailcollectorOperations=Операции за извършване от колекционера
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Максимален брой събрани имейли при колекциониране
 CollectNow=Колекциониране
 ConfirmCloneEmailCollector=Сигурни ли сте, че искате да клонирате имейл колектора %s?
-DateLastCollectResult=Дата на последен опит за колекциониране
-DateLastcollectResultOk=Дата на последно успешно колекциониране
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Последен резултат
 EmailCollectorConfirmCollectTitle=Потвърждение за колекциониране на имейли
 EmailCollectorConfirmCollect=Искате ли да стартирате колекционирането на този колекционер?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Код на меню (главно меню)
 ECMAutoTree=Показване на автоматично ECM дърво
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/bg_BG/banks.lang b/htdocs/langs/bg_BG/banks.lang
index 234d788aaa4..fe4cf4b6b83 100644
--- a/htdocs/langs/bg_BG/banks.lang
+++ b/htdocs/langs/bg_BG/banks.lang
@@ -173,10 +173,11 @@ SEPAMandate=SEPA нареждане
 YourSEPAMandate=Вашите SEPA нареждания
 FindYourSEPAMandate=Това е вашето SEPA нареждане, с което да упълномощите нашата фирма да направи поръчка за директен дебит към вашата банка. Върнете го подписано (сканиран подписан документ) или го изпратете по пощата на
 AutoReportLastAccountStatement=Автоматично попълване на полето „номер на банково извлечение“ с последния номер на извлечение, когато правите съгласуване.
-CashControl=Лимит за плащане в брой на ПОС
-NewCashFence=Нов лимит за плащане в брой
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 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
diff --git a/htdocs/langs/bg_BG/blockedlog.lang b/htdocs/langs/bg_BG/blockedlog.lang
index 60c5d813935..892210b3ebb 100644
--- a/htdocs/langs/bg_BG/blockedlog.lang
+++ b/htdocs/langs/bg_BG/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Дарението е логически изтрито
 logMEMBER_SUBSCRIPTION_CREATE=Членският внос е създаден
 logMEMBER_SUBSCRIPTION_MODIFY=Членският внос е променен
 logMEMBER_SUBSCRIPTION_DELETE=Членският внос е логически изтрит
-logCASHCONTROL_VALIDATE=Регистриране на финансово престъпление
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Изтегляне на фактура за продажба
 BlockedLogBillPreview=Преглед на фактура за продажба
 BlockedlogInfoDialog=Подробности в регистъра
diff --git a/htdocs/langs/bg_BG/boxes.lang b/htdocs/langs/bg_BG/boxes.lang
index f360c2f0d01..c59a1d12298 100644
--- a/htdocs/langs/bg_BG/boxes.lang
+++ b/htdocs/langs/bg_BG/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Дарения: %s последно промене
 BoxTitleLastModifiedExpenses=Разходни отчети: %s последно променени
 BoxTitleLatestModifiedBoms=Спецификации: %s последно променени
 BoxTitleLatestModifiedMos=Поръчки за производство: %s последно променени
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Глобална дейност (фактури, предложения, поръчки)
 BoxGoodCustomers=Добри клиенти
 BoxTitleGoodCustomers=%s Добри клиенти
+BoxScheduledJobs=Планирани задачи
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Неуспешно опресняване на RSS поток. Последното успешно опресняване е на дата: %s
 LastRefreshDate=Последна дата на опресняване
 NoRecordedBookmarks=Не са дефинирани отметки.
@@ -92,8 +95,8 @@ LastXMonthRolling=Подвижни месеци: %s последно изтек
 ChooseBoxToAdd=Добавяне на джаджа към таблото
 BoxAdded=Джаджата е добавена към таблото
 BoxTitleUserBirthdaysOfMonth=Рождени дни в този месец (потребители)
-BoxLastManualEntries=Последни ръчни записи в счетоводството
-BoxTitleLastManualEntries=Ръчни записи: %s последни
+BoxLastManualEntries=Latest record in accountancy entered manually or without source document
+BoxTitleLastManualEntries=%s latest record entered manually or without source document
 NoRecordedManualEntries=Няма ръчни записи в счетоводството
 BoxSuspenseAccount=Брой счетоводни операции във временна сметка
 BoxTitleSuspenseAccount=Брой неразпределени редове
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Не е дефинирана временна смет
 BoxLastCustomerShipments=Последни пратки към клиенти
 BoxTitleLastCustomerShipments=Пратки: %s последни към клиенти
 NoRecordedShipments=Няма регистрирани пратки към клиенти
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Счетоводство
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/bg_BG/cashdesk.lang b/htdocs/langs/bg_BG/cashdesk.lang
index a30ed1b0a22..a7d3530d1e3 100644
--- a/htdocs/langs/bg_BG/cashdesk.lang
+++ b/htdocs/langs/bg_BG/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Футър
 AmountAtEndOfPeriod=Сума в края на периода (ден, месец или година)
 TheoricalAmount=Теоретична сума
 RealAmount=Реална сума
-CashFence=Cash fence
-CashFenceDone=Парична граница за периода
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Брой фактури
 Paymentnumpad=Тип Pad за въвеждане на плащане
 Numberspad=Числов Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> тагът се използва за добавяне на номера на терминала
 TakeposGroupSameProduct=Групиране на едни и същи продукти
 StartAParallelSale=Стартиране на нова паралелна продажба
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Паричен отчет
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/bg_BG/categories.lang b/htdocs/langs/bg_BG/categories.lang
index 717f1a5fadd..54c706a7b42 100644
--- a/htdocs/langs/bg_BG/categories.lang
+++ b/htdocs/langs/bg_BG/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Секция с тагове / категории за п
 UsersCategoriesArea=Секция с тагове / категории за потребители
 SubCats=Подкатегории
 CatList=Списък с тагове / категории
+CatListAll=List of tags/categories (all types)
 NewCategory=Нов таг / категория
 ModifCat=Променяне на таг / категория
 CatCreated=Създаден е таг / категория
@@ -65,16 +66,22 @@ UsersCategoriesShort=Категории потребители
 StockCategoriesShort=Тагове / Категории
 ThisCategoryHasNoItems=Тази категория не съдържа никакви елементи
 CategId=Идентификатор на таг / категория
-CatSupList=Списък на тагове / категории за доставчици
-CatCusList=Списък на тагове / категории за клиенти / потенциални клиенти
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Списък на тагове / категории за продукти
 CatMemberList=Списък на тагове / категории за членове
-CatContactList=Списък на тагове / категории за контакти
-CatSupLinks=Връзки между доставчици и тагове / категории
+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=Връзки между клиенти / потенциални клиенти и тагове / категории
 CatContactsLinks=Връзки между контакти / адреси и тагове / категории
 CatProdLinks=Връзки между продукти / услуги и тагове / категории
-CatProJectLinks=Връзки между проекти и тагове / категории
+CatMembersLinks=Връзки между членове и етикети/категории
+CatProjectsLinks=Връзки между проекти и тагове / категории
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Изтриване от таг / категория
 ExtraFieldsCategories=Допълнителни атрибути
 CategoriesSetup=Настройка на тагове / категории
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index 267abddeb98..5acad41ae81 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Проверяване на вътрешно-общн
 VATIntraManualCheck=Може да проверите също така ръчно в интернет страницата на Европейската Комисия: <a href="%s" target="_blank"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Проверка не е възможна. Услугата за проверка не се предоставя от държавата-членка (%s).
 NorProspectNorCustomer=Нито потенциален клиент, нито клиент
-JuridicalStatus=Правна форма
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Служители
 ProspectLevelShort=Потенциал
diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
index c9dd8bc51e4..177dc32434a 100644
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@@ -111,7 +111,7 @@ Refund=Възстановяване
 SocialContributionsPayments=Плащания на социални / фискални данъци
 ShowVatPayment=Показване на плащане на ДДС
 TotalToPay=Общо за плащане
-BalanceVisibilityDependsOnSortAndFilters=Балансът е видим в този списък само ако таблицата е сортирана възходящо на %s и филтрирана за 1 банкова сметка
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Счетоводен код на клиент
 SupplierAccountancyCode=Счетоводен код на доставчик
 CustomerAccountancyCodeShort=Счет. код на клиент
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Сигурни ли сте, че искате д
 ExportDataset_tax_1=Социални / фискални данъци и плащания
 CalcModeVATDebt=Режим <b>%sДДС върху осчетоводени задължения%s</b>
 CalcModeVATEngagement=Режим <b>%sДДС върху приходи - разходи%s</b>
-CalcModeDebt=Анализ на регистрирани фактури, включително на неосчетоводени в книгата
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Анализ на регистрирани плащания, включително на неосчетоводени в книгата
 CalcModeBookkeeping=Анализ на данни, регистрирани в таблицата на счетоводната книга.
 CalcModeLT1= Режим <b>%sRE върху фактури за продажба - фактури за доставка%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Баланс на приходи и разходи,
 AnnualByCompanies=Баланс на приходи и разходи, по предварително определени групи сметки
 AnnualByCompaniesDueDebtMode=Баланс на приходи и разходи, по предварително определени групи, режим <b>%sВземания - Дългове%s</b> или казано още <b>Осчетоводяване на вземания</b>.
 AnnualByCompaniesInputOutputMode=Баланс на приходи и разходи, по предварително определени групи, режим <b>%sПриходи - Разходи%s</b> или казано още <b>Касова отчетност</b>.
-SeeReportInInputOutputMode=Вижте %sанализа на плащанията%s за изчисляване на действителните плащания, дори и ако те все още не са осчетоводени в книгата.
-SeeReportInDueDebtMode=Вижте %sанализа на фактурите%s за изчисляване, който е базиран на регистираните фактури, дори и ако те все още не са осчетоводени в книгата.
-SeeReportInBookkeepingMode=Вижте <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>
 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>- Основава се на дата на плащане на фактури, разходи, ДДС и заплати. Дата на дарение за дарения.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Показва запис във вашата
 SeePageForSetup=Вижте менюто <a href="%s">%s</a> за настройка
 DepositsAreNotIncluded=- Не включва фактури за авансови плащания
 DepositsAreIncluded=- Включва фактури за авансови плащания
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Справка за данък 2 по контрагент
 LT2ReportByCustomers=Справка за данък 3 по контрагент
 LT1ReportByCustomersES=Справка за RE по контрагент
 LT2ReportByCustomersES=Справка за IRPF по контрагент
 VATReport=Справка за данък върху продажби
 VATReportByPeriods=Справка за данък върху продажби по периоди
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Справка за данък върху продажби по ставки
 VATReportByThirdParties=Справка за данък върху продажби по контрагенти
 VATReportByCustomers=Справка за данък върху продажби по клиенти
diff --git a/htdocs/langs/bg_BG/cron.lang b/htdocs/langs/bg_BG/cron.lang
index d762cb8a0ed..91af655214e 100644
--- a/htdocs/langs/bg_BG/cron.lang
+++ b/htdocs/langs/bg_BG/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Изтриване на планирани задачи
 Permission23104 = Стартиране на планирани задачи
 # Admin
 CronSetup=Настройки за управление на планирани задачи
-URLToLaunchCronJobs=URL адрес за проверка и стартиране на определени cron задачи
-OrToLaunchASpecificJob=Или за проверка и зареждане на специфична задача
+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=Защитен ключ на URL за зареждане на cron задачи
 FileToLaunchCronJobs=Команден ред за проверка и стартиране на определени cron задачи
 CronExplainHowToRunUnix=В Unix среда би трябвало да използвате следния crontab ред за изпълнение на командния ред на всеки 5 минути
 CronExplainHowToRunWin=В среда на Microsoft (tm) Windows можете да използвате инструментите за планирани задачи, за да стартирате командния ред на всеки 5 минути
 CronMethodDoesNotExists=Класът %s не съдържа метод %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Профилите на Cron задачите се дефинират в дескрипторния файл на модула. Когато модулът е активиран, те са заредени и достъпни, така че можете да администрирате задачите от менюто за администриране %s.
 CronJobProfiles=Списък на предварително определени профили на cron задачи
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Брой стартирания
 CronMaxRun=Максимален брой стартирания
 CronEach=Всеки
 JobFinished=Задачи заредени и приключили
+Scheduled=Scheduled
 #Page card
 CronAdd= Добавяне на задачи
 CronEvery=Изпълни задачата всеки
@@ -56,7 +58,7 @@ CronNote=Коментар
 CronFieldMandatory=Полета %s са задължителни
 CronErrEndDateStartDt=Крайната дата не може да бъде преди началната дата
 StatusAtInstall=Състояние при инсталиране на модула
-CronStatusActiveBtn=Активиране
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Деактивиране
 CronTaskInactive=Тази задача е деактивирана
 CronId=Идентификатор
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Архивиране на локална база д
 MakeLocalDatabaseDump=Създаване на локална база данни. Параметрите са: компресия ('gz' or 'bz' or 'none'), вид архивиране ('mysql', 'pgsql', 'auto'), 1, 'auto' или име на файла за съхранение, брой резервни файлове, които да се запазят
 WarningCronDelayed=Внимание, за целите на изпълнението, каквато и да е следващата дата на изпълнение на активирани задачи, вашите задачи могат да бъдат забавени до максимум %s часа, преди да бъдат стартирани.
 DATAPOLICYJob=Почистване на данни и анонимност
+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/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index 622d5c15041..aea2d732d1c 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Няма грешка, но се ангажираме.
 # Errors
 ErrorButCommitIsDone=Намерени са грешки, но ние валидираме въпреки това.
 ErrorBadEMail=Имейл %s е грешен
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=URL адрес %s е грешен
 ErrorBadValueForParamNotAString=Неправилна стойност за вашия параметър. Обикновено се добавя, когато преводът липсва.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Потребител %s вече съществува.
 ErrorGroupAlreadyExists=Група %s вече съществува.
 ErrorRecordNotFound=Записът не е намерен.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Някои задължителни полета не са 
 ErrorSubjectIsRequired=Необходима е тема на имейл
 ErrorFailedToCreateDir=Неуспешно създаване на директория. Уверете се, че уеб сървър потребител има разрешение да пишат в Dolibarr документи. Ако параметър <b>safe_mode</b> е разрешен в тази PHP, проверете дали Dolibarr PHP файлове притежава за потребителя на уеб сървъра (или група).
 ErrorNoMailDefinedForThisUser=Няма дефиниран имейл за този потребител
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Тази функция трябва ДжаваСкрипт да се активира, за да работят. Променете тази настройка - дисплей.
 ErrorTopMenuMustHaveAParentWithId0=Меню от тип 'Горно' не може да има главно меню. Поставете 0 за главно меню или изберете меню от тип 'Ляво'.
 ErrorLeftMenuMustHaveAParentId=Менюто на &quot;левицата&quot; тип трябва да имат родителски идентификатор.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Това име на профил вече същес
 ErrorLDAPSetupNotComplete=Dolibarr LDAP съвпадение не е пълна.
 ErrorLDAPMakeManualTest=. LDIF файл е генериран в директорията %s. Опитайте се да го заредите ръчно от командния ред, за да има повече информация за грешките,.
 ErrorCantSaveADoneUserWithZeroPercentage=Не може да се съхрани действие със „състояние не е стартирано“, ако е попълнено и поле „извършено от“.
-ErrorRefAlreadyExists=Ref използван за създаване вече съществува.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Моля, въведете името на банковото извлечение, където трябва да се докладва вписването (формат YYYYMM или YYYYMMDD)
 ErrorRecordHasChildren=Изтриването на записа не бе успешно, тъй като има някои наследени записи.
 ErrorRecordHasAtLeastOneChildOfType=Обектът има поне един наследен обект от тип %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Трябва да изберет
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Отстъпката, която се опитвате да приложите, е по-голяма, отколкото оставащото за плащане. Разделете отстъпката преди това в 2 по-малки отстъпки.
 ErrorFileNotFoundWithSharedLink=Файлът не бе намерен. Може да е променен ключът за споделяне или файлът е премахнат наскоро.
 ErrorProductBarCodeAlreadyExists=Продуктовият баркод %s вече съществува за друга продуктова референция.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Обърнете внимание също така, че използването на виртуален продукт за автоматично увеличаване/намаляване на подпродукти не е възможно, когато поне един подпродукт (или подпродукт на подпродукти) се нуждае от партиден/сериен номер.
+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=Описанието е задължително за редове със свободни продукти
 ErrorAPageWithThisNameOrAliasAlreadyExists=Страницата/контейнера <strong>%s</strong> има същото име или алтернативен псевдоним, който се опитвате да използвате
 ErrorDuringChartLoad=Грешка при зареждане на диаграмата на сметките. Ако някои сметки не са заредени, може да ги въведете ръчно.
@@ -243,6 +246,16 @@ 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=Публичният интерфейс не е активиран
+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
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Вашата стойност на PHP параметър upload_max_filesize (%s) е по-голяма от стойността на PHP параметър post_max_size (%s). Това не е последователна настройка.
 WarningPasswordSetWithNoAccount=За този член бе зададена парола. Въпреки това, не е създаден потребителски акаунт. Така че тази парола е съхранена, но не може да се използва за влизане в Dolibarr. Може да се използва от външен модул/интерфейс, но ако не е необходимо да дефинирате потребителско име или парола за член може да деактивирате опцията "Управление на вход за всеки член" от настройката на модула Членове. Ако трябва да управлявате вход, но не се нуждаете от парола, можете да запазите това поле празно, за да избегнете това предупреждение. Забележка: Имейлът може да се използва и като вход, ако членът е свързан с потребител.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Входните ви данни са п
 WarningAnEntryAlreadyExistForTransKey=Вече съществува запис за ключа за превод за този език
 WarningNumberOfRecipientIsRestrictedInMassAction=Внимание, броят на различните получатели е ограничен до <b>%s</b>, когато се използват масови действия в списъците
 WarningDateOfLineMustBeInExpenseReportRange=Внимание, датата на реда не е в обхвата на разходния отчет
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Проектът е приключен. Трябва първо да го активирате отново.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Някои банкови транзакции бяха премахнати, след което бе генерирана разписка, в която са включени. Броят на чековете и общата сума на разписката може да се различават от броя и общата сума в списъка.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/bg_BG/exports.lang b/htdocs/langs/bg_BG/exports.lang
index f54b6ab17aa..f371671587f 100644
--- a/htdocs/langs/bg_BG/exports.lang
+++ b/htdocs/langs/bg_BG/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Ключ (колона), който да се използв
 NbInsert=Брой вмъкнати редове: %s
 NbUpdate=Брой актуализирани редове: %s
 MultipleRecordFoundWithTheseFilters=Намерени са няколко записа с тези филтри: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang
index 998b2de9d97..87d5e252581 100644
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/htdocs/langs/bg_BG/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Имейли, въведени от потреб
 MailingModuleDescDolibarrUsers=Потребители с имейли
 MailingModuleDescThirdPartiesByCategories=Контрагенти (с категории)
 SendingFromWebInterfaceIsNotAllowed=Изпращането от уеб интерфейса не е позволено.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Ред %s във файл
@@ -125,12 +126,13 @@ TagMailtoEmail=Емейл на получателя (включително HTML
 NoEmailSentBadSenderOrRecipientEmail=Няма изпратени имейли. Неправилен имейл на подателя или получателя. Проверете потребителския профил.
 # Module Notifications
 Notifications=Известия
-NoNotificationsWillBeSent=За това събитие и този контрагент не са планирани известия по имейл
-ANotificationsWillBeSent=1 известие ще бъде изпратено по имейл
-SomeNotificationsWillBeSent=%s известия ще бъдат изпратени по имейл
-AddNewNotification=Активиране на ново имейл известяване за цел / събитие
-ListOfActiveNotifications=Списък на всички активни имейл известия за цели/събития
-ListOfNotificationsDone=Списък на всички изпратени имейл известия
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Конфигурацията за изпращане на имейл е настроена на '%s'. Този режим не може да се използва за изпращане на масови имейли.
 MailSendSetupIs2=Трябва първо да отидете с администраторски акаунт в меню %sНачало - Настройка - Имейли%s и да промените параметър <strong>'%s'</strong>, за да използвате режим '%s'. С този режим може да въведете настройки за SMTP сървъра, предоставен от вашия доставчик на интернет услуги и да използвате функцията за изпращане на масови имейли.
 MailSendSetupIs3=Ако имате някакви въпроси как да настроите вашия SMTP сървър, може да се обърнете към %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Импортираният файл трябва да
 UseFormatInputEmailToTarget=Въведете низ с формат <strong>имейл;фамилия;име;друго</strong>
 MailAdvTargetRecipients=Получатели (разширен избор)
 AdvTgtTitle=Попълнете полетата за въвеждане, за да посочите предварително избраните контрагенти или контакти/адреси
-AdvTgtSearchTextHelp=Използвайте %% като заместващи символи. Например, за да намерите всички елементи като <b>jean, joe, jim</b>, може да въведете <b>j%%</b> или да използвате ; като разделител за стойност, а ! за изключване на стойност. Например <b>jean;joe;jim%%;!jimo;!jima%</b> ще се цели всички jean, joe, започващи с jim, но не с jimo и всичко останало, което започва с jima
+AdvTgtSearchTextHelp=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=Използвайте интервал, за да изберете целочислена или десетична стойност
 AdvTgtMinVal=Минимална стойност
 AdvTgtMaxVal=Максимална стойност
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Създаване на филтър
 AdvTgtOrCreateNewFilter=Име на новия филтър
 NoContactWithCategoryFound=Няма намерен контакт/адрес с тази категория
 NoContactLinkedToThirdpartieWithCategoryFound=Няма намерен контакт/адрес с тази категория
-OutGoingEmailSetup=Настройка на изходяща електронна поща
-InGoingEmailSetup=Настройка на входящата поща
-OutGoingEmailSetupForEmailing=Настройка на изходяща електронна поща (за модул %s)
-DefaultOutgoingEmailSetup=Настройка на изходящата поща по подразбиране
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Информация
 ContactsWithThirdpartyFilter=Контакти с филтър за контрагент
 Unanswered=Unanswered
 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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 335801537fa..b84fe0a8561 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Няма наличен шаблон за този тип им
 AvailableVariables=Налични променливи за заместване
 NoTranslation=Няма превод
 Translation=Превод
+CurrentTimeZone=Времева зона на PHP (сървър)
 EmptySearchString=Въведете критерии за търсене
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Няма намерен запис
 NoRecordDeleted=Няма изтрит запис
 NotEnoughDataYet=Няма достатъчно данни
@@ -85,6 +87,8 @@ FileWasNotUploaded=Избран е файл за прикачване, но вс
 NbOfEntries=Брой вписвания
 GoToWikiHelpPage=Прочетете онлайн помощта (необходим е достъп до интернет)
 GoToHelpPage=Прочетете помощната информация
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Начална страница
 RecordSaved=Записът е съхранен
 RecordDeleted=Записът е изтрит
 RecordGenerated=Записът е генериран
@@ -220,6 +224,7 @@ Value=Стойност
 PersonalValue=Лична стойност
 NewObject=Нов %s
 NewValue=Нова стойност
+OldValue=Old value %s
 CurrentValue=Текуща стойност
 Code=Код
 Type=Тип
@@ -433,6 +438,7 @@ RemainToPay=Оставащо за плащане
 Module=Модул / Приложение
 Modules=Модули / Приложения
 Option=Опция
+Filters=Filters
 List=Списък
 FullList=Пълен списък
 FullConversation=Пълен списък със съобщения
@@ -650,6 +656,7 @@ SupplierPreview=Преглед на доставчик
 ShowCustomerPreview=Преглеждане на клиент
 ShowSupplierPreview=Преглеждане на доставчик
 RefCustomer=Изх. № на клиент
+InternalRef=Internal ref.
 Currency=Валута
 InfoAdmin=Информация за администратори
 Undo=Отменяне
@@ -671,7 +678,7 @@ SendMail=Изпращане на имейл
 Email=Имейл
 NoEMail=Няма имейл
 AlreadyRead=Вече е прочетено
-NotRead=Непрочетено
+NotRead=Непрочетен
 NoMobilePhone=Няма мобилен телефон
 Owner=Собственик
 FollowingConstantsWillBeSubstituted=Следните константи ще бъдат заменени със съответната стойност:
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=На изчакване
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/bg_BG/modulebuilder.lang b/htdocs/langs/bg_BG/modulebuilder.lang
index 214ce4293d0..eb76c35f976 100644
--- a/htdocs/langs/bg_BG/modulebuilder.lang
+++ b/htdocs/langs/bg_BG/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP страница за създаване / проме
 PageForAgendaTab=PHP страница за раздел със събития
 PageForDocumentTab=PHP страница за раздел с документация
 PageForNoteTab=PHP страница за раздел с бележки
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Път до zip пакет на модул / приложение
 PathToModuleDocumentation=Път до файл с документация на модул / приложение (%s)
 SpaceOrSpecialCharAreNotAllowed=Интервали или специални символи не са разрешени.
@@ -77,7 +78,7 @@ IsAMeasure=Измерва се
 DirScanned=Сканирани директории
 NoTrigger=Няма тригер
 NoWidget=Няма джаджа
-GoToApiExplorer=Отидете в API Explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=Списък на записи в меню
 ListOfDictionariesEntries=Списък на записи в речници
 ListOfPermissionsDefined=Списък на дефинирани права
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Ако имате познания за SQL и PHP мо
 SeeTopRightMenu=Вижте <span class="fa fa-bug"></span> в десния край на горното меню
 AddLanguageFile=Добавяне на езиков файл
 YouCanUseTranslationKey=Може да използвате тук ключ, който е ключ за превод от езиков файл (вижте раздел 'Езици').
-DropTableIfEmpty=(Изтриване на таблица, ако е празна)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=Таблицата %s не съществува
 TableDropped=Таблица %s е изтрита
 InitStructureFromExistingTable=Създаване на низова структура в масив на съществуваща таблица
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Използване на конкретен URL адре
 UseSpecificFamily = Използване на конкретна фамилия
 UseSpecificAuthor = Използване на конкретен автор
 UseSpecificVersion = Използване на конкретна първоначална версия
-ModuleMustBeEnabled=Първо трябва да бъде активиран модулът / приложението
 IncludeRefGeneration=Референцията на обекта трябва да се генерира автоматично
 IncludeRefGenerationHelp=Маркирайте това, ако искате да включите код за управление на автоматичното генериране на референция.
 IncludeDocGeneration=Искам да генерирам някои документи от обекта
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Тип на полета:<br>varchar(99), double(24,8), real, t
 AsciiToHtmlConverter=Ascii към HTML конвертор
 AsciiToPdfConverter=Ascii към PDF конвертор
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/bg_BG/mrp.lang b/htdocs/langs/bg_BG/mrp.lang
index f35119307bb..a8aea279320 100644
--- a/htdocs/langs/bg_BG/mrp.lang
+++ b/htdocs/langs/bg_BG/mrp.lang
@@ -78,3 +78,27 @@ TotalCost=Обща цена
 BOMTotalCost=Разходите за производство на този списък с материали въз основа на разходите за всяко количество и продукт, които ще се използват (използвайте себестойност, ако е дефинирана, иначе средно претеглена цена, ако е определена, или най-добра покупна цена).
 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
index b256d336fd7..5d9542b424e 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -5,8 +5,6 @@ Tools=Инструменти
 TMenuTools=Инструменти
 ToolsDesc=Всички инструменти, които не са включени в другите менюта, са групирани тук.<br>Всички инструменти са достъпни, чрез лявото меню.
 Birthday=Рожден ден
-BirthdayDate=Рождена дата
-DateToBirth=Рождена дата
 BirthdayAlertOn=сигнал за рожден ден активен
 BirthdayAlertOff=сигнал за рожден ден неактивен
 TransKey=Превод на ключа TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Предишен месец (число 1-12) от дат
 TextPreviousMonthOfInvoice=Предишен месец (текст) от дата на фактурата
 NextMonthOfInvoice=Следващ месец (число 1-12) от дата на фактурата
 TextNextMonthOfInvoice=Следващ месец (текст) от дата на фактурата
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Архивния файл е генериран в <b>%s</b>.
 DocFileGeneratedInto=Документа е генериран в <b>%s</b>.
 JumpToLogin=Връзката е прекъсната. Отидете на страницата за въвеждане на входни данни...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Разходния отчет е валидира
 Notify_EXPENSE_REPORT_APPROVE=Разходният отчет е одобрен
 Notify_HOLIDAY_VALIDATE=Молбата за отпуск е валидирана (изисква се одобрение)
 Notify_HOLIDAY_APPROVE=Молбата за отпуск е одобрена
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=Вижте настройка на модул %s
 NbOfAttachedFiles=Брой на прикачените файлове / документи
 TotalSizeOfAttachedFiles=Общ размер на прикачените файлове / документи
@@ -99,6 +100,7 @@ PredefinedMailContentSendShipping=__(Здравейте)__,\n\nМоля, виж
 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 reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr е компактна ERP / CRM система, която поддържа различни работни модули. Няма смисъл от демонстрация, показваща всички модули, тъй като такъв сценарий никога не се случва (на разположение са стотици модули). Налични са няколко демо профила.
 ChooseYourDemoProfil=Изберете демо профила, който най-добре отговаря на вашите нужди...
 ChooseYourDemoProfilMore=...или създайте свой собствен профил<br>(свободен избор на модули)
@@ -214,6 +216,7 @@ EMailTextExpenseReportValidated=Разходен отчет %s е валидир
 EMailTextExpenseReportApproved=Разходен отчет %s е одобрен.
 EMailTextHolidayValidated=Молба за отпуск %s е валидирана.
 EMailTextHolidayApproved=Молба за отпуск %s е одобрена.
+EMailTextActionAdded=The action %s has been added to the Agenda.
 ImportedWithSet=Набор от данни за импортиране
 DolibarrNotification=Автоматично известяване
 ResizeDesc=Въведете нова ширина <b>или</b> нова височина. Съотношението ще се запази по време преоразмеряването...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Контактът / адресът е създа
 ProjectCreatedByEmailCollector=Проектът е създаден, чрез имейл колектор от имейл MSGID %s
 TicketCreatedByEmailCollector=Тикетът е създаден, чрез имейл колектор от имейл MSGID %s
 OpeningHoursFormatDesc=Използвайте средно тире '-' за разделяне на часовете на отваряне и затваряне.<br> Използвайте интервал, за да въведете различни диапазони.<br> Пример: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Секция с експортирания
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index 02ca66e192d..e7009fa4c48 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Множество ценови сегменти за продукт / услуга (всеки клиент е в един ценови сегмент)
 MultiPricesNumPrices=Брой цени
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+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=Брой основни опаковащи продукти
@@ -167,8 +168,10 @@ BuyingPrices=Покупни цени
 CustomerPrices=Клиентски цени
 SuppliersPrices=Доставни цени
 SuppliersPricesOfProductsOrServices=Доставни цени (на продукти / услуги)
-CustomCode=Митнически / Стоков / ХС код
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Държава на произход
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Произход на продукта (суровина / произведен)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Използване на фиксирана цена
 PriceByQuantity=Различни цени за количество
 DisablePriceByQty=Деактивиране на цени за количество
 PriceByQuantityRange=Количествен диапазон
-MultipriceRules=Правила за ценови сегмент
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Използване на правила за ценови сегмент (дефинирани в настройката на модула 'Продукти"), за да се изчисляват автоматично цените за всички други сегменти според първия сегмент
 PercentVariationOver=%% вариация над %s
 PercentDiscountOver=%% отстъпка над %s
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index a60103602e1..447427dfbc8 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -76,15 +76,16 @@ MyActivities=Мои задачи / дейности
 MyProjects=Мои проекти
 MyProjectsArea=Секция с мои проекти
 DurationEffective=Ефективна продължителност
-ProgressDeclared=Деклариран напредък
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Напредък на задачата
 CurentlyOpenedTasks=Текущи активни задачи
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=Декларираният напредък е по-малко %s от изчисления напредък
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Декларираният напредък е повече %s от изчисления напредък
-ProgressCalculated=Изчислен напредък
+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=с които съм свързан
 WhichIamLinkedToProject=с които съм свързан в проект
 Time=Време
+TimeConsumed=Consumed
 ListOfTasks=Списък със задачи
 GoToListOfTimeConsumed=Показване на списъка с изразходвано време
 GanttView=Gantt диаграма
diff --git a/htdocs/langs/bg_BG/recruitment.lang b/htdocs/langs/bg_BG/recruitment.lang
index 2dfffcd1215..14eeb3f6dda 100644
--- a/htdocs/langs/bg_BG/recruitment.lang
+++ b/htdocs/langs/bg_BG/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/bg_BG/sendings.lang b/htdocs/langs/bg_BG/sendings.lang
index 0a41c54d2d7..cf1a6ec0ef6 100644
--- a/htdocs/langs/bg_BG/sendings.lang
+++ b/htdocs/langs/bg_BG/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Други пратки за тази поръчка
 SendingsAndReceivingForSameOrder=Пратки и разписки за тази поръчка
 SendingsToValidate=Пратки за валидиране
 StatusSendingCanceled=Анулирана
+StatusSendingCanceledShort=Анулирана
 StatusSendingDraft=Чернова
 StatusSendingValidated=Валидирана (продукти за изпращане или вече изпратени)
 StatusSendingProcessed=Обработена
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Първо трябва да валидират
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Шаблон на разписка за доставка (лого, ...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Константата EXPEDITION_ADDON_NUMBER не е дефинирана
 SumOfProductVolumes=Общ обем на продуктите
 SumOfProductWeights=Общо тегло на продуктите
diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang
index a2a308ad231..2e83457229d 100644
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Складова стойност
 UserWarehouseAutoCreate=Автоматично създаване на личен потребителски склад при създаване на потребител
 AllowAddLimitStockByWarehouse=Управляване също и на стойност за минимална и желана наличност за двойка (продукт - склад) в допълнение към стойността за минимална и желана наличност за продукт
 RuleForWarehouse=Rule for warehouses
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Склад по подразбиране
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/bg_BG/ticket.lang b/htdocs/langs/bg_BG/ticket.lang
index 196f2f14856..e1801645a17 100644
--- a/htdocs/langs/bg_BG/ticket.lang
+++ b/htdocs/langs/bg_BG/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Тикет - Видове
 TicketDictCategory=Тикет - Групи
 TicketDictSeverity=Тикет - Приоритети
 TicketDictResolution=Тикет - Решения
-TicketTypeShortBUGSOFT=Софтуерна неизправност
-TicketTypeShortBUGHARD=Хардуерна неизправност
-TicketTypeShortCOM=Търговски въпрос
 
+TicketTypeShortCOM=Търговски въпрос
 TicketTypeShortHELP=Молба за асистенция
 TicketTypeShortISSUE=Въпрос, грешка или проблем
 TicketTypeShortREQUEST=Заявка за подобрение
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Друго
 TicketSeverityShortLOW=Нисък
 TicketSeverityShortNORMAL=Нормален
 TicketSeverityShortHIGH=Висок
-TicketSeverityShortBLOCKING=Критичен
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Полето "%s" е неправилно
 MenuTicketMyAssign=Мои тикети
@@ -60,7 +58,6 @@ OriginEmail=Имейл източник
 Notify_TICKET_SENTBYMAIL=Изпращане на тикет съобщението по имейл
 
 # Status
-NotRead=Непрочетен
 Read=Прочетен
 Assigned=Възложен
 InProgress=В изпълнение
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Публичният интерфейс по
 TicketsAutoAssignTicket=Автоматично възлагане на тикета на потребителя, който го е създал
 TicketsAutoAssignTicketHelp=При създаване на тикет, той може автоматично да бъде възложен на потребителя, който го е създал.
 TicketNumberingModules=Модул за номериране на тикети
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Уведомяване на контрагента при създаване
 TicketsDisableCustomerEmail=Деактивиране на имейлите, когато тикетът е създаден от публичния интерфейс
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Статусът е променен: от %s на %s
 TicketNotNotifyTiersAtCreate=Да не се уведомява фирмата при създаване на тикета
 Unread=Непрочетен
 TicketNotCreatedFromPublicInterface=Не е налично. Тикетът не беше създаден от публичният интерфейс.
-PublicInterfaceNotEnabled=Публичният интерфейс не е активиран
 ErrorTicketRefRequired=Изисква се референтен номер на тикета
 
 #
diff --git a/htdocs/langs/bg_BG/website.lang b/htdocs/langs/bg_BG/website.lang
index 7378ad1189a..1696d94a7ad 100644
--- a/htdocs/langs/bg_BG/website.lang
+++ b/htdocs/langs/bg_BG/website.lang
@@ -30,7 +30,6 @@ EditInLine=Редактиране в движение
 AddWebsite=Добавяне на уебсайт
 Webpage=Уеб страница / контейнер
 AddPage=Добавяне на страница / контейнер
-HomePage=Начална страница
 PageContainer=Страница
 PreviewOfSiteNotYetAvailable=Преглед на вашия уебсайт <strong>%s</strong> все още не е наличен. Първо трябва да '<strong>Импортирате пълен шаблон за уебсайт</strong>' или просто да '<strong>Добавите страница / контейнер</strong>'.
 RequestedPageHasNoContentYet=Заявената страница с id %s все още няма съдържание или кеш файлът .tpl.php е бил премахнат. Редактирайте съдържанието на страницата, за да коригирате това.
@@ -101,7 +100,7 @@ EmptyPage=Празна страница
 ExternalURLMustStartWithHttp=Външният URL адрес трябва да започва с http:// или https://
 ZipOfWebsitePackageToImport=Качете Zip файла на пакета с шаблон на уебсайта
 ZipOfWebsitePackageToLoad=или Изберете наличен пакет с вграден шаблон за уебсайт
-ShowSubcontainers=Вмъкване на динамично съдържание
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Вътрешен URL адрес на страница
 ThisPageIsTranslationOf=Тази страница / контейнер е превод на
 ThisPageHasTranslationPages=Тази страница / контейнер има превод
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/bg_BG/withdrawals.lang b/htdocs/langs/bg_BG/withdrawals.lang
index 00e2744c5ba..6f07b1f1877 100644
--- a/htdocs/langs/bg_BG/withdrawals.lang
+++ b/htdocs/langs/bg_BG/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Разписки с директен дебит: %s пос
 MakeWithdrawRequest=Заявяване на плащане с директен дебит
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s заявления за плащане с директен дебит са записани
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Банков код на контрагента
 NoInvoiceCouldBeWithdrawed=Няма успешно дебитирани фактури. Проверете дали фактурите са на фирми с валиден IBAN и дали този IBAN има UMR (Unique Mandate Reference) в режим <strong>%s</strong>.
 ClassCredited=Класифициране като 'Кредитирана'
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Дата на изпълнение
 CreateForSepa=Създаване на файл с директен дебит
-ICS=Идентификатор на кредитора CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END='EndToEndId' SEPA XML таг - Уникален идентификатор, присвоен на транзакция
 USTRD='Unstructured' SEPA XML таг
 ADDDAYS=Добавяне на дни към датата на изпълнение
@@ -146,3 +148,5 @@ InfoRejectSubject=Платежното нареждане с директен д
 InfoRejectMessage=Здравейте, <br><br> Платежното нареждане с директен дебит по фактура %s, отнасящо се до фирма %s, със сума от %s е отказано от банката. <br><br>--<br>%s
 ModeWarning=Опцията за реален режим не беше зададена, спираме след тази симулация
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/bg_BG/workflow.lang b/htdocs/langs/bg_BG/workflow.lang
index ed2fb4312cf..82e4a079ac2 100644
--- a/htdocs/langs/bg_BG/workflow.lang
+++ b/htdocs/langs/bg_BG/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Автоматично създаване
 AutomaticClassification=Автоматично класифициране
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index 3211a0b62df..9e084932477 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index f1c41a3b62b..f9a6468d94a 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -56,6 +56,8 @@ 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.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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.
@@ -256,6 +257,7 @@ 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.
@@ -375,7 +377,7 @@ 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:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+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
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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
+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 the language of the third party
+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
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+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
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/bn_BD/banks.lang b/htdocs/langs/bn_BD/banks.lang
index 5cddfdaf30c..ac24131462a 100644
--- a/htdocs/langs/bn_BD/banks.lang
+++ b/htdocs/langs/bn_BD/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/bn_BD/blockedlog.lang b/htdocs/langs/bn_BD/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/bn_BD/blockedlog.lang
+++ b/htdocs/langs/bn_BD/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/bn_BD/boxes.lang b/htdocs/langs/bn_BD/boxes.lang
index d6fd298a3a7..9a751483fb1 100644
--- a/htdocs/langs/bn_BD/boxes.lang
+++ b/htdocs/langs/bn_BD/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+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.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/bn_BD/cashdesk.lang b/htdocs/langs/bn_BD/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/bn_BD/cashdesk.lang
+++ b/htdocs/langs/bn_BD/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+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
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/bn_BD/categories.lang b/htdocs/langs/bn_BD/categories.lang
index 84e5796763e..52327db3510 100644
--- a/htdocs/langs/bn_BD/categories.lang
+++ b/htdocs/langs/bn_BD/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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
diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang
index ee3854f04f8..e60b163d09f 100644
--- a/htdocs/langs/bn_BD/companies.lang
+++ b/htdocs/langs/bn_BD/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/bn_BD/compta.lang b/htdocs/langs/bn_BD/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/bn_BD/compta.lang
+++ b/htdocs/langs/bn_BD/compta.lang
@@ -111,7 +111,7 @@ 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 ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/bn_BD/cron.lang b/htdocs/langs/bn_BD/cron.lang
index d2da7ded67e..2ebdda1e685 100644
--- a/htdocs/langs/bn_BD/cron.lang
+++ b/htdocs/langs/bn_BD/cron.lang
@@ -6,14 +6,15 @@ 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
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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 environement you can use Scheduled task tools 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
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+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
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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
@@ -76,8 +78,14 @@ 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+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/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 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.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/bn_BD/exports.lang b/htdocs/langs/bn_BD/exports.lang
index 2dcf4317e00..a0eb7161ef2 100644
--- a/htdocs/langs/bn_BD/exports.lang
+++ b/htdocs/langs/bn_BD/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 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.
@@ -131,3 +133,4 @@ 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/bn_BD/mails.lang b/htdocs/langs/bn_BD/mails.lang
index 1235eef3b27..2d02c5ddcf9 100644
--- a/htdocs/langs/bn_BD/mails.lang
+++ b/htdocs/langs/bn_BD/mails.lang
@@ -92,6 +92,7 @@ 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
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index 49a5986c0df..d8cd5eaea4f 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -28,7 +28,9 @@ 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
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Value
 PersonalValue=Personal value
 NewObject=New %s
 NewValue=New value
+OldValue=Old value %s
 CurrentValue=Current value
 Code=Code
 Type=Type
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ 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
@@ -671,7 +678,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/bn_BD/modulebuilder.lang b/htdocs/langs/bn_BD/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/bn_BD/modulebuilder.lang
+++ b/htdocs/langs/bn_BD/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/bn_BD/mrp.lang b/htdocs/langs/bn_BD/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/bn_BD/mrp.lang
+++ b/htdocs/langs/bn_BD/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/bn_BD/other.lang b/htdocs/langs/bn_BD/other.lang
index 54c0572d453..7a895bb1ca5 100644
--- a/htdocs/langs/bn_BD/other.lang
+++ b/htdocs/langs/bn_BD/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index 97db059594f..9ecc11ed93d 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -108,7 +108,8 @@ 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=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index baf0ecde17f..05aa1f5a560 100644
--- a/htdocs/langs/bn_BD/projects.lang
+++ b/htdocs/langs/bn_BD/projects.lang
@@ -76,15 +76,16 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/bn_BD/recruitment.lang b/htdocs/langs/bn_BD/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/bn_BD/recruitment.lang
+++ b/htdocs/langs/bn_BD/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/bn_BD/sendings.lang b/htdocs/langs/bn_BD/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/bn_BD/sendings.lang
+++ b/htdocs/langs/bn_BD/sendings.lang
@@ -30,6 +30,7 @@ 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
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/bn_BD/stocks.lang b/htdocs/langs/bn_BD/stocks.lang
index 660443bcded..a1f55010139 100644
--- a/htdocs/langs/bn_BD/stocks.lang
+++ b/htdocs/langs/bn_BD/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/bn_BD/ticket.lang b/htdocs/langs/bn_BD/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/bn_BD/ticket.lang
+++ b/htdocs/langs/bn_BD/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/bn_BD/website.lang b/htdocs/langs/bn_BD/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/bn_BD/website.lang
+++ b/htdocs/langs/bn_BD/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/bn_BD/withdrawals.lang b/htdocs/langs/bn_BD/withdrawals.lang
index a80c1865a0a..0e84cc071d2 100644
--- a/htdocs/langs/bn_BD/withdrawals.lang
+++ b/htdocs/langs/bn_BD/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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/bn_BD/workflow.lang b/htdocs/langs/bn_BD/workflow.lang
index 299be277e1d..494a0424a75 100644
--- a/htdocs/langs/bn_BD/workflow.lang
+++ b/htdocs/langs/bn_BD/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/bn_IN/accountancy.lang b/htdocs/langs/bn_IN/accountancy.lang
index 3211a0b62df..9e084932477 100644
--- a/htdocs/langs/bn_IN/accountancy.lang
+++ b/htdocs/langs/bn_IN/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/bn_IN/admin.lang b/htdocs/langs/bn_IN/admin.lang
index f1c41a3b62b..f9a6468d94a 100644
--- a/htdocs/langs/bn_IN/admin.lang
+++ b/htdocs/langs/bn_IN/admin.lang
@@ -56,6 +56,8 @@ 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.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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.
@@ -256,6 +257,7 @@ 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.
@@ -375,7 +377,7 @@ 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:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+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
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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
+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 the language of the third party
+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
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+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
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/bn_IN/banks.lang b/htdocs/langs/bn_IN/banks.lang
index 9500a5b8b2e..81a23238550 100644
--- a/htdocs/langs/bn_IN/banks.lang
+++ b/htdocs/langs/bn_IN/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/bn_IN/blockedlog.lang b/htdocs/langs/bn_IN/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/bn_IN/blockedlog.lang
+++ b/htdocs/langs/bn_IN/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/bn_IN/boxes.lang b/htdocs/langs/bn_IN/boxes.lang
index d6fd298a3a7..9a751483fb1 100644
--- a/htdocs/langs/bn_IN/boxes.lang
+++ b/htdocs/langs/bn_IN/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+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.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/bn_IN/cashdesk.lang b/htdocs/langs/bn_IN/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/bn_IN/cashdesk.lang
+++ b/htdocs/langs/bn_IN/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+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
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/bn_IN/categories.lang b/htdocs/langs/bn_IN/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/bn_IN/categories.lang
+++ b/htdocs/langs/bn_IN/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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
diff --git a/htdocs/langs/bn_IN/companies.lang b/htdocs/langs/bn_IN/companies.lang
index dadff6a7894..8dc815b522e 100644
--- a/htdocs/langs/bn_IN/companies.lang
+++ b/htdocs/langs/bn_IN/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/bn_IN/compta.lang b/htdocs/langs/bn_IN/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/bn_IN/compta.lang
+++ b/htdocs/langs/bn_IN/compta.lang
@@ -111,7 +111,7 @@ 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 ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/bn_IN/cron.lang b/htdocs/langs/bn_IN/cron.lang
index 1de1251831a..2ebdda1e685 100644
--- a/htdocs/langs/bn_IN/cron.lang
+++ b/htdocs/langs/bn_IN/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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
@@ -46,6 +47,7 @@ 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
@@ -56,7 +58,7 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
@@ -82,3 +84,8 @@ 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/bn_IN/errors.lang b/htdocs/langs/bn_IN/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/bn_IN/errors.lang
+++ b/htdocs/langs/bn_IN/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 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.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/bn_IN/exports.lang b/htdocs/langs/bn_IN/exports.lang
index 3549e3f8b23..a0eb7161ef2 100644
--- a/htdocs/langs/bn_IN/exports.lang
+++ b/htdocs/langs/bn_IN/exports.lang
@@ -133,3 +133,4 @@ 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/bn_IN/mails.lang b/htdocs/langs/bn_IN/mails.lang
index 1235eef3b27..2d02c5ddcf9 100644
--- a/htdocs/langs/bn_IN/mails.lang
+++ b/htdocs/langs/bn_IN/mails.lang
@@ -92,6 +92,7 @@ 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
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/bn_IN/main.lang b/htdocs/langs/bn_IN/main.lang
index 96c68cdcfa3..f8ba6f4073c 100644
--- a/htdocs/langs/bn_IN/main.lang
+++ b/htdocs/langs/bn_IN/main.lang
@@ -28,7 +28,9 @@ 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
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Value
 PersonalValue=Personal value
 NewObject=New %s
 NewValue=New value
+OldValue=Old value %s
 CurrentValue=Current value
 Code=Code
 Type=Type
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ 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
@@ -671,7 +678,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/bn_IN/modulebuilder.lang b/htdocs/langs/bn_IN/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/bn_IN/modulebuilder.lang
+++ b/htdocs/langs/bn_IN/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/bn_IN/mrp.lang b/htdocs/langs/bn_IN/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/bn_IN/mrp.lang
+++ b/htdocs/langs/bn_IN/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/bn_IN/other.lang b/htdocs/langs/bn_IN/other.lang
index 54c0572d453..7a895bb1ca5 100644
--- a/htdocs/langs/bn_IN/other.lang
+++ b/htdocs/langs/bn_IN/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/bn_IN/products.lang b/htdocs/langs/bn_IN/products.lang
index 97db059594f..9ecc11ed93d 100644
--- a/htdocs/langs/bn_IN/products.lang
+++ b/htdocs/langs/bn_IN/products.lang
@@ -108,7 +108,8 @@ 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=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/bn_IN/projects.lang b/htdocs/langs/bn_IN/projects.lang
index baf0ecde17f..05aa1f5a560 100644
--- a/htdocs/langs/bn_IN/projects.lang
+++ b/htdocs/langs/bn_IN/projects.lang
@@ -76,15 +76,16 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/bn_IN/recruitment.lang b/htdocs/langs/bn_IN/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/bn_IN/recruitment.lang
+++ b/htdocs/langs/bn_IN/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/bn_IN/sendings.lang b/htdocs/langs/bn_IN/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/bn_IN/sendings.lang
+++ b/htdocs/langs/bn_IN/sendings.lang
@@ -30,6 +30,7 @@ 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
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/bn_IN/stocks.lang b/htdocs/langs/bn_IN/stocks.lang
index 660443bcded..a1f55010139 100644
--- a/htdocs/langs/bn_IN/stocks.lang
+++ b/htdocs/langs/bn_IN/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/bn_IN/ticket.lang b/htdocs/langs/bn_IN/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/bn_IN/ticket.lang
+++ b/htdocs/langs/bn_IN/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/bn_IN/website.lang b/htdocs/langs/bn_IN/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/bn_IN/website.lang
+++ b/htdocs/langs/bn_IN/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/bn_IN/withdrawals.lang b/htdocs/langs/bn_IN/withdrawals.lang
index 114a8d9dd6c..059b3451c11 100644
--- a/htdocs/langs/bn_IN/withdrawals.lang
+++ b/htdocs/langs/bn_IN/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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/bn_IN/workflow.lang b/htdocs/langs/bn_IN/workflow.lang
index 299be277e1d..494a0424a75 100644
--- a/htdocs/langs/bn_IN/workflow.lang
+++ b/htdocs/langs/bn_IN/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index 27f2742906e..6a1143bab46 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=This service
 ThisProduct=Ovaj proizvod
 DefaultForService=Default for service
 DefaultForProduct=Pretpostavljeno za proizvod
+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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Nije izmireno
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index 4149ca416ca..8edb636b439 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Prikaz
 SetupArea=Postavke
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Forma za testiranje uploada fajlova (prema postavkama)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Prikaži pretpregled
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Pretpregled nije moguć
 ThemeCurrentlyActive=Trenutno aktivna tema
-CurrentTimeZone=Vremenska zona PHP (servera)
 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=Razmak
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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.
@@ -256,6 +257,7 @@ 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.
@@ -375,7 +377,7 @@ 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:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+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
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Optimizacija pretraživanja
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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
+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 the language of the third party
+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
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+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
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang
index 696a6ff35f6..9b7547ab933 100644
--- a/htdocs/langs/bs_BA/banks.lang
+++ b/htdocs/langs/bs_BA/banks.lang
@@ -173,10 +173,11 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=Vaš SEPA mandat
 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/bs_BA/blockedlog.lang b/htdocs/langs/bs_BA/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/bs_BA/blockedlog.lang
+++ b/htdocs/langs/bs_BA/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/bs_BA/boxes.lang b/htdocs/langs/bs_BA/boxes.lang
index 7106f0a31c4..706ce4969d7 100644
--- a/htdocs/langs/bs_BA/boxes.lang
+++ b/htdocs/langs/bs_BA/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Posljednjih %s izmijenjenih donacija
 BoxTitleLastModifiedExpenses=Posljednjih %s izmijenjenih troškovnika
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Globalne aktivnosti (fakture, prijedlozi, narudžbe)
 BoxGoodCustomers=Dobar kupac
 BoxTitleGoodCustomers=%s dobrih kupaca
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Posljednji datum ažuriranja
 NoRecordedBookmarks=Nema definisanih bookmark-a.
@@ -92,8 +95,8 @@ LastXMonthRolling=Posljednje %s mjesečne plate
 ChooseBoxToAdd=Dodaj kutijicu na vašu nadzornu ploču
 BoxAdded=Kutijica je dodana na vašu nadzornu ploču
 BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Računovodstvo
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/bs_BA/cashdesk.lang b/htdocs/langs/bs_BA/cashdesk.lang
index b0ffb1d3f05..6ae6a2bda91 100644
--- a/htdocs/langs/bs_BA/cashdesk.lang
+++ b/htdocs/langs/bs_BA/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Broj faktura
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/bs_BA/categories.lang b/htdocs/langs/bs_BA/categories.lang
index 0672e7c4bc7..68923ab7d34 100644
--- a/htdocs/langs/bs_BA/categories.lang
+++ b/htdocs/langs/bs_BA/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Spisak oznaka proizvoda/kategorija
 CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index f1b1949d9a9..b199c6e0fce 100644
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potencijal
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index 90a8289d2d9..233903b0bfe 100644
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -111,7 +111,7 @@ 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 ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/bs_BA/cron.lang b/htdocs/langs/bs_BA/cron.lang
index 32e49dd3bde..cb278ba6885 100644
--- a/htdocs/langs/bs_BA/cron.lang
+++ b/htdocs/langs/bs_BA/cron.lang
@@ -6,14 +6,15 @@ 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
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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=Sigurnosni ključ za URL za pokretanje cron poslova
 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 environement you can use Scheduled task tools 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
@@ -42,10 +43,11 @@ CronModule=Modul
 CronNoJobs=Nema registrovanih poslova
 CronPriority=Prioritet
 CronLabel=Oznaka
-CronNbRun=Broj pokretanja
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Dodaj posao
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Komentar
 CronFieldMandatory=Polja %s su obavezna
 CronErrEndDateStartDt=Datum završetka ne može biti prije datuma početka
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Iskljući
 CronTaskInactive=This job is disabled
 CronId=ID
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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=Sistemska komanda za izvršenje
 CronCreateJob=Create new Scheduled Job
 CronFrom=Od
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Shell komanda
 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+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/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index d3460403a51..e2d3b3e5347 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s je pogrešan
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Prijava %s već postoji.
 ErrorGroupAlreadyExists=Grupa %s već postoji.
 ErrorRecordNotFound=Zapis nije pronađen.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/bs_BA/exports.lang b/htdocs/langs/bs_BA/exports.lang
index c1e9cc4b30f..30e7e97e5a5 100644
--- a/htdocs/langs/bs_BA/exports.lang
+++ b/htdocs/langs/bs_BA/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 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.
@@ -131,3 +133,4 @@ 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/bs_BA/mails.lang b/htdocs/langs/bs_BA/mails.lang
index 93bde73c33f..a9adc014ec8 100644
--- a/htdocs/langs/bs_BA/mails.lang
+++ b/htdocs/langs/bs_BA/mails.lang
@@ -92,6 +92,7 @@ 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=Linija %s u fajlu
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifikacije
-NoNotificationsWillBeSent=Nema planiranih email notifikacija za ovaj događaj i kompaniju
-ANotificationsWillBeSent=1 notifikacija će biti poslana emailom
-SomeNotificationsWillBeSent=%s notifikacija će biti poslane emailom
-AddNewNotification=Activate a new email notification target
-ListOfActiveNotifications=List all active targets for email notification
-ListOfNotificationsDone=Lista svih notifikacija o slanju emaila
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Inromacije
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 53577a4ab73..fb1c15f2bfd 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Šablon za ovu vrstu emaila nije dostupan
 AvailableVariables=Dostupne zamjenske varijable
 NoTranslation=Nema prevoda
 Translation=Prevod
+CurrentTimeZone=Vremenska zona PHP (servera)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Nije pronađen zapis
 NoRecordDeleted=Nijedan zapis nije obrisan
 NotEnoughDataYet=Nema dovoljno podataka
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Unos spremljen
 RecordDeleted=Unos obrisan
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Vrijednost
 PersonalValue=Lična vrijednost
 NewObject=Novi %s
 NewValue=Nova vrijednost
+OldValue=Old value %s
 CurrentValue=Trenutna vrijednost
 Code=Kod
 Type=Tip
@@ -433,6 +438,7 @@ RemainToPay=Preostalo za platiti
 Module=Modul/aplikacija
 Modules=Moduli/aplikacije
 Option=Opcija
+Filters=Filters
 List=Spisak
 FullList=Potpuni spisak
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ SupplierPreview=Pregled prodavača
 ShowCustomerPreview=Pokaži sažetak kupca
 ShowSupplierPreview=Pokaži pregled prodavača
 RefCustomer=Ref. kupca
+InternalRef=Internal ref.
 Currency=valuta
 InfoAdmin=Informacije za administratore
 Undo=vrati
@@ -671,7 +678,7 @@ SendMail=Pošalji e-mail
 Email=email
 NoEMail=nema emaila
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=Nema broj mobitela
 Owner=Vlasnik
 FollowingConstantsWillBeSubstituted=Sljedeće konstante će se zamijeniti sa odgovarajućim vrijednostima.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/bs_BA/modulebuilder.lang b/htdocs/langs/bs_BA/modulebuilder.lang
index db704769abd..9281e1f7849 100644
--- a/htdocs/langs/bs_BA/modulebuilder.lang
+++ b/htdocs/langs/bs_BA/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/bs_BA/mrp.lang b/htdocs/langs/bs_BA/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/bs_BA/mrp.lang
+++ b/htdocs/langs/bs_BA/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
index 024bf6013d5..26ece215614 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 23be1f760b5..467e9f62b86 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -108,7 +108,8 @@ 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=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 2a1023dec52..ed058b147fe 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -76,15 +76,16 @@ MyActivities=Moji zadaci/aktivnosti
 MyProjects=Moji projekti
 MyProjectsArea=My projects Area
 DurationEffective=Efektivno trajanje
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Vrijeme
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/bs_BA/recruitment.lang b/htdocs/langs/bs_BA/recruitment.lang
index 1d485508eff..a2e64d9e81f 100644
--- a/htdocs/langs/bs_BA/recruitment.lang
+++ b/htdocs/langs/bs_BA/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/bs_BA/sendings.lang b/htdocs/langs/bs_BA/sendings.lang
index dfae5d3a8a8..1fc121104eb 100644
--- a/htdocs/langs/bs_BA/sendings.lang
+++ b/htdocs/langs/bs_BA/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Druge pošiljke za ovu narudžbu
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Pošiljke za potvrditi
 StatusSendingCanceled=Otkazano
+StatusSendingCanceledShort=Otkazan
 StatusSendingDraft=Nacrt
 StatusSendingValidated=Potvrđeno (proizvodi za slanje ili već poslano)
 StatusSendingProcessed=Obrađeno
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Suma količina proizvoda
 SumOfProductWeights=Suma težina proizvoda
diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
index 9dbb5dd7df2..3549cc9c195 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Skladišna vrijednost
 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Glavno skladište
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/bs_BA/ticket.lang b/htdocs/langs/bs_BA/ticket.lang
index c93c3a3c59e..fd582550e54 100644
--- a/htdocs/langs/bs_BA/ticket.lang
+++ b/htdocs/langs/bs_BA/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Ostalo
 TicketSeverityShortLOW=Nizak potencijal
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Veliki potencijal
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Pročitaj
 Assigned=Assigned
 InProgress=U toku
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/bs_BA/website.lang b/htdocs/langs/bs_BA/website.lang
index 8aa0ca84eb0..aa90f42f735 100644
--- a/htdocs/langs/bs_BA/website.lang
+++ b/htdocs/langs/bs_BA/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Stranica
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/bs_BA/withdrawals.lang b/htdocs/langs/bs_BA/withdrawals.lang
index ae61a690ede..67fafcf5faa 100644
--- a/htdocs/langs/bs_BA/withdrawals.lang
+++ b/htdocs/langs/bs_BA/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Označi na potraživanja
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Datum izvršenja
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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/bs_BA/workflow.lang b/htdocs/langs/bs_BA/workflow.lang
index 81f8088f74d..713199e5ec9 100644
--- a/htdocs/langs/bs_BA/workflow.lang
+++ b/htdocs/langs/bs_BA/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index 6146dd28e9f..de5dd2c6a24 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=Aquest servei
 ThisProduct=Aquest producte
 DefaultForService=Defecte per al servei
 DefaultForProduct=Defecte per al producte
+ProductForThisThirdparty=Producte per a aquest tercer
+ServiceForThisThirdparty=Servei per a aquest tercer
 CantSuggest=No es pot suggerir
 AccountancySetupDoneFromAccountancyMenu=La major part de la configuració de la comptabilitat es realitza des del menú %s
 ConfigAccountingExpert=Configuració del mòdul de comptabilitat (doble entrada)
@@ -31,7 +33,7 @@ AssignDedicatedAccountingAccount=Compte nou per a assignar
 InvoiceLabel=Etiqueta de factura
 OverviewOfAmountOfLinesNotBound=Vista general de la quantitat de línies no comptabilitzades en un compte comptable
 OverviewOfAmountOfLinesBound=Vista general de la quantitat de línies ja comptabilitzades en un compte comptable
-OtherInfo=Altra informació
+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
@@ -46,8 +48,9 @@ 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 i PDF) que es van utilitzar per generar la vostra comptabilitat. Per exportar els vostres diaris, utilitzeu l’entrada de menú %s - %s.
+ExportAccountingSourceDocHelp=Amb aquesta eina, podeu exportar els esdeveniments d'origen (llista i PDF) que es van utilitzar per a generar la vostra comptabilitat. Per a exportar els vostres diaris, utilitzeu l’entrada de menú %s - %s.
 VueByAccountAccounting=Veure per compte comptable
+VueBySubAccountAccounting=Veure-ho per subcomptes comptables
 
 MainAccountForCustomersNotDefined=Compte comptable per a clients no definida en la configuració
 MainAccountForSuppliersNotDefined=Compte comptable principal per a proveïdors no definit a la configuració
@@ -58,12 +61,12 @@ MainAccountForSubscriptionPaymentNotDefined=Compte comptable per a IVA no defini
 AccountancyArea=Àrea de comptabilitat
 AccountancyAreaDescIntro=L'ús del mòdul de comptabilitat es realitza en diverses etapes:
 AccountancyAreaDescActionOnce=Les següents accions s'executen normalment per una sola vegada, o un cop l'any ...
-AccountancyAreaDescActionOnceBis=Els passos següents s'han de fer per a estalviar-vos temps en el futur suggerint-vos el compte comptable per defecte correcte al fer els diaris (escriptura dels registres en els diaris i Llibre Major)
+AccountancyAreaDescActionOnceBis=Cal fer els passos següents per a estalviar-vos temps en el futur, suggerint-vos el compte comptable per defecte correcte quan feu els diaris (escriptura dels registres en els Diaris i Llibre major)
 AccountancyAreaDescActionFreq=Les següents accions s'executen normalment cada mes, setmana o dia per empreses molt grans ...
 
 AccountancyAreaDescJournalSetup=PAS %s: Crea o consulta el contingut dels teus diaris des del menú %s
 AccountancyAreaDescChartModel=PAS %s: Comproveu que existeix un model de pla comptable o creeu-ne un des del menú %s
-AccountancyAreaDescChart=PAS %s: Seleccioneu i/o completeu el vostre pla comptable al menú %s
+AccountancyAreaDescChart=PAS %s: Seleccioneu o completeu el vostre pla comptable al menú %s
 
 AccountancyAreaDescVat=PAS %s: Defineix comptes comptables per cada tipus d'IVA. Per això, utilitzeu l'entrada del menú %s.
 AccountancyAreaDescDefault=PAS %s: Definiu comptes comptables per defecte. Per a això, utilitzeu l'entrada de menú %s.
@@ -144,24 +147,24 @@ NotVentilatedinAccount=No vinculat al compte comptable
 XLineSuccessfullyBinded=%s productes/serveis vinculats amb èxit a un compte comptable
 XLineFailedToBeBinded=%s de productes/serveis no comptabilitzats en cap compte comptable
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre d'elements a vincular mostrats per pàgina (màxim recomanat: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comença l'ordenació de la pàgina "Comptabilització per fer" pels elements més recents
+ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre màxim de línies en llistes per pàgina (recomanat: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comença l'ordenació de la pàgina "Comptabilització per a fer" pels elements més recents
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comença l'ordenació de la pàgina "Comptabilització realitzada" pels elements més recents
 
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar descripcions de producte i serveis en llistes de x caràcters (Millor = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncar descripcions de comptes de producte i serveis en llistes de x caràcters (Millor = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Longitud dels comptes generals (Si s'estableix el valor a 6 aquí, el compte '706' apareixerà com '706000' a la pantalla)
-ACCOUNTING_LENGTH_AACCOUNT=Longitud dels subcomptes (Si s'estableix el valor a 6 aquí, el compte '401' apareixerà com '401000' a la pantalla)
-ACCOUNTING_MANAGE_ZERO=Gestiona un nombre diferent de zero al final d'un compte comptable. Necessària per alguns països (com Suïssa). Si es manté apagat (per defecte), pot configurar els següents 2 paràmetres per a demanar a l'aplicació afegir un zero virtual.
-BANK_DISABLE_DIRECT_INPUT=Des-habilitar l'enregistrament directe de transaccions al compte bancari 
+ACCOUNTING_LENGTH_GACCOUNT=Longitud dels comptes generals (Si s'estableix el valor a 6 aquí, el compte «706» apareixerà com «706000» a la pantalla)
+ACCOUNTING_LENGTH_AACCOUNT=Longitud dels subcomptes (Si s'estableix el valor a 6 aquí, el compte «401» apareixerà com «401000» a la pantalla)
+ACCOUNTING_MANAGE_ZERO=Gestiona un nombre diferent de zero al final d'un compte comptable. És necessari per a alguns països (com Suïssa). Si es manté apagat (per defecte), podeu configurar els següents dos paràmetres per a demanar a l'aplicació d'afegir zeros virtuals.
+BANK_DISABLE_DIRECT_INPUT=Desactiva el registre directe de transaccions al compte bancari
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilita l'exportació d'esborrany en el diari
 ACCOUNTANCY_COMBO_FOR_AUX=Activa la llista de combo per al compte subsidiari (pot ser lent si tens molts tercers)
-ACCOUNTING_DATE_START_BINDING=Definiu una data per començar la vinculació i transferència a la comptabilitat. Per sota d’aquesta data, les transaccions no es transferiran a la comptabilitat.
+ACCOUNTING_DATE_START_BINDING=Definiu una data per a començar la vinculació i transferència a la comptabilitat. Per sota d’aquesta data, les transaccions no es transferiran a la comptabilitat.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=En el cas de transferència de comptabilitat, seleccioneu el període a mostrar per defecte
 
 ACCOUNTING_SELL_JOURNAL=Diari de venda
 ACCOUNTING_PURCHASE_JOURNAL=Diari de compra
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Diari varis
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Diaris varis
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Diari de l'informe de despeses
 ACCOUNTING_SOCIAL_JOURNAL=Diari social
 ACCOUNTING_HAS_NEW_JOURNAL=Té un nou Diari
@@ -177,7 +180,7 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Compte comptable d'espera
 DONATION_ACCOUNTINGACCOUNT=Compte comptable per a registrar les donacions
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Compte comptable per a registrar les donacions
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Compte comptable per defecte per registrar el dipòsit del client
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Compte comptable per defecte per a registrar el dipòsit del client
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte comptable per defecte per als productes comprats (utilitzat si no es defineix en el producte)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Compte de comptabilitat per defecte dels productes comprats a la CEE (utilitzat si no està definit a la taula de productes)
@@ -198,7 +201,8 @@ Docdate=Data
 Docref=Referència
 LabelAccount=Etiqueta de compte
 LabelOperation=Etiqueta de l'operació
-Sens=Significat
+Sens=Direcció
+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 un pagament que feu
 LetteringCode=Codi de retolació
 Lettering=Lletres
 Codejournal=Diari
@@ -206,8 +210,9 @@ JournalLabel=Títol de Diari
 NumPiece=Número de peça
 TransactionNumShort=Número de transacció
 AccountingCategory=Grups personalitzats
-GroupByAccountAccounting=Agrupar per compte comptable
-AccountingAccountGroupsDesc=Pots definir aquí alguns grups de compte comptable. S'utilitzaran per a informes comptables personalitzats.
+GroupByAccountAccounting=Agrupa per compte major
+GroupBySubAccountAccounting=Agrupa per subcompte comptable
+AccountingAccountGroupsDesc=Podeu definir aquí alguns grups de comptes comptables. S'utilitzaran per a informes comptables personalitzats.
 ByAccounts=Per comptes
 ByPredefinedAccountGroups=Per grups predefinits
 ByPersonalizedAccountGroups=Per grups personalitzats
@@ -216,14 +221,14 @@ NotMatch=No definit
 DeleteMvt=Elimina algunes línies d'operació de la comptabilitat
 DelMonth=Mes a eliminar
 DelYear=Any a eliminar
-DelJournal=Diari per esborrar
-ConfirmDeleteMvt=Això suprimirà totes les línies d'operació de la comptabilitat de l'any/mes i/o d'un diari específic (cal un criteri com a mínim). Haureu de tornar a utilitzar la funció '%s' per a que el registre suprimit torni al llibre major.
+DelJournal=Diari per a suprimir
+ConfirmDeleteMvt=Això suprimirà totes les línies d'operació de la comptabilitat de l'any/mes o d'un diari específic (cal un criteri com a mínim). Haureu d'utilitzar la funció «%s» per a tornar a tenir el registre suprimit al llibre major.
 ConfirmDeleteMvtPartial=Això suprimirà la transacció de la comptabilitat (se suprimiran totes les línies d’operació relacionades amb la mateixa transacció)
 FinanceJournal=Diari de finances
 ExpenseReportsJournal=Informe-diari de despeses
-DescFinanceJournal=Finance journal including all the types of payments by bank account
+DescFinanceJournal=Diari financer que inclou tots els tipus de pagaments per compte bancari
 DescJournalOnlyBindedVisible=Aquesta és una vista de registre que està vinculada a un compte comptable i que es pot registrar als diaris i llibres majors.
-VATAccountNotDefined=Comptes comptables de IVA sense definir
+VATAccountNotDefined=Comptes comptables d'IVA sense definir
 ThirdpartyAccountNotDefined=Comptes comptables de tercers (clients o proveïdors) sense definir
 ProductAccountNotDefined=Comptes comptables per al producte sense definir
 FeeAccountNotDefined=Compte per tarifa no definit
@@ -248,10 +253,10 @@ PaymentsNotLinkedToProduct=Pagament no vinculat a cap producte / servei
 OpeningBalance=Saldo d'obertura
 ShowOpeningBalance=Mostra el saldo d'obertura
 HideOpeningBalance=Amagueu el balanç d'obertura
-ShowSubtotalByGroup=Mostrar subtotals per grup
+ShowSubtotalByGroup=Mostra el subtotal per nivell
 
 Pcgtype=Grup de compte
-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 de comptabilitat de productes per crear l'informe de despeses / ingressos.
+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
 
@@ -259,7 +264,7 @@ TotalVente=Total turnover before tax
 TotalMarge=Marge total de vendes
 
 DescVentilCustomer=Consulti aquí la llista de línies de factures de client vinculades (o no) a comptes comptables de producte
-DescVentilMore=En la majoria dels casos, si tu utilitzes productes o serveis predefinits i poses el número de compte a la fitxa de producte/servei, l'aplicació serà capaç de fer tots els vincles entre les línies de factura i els comptes comptables del teu pla comptable, només amb un clic mitjançant el botó <strong>"%s"</strong>. Si el compte no està col·locat  a la fitxa del producte/servei o si encara hi ha alguna línia no vinculada a cap compte, hauràs de fer una vinculació manual a partir del menú "<strong>%s</strong>".
+DescVentilMore=En la majoria dels casos, si utilitzeu productes o serveis predefinits i poses el número de compte a la fitxa de producte/servei, l'aplicació serà capaç de fer tots els vincles entre les línies de factura i els comptes comptables del vostre pla comptable, només amb un clic mitjançant el botó <strong>«%s»</strong>. Si el compte no està col·locat a la fitxa del producte/servei o si encara hi ha alguna línia no vinculada a cap compte, haureu de fer una vinculació manual a partir del menú «<strong>%s</strong>».
 DescVentilDoneCustomer=Consulta aquí la llista de línies de factures a clients i els seus comptes comptables de producte
 DescVentilTodoCustomer=Comptabilitza les línies de factura encara no comptabilitzades amb un compte comptable de producte
 ChangeAccount=Canvia el compte comptable de producte/servei per les línies seleccionades amb el següent compte comptable:
@@ -268,14 +273,16 @@ DescVentilSupplier=Consulteu aquí la llista de les línies de facturació dels
 DescVentilDoneSupplier=Consulteu aquí la llista de les línies de venedors de factures i el seu compte comptable
 DescVentilTodoExpenseReport=Línies d'informes de despeses comptabilitzades encara no comptabilitzades amb un compte comptable de tarifa
 DescVentilExpenseReport=Consulteu aquí la llista de les línies d'informe de despeses vinculada (o no) a un compte comptable corresponent a tarifa
-DescVentilExpenseReportMore=Si tu poses el compte comptable sobre les línies de l'informe per tipus de despesa, l'aplicació serà capaç de fer tots els vincles entre les línies de l'informe i els comptes comptables del teu pla comptable, només amb un clic amb el botó <strong>"%s"</strong>. Si el compte no estava al diccionari de tarifes o si encara hi ha línies no vinculades a cap compte, hauràs de fer-ho manualment a partir del menú "<strong>%s</strong>".
+DescVentilExpenseReportMore=Si poseu el compte comptable sobre les línies de l'informe per tipus de despesa, l'aplicació serà capaç de fer tots els vincles entre les línies de l'informe i els comptes comptables del vostre pla comptable, només amb un clic amb el botó <strong>«%s»</strong>. Si el compte no estava al diccionari de tarifes o si encara hi ha línies no vinculades a cap compte, haureu de fer-ho manualment a partir del menú «<strong>%s</strong>».
 DescVentilDoneExpenseReport=Consulteu aquí la llista de les línies d'informes de despeses i el seu compte comptable de comissions
 
-DescClosure=Consulteu aquí el nombre de moviments per mes que no són validats i els exercicis ja oberts
+Closure=Tancament anual
+DescClosure=Consulteu aquí el nombre de moviments mensuals que no estan validats i els exercicis fiscals encara oberts
 OverviewOfMovementsNotValidated=Pas 1 / Visió general dels moviments no validats. (Cal tancar un exercici)
+AllMovementsWereRecordedAsValidated=Tots els moviments es van registrar com a validats
+NotAllMovementsCouldBeRecordedAsValidated=No es poden registrar tots els moviments com a validats
 ValidateMovements=Valida moviments
 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
-SelectMonthAndValidate=Selecciona el mes i valida els moviments
 
 ValidateHistory=Comptabilitza automàticament
 AutomaticBindingDone=Comptabilització automàtica realitzada
@@ -293,6 +300,7 @@ Accounted=Comptabilitzat en el llibre major
 NotYetAccounted=Encara no comptabilitzat en el llibre major
 ShowTutorial=Mostrar Tutorial
 NotReconciled=No conciliat
+WarningRecordWithoutSubledgerAreExcluded=Advertiment: totes les operacions sense subcompte comptable definit es filtren i s'exclouen d'aquesta vista
 
 ## Admin
 BindingOptions=Opcions d'enquadernació
@@ -320,7 +328,7 @@ 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
-ExportDraftJournal=Exportar esborranys del llibre 
+ExportDraftJournal=Exporta els esborranys del llibre
 Modelcsv=Model d'exportació
 Selectmodelcsv=Selecciona un model d'exportació
 Modelcsv_normal=Exportació clàssica
@@ -337,6 +345,7 @@ Modelcsv_LDCompta10=Exportar per LD Compta (v10 i més)
 Modelcsv_openconcerto=Exporta per a OpenConcerto (Test)
 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=Exportar Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Exporta per a Gestinum (v3)
@@ -345,13 +354,13 @@ ChartofaccountsId=Id pla comptable
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Inicialitza la comptabilitat
-InitAccountancyDesc=Aquesta pàgina es pot utilitzar per inicialitzar un compte de comptabilitat en productes i serveis que no tenen compte comptable definit per a vendes i compres.
-DefaultBindingDesc=Aquesta pàgina es pot utilitzar per establir un compte predeterminat que s'utilitzarà per enllaçar el registre de transaccions sobre el pagament de salaris, donacions, impostos i IVA quan encara no s'hagi establert cap compte comptable específic.
-DefaultClosureDesc=Aquesta pàgina es pot utilitzar per definir els paràmetres usats per als tancaments de comptabilitat.
+InitAccountancyDesc=Aquesta pàgina es pot utilitzar per a inicialitzar un compte comptable de productes i serveis que no tenen un compte comptable definit per a vendes i compres.
+DefaultBindingDesc=Aquesta pàgina es pot utilitzar per a establir un compte predeterminat que s'utilitzarà per a enllaçar el registre de transaccions sobre el pagament de salaris, donacions, impostos i IVA quan encara no s'hagi establert cap compte comptable específic.
+DefaultClosureDesc=Aquesta pàgina es pot utilitzar per a definir els paràmetres utilitzats per als tancaments de comptabilitat.
 Options=Opcions
-OptionModeProductSell=En mode vendes
-OptionModeProductSellIntra=Les vendes de mode exportades a la CEE
-OptionModeProductSellExport=Les vendes de mode exportades a altres països
+OptionModeProductSell=Modalitat de vendes
+OptionModeProductSellIntra=Modalitats de vendes exportades a la CEE
+OptionModeProductSellExport=Modalitats de vendes exportades a altres països
 OptionModeProductBuy=En mode compres
 OptionModeProductBuyIntra=Mode compres importades a la CEE
 OptionModeProductBuyExport=Mode compres importades de fora la CEE
@@ -372,7 +381,7 @@ SaleLocal=Venda local
 SaleExport=Venda d’exportació
 SaleEEC=Venda en CEE
 SaleEECWithVAT=Venda a la CEE amb un IVA que no és nul, per la qual cosa suposem que NO es tracta d’una venda intracomunitària i el compte suggerit és el compte estàndard del producte.
-SaleEECWithoutVATNumber=Venda a la CEE sense IVA però l’identificador d’IVA d'aquest tercer no està definit. Així que s'ha emprat el compte del producte per a vendes estàndard. Podeu corregir l’identificador d’IVA d'aquest tercer o el compte del producte si cal.
+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.
 
 ## Dictionary
 Range=Rang de compte comptable
@@ -389,7 +398,7 @@ BookeppingLineAlreayExists=Les línies ja existeixen en la comptabilitat
 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 fer l'enllaç manualment
+UseMenuToSetBindindManualy=Línies encara no enllaçades, utilitzeu el menú <a href="%s"> %s </a> per a fer l'enllaç manualment
 
 ## Import
 ImportAccountingEntries=Entrades de comptabilitat
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 7d1f089796c..552135eda7c 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -2,7 +2,7 @@
 Foundation=Entitat
 Version=Versió
 Publisher=Publicador
-VersionProgram=Versió programa
+VersionProgram=Versió del programa
 VersionLastInstall=Versió d'instal·lació inicial
 VersionLastUpgrade=Versió de l'última actualització
 VersionExperimental=Experimental
@@ -10,7 +10,7 @@ VersionDevelopment=Desenvolupament
 VersionUnknown=Desconeguda
 VersionRecommanded=Recomanada
 FileCheck=Comprovador d'integritat de fitxers
-FileCheckDesc=Aquesta eina et permet comprovar la integritat dels fitxers i la configuració de la vostra aplicació, comparant cada fitxer amb l'oficial. També es pot comprovar el valor d'algunes constants de configuració. Pots utilitzar aquesta eina per determinar si s'han modificat fitxers (per exemple, per un hacker).
+FileCheckDesc=Aquesta eina us permet comprovar la integritat dels fitxers i la configuració de la vostra aplicació, comparant cada fitxer amb l'oficial. També es pot comprovar el valor d'algunes constants de configuració. Podeu utilitzar aquesta eina per a determinar si s'han modificat fitxers (per exemple, per un hacker).
 FileIntegrityIsStrictlyConformedWithReference=La integritat dels arxius està estrictament conforme amb la referència.
 FileIntegrityIsOkButFilesWereAdded=La comprovació de la integritat dels arxius ha resultat exitosa, no obstant s'han afegit alguns arxius nous.
 FileIntegritySomeFilesWereRemovedOrModified=La comprovació d'integritat d'arxius ha fallat. Alguns arxius han sigut modificats, eliminats o afegits.
@@ -22,7 +22,7 @@ FilesMissing=Arxius que falten
 FilesUpdated=Arxius actualitzats
 FilesModified=Fitxers modificats
 FilesAdded=Fitxers afegits
-FileCheckDolibarr=Comprovar l'integritat dels arxius de l'aplicació
+FileCheckDolibarr=Comprova la integritat dels fitxers de l'aplicació
 AvailableOnlyOnPackagedVersions=El fitxer local per a la comprovació d'integritat només està disponible quan l'aplicació està instal·lada des d'un paquet oficial
 XmlNotFound=No es troba l'arxiu xml
 SessionId=ID de sessió
@@ -32,7 +32,7 @@ PurgeSessions=Purga de sessions
 ConfirmPurgeSessions=Estàs segur de voler purgar totes les sessions? Es desconnectaran tots els usuaris (excepte tu mateix)
 NoSessionListWithThisHandler=El gestor de sessions configurat al vostre PHP no permet llistar totes les sessions en execució.
 LockNewSessions=Bloquejar connexions noves
-ConfirmLockNewSessions=Esteu segur de voler restringir l'accés a Dolibarr únicament al seu usuari? Només el login <b>%s</b> podrà connectar si confirma.
+ConfirmLockNewSessions=Esteu segur que voleu restringir qualsevol nova connexió a Dolibarr només a vosaltres mateixos? Només l'usuari <b> %s </b> podrà connectar-se després d'això.
 UnlockNewSessions=Eliminar bloqueig de connexions
 YourSession=La seva sessió
 Sessions=Sessions d'usuaris
@@ -41,7 +41,7 @@ PermissionsOnFilesInWebRoot=Permisos als fitxers del directori arrel web
 PermissionsOnFile=Permisos al fitxer %s
 NoSessionFound=Sembla que el seu PHP no pot llistar les sessions actives. El directori de salvaguardat de sessions (<b>%s</b>) pot estar protegit (per exemple, pels permisos del sistema operatiu o per la directiva open_basedir del seu PHP).
 DBStoringCharset=Codificació base de dades per emmagatzematge de dades
-DBSortingCharset=Codificació base de dades per classificar les dades
+DBSortingCharset=Conjunt de caràcters de base de dades per a ordenar les dades
 HostCharset=Joc de caràcters del servidor
 ClientCharset=Joc de caràcters del client
 ClientSortingCharset="Collation" del client
@@ -56,8 +56,10 @@ GUISetup=Entorn
 SetupArea=Configuració
 UploadNewTemplate=Carrega plantilles noves
 FormToTestFileUploadForm=Formulari de prova de càrrega de fitxer (segons opcions escollides)
+ModuleMustBeEnabled=El mòdul/aplicació <b>%s</b> s'ha d'activar
+ModuleIsEnabled=El mòdul/aplicació <b>%s</b> s'ha activat
 IfModuleEnabled=Nota: sí només és eficaç si el mòdul <b>%s</b> està activat
-RemoveLock=Elimineu/renombreu el fitxer <b> %s </b> si existeix, per a permetre l'ús de l'eina d'actualització/instal·lació.
+RemoveLock=Elimineu/reanomeneu el fitxer <b> %s </b> si existeix, per a permetre l'ús de l'eina d'actualització/instal·lació.
 RestoreLock=Substituir un arxiu <b>%s</b>, donant-li només drets de lectura a aquest arxiu per tal de prohibir noves actualitzacions.
 SecuritySetup=Configuració de seguretat
 SecurityFilesDesc=Defineix les opcions relacionades amb la seguretat de càrrega de fitxers.
@@ -66,7 +68,7 @@ ErrorModuleRequireDolibarrVersion=Error, aquest mòdul requereix una versió %s
 ErrorDecimalLargerThanAreForbidden=Error, les precisions superiors a <b>%s</b> no estan suportades.
 DictionarySetup=Configuració de Diccionari
 Dictionary=Diccionaris
-ErrorReservedTypeSystemSystemAuto=L'ús del tipus 'system' i 'systemauto' està reservat. Podeu utilitzar 'user' com a valor per afegir el seu propi registre
+ErrorReservedTypeSystemSystemAuto=Els valors "sistema" i "systemauto" per al tipus estan reservats. Podeu utilitzar "user" com a valor per a afegir el vostre propi registre
 ErrorCodeCantContainZero=El codi no pot contenir el valor 0
 DisableJavascript=Desactivar les funcions Javascript
 DisableJavascriptNote=Nota: per a propòsits de prova o de depuració. Per a l’optimització dels navegadors cec o de text, és possible que preferiu utilitzar la configuració en el perfil de l’usuari
@@ -74,7 +76,7 @@ UseSearchToSelectCompanyTooltip=A més, si teniu un gran nombre de tercers (> 10
 UseSearchToSelectContactTooltip=A més, si teniu un gran nombre de tercers (> 100.000), podeu augmentar la velocitat establint la constant CONTACT_DONOTSEARCH_ANYWHERE a 1 a Configuració->Altres. La cerca es limitarà a l'inici de la cadena.
 DelaiedFullListToSelectCompany=Esperar fins que es prem una tecla abans de carregar el contingut de la llista combinada de Tercers. <br> Això pot augmentar el rendiment si teniu un gran nombre de tercers, però és menys convenient.
 DelaiedFullListToSelectContact=Espereu fins que es prem una tecla abans de carregar el contingut de la llista combinada de contactes. <br> Això pot augmentar el rendiment si teniu un gran nombre de contactes, però és menys convenient.
-NumberOfKeyToSearch=Nombre de caràcters per activar la cerca: %s
+NumberOfKeyToSearch=Nombre de caràcters per a activar la cerca: %s
 NumberOfBytes=Nombre de bytes
 SearchString=Cerca cadena
 NotAvailableWhenAjaxDisabled=No disponible quan Ajax estigui desactivat
@@ -85,7 +87,6 @@ ShowPreview=Veure previsualització
 ShowHideDetails=Mostra-Amaga els detalls
 PreviewNotAvailable=Vista prèvia no disponible
 ThemeCurrentlyActive=Tema actualment actiu
-CurrentTimeZone=Fus horari PHP (Servidor)
 MySQLTimeZone=Zona horària MySql (base de dades)
 TZHasNoEffect=El servidor de base de dades emmagatzema i retorna les dates com si les haguessin enviat com una cadena. La zona horària només té efecte quan s’utilitza la funció UNIX_TIMESTAMP (que Dolibarr no hauria d’utilitzar, de manera que la base de dades TZ no hauria de tenir cap efecte, fins i tot si es canvia després d’introduir les dades).
 Space=Àrea
@@ -100,15 +101,15 @@ NextValueForDeposit=Següent valor (bestreta)
 NextValueForReplacements=Pròxim valor (rectificatives)
 MustBeLowerThanPHPLimit=Nota: actualment la vostra configuració PHP limita la mida màxima de fitxers per a la pujada a <b> %s </b> %s, independentment del valor d'aquest paràmetre.
 NoMaxSizeByPHPLimit=Cap limitació interna en el seu servidor PHP
-MaxSizeForUploadedFiles=Tamany màxim dels documents a pujar (0 per prohibir la pujada)
-UseCaptchaCode=Utilització de codi gràfic (CAPTCHA) en el login
+MaxSizeForUploadedFiles=Mida màxima per als fitxers a pujar (0 per a no permetre cap pujada)
+UseCaptchaCode=Utilitzeu el codi gràfic (CAPTCHA) a la pàgina d'inici de sessió
 AntiVirusCommand=Ruta completa cap al comandament antivirus
 AntiVirusCommandExample=Exemple per al dimoni ClamAv (requereix clamav-daemon): /usr/bin/clamdscan<br>Exemple per a ClamWin (molt molt lent): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Paràmetres complementaris en la línia de comandes
 AntiVirusParamExample=Exemple per al dimoni de ClamAv: --fdpass<br>Exemple per a ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Configuració del mòdul Comptabilitat
 UserSetup=Configuració de gestió d'usuaris
-MultiCurrencySetup=Configuració multi-divisa
+MultiCurrencySetup=Configuració multidivisa
 MenuLimits=Límits i precisió
 MenuIdParent=Id del menú pare
 DetailMenuIdParent=IDr del menú pare (buit per a un menú superior)
@@ -133,7 +134,7 @@ PHPTZ=Zona horària Servidor PHP
 DaylingSavingTime=Horari d'estiu (usuari)
 CurrentHour=Hora PHP (servidor)
 CurrentSessionTimeOut=Timeout sessió actual
-YouCanEditPHPTZ=Per establir una zona horària PHP diferent (no és necessari), pots intentar afegir un fitxer .htaccess amb una línia com aquesta "SetEnv TZ Europe/Madrid"
+YouCanEditPHPTZ=Per a establir una zona horària PHP diferent (no obligatori), podeu provar d'afegir un fitxer .htaccess amb una línia com aquesta "SetEnv TZ Europe/Madrid"
 HoursOnThisPageAreOnServerTZ=Avís, al contrari d'altres pantalles, les hores d'aquesta pàgina no són a la vostra zona horària local, sinó a la zona horària del servidor.
 Box=Panell
 Boxes=Panells
@@ -141,23 +142,23 @@ MaxNbOfLinesForBoxes=Màx. nombre de línies pels panells
 AllWidgetsWereEnabled=Tots els widgets disponibles estan habilitats
 PositionByDefault=Posició per defecte
 Position=Lloc
-MenusDesc=Els gestors de menú defineixen el contingut de les dos barres de menú (horitzontal i vertical)
-MenusEditorDesc=L'editor de menús permet definir entrades a mida. S'ha d'emprar amb cura per evitar introduir entrades que no siguin no portin enlloc. <br>Alguns mòduls afegeixen entrades de menú (normalment a <b>Tots</b>). Si per error elimineu cap d'aquestes entrades de menú, podeu restablir-les desactivant i tornant a activar el mòdul.
+MenusDesc=Els gestors de menú configuren el contingut de les dues barres de menú (horitzontal i vertical).
+MenusEditorDesc=L'editor de menú us permet definir entrades de menú personalitzades. Feu-lo servir amb cura per a evitar la inestabilitat i les entrades de menú inaccessibles permanentment. <br> Alguns mòduls afegeixen entrades de menú (al menú <b> Tot </b> sobretot). Si elimineu algunes d'aquestes entrades per error, podeu restaurar-les desactivant i tornant a activar el mòdul.
 MenuForUsers=Menú per als usuaris
 LangFile=arxiu .lang
 Language_en_US_es_MX_etc=Idioma (ca_ES, es_ES, ...)
 System=Sistema
 SystemInfo=Informació del sistema
 SystemToolsArea=Àrea utilitats del sistema
-SystemToolsAreaDesc=Aquesta àrea proporciona funcions d'administració. Utilitza el menú per triar la funció necessària.
+SystemToolsAreaDesc=Aquesta àrea proporciona funcions d'administració. Utilitzeu el menú per a triar la funció necessària.
 Purge=Purga
 PurgeAreaDesc=Aquesta pàgina permet eliminar tots els fitxers generats o guardats per Dolibarr (fitxers temporals o tots els fitxers de la carpeta <b>%s</b>). L'ús d'aquesta funció no és necessària. Es dóna per als usuaris que alberguen Dolibarr en un servidor que no ofereix els permisos d'eliminació de fitxers generats pel servidor web.
 PurgeDeleteLogFile=Suprimeix els fitxers de registre, incloent <b>%s</b> definit per al mòdul Syslog (sense risc de perdre dades)
-PurgeDeleteTemporaryFiles=Elimineu tots els fitxers temporals (no hi ha risc de perdre dades). Nota: La supressió només es fa si el directori temporal es va crear fa 24 hores.
-PurgeDeleteTemporaryFilesShort=Elimina els fitxers temporals
-PurgeDeleteAllFilesInDocumentsDir=Elimineu tots els arxius del directori: <b> %s </b>. <br> Això esborrarà tots documents generats i relacionats amb els elements (Tercers, factures etc ...), arxius carregats al mòdul ECM, còpies de seguretat de la Base de Dades, paperera i arxius temporals.
+PurgeDeleteTemporaryFiles=Suprimeix tots els registres i fitxers temporals (no hi ha risc de perdre dades). Nota: la supressió de fitxers temporals només es fa si el directori temporal es va crear fa més de 24 hores.
+PurgeDeleteTemporaryFilesShort=Esborra el registre i els fitxers temporals
+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 carpeta o fitxers per esborrar.
+PurgeNothingToDelete=No hi ha cap directori ni fitxers per a suprimir.
 PurgeNDirectoriesDeleted=<b>%s</b> arxius o carpetes eliminats
 PurgeNDirectoriesFailed=No s'han pogut eliminar <b>%s</b> fitxers o directoris.
 PurgeAuditEvents=Purgar els esdeveniments de seguretat
@@ -172,14 +173,14 @@ YouCanDownloadBackupFile=Ara es pot descarregar el fitxer generat
 NoBackupFileAvailable=Cap còpia disponible
 ExportMethod=Mètode d'exportació
 ImportMethod=Mètode d'importació
-ToBuildBackupFileClickHere=Per crear una còpia, feu clic <a href="%s">aquí</a>.
+ToBuildBackupFileClickHere=Per a crear un fitxer de còpia de seguretat, feu clic <a href="%s">aquí</a>.
 ImportMySqlDesc=Per a importar una còpia de seguretat MySQL, podeu utilitzar phpMyAdmin a través del vostre hosting o utilitzar les ordres mysql de la línia de comandes. <br> Per exemple:
 ImportPostgreSqlDesc=Per a importar una còpia de seguretat, useu l'ordre pg_restore des de la línia de comandes:
 ImportMySqlCommand=%s %s < elmeuarxiubackup.sql
 ImportPostgreSqlCommand=%s %s elmeuarxiubackup.sql
 FileNameToGenerate=Nom del fitxer de còpia de seguretat:
 Compression=Compressió
-CommandsToDisableForeignKeysForImport=Comanda per desactivar les claus excloents a la importació
+CommandsToDisableForeignKeysForImport=Comanda per a desactivar les claus forànies a la importació
 CommandsToDisableForeignKeysForImportWarning=Obligatori si vol poder restaurar més tard el dump SQL
 ExportCompatibility=Compatibilitat de l'arxiu d'exportació generat
 ExportUseMySQLQuickParameter=Utilitza el paràmetre --quick
@@ -201,15 +202,15 @@ IgnoreDuplicateRecords=Ignorar errors de registres duplicats (INSERT IGNORE)
 AutoDetectLang=Autodetecta (idioma del navegador)
 FeatureDisabledInDemo=Opció deshabilitada en demo
 FeatureAvailableOnlyOnStable=Funcionalitat disponible únicament en versions estables oficials 
-BoxesDesc=Els panells són components que mostren algunes dades que poden afegir-se per 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 desactivar.
+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ó.
-ModulesMarketPlaceDesc=Pots trobar més mòduls per descarregar en pàgines web externes per internet...
-ModulesDeployDesc=Si els permisos del vostre sistema de fitxers ho permeten, podeu utilitzar aquesta eina per desplegar un mòdul extern. El mòdul serà visible a la pestanya <strong> %s </strong>.
+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
 ModulesDevelopYourModule=Desenvolupeu els vostres mòduls/aplicacions
 ModulesDevelopDesc=Podeu desenvolupar o trobar un partner que desenvolupi per a vostè, el vostre mòdul personalitzat
-DOLISTOREdescriptionLong=En lloc d'anar al lloc web <a href="https://www.dolistore.com">www.dolistore.com</a> per trobar un mòdul extern, podeu utilitzar aquesta eina incrustada que farà la cerca en la tenda per vosaltres (pot ser lent, necessiteu un accés a internet)...
+DOLISTOREdescriptionLong=En lloc d'anar al lloc web <a href="https://www.dolistore.com">www.dolistore.com</a> per a trobar un mòdul extern, podeu utilitzar aquesta eina incrustada que farà la cerca en la tenda per vosaltres (pot ser lent, necessiteu un accés a internet)...
 NewModule=Mòdul nou
 FreeModule=Gratuït
 CompatibleUpTo=Compatible amb la versió %s
@@ -220,11 +221,11 @@ SeeSetupOfModule=Vegi la configuració del mòdul %s
 Updated=Actualitzat
 Nouveauté=Novetat
 AchatTelechargement=Comprar / Descarregar
-GoModuleSetupArea=Per desplegar / instal·lar un nou mòdul, aneu a l'àrea de configuració del mòdul: <a href="%s"> %s </a>.
+GoModuleSetupArea=Per a desplegar/instal·lar un mòdul nou, aneu a l'àrea de configuració del mòdul: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore, el lloc oficial de mòduls complementaris per Dolibarr ERP / CRM
 DoliPartnersDesc=Llista d’empreses que ofereixen mòduls o funcions desenvolupades a mida. <br> Nota: ja que Dolibarr és una aplicació de codi obert, <i> qualsevol usuari </i> experimentat en la programació PHP hauria de poder desenvolupar un mòdul.
 WebSiteDesc=Llocs web de referència per a trobar més mòduls (no core)...
-DevelopYourModuleDesc=Algunes solucions per desenvolupar el vostre propi mòdul...
+DevelopYourModuleDesc=Algunes solucions per a desenvolupar el vostre propi mòdul...
 URL=URL
 RelativeURL=URL relativa
 BoxesAvailable=Panells disponibles
@@ -239,10 +240,10 @@ Security=Seguretat
 Passwords=Contrasenyes
 DoNotStoreClearPassword=Encripta les contrasenyes emmagatzemades a la base de dades (NO com a text sense format). Es recomana activar aquesta opció.
 MainDbPasswordFileConfEncrypted=Encriptar la contrasenya de la base de dades emmagatzemada a conf.php. Es recomana activar aquesta opció.
-InstrucToEncodePass=Per tenir la contrasenya encriptada al fitxer <b>conf.php</b> reemplaça la línia<br><b>$dolibarr_main_db_pass="...";</b><br>per<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
-InstrucToClearPass=Per tenir la contrasenya descodificada en el fitxer de configuració <b> conf.php </b>, reemplaça en aquest fitxer la línia <br><b>$dolibarr_main_db_pass="crypted:..."</b><br> per <br><b>$dolibarr_main_db_pass="%s"</b>
+InstrucToEncodePass=Per a tenir la contrasenya codificada al fitxer <b>conf.php</b>, substituïu la línia <br> <b> $ dolibarr_main_db_pass="...";</b><br>per<br><b> $dolibarr_main_db_pass = "xifrat:%s";</b>
+InstrucToClearPass=Per a tenir la contrasenya descodificada en el fitxer de configuració <b>conf.php</b>, reemplaça en aquest fitxer la línia <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>per<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protegeix els fitxers PDF generats. Això NO es recomana ja que trenca la generació massiva de PDF.
-ProtectAndEncryptPdfFilesDesc=La protecció d'un document PDF el manté disponible per llegir i imprimir amb qualsevol navegador PDF. No obstant això, l'edició i la còpia ja no és possible. Tingues en compte que l'ús d'aquesta característica fa que la construcció d'un arxiu PDF fusionat global no funcioni.
+ProtectAndEncryptPdfFilesDesc=La protecció d’un document PDF el manté disponible per a llegir i imprimir amb qualsevol navegador PDF. Tanmateix, ja no és possible editar ni copiar. Tingueu en compte que l'ús d'aquesta funció fa que la creació d'un PDF combinat global no funcioni.
 Feature=Funció
 DolibarrLicense=Llicència
 Developpers=Desenvolupadors/col·laboradors
@@ -256,19 +257,20 @@ ReferencedPreferredPartners=Soci preferent
 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>
-HelpCenterDesc1=Aquests són alguns recursos per obtenir ajuda i suport amb Dolibarr.
+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ú
 MeasuringUnit=Unitat de mesura
-LeftMargin=Marge esquerra
+LeftMargin=Marge esquerre
 TopMargin=Marge superior
 PaperSize=Tipus de paper
 Orientation=Orientació
 SpaceX=Àrea X
 SpaceY=Àrea Y
-FontSize=Tamany de font
+FontSize=Mida de la font
 Content=Contingut
 NoticePeriod=Preavís
 NewByMonth=Nou per mes
@@ -326,13 +328,13 @@ MenuHandlers=Gestors de menú
 MenuAdmin=Editor de menú
 DoNotUseInProduction=No utilitzar en producció
 ThisIsProcessToFollow=Procediment d'actualització:
-ThisIsAlternativeProcessToFollow=Aquesta és una configuració alternativa per processar manualment:
+ThisIsAlternativeProcessToFollow=Aquesta és una configuració alternativa per a processar manualment:
 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 instal·lar un mòdul extern, descomprimir l'arxiu en el directori del servidor dedicat als mòduls: <br><b>%s</b>
-SetupIsReadyForUse=La instal·lació del mòdul ha finalitzat. No obstant, ha d'habilitar i configurar el mòdul en la seva aplicació, aneu a la pàgina per configurar els mòduls: <a href="%s">%s</a>.
+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>
+SetupIsReadyForUse=La instal·lació del mòdul ha finalitzat. No obstant, 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>
 InfDirExample=Llavors <br>declareu-ho a l'arxiu <strong>conf.php </strong><br> $dolibarr_main_url_root_alt='/custom'<br> $dolibarr_main_document_root_alt='/ruta/del/dolibarr/htdocs/custom'<br> Si aquestes línies estan comentades amb "#", per a activar-les simplement descomenteu-les traient el caràcter "#".
@@ -345,7 +347,7 @@ LastActivationAuthor=Últim autor d'activació
 LastActivationIP=Última IP d'activació
 UpdateServerOffline=Actualitza el servidor fora de línia
 WithCounter=Gestiona un comptador
-GenericMaskCodes=Podeu introduir qualsevol màscara numèrica. En aquesta màscara es podrien 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 per 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 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 configuració o 99 per restablir-los 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}</b> any en 2, 4 o 1 xifra. <br>
+GenericMaskCodes=Podeu introduir qualsevol màscara numèrica. En aquesta màscara es podrien 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 per 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 restableix 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 configuració o 99 per a restablir-los 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}</b> any en 2, 4 o 1 xifra. <br>
 GenericMaskCodes2=<b>{cccc}</b> el codi de client amb n caràcters<br><b>{cccc000}</b> el codi de client amb n caràcters seguit d'un comptador dedicat pel client. Aquest comptador dedicat al client es reinicia al mateix temps que el comptador global.<br><b>{tttt}</b> El codi del tipus de tercer amb n caràcters (vegeu el menú Inici - Configuració - Diccionaris - Tipus de tercers). Si afegeixes 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>
 GenericMaskCodes4a=<u>Exemple en el 99 %s del tercer L'Empresa, amb data 31/01/2007:</u><br>
@@ -358,16 +360,16 @@ ServerNotAvailableOnIPOrPort=Servidor no disponible en l'adreça <b>%s</b> al po
 DoTestServerAvailability=Provar la connexió amb el servidor
 DoTestSend=Provar enviament
 DoTestSendHTML=Prova l'enviament HTML
-ErrorCantUseRazIfNoYearInMask=Error: no pot utilitzar l'opció @ per reiniciar el comptador cada any si la seqüencia {yy} o {yyyy} no es troba a la mascara
+ErrorCantUseRazIfNoYearInMask=Error, no es pot utilitzar l'opció @ per a restablir el comptador cada any si la seqüència {yy} o {yyyy} no està emmascarada.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, no es pot usar opció @ si la seqüència (yy) (mm) o (yyyy) (mm) no es troba a la màscara.
 UMask=Paràmetre UMask de nous fitxers en Unix/Linux/BSD.
 UMaskExplanation=Aquest paràmetre determina els drets dels arxius creats en el servidor Dolibarr (durant la pujada, per exemple).<br>Aquest ha de ser el valor octal (per exemple, 0666 significa lectura/escriptura per a tots).<br>Aquest paràmetre no té cap efecte sobre un servidor Windows.
 SeeWikiForAllTeam=Mira a la pàgina Wiki per veure una llista de contribuents i la seva organització
 UseACacheDelay= Demora en memòria cau de l'exportació en segons (0 o buit sense memòria)
-DisableLinkToHelpCenter=Amagar l'enllaç "Necessita suport o ajuda" a la pàgina de login
+DisableLinkToHelpCenter=Amaga l'enllaç "<b>Necessiteu ajuda o assistència</b>" a la pàgina d'inici de sessió
 DisableLinkToHelp=Amaga l'enllaç a l'ajuda en línia "<b>%s</b>"
 AddCRIfTooLong=No hi ha cap tall de text automàtic, el text massa llarg no es mostrarà als documents. Si cal, afegiu devolucions de carro a l'àrea de text.
-ConfirmPurge=Estàs segur de voler realitzar aquesta purga? <br> Això esborrarà definitivament totes les dades dels seus fitxers (àrea GED, arxius adjunts etc.).
+ConfirmPurge=Esteu segur que voleu executar aquesta purga? <br>Això suprimirà permanentment tots els fitxers de dades sense opció de restaurar-los (fitxers del GED, fitxers adjunts...).
 MinLength=Longitud mínima
 LanguageFilesCachedIntoShmopSharedMemory=arxius .lang en memòria compartida
 LanguageFile=Fitxer d'idioma
@@ -375,12 +377,12 @@ ExamplesWithCurrentSetup=Exemples amb configuració actual
 ListOfDirectories=Llistat de directoris de plantilles OpenDocument
 ListOfDirectoriesForModelGenODT=Llista de directoris que contenen fitxers de plantilles amb format OpenDocument.<br><br>Posa aquí l'adreça completa dels directoris.<br>Afegeix un "intro" entre cada directori.<br>Per afegir un directori del mòdul GED, afegeix aquí <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Els fitxers d'aquests directoris han de tenir l'extensió <b>.odt</b> o <b>.ods</b>.
 NumberOfModelFilesFound=Nombre d'arxius de plantilles ODT/ODS trobats en aquest(s) directori(s)
-ExampleOfDirectoriesForModelGen=Exemples de sintaxi:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Exemples de sintaxi: <br>c:\\myapp\\mydocumentdir\\mysubdir <br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=Posant les següents etiquetes a la plantilla, obtindrà una substitució amb el valor personalitzat en generar el document:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Crear_un_modelo_de_documento_ODT
 FirstnameNamePosition=Posició del Nom/Cognoms
 DescWeather=Les imatges següents es mostraran al tauler de control quan el nombre d'accions posteriors arriba als valors següents:
-KeyForWebServicesAccess=Clau per utilitzar els Web Services (paràmetre "dolibarrkey" en els webservices)
+KeyForWebServicesAccess=Clau per a utilitzar els serveis web (paràmetre "dolibarrkey" als serveis web)
 TestSubmitForm=Formulari de proves
 ThisForceAlsoTheme=L’ús d’aquest gestor de menús també farà servir el seu propi tema sigui quina sigui l’opció de l’usuari. A més, aquest gestor de menú especialitzat per a telèfons intel·ligents no funciona en tots els telèfons intel·ligents. Utilitzeu un altre gestor de menús si teniu problemes amb el vostre.
 ThemeDir=Directori dels temes
@@ -388,7 +390,7 @@ ConnectionTimeout=Temps d'espera de connexió
 ResponseTimeout=Timeout de resposta
 SmsTestMessage=Missatge de prova de __PHONEFROM__ per __PHONETO__
 ModuleMustBeEnabledFirst=El mòdul "<b>%s</b>" ha d'habilitar-se primer si necessita aquesta funcionalitat.
-SecurityToken=Clau per encriptar urls
+SecurityToken=Clau per a protegir les URL
 NoSmsEngine=No hi ha cap gestor d'enviament de SMS. Els gestors d'enviament de SMS no s'instal·len per defecte ja que depenen de cada proveïdor, però pot trobar-los a la plataforma %s
 PDF=PDF
 PDFDesc=Opcions globals de generació de PDF
@@ -406,7 +408,7 @@ UrlGenerationParameters=Seguretat de les URL
 SecurityTokenIsUnique=Fer servir un paràmetre securekey únic per a cada URL?
 EnterRefToBuildUrl=Introduïu la referència de l'objecte %s
 GetSecuredUrl=Obté la URL calculada
-ButtonHideUnauthorized=Amaga els botons a usuaris no administradors per accions no autoritzades enlloc de mostrar-los en gris deshabilitats
+ButtonHideUnauthorized=Amaga els botons d'acció no autoritzats també per als usuaris interns (en cas contrari, en gris)
 OldVATRates=Taxa d'IVA antiga
 NewVATRates=Taxa d'IVA nova
 PriceBaseTypeToChange=Canviar el preu on la referència de base és
@@ -435,23 +437,23 @@ ExtrafieldCheckBox=Caselles de selecció
 ExtrafieldCheckBoxFromList=Caselles de selecció des d'una taula
 ExtrafieldLink=Enllaç a un objecte
 ComputedFormula=Camp calculat
-ComputedFormulaDesc=Podeu introduir aquí una fórmula utilitzant altres propietats de l’objecte o qualsevol codi PHP per obtenir un valor calculat dinàmicament. Podeu utilitzar qualsevol fórmula compatible amb PHP, inclòs l'operador condicional "?"  i els següents objectes globals: <strong> $db, $conf, $langs, $mysoc, $user, $object </strong>. <br> <strong> ATENCIÓ </strong>: Només poden estar disponibles algunes propietats de $object. Si necessiteu una propietat no carregada, només cal que incorporeu l'objecte a la vostra fórmula com en el segon exemple. <br> Utilitzar un camp calculat implica que no podreu introduir cap valor des de la interfície. A més, si hi ha un error de sintaxi, la fórmula pot no tornar res. <br> <br> Exemple de fórmula: <br> $object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2 ) <br> <br> Exemple per tornar a carregar l'objecte <br>  (($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br> <br> Un altre exemple de fórmula per forçar la càrrega de l'objecte i el seu objecte pare: <br> (($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=Podeu introduir aquí una fórmula utilitzant altres propietats de l’objecte o qualsevol codi PHP per a obtenir un valor calculat dinàmicament. Podeu utilitzar qualsevol fórmula compatible amb PHP, inclòs l'operador condicional «?»  i els següents objectes globals: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>. <br><strong>ATENCIÓ</strong>: Només poden estar disponibles algunes propietats de $object. Si necessiteu una propietat no carregada, només cal que incorporeu l'objecte a la vostra fórmula com en el segon exemple. <br> Utilitzar un camp calculat implica que no podreu introduir cap valor des de la interfície. A més, si hi ha un error de sintaxi, la fórmula pot no tornar res. <br> <br> Exemple de fórmula: <br> $object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2 ) <br> <br> Exemple per a tornar a carregar l'objecte <br>  (($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br> <br> Un altre exemple de fórmula per a forçar la càrrega de l'objecte i el seu objecte pare: <br> (($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Emmagatzemar el camp computat
-ComputedpersistentDesc=Els camps addicionals computats s’emmagatzemaran a la base de dades, però, el valor només es tornarà a calcular quan l’objecte d’aquest camp s’ha canviat. Si el camp calculat depèn d'altres objectes o dades globals, aquest valor podria estar equivocat !!
-ExtrafieldParamHelpPassword=Mantenir aquest camp buit significa que el valor s'emmagatzema sense xifrar (el camp només ha d'estar amagat amb una estrella sobre la pantalla). <br> Establiu aquí el valor 'auto' per utilitzar la regla de xifrat per defecte per guardar la contrasenya a la base de dades (el valor llegit serà només el "hash", no hi haurà cap manera de recuperar el valor original)
-ExtrafieldParamHelpselect=La llista de valors ha de ser un conjunt de línies amb un par del tipus clau,valor (on la clau no pot ser '0') <br><br> per exemple : <br>clau1,valor1<br>clau2,valor2<br>clau3,valor3<br>...<br><br>Per tenir la llista depenent d'una altra llista d'atributs complementaris: <br>1,valor1|options_<i>codi_llista_pare</i>:clau_pare<br>2,valor2|options_<i>codi_llista_pare</i>:clau_pare <br><br>Per tenir la llista depenent d'una altra llista:<br>1,valor1|<i>codi_llista_pare</i>:clau_pare<br>2,valor2|<i>codi_llista_pare</i>:clau_pare
-ExtrafieldParamHelpcheckbox=La llista de valor ha de ser un conjunt de línies del tipus clau,valor (a on la clau no pot ser '0')<br><br> per exemple : <br>1,valor1<br>2,valor2<br>3,valor3<br>...
-ExtrafieldParamHelpradio=La llista de valor ha de ser un conjunt de línies del tipus clau,valor (a on la clau no pot ser '0')<br><br> per exemple : <br>1,valor1<br>2,valor2<br>3,valor3<br>...
-ExtrafieldParamHelpsellist=Llista de valors que provenen d’una taula<br>Sintaxi: nom_taula:nom_camp:id_camp::filtre<br>Exemple: c_typent:libelle:id::filtre<br><br>- id_camp ha de ser necessàriament una "primary int key"<br>- el filtre pot ser una comprovació senzilla (p.e. active=1) per mostrar només els valors actius<br>També pots utilitzar $ID$ al filtre per representar el ID de l'actual objecte en curs<br>Per utilitzar un SELECT al filtre, utilitzeu la paraula clau $SEL$ per evitar la protecció antiinjecció.<br>Si vols filtrar camps addicionals utilitza la sintaxi extra.nom_camp=... (on nom_camp és el codi del camp addicional)<br><br>Per tenir la llista en funció d’una altra llista d’atributs complementaris:<br>c_typent:libelle:id:options_<i>codi_llista_mare</i>|parent_column:filtre <br><br>Per tenir la llista en funció d'una altra llista:<br>c_typent:libelle:id:<i>codi_llista_mare</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=La llista de valors prové d'una taula <br> Sintaxi: nom_taula:nom_camp:id_camp::filtre <br> Exemple: c_typent:libelle:id::filter<br> <br> filtre pot ser una comprovació simple (p. ex. active=1) per mostrar només el valor actiu <br> També podeu utilitzar $ID$ en el filtre per representar l'ID actual de l'objecte en curs <br>Per fer un SELECT en el filtre utilitzeu $SEL$ <br> si voleu filtrar per camps extra utilitzeu sintaxi extra.fieldcode=... (on el codi de camp és el codi del extrafield) <br> <br>Per tenir la llista depenent d'una altra llista d'atributs complementaris: <br>c_typent:libelle:id:options_<i>codi_llista_pare</i>|parent_column: filter  <br><br>Per tenir la llista depenent d'una altra llista: c_typent:libelle:id:<i>codi_llista_pare</i>|parent_column:filter
+ComputedpersistentDesc=Els camps addicionals calculats s’emmagatzemaran a la base de dades, però el valor només es recalcularà quan es canviï l’objecte d’aquest camp. Si el camp calculat depèn d'altres objectes o dades globals, aquest valor pot ser incorrecte!!
+ExtrafieldParamHelpPassword=Mantenir aquest camp buit significa que el valor s'emmagatzema sense xifrar (el camp només ha d'estar amagat amb una estrella sobre la pantalla). <br> Establiu aquí el valor 'auto' per a utilitzar la regla de xifrat per defecte per a guardar la contrasenya a la base de dades (el valor llegit serà només el "hash", no hi haurà cap manera de recuperar el valor original)
+ExtrafieldParamHelpselect=La llista de valors ha de ser un conjunt de línies amb un format del tipus clau,valor (on la clau no pot ser '0') <br><br> per exemple: <br>1,valor1<br>2,valor2<br>codi3,valor3<br>...<br><br>Per a tenir la llista depenent d'una altra llista d'atributs complementaris: <br>1,valor1|options_<i>codi_llista_pare</i>:clau_pare<br>2,valor2|options_<i>codi_llista_pare</i>:clau_pare <br><br>Per a tenir la llista depenent d'una altra llista:<br>1,valor1|<i>codi_llista_pare</i>:clau_pare<br>2,valor2|<i>codi_llista_pare</i>:clau_pare
+ExtrafieldParamHelpcheckbox=La llista de valor ha de ser un conjunt de línies del tipus clau,valor (on la clau no pot ser '0')<br><br> per exemple: <br>1,valor1<br>2,valor2<br>3,valor3<br>...
+ExtrafieldParamHelpradio=La llista de valor ha de ser un conjunt de línies del tipus clau,valor (on la clau no pot ser '0')<br><br> per exemple: <br>1,valor1<br>2,valor2<br>3,valor3<br>...
+ExtrafieldParamHelpsellist=Llista de valors que provenen d’una taula<br>Sintaxi: nom_taula:nom_camp:id_camp::filtre<br>Exemple: c_typent:libelle:id::filtre<br><br>- id_camp ha de ser necessàriament una "primary int key"<br>- el filtre pot ser una comprovació senzilla (p.e. active=1) per a mostrar només els valors actius<br>També pots utilitzar $ID$ al filtre per a representar el ID de l'actual objecte en curs<br>Per a utilitzar un SELECT al filtre, utilitzeu la paraula clau $SEL$ per a evitar la protecció anti injecció.<br>Si vols filtrar camps addicionals utilitza la sintaxi extra.nom_camp=... (on nom_camp és el codi del camp addicional)<br><br>Per a tenir la llista en funció d’una altra llista d’atributs complementaris:<br>c_typent:libelle:id:options_<i>codi_llista_mare</i>|parent_column:filtre <br><br>Per a tenir la llista en funció d'una altra llista:<br>c_typent:libelle:id:<i>codi_llista_mare</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=La llista de valors prové d'una taula <br> Sintaxi: nom_taula:nom_camp:id_camp::filtre <br> Exemple: c_typent:libelle:id::filter<br> <br> filtre pot ser una comprovació simple (p. ex. active=1) per a mostrar només el valor actiu <br> També podeu utilitzar $ID$ en el filtre per a representar l'ID actual de l'objecte en curs <br>Per fer un SELECT en el filtre utilitzeu $SEL$ <br> si voleu filtrar per camps extra utilitzeu sintaxi extra.fieldcode=... (on el codi de camp és el codi del extrafield) <br> <br>Per a tenir la llista depenent d'una altra llista d'atributs complementaris: <br>c_typent:libelle:id:options_<i>codi_llista_pare</i>|parent_column: filter  <br><br>Per a tenir la llista depenent d'una altra llista: c_typent:libelle:id:<i>codi_llista_pare</i>|parent_column:filter
 ExtrafieldParamHelplink=Els paràmetres han de ser ObjectName:Classpath <br>Sintaxi: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Manteniu-lo buit per un simple separador <br> Configureu-ho a 1 per a un separador col·lapsador (obert per defecte per a la sessió nova, i es mantindrà l'estat de cada sessió d'usuari) <br> Configureu-ho a 2 per a un separador col·lapsat (es va desplomar per defecte per a la sessió nova, i es mantindrà l'estat per a cada sessió d'usuari)
-LibraryToBuildPDF=Llibreria utilitzada per generar PDF
+LibraryToBuildPDF=Llibreria utilitzada per a la generació de PDF
 LocalTaxDesc=Alguns països apliquen 2 o 3 impostos en cada línia de factura. Si aquest és el cas, escull el tipus pel segon i el tercer impost i el seu valor. Els tipus possibles són: <br>1: impostos locals aplicats en productes i serveis sense IVA (l'impost local serà calculat en el total sense impostos)<br>2: impost local aplicat en productes i serveis amb IVA (l'impost local serà calculat amb el total + l'impost principal)<br>3: impost local aplicat en productes sense IVA (l'impost local serà calculat en el total sense impost)<br>4: impost local aplicat en productes amb IVA (l'impost local serà calculat amb el total + l'impost principal)<br>5: impost local aplicat en serveis sense IVA (l'impost local serà calculat amb el total sense impost)<br>6: impost local aplicat en serveis amb IVA inclòs (l'impost local serà calculat amb el total + IVA)
 SMS=SMS
-LinkToTestClickToDial=Introduïu un número de telèfon que voleu marcar per provar l'enllaç de crida ClickToDial per a l'usuari <strong>%s</strong>
+LinkToTestClickToDial=Introduïu un número de telèfon per a trucar per a mostrar un enllaç per a provar l'URL ClickToDial per a l'usuari <strong>%s</strong>
 RefreshPhoneLink=Actualitza l'enllaç
-LinkToTest=Enllaç seleccionable per l'usuari <strong>%s</strong> (feu clic al número per provar)
+LinkToTest=Enllaç clicable generat per l'usuari <strong>%s</strong> (feu clic al número de telèfon per a provar-lo)
 KeepEmptyToUseDefault=Deixa-ho buit per usar el valor per defecte
 KeepThisEmptyInMostCases=En la majoria dels casos, pots deixar aquest camp buit.
 DefaultLink=Enllaç per defecte
@@ -467,22 +469,22 @@ EraseAllCurrentBarCode=Esborrar tots els valors de codi de barres actuals
 ConfirmEraseAllCurrentBarCode=Esteu segur que voleu esborrar tots els valors de codis de barres actuals?
 AllBarcodeReset=S'han eliminat tots els valors de codi de barres
 NoBarcodeNumberingTemplateDefined=No hi ha cap plantilla de codi de barres habilitada a la configuració del mòdul de codi de barres.
-EnableFileCache=Habilita la caché de fitxers
+EnableFileCache=Activa la memòria cau de fitxers
 ShowDetailsInPDFPageFoot=Afegiu més detalls al peu de pàgina, com ara l'adreça de l'empresa o els noms dels gestors (a més d'identificadors professionals, capital de l'empresa i número de NIF/CIF).
 NoDetails=No hi ha detalls addicionals al peu de pàgina
 DisplayCompanyInfo=Mostra l'adreça de l'empresa
 DisplayCompanyManagers=Mostra el gestor de noms
 DisplayCompanyInfoAndManagers=Mostra l'adreça de l'empresa i els noms de la persona gestora
 EnableAndSetupModuleCron=Si voleu que aquesta factura periòdica es generi automàticament, el mòdul * %s * s’ha d’habilitar i configurar correctament. En cas contrari, la generació de factures s’ha de fer manualment des d’aquesta plantilla mitjançant el botó *Crea*. Tingueu en compte que, fins i tot si heu activat la generació automàtica, encara podeu iniciar la generació manual amb seguretat. No es pot generar duplicats per al mateix període.
-ModuleCompanyCodeCustomerAquarium=%s seguit de codi de client de tercers per obtenir un codi de comptabilitat de clients
+ModuleCompanyCodeCustomerAquarium=%s seguit del codi de client per a un codi comptable de client
 ModuleCompanyCodeSupplierAquarium=%s seguit del codi de proveïdor per a un codi de comptabilitat del proveïdor 
 ModuleCompanyCodePanicum=Retorna un codi comptable buit.
 ModuleCompanyCodeDigitaria=Retorna un codi comptable compost d'acord amb el nom del tercer. El codi consisteix en un prefix, que pot definir-se, en primera posició, seguit del nombre de caràcters que es defineixi com a codi del tercer.
 ModuleCompanyCodeCustomerDigitaria=%s seguit pel nom abreujat del client pel nombre de caràcters: %s pel codi del compte de client
 ModuleCompanyCodeSupplierDigitaria=%s seguit pel nom abreujat del proveïdor pel nombre de caràcters: %s pel codi del compte de proveïdor
-Use3StepsApproval=Per defecte, les comandes de compra necessiten ser creades i aprovades per 2 usuaris diferents (el primer pas/usuari és per a crear i un altre pas/usuari per aprovar. Noteu que si un usuari te permisos tant per crear com per aprovar, un sol pas/usuari serà suficient). Amb aquesta opció, tens la possibilitat d'introduir un tercer pas/usuari per a l'aprovació, si l'import es superior a un determinat valor (d'aquesta manera són necessaris 3 passos: 1=validació, 2=primera aprovació i 3=segona aprovació si l'import és suficient).<br>Deixa-ho en blanc si només vols un nivell d'aprovació (2 passos); posa un valor encara que sigui molt baix (0,1) si vols una segona aprovació (3 passos).
+Use3StepsApproval=Per defecte, les comandes de compra necessiten ser creades i aprovades per 2 usuaris diferents (el primer pas/usuari és per a crear i un altre pas/usuari per a aprovar. Noteu que si un usuari te permisos tant per a crear com per a aprovar, un sol pas/usuari serà suficient). Amb aquesta opció, tens la possibilitat d'introduir un tercer pas/usuari per a l'aprovació, si l'import es superior a un determinat valor (d'aquesta manera són necessaris 3 passos: 1=validació, 2=primera aprovació i 3=segona aprovació si l'import és suficient).<br>Deixa-ho en blanc si només vols un nivell d'aprovació (2 passos); posa un valor encara que sigui molt baix (0,1) si vols una segona aprovació (3 passos).
 UseDoubleApproval=Utilitza una aprovació en 3 passos quan l'import (sense impostos) sigui més gran que...
-WarningPHPMail=ADVERTÈNCIA: la configuració per enviar correus electrònics des de l'aplicació utilitza la configuració genèrica predeterminada. Sovint és millor configurar els correus electrònics de sortida per utilitzar el servidor de correu electrònic del vostre proveïdor de serveis de correu electrònic en lloc de la configuració predeterminada per diversos motius:
+WarningPHPMail=ADVERTÈNCIA: la configuració per a enviar correus electrònics des de l'aplicació utilitza la configuració genèrica predeterminada. Sovint és millor configurar els correus electrònics de sortida per a utilitzar el servidor de correu electrònic del vostre proveïdor de serveis de correu electrònic en lloc de la configuració predeterminada per diversos motius:
 WarningPHPMailA=- L’ús del servidor del proveïdor de serveis de correu electrònic augmenta la confiança del vostre correu electrònic, de manera que augmenta l'enviament sense ser marcat com a SPAM
 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 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 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.
@@ -492,7 +494,7 @@ WarningPHPMailSPF=Si el nom de domini de l’adreça de correu electrònic del r
 ClickToShowDescription=Clica per mostrar la descripció
 DependsOn=Aquest mòdul necessita els mòduls
 RequiredBy=Aquest mòdul és requerit pel/s mòdul/s
-TheKeyIsTheNameOfHtmlField=Aquest és el nom del camp HTML. Es necessiten coneixements tècnics per llegir el contingut de la pàgina HTML per a obtenir el nom clau d’un camp.
+TheKeyIsTheNameOfHtmlField=Aquest és el nom del camp HTML. Es necessiten coneixements tècnics per a llegir el contingut de la pàgina HTML per a obtenir el nom clau d’un camp.
 PageUrlForDefaultValues=Has d'introduir aquí l'URL relatiu de la pàgina. Si inclous paràmetres a l'URL, els valors predeterminats seran efectius si tots els paràmetres s'estableixen en el mateix valor.
 PageUrlForDefaultValuesCreate=<br> Exemple: <br> Per al formulari per crear una nou tercer, és <strong> %s </strong>. <br> Per a l'URL dels mòduls externs instal·lats al directori personalitzat, no incloeu "custom/", així que utilitzeu una ruta com <strong> mymodule / mypage.php </strong> i no custom/mymodule/mypage.php. <br> Si voleu un valor predeterminat només si la url té algun paràmetre, podeu utilitzar <strong> %s</strong>
 PageUrlForDefaultValuesList=<br> Exemple: <br> Per a la pàgina que llista els tercers, és <strong> %s </strong>. <br> Per a l'URL dels mòduls externs instal·lats al directori personalitzat, no incloeu "custom/" utilitzeu una ruta com <strong> mymodule/mypagelist.php </strong> i no custom/mymodule/mypagelist.php. <br> Si voleu un valor predeterminat només si la url té algun paràmetre, podeu utilitzar <strong> %s</strong>
@@ -502,11 +504,11 @@ EnableOverwriteTranslation=Habilita l'ús de la traducció sobreescrita
 GoIntoTranslationMenuToChangeThis=S'ha trobat una traducció de la clau amb aquest codi. Per a canviar aquest valor, l’heu d’editar des d'Inici-Configuració-Traducció.
 WarningSettingSortOrder=Avís, establir un ordre de classificació predeterminat pot provocar un error tècnic en passar a la pàgina de la llista si el camp és un camp desconegut. Si experimentes aquest error, torna a aquesta pàgina per eliminar l'ordre de classificació predeterminat i restablir el comportament predeterminat.
 Field=Camp
-ProductDocumentTemplates=Plantilles de documents per generar document de producte
+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
 AttachMainDocByDefault=Establiu-lo a 1 si voleu adjuntar el document principal al correu electrònic de manera predeterminada (si escau)
-FilesAttachedToEmail=Adjuntar fitxer
+FilesAttachedToEmail=Adjunta el fitxer
 SendEmailsReminders=Enviar recordatoris d'agenda per correu electrònic
 davDescription=Configura un servidor WebDAV
 DAVSetup=Configuració del mòdul DAV
@@ -566,7 +568,7 @@ Module70Desc=Gestió de intervencions
 Module75Name=Notes de despeses i desplaçaments
 Module75Desc=Gestió de les notes de despeses i desplaçaments
 Module80Name=Expedicions
-Module80Desc=Enviaments i gestió de notes de lliurament
+Module80Desc=Gestió d’enviaments i albarans
 Module85Name=Bancs i Efectiu
 Module85Desc=Gestió de comptes bancaris o efectiu
 Module100Name=Lloc extern
@@ -615,11 +617,11 @@ Module1520Desc=Generació de documents de correu electrònic massiu
 Module1780Name=Etiquetes
 Module1780Desc=Crea etiquetes (productes, clients, proveïdors, contactes o socis)
 Module2000Name=Editor WYSIWYG
-Module2000Desc=Permetre que els camps de text es puguin editar/formatejar amb CKEditor (html)
-Module2200Name=Multi-preus
+Module2000Desc=Permet editar/formatar els camps de text mitjançant CKEditor (html)
+Module2200Name=Preus dinàmics
 Module2200Desc=Utilitza expressions matemàtiques per a la generació automàtica de preus
 Module2300Name=Tasques programades
-Module2300Desc=Gestió de tasques programades (alias cron o taula chrono)
+Module2300Desc=Gestió de tasques programades (àlies cron o taula de crons)
 Module2400Name=Esdeveniments/Agenda
 Module2400Desc=Seguiment d'esdeveniments. Registre d'esdeveniments automàtics per a fer el seguiment o registrar esdeveniments manuals o reunions. Aquest és el mòdul principal per a una bona gestió de la relació amb clients o proveïdors.
 Module2500Name=SGD / GCE
@@ -641,10 +643,10 @@ Module4000Name=RRHH
 Module4000Desc=Gestió de recursos humans (gestionar departaments, empleats, contractes i "feelings")
 Module5000Name=Multi-empresa
 Module5000Desc=Permet gestionar diverses empreses
-Module6000Name=Workflow
+Module6000Name=Flux de treball
 Module6000Desc=Gestió del flux de treball (creació automàtica d'objectes i / o canvi d'estat automàtic)
 Module10000Name=Pàgines web
-Module10000Desc=Creeu llocs web (públics) amb un editor WYSIWYG. Es tracta d’un CMS per a administradors web o desenvolupador (és millor conèixer el llenguatge HTML i CSS). N’hi ha prou amb configurar el servidor web (Apache, Nginx, ...) per assenyalar el directori dedicat a Dolibarr perquè el tingui en línia a Internet amb el seu propi nom de domini.
+Module10000Desc=Creeu llocs web (públics) amb un editor WYSIWYG. Es tracta d’un CMS per a administradors web o desenvolupador (és millor conèixer el llenguatge HTML i CSS). N’hi ha prou amb configurar el servidor web (Apache, Nginx, ...) per a assenyalar el directori dedicat a Dolibarr perquè el tingui en línia a Internet amb el seu propi nom de domini.
 Module20000Name=Gestió de sol·licituds de dies lliures
 Module20000Desc=Defineix i fes seguiment de les sol·licituds de dies lliures dels empleats
 Module39000Name=Lots de productes
@@ -652,15 +654,15 @@ Module39000Desc=Lots, números de sèrie, gestió de data de comerç / venda per
 Module40000Name=Multidivisa
 Module40000Desc=Utilitza divises alternatives en preus i documents
 Module50000Name=PayBox
-Module50000Desc=Oferiu als clients una pàgina de pagament en línia de PayBox (targetes de crèdit / dèbit). Això es pot utilitzar per permetre als vostres clients fer pagaments o pagaments ad hoc relacionats amb un objecte Dolibarr específic (factura, ordre, etc ...)
+Module50000Desc=Oferiu als clients una pàgina de pagament en línia de PayBox (targetes de crèdit/dèbit). Es pot utilitzar per a permetre als vostres clients fer pagaments ad-hoc o pagaments relacionats amb un objecte Dolibarr específic (factura, comanda, etc.)
 Module50100Name=TPV SimplePOS
 Module50100Desc=Mòdul de punt de venda SimplePOS (TPV simple).
 Module50150Name=TPV TakePOS
 Module50150Desc=Mòdul de punt de venda TakePOS (TOS de pantalla tàctil, per a botigues, bars o restaurants).
 Module50200Name=Paypal
-Module50200Desc=Ofereix als clients una pàgina de pagament en línia de PayPal (compte PayPal o targetes de crèdit / dèbit). Això es pot utilitzar per permetre als vostres clients fer pagaments o pagaments ad-hoc relacionats amb un objecte Dolibarr específic (factura, ordre, etc ...)
+Module50200Desc=Oferiu als clients una pàgina de pagament en línia de PayPal (compte de PayPal o targetes de crèdit/dèbit). Es pot utilitzar per a permetre als vostres clients fer pagaments ad-hoc o pagaments relacionats amb un objecte Dolibarr específic (factura, comanda, etc.)
 Module50300Name=Stripe
-Module50300Desc=Oferiu als clients una pàgina de pagament en línia de Stripe (targetes de crèdit / dèbit). Això es pot utilitzar per permetre als vostres clients fer pagaments o pagaments ad-hoc relacionats amb un objecte Dolibarr específic (factura, ordre, etc ...)
+Module50300Desc=Oferiu als clients una pàgina de pagaments en línia de Stripe (targetes de crèdit/dèbit). Es pot utilitzar per a permetre als vostres clients fer pagaments ad-hoc o pagaments relacionats amb un objecte Dolibarr específic (factura, comanda, etc.)
 Module50400Name=Comptabilitat (doble entrada)
 Module50400Desc=Gestió comptable (entrades dobles, suport de comptabilitats generals i subsidiàries). Exporteu el llibre major en altres formats de programari de comptabilitat.
 Module54000Name=PrintIPP
@@ -668,23 +670,23 @@ Module54000Desc=Impressió directa (sense obrir els documents) mitjançant la in
 Module55000Name=Enquesta o votació
 Module55000Desc=Creeu enquestes o vots en línia (com Doodle, Studs, RDVz, etc.)
 Module59000Name=Marges
-Module59000Desc=Mòdul per gestionar els marges
+Module59000Desc=Mòdul per a seguir els marges
 Module60000Name=Comissions
-Module60000Desc=Mòdul per gestionar les comissions
+Module60000Desc=Mòdul per a gestionar comissions
 Module62000Name=Incoterms
-Module62000Desc=Afegir funcions per gestionar Incoterm
+Module62000Desc=Afegeix funcions per a gestionar Incoterms
 Module63000Name=Recursos
 Module63000Desc=Gestiona els recursos (impressores, cotxes, habitacions...) que pots compartir en esdeveniments
 Permission11=Consulta factures de client
 Permission12=Crear/Modificar factures
 Permission13=Invalida les factures dels clients
-Permission14=Validar factures
+Permission14=Valida les factures dels clients
 Permission15=Envia factures per e-mail
 Permission16=Crear cobraments per factures de client
 Permission19=Elimina factures de client
 Permission21=Consulta pressupostos
 Permission22=Crear/modificar pressupostos
-Permission24=Validar pressupostos
+Permission24=Valida pressupostos
 Permission25=Envia pressupostos
 Permission26=Tancar pressupostos
 Permission27=Elimina pressupostos
@@ -695,9 +697,9 @@ Permission34=Elimina productes
 Permission36=Veure/gestionar els productes ocults
 Permission38=Exportar productes
 Permission39=Ignora el preu mínim
-Permission41=Llegir projectes i tasques (projectes compartits i projectes dels que sóc contacte). També pot introduir temps consumits, per a mi o els meus subordinats, en tasques assignades (Fulls de temps).
-Permission42=Crea/modifica projectes (projectes compartits i projectes dels que sóc contacte). També pot crear tasques i assignar usuaris a projectes i tasques
-Permission44=Elimina projectes (projectes compartits i projectes dels que en sóc contacte)
+Permission41=Consulta projectes i tasques (projecte compartit i projectes dels qui en soc contacte). També pot introduir temps consumits, per a mi o dels meus subordinats, en tasques assignades (Fulls de temps).
+Permission42=Crea/modifica projectes (projecte compartit i projectes dels qui en soc contacte). També pot crear tasques i assignar usuaris al projecte i tasques
+Permission44=Elimina projectes (projecte compartit i projectes de qui en soc contacte)
 Permission45=Exporta projectes
 Permission61=Consulta intervencions
 Permission62=Crea/modifica intervencions
@@ -742,9 +744,9 @@ 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
-Permission141=Consulta tots els projectes i tasques (també els projectes privats dels que no sóc contacte)
-Permission142=Crea/modifica tots els projectes i tasques (també projectes privats dels que no sóc el contacte)
-Permission144=Elimina tots els projectes i tasques (també els projectes privats dels que no sóc contacte)
+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)
 Permission146=Consulta proveïdors
 Permission147=Consulta estadístiques
 Permission151=Llegir domiciliacions
@@ -833,7 +835,7 @@ Permission354=Eliminar o desactivar grups
 Permission358=Exportar usuaris
 Permission401=Consultar havers
 Permission402=Crear/modificar havers
-Permission403=Validar havers
+Permission403=Valida els descomptes
 Permission404=Eliminar havers
 Permission430=Utilitzeu la barra de depuració
 Permission511=Consulta els pagaments dels sous (vostres i subordinats)
@@ -1047,14 +1049,14 @@ VATIsNotUsedExampleFR=A França, es tracta d'associacions que no siguin declarad
 TypeOfSaleTaxes=Tipus d’impost sobre vendes
 LTRate=Tarifa
 LocalTax1IsNotUsed=No subjecte
-LocalTax1IsUsedDesc=Utilitzar un 2on tipus d'impost (diferent de l'IVA)
-LocalTax1IsNotUsedDesc=No utilitzar un 2on tipus d'impost (diferent de l'IVA)
+LocalTax1IsUsedDesc=Utilitza un 2n tipus d'impost (diferent de l'IVA)
+LocalTax1IsNotUsedDesc=No utilitzis un 2n tipus d’impost (diferent de l'IVA)
 LocalTax1Management=2n tipus d'impost
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
 LocalTax2IsNotUsed=No subjecte
-LocalTax2IsUsedDesc=Utilitzar un 3er tipus d'impost (diferent de l'IVA)
-LocalTax2IsNotUsedDesc=No utilitzar un 3er tipus d'impost (diferent de l'IVA)
+LocalTax2IsUsedDesc=Utilitza un 3r tipus d'impost (diferent de l'IVA)
+LocalTax2IsNotUsedDesc=No utilitzis un 3r tipus d'impost (diferent de l'IVA)
 LocalTax2Management=3r tipus d'impost
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
@@ -1084,7 +1086,7 @@ LabelOnDocuments=Etiqueta sobre documents
 LabelOrTranslationKey=Clau de traducció o cadena
 ValueOfConstantKey=Valor d’una constant de configuració
 ConstantIsOn=L'opció %s està activada
-NbOfDays=Nº de dies
+NbOfDays=Nombre de dies
 AtEndOfMonth=A final de mes
 CurrentNext=Actual/Següent
 Offset=Decàleg
@@ -1094,7 +1096,7 @@ MenuUpgrade=Actualització / Extensió
 AddExtensionThemeModuleOrOther=Instal·lar mòduls/complements externs
 WebServer=Servidor web
 DocumentRootServer=Carpeta arrel de les pàgines web
-DataRootServer=Carpeta arrel dels arxius de dades
+DataRootServer=Directori de fitxers de dades
 IP=IP
 Port=Port
 VirtualServerName=Nom del servidor virtual
@@ -1105,11 +1107,11 @@ Database=Base de dades
 DatabaseServer=Host de la base de dades
 DatabaseName=Nom de la base de dades
 DatabasePort=Port de la base de dades
-DatabaseUser=Login de la base de dades
+DatabaseUser=Usuari de la base de dades
 DatabasePassword=Contrasenya de la base de dades
 Tables=Taules
 TableName=Nom de la taula
-NbOfRecord=Nº de registres
+NbOfRecord=Nombre de registres
 Host=Servidor
 DriverType=Tipus de driver
 SummarySystem=Resum de la informació de sistemes Dolibarr
@@ -1123,8 +1125,8 @@ MaxSizeList=Longitud màxima per llistats
 DefaultMaxSizeList=Longitud màxima per defecte per a les llistes
 DefaultMaxSizeShortList=Longitud màxima per defecte en llistes curtes (per exemple, en la fitxa de client)
 MessageOfDay=Missatge del dia
-MessageLogin=Missatge del login
-LoginPage=Pàgina de login
+MessageLogin=Missatge en la pàgina d'inici de sessió
+LoginPage=Pàgina d'inici de sessió
 BackgroundImageLogin=Imatge de fons
 PermanentLeftSearchForm=Zona de recerca permanent del menú de l'esquerra
 DefaultLanguage=Idioma per defecte
@@ -1166,11 +1168,11 @@ Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Factura del client no pagada
 Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Conciliació bancària pendent
 Delays_MAIN_DELAY_MEMBERS=Quota de membre retardada
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Ingrés de xec no realitzat
-Delays_MAIN_DELAY_EXPENSEREPORTS=Informe de despeses per aprovar
+Delays_MAIN_DELAY_EXPENSEREPORTS=Informe de despeses per a aprovar
 Delays_MAIN_DELAY_HOLIDAYS=Dies lliures a aprovar
 SetupDescription1=Abans de començar a utilitzar Dolibarr cal definir alguns paràmetres inicials i habilitar/configurar els mòduls.
 SetupDescription2=Les dues seccions següents són obligatòries (les dues primeres entrades al menú Configuració):
-SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Paràmetres bàsics utilitzats per personalitzar el comportament predeterminat de la teva aplicació (per exemple, per a les funcions relacionades amb el país).
+SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Paràmetres bàsics utilitzats per a personalitzar el comportament per defecte de la vostra aplicació (per exemple, per a funcions relacionades amb el país).
 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.
 LogEvents=Auditoria de la seguretat d'esdeveniments
@@ -1201,12 +1203,12 @@ SessionTimeOut=Temps de desconnexió per a la sessió
 SessionExplanation=Aquest número garanteix que la sessió no caduqui abans d'aquest retard, si el netejador de sessió es fa mitjançant un netejador de sessió de PHP intern (i res més). El netejador de sessió intern de PHP no garanteix que la sessió expire després d'aquest retard. Caducarà, després d'aquest retard, i quan s'executi el netejador de sessió, de manera que cada accés <b> %s / %s </b>, però només durant l'accés fet per altres sessions (si el valor és 0, significa que l'eliminació de la sessió només es fa mitjançant un extern procés). <br> Nota: en alguns servidors amb un mecanisme de neteja de sessió externa (cron sota debian, ubuntu ...), les sessions es poden destruir després d'un període definit per una configuració externa, independentment del valor introduït aquí.
 SessionsPurgedByExternalSystem=Sembla que les sessions en aquest servidor són netejades mitjançant un mecanisme extern (cron sota debian, ubuntu ...), probablement cada  <b> %s </b> segons (= el valor del paràmetre  sessió.gc_maxlifetime ), així que modificant aquest valor aquí no té cap efecte, Heu de sol·licitar a l’administrador del servidor que canviï la durada de la sessió.
 TriggersAvailable=Triggers disponibles
-TriggersDesc=Els triggers són arxius que modifiquen el comportament del fluxe de treball de Dolibarr un cop s'han copiat a la carpeta <b>htdocs/core/triggers</b>. Realitzen noves accions activades pels esdeveniments de Dolibarr (creació d'empresa, validació factura, ...).
+TriggersDesc=Els activadors són fitxers que modificaran el comportament del flux de treball de Dolibarr un cop copiat al directori <b>htdocs/core/triggers</b>. Realitzen accions noves, activades en esdeveniments Dolibarr (creació d'empresa nova, validació de factures, ...).
 TriggerDisabledByName=Triggers d'aquest arxiu desactivador pel sufix <b>-NORUN</b> en el nom de l'arxiu.
 TriggerDisabledAsModuleDisabled=Triggers d'aquest arxiu desactivats ja que el mòdul <b>%s</b> no està activat.
 TriggerAlwaysActive=Triggers d'aquest arxiu sempre actius, ja que els mòduls Dolibarr relacionats estan activats
 TriggerActiveAsModuleActive=Triggers d'aquest arxiu actius ja que el mòdul <b>%s</b> està activat
-GeneratedPasswordDesc=Trieu el mètode que s'utilitzarà per a les contrasenyes auto-generades.
+GeneratedPasswordDesc=Trieu el mètode que s'utilitzarà per a les contrasenyes generades automàticament.
 DictionaryDesc=Afegeix totes les dades de referència. Pots afegir els teus valors per defecte.
 ConstDesc=Aquesta pàgina permet editar (anul·lar) paràmetres no disponibles en altres pàgines. Aquests són paràmetres reservats només per a desenvolupadors o solucions avançades de problemes.
 MiscellaneousDesc=Aquí es defineixen la resta de paràmetres relacionats amb la seguretat.
@@ -1222,15 +1224,15 @@ ParameterActiveForNextInputOnly=Paràmetre efectiu només a partir de les proper
 NoEventOrNoAuditSetup=No s'ha registrat cap esdeveniment de seguretat. Això és normal si l'auditoria no s'ha activat a la pàgina "Configuració - Seguretat - Esdeveniments".
 NoEventFoundWithCriteria=No s'han trobat esdeveniments de seguretat per a aquests criteris de cerca.
 SeeLocalSendMailSetup=Veure la configuració local de sendmail
-BackupDesc=Una còpia de seguretat <b> completa de </b> d'una instal·lació de Dolibarr requereix dos passos.
+BackupDesc=Una còpia de seguretat <b>completa</b> d'una instal·lació Dolibarr requereix dos passos.
 BackupDesc2=Feu una còpia de seguretat del contingut del directori "documents" (<b> %s </b>) que conté tots els fitxers carregats i generats. Això també inclourà tots els fitxers d'escombraries generats al pas 1. Aquesta operació pot tardar uns minuts
 BackupDesc3=Feu una còpia de seguretat de l'estructura i continguts de la vostra base de dades (<b> %s </b>) en un arxiu de bolcat. Per això, podeu utilitzar el següent assistent.
 BackupDescX=La carpeta arxivada haurà de guardar-se en un lloc segur
 BackupDescY=L'arxiu de bolcat generat haurà de guardar-se en un lloc segur.
 BackupPHPWarning=La còpia de seguretat no pot ser garantida amb aquest mètode. És preferible utilitzar l'anterior
-RestoreDesc=Per restaurar una còpia de seguretat de Dolibarr, calen dos passos.
+RestoreDesc=Per a restaurar una còpia de seguretat de Dolibarr, calen dos passos.
 RestoreDesc2=Restaura el fitxer de còpia de seguretat (fitxer zip, per exemple) del directori "documents" a una nova instal·lació de Dolibarr o en aquest directori de documents actual (<b> %s </b>).
-RestoreDesc3=Restaura l'estructura i les dades de la base de dades des d'un fitxer d'emmagatzematge de seguretat a la base de dades de la nova instal·lació de Dolibarr o bé a la base de dades d'aquesta instal·lació actual (<b> %s </b>). Avís, un cop finalitzada la restauració, haureu d'utilitzar un inici de sessió / contrasenya, que existia des de la còpia de seguretat / instal·lació per tornar a connectar-se. <br> Per restaurar una base de dades de còpia de seguretat en aquesta instal·lació actual, podeu seguir aquest assistent.
+RestoreDesc3=Restaura l'estructura i les dades de la base de dades des d'un fitxer d'emmagatzematge de seguretat a la base de dades de la nova instal·lació de Dolibarr o bé a la base de dades d'aquesta instal·lació actual (<b> %s </b>). Avís, un cop finalitzada la restauració, haureu d'utilitzar un usuari/contrasenya, que existia en el moment de la còpia de seguretat per a tornar a connectar-se. <br> Per a restaurar una base de dades de còpia de seguretat en aquesta instal·lació actual, podeu seguir aquest assistent.
 RestoreMySQL=Importació MySQL
 ForcedToByAModule=Aquesta regla està forçada a <b>%s</b> per un dels mòduls activats
 ValueIsForcedBySystem=Aquest valor és forçat pel sistema. No es pot canviar.
@@ -1240,7 +1242,7 @@ WeekStartOnDay=Primer dia de la setmana
 RunningUpdateProcessMayBeRequired=Sembla que cal executar el procés d’actualització (la versió del programa %s és diferent de la versió de la base de dades %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Ha d'executar la comanda des d'un shell després d'haver iniciat sessió amb el compte <b>%s</b>.
 YourPHPDoesNotHaveSSLSupport=Funcions SSL no disponibles al vostre PHP
-DownloadMoreSkins=Més temes per descarregar
+DownloadMoreSkins=Més temes per a descarregar
 SimpleNumRefModelDesc=Retorna el número de referència amb el format %syymm-nnnn on yy és l'any, mm és el mes i nnnn és el seqüencial sense inicialitzar
 ShowProfIdInAddress=Mostra l'identificador professional amb adreces
 ShowVATIntaInAddress=Amaga el número d'IVA intracomunitari amb adreces
@@ -1250,7 +1252,7 @@ MeteoStdMod=Mode estàndard
 MeteoStdModEnabled=Mode estàndard habilitat
 MeteoPercentageMod=Mode percentual
 MeteoPercentageModEnabled=Mode de percentatge activat
-MeteoUseMod=Feu clic per utilitzar %s
+MeteoUseMod=Feu clic per a utilitzar %s
 TestLoginToAPI=Comprovar connexió a l'API
 ProxyDesc=Algunes característiques de Dolibarr requereixen accés a Internet. Definiu aquí els paràmetres de connexió a Internet, com ara l'accés a través d'un servidor proxy, si és necessari.
 ExternalAccess=Accés extern / accés a Internet
@@ -1276,12 +1278,12 @@ ExtraFieldsSupplierInvoices=Atributs complementaris (factures)
 ExtraFieldsProject=Atributs complementaris (projectes)
 ExtraFieldsProjectTask=Atributs complementaris (tasques)
 ExtraFieldsSalaries=Atributs complementaris (sous)
-ExtraFieldHasWrongValue=L'atribut %s té un valor no valid
+ExtraFieldHasWrongValue=L'atribut %s té un valor incorrecte.
 AlphaNumOnlyLowerCharsAndNoSpace=només caràcters alfanumèrics i en minúscula sense espai
 SendmailOptionNotComplete=Atenció, en alguns sistemes Linux, amb aquest mètode d'enviament, per poder enviar mails en nom seu, la configuració de sendmail ha de contenir l'opció <b>-ba</b> (paràmetre <b>mail.force_extra_parameters</b> a l'arxiu <b>php.ini</b>). Si alguns dels seus destinataris no reben els seus missatges, proveu de modificar aquest paràmetre PHP amb <b>mail.force_extra_parameters =-ba </b>.
 PathToDocuments=Rutes d'accés a documents
 PathDirectory=Catàleg
-SendmailOptionMayHurtBuggedMTA=La característica per enviar correus mitjançant el mètode "correu directe de PHP" generarà un missatge de correu que podria no ser analitzat correctament per alguns servidors de correu rebuts. El resultat és que alguns usuaris no poden llegir alguns mails d'aquestes plataformes falses. Aquest és el cas d'alguns proveïdors d'Internet (Ex: Orange a França). Això no és un problema amb Dolibarr o PHP, però amb el servidor de correu rebedor. Tanmateix, podeu afegir una opció MAIN_FIX_FOR_BUGGED_MTA a 1 en la instal·lació: una altra per modificar Dolibarr per evitar-ho. Tanmateix, pot tenir problemes amb altres servidors que utilitzin estrictament l'estàndard SMTP. L'altra solució (recomanada) és utilitzar el mètode "biblioteca de sockets SMTP" que no té cap desavantatge.
+SendmailOptionMayHurtBuggedMTA=La característica per a enviar correus mitjançant el mètode "correu directe de PHP" generarà un missatge de correu que podria no ser analitzat correctament per alguns servidors de correu entrant. El resultat és que alguns usuaris no poden llegir alguns correus d'aquestes plataformes errònies. Aquest és el cas d'alguns proveïdors d'Internet (Ex: Orange a França). Això no és un problema amb Dolibarr o PHP, però sí amb el servidor de correu entrant. Tanmateix, podeu afegir una opció MAIN_FIX_FOR_BUGGED_MTA a 1 a Configuració - Altres per a modificar Dolibarr per tal d'evitar-ho. Tanmateix, podeu tenir problemes amb altres servidors que utilitzin estrictament l'estàndard SMTP. L'altra solució (recomanada) és utilitzar el mètode "llibreria de sockets SMTP" que no té cap desavantatge.
 TranslationSetup=Configuració de traducció
 TranslationKeySearch=Cerca una clau o cadena de traducció
 TranslationOverwriteKey=Sobreescriu una cadena de traducció
@@ -1306,7 +1308,7 @@ YouUseBestDriver=Utilitzeu el controlador %s, que és el millor controlador disp
 YouDoNotUseBestDriver=S'utilitza el controlador %s, però es recomana utilitzar el controlador %s.
 NbOfObjectIsLowerThanNoPb=Només teniu %s %s a la base de dades. Això no requereix cap optimització particular.
 SearchOptim=Cerca optimització
-YouHaveXObjectUseSearchOptim=Teniu %s %s a la base de dades. Hauríeu d’afegir la constant %s a 1 a Home-Setup-Other. Limiteu la cerca a l'inici de cadenes, cosa que permet que la base de dades utilitzeu índexs i haureu d'obtenir una resposta immediata.
+YouHaveXObjectUseSearchOptim=Teniu %s %s a la base de dades. Podeu afegir la constant %s a 1 a Inici-Configuració-Altres. Limiteu la cerca al començament de les cadenes, cosa que fa possible que la base de dades utilitzi índexs i hauríeu d'obtenir una resposta immediata.
 YouHaveXObjectAndSearchOptimOn=Teniu %s %s a la base de dades i %s constant es configura com a 1 a Home-Setup-Other.
 BrowserIsOK=Esteu utilitzant el navegador web %s. Aquest navegador està bé per a la seguretat i el rendiment.
 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.
@@ -1324,8 +1326,8 @@ DocumentModules=Models de documents
 ##### Module password generation
 PasswordGenerationStandard=Retorna una contrasenya generada segons l'algorisme intern de Dolibarr: %s caràcters amb barreja de números i caràcters en minúscula.
 PasswordGenerationNone=No suggereixis una contrasenya generada. La contrasenya s'ha d'escriure manualment.
-PasswordGenerationPerso=Retorna una contrasenya d'acord a la seva configuració personalitzada.
-SetupPerso=D'acord a la teva configuració
+PasswordGenerationPerso=Retorna una contrasenya segons la vostra configuració personalitzada.
+SetupPerso=Segons la vostra configuració
 PasswordPatternDesc=Descripció patró contrasenya
 ##### Users setup #####
 RuleForGeneratedPasswords=Regles per a generar i validar contrasenyes
@@ -1340,7 +1342,7 @@ HRMSetup=Configuració de mòdul de gestió de recursos humans
 ##### Company setup #####
 CompanySetup=Configuració del mòdul empreses
 CompanyCodeChecker=Opcions per a la generació automàtica de codis de client / proveïdor
-AccountCodeManager=Opcions per generar automàticament codis de comptabilitat de client / proveïdor
+AccountCodeManager=Opcions per a la generació automàtica de comptes comptables de client/proveïdor
 NotificationsDesc=Les notificacions per correu electrònic es poden enviar automàticament per a alguns esdeveniments de Dolibarr. <br> Es poden definir els destinataris de les notificacions:
 NotificationsDescUser=* per usuari, un usuari alhora.
 NotificationsDescContact=* per contactes de tercers (clients o venedors), un contacte a la vegada.
@@ -1388,8 +1390,8 @@ SupplierProposalNumberingModules=Models de numeració de sol·licitud de preus a
 SupplierProposalPDFModules=Models de documents de sol·licituds de preus a proveïdors
 FreeLegalTextOnSupplierProposal=Text lliure en sol·licituds de preus a proveïdors
 WatermarkOnDraftSupplierProposal=Marca d'aigua en sol·licituds de preus a proveïdors (en cas d'estar buit)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Preguntar per compte bancari per utilitzar en el pressupost
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Preguntar per el magatzem d'origen per a la comanda
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Demana el compte bancari a utilitzar en el pressupost
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Demana pel magatzem d'origen per a la comanda
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Demana el compte bancari de destí de la comanda de compra
 ##### Orders #####
@@ -1399,8 +1401,8 @@ OrdersNumberingModules=Models de numeració de comandes
 OrdersModelModule=Models de documents de comandes
 FreeLegalTextOnOrders=Text lliure en comandes
 WatermarkOnDraftOrders=Marca d'aigua en comandes esborrany (en cas d'estar buit)
-ShippableOrderIconInList=Afegir una icona en el llistat de comandes que indica si la comanda és enviable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Preguntar pel compte bancari a l'utilitzar la comanda
+ShippableOrderIconInList=Afegeix una icona a la llista de comandes que indiqui si la comanda es pot enviar
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Demana el compte bancari de destí en la comanda
 ##### Interventions #####
 InterventionsSetup=Configuració del mòdul intervencions
 FreeLegalTextOnInterventions=Text addicional en les fitxes d'intervenció
@@ -1499,11 +1501,11 @@ LDAPSetupForVersion3=Servidor LDAP configurat en versió 3
 LDAPSetupForVersion2=Servidor LDAP configurat en versió 2
 LDAPDolibarrMapping=Mapping Dolibarr
 LDAPLdapMapping=Mapping LDAP
-LDAPFieldLoginUnix=Login (unix)
+LDAPFieldLoginUnix=Nom d'usuari (unix)
 LDAPFieldLoginExample=Exemple: uid
 LDAPFilterConnection=Filtre de cerca
 LDAPFilterConnectionExample=Exemple: & (objectClass = inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
+LDAPFieldLoginSamba=Nom d'usuari (samba, activedirectory)
 LDAPFieldLoginSambaExample=Exemple: samaccountname
 LDAPFieldFullname=Nom complet
 LDAPFieldFullnameExample=Exemple: cn
@@ -1569,7 +1571,7 @@ NotSlowedDownByThis=No frenat per això.
 NotRiskOfLeakWithThis=No hi ha risc de filtració amb això.
 ApplicativeCache=Aplicació memòria cau
 MemcachedNotAvailable=No s'ha trobat una aplicació de cache. Pot millorar el rendiment instal·lant un cache server Memcached i un mòdul capaç d'utilitzar aquest servidor de cache.<br>Mes informació aquí <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Tingui en compte que alguns hostings no ofereixen servidors cache.
-MemcachedModuleAvailableButNotSetup=S'ha trobat el mòdul memcached per a la aplicació de memòria cau, però la configuració del mòdul no està completa.
+MemcachedModuleAvailableButNotSetup=S'ha trobat el mòdul memcached per a l'aplicació de memòria cau, però la configuració del mòdul no està completa.
 MemcachedAvailableAndSetup=El mòdul memcached dedicat a utilitzar el servidor memcached està habilitat.
 OPCodeCache=OPCode memòria cau
 NoOPCodeCacheFound=No s'ha trobat cap memòria cau OPCode. Potser utilitzeu una memòria cau OPCode diferent de XCache o eAccelerator (bé), o potser no tingueu la memòria cau OPCode (molt dolenta).
@@ -1585,7 +1587,7 @@ CompressionOfResources=Compressió de les respostes HTTP
 CompressionOfResourcesDesc=Per exemple, utilitzant la directiva Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=La detecció automàtica no és possible amb els navegadors actuals
 DefaultValuesDesc=Aquí podeu definir el valor predeterminat que voleu utilitzar quan creeu un registre nou, i / o filtres predeterminats o l'ordre de classificació quan enumereu els registres.
-DefaultCreateForm=Valors per defecte (per utilitzar-los en formularis)
+DefaultCreateForm=Valors predeterminats (per a utilitzar en formularis)
 DefaultSearchFilters=Filtres de cerca per defecte
 DefaultSortOrder=Tipus d'ordenació per defecte
 DefaultFocus=Camps d'enfocament per defecte
@@ -1596,8 +1598,13 @@ 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=Mostra les descripcions dels productes en els formularis (en cas contrari es mostra en una finestra emergent de suggeriments)
+DoNotAddProductDescAtAddLines=No afegiu la descripció del producte (de la fitxa de producte) en afegir línies als formularis
+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.
+DoNotUseDescriptionOfProdut=La descripció del producte mai no s’inclourà a la descripció de les línies de documents
 MergePropalProductCard=Activeu a la pestanya Fitxers adjunts de productes/serveis una opció per combinar el document PDF del producte amb el PDF del pressupost si el producte/servei es troba en ell
-ViewProductDescInThirdpartyLanguageAbility=Mostra les descripcions dels productes en l'idioma del tercer
+ViewProductDescInThirdpartyLanguageAbility=Mostra les descripcions dels productes en formularis en l'idioma del tercer (en cas contrari, en l'idioma de l'usuari)
 UseSearchToSelectProductTooltip=A més, si teniu un gran nombre de productes (> 100.000), podeu augmentar la velocitat establiint la constant PRODUCT_DONOTSEARCH_ANYWHERE a 1 a Configuració->Altres. La cerca es limitarà a l'inici de la cadena.
 UseSearchToSelectProduct=Espereu fins que premeu una tecla abans de carregar el contingut de la llista combinada del producte (això pot augmentar el rendiment si teniu una gran quantitat de productes, però és menys convenient)
 SetDefaultBarcodeTypeProducts=Tipus de codi de barres utilitzat per defecte per als productes
@@ -1617,7 +1624,7 @@ ErrorUnknownSyslogConstant=La constant %s no és una constant syslog coneguda
 OnlyWindowsLOG_USER=En Windows, només s'admetrà la funció LOG_USER
 CompressSyslogs=Compressió i còpia de seguretat dels fitxers de registre de depuració (generats pel mòdul Log per depurar)
 SyslogFileNumberOfSaves=Nombre de registres de còpia de seguretat que cal conservar
-ConfigureCleaningCronjobToSetFrequencyOfSaves=Configura la tasca programada de neteja per establir la freqüència de còpia de seguretat del registre
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configureu la tasca programada de neteja per a establir la freqüència de còpia de seguretat del registre
 ##### Donations #####
 DonationsSetup=Configuració del mòdul donacions
 DonationsReceiptModel=Plantilla de rebut de donació
@@ -1657,8 +1664,8 @@ NotificationEMailFrom=Correu electrònic del remitent (des de) per als correus e
 FixedEmailTarget=Destinatari
 ##### Sendings #####
 SendingsSetup=Configuració del mòdul d'enviament
-SendingsReceiptModel=Model de rebut de lliurament
-SendingsNumberingModules=Mòduls de numeració de notes de lliurament
+SendingsReceiptModel=Model de rebut d’enviament
+SendingsNumberingModules=Mòduls de numeració d'enviaments
 SendingsAbility=Suport en fulles d'expedició per entregues de clients
 NoNeedForDeliveryReceipts=En la majoria dels casos, els fulls d'enviament s'utilitzen tant com a fulls de lliurament de clients (llista de productes a enviar) i fulls rebuts i signats pel client. Per tant, el rebut de lliurament del producte és una característica duplicada i rarament s'activa.
 FreeLegalTextOnShippings=Text lliure en els enviaments
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Els menús personalitzats no estan enllaçats a una e
 NewMenu=Menú nou
 MenuHandler=Gestor de menús
 MenuModule=Mòdul origen
-HideUnauthorizedMenu= Amaga també els menús no autoritzats a usuaris interns (si no només atenuats)
+HideUnauthorizedMenu=Amaga els menús no autoritzats també per als usuaris interns (en cas contrari, en gris)
 DetailId=Identificador del menú
 DetailMenuHandler=Nom del gestor de menús
 DetailMenuModule=Nom del mòdul si l'entrada del menú és resultant d'un mòdul
@@ -1717,7 +1724,7 @@ OptionVatDebitOptionDesc=L'IVA es deu: <br> - en el lliurament de mercaderies (s
 OptionPaymentForProductAndServices=Base de caixa de productes i serveis
 OptionPaymentForProductAndServicesDesc=L'IVA es deu: <br> - pel pagament de béns <br> - sobre els pagaments per serveis
 SummaryOfVatExigibilityUsedByDefault=Durada de l'elegibilitat de l'IVA per defecte d'acord amb l'opció escollida:
-OnDelivery=Al lliurament
+OnDelivery=En entrega
 OnPayment=Al pagament
 OnInvoice=A la factura
 SupposedToBePaymentDate=Data de pagament utilitzada
@@ -1725,7 +1732,7 @@ SupposedToBeInvoiceDate=Data de factura utilitzada
 Buy=Compra
 Sell=Venda
 InvoiceDateUsed=Data utilitzada de factura
-YourCompanyDoesNotUseVAT=L'empresa s'ha configurat com a no subjecta a IVA (Inici - Configuració - Empresa/Organització), per tant no hi ha opcions per configurar l'IVA.
+YourCompanyDoesNotUseVAT=L'empresa s'ha configurat com a no subjecta a IVA (Inici - Configuració - Empresa/Organització), per tant no hi ha opcions per a configurar l'IVA.
 AccountancyCode=Codi comptable
 AccountancyCodeSell=Codi comptable vendes
 AccountancyCodeBuy=Codi comptable compres
@@ -1761,7 +1768,7 @@ CashDeskDoNotDecreaseStock=Desactiva la reducció d'estoc quan es realitza una v
 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
 StockDecreaseForPointOfSaleDisabledbyBatch=La disminució d'accions en POS no és compatible amb el mòdul de gestió de Serial / Lot (actualment actiu) perquè la disminució de l'estoc està desactivada.
-CashDeskYouDidNotDisableStockDecease=No va desactivar la disminució de les existències en fer una venda des del punt de venda. Per tant, es requereix un magatzem.
+CashDeskYouDidNotDisableStockDecease=No vau desactivar la disminució de l'estoc en fer una venda des del TPV. Per tant, es requereix un magatzem.
 CashDeskForceDecreaseStockLabel=La disminució d’estoc dels productes per lots es obligada.
 CashDeskForceDecreaseStockDesc=Disminuïu primer les dates més antigues de consumir i vendre.
 CashDeskReaderKeyCodeForEnter=Codi clau per a "Enter" definit al lector de codi de barres (Exemple: 13)
@@ -1777,11 +1784,11 @@ EndPointIs=Els clients SOAP han d’enviar les seves sol·licituds al punt final
 ##### API ####
 ApiSetup=Configuració del mòdul API
 ApiDesc=Habilitant aquest mòdul, Dolibarr serà un servidor REST per oferir varis serveis web.
-ApiProductionMode=Activa el mode de producció (activarà l'ús de cachés per a la gestió de serveis)
+ApiProductionMode=Activa el mode de producció (activarà l'ús d'una memòria cau per a la gestió de serveis)
 ApiExporerIs=Pots explorar i provar les API en la URL
 OnlyActiveElementsAreExposed=Només s'exposen els elements de mòduls habilitats
 ApiKey=Clau per l'API
-WarningAPIExplorerDisabled=S'ha deshabilitat l'explorador de API. No és necessari API Explorer per a proporcionar serveis API. És una ferramenta per a que el desenvolupador trobe/probe API REST. Si necessita aquesta ferramenta, vaja a la configuració del mòdul API REST per activar-la.
+WarningAPIExplorerDisabled=S'ha desactivat l'explorador d'API. L'explorador d'API no és necessari per a proporcionar serveis d'API. És una eina perquè el desenvolupador pugui trobar/provar API REST. Si necessiteu aquesta eina, aneu a la configuració del mòdul API REST per a activar-la.
 ##### Bank #####
 BankSetupModule=Configuració del mòdul Banc
 FreeLegalTextOnChequeReceipts=Text lliure en els rebuts de xecs
@@ -1803,7 +1810,7 @@ IfSetToYesDontForgetPermission=Si establiu un valor vàlid, no us oblideu d'esta
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Configuració del mòdul GeoIP  Maxmind
 PathToGeoIPMaxmindCountryDataFile=Ruta al fitxer que conté Maxmind ip a la traducció del país. <br> Exemples: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoLite2-Country.mmdb
-NoteOnPathLocation=Tingueu en compte que aquest arxiu ha d'estar en una carpeta accessible desde la seva PHP (Comproveu la configuració de open_basedir de la seva PHP i els permisos d'arxiu/carpetes).
+NoteOnPathLocation=Tingueu en compte que el fitxer de dades IP a país ha de ser dins d’un directori que pugui llegir PHP (Comproveu la configuració de PHP open_basedir i els permisos del sistema de fitxers).
 YouCanDownloadFreeDatFileTo=Pot descarregar-se una <b>versió demo gratuïta</b> de l'arxiu de països  Maxmind GeoIP a l'adreça %s.
 YouCanDownloadAdvancedDatFileTo=També pot descarregar-se una <b>versió més completa</b> de l'arxiu de països Maxmind GeoIP a l'adreça %s.
 TestGeoIPResult=Test de conversió IP -> País
@@ -1825,7 +1832,7 @@ DeleteFiscalYear=Eliminar any fiscal
 ConfirmDeleteFiscalYear=Esteu segur d'eliminar aquest any fiscal?
 ShowFiscalYear=Mostra el període comptable
 AlwaysEditable=Sempre es pot editar
-MAIN_APPLICATION_TITLE=Força veure el nom de l'aplicació (advertència: indicar el teu propi nom aquí pot trencar la característica d'auto-omplir l'inici de sessió en utilitzar l'aplicació mòbil DoliDroid)
+MAIN_APPLICATION_TITLE=Força el nom visible de l'aplicació (advertència: definir el vostre propi nom aquí pot trencar la funció d'inici de sessió d'emplenament automàtic quan s'utilitza l'aplicació mòbil DoliDroid)
 NbMajMin=Nombre mínim de caràcters en majúscules
 NbNumMin=Nombre mínim de caràcters numèrics
 NbSpeMin=Nombre mínim de caràcters especials
@@ -1839,8 +1846,8 @@ IncludePath=Incloure ruta (que es defineix a la variable %s)
 ExpenseReportsSetup=Configuració del mòdul Informe de Despeses
 TemplatePDFExpenseReports=Plantilles de documents per a generar un document d’informe de despeses
 ExpenseReportsRulesSetup=Configurar mòdul Informes de despeses - Regles
-ExpenseReportNumberingModules=Número del mòdul Informe de despeses
-NoModueToManageStockIncrease=No esta activat el mòdul per gestionar automàticament l'increment d'estoc. L'increment d'estoc es realitzara només amb l'entrada manual
+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ó".
 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**
@@ -1853,7 +1860,7 @@ BackupZipWizard=Assistent per 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ó
-ConfFileMustContainCustom=Per instal·lar o crear un mòdul extern desde l'aplicació es necessita desar els fitxers del mòdul en el directori <strong>%s</strong>. Per 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>
+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)
@@ -1911,10 +1918,10 @@ MailToProject=Projectes
 MailToTicket=Tiquets
 ByDefaultInList=Mostra per defecte en la vista del llistat
 YouUseLastStableVersion=Estàs utilitzant l'última versió estable
-TitleExampleForMajorRelease=Exemple de missatge que es pot utilitzar per anunciar aquesta actualització de versió (ets lliure d'utilitzar-ho a les teves webs)
-TitleExampleForMaintenanceRelease=Exemple de missatge que es pot utilitzar per anunciar aquesta actualització de manteniment (ets lliure d'utilitzar-ho a les teves webs)
+TitleExampleForMajorRelease=Exemple de missatge que podeu utilitzar per a anunciar aquesta actualització de versió (no dubteu a utilitzar-lo als vostres llocs web)
+TitleExampleForMaintenanceRelease=Exemple de missatge que podeu utilitzar per a anunciar aquesta versió de manteniment (no dubteu a utilitzar-lo als vostres llocs web)
 ExampleOfNewsMessageForMajorRelease=Disponible ERP/CRM Dolibarr %s. La versió %s és una versió major amb un munt de noves característiques, tant per a usuaris com per a desenvolupadors. Es pot descarregar des de la secció de descàrregues del portal https://www.dolibarr.org (subdirectori versions estables). Podeu llegir <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> per veure la llista completa dels canvis.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s està disponible. La versió %s és una versió de manteniment, de manera que només conté correccions d'errors. Us recomanem que tots els usuaris actualitzeu aquesta versió. Un llançament de manteniment no introdueix novetats ni canvis a la base de dades. Podeu descarregar-lo des de l'àrea de descàrrega del portal https://www.dolibarr.org (subdirectori de les versions estables). Podeu llegir el <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> per obtenir una llista completa dels canvis.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s està disponible. La versió %s és una versió de manteniment, de manera que només conté correccions d'errors. Us recomanem que tots els usuaris actualitzeu aquesta versió. Un llançament de manteniment no introdueix novetats ni canvis a la base de dades. Podeu descarregar-lo des de l'àrea de descàrrega del portal https://www.dolibarr.org (subdirectori de les versions estables). Podeu llegir el <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> per a obtenir una llista completa dels canvis.
 MultiPriceRuleDesc=Quan l'opció "Diversos nivells de preus per producte/servei" està activada, podeu definir preus diferents (un preu per nivell) per a cada producte. Per a estalviar-vos temps, aquí podeu introduir una regla per calcular automàticament un preu per a cada nivell en funció del preu del primer nivell, de manera que només haureu d'introduir un preu per al primer nivell per a cada producte. Aquesta pàgina està dissenyada per a estalviar-vos temps, però només és útil si els preus de cada nivell són relatius al primer nivell. Podeu ignorar aquesta pàgina en la majoria dels casos.
 ModelModulesProduct=Plantilles per documents de productes
 WarehouseModelModules=Plantilles per a documents de magatzems
@@ -1939,7 +1946,7 @@ AddOtherPagesOrServices=Afegeix altres pàgines o serveis
 AddModels=Afegeix document o model de numeració
 AddSubstitutions=Afegeix claus de substitució
 DetectionNotPossible=Detecció no possible
-UrlToGetKeyToUseAPIs=Url per obtenir el token per utilitzar l'API (una vegada que s'ha rebut el testimoni es guarda a la taula d'usuaris de la base de dades i s'ha de proporcionar en cada trucada de l'API)
+UrlToGetKeyToUseAPIs=URL per a obtenir el testimoni per a utilitzar l'API (un cop rebut el testimoni, es desa a la taula d'usuaris de la base de dades i s'ha de proporcionar a cada trucada de l'API)
 ListOfAvailableAPIs=Llistat de APIs disponibles
 activateModuleDependNotSatisfied=El mòdul "%s" depèn del mòdul "%s", que falta, de manera que el mòdul "%1$s" pot no funcionar correctament. Instal·leu el mòdul "%2$s" o desactiveu el mòdul "%1$s" si voleu estar segur de qualsevol sorpresa.
 CommandIsNotInsideAllowedCommands=L'ordre que intenteu executar no es troba a la llista de comandaments permesos definits al paràmetre <strong> $ dolibarr_main_restrict_os_commands </strong> al fitxer <strong> conf.php </strong>.
@@ -1983,15 +1990,16 @@ EMailHost=Servidor IMAP de correu electrònic
 MailboxSourceDirectory=Directori d'origen de la bústia
 MailboxTargetDirectory=Directori de destinació de la bústia
 EmailcollectorOperations=Operacions a fer per recol·lector
+EmailcollectorOperationsDesc=Les operacions s’executen de dalt a baix
 MaxEmailCollectPerCollect=Nombre màxim de correus electrònics recopilats per recollida
 CollectNow=Recolliu ara
 ConfirmCloneEmailCollector=Esteu segur que voleu clonar el recollidor de correu electrònic %s?
-DateLastCollectResult=Data del darrer intent de recollida
+DateLastCollectResult=Data de l'últim intent de recollida
 DateLastcollectResultOk=Data de la darrera recollida amb èxit
 LastResult=Últim resultat
 EmailCollectorConfirmCollectTitle=Confirmació de recollida de correu electrònic
 EmailCollectorConfirmCollect=Voleu executar ara la recol·lecció d’aquest col·lector?
-NoNewEmailToProcess=No hi ha cap altre correu electrònic (filtres coincidents) per processar
+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
@@ -2005,17 +2013,17 @@ WithDolTrackingID=Missatge d'una conversa iniciada per un primer correu electrò
 WithoutDolTrackingID=Missatge d'una conversa iniciada per un primer correu electrònic NO enviat des de Dolibarr
 WithDolTrackingIDInMsgId=Missatge enviat des de Dolibarr
 WithoutDolTrackingIDInMsgId=Missatge NO enviat des de Dolibarr
-CreateCandidature=Crea candidatura
-FormatZip=Codi postal
+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 emprar per l'objecte de l'acció, o com extreure valors. Per exemple:<br>objproperty1=SET:el valor a assignar<br>objproperty2=SET:un valor am 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 un punt i coma (;) com a separadorper a extreure o definir vàries propietats alhora.
+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.
 OpeningHours=Horari d'obertura
 OpeningHoursDesc=Introduïu aquí l'horari habitual d'obertura de la vostra empresa.
 ResourceSetup=Configuració del mòdul de recursos
 UseSearchToSelectResource=Utilitza un formulari de cerca per a seleccionar un recurs (millor que una llista desplegable)
-DisabledResourceLinkUser=Desactiva la funció per enllaçar un recurs als usuaris
-DisabledResourceLinkContact=Desactiva la funció per enllaçar un recurs als contactes
+DisabledResourceLinkUser=Desactiva la funció per a enllaçar un recurs amb els usuaris
+DisabledResourceLinkContact=Desactiva la funció per a enllaçar un recurs amb els contactes
 EnableResourceUsedInEventCheck=Habilita la funció per comprovar si s’utilitza un recurs en un esdeveniment
 ConfirmUnactivation=Confirma el restabliment del mòdul
 OnMobileOnly=Només en pantalla petita (telèfon intel·ligent)
@@ -2051,8 +2059,8 @@ SmallerThan=Menor que
 LargerThan=Major que
 IfTrackingIDFoundEventWillBeLinked=Tingueu en compte que si es troba un identificador de seguiment d’un objecte al correu electrònic o si el correu electrònic és una resposta d’un correu electrònic que ja està recollit i enllaçat a un objecte, l’esdeveniment creat s’enllaçarà automàticament a l’objecte relacionat conegut.
 WithGMailYouCanCreateADedicatedPassword=Amb un compte de GMail, si heu activat la validació de dos passos, es recomana crear una segona contrasenya dedicada a l’aplicació en comptes d’utilitzar la contrasenya del vostre compte des de https://myaccount.google.com/.
-EmailCollectorTargetDir=Pot ser un comportament desitjat traslladar el correu electrònic a una altra etiqueta / directori quan s'ha processat correctament. Només heu de definir el nom del directori per utilitzar aquesta funció (NO utilitzeu caràcters especials en nom). Tingueu en compte que també heu d'utilitzar un compte d'inici de sessió de lectura / escriptura.
-EmailCollectorLoadThirdPartyHelp=Podeu utilitzar aquesta acció per a 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. Al camp del paràmetre podeu utilitzar, per exemple, 'EXTRACT:BODY:Name:\\s([^\\s]*)' si voleu extreure el nom del tercer d'una cadena 'Name:name to find' que es troba al cos.
+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 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. Al camp del paràmetre podeu utilitzar, per exemple, 'EXTRACT:BODY:Name:\\s([^\\s]*)' si voleu extreure el nom del tercer d'una cadena 'Name:name to find' que es troba al cos.
 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?
@@ -2066,20 +2074,24 @@ MakeAnonymousPing=Creeu un ping &quot;+1&quot; anònim al servidor de bases Doli
 FeatureNotAvailableWithReceptionModule=Funció no disponible quan el mòdul Recepció està habilitat
 EmailTemplate=Plantilla per correu electrònic
 EMailsWillHaveMessageID=Els correus electrònics tindran una etiqueta "Referències" que coincideix amb aquesta sintaxi
-PDF_USE_ALSO_LANGUAGE_CODE=Si voleu tenir alguns textos del vostre PDF duplicats en 2 idiomes diferents en el mateix PDF generat, heu d’establir aquí aquest segon idioma a fi que el PDF generat contingui 2 idiomes diferents a la mateixa pàgina, el triat per generar el PDF i aquest segon ( només algunes plantilles PDF suporten això). Manteniu-lo buit per a 1 idioma per PDF.
+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.
 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.
 FeatureNotAvailableWithReceptionModule=Funció no disponible quan el mòdul Recepció està habilitat
-RssNote=Nota: Cada definició de canal RSS proporciona un giny que heu d'habilitar per tenir-lo disponible al tauler de control
+RssNote=Nota: Cada definició del canal RSS proporciona un giny que heu d’habilitar per a tenir-lo disponible al tauler de control
 JumpToBoxes=Vés a Configuració -> Ginys
-MeasuringUnitTypeDesc=Utilitzeu aquí un valor com "size", "surface", "volume", "weight", "time"
+MeasuringUnitTypeDesc=Utilitzeu aquí un valor com "mida", "superfície", "volum", "pes", "temps"
 MeasuringScaleDesc=L'escala és el nombre de llocs que heu de moure la part decimal per a coincidir amb la unitat de referència predeterminada. Per al tipus d'unitat de "temps", és el nombre de segons. Els valors entre 80 i 99 són valors reservats.
 TemplateAdded=S'ha afegit la plantilla
 TemplateUpdated=Plantilla actualitzada
 TemplateDeleted=S'ha suprimit la plantilla
 MailToSendEventPush=Correu electrònic de recordatori d'esdeveniments
-SwitchThisForABetterSecurity=Es recomana canviar aquest valor a %s per obtenir més seguretat
+SwitchThisForABetterSecurity=Es recomana canviar aquest valor a %s per a obtenir més seguretat
 DictionaryProductNature= Naturalesa del producte
 CountryIfSpecificToOneCountry=País (si és específic d'un país determinat)
 YouMayFindSecurityAdviceHere=Podeu trobar assessorament de seguretat aquí
 ModuleActivatedMayExposeInformation=Aquest mòdul pot exposar dades sensibles. Si no el necessiteu, desactiveu-lo.
 ModuleActivatedDoNotUseInProduction=S'ha habilitat un mòdul dissenyat per al desenvolupament. No l'activeu en un entorn de producció.
+CombinationsSeparator=Caràcter separador per a combinacions de productes
+SeeLinkToOnlineDocumentation=Vegeu l'enllaç a la documentació en línia al menú superior per a obtenir exemples
+SHOW_SUBPRODUCT_REF_IN_PDF=Si s'utilitza la funció "%s" del mòdul <b> %s </b>, mostra els detalls dels subproductes d'un kit en el PDF.
+AskThisIDToYourBank=Poseu-vos en contacte amb el vostre banc per a obtenir aquesta identificació
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index ac453608960..7950ff65d5b 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -34,7 +34,7 @@ AutoActions= Inclusió automàtica a l'agenda
 AgendaAutoActionDesc= Aquí pots definir esdeveniments que vols que Dolibarr creï automàticament a Agenda. Si no hi ha res comprovat, només s'inclouran les accions manuals als registres i es mostraran a Agenda. El seguiment automàtic de les accions empresarials realitzades en objectes (validació, canvi d'estat) no es desarà.
 AgendaSetupOtherDesc= Aquesta pàgina permet configurar algunes opcions que permeten exportar una vista de la seva agenda Dolibar a un calendari extern (thunderbird, google calendar, ...)
 AgendaExtSitesDesc=Aquesta pàgina permet configurar calendaris externs per a la seva visualització en l'agenda de Dolibarr.
-ActionsEvents=Esdeveniments per a què Dolibarr crei una acció de forma automàtica
+ActionsEvents=Esdeveniments pels quals Dolibarr crearà una acció a l'agenda automàticament
 EventRemindersByEmailNotEnabled=Els recordatoris d'esdeveniments per correu electrònic no estaven habilitats en la configuració del mòdul %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Tercer %s creat
@@ -60,7 +60,7 @@ MemberSubscriptionModifiedInDolibarr=Subscripció %s per a membre %s, modificada
 MemberSubscriptionDeletedInDolibarr=Subscripció %s per a membre %s, eliminada
 ShipmentValidatedInDolibarr=Expedició %s validada
 ShipmentClassifyClosedInDolibarr=Expedició %s classificada com a facturada
-ShipmentUnClassifyCloseddInDolibarr=Enviament %s classificat com a re-obert
+ShipmentUnClassifyCloseddInDolibarr=Enviament %s classificat de nou com a obert
 ShipmentBackToDraftInDolibarr=Enviament %s retornat a l'estat d'esborrany
 ShipmentDeletedInDolibarr=Expedició %s eliminada
 ReceptionValidatedInDolibarr=S'ha validat la recepció %s
@@ -131,7 +131,7 @@ AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> per a restringir la sortida d'
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> per excloure esdeveniments automàtics.
 AgendaUrlOptionsIncludeHolidays= <b> includeholidays = 1 </b> per incloure esdeveniments de vacances.
 AgendaShowBirthdayEvents=Mostra aniversaris dels contactes
-AgendaHideBirthdayEvents=Oculta aniversaris dels contactes
+AgendaHideBirthdayEvents=Amaga els aniversaris dels contactes
 Busy=Ocupat
 ExportDataset_event1=Llista d'esdeveniments de l'agenda
 DefaultWorkingDays=Rang de dies de treball per defecte durant la setmana (Exemple: 1-5, 1-6)
@@ -158,12 +158,12 @@ EveryMonth=Cada mes
 DayOfMonth=Dia del mes
 DayOfWeek=Dia de la setmana
 DateStartPlusOne=Data d'inici + 1 hora
-SetAllEventsToTodo=Definir tots els events com a pendents
-SetAllEventsToInProgress=Definir tots els events en progrés
-SetAllEventsToFinished=Definir tots els events com a enllestits
+SetAllEventsToTodo=Estableix tots els esdeveniments com a pendents
+SetAllEventsToInProgress=Estableix tots els esdeveniments a en curs
+SetAllEventsToFinished=Estableix tots els esdeveniments com a finalitzats
 ReminderTime=Període de recordatori abans de l'esdeveniment
 TimeType=Tipus de durada
 ReminderType=Tipus de devolució de trucada
 AddReminder=Crea una notificació de recordatori automàtica per a aquest esdeveniment
 ErrorReminderActionCommCreation=S'ha produït un error en crear la notificació de recordatori per a aquest esdeveniment
-BrowserPush=Notificació del navegador
+BrowserPush=Notificació emergent del navegador
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index 593678f8d7d..a8562e1ab57 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -69,14 +69,14 @@ BankTransactionByCategories=Registres bancaris per categories
 BankTransactionForCategory=Registres bancaris per la categoria <b>%s</b>
 RemoveFromRubrique=Suprimir vincle amb categoria
 RemoveFromRubriqueConfirm=Està segur de voler eliminar l'enllaç entre el registre i la categoria?
-ListBankTransactions=Llistat de registres bancaris
+ListBankTransactions=Llista de registres bancaris
 IdTransaction=Id de transacció
 BankTransactions=Registres bancaris
 BankTransaction=Registre bancari
-ListTransactions=Llistat registres
-ListTransactionsByCategory=Llistat registres/categoria
+ListTransactions=Llista de registres
+ListTransactionsByCategory=Llista de registres/categoria
 TransactionsToConciliate=Registres a conciliar
-TransactionsToConciliateShort=Per conciliar
+TransactionsToConciliateShort=Per a conciliar
 Conciliable=Conciliable
 Conciliate=Conciliar
 Conciliation=Conciliació
@@ -93,7 +93,7 @@ StatusAccountOpened=Obert
 StatusAccountClosed=Tancada
 AccountIdShort=Número
 LineRecord=Registre
-AddBankRecord=Afegir registre
+AddBankRecord=Afegeix entrada
 AddBankRecordLong=Afegir registre manualment
 Conciliated=Conciliat
 ConciliatedBy=Conciliat per
@@ -122,9 +122,9 @@ BankChecks=Xec bancari
 BankChecksToReceipt=Xecs en espera de l'ingrés
 BankChecksToReceiptShort=Xecs en espera de l'ingrés
 ShowCheckReceipt=Mostra la remesa d'ingrés de xec
-NumberOfCheques=Nº de xec
+NumberOfCheques=Núm. de xec
 DeleteTransaction=Eliminar registre
-ConfirmDeleteTransaction=Esteu segur de voler eliminar aquesta registre?
+ConfirmDeleteTransaction=Esteu segur que voleu suprimir aquest registre?
 ThisWillAlsoDeleteBankRecord=Açò eliminarà també els registres bancaris generats
 BankMovements=Moviments
 PlannedTransactions=Registres prevists
@@ -133,7 +133,7 @@ ExportDataset_banque_1=Registres bancaris i extractes
 ExportDataset_banque_2=Resguard
 TransactionOnTheOtherAccount=Transacció sobre l'altra compte
 PaymentNumberUpdateSucceeded=Número de pagament actualitzat correctament
-PaymentNumberUpdateFailed=Numero de pagament no va poder ser modificat
+PaymentNumberUpdateFailed=No s'ha pogut actualitzar el número de pagament
 PaymentDateUpdateSucceeded=Data de pagament actualitzada correctament
 PaymentDateUpdateFailed=Data de pagament no va poder ser modificada
 Transactions=Transaccions
@@ -157,10 +157,10 @@ RejectCheck=Xec retornat
 ConfirmRejectCheck=Estàs segur que vols marcar aquesta comprovació com a rebutjada?
 RejectCheckDate=Data de devolució del xec
 CheckRejected=Xec retornat
-CheckRejectedAndInvoicesReopened=Xecs retornats i factures re-obertes
+CheckRejectedAndInvoicesReopened=Xec retornat i factures reobertes
 BankAccountModelModule=Plantilles de documents per comptes bancaris
 DocumentModelSepaMandate=Plantilla per a mandat SEPA. Vàlid només per a països europeus de la CEE.
-DocumentModelBan=Plantilla per imprimir una pàgina amb informació BAN
+DocumentModelBan=Plantilla per a imprimir una pàgina amb informació BAN.
 NewVariousPayment=Pagament divers nou
 VariousPayment=Pagament divers
 VariousPayments=Pagaments varis
@@ -171,12 +171,13 @@ VariousPaymentLabel=Etiqueta de pagament divers
 ConfirmCloneVariousPayment=Confirmeu el clon d'un pagament divers
 SEPAMandate=Mandat SEPA
 YourSEPAMandate=La vostra ordre SEPA
-FindYourSEPAMandate=Aquest és el vostre mandat de SEPA per autoritzar a la nostra empresa a realitzar un ordre de dèbit directe al vostre banc. Gràcies per retornar-la signada (escanejar el document signat) o envieu-lo per correu a
+FindYourSEPAMandate=Aquest és el vostre mandat SEPA per a autoritzar la nostra empresa a fer una ordre de domiciliació bancària al vostre banc. Torneu-lo signat (escaneja el document signat) o envieu-lo per correu electrònic a
 AutoReportLastAccountStatement=Ompliu automàticament el camp "nombre d'extracte bancari" amb l'últim número de l'extracte al fer la conciliació
-CashControl=Tancar Efectiu del Punt de Venda
-NewCashFence=Tancament d'efectiu nou
+CashControl=Control de caixa TPV
+NewCashFence=Tancament de caixa nou
 BankColorizeMovement=Color de moviments
 BankColorizeMovementDesc=Si aquesta funció està habilitada, podeu triar un color de fons específic per als moviments de dèbit o de crèdit
 BankColorizeMovementName1=Color de fons pel moviment de dèbit
 BankColorizeMovementName2=Color de fons pel moviment de crèdit
-IfYouDontReconcileDisableProperty=Si no feu les conciliacions bancàries en alguns comptes bancaris, desactiveu la propietat "%s" per eliminar aquest advertiment.
+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
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 61e70a38bea..01a98bf0260 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -11,8 +11,8 @@ BillsSuppliersUnpaidForCompany=Factures de proveïdors pendents de pagament per
 BillsLate=Retard en el pagament
 BillsStatistics=Estadístiques factures a clients
 BillsStatisticsSuppliers=Estadístiques de Factures de proveïdors
-DisabledBecauseDispatchedInBookkeeping=Desactivat perquè la factura s'ha contabilitzat
-DisabledBecauseNotLastInvoice=Desactivat perque la factura no es pot eliminar. S'han creat factures després d'aquesta i crearia buits al contador.
+DisabledBecauseDispatchedInBookkeeping=Desactivat perquè la factura ja s'ha comptabilitzat
+DisabledBecauseNotLastInvoice=Desactivat perquè la factura no es pot esborrar. Algunes factures s'han registrat després d'aquesta i això crearia espais buits al comptador.
 DisabledBecauseNotErasable=Desactivat perque no es pot eliminar
 InvoiceStandard=Factura estàndard
 InvoiceStandardAsk=Factura estàndard
@@ -66,9 +66,9 @@ paymentInInvoiceCurrency=en divisa de factures
 PaidBack=Reemborsat
 DeletePayment=Elimina el pagament
 ConfirmDeletePayment=Esteu segur de voler eliminar aquest pagament?
-ConfirmConvertToReduc=Voleu convertir aquesta %s en crèdit disponible?
+ConfirmConvertToReduc=Voleu convertir aquest %s en un crèdit disponible?
 ConfirmConvertToReduc2=L’import s’emmagatzemarà entre tots els descomptes i es podrà utilitzar com a descompte per a una factura actual o futura per a aquest client.
-ConfirmConvertToReducSupplier=Voleu convertir aquesta %s en un crèdit disponible?
+ConfirmConvertToReducSupplier=Voleu convertir aquest %s en un crèdit disponible?
 ConfirmConvertToReducSupplier2=L’import s’ha desat entre tots els descomptes i es podrà utilitzar com a descompte per a una factura actual o futura per a aquest proveïdor.
 SupplierPayments=Pagaments a proveïdors
 ReceivedPayments=Pagaments rebuts
@@ -84,7 +84,7 @@ PaymentMode=Forma de pagament
 PaymentTypeDC=Dèbit/Crèdit Tarja
 PaymentTypePP=PayPal
 IdPaymentMode=Forma de pagament (Id)
-CodePaymentMode=Payment type (code)
+CodePaymentMode=Tipus de pagament (codi)
 LabelPaymentMode=Forma de pagament (etiqueta)
 PaymentModeShort=Forma de pagament
 PaymentTerm=Condicions de pagament
@@ -94,11 +94,11 @@ PaymentAmount=Import pagament
 PaymentHigherThanReminderToPay=Pagament superior a la resta a pagar
 HelpPaymentHigherThanReminderToPay=Atenció, l'import del pagament d'una o més factures és superior a l'import pendent de pagar. <br> Editeu la vostra entrada; en cas contrari, confirmeu i considereu la possibilitat de crear un abonament per l'excés rebut per cada factura pagada de més.
 HelpPaymentHigherThanReminderToPaySupplier=Atenció, l'import del pagament d'una o més factures és superior a l'import pendent de pagar.<br>Editeu l'entrada, en cas contrari, confirmeu i considereu la possibilitat de crear un abonament per l'excés pagat per cada factura pagada de més.
-ClassifyPaid=Classificar 'Pagat'
+ClassifyPaid=Classifica "Pagat"
 ClassifyUnPaid=Classifica &quot;sense pagar&quot;
-ClassifyPaidPartially=Classificar 'Pagat parcialment'
-ClassifyCanceled=Classificar 'Abandonat'
-ClassifyClosed=Classificar 'Tancat'
+ClassifyPaidPartially=Classifica "Pagat parcialment"
+ClassifyCanceled=Classifica "Abandonat"
+ClassifyClosed=Classifica "Tancat"
 ClassifyUnBilled=Classifiqueu 'facturar'
 CreateBill=Crear factura
 CreateCreditNote=Crear abonament
@@ -109,11 +109,11 @@ SearchACustomerInvoice=Cercar una factura a client
 SearchASupplierInvoice=Cercar una factura de proveïdor
 CancelBill=Anul·lar una factura
 SendRemindByMail=Envia recordatori per e-mail
-DoPayment=Afegir pagament
+DoPayment=Introdueix el pagament
 DoPaymentBack=Afegir reemborsament
 ConvertToReduc=Marca com a crèdit disponible
-ConvertExcessReceivedToReduc=Convertir l'excés rebut en el crèdit disponible
-ConvertExcessPaidToReduc=Convertir l'excés pagat en descompte disponible
+ConvertExcessReceivedToReduc=Converteix l'excés rebut en crèdit disponible
+ConvertExcessPaidToReduc=Converteix l'excés pagat en descompte disponible
 EnterPaymentReceivedFromCustomer=Afegir cobrament rebut del client
 EnterPaymentDueToCustomer=Fer pagament del client
 DisabledBecauseRemainderToPayIsZero=Desactivar ja que la resta a pagar és 0
@@ -123,7 +123,7 @@ StatusOfGeneratedInvoices=Estat de factures generades
 BillStatusDraft=Esborrany (a validar)
 BillStatusPaid=Pagada
 BillStatusPaidBackOrConverted=Nota de crèdit reembossada o marcada com a crèdit disponible
-BillStatusConverted=Pagada (llesta per utilitzar-se en factura final)
+BillStatusConverted=Pagada (llesta per a utilitzar-se en la factura final)
 BillStatusCanceled=Abandonada
 BillStatusValidated=Validada (a pagar)
 BillStatusStarted=Pagada parcialment
@@ -156,12 +156,12 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, no és possible cancel·l
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Aquesta part o una altra ja s'utilitza, de manera que la sèrie de descompte no es pot treure.
 BillFrom=Emissor
 BillTo=Enviar a
-ActionsOnBill=Eventos sobre la factura
+ActionsOnBill=Accions en la factura
 RecurringInvoiceTemplate=Plantilla / Factura recurrent
-NoQualifiedRecurringInvoiceTemplateFound=No s'ha qualificat cap plantilla de factura recurrent per generar-se.
-FoundXQualifiedRecurringInvoiceTemplate=S'ha trobat la plantilla de factura/es recurrent %s qualificada per generar-se.
+NoQualifiedRecurringInvoiceTemplateFound=No es pot generar cap factura de plantilla periòdica.
+FoundXQualifiedRecurringInvoiceTemplate=S'han trobat %s factures recurrents de plantilla qualificades per a la generació.
 NotARecurringInvoiceTemplate=No és una plantilla de factura recurrent
-NewBill=Nova factura
+NewBill=Factura nova
 LastBills=Últimes %s factures
 LatestTemplateInvoices=Últimes %s plantilles de factura 
 LatestCustomerTemplateInvoices=Últimes %s plantilles de factures de client 
@@ -192,20 +192,20 @@ ConfirmClassifyPaidPartiallyReasonBadCustomer=Client morós
 ConfirmClassifyPaidPartiallyReasonProductReturned=Productes retornats en part
 ConfirmClassifyPaidPartiallyReasonOther=D'altra raó
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Aquesta opció és possible si la teva factura s'ha proporcionat amb comentaris adequats. (Exemple «Només l'impost corresponent al preu realment pagat dóna dret a la deducció»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=En alguns països, aquesta elecció només pot ser possible si la teva factura conté les notes correctes.
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=En alguns països, aquesta opció només és possible si la factura conté les notes correctes.
 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
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Utilitza aquesta opció si totes les altres no et convenen, per exemple en la situació següent:<br>- pagament parcial ja que una partida de productes s'ha tornat<br>- la quantitat reclamada és massa important perquè s'ha oblidat un descompte<br>En tots els casos, la reclamació s'ha de regularitzar mitjançant un abonament.
+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.
 ConfirmCustomerPayment=Confirmes aquesta entrada de pagament per a <b>%s</b> %s?
 ConfirmSupplierPayment=Confirmes aquesta entrada de pagament per a <b>%s</b> %s?
 ConfirmValidatePayment=Estàs segur que vols validar aquest pagament? No es poden fer canvis un cop el pagament s'ha validat.
-ValidateBill=Validar factura
+ValidateBill=Valida la factura
 UnvalidateBill=Tornar factura a esborrany
-NumberOfBills=Nº de factures
-NumberOfBillsByMonth=Nº de factures per mes
+NumberOfBills=Nombre de factures
+NumberOfBillsByMonth=Nombre de factures per mes
 AmountOfBills=Import de les factures
 AmountOfBillsHT=Import de factures (net d'impostos)
 AmountOfBillsByMonthHT=Import de les factures per mes (Sense IVA)
@@ -256,7 +256,7 @@ DateMaxPayment=Pagament vençut
 DateInvoice=Data facturació
 DatePointOfTax=Punt d'impostos
 NoInvoice=Cap factura
-ClassifyBill=Classificar la factura
+ClassifyBill=Classifica la factura
 SupplierBillsToPay=Factures de proveïdors pendents de pagament
 CustomerBillsUnpaid=Factures de client pendents de cobrament
 NonPercuRecuperable=No percebut recuperable
@@ -269,7 +269,7 @@ RepeatableInvoice=Factura recurrent
 RepeatableInvoices=Factures recurrents
 Repeatable=Recurrent
 Repeatables=Recurrents
-ChangeIntoRepeatableInvoice=Convertir en recurrent
+ChangeIntoRepeatableInvoice=Converteix-la en plantilla
 CreateRepeatableInvoice=Crear factura recurrent
 CreateFromRepeatableInvoice=Crear des de factura recurrent
 CustomersInvoicesAndInvoiceLines=Factures del client i detalls de la factura
@@ -304,8 +304,8 @@ DiscountFromExcessReceived=Pagaments superiors a la factura %s
 DiscountFromExcessPaid=Pagaments superiors a la factura %s
 AbsoluteDiscountUse=Aquest tipus de crèdit no es pot utilitzar en una factura abans de la seva validació
 CreditNoteDepositUse=La factura deu estar validada per a utilitzar aquest tipus de crèdits
-NewGlobalDiscount=Nou descompte fixe
-NewRelativeDiscount=Nou descompte
+NewGlobalDiscount=Descompte absolut nou
+NewRelativeDiscount=Descompte relatiu nou
 DiscountType=Tipus de descompte
 NoteReason=Nota/Motiu
 ReasonDiscount=Motiu
@@ -328,7 +328,7 @@ InvoiceStatus=Estat factura
 InvoiceNote=Nota factura
 InvoicePaid=Factura pagada
 InvoicePaidCompletely=Pagat per complet
-InvoicePaidCompletelyHelp=Factura pagada per complet. Això exclou les factures que estan pagades parcialment. Per obtenir la llista de totes les factures tancades o no tancades, utilitzeu el filtre de l'estat de la factura.
+InvoicePaidCompletelyHelp=Factura pagada per complet. Això exclou les factures que estan pagades parcialment. Per a obtenir la llista de totes les factures tancades o no tancades, utilitzeu el filtre de l'estat de la factura.
 OrderBilled=Ordre facturat
 DonationPaid=Donació pagada
 PaymentNumber=Número de pagament
@@ -338,7 +338,7 @@ InvoiceNotChecked=Cap factura pendent està seleccionada
 ConfirmCloneInvoice=Vols clonar aquesta factura <b>%s</b>?
 DisabledBecauseReplacedInvoice=Acció desactivada perquè és una factura reemplaçada
 DescTaxAndDividendsArea=Aquesta àrea presenta un resum de tots els pagaments fets per a despeses especials.  Aquí només s'inclouen registres amb pagament durant l'any fixat.
-NbOfPayments=Nº de pagaments
+NbOfPayments=Nombre de pagaments
 SplitDiscount=Dividir el dte. en dos
 ConfirmSplitDiscount=Estàs segur que vols dividir aquest descompte de <b>%s</b> %s en 2 descomptes més baixos?
 TypeAmountOfEachNewDiscount=Import de l'entrada per a cada una de les dues parts:
@@ -371,10 +371,10 @@ NextDateToExecution=Data de la propera generació de factures
 NextDateToExecutionShort=Data següent gen.
 DateLastGeneration=Data de l'última generació
 DateLastGenerationShort=Data última gen.
-MaxPeriodNumber=Nº màxim de generació de factures
-NbOfGenerationDone=Número de generació de factura ja realitzat
+MaxPeriodNumber=Màx. nombre de generació de factures
+NbOfGenerationDone=Nombre de generació de factura ja realitzat
 NbOfGenerationDoneShort=Número de generació realitzat
-MaxGenerationReached=Número màxim de generacions aconseguides
+MaxGenerationReached=Nombre màxim de generacions assolides
 InvoiceAutoValidate=Valida les factures automàticament
 GeneratedFromRecurringInvoice=Generat des de la plantilla de factura recurrent %s
 DateIsNotEnough=Encara no s'ha arribat a la data
@@ -396,12 +396,12 @@ PaymentConditionShort60D=60 dies
 PaymentCondition60D=60 dies
 PaymentConditionShort60DENDMONTH=60 dies final de mes
 PaymentCondition60DENDMONTH=En els 60 dies següents a final de mes
-PaymentConditionShortPT_DELIVERY=Al lliurament
-PaymentConditionPT_DELIVERY=Al lliurament
+PaymentConditionShortPT_DELIVERY=Entrega
+PaymentConditionPT_DELIVERY=En entrega
 PaymentConditionShortPT_ORDER=Comanda
 PaymentConditionPT_ORDER=A la recepció de la comanda
 PaymentConditionShortPT_5050=50/50
-PaymentConditionPT_5050=50%% per avançat, 50%% al lliurament
+PaymentConditionPT_5050=50%% per avançat, 50%% a l’entrega
 PaymentConditionShort10D=10 dies
 PaymentCondition10D=10 dies
 PaymentConditionShort10DENDMONTH=10 dies final de mes
@@ -447,8 +447,8 @@ BIC=BIC/SWIFT
 BICNumber=Codi BIC/SWIFT
 ExtraInfos=Informacions complementàries
 RegulatedOn=Pagar el
-ChequeNumber=Xec nº
-ChequeOrTransferNumber=Nº Xec/Transferència
+ChequeNumber=Número de xec
+ChequeOrTransferNumber=Núm. de xec/transferència
 ChequeBordereau=Comprova horari
 ChequeMaker=Autor xec/transferència
 ChequeBank=Banc del xec
@@ -476,19 +476,19 @@ UseCreditNoteInInvoicePayment=Reduir el pagament amb aquest crèdit
 MenuChequeDeposits=Ingrés de xecs
 MenuCheques=Xecs
 MenuChequesReceipts=Remeses de xecs
-NewChequeDeposit=Nou dipòsit
+NewChequeDeposit=Dipòsit nou
 ChequesReceipts=Remeses de xecs
-ChequesArea=Àrea de ingrés de xecs
+ChequesArea=Àrea d'ingressos de xecs
 ChequeDeposits=Ingrés de xecs
 Cheques=Xecs
 DepositId=Id. dipòsit
-NbCheque=Número de xecs
+NbCheque=Nombre de xecs
 CreditNoteConvertedIntoDiscount=This %s has been converted into %s
 UsBillingContactAsIncoiveRecipientIfExist=Utilitzeu el contacte / adreça amb el tipus 'contacte de facturació' en comptes de l'adreça de tercers com a destinatari de factures
 ShowUnpaidAll=Mostrar tots els pendents
 ShowUnpaidLateOnly=Mostrar els pendents en retard només
 PaymentInvoiceRef=Pagament factura %s
-ValidateInvoice=Validar factura
+ValidateInvoice=Valida la factura
 ValidateInvoices=Validació de factures
 Cash=Efectiu
 Reported=Ajornat
@@ -514,8 +514,8 @@ PDFSpongeDescription=Plantilla PDF de factures Sponge. Una plantilla de factura
 PDFCrevetteDescription=Plantilla Crevette per factures PDF. Una plantilla de factura completa per factures de situació.
 TerreNumRefModelDesc1=Retorna el nombre sota el format %syymm-nnnn per a les factures i %syymm-nnnn per als abonaments on yy és l'any, mm. el mes i nnnn un comptador seqüencial sense ruptura i sense permanència a 0
 MarsNumRefModelDesc1=Retorna el nombre sota el format %syymm-nnnn per a les factures, %syymm-nnnn per a les factures rectificatives, %syymm-nnnn per a les factures de dipòsit i %syymm-nnnn pels abonaments  on yy és l'any, mm el mes i nnnn un comptador seqüencial sense ruptura i sense retorn a 0
-TerreNumRefModelError=Ja hi ha una factura amb $syymm i no és compatible amb aquest model de seqüència. Elimineu o renómbrela per poder activar aquest mòdul
-CactusNumRefModelDesc1=Retorna un numero amb format %syymm-nnnn per a factures estàndard, %syymm-nnnn per a notes de crèdit i %syymm-nnnn per a factures de dipòsits anticipats a on yy es l'any, mm és el mes i nnnn és una seqüència sense ruptura i sense retorn a 0
+TerreNumRefModelError=Ja existeix una factura que comença amb $syymm i no és compatible amb aquest model de seqüència. Elimineu-la o canvieu-li el nom per a activar aquest mòdul.
+CactusNumRefModelDesc1=Retorna un número amb format %syymm-nnnn per a factures estàndard, %syymm-nnnn per a devolucions i %syymm-nnnn per a factures de dipòsits anticipats on yy es l'any, mm és el mes i nnnn és una seqüència sense ruptura i sense retorn a 0
 EarlyClosingReason=Motiu de tancament anticipat
 EarlyClosingComment=Nota de tancament anticipat
 ##### Types de contacts #####
@@ -557,7 +557,7 @@ TotalSituationInvoice=Total situació
 invoiceLineProgressError=El progrés de la línia de factura no pot ser igual o superior a la següent línia de factura
 updatePriceNextInvoiceErrorUpdateline=Error : actualització de preu en línia de factura : %s
 ToCreateARecurringInvoice=Per crear una factura recurrent d'aquest contracte, primer crea aquesta factura esborrany, després converteix-la en una plantilla de factura i defineix la freqüència per a la generació de factures futures.
-ToCreateARecurringInvoiceGene=Per generar futures factures regulars i manualment, només ves al menú <strong>%s - %s - %s</strong>.
+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.
 DeleteRepeatableInvoice=Elimina la factura recurrent
 ConfirmDeleteRepeatableInvoice=Vols eliminar la plantilla de factura?
diff --git a/htdocs/langs/ca_ES/blockedlog.lang b/htdocs/langs/ca_ES/blockedlog.lang
index 5c380fdb581..dc38c2149c7 100644
--- a/htdocs/langs/ca_ES/blockedlog.lang
+++ b/htdocs/langs/ca_ES/blockedlog.lang
@@ -2,7 +2,7 @@ BlockedLog=Registres inalterables
 Field=Camp
 BlockedLogDesc=Aquest mòdul fa un seguiment d'alguns esdeveniments en un registre inalterable (que no es pot modificar una vegada registrat) en una cadena de blocs, en temps real. Aquest mòdul ofereix compatibilitat amb els requisits de les lleis d'alguns països (com França amb la llei Finances 2016 - Norma NF525).
 Fingerprints=Esdeveniments arxivats i empremtes digitals
-FingerprintsDesc=Aquesta és l'eina per explorar o extreure els registres inalterables. Els registres inalterables es generen i es arxiven localment en una taula dedicada, en temps real quan es registra un esdeveniment empresarial. Podeu utilitzar aquesta eina per exportar aquest arxiu i desar-lo en un suport extern (alguns països, com França, demanen que ho feu cada any). Tingueu en compte que, no hi ha cap funció per purgar aquest registre i tots els canvis que s'hagin intentat fer directament en aquest registre (per exemple, un hacker) es comunicaran amb una empremta digital no vàlida. Si realment necessiteu purgar aquesta taula perquè heu utilitzat la vostra aplicació per a un propòsit de demostració / prova i voleu netejar les vostres dades per iniciar la vostra producció, podeu demanar al vostre distribuïdor o integrador que restableixi la vostra base de dades (totes les vostres dades seran eliminades).
+FingerprintsDesc=Aquesta és l'eina per a explorar o extreure els registres inalterables. Els registres inalterables es generen i s'arxiven localment en una taula dedicada, en temps real quan es registra un esdeveniment de negoci. Podeu utilitzar aquesta eina per a exportar aquest arxiu i desar-lo en un suport extern (alguns països, com França, demanen que ho feu cada any). Tingueu en compte que, no hi ha cap funció per a purgar aquest registre i tots els canvis que s'hagin intentat fer directament en aquest registre (per exemple, un hacker) es comunicaran amb una empremta digital no vàlida. Si realment necessiteu purgar aquesta taula perquè heu utilitzat la vostra aplicació per a un propòsit de demostració / prova i voleu netejar les vostres dades per a iniciar la vostra producció, podeu demanar al vostre distribuïdor o integrador que restableixi la vostra base de dades (totes les vostres dades seran eliminades).
 CompanyInitialKey=Clau inicial de l'empresa (hash de bloc de gènesi)
 BrowseBlockedLog=Registres inalterables
 ShowAllFingerPrintsMightBeTooLong=Mostra tots els registres arxivats (pot ser llarg)
@@ -35,7 +35,7 @@ logDON_DELETE=Donació de l'eliminació lògica
 logMEMBER_SUBSCRIPTION_CREATE=S'ha creat una subscripció de membre
 logMEMBER_SUBSCRIPTION_MODIFY=S'ha modificat la subscripció de membre
 logMEMBER_SUBSCRIPTION_DELETE=Supressió lògica de subscripció de membre
-logCASHCONTROL_VALIDATE=Gravació de tanques d'efectiu
+logCASHCONTROL_VALIDATE=Registre de tancament de caixa
 BlockedLogBillDownload=Descarrega la factura del client
 BlockedLogBillPreview=Previsualització de la factura del client
 BlockedlogInfoDialog=Detalls del registre
@@ -45,10 +45,10 @@ DownloadLogCSV=Exporta els registres arxivats (CSV)
 logDOC_PREVIEW=Vista prèvia d'un document validat per imprimir o descarregar
 logDOC_DOWNLOAD=Descarregar un document validat per imprimir o enviar
 DataOfArchivedEvent=Dades completes d'esdeveniments arxivats
-ImpossibleToReloadObject=Objecte original (tipus %s, id %s) no enllaçat (vegeu la columna "Dades complets" per obtenir dades guardades inalterables)
+ImpossibleToReloadObject=Objecte original (tipus %s, identificador %s) no enllaçat (vegeu la columna "Dades completes" per a obtenir dades desades inalterables)
 BlockedLogAreRequiredByYourCountryLegislation=El mòdul de registres inalterables pot ser requerit per la legislació del vostre país. La desactivació d'aquest mòdul pot fer que qualsevol transacció futura sigui invàlida pel que fa a la llei i l'ús del programari legal, ja que no es pot validar mitjançant una auditoria fiscal.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=El mòdul de registres inalterables s'ha activat a causa de la legislació del vostre país. La desactivació d'aquest mòdul pot fer que qualsevol transacció futura sigui invàlida pel que fa a la llei i l'ús del programari legal, ja que no es pot validar mitjançant una auditoria fiscal.
 BlockedLogDisableNotAllowedForCountry=Llista de països on l'ús d'aquest mòdul és obligatori (només per impedir que es desactivi el mòdul per error, si el vostre país està en aquesta llista, la desactivació del mòdul no és possible sense editar aquesta llista. Noteu també que habilitar / desactivar aquest mòdul seguiu una pista en el registre inalterable).
 OnlyNonValid=No vàlid
 TooManyRecordToScanRestrictFilters=Hi ha massa registres per escanejar / analitzar. Limiteu la llista amb filtres més restrictius.
-RestrictYearToExport=Restringiu el mes / any per exportar
+RestrictYearToExport=Restringeix el mes / any per a exportar
diff --git a/htdocs/langs/ca_ES/bookmarks.lang b/htdocs/langs/ca_ES/bookmarks.lang
index 8e406ad77d6..423f70a3814 100644
--- a/htdocs/langs/ca_ES/bookmarks.lang
+++ b/htdocs/langs/ca_ES/bookmarks.lang
@@ -4,15 +4,15 @@ Bookmark=Marcador
 Bookmarks=Marcadors
 ListOfBookmarks=Llista de marcadors
 EditBookmarks=Llista/edita els marcadors
-NewBookmark=Nou marcador
+NewBookmark=Marcador nou
 ShowBookmark=Mostra marcador
 OpenANewWindow=Obriu una pestanya nova
 ReplaceWindow=Reemplaça la pestanya actual
-BookmarkTargetNewWindowShort=Nova pestanya
+BookmarkTargetNewWindowShort=Pestanya nova
 BookmarkTargetReplaceWindowShort=Pestanya actual
 BookmarkTitle=Nom de marcatge
 UrlOrLink=URL
-BehaviourOnClick=Comportament al fer clic a la 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/...)
diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang
index db7fab66a6b..37668884c7a 100644
--- a/htdocs/langs/ca_ES/boxes.lang
+++ b/htdocs/langs/ca_ES/boxes.lang
@@ -40,19 +40,22 @@ BoxTitleLastModifiedContacts=Adreces i contactes: últims %s modificats
 BoxMyLastBookmarks=Adreces d'interès: últims %s
 BoxOldestExpiredServices=Serveis antics expirats
 BoxLastExpiredServices=Últims %s contactes amb serveis actius expirats
-BoxTitleLastActionsToDo=Últims %s events a realitzar
+BoxTitleLastActionsToDo=Últimes %s accions a fer
 BoxTitleLastContracts=Últims %s contractes modificats
 BoxTitleLastModifiedDonations=Últimes %s donacions modificades
 BoxTitleLastModifiedExpenses=Últimes %s despeses modificades
 BoxTitleLatestModifiedBoms=Últimes %s llistes de material modificades
 BoxTitleLatestModifiedMos=Últimes %s ordres de fabricació modificades
+BoxTitleLastOutstandingBillReached=Clients que han superat el màxim pendent
 BoxGlobalActivity=Activitat global
 BoxGoodCustomers=Bons clients
 BoxTitleGoodCustomers=% bons clients
+BoxScheduledJobs=Tasques programades
+BoxTitleFunnelOfProspection=Oportunitat embut
 FailedToRefreshDataInfoNotUpToDate=No s'ha pogut actualitzar el flux RSS. Última data d'actualització amb èxit: %s
 LastRefreshDate=Última data que es va refrescar
 NoRecordedBookmarks=No hi ha marcadors personals.
-ClickToAdd=Faci clic aquí per afegir.
+ClickToAdd=Feu clic aquí per a afegir.
 NoRecordedCustomers=Cap client registrat
 NoRecordedContacts=Cap contacte registrat
 NoActionsToDo=Sense esdeveniments a realitzar
@@ -92,8 +95,8 @@ LastXMonthRolling=Els últims %s mesos consecutius
 ChooseBoxToAdd=Afegeix el panell a la teva taula de control
 BoxAdded=S'ha afegit el panell a la teva taula de control
 BoxTitleUserBirthdaysOfMonth=Aniversaris d'aquest mes (usuaris)
-BoxLastManualEntries=Últimes entrades manuals en comptabilitat
-BoxTitleLastManualEntries=Les darreres entrades manuals %s
+BoxLastManualEntries=Últim registre de comptabilitat introduït manualment o sense document d'origen
+BoxTitleLastManualEntries=%s últim registre introduït manualment o sense document d'origen
 NoRecordedManualEntries=No hi ha registres d'entrades manuals en comptabilitat
 BoxSuspenseAccount=Operació comptable de comptes amb compte de suspens
 BoxTitleSuspenseAccount=Nombre de línies no assignades
@@ -102,6 +105,7 @@ SuspenseAccountNotDefined=El compte de suspens no està definit
 BoxLastCustomerShipments=Últims enviaments de clients
 BoxTitleLastCustomerShipments=Últims %s enviaments de clients
 NoRecordedShipments=Cap enviament de client registrat
+BoxCustomersOutstandingBillReached=Clients que superen el límit pendent
 # Pages
 AccountancyHome=Comptabilitat
 ValidatedProjects=Projectes validats
diff --git a/htdocs/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang
index c17e230f1ee..9cfb5122c12 100644
--- a/htdocs/langs/ca_ES/cashdesk.lang
+++ b/htdocs/langs/ca_ES/cashdesk.lang
@@ -11,10 +11,10 @@ CashDeskStock=Estoc
 CashDeskOn=de
 CashDeskThirdParty=Tercer
 ShoppingCart=Cistella
-NewSell=Nova venda
+NewSell=Venda nova
 AddThisArticle=Afegeix aquest article
 RestartSelling=Reprendre la venda
-SellFinished=Venda acabada
+SellFinished=Venda completa
 PrintTicket=Imprimir
 SendTicket=Envia el tiquet
 NoProductFound=Cap article trobat
@@ -32,7 +32,7 @@ ShowStock=Veure magatzem
 DeleteArticle=Feu clic per treure aquest article
 FilterRefOrLabelOrBC=Cerca (Ref/Etiq.)
 UserNeedPermissionToEditStockToUsePos=Es demana disminuir l'estoc en la creació de la factura, de manera que l'usuari que utilitza el TPV ha de tenir permís per editar l'estoc.
-DolibarrReceiptPrinter=Impressora de tickets de Dolibarr
+DolibarrReceiptPrinter=Impressora de tiquets de Dolibarr
 PointOfSale=Punt de venda
 PointOfSaleShort=TPV
 CloseBill=Tanca el compte
@@ -49,9 +49,9 @@ Footer=Peu de pàgina
 AmountAtEndOfPeriod=Import al final del període (dia, mes o any)
 TheoricalAmount=Import teòric
 RealAmount=Import real
-CashFence=Recompte d'efectiu
+CashFence=Tancament de caixa
 CashFenceDone=Tancament de caixa realitzat pel període
-NbOfInvoices=Nº de factures
+NbOfInvoices=Nombre de factures
 Paymentnumpad=Tipus de pad per introduir el pagament
 Numberspad=Números Pad
 BillsCoinsPad=Pad de monedes i bitllets
@@ -60,9 +60,9 @@ TakeposNeedsCategories=TakePOS necessita que les categories de productes funcion
 OrderNotes=Notes de comanda
 CashDeskBankAccountFor=Compte predeterminat a utilitzar per als pagaments
 NoPaimementModesDefined=No hi ha cap mode de pagament definit a la configuració de TakePOS
-TicketVatGrouped=Agrupar IVA per tipus als tickets/rebuts
-AutoPrintTickets=Imprimir automàticament tickets/rebuts
-PrintCustomerOnReceipts=Imprimir el client als tickets/rebuts
+TicketVatGrouped=Agrupa IVA per tipus als tiquets|rebuts
+AutoPrintTickets=Imprimeix automàticament els tiquets|rebuts
+PrintCustomerOnReceipts=Imprimeix el client als tiquets|rebuts
 EnableBarOrRestaurantFeatures=Habiliteu funcions per a bar o restaurant
 ConfirmDeletionOfThisPOSSale=Confirmeu la supressió de la venda actual?
 ConfirmDiscardOfThisPOSSale=Voleu descartar aquesta venda actual?
@@ -89,18 +89,19 @@ Colorful=Colorit
 HeadBar=Barra de capçalera
 SortProductField=Camp per a ordenar productes
 Browser=Navegador
-BrowserMethodDescription=Impressió de rebuts senzilla i senzilla. Només uns quants paràmetres per configurar el rebut. Imprimeix a través del navegador.
+BrowserMethodDescription=Impressió de rebuts fàcil i senzilla. Només uns quants paràmetres per a configurar el rebut. Imprimeix mitjançant el navegador.
 TakeposConnectorMethodDescription=Mòdul extern amb funcions addicionals. Possibilitat d’imprimir des del núvol.
 PrintMethod=Mètode d'impressió
 ReceiptPrinterMethodDescription=Mètode potent amb molts paràmetres. Completament personalitzable amb plantilles. No es pot imprimir des del núvol.
 ByTerminal=Per terminal
 TakeposNumpadUsePaymentIcon=Utilitzeu la icona en lloc del text als botons de pagament del teclat numèric
-CashDeskRefNumberingModules=Mòdul de numeració per a vendes del Punt de Venda (POS)
-CashDeskGenericMaskCodes6 = <br>l'etiqueta <b>{TN}</b> s'utilitza per afegir el numero de terminal
+CashDeskRefNumberingModules=Mòdul de numeració per a vendes des del TPV (Punt de Venda)
+CashDeskGenericMaskCodes6 =  L'etiqueta <br><b>{TN}</b> s'utilitza per a afegir el número de terminal
 TakeposGroupSameProduct=Agrupa les mateixes línies de productes
-StartAParallelSale=Inicia una nova venda paral·lela
-ControlCashOpening=Control de caixa en obrir el TPV
-CloseCashFence=Tanca el recompte d'efectiu
+StartAParallelSale=Comenceu una venda nova paral·lela
+SaleStartedAt=La venda va començar a %s
+ControlCashOpening=Finestra emergent de control de caixa en obrir el TPV
+CloseCashFence=Tanca el control de caixa
 CashReport=Informe d'efectiu
 MainPrinterToUse=Impressora principal a utilitzar
 OrderPrinterToUse=Impressora de comandes a utilitzar
diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang
index 900f42e763a..195fe0a4157 100644
--- a/htdocs/langs/ca_ES/categories.lang
+++ b/htdocs/langs/ca_ES/categories.lang
@@ -5,9 +5,9 @@ RubriquesTransactions=Etiquetes d'assentaments
 categories=etiquetes
 NoCategoryYet=No s'ha creat cap etiqueta d'aquest tipus
 In=En
-AddIn=Afegir en
-modify=Modificar
-Classify=Classificar
+AddIn=Afegeix
+modify=Modifica
+Classify=Classifica
 CategoriesArea=Àrea d'etiquetes
 ProductsCategoriesArea=Àrea d'etiquetes de productes/serveis
 SuppliersCategoriesArea=Àrea d'etiquetes de proveïdors
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Àrea d'etiquetes de projectes
 UsersCategoriesArea=Àrea d'etiquetes d'usuaris
 SubCats=Subcategories
 CatList=Llistat d'etiquetes
+CatListAll=Llista d'etiquetes (tots els tipus)
 NewCategory=Etiqueta nova
 ModifCat=Modifica l'etiqueta
 CatCreated=Etiqueta creada
@@ -65,16 +66,22 @@ UsersCategoriesShort=Etiquetes d'usuaris
 StockCategoriesShort=Etiquetes / categories de magatzem
 ThisCategoryHasNoItems=Aquesta categoria no conté cap element.
 CategId=ID d'etiqueta
-CatSupList=Llistat d'etiquetes de proveïdors
-CatCusList=Llistat d'etiquetes de clients/clients potencials
+ParentCategory=Etiqueta mare
+ParentCategoryLabel=Descripció de l'etiqueta mare
+CatSupList=Llista d'etiquetes de proveïdors
+CatCusList=Llista d'etiquetes de clients/potencials
 CatProdList=Llistat d'etiquetes de productes
 CatMemberList=Llistat d'etiquetes de socis
-CatContactList=Llistat d'etiquetes de contactes
+CatContactList=Llista d’etiquetes de contactes
+CatProjectsList=Llista d’etiquetes de projectes
+CatUsersList=Llista d'etiquetes d'usuaris
 CatSupLinks=Enllaços entre proveïdors i etiquetes
 CatCusLinks=Enllaços entre clients/clients potencials i etiquetes
 CatContactsLinks=Enllaços entre contactes / adreces i etiquetes / categories
 CatProdLinks=Enllaços entre productes/serveis i etiquetes
-CatProJectLinks=Enllaços entre projectes i etiquetes
+CatMembersLinks=Enllaços entre socis i etiquetes
+CatProjectsLinks=Enllaços entre projectes i etiquetes
+CatUsersLinks=Enllaços entre usuaris i etiquetes
 DeleteFromCat=Elimina de l'etiqueta
 ExtraFieldsCategories=Atributs complementaris
 CategoriesSetup=Configuració d'etiquetes
diff --git a/htdocs/langs/ca_ES/commercial.lang b/htdocs/langs/ca_ES/commercial.lang
index 6dbcc4f80cd..ce0aee13e4a 100644
--- a/htdocs/langs/ca_ES/commercial.lang
+++ b/htdocs/langs/ca_ES/commercial.lang
@@ -6,7 +6,7 @@ Customers=Clients
 Prospect=Client potencial
 Prospects=Clients potencials
 DeleteAction=Elimina un esdeveniment
-NewAction=Nou esdeveniment
+NewAction=Esdeveniment nou
 AddAction=Crea esdeveniment
 AddAnAction=Crea un esdeveniment
 AddActionRendezVous=Crear una cita
@@ -33,7 +33,7 @@ LastDoneTasks=Últimes %s accions acabades
 LastActionsToDo=Les %s més antigues accions no completades
 DoneAndToDoActions=Llista d'esdeveniments realitzats o a realitzar
 DoneActions=Llista d'esdeveniments realitzats
-ToDoActions=Llista d'esdevenimentss incomplets
+ToDoActions=Esdeveniments incomplets
 SendPropalRef=Enviament del pressupost %s
 SendOrderRef=Enviament de la comanda %s
 StatusNotApplicable=No aplicable
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index 1ed63965f27..0125a802bf8 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -68,8 +68,8 @@ PhoneShort=Telèfon
 Skype=Skype
 Call=Trucar
 Chat=Xat
-PhonePro=Telf. treball
-PhonePerso=Telf. particular
+PhonePro=Tel. treball
+PhonePerso=Tel. personal
 PhoneMobile=Mòbil
 No_Email=No enviar e-mailings massius
 Fax=Fax
@@ -245,7 +245,7 @@ ProfId3TN=CNAE
 ProfId4TN=CCC
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id (FEIN) <i>associat a l'Administració de taxes dels USA</i>
+ProfId1US=FEIN
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -286,7 +286,7 @@ HasNoRelativeDiscountFromSupplier=No tens descomptes relatius per defecte d'aque
 CompanyHasAbsoluteDiscount=Aquest client té descomptes disponibles (notes de crèdit o bestretes) per <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Aquest client té un descompte disponible (comercial, de pagament) per a <b>%s</b>%s
 CompanyHasCreditNote=Aquest client encara té abonaments per <b>%s</b> %s
-HasNoAbsoluteDiscountFromSupplier=No tens crèdit disponible per descomptar d'aquest proveïdor
+HasNoAbsoluteDiscountFromSupplier=No teniu disponible cap crèdit de descompte per aquest proveïdor
 HasAbsoluteDiscountFromSupplier=Disposes de descomptes (notes de crèdits o pagaments pendents) per a <b> %s </b> %s d'aquest proveïdor
 HasDownPaymentOrCommercialDiscountFromSupplier=Teniu descomptes disponibles (comercials, pagaments inicials) de <b> %s </b> %s d'aquest proveïdor
 HasCreditNoteFromSupplier=Teniu notes de crèdit per a <b> %s </b> %s d'aquest proveïdor
@@ -349,7 +349,7 @@ NewContactAddress=Contacte/Adreça nova
 MyContacts=Els meus contactes
 Capital=Capital
 CapitalOf=Capital de %s
-EditCompany=Modificar empresa
+EditCompany=Edita l'empresa
 ThisUserIsNot=Aquest usuari no és client potencial, client o proveïdor
 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.
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Verifica el NIF Intracomunitari a la web de la Comissi
 VATIntraManualCheck=També podeu verificar-ho manualment al lloc web de la Comissió Europea <a href="%s" target="_blank">%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 legal
+JuridicalStatus=Tipus d'entitat empresarial
 Workforce=Força de treball
 Staff=Empleats
 ProspectLevelShort=Potencial
@@ -398,7 +398,7 @@ ProspectsByStatus=Clients potencials per estat
 NoParentCompany=Cap
 ExportCardToFormat=Exporta fitxa a format
 ContactNotLinkedToCompany=Contacte no vinculat a un tercer
-DolibarrLogin=Login usuari
+DolibarrLogin=Nom d'usuari de Dolibarr
 NoDolibarrAccess=Sense accés d'usuari
 ExportDataset_company_1=Tercers (empreses/entitats/persones físiques) i propietats
 ExportDataset_company_2=Contactes i propietats
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index 7cd6406d3ff..36c3821c1be 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -75,12 +75,12 @@ TypeContrib=Tipus d'aportació
 MenuSpecialExpenses=Pagaments especials
 MenuTaxAndDividends=Impostos i càrregues
 MenuSocialContributions=Impostos varis
-MenuNewSocialContribution=Nou impost varis
-NewSocialContribution=Nou impost varis
+MenuNewSocialContribution=Impost varis nou
+NewSocialContribution=Impost varis nou
 AddSocialContribution=Afegeix un impost varis
 ContributionsToPay=Impostos varis a pagar
 AccountancyTreasuryArea=Àrea de facturació i pagament
-NewPayment=Nou pagament
+NewPayment=Pagament nou
 PaymentCustomerInvoice=Cobrament factura a client
 PaymentSupplierInvoice=Pagament de la factura del proveïdor
 PaymentSocialContribution=Pagament d'impost varis
@@ -88,16 +88,16 @@ PaymentVat=Pagament IVA
 ListPayment=Llistat de pagaments
 ListOfCustomerPayments=Llistat de cobraments de clients
 ListOfSupplierPayments=Llista de pagaments a proveïdors
-DateStartPeriod=Data d'inici del periode
-DateEndPeriod=Data final del periode
-newLT1Payment=Nou pagament de RE
-newLT2Payment=Nou pagament IRPF
+DateStartPeriod=Data d'inici del període
+DateEndPeriod=Data final del període
+newLT1Payment=Pagament de RE nou
+newLT2Payment=Pagament d'IRPF nou
 LT1Payment=Pagament RE
 LT1Payments=Pagaments RE
 LT2Payment=Pagament IRPF
 LT2Payments=Pagaments IRPF
-newLT1PaymentES=Nou pagament de RE
-newLT2PaymentES=Nou pagament d'IRPF
+newLT1PaymentES=Pagament de RE nou
+newLT2PaymentES=Pagament d'IRPF nou
 LT1PaymentES=Pagament de RE
 LT1PaymentsES=Pagaments de RE
 LT2PaymentES=Pagament IRPF
@@ -105,19 +105,19 @@ LT2PaymentsES=Pagaments IRPF
 VATPayment=Pagament d'impost de vendes
 VATPayments=Pagaments d'impost de vendes
 VATRefund=Devolució IVA
-NewVATPayment=Nou pagament d'impostos a les vendes
-NewLocalTaxPayment=Nou pagament d'impostos %s
+NewVATPayment=Pagament nou de l'impost sobre les vendes
+NewLocalTaxPayment=Pagament nou d'impostos %s
 Refund=Devolució
 SocialContributionsPayments=Pagaments d'impostos varis
 ShowVatPayment=Veure pagaments IVA
 TotalToPay=Total a pagar
-BalanceVisibilityDependsOnSortAndFilters=El balanç es visible en aquest llistat només si la taula està ordenada de manera ascendent sobre %s i filtrada per 1 compte bancari
+BalanceVisibilityDependsOnSortAndFilters=El saldo només es pot veure en aquesta llista si la taula està ordenada amb %s i es filtra en 1 compte bancari (sense altres filtres)
 CustomerAccountancyCode=Codi comptable del client
 SupplierAccountancyCode=Codi de comptabilitat del venedor
 CustomerAccountancyCodeShort=Codi compt. cli.
 SupplierAccountancyCodeShort=Codi compt. prov.
 AccountNumber=Número de compte
-NewAccountingAccount=Nou compte
+NewAccountingAccount=Compte nou
 Turnover=Facturació facturada
 TurnoverCollected=Facturació recopilada
 SalesTurnoverMinimum=Facturació mínima
@@ -127,12 +127,12 @@ ByUserAuthorOfInvoice=Per autor de la factura
 CheckReceipt=Ingrés de xec
 CheckReceiptShort=Ingrés de xec
 LastCheckReceiptShort=Últimes %s remeses de xec
-NewCheckReceipt=Nou descompte
-NewCheckDeposit=Nou ingrés
+NewCheckReceipt=Descompte nou
+NewCheckDeposit=Ingrés nou
 NewCheckDepositOn=Crea remesa per ingressar al compte: %s
 NoWaitingChecks=Sense xecs en espera de l'ingrés.
 DateChequeReceived=Data recepció del xec
-NbOfCheques=Nº de xecs
+NbOfCheques=Nombre de xecs
 PaySocialContribution=Pagar un impost varis
 ConfirmPaySocialContribution=Esteu segur de voler classificar aquest impost varis com a pagat?
 DeleteSocialContribution=Elimina un pagament d'impost varis
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Esteu segur de voler eliminar el pagament d'aque
 ExportDataset_tax_1=Impostos varis i pagaments
 CalcModeVATDebt=Mode d'<b>%sIVA sobre comptabilitat de compromís%s </b>.
 CalcModeVATEngagement=Mode d'<b>%sIVA sobre ingressos-despeses%s</b>.
-CalcModeDebt=Anàlisi de factures conegudes registrades, fins i tot si encara no estan comptabilitzades en el llibre major.
+CalcModeDebt=Anàlisi de documents registrats coneguts encara no comptabilitzats al llibre major.
 CalcModeEngagement=Anàlisi dels pagaments registrats coneguts, fins i tot si encara no estan comptabilitzat en el Llibre Major.
 CalcModeBookkeeping=Anàlisi de dades publicades a la taula de compilació de llibres.
 CalcModeLT1= Metode <b>%sRE factures a client - factures de proveïdor%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Saldo d'ingressos i despeses, resum anual
 AnnualByCompanies=Saldo d'ingressos i despeses, per grups de compte predefinits
 AnnualByCompaniesDueDebtMode=Saldo d'ingressos i despeses, detall per grups predefinits, mode <b> %sReclamacions-Deutes%s</b> és a dir <b>Comptabilitat de compromisos</b>.
 AnnualByCompaniesInputOutputMode=Saldo d'ingressos i despeses, detall per grups predefinits, mode <b> %sIngresos-Despeses%s</b> és a dir <b>comptabilitat d'efectiu</b>.
-SeeReportInInputOutputMode=Veure %sl'anàlisi de pagaments %s per a un càlcul dels pagaments realitzats fins i tot si encara no estan comptabilitzats en el Llibre Major.
-SeeReportInDueDebtMode=Veure l'informe %sanàlisi de factures%s per a un càlcul basat en factures registrades conegudes encara que encara no s'hagin comptabilitzat en el Llibre Major.
-SeeReportInBookkeepingMode=Veure <b>%sl'informe%s</b> per a un càlcul a <b> Taula de Llibre Major</b>
+SeeReportInInputOutputMode=Mostra<b>%sl'anàlisi de pagaments%s</b> per a obtenir un càlcul basat en <b>pagaments registrats</b> realitzats fins i tot si encara no estan comptabilitzats al llibre major
+SeeReportInDueDebtMode=Mostra l'<b>%sanàlisi de documents registrats%s </b> per a obtenir un càlcul basat en els <b>documents registrats</b> coneguts, fins i tot si encara no estan comptabilitzats al llibre major.
+SeeReportInBookkeepingMode=Mostra <b>%sl'anàlisi de la taula de llibres comptables%s</b> per a obtenir un informe basat en <b>Taula de llibres comptables</b>
 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ó.
@@ -166,7 +166,7 @@ RulesCATotalSaleJournal=Inclou totes les línies de crèdit del Diari de venda.
 RulesAmountOnInOutBookkeepingRecord=Inclou un registre al vostre Llibre Major amb comptes comptables que tenen el grup "DESPESA" o "INGRÉS"
 RulesResultBookkeepingPredefined=Inclou un registre al vostre Llibre Major amb comptes comptables que tenen el grup "DESPESA" o "INGRÉS"
 RulesResultBookkeepingPersonalized=Mostra un registre al vostre Llibre Major amb comptes comptables <b> agrupats per grups personalitzats </b>
-SeePageForSetup=Veure el menú <a href="%s"> %s </a> per configurar-lo
+SeePageForSetup=Veure el menú <a href="%s"> %s </a> per a configurar-lo
 DepositsAreNotIncluded=- Les factures de bestreta no estan incloses
 DepositsAreIncluded=- Les factures de bestreta estan incloses
 LT1ReportByMonth=Informe RE per mes
@@ -189,7 +189,7 @@ LT1ReportByQuartersES=Informe per taxa de RE
 LT2ReportByQuartersES=Informe per taxa de IRPF
 SeeVATReportInInputOutputMode=Veure l'informe <b>%sIVA pagat%s </b> per a un mode de càlcul estàndard
 SeeVATReportInDueDebtMode=Veure l'informe <b>%s IVA degut%s </b> per a un mode de càlcul amb l'opció sobre el degut
-RulesVATInServices=- Per als serveis, l'informe inclou la normativa de l'IVA rebuts o emesos en base a la data de pagament.
+RulesVATInServices=- Per als serveis, l'informe inclou la normativa de l'IVA realment rebuda o emesa en funció de la data de pagament.
 RulesVATInProducts=- Per a actius materials, l'informe inclou l'IVA rebut o emès a partir de la data de pagament.
 RulesVATDueServices=- Per als serveis, l'informe inclou l'IVA de les factures degudes, pagades o no basant-se en la data d'aquestes factures.
 RulesVATDueProducts=- Pel que fa als béns materials, l'informe inclou les factures de l'IVA, segons la data de facturació.
@@ -231,7 +231,7 @@ ACCOUNTING_VAT_SOLD_ACCOUNT=Compte de comptabilitat per defecte per l'IVA en ven
 ACCOUNTING_VAT_BUY_ACCOUNT=Compte de comptabilitat per defecte per l'IVA en les compres (s'utilitza si no es defineix en la configuració del diccionari d'IVA)
 ACCOUNTING_VAT_PAY_ACCOUNT=Compte comptable per defecte per IVA pagat
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
-ACCOUNTING_ACCOUNT_CUSTOMER_Desc=El compte de comptabilitat dedicat definit a la targeta de tercers només s'utilitzarà per a la comptabilitat del Llibre Major. Aquest serà utilitzat per al Llibre Major i com a valor predeterminat de la comptabilitat de subcompte si el compte de comptabilitat de clients dedicat a tercers no està definit.
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=El compte comptable dedicat definit a la fitxa de tercer només s’utilitzarà per a la comptabilitat auxiliar. Aquest s'utilitzarà per al llibre major i com a valor per defecte de la comptabilitat auxiliar si no es defineix un compte comptable de client dedicat a tercers.
 ACCOUNTING_ACCOUNT_SUPPLIER=Compte de comptabilitat utilitzat per tercers proveïdors
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=El compte comptable dedicat definit a la fitxa de tercers només s'utilitzarà per al Llibre Major. Aquest serà utilitzat pel Llibre Major i com a valor predeterminat del subcompte si no es defineix un compte comptable a la fitxa del tercer.
 ConfirmCloneTax=Confirma el clonat d'un impost social / fiscal
@@ -261,7 +261,7 @@ PurchasebyVatrate=Compra per l'impost sobre vendes
 LabelToShow=Etiqueta curta
 PurchaseTurnover=Volum de compres
 PurchaseTurnoverCollected=Volum de compres recollit
-RulesPurchaseTurnoverDue=- Inclou les factures degudes al proveïdor tant si són pagaes com si no. <br> - Es basa en la data de factura d'aquestes factures. <br>
+RulesPurchaseTurnoverDue=- Inclou les factures pendents del proveïdor, tant si es paguen com si no. <br>- Es basa en la data de factura d'aquestes factures.<br>
 RulesPurchaseTurnoverIn=- Inclou tots els pagaments realitzats de les factures de proveïdors. <br> - Es basa en la data de pagament d’aquestes factures <br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Inclou totes les línies de dèbit del diari de compra.
 ReportPurchaseTurnover=Volum de compres facturat
diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang
index c2771dd9a03..96066b666fe 100644
--- a/htdocs/langs/ca_ES/cron.lang
+++ b/htdocs/langs/ca_ES/cron.lang
@@ -7,10 +7,10 @@ Permission23103 = Elimina la tasca programada
 Permission23104 = Executa les tasques programades
 # Admin
 CronSetup=Pàgina de configuració del mòdul - Gestió de tasques planificades
-URLToLaunchCronJobs=URL per comprovar i posar en marxa les tasques automàtiques qualificades
-OrToLaunchASpecificJob=O per llançar una tasca específica
+URLToLaunchCronJobs=URL per comprovar i iniciar les tasques programades des d'un navegador
+OrToLaunchASpecificJob=O per comprovar i iniciar una tasca específica des d’un navegador
 KeyForCronAccess=Codi de seguretat per a la URL de llançament de tasques automàtiques
-FileToLaunchCronJobs=Línia de comando per verificar i executar tasques cron qualificades
+FileToLaunchCronJobs=Línia d'ordres per a comprovar i iniciar les tasques cron qualificades
 CronExplainHowToRunUnix=A entorns Unix s'ha d'utilitzar la següent entrada crontab per executar la comanda cada 5 minuts
 CronExplainHowToRunWin=En l'entorn de Microsoft (tm) de Windows, podeu utilitzar les Eines de tasques programades per executar la línia de comandaments cada 5 minuts
 CronMethodDoesNotExists=La classe %s no conté cap mètode %s
@@ -22,7 +22,7 @@ EnabledAndDisabled=Habilitat i deshabilitat
 # Page list
 CronLastOutput=Última sortida d'execució
 CronLastResult=Últim codi retornat
-CronCommand=Comando
+CronCommand=Ordre
 CronList=Tasques programades
 CronDelete=Elimina les tasques programades
 CronConfirmDelete=Vols eliminar aquests treballs programats?
@@ -43,13 +43,13 @@ CronModule=Mòdul
 CronNoJobs=Sense treballs actualment
 CronPriority=Prioritat
 CronLabel=Etiqueta
-CronNbRun=Nº execucions
-CronMaxRun=Número màxim d'execucions
+CronNbRun=Nombre d'execucions
+CronMaxRun=Nombre màxim d'execucions
 CronEach=Tota (s)
 JobFinished=Tasques llançades i finalitzades
 Scheduled=Programat
 #Page card
-CronAdd= Afegir una tasca
+CronAdd= Afegeix tasques
 CronEvery=Executa cada tasca
 CronObject=Instància/Objecte a crear
 CronArgs=Argument
@@ -68,15 +68,15 @@ CronClassFileHelp=La ruta relativa i el nom del fitxer a carregar (la ruta és r
 CronObjectHelp=El nom de l'objecte a carregar. <BR> Per exemple, per cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/product/class/product.class.php, el valor pel nom del fitxer de classe és<br> <i>Product</i>
 CronMethodHelp=El mètode d'objecte a cridar. <BR> Per exemple, per cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/product/class/product.class.php, el valor pel mètode és<br> <i>fetch</i>
 CronArgsHelp=Els arguments del mètode. <BR> Per exemple, cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/product/class/product.class.php, el valor dels paràmetres pot ser <br> <i>0, ProductRef</i>
-CronCommandHelp=El comando del sistema a executar
+CronCommandHelp=La línia d'ordres del sistema a executar.
 CronCreateJob=Crear nova tasca programada
 CronFrom=De
 # Info
 # Common
 CronType=Tipus de tasca
 CronType_method=Mètode per cridar una classe PHP
-CronType_command=Comando Shell
-CronCannotLoadClass=Impossible carregar el fitxer de la classe %s (per utilitzar la classe %s)
+CronType_command=Ordre Shell
+CronCannotLoadClass=Impossible carregar el fitxer de la classe %s (per a utilitzar la classe %s)
 CronCannotLoadObject=El "class file" %s s'ha carregat, però l'objecte %s no s'ha trobat dins d'ell
 UseMenuModuleToolsToAddCronJobs=Vés al menú "<a href="%s">Inici - Eines d'administració: treballs programats</a>" per veure i editar les tasques programades.
 JobDisabled=Tasca desactivada
@@ -84,3 +84,8 @@ MakeLocalDatabaseDumpShort=Còpia de seguretat de la base de dades local
 MakeLocalDatabaseDump=Crear un bolcat de la base de dades local. Els paràmetres són: compressió ('gz' o 'bz' o 'none'), tipus de còpia de seguretat ('mysql' o 'pgsql'), 1, 'auto' o nom de fitxer per a compilar, nombre de fitxers de còpia de seguretat per conservar
 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=Netejador de dades i anonimitzador
+JobXMustBeEnabled=La tasca %s s'ha d'activar
+# Cron Boxes
+LastExecutedScheduledJob=Darrera tasca programada executada
+NextScheduledJobExecute=Propera tasca programada a executar
+NumberScheduledJobError=Nombre de tasques programades en error
diff --git a/htdocs/langs/ca_ES/dict.lang b/htdocs/langs/ca_ES/dict.lang
index 00988d0d397..1d0f708a3e0 100644
--- a/htdocs/langs/ca_ES/dict.lang
+++ b/htdocs/langs/ca_ES/dict.lang
@@ -166,7 +166,7 @@ CountryNR=Nauru
 CountryNP=Nepal
 CountryAN=Antilles Holandeses
 CountryNC=Nova Caledònia
-CountryNZ=Nouvelle-Zélande
+CountryNZ=Nova Zelanda
 CountryNI=Nicaragua
 CountryNE=Níger
 CountryNG=Nigèria
@@ -197,7 +197,7 @@ CountryPM=San Pedro i Miquelon
 CountryVC=Saint Vincent i les Grenadines
 CountryWS=Samoa
 CountrySM=San Marino
-CountryST=São Tomé i Príncipe
+CountryST=Sao Tomé i Príncep
 CountryRS=Serbia
 CountrySC=Seychelles
 CountrySL=Sierra Leone
@@ -223,7 +223,7 @@ CountryTO=Tonga
 CountryTT=Trinité-et-Tobago
 CountryTR=Turquia
 CountryTM=Turkmenistan
-CountryTC=Illes turques i caicos
+CountryTC=Illes Turques i Caicos
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ucraïna
@@ -245,7 +245,7 @@ CountryGG=Guernesey
 CountryIM=Ile de Man
 CountryJE=Jersey
 CountryME=Monténégro
-CountryBL=Saint-Barthélemy
+CountryBL=Sant Bartomeu
 CountryMF=Saint-Martin
 
 ##### Civilities #####
@@ -353,7 +353,7 @@ ExpAuto10PCV=10 CV i més
 ExpAuto11PCV=11 CV i més
 ExpAuto12PCV=12 CV i més
 ExpAuto13PCV=13 CV i més
-ExpCyclo=Capacitat inferior a 50cm3
+ExpCyclo=Capacitat inferior a 50 cm3
 ExpMoto12CV=Moto 1 ó 2 CV
 ExpMoto345CV=Moto 3, 4 ó 5 CV
 ExpMoto5PCV=Moto 5 CV i més
diff --git a/htdocs/langs/ca_ES/ecm.lang b/htdocs/langs/ca_ES/ecm.lang
index f26824bcc38..4f27a022b9e 100644
--- a/htdocs/langs/ca_ES/ecm.lang
+++ b/htdocs/langs/ca_ES/ecm.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nº de documents en el directori
+ECMNbOfDocs=Nombre de documents al directori
 ECMSection=Carpeta
 ECMSectionManual=Carpeta manual
 ECMSectionAuto=Carpeta automàtica
@@ -7,15 +7,15 @@ ECMSectionsManual=Arbre manual
 ECMSectionsAuto=Arbre automàtic
 ECMSections=Carpetes
 ECMRoot=Arrel del ECM
-ECMNewSection=Nova carpeta
-ECMAddSection=Afegir carpeta
+ECMNewSection=Carpeta nova
+ECMAddSection=Afegeix directori
 ECMCreationDate=Data creació
 ECMNbOfFilesInDir=Nombre d'arxius a la carpeta
-ECMNbOfSubDir=nombre de subcarpetes
+ECMNbOfSubDir=Nombre de subcarpetes
 ECMNbOfFilesInSubDir=Nombre d'arxius en les subcarpetes
 ECMCreationUser=Creador
 ECMArea=Àrea SGD/GCE
-ECMAreaDesc=L'àrea SGD / GCE (Sistema de Gestió de Documents / Gestió de Continguts Electrònics) et permet desar, compartir i cercar ràpidament tot tipus de documents a Dolibarr.
+ECMAreaDesc=L’àrea SGD/GED (Sistema de Gestió de Documents / Gestió de Continguts Electrònics) us permet desar, compartir i cercar ràpidament tota mena de documents a Dolibarr.
 ECMAreaDesc2=Podeu crear carpetes manuals i adjuntar els documents<br>Les carpetes automàtiques són emplenades automàticament en l'addició d'un document en una fitxa.
 ECMSectionWasRemoved=La carpeta <b>%s</b> ha estat eliminada
 ECMSectionWasCreated=S'ha creat el directori <b>%s</b>.
@@ -33,7 +33,7 @@ CannotRemoveDirectoryContainsFilesOrDirs=L'eliminació no és possible perquè c
 CannotRemoveDirectoryContainsFiles=L'eliminació no és possible perquè conté alguns fitxers
 ECMFileManager=Explorador de fitxers
 ECMSelectASection=Seleccioneu una carpeta en l'arbre...
-DirNotSynchronizedSyncFirst=Aquest directori sembla que s'ha creat o modificat fora del mòdul ECM. Heu de prémer el botó "Resincronitzar" per sincronitzar el disc i la base de dades per obtenir el contingut d'aquest directori.
+DirNotSynchronizedSyncFirst=Sembla que aquest directori es va crear o modificar fora del mòdul ECM. Primer heu de fer clic al botó "Resincronitza" per sincronitzar el disc i la base de dades per a obtenir el contingut d'aquest directori.
 ReSyncListOfDir=Resincronitzar la llista de directoris
 HashOfFileContent=Resum matemàtic ("hash") del contingut del fitxer
 NoDirectoriesFound=No s'han trobat directoris
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 520515f844c..26ff6a8f8bd 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -8,7 +8,8 @@ ErrorBadEMail=Correu electrònic %s és incorrecte
 ErrorBadMXDomain=El correu electrònic %s sembla incorrecte (el domini no té cap registre MX vàlid)
 ErrorBadUrl=Url %s invàlida
 ErrorBadValueForParamNotAString=Valor incorrecte del paràmetre. Acostuma a passar quan falta la traducció.
-ErrorLoginAlreadyExists=El login %s ja existeix.
+ErrorRefAlreadyExists=La referència <b> %s </b> ja existeix.
+ErrorLoginAlreadyExists=El nom d'usuari %s ja existeix.
 ErrorGroupAlreadyExists=El grup %s ja existeix.
 ErrorRecordNotFound=Registre no trobat
 ErrorFailToCopyFile=Error al copiar l'arxiu '<b>%s</b>' a '<b>%s</b>'.
@@ -22,7 +23,7 @@ ErrorFailToDeleteDir=Error en eliminar la carpeta '<b>%s</b>'.
 ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
 ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=Aquest contacte ja està definit com a contacte per a aquest tipus.
-ErrorCashAccountAcceptsOnlyCashMoney=Aquesta compte bancari és de tipus caixa i només accepta el mètode de pagament de tipus <b>espècie</b>.
+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
 ErrorProdIdIsMandatory=El %s es obligatori
@@ -49,6 +50,7 @@ ErrorFieldsRequired=No s'han indicat alguns camps obligatoris
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Error en la creació d'una carpeta. Comprovi que l'usuari del servidor web té drets d'escriptura en les carpetes de documents de Dolibarr. Si el paràmetre <b>safe_mode</b> està actiu en aquest PHP, Comproveu que els fitxers php dolibarr pertanyen a l'usuari del servidor web.
 ErrorNoMailDefinedForThisUser=E-Mail no definit per a aquest usuari
+ErrorSetupOfEmailsNotComplete=La configuració dels correus electrònics no s'ha completat
 ErrorFeatureNeedJavascript=Aquesta funcionalitat requereix javascript actiu per funcionar. Modifiqueu en configuració->entorn.
 ErrorTopMenuMustHaveAParentWithId0=Un menú del tipus 'Superior' no pot tenir un menú pare. Poseu 0 al menú pare o trieu un menú del tipus 'Esquerra'.
 ErrorLeftMenuMustHaveAParentId=Un menú del tipus 'Esquerra' ha de tenir un ID de pare
@@ -59,7 +61,7 @@ ErrorDirAlreadyExists=Ja existeix una carpeta amb aquest nom.
 ErrorFileAlreadyExists=Ja existeix un fitxer amb aquest nom.
 ErrorPartialFile=Arxiu no rebut íntegrament pel servidor.
 ErrorNoTmpDir=Directori temporal de recepció %s inexistent
-ErrorUploadBlockedByAddon=Pujada bloquejada per un plugin PHP/Apache.
+ErrorUploadBlockedByAddon=Càrrega bloquejada per un connector PHP/Apache.
 ErrorFileSizeTooLarge=La mida del fitxer és massa gran.
 ErrorFieldTooLong=El camp %s és massa llarg.
 ErrorSizeTooLongForIntType=Longitud del camp massa llarg per al tipus int (màxim %s xifres)
@@ -74,10 +76,10 @@ ErrorFieldMustHaveXChar=El camp <b> %s </b> ha de tenir com a mínim %s caràcte
 ErrorNoAccountancyModuleLoaded=Mòdul de comptabilitat no activat
 ErrorExportDuplicateProfil=El nom d'aquest perfil ja existeix per aquest conjunt d'exportació
 ErrorLDAPSetupNotComplete=La configuració Dolibarr-LDAP és incompleta.
-ErrorLDAPMakeManualTest=S'ha creat un arxiu .ldif a la carpeta %s. Intenta carregar-lo manualment des de la línia de comandes per tenir més informació sobre l'error.
+ErrorLDAPMakeManualTest=S'ha generat un fitxer .ldif al directori %s. Proveu de carregar-lo manualment des de la línia de comandes per a obtenir més informació sobre els errors.
 ErrorCantSaveADoneUserWithZeroPercentage=No es pot desar una acció amb "estat no iniciat" si el camp "fet per" també s'omple.
-ErrorRefAlreadyExists=La referència utilitzada per a la creació ja existeix
-ErrorPleaseTypeBankTransactionReportName=Si us plau, tecleja el nom del extracte bancari on s'informa del registre (format AAAAMM o AAAAMMDD)
+ErrorRefAlreadyExists=La referència <b> %s </b> ja existeix.
+ErrorPleaseTypeBankTransactionReportName=Introduïu el nom de l’extracte bancari on s’ha d’informar de l’entrada (format AAAAAMM o AAAAAMMDD)
 ErrorRecordHasChildren=No s'ha pogut eliminar el registre, ja que té alguns registres fills.
 ErrorRecordHasAtLeastOneChildOfType=L'objecte té almenys un fill de tipus %s
 ErrorRecordIsUsedCantDelete=No es pot eliminar el registre. Ja s'utilitza o s'inclou en un altre objecte.
@@ -133,14 +135,14 @@ ErrorModuleFileRequired=Ha de seleccionar un arxiu del paquet del mòdul de Doli
 ErrorPhpCurlNotInstalled=L'extensió PHP CURL no es troba instal·lada, és indispensable per dialogar amb Paypal.
 ErrorFailedToAddToMailmanList=S'ha produït un error en intentar afegir un registre a la llista Mailman o base de dades SPIP
 ErrorFailedToRemoveToMailmanList=Error en l'eliminació de %s de la llista Mailmain %s o base SPIP
-ErrorNewValueCantMatchOldValue=El Nou valor no pot ser igual al antic
+ErrorNewValueCantMatchOldValue=El valor nou no pot ser igual al valor antic
 ErrorFailedToValidatePasswordReset=No s'ha pogut restablir la contrasenya. És possible que aquest enllaç ja s'hagi utilitzat (aquest enllaç només es pot utilitzar una vegada). Si no és el cas prova de reiniciar el procés de restabliment de contrasenya des del principi.
 ErrorToConnectToMysqlCheckInstance=Error de connexió amb la base de dades. Comprovi que el servidor de la base de dades està funcionant (per exemple, amb mysql/mariadb, pot iniciar-lo amb el comandament 'sudo service mysql start')
 ErrorFailedToAddContact=Error en l'addició del contacte
 ErrorDateMustBeBeforeToday=La data ha de ser inferior a la d’avui
 ErrorDateMustBeInFuture=La data ha de ser major que avui
 ErrorPaymentModeDefinedToWithoutSetup=S'ha establert la forma de pagament al tipus %s però a la configuració del mòdul de factures no s'ha indicat la informació per mostrar aquesta forma de pagament.
-ErrorPHPNeedModule=Error, el seu PHP ha de tenir instal·lat el mòdul <b>%s</b> per utilitzar aquesta funcionalitat.
+ErrorPHPNeedModule=Error, el vostre PHP ha de tenir instal·lat el mòdul <b>%s</b> per a utilitzar aquesta funció.
 ErrorOpenIDSetupNotComplete=Ha configurat Dolibarr per acceptar l'autentificació OpenID, però la URL del servei OpenID no es troba definida a la constant %s
 ErrorWarehouseMustDiffers=El magatzem d'origen i destí han de ser diferents
 ErrorBadFormat=El format és incorrecte!
@@ -173,7 +175,7 @@ ErrorTryToMakeMoveOnProductRequiringBatchData=Error, intentant fer un moviment d
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Totes les recepcions han de verificar-se primer (acceptades o denegades) abans per realitzar aquesta acció
 ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Totes les recepcions han de verificar-se (acceptades) abans per poder-se realitzar a aquesta acció
 ErrorGlobalVariableUpdater0=Petició HTTP fallida amb error '%s'
-ErrorGlobalVariableUpdater1=Format JSON '%s' invalid
+ErrorGlobalVariableUpdater1=Format JSON no vàlid "%s"
 ErrorGlobalVariableUpdater2=Falta el paràmetre '%s'
 ErrorGlobalVariableUpdater3=No s'han trobat les dades sol·licitades
 ErrorGlobalVariableUpdater4=El client SOAP ha fallat amb l'error '%s'
@@ -181,7 +183,7 @@ ErrorGlobalVariableUpdater5=Sense variable global seleccionada
 ErrorFieldMustBeANumeric=El camp <b>%s</b> ha de ser un valor numèric
 ErrorMandatoryParametersNotProvided=Paràmetre/s obligatori/s no definits
 ErrorOppStatusRequiredIfAmount=Establiu una quantitat estimada d'aquest avantatge. Així que també heu d'introduir el seu estat.
-ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
+ErrorFailedToLoadModuleDescriptorForXXX=No s'ha pogut carregar la classe del descriptor del mòdul per %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Definició incorrecta del menú Array en el descriptor del mòdul (valor incorrecte per a la clau fk_menu)
 ErrorSavingChanges=S'ha produït un error en desar els canvis
 ErrorWarehouseRequiredIntoShipmentLine=El magatzem és obligatori en la línia a enviar
@@ -199,7 +201,7 @@ ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined
 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, el nom del comunicat del banc deu de seguir la regla de sintaxis %s
-ErrorPhpMailDelivery=Comproveu que no faci servir un nombre massa alt de destinataris i que el seu contingut de correu electrònic no sigui similar a un Spam. Demani també al seu administrador que verifiqui el tallafocs i els arxius dels registres del servidor per obtenir una informació més completa.
+ErrorPhpMailDelivery=Comproveu que no feu servir un nombre massa elevat de destinataris i que el vostre contingut de correu electrònic no sigui similar a un correu brossa. Demaneu també al vostre administrador que comprovi el tallafocs i els fitxers de registre del servidor per a obtenir una informació més completa.
 ErrorUserNotAssignedToTask=L'usuari ha d'estar assignat a la tasca per poder introduir el temps consumit.
 ErrorTaskAlreadyAssigned=La tasca també està assignada a l'usuari
 ErrorModuleFileSeemsToHaveAWrongFormat=Pareix que el mòdul té un format incorrecte.
@@ -207,7 +209,7 @@ ErrorModuleFileSeemsToHaveAWrongFormat2=Al ZIP d'un mòdul ha d'haver necessàri
 ErrorFilenameDosNotMatchDolibarrPackageRules=El nom de l'arxiu del mòdul (<strong>%s</strong>) no coincideix amb la sintaxi del nom esperat: <strong>%s</strong>
 ErrorDuplicateTrigger=Error, nom de disparador %s duplicat. Ja es troba carregat des de %s.
 ErrorNoWarehouseDefined=Error, no hi ha magatzems definits.
-ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorBadLinkSourceSetButBadValueForRef=L'enllaç que utilitzeu no és vàlid. Es defineix una "font" de pagament, però el valor de "ref" no és vàlid.
 ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
 ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=No és possible la validació massiva quan s'estableix l'opció d'augmentar/disminuir l'estoc en aquesta acció (cal validar-ho un per un per poder definir el magatzem a augmentar/disminuir)
 ErrorObjectMustHaveStatusDraftToBeValidated=L'objecte %s ha de tenir l'estat 'Esborrany' per ser validat.
@@ -224,10 +226,10 @@ ErrorDuringChartLoad=S'ha produït un error en carregar el gràfic de comptes. S
 ErrorBadSyntaxForParamKeyForContent=Sintaxi incorrecta per a la clau de contingut del paràmetre. Ha de tenir un valor que comenci per %s o %s
 ErrorVariableKeyForContentMustBeSet=Error, s'ha d'establir la constant amb el nom %s (amb contingut de text per mostrar) o %s (amb url extern per mostrar).
 ErrorURLMustStartWithHttp=L'URL %s ha de començar amb http: // o https: //
-ErrorNewRefIsAlreadyUsed=Error, la nova referència ja s’està utilitzant
+ErrorNewRefIsAlreadyUsed=Error, la referència nova ja s’està utilitzant
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, l’eliminació del pagament vinculat a una factura tancada no és possible.
 ErrorSearchCriteriaTooSmall=Criteris de cerca massa petits.
-ErrorObjectMustHaveStatusActiveToBeDisabled=Per desactivar els objectes, han de tenir l'estat "Actiu"
+ErrorObjectMustHaveStatusActiveToBeDisabled=Per a desactivar els objectes, han de tenir l'estat "Actiu"
 ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Per ser activats, els objectes han de tenir l'estat "Esborrany" o "Desactivat"
 ErrorNoFieldWithAttributeShowoncombobox=Cap camp té la propietat "showoncombobox" en la definició de l'objecte "%s". No es pot mostrar el llistat desplegable.
 ErrorFieldRequiredForProduct=El camp "%s" és obligatori per al producte %s
@@ -246,10 +248,18 @@ ErrorProductDoesNotNeedBatchNumber=Error, el producte '<b> %s </b>' no accepta u
 ErrorFailedToReadObject=Error, no s'ha pogut llegir l'objecte del tipus <b> %s </b>
 ErrorParameterMustBeEnabledToAllwoThisFeature=Error, el paràmetre <b> %s </b> s'ha d'activar a <b>conf/conf.php<b> per permetre l'ús de la interfície de línia d'ordres pel programador de treball intern
 ErrorLoginDateValidity=Error, aquest inici de sessió està fora de l'interval de dates de validesa
+ErrorValueLength=La longitud del camp '<b> %s </b>' ha de ser superior a '<b> %s </b>'
+ErrorReservedKeyword=La paraula '<b> %s </b>' és una paraula clau reservada
+ErrorNotAvailableWithThisDistribution=No disponible amb aquesta distribució
+ErrorPublicInterfaceNotEnabled=La interfície pública no s'ha activat
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Cal definir l'idioma de la pàgina nova si es defineix com a traducció d'una altra pàgina
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=L'idioma de la pàgina nova no ha de ser l'idioma d'origen si s'estableix com a traducció d'una altra pàgina
+ErrorAParameterIsRequiredForThisOperation=Un paràmetre és obligatori per a aquesta operació
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=El paràmetre PHP upload_max_filesize (%s) és superior al paràmetre PHP post_max_size (%s). No es tracta d’una configuració consistent.
 WarningPasswordSetWithNoAccount=S'ha indicat una contrasenya per aquest soci. En canvi, no s'ha creat cap compte d'usuari, de manera que aquesta contrasenya s'ha desat però no pot ser utilitzada per entrar a Dolibarr. Es pot utilitzar per un mòdul/interfície extern, però si no cal definir cap usuari i contrasenya per un soci, pots deshabilitar la opció "Gestiona l'entrada per tots els socis" des de la configuració del mòdul Socis. Si necessites gestionar una entrada sense contrasenya, pots mantenir aquest camp buit i permetre aquest avís. Nota: El correu electrònic es pot utilitzar per entrar si el soci està enllaçat a un usuarí
-WarningMandatorySetupNotComplete=Feu clic aquí per configurar els paràmetres obligatoris
+WarningMandatorySetupNotComplete=Feu clic aquí per a configurar els paràmetres obligatoris
 WarningEnableYourModulesApplications=Feu clic aquí per activar els vostres mòduls i aplicacions
 WarningSafeModeOnCheckExecDir=Atenció, està activada l'opció PHP <b>safe_mode</b>, la comanda ha d'estar dins d'un directori declarat dins del paràmetre php <b>safe_mode_exec_dir</b>.
 WarningBookmarkAlreadyExists=Ja existeix un marcador amb aquest títol o aquest URL.
@@ -266,7 +276,7 @@ WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funcionalitat deshabilita
 WarningPaymentDateLowerThanInvoiceDate=La data de pagament (%s) és anterior a la data (%s) de la factura %s.
 WarningTooManyDataPleaseUseMoreFilters=Massa dades (més de %s línies). Utilitza més filtres o indica la constant %s amb un límit superior.
 WarningSomeLinesWithNullHourlyRate=Algunes vegades es van registrar per alguns usuaris quan no s'havia definit el seu preu per hora. Es va utilitzar un valor de 0 %s per hora, però això pot resultar una valoració incorrecta del temps dedicat.
-WarningYourLoginWasModifiedPleaseLogin=El teu login s'ha modificat. Per seguretat has de fer login amb el nou login abans de la següent acció.
+WarningYourLoginWasModifiedPleaseLogin=El vostre nom d'usuari s'ha modificat. Per motius de seguretat, haureu d'iniciar sessió amb el vostre nou nom d'usuari abans de la propera acció.
 WarningAnEntryAlreadyExistForTransKey=Ja existeix una entrada per la clau de traducció d'aquest idioma
 WarningNumberOfRecipientIsRestrictedInMassAction=Advertència: el nombre de destinataris diferents està limitat a <b> %s </b> quan s'utilitzen les accions massives a les llistes.
 WarningDateOfLineMustBeInExpenseReportRange=Advertència, la data de la línia no està dins del rang de l'informe de despeses
@@ -275,4 +285,5 @@ WarningProjectClosed=El projecte està tancat. Heu de tornar a obrir primer.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Algunes transaccions bancàries es van suprimir després que es generés el rebut que les conté. Per tant, el nombre de xecs i el total de rebuts poden diferir del nombre i el total a la llista.
 WarningFailedToAddFileIntoDatabaseIndex=Advertiment: no s'ha pogut afegir l'entrada de fitxer a la taula d'índex de la base de dades ECM
 WarningTheHiddenOptionIsOn=Advertiment, l'opció oculta <b> %s </b> està activada.
-WarningCreateSubAccounts=Atenció, no podeu crear directament un subcompte, heu de crear un tercer o un usuari i assignar-los un codi comptable per trobar-los en aquesta llista.
+WarningCreateSubAccounts=Atenció, no podeu crear directament un subcompte, heu de crear un tercer o un usuari i assignar-los un codi comptable per a trobar-los en aquesta llista.
+WarningAvailableOnlyForHTTPSServers=Disponible només si s'utilitza una connexió segura HTTPS.
diff --git a/htdocs/langs/ca_ES/exports.lang b/htdocs/langs/ca_ES/exports.lang
index 5a0d95fcf7d..f66769a30f7 100644
--- a/htdocs/langs/ca_ES/exports.lang
+++ b/htdocs/langs/ca_ES/exports.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - exports
 ExportsArea=Exportacions
 ImportArea=Importació
-NewExport=Nova exportació
-NewImport=Nova importació
+NewExport=Exportació nova
+NewImport=Importació nova
 ExportableDatas=Conjunt de dades exportables
 ImportableDatas=Conjunt de dades importables
 SelectExportDataSet=Trieu un conjunt predefinit de dades que voleu exportar ...
@@ -23,7 +23,7 @@ DatasetToImport=Lot de dades a importar
 ChooseFieldsOrdersAndTitle=Trieu l'ordre dels camps ...
 FieldsTitle=Títol camps
 FieldTitle=Títol camp
-NowClickToGenerateToBuildExportFile=Ara, seleccioneu el format del fitxer al quadre combinat i feu clic a "Generar" per generar el fitxer d'exportació ...
+NowClickToGenerateToBuildExportFile=Ara, seleccioneu el format de fitxer al quadre combinat i feu clic a "Genera" per a crear el fitxer d'exportació...
 AvailableFormats=Formats disponibles
 LibraryShort=Llibreria
 ExportCsvSeparator=Caràcter separador del CSV
@@ -35,7 +35,7 @@ FormatedImportDesc2=El primer pas és triar el tipus de dades que voleu importar
 FormatedExport=Assistent d'exportació
 FormatedExportDesc1=Aquestes eines permeten l'exportació de dades personalitzades mitjançant un assistent, per ajudar-vos en el procés sense necessitat de coneixements tècnics.
 FormatedExportDesc2=El primer pas és triar un conjunt de dades predefinit, després els camps que voleu exportar i en quin ordre.
-FormatedExportDesc3=Quan se seleccionen les dades per exportar, podeu triar el format del fitxer de sortida.
+FormatedExportDesc3=Quan se seleccionen les dades per a exportar, podeu triar el format del fitxer de sortida.
 Sheet=Fulla
 NoImportableData=Sense taules de dades importables (cap mòdul amb les definicions dels perfils d'importació està actiu)
 FileSuccessfullyBuilt=Fitxer generat
@@ -92,8 +92,8 @@ NbOfLinesOK=Nombre de línies sense errors ni warnings: <b>%s</b>.
 NbOfLinesImported=Nombre de línies correctament importades: <b>%s</b>.
 DataComeFromNoWhere=El valor a inserir no correspon a cap camp de l'arxiu origen.
 DataComeFromFileFieldNb=El valor a inserir es correspon al camp nombre <<b>%s</b> de l'arxiu origen.
-DataComeFromIdFoundFromRef=El valor que prové del número de camp <b> %s </b> del fitxer d'origen s'utilitzarà per trobar l'id del objecte primari que s'utilitzarà (de manera que l'objecte <b> %s </b> que té la referència del fitxer d'origen ha d'existir a la base de dades).
-DataComeFromIdFoundFromCodeId=El codi que prové del número de camp <b> %s </b> del fitxer d'origen s'utilitzarà per trobar l'id del seu objecte primari a utilitzar (pel que el codi del fitxer d'origen ha d'existir al diccionari <b> %s </b>). Tingueu en compte que si coneixeu l'identificador, també podeu utilitzar-lo al fitxer font en lloc del codi. La importació ha de funcionar en ambdós casos.
+DataComeFromIdFoundFromRef=El valor que prové del camp numèric <b>%s</b> del fitxer d'origen s'utilitzarà per a trobar l'id de l'objecte pare que s'utilitzarà (de manera que l'objecte <b>%s</b> que té la referència del fitxer d'origen ha d'existir a la base de dades).
+DataComeFromIdFoundFromCodeId=El codi que prové del camp numèric <b>%s</b> del fitxer d'origen s'utilitzarà per a trobar l'id de l'objecte pare a utilitzar (pel que el codi del fitxer d'origen ha d'existir al diccionari <b>%s</b>). Tingueu en compte que si coneixeu l'identificador, també podeu utilitzar-lo al fitxer font en lloc del codi. La importació ha de funcionar en ambdós casos.
 DataIsInsertedInto=Les dades de l'arxiu d'origen s'inseriran en el següent camp:
 DataIDSourceIsInsertedInto=L'identificador de l'objecte primari s'ha trobat utilitzant les dades del fitxer d'origen, s'inserirà en el camp següent:
 DataCodeIDSourceIsInsertedInto=L'id de la línia pare trobada a partir del codi, s'ha d'inserir en el següent camp:
@@ -117,8 +117,8 @@ ImportFromLine=Importa començant des del número de línia
 EndAtLineNb=Final en el número de línia
 ImportFromToLine=Interval límit (Des de - Fins a). Per exemple per a ometre les línies de capçalera.
 SetThisValueTo2ToExcludeFirstLine=Per exemple, estableixi aquest valor a 3 per excloure les 2 primeres línies. <br> Si no s'ometen les línies de capçalera, això provocarà diversos errors en la simulació d'importació.
-KeepEmptyToGoToEndOfFile=Mantingueu aquest camp buit per processar totes les línies al final del fitxer.
-SelectPrimaryColumnsForUpdateAttempt=Seleccioneu les columnes que s'utilitzaran com a clau principal per a una importació UPDATE
+KeepEmptyToGoToEndOfFile=Mantingueu aquest camp buit per a processar totes les línies fins al final del fitxer.
+SelectPrimaryColumnsForUpdateAttempt=Seleccioneu les columnes que vulgueu utilitzar com a clau principal per a la importació d'ACTUALITZACIÓ
 UpdateNotYetSupportedForThisImport=L'actualització no és compatible amb aquest tipus d'importació (només afegir)
 NoUpdateAttempt=No s'ha realitzat cap intent d'actualització, només afegir
 ImportDataset_user_1=Usuaris (empleats o no) i propietats
@@ -130,6 +130,7 @@ FilteredFieldsValues=Valors de filtres
 FormatControlRule=Regla de control de format
 ## imports updates
 KeysToUseForUpdates=Clau (columna) a utilitzar per <b> actualització </b> dades existents
-NbInsert=Número de línies afegides: %s
-NbUpdate=Número de línies actualizades: %s
+NbInsert=Nombre de línies afegides: %s
+NbUpdate=Nombre de línies actualitzades: %s
 MultipleRecordFoundWithTheseFilters=S'han trobat múltiples registres amb aquests filtres: %s
+StocksWithBatch=Estocs i ubicacions (magatzem) de productes amb número de lot/sèrie
diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang
index e1143a0ae38..5a0098d8bdd 100644
--- a/htdocs/langs/ca_ES/holiday.lang
+++ b/htdocs/langs/ca_ES/holiday.lang
@@ -3,7 +3,7 @@ HRM=RRHH
 Holidays=Dies lliures
 CPTitreMenu=Dies lliures
 MenuReportMonth=Estat mensual
-MenuAddCP=Nova petició de dia lliure
+MenuAddCP=Sol·licitud nova de permís
 NotActiveModCP=Ha d'activar el mòdul Dies lliures retribuïts per veure aquesta pàgina
 AddCP=Realitzar una petició de dies lliures
 DateDebCP=Data inici
@@ -15,14 +15,14 @@ CancelCP=Anul·lada
 RefuseCP=Rebutjada
 ValidatorCP=Validador
 ListeCP=Llista de dies lliures
-Leave=Fitxa de dies lliures
+Leave=Sol·licitud de permís
 LeaveId=Identificador de baixa
 ReviewedByCP=Serà revisada per
 UserID=ID d'usuari
 UserForApprovalID=Usuari per al ID d'aprovació
 UserForApprovalFirstname=Nom de l'usuari d'aprovació
 UserForApprovalLastname=Cognom de l'usuari d'aprovació
-UserForApprovalLogin=Login de l'usuari d'aprovació
+UserForApprovalLogin=Nom d'usuari de l’usuari d’aprovació
 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.
@@ -33,7 +33,7 @@ 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
 ReturnCP=Tornar a la pàgina anterior
 ErrorUserViewCP=No esta autoritzat a llegir aquesta petició de dies lliures.
-InfosWorkflowCP=Informació del workflow
+InfosWorkflowCP=Informació del flux de treball
 RequestByCP=Comandada per
 TitreRequestCP=Fitxa de dies lliures
 TypeOfLeaveId=Tipus d'identificador de baixa
@@ -46,14 +46,14 @@ NbUseDaysCPShortInMonth=Dies consumits al mes
 DayIsANonWorkingDay=%s és un dia no laborable
 DateStartInMonth=Data d'inici al mes
 DateEndInMonth=Data de finalització al mes
-EditCP=Modificar
+EditCP=Edita
 DeleteCP=Eliminar
 ActionRefuseCP=Rebutja
 ActionCancelCP=Cancel·la
 StatutCP=Estat
 TitleDeleteCP=Eliminar la petició de dies lliures
 ConfirmDeleteCP=Estàs segur de voler eliminar aquesta petició de dies lliures?
-ErrorCantDeleteCP=Error, no te permisos per eliminar aquesta petició de dies lliures
+ErrorCantDeleteCP=Error, no teniu permisos per a suprimir aquesta sol·licitud de permís.
 CantCreateCP=Note permisos per realitzar peticions de dies lliures
 InvalidValidatorCP=Ha d'indicar un validador per la seva petició de dies lliures
 NoDateDebut=Ha d'indicar una data d'inici.
@@ -80,12 +80,12 @@ UserCP=Usuari
 ErrorAddEventToUserCP=S'ha produït un error en l'assignació del permís excepcional.
 AddEventToUserOkCP=S'ha afegit el permís excepcional.
 MenuLogCP=Veure registre de canvis
-LogCP=Historial d'actualizacions de dies lliures
+LogCP=Registre d’actualitzacions dels dies de vacances disponibles
 ActionByCP=Realitzat per
 UserUpdateCP=Per a l'usuari
 PrevSoldeCP=Saldo anterior
-NewSoldeCP=Nou saldo
-alreadyCPexist=Ha s'ha efectuat una petició de dies lliures per aquest periode
+NewSoldeCP=Saldo nou
+alreadyCPexist=En aquest període ja s’ha fet una sol·licitud de dia lliure.
 FirstDayOfHoliday=Primer dia lliure
 LastDayOfHoliday=Últim dia de vacances
 BoxTitleLastLeaveRequests=Últimes %s peticions de dies lliures modificades
@@ -113,22 +113,22 @@ ErrorMailNotSend=S'ha produït un error en l'enviament del correu electrònic:
 NoticePeriod=Preavís
 #Messages
 HolidaysToValidate=Dies lliures retribuïts a validar
-HolidaysToValidateBody=A continuació trobara una sol·licitud de dies lliures retribuïts per validar
+HolidaysToValidateBody=A continuació es mostra una sol·licitud de permís per a validar
 HolidaysToValidateDelay=Aquesta sol·licitud de dies lliures retribuïts tindrà lloc en un termini de menys de %s dies.
 HolidaysToValidateAlertSolde=L'usuari que ha realitzat la sol·licitud de dies lliures retribuïts no disposa de suficients dies disponibles
-HolidaysValidated=Dies lliures retribuïts valids
+HolidaysValidated=Sol·licituds de permís validats
 HolidaysValidatedBody=La seva sol·licitud de dies lliures retribuïts des de el %s al %s ha sigut validada.
 HolidaysRefused=Dies lliures retribuïts denegats
 HolidaysRefusedBody=La seva sol·licitud de dies lliures retribuïts des de el %s al %s ha sigut denegada per el següent motiu:
 HolidaysCanceled=Dies lliures retribuïts cancel·lats
-HolidaysCanceledBody=La seva solicitud de dies lliures retribuïts del %s al %s ha sigut cancel·lada.
+HolidaysCanceledBody=S'ha cancel·lat la vostra sol·licitud de permís del %s al %s.
 FollowedByACounter=1: Aquest tipus de dia lliure necessita el seguiment d'un comptador. El comptador s'incrementa manualment o automàticament i quan hi ha una petició de dia lliure validada, el comptador es decrementa.<br>0: No seguit per un comptador.
 NoLeaveWithCounterDefined=No s'han definit els tipus de dies lliures que son necessaris per poder seguir-los amb comptador
-GoIntoDictionaryHolidayTypes=Ves a <strong>Inici - Configuració - Diccionaris - Tipus de dies lliures</strong> per configurar els diferents tipus de dies lliures
+GoIntoDictionaryHolidayTypes=Ves a <strong>Inici - Configuració - Diccionaris - Tipus de dies lliures</strong> per a configurar els diferents tipus de dies lliures
 HolidaySetup=Configuració del mòdul Vacances
 HolidaysNumberingModules=Models numerats de sol·licituds de dies lliures
-TemplatePDFHolidays=Plantilla de sol · licitud de dies lliures en PDF
+TemplatePDFHolidays=Plantilla per a sol·licituds de permisos en PDF
 FreeLegalTextOnHolidays=Text gratuït a PDF
 WatermarkOnDraftHolidayCards=Marques d'aigua sobre esborranys de sol·licituds de dies lliures
-HolidaysToApprove=Vacances per aprovar
-NobodyHasPermissionToValidateHolidays=Ningú té permís per validar vacances
+HolidaysToApprove=Vacances per a aprovar
+NobodyHasPermissionToValidateHolidays=Ningú no té permís per a validar les vacances
diff --git a/htdocs/langs/ca_ES/hrm.lang b/htdocs/langs/ca_ES/hrm.lang
index 2952d702637..cc584a4d291 100644
--- a/htdocs/langs/ca_ES/hrm.lang
+++ b/htdocs/langs/ca_ES/hrm.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - en_US - hrm
 # Admin
-HRM_EMAIL_EXTERNAL_SERVICE=Correu electrònic per prevenir serveis externs HRM
+HRM_EMAIL_EXTERNAL_SERVICE=Correu electrònic per a evitar el servei extern de HRM
 Establishments=Establiments
 Establishment=Establiment
 NewEstablishment=Establiment nou
diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang
index 98b6efbeb16..485ed64c1c8 100644
--- a/htdocs/langs/ca_ES/install.lang
+++ b/htdocs/langs/ca_ES/install.lang
@@ -42,7 +42,7 @@ WebPagesDirectory=Carpeta que conté les pàgines web
 DocumentsDirectory=Carpeta que ha de contenir els documents generats (PDF, etc.)
 URLRoot=URL Arrel
 ForceHttps=Forçar connexions segures (https)
-CheckToForceHttps=Marqueu aquesta opció per forçar connexions segures (https).<br>Per a això és necessari que el servidor web està configurat amb un certificat SSL.
+CheckToForceHttps=Marqueu aquesta opció per a forçar connexions segures (https). <br> Això requereix que el servidor web estigui configurat amb un certificat SSL.
 DolibarrDatabase=Base de dades Dolibarr
 DatabaseType=Tipus de la base de dades
 DriverType=Tipus del driver
@@ -89,21 +89,21 @@ GoToUpgradePage=Ves de nou a la pàgina d'actualització
 WithNoSlashAtTheEnd=Sense el signe "/" al final
 DirectoryRecommendation= <span class="warning"> IMPORTANT </span>: Heu d'utilitzar un directori que es troba fora de les pàgines web (no utilitzeu un subdirector del paràmetre anterior).
 LoginAlreadyExists=Ja existeix
-DolibarrAdminLogin=Login de l'usuari administrador de Dolibarr
+DolibarrAdminLogin=Nom d'usuari d’administrador de Dolibarr
 AdminLoginAlreadyExists=El compte d'administrador de Dolibarr '<b> %s </b>' ja existeix. Torneu enrere si voleu crear un altre.
 FailedToCreateAdminLogin=No s'ha pogut crear el compte d'administrador de Dolibarr.
-WarningRemoveInstallDir=Avís, per motius de seguretat, un cop finalitzada la instal·lació o l'actualització, heu d'afegir un fitxer anomenat <b> install.lock </b> al directori del document Dolibarr per evitar l'ús accidental / maliciós de les eines d'instal·lació de nou.
+WarningRemoveInstallDir=Advertiment, per motius de seguretat, un cop finalitzada la instal·lació o actualització, heu d'afegir un fitxer anomenat <b> install.lock </b> al directori del document Dolibarr per a evitar l'ús accidental / malintencionat de les eines d'instal·lació.
 FunctionNotAvailableInThisPHP=No està disponible en aquest PHP
 ChoosedMigrateScript=Elecció de l'script de migració
 DataMigration=Migració de la base de dades (dades)
 DatabaseMigration=Migració de la base de dades (estructura + algunes dades)
 ProcessMigrateScript=Execució del script
-ChooseYourSetupMode=Tria el teu mètode d'instal·lació i fes clic a "Començar"
+ChooseYourSetupMode=Trieu el mode de configuració i feu clic a "Comença"...
 FreshInstall=Nova instal·lació
 FreshInstallDesc=Utilitzeu aquest mode si aquesta és la vostra primera instal·lació. Si no, aquest mode pot reparar una instal·lació prèvia incompleta. Si voleu actualitzar la vostra versió, seleccioneu "Actualitzar".
 Upgrade=Actualització
 UpgradeDesc=Utilitzeu aquest mètode després d'haver actualitzat els fitxers d'una instal·lació Dolibarr antiga pels d'una versió més recent. Aquesta elecció permet posar al dia la base de dades i les seves dades per a aquesta nova versió.
-Start=Començar
+Start=Comença
 InstallNotAllowed=Instal·lació no autoritzada per els permisos de l'arxiu <b>conf.php</b>
 YouMustCreateWithPermission=Ha de crear un fitxer %s i donar-li els drets d'escriptura al servidor web durant el procés d'instal·lació.
 CorrectProblemAndReloadPage=Corregiu el problema i premeu F5 per tornar a carregar la pàgina.
@@ -117,7 +117,7 @@ YouAskLoginCreationSoDolibarrNeedToConnect=Heu seleccionat crear un usuari de ba
 BecauseConnectionFailedParametersMayBeWrong=La connexió a la base de dades ha fallat: els paràmetres de l'amfitrió o superusuari han de ser incorrectes.
 OrphelinsPaymentsDetectedByMethod=Pagaments orfes detectats pel mètode %s
 RemoveItManuallyAndPressF5ToContinue=Esborreu manualment i premeu F5 per continuar.
-FieldRenamed=Camp renombrat
+FieldRenamed=S'ha canviat el nom del camp
 IfLoginDoesNotExistsCheckCreateUser=Si l'usuari encara no existeix, heu de marcar l'opció "Crear usuari"
 ErrorConnection=El servidor "<b> %s </b>", el nom de la base de dades "<b> %s </b>", inici de sessió "<b> %s </b>" o la contrasenya de la base de dades pot ser incorrecte o la versió del client PHP pot ser massa antiga en comparació amb la versió de la base de dades.
 InstallChoiceRecommanded=Opció recomanada per a instal·lar la versió <b>%s</b> sobre la seva actual versió <b>%s</b>
@@ -126,13 +126,13 @@ MigrateIsDoneStepByStep=La versió específica (%s) té un buit de diverses vers
 CheckThatDatabasenameIsCorrect=Comproveu que el nom de la base de dades "<b> %s </b>" sigui correcte.
 IfAlreadyExistsCheckOption=Si el nom és correcte i la base de dades no existeix, heu de seleccionar l'opció "Crear la base de dades"
 OpenBaseDir=Paràmetre php openbasedir
-YouAskToCreateDatabaseSoRootRequired=Heu marcat el quadre "Crea una base de dades". Per això, heu de proporcionar el login / contrasenya del superusuari (part inferior del formulari).
-YouAskToCreateDatabaseUserSoRootRequired=Heu marcat el quadre "Crea propietari de la base de dades". Per això, heu de proporcionar el login / contrasenya del superusuari (part inferior del formulari).
+YouAskToCreateDatabaseSoRootRequired=Heu marcat el quadre "Crea una base de dades". Per això, heu de proporcionar el nom d'usuari / contrasenya del superusuari (part inferior del formulari).
+YouAskToCreateDatabaseUserSoRootRequired=Heu marcat el quadre "Crea propietari de la base de dades". Per això, heu de proporcionar el nom d'usuari / contrasenya del superusuari (part inferior del formulari).
 NextStepMightLastALongTime=El següent pas pot trigar diversos minuts. Després d'haver validat, li agraïm esperi a la completa visualització de la pàgina següent per continuar.
-MigrationCustomerOrderShipping=Actualització de les dades de expedicions de comandes de clients
-MigrationShippingDelivery=Actualització de les dades de expedicions
-MigrationShippingDelivery2=Actualització de les dades expedicions 2
-MigrationFinished=Acabada l'actualització
+MigrationCustomerOrderShipping=Migració de dades d'enviament de comandes de venda
+MigrationShippingDelivery=Actualització de les dades d'enviaments
+MigrationShippingDelivery2=Actualització de les dades d'enviaments 2
+MigrationFinished=S'ha acabat la migració
 LastStepDesc=<strong> Darrer pas </strong>: definiu aquí l'inici de sessió i la contrasenya que voleu utilitzar per connectar-se a Dolibarr. <b> No perdis això, ja que és el compte mestre per administrar tots els altres / comptes d'usuari addicionals.</b>
 ActivateModule=Activació del mòdul %s
 ShowEditTechnicalParameters=Premi aquí per veure/editar els paràmetres tècnics (mode expert)
@@ -142,9 +142,9 @@ KeepDefaultValuesWamp=Heu utilitzat l'assistent de configuració Dolibarr de Dol
 KeepDefaultValuesDeb=Heu utilitzat l'assistent de configuració Dolibarr des d'un paquet Linux (Ubuntu, Debian, Fedora ...), de manera que els valors proposats aquí ja estan optimitzats. Només s'ha d'introduir la contrasenya del propietari de la base de dades per crear. Canvieu altres paràmetres només si saps el que estàs fent.
 KeepDefaultValuesMamp=Heu utilitzat l'assistent de configuració Dolibarr de DoliMamp, de manera que els valors proposats aquí ja estan optimitzats. Canvieu-los només si saps el que estàs fent.
 KeepDefaultValuesProxmox=Heu utilitzat l'assistent de configuració de Dolibarr des d'un dispositiu virtual Proxmox, de manera que els valors proposats aquí ja estan optimitzats. Canvieu-los només si saps el que estàs fent.
-UpgradeExternalModule=Executeu el procés d'actualització dedicat del mòdul extern
+UpgradeExternalModule=Execució del procés d'actualització dedicat de mòdul extern
 SetAtLeastOneOptionAsUrlParameter=Estableix com a mínim una opció com a paràmetre a l'URL. Per exemple: '... repair.php?standard=confirmed'
-NothingToDelete=Res per netejar / esborrar
+NothingToDelete=Res a netejar/esborrar
 NothingToDo=No hi ha res a fer
 #########
 # upgrade
@@ -167,15 +167,15 @@ MigrationContractsNumberToUpdate=%s contracte(s) a actualitzar
 MigrationContractsLineCreation=Crea una línia de contracte per referència del contracte %s
 MigrationContractsNothingToUpdate=No hi ha més contractes (vinculats a un producte) sense línies de detalls que hagin de corregir.
 MigrationContractsFieldDontExist=El camp fk_facture ja no existeix. Res a fer.
-MigrationContractsEmptyDatesUpdate=Actualització de les dades de contractes no indicades
+MigrationContractsEmptyDatesUpdate=Correcció de la data buida de contracte
 MigrationContractsEmptyDatesUpdateSuccess=La correcció de la data buida del contracte s'ha realitzat correctament
 MigrationContractsEmptyDatesNothingToUpdate=No hi ha data de contracte buida per corregir
 MigrationContractsEmptyCreationDatesNothingToUpdate=No hi ha data de creació del contracte per corregir
-MigrationContractsInvalidDatesUpdate=Actualització dades contracte incorrectes (per contractes amb detall en servei)
+MigrationContractsInvalidDatesUpdate=Correcció del valor incorrecte de la data de contracte
 MigrationContractsInvalidDateFix=Corregir contracte %s (data contracte=%s, Data posada en servei min=%s)
 MigrationContractsInvalidDatesNumber=%s contractes modificats
 MigrationContractsInvalidDatesNothingToUpdate=No hi ha més de contractes que hagin de corregir-se.
-MigrationContractsIncoherentCreationDateUpdate=Actualització de les dades de creació de contracte que tenen un valor incoherent
+MigrationContractsIncoherentCreationDateUpdate=Correcció del valor incorrecte de la data de creació del contracte
 MigrationContractsIncoherentCreationDateUpdateSuccess=S'ha fet correctament la correcció del valor incorrecte en la data de creació de contracte
 MigrationContractsIncoherentCreationDateNothingToUpdate=No hi ha més dades de contractes.
 MigrationReopeningContracts=Reobertura dels contractes que tenen almenys un servei actiu no tancat
@@ -184,16 +184,16 @@ MigrationReopenedContractsNumber=%s contractes modificats
 MigrationReopeningContractsNothingToUpdate=No hi ha contractes tancats per a obrir
 MigrationBankTransfertsUpdate=Actualitza l'enllaç entre el registre bancari i la transferència bancària
 MigrationBankTransfertsNothingToUpdate=Cap vincle desfasat
-MigrationShipmentOrderMatching=Actualitzar rebuts de lliurament
+MigrationShipmentOrderMatching=Actualització de rebuts d'enviaments
 MigrationDeliveryOrderMatching=Actualitzar rebuts d'entrega
 MigrationDeliveryDetail=Actualitzar recepcions
-MigrationStockDetail=Actualitzar valor en stock dels productes
+MigrationStockDetail=Actualitza el valor de l'estoc dels productes
 MigrationMenusDetail=Actualització de la taula de menús dinàmics
 MigrationDeliveryAddress=Actualització de les adreces d'enviament en les notes de lliurament
 MigrationProjectTaskActors=Migració de dades per a la taula llx_projet_task_actors
 MigrationProjectUserResp=Migració del camp fk_user_resp de llx_projet a llx_element_contact
 MigrationProjectTaskTime=Actualitza el temps dedicat en segons
-MigrationActioncommElement=Actualització de les dades de accions sobre elements
+MigrationActioncommElement=Actualització de dades d'accions
 MigrationPaymentMode=Migració de dades per tipus de pagament
 MigrationCategorieAssociation=Actualització de les categories
 MigrationEvents=Migració d'esdeveniments per afegir el propietari de l'esdeveniment a la taula d'assignacions
@@ -203,7 +203,7 @@ MigrationRemiseExceptEntity=Actualitza el valor del camp entity de llx_societe_r
 MigrationUserRightsEntity=Actualitza el valor del camp de l'entitat llx_user_rights
 MigrationUserGroupRightsEntity=Actualitza el valor del camp de l'entitat llx_usergroup_rights
 MigrationUserPhotoPath=Migració de rutes per les fotos dels usuaris
-MigrationFieldsSocialNetworks=Migració de camps de xarxes socials de usuaris (%s)
+MigrationFieldsSocialNetworks=Migració de camps de xarxes socials d'usuaris (%s)
 MigrationReloadModule=Recarrega el mòdul %s
 MigrationResetBlockedLog=Restablir el mòdul BlockedLog per l'algoritme v7
 ShowNotAvailableOptions=Mostra les opcions no disponibles
diff --git a/htdocs/langs/ca_ES/interventions.lang b/htdocs/langs/ca_ES/interventions.lang
index ec994e9dd8d..242a537dcc8 100644
--- a/htdocs/langs/ca_ES/interventions.lang
+++ b/htdocs/langs/ca_ES/interventions.lang
@@ -2,7 +2,7 @@
 Intervention=Intervenció
 Interventions=Intervencions
 InterventionCard=Fitxa intervenció
-NewIntervention=Nova intervenció
+NewIntervention=Intervenció nova
 AddIntervention=Crea intervenció
 ChangeIntoRepeatableIntervention=Canvia-ho a intervenció repetible
 ListOfInterventions=Llistat d'intervencions
@@ -18,14 +18,14 @@ DeleteInterventionLine=Eliminar línia d'intervenció
 ConfirmDeleteIntervention=Vols eliminar aquesta intervenció?
 ConfirmValidateIntervention=Vols validar aquesta intervenció amb nom <b>%s</b>?
 ConfirmModifyIntervention=Vols modificar aquesta intervenció?
-ConfirmDeleteInterventionLine=Vols eliminar aquesta línia d'intervenció?
+ConfirmDeleteInterventionLine=Esteu segur que voleu suprimir aquesta línia d'intervenció?
 ConfirmCloneIntervention=Estàs segur que vols clonar aquesta intervenció?
 NameAndSignatureOfInternalContact=Nom i signatura del participant:
 NameAndSignatureOfExternalContact=Nom i signatura del client:
 DocumentModelStandard=Document model estàndard per a intervencions
 InterventionCardsAndInterventionLines=Fitxes i línies d'intervenció
-InterventionClassifyBilled=Classificar "facturat"
-InterventionClassifyUnBilled=Classificar "no facturat"
+InterventionClassifyBilled=Classifica "Facturat"
+InterventionClassifyUnBilled=Classifica "No facturat"
 InterventionClassifyDone=Classifica com a "Fet"
 StatusInterInvoiced=Facturada
 SendInterventionRef=Presentar intervenció %s
@@ -48,8 +48,8 @@ UseServicesDurationOnFichinter=Utilitza la durada dels serveis en les intervenci
 UseDurationOnFichinter=Oculta el camp de durada dels registres d'intervenció
 UseDateWithoutHourOnFichinter=Oculta hores i minuts del camp de dates dels registres d'intervenció
 InterventionStatistics=Estadístiques de intervencions
-NbOfinterventions=Nº de fitxes d'intervenció
-NumberOfInterventionsByMonth=Nº de fitxes d'intervenció per mes (data de validació)
+NbOfinterventions=Nombre de fitxers d’intervenció
+NumberOfInterventionsByMonth=Nombre de fitxes d'intervenció per mes (data de validació)
 AmountOfInteventionNotIncludedByDefault=La quantitat d'intervenció no s'inclou de manera predeterminada en els beneficis (en la majoria dels casos, els fulls de temps s'utilitzen per comptar el temps dedicat). Per incloure'ls, afegiu la opció  PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT amb el valor 1 a Configuració &rarr; Varis.
 InterId=Id. d'intervenció
 InterRef=Ref. d'intervenció
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index be984d41323..ffcbd2fd725 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -14,7 +14,7 @@ MailTo=Destinatari(s)
 MailToUsers=A l'usuari(s)
 MailCC=Còpia a
 MailToCCUsers=Còpia l'usuari(s)
-MailCCC=Adjuntar còpia a
+MailCCC=Còpia oculta a
 MailTopic=Tema de correu electrònic
 MailText=Missatge
 MailFile=Fitxers adjunts
@@ -23,7 +23,7 @@ SubjectNotIn=No està subjecte
 BodyNotIn=No en el cos
 ShowEMailing=Mostrar E-Mailing
 ListOfEMailings=Llistat de E-Mailings
-NewMailing=Nou E-Mailing
+NewMailing=E-Mailing nou
 EditMailing=Editar E-Mailing
 ResetMailing=Nou enviament
 DeleteMailing=Elimina E-Mailing
@@ -50,14 +50,14 @@ ConfirmValidMailing=Vols validar aquest E-Mailing?
 ConfirmResetMailing=Advertència, reiniciant el correu electrònic <b> %s </b>, permetrà tornar a enviar aquest correu electrònic en un correu a granel. Estàs segur que vols fer això?
 ConfirmDeleteMailing=Esteu segur que voleu suprimir aquesta adreça electrònica?
 NbOfUniqueEMails=Nombre de correus electrònics exclusius
-NbOfEMails=Nº d'E-mails
+NbOfEMails=Nombre de correus electrònics
 TotalNbOfDistinctRecipients=Nombre de destinataris únics
 NoTargetYet=Cap destinatari definit
 NoRecipientEmail=No hi ha cap correu electrònic destinatari per a %s
 RemoveRecipient=Eliminar destinatari
 YouCanAddYourOwnPredefindedListHere=Per crear el seu mòdul de selecció e-mails, mireu htdocs /core/modules/mailings/README.
 EMailTestSubstitutionReplacedByGenericValues=En mode prova, les variables de substitució són substituïdes per valors genèrics
-MailingAddFile=Adjuntar aquest arxiu
+MailingAddFile=Adjunta aquest fitxer
 NoAttachedFiles=Sense fitxers adjunts
 BadEMail=Valor incorrecte per correu electrònic
 ConfirmCloneEMailing=Vols clonar aquest E-Mailing?
@@ -87,14 +87,15 @@ MailingModuleDescContactsWithThirdpartyFilter=Contacte amb filtres de client
 MailingModuleDescContactsByCompanyCategory=Contactes per categoria de tercers
 MailingModuleDescContactsByCategory=Contactes per categories
 MailingModuleDescContactsByFunction=Contactes per càrrec
-MailingModuleDescEmailsFromFile=Correus electrònics desde fitxer
+MailingModuleDescEmailsFromFile=Correus electrònics des de fitxer
 MailingModuleDescEmailsFromUser=Entrada de correus electrònics per usuari
 MailingModuleDescDolibarrUsers=Usuaris amb correus electrònics
 MailingModuleDescThirdPartiesByCategories=Tercers (per categories)
 SendingFromWebInterfaceIsNotAllowed=L'enviament des de la interfície web no està permès.
+EmailCollectorFilterDesc=Tots els filtres han de coincidir perquè es reculli un correu electrònic
 
 # Libelle des modules de liste de destinataires mailing
-LineInFile=Línea %s en archiu
+LineInFile=Línia %s al fitxer
 RecipientSelectionModules=Mòduls de selecció dels destinataris
 MailSelectedRecipients=Destinataris seleccionats
 MailingArea=Àrea E-Mailings
@@ -105,13 +106,13 @@ MailNoChangePossible=Destinataris d'un E-Mailing validat no modificables
 SearchAMailing=Cercar un E-Mailing
 SendMailing=Envia e-mailing
 SentBy=Enviat por
-MailingNeedCommand=L'enviament d'un emailing pot realitzar-se desde la línia de comandos. Solicita a l'administrador del servidor que executi el següent comando per enviar l'emailing a tots els destinataris:
+MailingNeedCommand=L’enviament de correus electrònics massius es pot realitzar des de la línia de comandes. Demaneu a l'administrador del servidor que iniciï la següent comanda per enviar els correus electrònics a tots els destinataris:
 MailingNeedCommand2=Podeu enviar en línia afegint el paràmetre MAILING_LIMIT_SENDBYWEB amb un valor nombre que indica el màxim nombre d'e-mails enviats per sessió. Per això aneu a Inici - Configuració - Varis
-ConfirmSendingEmailing=Si desitja enviar emailing directament desde aquesta pantalla, confirme que està segur de voler enviar l'emailing ara desde el seu navegador
-LimitSendingEmailing=Nota: L'enviament de e-mailings des de l'interfície web es realitza en tandes per raons de seguretat i "timeouts", s'enviaran a <b>%s</b> destinataris per tanda
+ConfirmSendingEmailing=Si voleu enviar correus electrònics directament des d'aquesta pantalla, confirmeu que esteu segur que voleu enviar correus electrònics ara des del vostre navegador?
+LimitSendingEmailing=Nota: L'enviament de missatges massius de correu electrònic des de la interfície web es realitza diverses vegades per motius de seguretat i temps d'espera, <b> %s </b> als destinataris de cada sessió d'enviament.
 TargetsReset=Buidar llista
 ToClearAllRecipientsClickHere=Per buidar la llista dels destinataris d'aquest E-Mailing, feu clic al botó
-ToAddRecipientsChooseHere=Per afegir destinataris, escolliu els que figuren en les llistes a continuació
+ToAddRecipientsChooseHere=Afegiu destinataris escollint entre les llistes
 NbOfEMailingsReceived=E-Mailings en massa rebuts
 NbOfEMailingsSend=E-mails massius enviats
 IdRecord=ID registre
@@ -125,22 +126,23 @@ TagMailtoEmail=Correu electrònic del destinatari (inclòs l'enllaç "mailto:" h
 NoEmailSentBadSenderOrRecipientEmail=No s'ha enviat el correu electrònic. Enviador del correu incorrecte. Verifica el perfil d'usuari.
 # Module Notifications
 Notifications=Notificacions
-NoNotificationsWillBeSent=Cap notificació per e-mail està prevista per a aquest esdeveniment i empresa
-ANotificationsWillBeSent=1 notificació serà enviada per e-mail
-SomeNotificationsWillBeSent=%s notificacions seran enviades per e-mail
-AddNewNotification=Activar una de notificació per correu electrònic
-ListOfActiveNotifications=Llista tots els destinataris actius per notificacions de correu electrònic
-ListOfNotificationsDone=Llista de notificacions d'e-mails enviades
+NotificationsAuto=Notificacions automàtiques.
+NoNotificationsWillBeSent=No hi ha previstes notificacions automàtiques per correu electrònic per a aquest tipus d'esdeveniment ni per a aquesta empresa
+ANotificationsWillBeSent=S'enviarà 1 notificació automàtica per correu electrònic
+SomeNotificationsWillBeSent=S'enviaran %s notificacions automàtiques per correu electrònic
+AddNewNotification=Subscriviu-vos a una nova notificació automàtica per correu electrònic (destinatari/esdeveniment)
+ListOfActiveNotifications=Llista totes les subscripcions actives (destinataris/esdeveniments) per a notificacions automàtiques per correu electrònic
+ListOfNotificationsDone=Llista totes les notificacions automàtiques enviades per correu electrònic
 MailSendSetupIs=La configuració d'enviament d'e-mail s'ha ajustat a '%s'. Aquest mètode no es pot utilitzar per enviar e-mails massius.
-MailSendSetupIs2=Abans tindrà que, amb un compte d'administrador, en el menú %sinici - Configuració - E-Mails%s, camviar el paràmetre <strong>'%s'</strong> per usar el mètode '%s'. Amb aquest metode pot configurar un servidor SMTP del seu proveïdor de serveis d'internet.
-MailSendSetupIs3=Si te preguntes de com configurar el seu servidor SMTP, pot contactar amb %s.
+MailSendSetupIs2=Primer heu d’anar, amb un compte d’administrador, al menú %sInici - Configuració - Correus electrònics%s per a canviar el paràmetre <strong>'%s'</strong> per a utilitzar el mode '%s'. Amb aquest mode, podeu introduir la configuració del servidor SMTP proporcionat pel vostre proveïdor de serveis d'Internet i utilitzar la funció de correu electrònic massiu.
+MailSendSetupIs3=Si teniu cap pregunta sobre com configurar el servidor SMTP, podeu demanar-li a %s.
 YouCanAlsoUseSupervisorKeyword=També pot afegir l'etiqueta <strong>__SUPERVISOREMAIL__</strong> per tenir un e-mail enviat pel supervisor a l'usuari (només funciona si un e-mail és definit per aquest supervisor)
-NbOfTargetedContacts=Número actual de contactes destinataris d'e-mails
+NbOfTargetedContacts=Nombre actual de correus electrònics de contactes destinataris
 UseFormatFileEmailToTarget=El fitxer importat ha de tenir el format <strong>email;nom;cognom;altre</strong>
 UseFormatInputEmailToTarget=Entra una cadena amb el format <strong>email;nom;cognom;altre</strong>
 MailAdvTargetRecipients=Destinataris (selecció avançada)
 AdvTgtTitle=Ompliu els camps d'entrada per seleccionar prèviament els tercers o contactes / adreces a destinació
-AdvTgtSearchTextHelp=Utilitzeu %% com comodins. Per exemple, per trobar tots els elements com <b> jean, joe, jim </b>, podeu ingressar <b> j%% </b>, també podeu utilitzar; com a separador de valor i ús! per excepte aquest valor. Per exemple, <b> jean; joe; jim%% ;; jimo ;; jima% </b> tindrà com a objectiu tot Jean, joe, comença amb Jim però no Jimo i no tot el que comença amb Jima
+AdvTgtSearchTextHelp=Utilitzeu %% com a comodins. Per exemple, per a trobar tots els elements com <b> jean, joe, jim </b>, podeu introduir <b> j%% </b>, també podeu utilitzar ; com a separador de valor i utilitzar ! per excepcions d'aquest valor. Per exemple, <b> jean;joe;jim%%;!jimo;!jima%% </b> tindrà com a objectiu tots els jean, joe, començant per jim però no jimo ni tot el que comenci amb jima
 AdvTgtSearchIntHelp=Utilitza un interval per seleccionar un valor enter o decimal
 AdvTgtMinVal=Valor mínim
 AdvTgtMaxVal=Valor màxim
@@ -159,16 +161,19 @@ AdvTgtLoadFilter=Carrega filtre
 AdvTgtDeleteFilter=Elimina filtre
 AdvTgtSaveFilter=Desa filtre
 AdvTgtCreateFilter=Crea filtre
-AdvTgtOrCreateNewFilter=Nom de nou filtre
+AdvTgtOrCreateNewFilter=Nom del filtre nou
 NoContactWithCategoryFound=No s'han trobat contactes/adreces amb categoria
 NoContactLinkedToThirdpartieWithCategoryFound=No s'han trobat contactes/adreces amb categoria
-OutGoingEmailSetup=Configuració de correus electrònics sortints
-InGoingEmailSetup=Configuració de correus electrònics entrants
-OutGoingEmailSetupForEmailing=Configuració del correu sortint (per al mòdul %s)
-DefaultOutgoingEmailSetup=Configuració per defecte del correu electrònic sortint 
+OutGoingEmailSetup=Correus electrònics de sortida
+InGoingEmailSetup=Correus electrònics entrants
+OutGoingEmailSetupForEmailing=Correu electrònic de sortida (per al mòdul %s)
+DefaultOutgoingEmailSetup=La mateixa configuració que el correu electrònic de sortida global
 Information=Informació
 ContactsWithThirdpartyFilter=Contactes amb filtre de tercers
-Unanswered=Unanswered
+Unanswered=Sense resposta
 Answered=Respost
-IsNotAnAnswer=Is not answer (initial email)
-IsAnAnswer=Is an answer of an initial email
+IsNotAnAnswer=No és resposta (correu electrònic inicial)
+IsAnAnswer=És la resposta d’un correu electrònic inicial
+RecordCreatedByEmailCollector=Registre creat pel Receptor de correus electrònics %s des del correu electrònic %s
+DefaultBlacklistMailingStatus=Estat de contacte predeterminat per a rebutjar correus electrònics massius
+DefaultStatusEmptyMandatory=Buit però obligatori
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index c970c1697f3..a50db98d5f8 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No hi ha cap plantilla disponible per a aquest tipus de correu
 AvailableVariables=Variables de substitució disponibles
 NoTranslation=Sense traducció
 Translation=Traducció
+CurrentTimeZone=Fus horari PHP (Servidor)
 EmptySearchString=Introdueix criteris de cerca no buits
+EnterADateCriteria=Introduïu un criteri de data
 NoRecordFound=No s'han trobat registres
 NoRecordDeleted=Sense registres eliminats
 NotEnoughDataYet=Dades insuficients
@@ -52,7 +54,7 @@ ErrorFileNotUploaded=El fitxer no s'ha pogut transferir
 ErrorInternalErrorDetected=Error detectat
 ErrorWrongHostParameter=Paràmetre Servidor invàlid
 ErrorYourCountryIsNotDefined=El teu país no està definit. Ves a Inici-Configuració-Empresa-Edita i omple de nou el formulari
-ErrorRecordIsUsedByChild=Impossible de suprimir aquest registre. Es sent utilitzat com a pare per almenys un registre fill.
+ErrorRecordIsUsedByChild=No s'ha pogut suprimir aquest registre. Aquest registre l’utilitza almenys un registre fill.
 ErrorWrongValue=Valor incorrecte
 ErrorWrongValueForParameterX=Valor incorrecte del paràmetre %s
 ErrorNoRequestInError=Cap petició en error
@@ -75,16 +77,18 @@ ClickHere=Fes clic aquí
 Here=Aquí
 Apply=Aplicar
 BackgroundColorByDefault=Color de fons
-FileRenamed=L'arxiu s'ha renombrat correctament
+FileRenamed=El fitxer s’ha reanomenat correctament
 FileGenerated=L'arxiu ha estat generat correctament
 FileSaved=El fitxer s'ha desat correctament
 FileUploaded=L'arxiu s'ha carregat correctament
 FileTransferComplete=El(s) fitxer(s) s'han carregat correctament
 FilesDeleted=El(s) fitxer(s) s'han eliminat correctament
 FileWasNotUploaded=Un arxiu ha estat seleccionat per adjuntar, però encara no ha estat pujat. Feu clic a "Adjuntar aquest arxiu" per a això.
-NbOfEntries=Nº d'entrades
+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
+HomePage=Pàgina d'inici
 RecordSaved=Registre guardat
 RecordDeleted=Registre eliminat
 RecordGenerated=Registre generat
@@ -109,7 +113,7 @@ RequestLastAccessInError=Últimes peticions d'accés a la base de dades amb erro
 ReturnCodeLastAccessInError=Retorna el codi per les últimes peticions d'accés a la base de dades amb error
 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 vostre fitxer de configuració per obtenir més informació.
+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 eliminar aquestes notificacions)
 MoreInformation=Més informació
 TechnicalInformation=Informació tècnica
@@ -149,11 +153,11 @@ Enable=Activar
 Deprecated=Obsolet
 Disable=Desactivar
 Disabled=Desactivat
-Add=Afegir
+Add=Afegeix
 AddLink=Enllaçar
 RemoveLink=Elimina enllaç
 AddToDraft=Afegeix a esborrany
-Update=Modificar
+Update=Actualitza
 Close=Tancar
 CloseAs=Indica l'estat 
 CloseBox=Elimina el panell de la taula de control
@@ -163,10 +167,10 @@ Delete=Elimina
 Remove=Retirar
 Resiliate=Dona de baixa
 Cancel=Cancel·la
-Modify=Modificar
+Modify=Modifica
 Edit=Editar
-Validate=Validar
-ValidateAndApprove=Validar i aprovar
+Validate=Valida
+ValidateAndApprove=Valida i aprova
 ToValidate=A validar
 NotValidated=No validat
 Save=Desa
@@ -174,10 +178,10 @@ SaveAs=Desa com
 SaveAndStay=Desa i continua
 SaveAndNew=Desa i nou
 TestConnection=Provar la connexió
-ToClone=Copiar
+ToClone=Clona
 ConfirmCloneAsk=Esteu segur que voleu clonar l'objecte <b> %s </b>?
 ConfirmClone=Trieu les dades que voleu clonar:
-NoCloneOptionsSpecified=no hi ha dades definits per copiar
+NoCloneOptionsSpecified=No s'ha definit cap dada per a clonar.
 Of=de
 Go=Anar
 Run=llançar
@@ -220,6 +224,7 @@ Value=Valor
 PersonalValue=Valor personalitzat
 NewObject=Nou %s
 NewValue=Valor nou
+OldValue=Valor antic %s
 CurrentValue=Valor actual
 Code=Codi
 Type=Tipus
@@ -329,7 +334,7 @@ HourShort=H
 MinuteShort=Minut
 Rate=Tipus
 CurrencyRate=Tarifa de conversió de moneda
-UseLocalTax=Incloure taxes
+UseLocalTax=Inclou impostos
 Bytes=Bytes
 KiloBytes=Kilobytes
 MegaBytes=Megabytes
@@ -343,7 +348,7 @@ Mb=Mb
 Gb=Gb
 Tb=Tb
 Cut=Tallar
-Copy=Copiar
+Copy=Copia
 Paste=Pegar
 Default=Defecte
 DefaultValue=Valor per defecte
@@ -433,6 +438,7 @@ RemainToPay=Queda per pagar
 Module=Mòdul/Aplicació
 Modules=Mòduls/Aplicacions
 Option=Opció
+Filters=Filtres
 List=Llistat
 FullList=Llista completa
 FullConversation=Conversa completa
@@ -484,7 +490,7 @@ TotalDuration=Duració total
 Summary=Resum
 DolibarrStateBoard=Estadístiques de base de dades
 DolibarrWorkBoard=Elements oberts
-NoOpenedElementToProcess=No hi ha elements oberts per processar
+NoOpenedElementToProcess=No hi ha elements oberts per a processar
 Available=Disponible
 NotYetAvailable=Encara no disponible
 NotAvailable=No disponible
@@ -501,7 +507,7 @@ and=i
 or=o
 Other=Altres
 Others=Altres
-OtherInformations=Altra informació
+OtherInformations=Una altra informació
 Quantity=Quantitat
 Qty=Qt.
 ChangedBy=Modificat per
@@ -517,7 +523,7 @@ Draft=Esborrany
 Drafts=Esborranys
 StatusInterInvoiced=Facturat
 Validated=Validat
-ValidatedToProduce=Validat (per produir)
+ValidatedToProduce=Validat (per a produir)
 Opened=Actiu
 OpenAll=Obre (tot)
 ClosedAll=Tancat (tot)
@@ -525,7 +531,7 @@ New=Nou
 Discount=Descompte
 Unknown=Desconegut
 General=General
-Size=Tamany
+Size=Mida
 OriginalSize=Mida original
 Received=Rebut
 Paid=Pagat
@@ -546,14 +552,14 @@ LateDesc=L'element es defineix com Retardat segons la configuració del sistema
 NoItemLate=No hi ha cap element tardà
 Photo=Foto
 Photos=Fotos
-AddPhoto=Afegir foto
+AddPhoto=Afegeix una imatge
 DeletePicture=Elimina la imatge
 ConfirmDeletePicture=Confirmes l'eliminació de la imatge?
-Login=Login
+Login=Nom d'usuari
 LoginEmail=Codi d'usuari (correu electrònic)
 LoginOrEmail=Codi d'usuari o correu electrònic
-CurrentLogin=Login actual
-EnterLoginDetail=Introduir detalls del login
+CurrentLogin=Nom d'usuari actual
+EnterLoginDetail=Introduïu les dades d'inici de sessió
 January=gener
 February=febrer
 March=març
@@ -650,6 +656,7 @@ SupplierPreview=Vista prèvia del proveïdor
 ShowCustomerPreview=Veure historial client
 ShowSupplierPreview=Mostra la vista prèvia del proveïdor
 RefCustomer=Ref. client
+InternalRef=Ref. Interna
 Currency=Divisa
 InfoAdmin=Informació per als administradors
 Undo=Desfer
@@ -716,7 +723,7 @@ MenuAWStats=AWStats
 MenuMembers=Socis
 MenuAgendaGoogle=Agenda Google
 MenuTaxesAndSpecialExpenses=Impostos | Despeses especials
-ThisLimitIsDefinedInSetup=Límit Dolibarr (Menú inici-configuració-seguretat): %s Kb, PHP limit: %s Kb
+ThisLimitIsDefinedInSetup=Límit Dolibarr (Menú inici-configuració-seguretat): %s Kb, límit PHP: %s Kb
 NoFileFound=No hi ha documents guardats en aquesta carpeta
 CurrentUserLanguage=Idioma actual
 CurrentTheme=Tema actual
@@ -737,7 +744,7 @@ Informations=Informació
 Page=Pàgina
 Notes=Notes
 AddNewLine=Afegeix una línia nova
-AddFile=Afegir arxiu
+AddFile=Afegeix un fitxer
 FreeZone=Producte de text lliure
 FreeLineOfType=Element de text lliure, escriviu:
 CloneMainAttributes=Clonar l'objecte amb aquests atributs principals
@@ -747,9 +754,9 @@ Merge=Fussió
 DocumentModelStandardPDF=Plantilla PDF estàndard
 PrintContentArea=Mostrar pàgina d'impressió de la zona central
 MenuManager=Gestor de menú
-WarningYouAreInMaintenanceMode=Advertència, esteu en mode de manteniment: només podeu iniciar sessió <b> %s </b> per utilitzar l'aplicació en aquest mode.
+WarningYouAreInMaintenanceMode=Atenció, esteu en mode de manteniment: només podeu iniciar sessió amb <b> %s </b> per a utilitzar l'aplicació en aquest mode.
 CoreErrorTitle=Error del sistema
-CoreErrorMessage=Ho sentim, hi ha un error. Contacti amb el seu administrador del sistema per a comprovar els "logs" o des-habilita $dolibarr_main_prod=1 per a obtenir més informació.
+CoreErrorMessage=Ho sentim, s'ha produït un error. Poseu-vos en contacte amb l'administrador del sistema per a comprovar els registres o desactiva $dolibarr_main_prod=1 per a obtenir més informació.
 CreditCard=Targeta de crèdit
 ValidatePayment=Validar aquest pagament
 CreditOrDebitCard=Tarja de crèdit o dèbit
@@ -822,8 +829,8 @@ toward=cap a
 Access=Accés
 SelectAction=Selecciona acció
 SelectTargetUser=Selecciona l'usuari/empleat de destí
-HelpCopyToClipboard=Utilitzeu Ctrl+C per copiar al portapapers
-SaveUploadedFileWithMask=Desa el fitxer al servidor amb el nom "<strong>%s</strong>" (del contrari "%s")
+HelpCopyToClipboard=Utilitzeu Ctrl+C per a copiar al porta-retalls
+SaveUploadedFileWithMask=Desa el fitxer al servidor amb el nom "<strong> %s </strong>" (en cas contrari "%s")
 OriginFileName=Nom original de l'arxiu
 SetDemandReason=Indica l'origen
 SetBankAccount=Definir el compte bancari
@@ -858,7 +865,7 @@ ConfirmDeleteObject=Esteu segur que voleu suprimir aquest objecte?
 DeleteLine=Elimina la línia
 ConfirmDeleteLine=Esteu segur que voleu suprimir aquesta línia?
 ErrorPDFTkOutputFileNotFound=Error: el fitxer no s'ha generat. Comproveu que la comanda "pdftk" estigui instal·lada en un directori inclòs a la variable d'entorn $ PATH (només linux / unix) o poseu-vos en contacte amb l'administrador del vostre sistema.
-NoPDFAvailableForDocGenAmongChecked=No hi havia PDF disponibles per a la generació de document entre els registre comprovats
+NoPDFAvailableForDocGenAmongChecked=No hi havia PDF disponible per a la generació de document amb el registre comprovat
 TooManyRecordForMassAction=S'ha seleccionat massa registres per a l'acció massiva. L'acció està restringida a una llista de %s registres.
 NoRecordSelected=No s'han seleccionat registres
 MassFilesArea=Àrea de fitxers generats per accions massives
@@ -866,8 +873,8 @@ ShowTempMassFilesArea=Mostra l'àrea de fitxers generats per accions massives
 ConfirmMassDeletion=Confirmació d'esborrament massiu
 ConfirmMassDeletionQuestion=Esteu segur que voleu suprimir els (s) registre (s) %s?
 RelatedObjects=Objectes relacionats
-ClassifyBilled=Classificar facturat
-ClassifyUnbilled=Classificar no facturat
+ClassifyBilled=Classifica facturat
+ClassifyUnbilled=Classifica no facturat
 Progress=Progrés
 ProgressShort=Progr.
 FrontOffice=Front office
@@ -1057,7 +1064,7 @@ ValidUntil=Vàlid fins
 NoRecordedUsers=No hi ha usuaris
 ToClose=Per tancar
 ToProcess=A processar
-ToApprove=Per aprovar
+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
@@ -1093,7 +1100,7 @@ AmountMustBePositive=L'import ha de ser positiu
 ByStatus=Per estat
 InformationMessage=Informació
 Used=Usat
-ASAP=El més aviat possible
+ASAP=Tan aviat com sigui possible
 CREATEInDolibarr=Registre %s creat
 MODIFYInDolibarr=Registre %s modificat
 DELETEInDolibarr=Registre %s eliminat
@@ -1107,3 +1114,9 @@ UpToDate=Actualitzat
 OutOfDate=Obsolet
 EventReminder=Recordatori d'esdeveniments
 UpdateForAllLines=Actualització per a totes les línies
+OnHold=Fora de servei
+Civility=Civility
+AffectTag=Afecta l'etiqueta
+ConfirmAffectTag=Afecta l'etiqueta massivament
+ConfirmAffectTagQuestion=Esteu segur que voleu afectar les etiquetes als registres seleccionats %s?
+CategTypeNotFound=No s'ha trobat cap tipus d'etiqueta per al tipus de registres
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index f2a3b4f400b..7fe30fe8322 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -11,13 +11,13 @@ MembersTickets=Etiquetes de socis
 FundationMembers=Socis de l'entitat
 ListOfValidatedPublicMembers=Llistat de socis públics validats
 ErrorThisMemberIsNotPublic=Aquest soci no és públic
-ErrorMemberIsAlreadyLinkedToThisThirdParty=Un altre soci (nom: <b>%s</b>, login: <b>%s</b>) està vinculat al tercer <b>%s</b>. Esborreu l'enllaç existent ja que un tercer només pot estar vinculat a un sol soci (i viceversa).
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Un altre soci (nom: <b>%s</b>, nom d'usuari: <b>%s</b>) ja està vinculat al tercer <b>%s</b>. Esborreu l'enllaç existent ja que un tercer només pot estar vinculat a un sol soci (i viceversa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Per raons de seguretat, ha de posseir els drets de modificació de tots els usuaris per poder vincular un soci a un usuari que no sigui vostè mateix.
 SetLinkToUser=Vincular a un usuari Dolibarr
 SetLinkToThirdParty=Vincular a un tercer Dolibarr
 MembersCards=Carnets de socis
 MembersList=Llistat de socis
-MembersListToValid=Llistat de socis esborrany (per validar)
+MembersListToValid=Llistat de socis esborrany (per a validar)
 MembersListValid=Llistat de socis validats
 MembersListUpToDate=Llista de socis vàlids amb quotes al dia
 MembersListNotUpToDate=Llista de socis vàlids amb quotes pendents
@@ -34,7 +34,7 @@ EndSubscription=Final d'afiliació
 SubscriptionId=ID d'afiliació
 WithoutSubscription=Sense afiliació
 MemberId=ID de soci
-NewMember=Nou soci
+NewMember=Soci nou
 MemberType=Tipus de soci
 MemberTypeId=ID de tipus de soci
 MemberTypeLabel=Etiqueta de tipus de soci
@@ -54,8 +54,8 @@ MembersStatusResiliated=Socis donats de baixa
 MemberStatusNoSubscription=Validat (no cal subscripció)
 MemberStatusNoSubscriptionShort=Validat
 SubscriptionNotNeeded=No cal subscripció
-NewCotisation=Nova aportació
-PaymentSubscription=Nou pagament de quota
+NewCotisation=Aportació nova
+PaymentSubscription=Pagament de quota nou
 SubscriptionEndDate=Data final d'afiliació
 MembersTypeSetup=Configuració dels tipus de socis
 MemberTypeModified=Tipus de soci modificat
@@ -63,8 +63,8 @@ DeleteAMemberType=Elimina un tipus de soci
 ConfirmDeleteMemberType=Estàs segur de voler eliminar aquest tipus de soci?
 MemberTypeDeleted=Tipus de soci eliminat
 MemberTypeCanNotBeDeleted=El tipus de soci no es pot eliminar
-NewSubscription=Nova afiliació
-NewSubscriptionDesc=Utilitzi aquest formulari per registrar-se com un nou soci de l'entitat. Per a una renovació (si ja és soci) poseu-vos en contacte amb l'entitat mitjançant l'e-mail %s.
+NewSubscription=Afiliació nova
+NewSubscriptionDesc=Aquest formulari us permet registrar la vostra afiliació com a soci nou de l'entitat. Si voleu renovar l'afiliació (si ja sou soci), poseu-vos en contacte amb el gestor de l'entitat per correu electrònic %s.
 Subscription=Afiliació
 Subscriptions=Afiliacions
 SubscriptionLate=En retard
@@ -73,7 +73,7 @@ ListOfSubscriptions=Llista d'afiliacions
 SendCardByMail=Enviar una targeta per correu electrònic
 AddMember=Crea soci
 NoTypeDefinedGoToSetup=No s'ha definit cap tipus de soci. Ves al menú "Tipus de socis"
-NewMemberType=Nou tipus de soci
+NewMemberType=Tipus de soci nou
 WelcomeEMail=Correu electrònic de benvinguda
 SubscriptionRequired=Subjecte a cotització
 DeleteType=Elimina
@@ -120,7 +120,7 @@ SendingReminderActionComm=Enviament de recordatori de l’esdeveniment de l’ag
 # Topic of email templates
 YourMembershipRequestWasReceived=S'ha rebut la vostra subscripció.
 YourMembershipWasValidated=S'ha validat la vostra subscripció
-YourSubscriptionWasRecorded=S'ha registrat la vostra nova subscripció
+YourSubscriptionWasRecorded=S'ha registrat la vostra afiliació nova
 SubscriptionReminderEmail=Recordatori de subscripció
 YourMembershipWasCanceled=S'ha cancel·lat la vostra pertinença
 CardContent=Contingut de la seva fitxa de soci
@@ -179,10 +179,10 @@ LatestSubscriptionDate=Data de l'última afiliació
 MemberNature=Naturalesa del membre
 MembersNature=Naturalesa dels socis
 Public=Informació pública
-NewMemberbyWeb=S'ha afegit un nou soci. A l'espera d'aprovació
-NewMemberForm=Formulari d'inscripció
+NewMemberbyWeb=S'ha afegit un soci nou. Esperant l'aprovació
+NewMemberForm=Formulari de soci nou
 SubscriptionsStatistics=Estadístiques de cotitzacions
-NbOfSubscriptions=Nombre de cotitzacions
+NbOfSubscriptions=Nombre d'afiliacions
 AmountOfSubscriptions=Import de cotitzacions
 TurnoverOrBudget=Volum de vendes (empresa) o Pressupost (associació o col.lectiu)
 DefaultAmount=Import per defecte cotització
diff --git a/htdocs/langs/ca_ES/modulebuilder.lang b/htdocs/langs/ca_ES/modulebuilder.lang
index 59936812c4a..275cdac1d5d 100644
--- a/htdocs/langs/ca_ES/modulebuilder.lang
+++ b/htdocs/langs/ca_ES/modulebuilder.lang
@@ -5,18 +5,18 @@ EnterNameOfObjectDesc=Introduïu el nom de l'objecte que voleu crear sense espai
 ModuleBuilderDesc2=Camí on es generen / editen els mòduls (primer directori per als mòduls externs definits en %s): <strong> %s </strong>
 ModuleBuilderDesc3=S'han trobat mòduls generats/editables: <strong>%s</strong>
 ModuleBuilderDesc4=Es detecta un mòdul com "editable" quan el fitxer <strong>%s</strong> existeix al directori arrel del mòdul
-NewModule=Nou mòdul
-NewObjectInModulebuilder=Nou objecte
+NewModule=Mòdul nou
+NewObjectInModulebuilder=Objecte nou
 ModuleKey=Clau del mòdul
 ObjectKey=Clau de l'objecte
 ModuleInitialized=Mòdul inicialitzat
-FilesForObjectInitialized=S'han inicialitzat els fitxers per al nou objecte '%s'
+FilesForObjectInitialized=S'han inicialitzat els fitxers per al objecte nou '%s'
 FilesForObjectUpdated=Fitxers de l'objecte '%s' actualitzat (fitxers .sql i fitxer .class.php)
 ModuleBuilderDescdescription=Introduïu aquí tota la informació general que descrigui el vostre mòdul.
 ModuleBuilderDescspecifications=Podeu introduir aquí una descripció detallada de les especificacions del mòdul que encara no està estructurada en altres pestanyes. Així que teniu a la vostra disposició totes les normes que es desenvolupin. També aquest contingut de text s'inclourà a la documentació generada (veure l'última pestanya). Podeu utilitzar el format de Markdown, però es recomana utilitzar el format Asciidoc (comparació entre .md i .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
 ModuleBuilderDescobjects=Definiu aquí els objectes que voleu gestionar amb el mòdul. Es crearà una classe CRUD DAO, fitxers SQL, una pàgina per llistar el registre d'objectes, per crear/editar/veure un registre i es generarà una API.
 ModuleBuilderDescmenus=Aquesta pestanya està dedicada a definir les entrades de menú proporcionades pel teu mòdul.
-ModuleBuilderDescpermissions=Aquesta pestanya està dedicada a definir els nous permisos que vols proporcionar amb el teu mòdul.
+ModuleBuilderDescpermissions=Aquesta pestanya està dedicada a definir els permisos nous que voleu proporcionar amb el vostre mòdul.
 ModuleBuilderDesctriggers=Aquesta és la vista dels disparadors proporcionats pel teu mòdul. Per incloure el codi executat quan es posa en marxa un esdeveniment de negoci desencadenat, edita aquest fitxer.
 ModuleBuilderDeschooks=Aquesta pestanya està dedicada als ganxos (hooks)
 ModuleBuilderDescwidgets=Aquesta pestanya està dedicada per crear/gestionar ginys
@@ -40,6 +40,7 @@ PageForCreateEditView=Pàgina PHP per crear/editar/veure un registre
 PageForAgendaTab=Pàgina de PHP per a la pestanya d'esdeveniments
 PageForDocumentTab=Pàgina de PHP per a la pestanya de documents
 PageForNoteTab=Pàgina de PHP per a la pestanya de notes
+PageForContactTab=Pàgina PHP per a la pestanya de contacte
 PathToModulePackage=Ruta al zip del paquet del mòdul/aplicació
 PathToModuleDocumentation=Camí al fitxer de la documentació del mòdul / aplicació (%s)
 SpaceOrSpecialCharAreNotAllowed=Els espais o caràcters especials no estan permesos.
@@ -82,11 +83,11 @@ ListOfMenusEntries=Llista d'entrades de menú
 ListOfDictionariesEntries=Llista d'entrades de diccionaris
 ListOfPermissionsDefined=Llista de permisos definits
 SeeExamples=Mira exemples aquí
-EnabledDesc=Condició per tenir activat aquest camp (Exemples: 1 ó $conf->global->MYMODULE_MYOPTION)
+EnabledDesc=Condició per a tenir aquest camp actiu (Exemples: 1 ó $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=És visible el camp ? (Exemples: 0=Mai visible, 1=Visible als llistats i als formularis crear/modificar/veure, 2=Visible només als llistats, 3=Visible només als formularis crear/modificar/veure (no als llistats), 4=Visible als llistats i només als formularis modificar/veure (no al de crear), 5=Visible als llistats i només al formulari de veure (però no als formularis de crear i modificar).<br><br>Utilitzant un valor negatiu implicarà que el camp no es mostrarà per defecte als llistats però podrà ser escollit per veure's).<br><br>pot ser una expressió, per exemple:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
 DisplayOnPdfDesc=Mostra aquest camp en documents PDF compatibles. Podeu gestionar la posició amb el camp "Posició". <br/> Actualment, els models PDF compatibles coneguts són: eratosthene (comanda), espadon (enviament), sponge (factures), cyan (propal / pressupost), cornas (comanda del proveïdor) <br/> <br/><strong>Per al document :</strong><br/>0 = no es mostra<br/> 1 = mostra <br/> 2 = només si no està buit <br/> <br/> <strong> Per a les línies de documents: </strong> <br/> 0 = no es veuen les <br/> 1 = mostra en una columna <br/> = 3 = mostra a la columna de descripció de línia després de la descripció <br/> 4 = mostra a la columna de descripció després de la descripció només si no està buida
 DisplayOnPdf=Visualització en PDF
-IsAMeasureDesc=Es pot acumular el valor del camp per obtenir un total en la llista? (Exemples: 1 o 0)
+IsAMeasureDesc=Es pot acumular el valor del camp per a obtenir un total a la llista? (Exemples: 1 o 0)
 SearchAllDesc=El camp utilitzat per realitzar una cerca des de l'eina de cerca ràpida? (Exemples: 1 o 0)
 SpecDefDesc=Introduïu aquí tota la documentació que voleu proporcionar amb el vostre mòdul que encara no està definit per altres pestanyes. Podeu utilitzar .md o millor, la sintaxi enriquida .asciidoc.
 LanguageDefDesc=Introduïu a aquests fitxers, totes les claus i les traduccions per a cada fitxer d'idioma.
@@ -126,9 +127,8 @@ UseSpecificEditorURL = Utilitzeu editor específic URL
 UseSpecificFamily = Utilitzeu una família específica
 UseSpecificAuthor = Utilitzeu un autor específic
 UseSpecificVersion = Utilitzeu una versió inicial específica
-ModuleMustBeEnabled=El mòdul / aplicació s'ha d’habilitar primer
 IncludeRefGeneration=La referència de l’objecte s’ha de generar automàticament
-IncludeRefGenerationHelp=Marca-ho si vols incloure codi per gestionar la generació automàtica de la referència
+IncludeRefGenerationHelp=Marca-ho si vols incloure codi per a gestionar la generació automàtica de la referència
 IncludeDocGeneration=Vull generar alguns documents des de l'objecte
 IncludeDocGenerationHelp=Si ho marques, es generarà el codi per afegir una casella "Generar document" al registre.
 ShowOnCombobox=Mostra el valor en un combobox
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Tipus de camps: <br> varchar(99), double (24,8), real, text, ht
 AsciiToHtmlConverter=Convertidor Ascii a HTML
 AsciiToPdfConverter=Convertidor Ascii a PDF
 TableNotEmptyDropCanceled=La taula no està buida. S'ha cancel·lat l'eliminació.
+ModuleBuilderNotAllowed=El creador de mòduls està disponible però no permès al vostre usuari.
diff --git a/htdocs/langs/ca_ES/mrp.lang b/htdocs/langs/ca_ES/mrp.lang
index 32ad23c0c3a..fe06e690cd0 100644
--- a/htdocs/langs/ca_ES/mrp.lang
+++ b/htdocs/langs/ca_ES/mrp.lang
@@ -1,7 +1,7 @@
 Mrp=Ordres de fabricació
 MOs=Ordres de fabricació
 ManufacturingOrder=Ordre de fabricació
-MRPDescription=Mòdul per gestionar Ordres de Fabricació o producció (OF).
+MRPDescription=Mòdul per a gestionar Ordres de producció i fabricació (OF).
 MRPArea=Àrea MRP
 MrpSetupPage=Configuració del mòdul MRP
 MenuBOM=Llistes de material
@@ -34,10 +34,10 @@ ConfirmDeleteBillOfMaterials=Estàs segur que vols suprimir aquesta llista de ma
 ConfirmDeleteMo=Esteu segur que voleu suprimir aquesta factura de material?
 MenuMRP=Ordres de fabricació
 NewMO=Ordre de fabricació nova
-QtyToProduce=Quantitat per produir
+QtyToProduce=Quantitat a produir
 DateStartPlannedMo=Data d’inici prevista
 DateEndPlannedMo=Data prevista de finalització
-KeepEmptyForAsap=Buit significa &quot;el més aviat possible&quot;
+KeepEmptyForAsap=Buit significa "Tan aviat com sigui possible"
 EstimatedDuration=Durada estimada
 EstimatedDurationDesc=Durada estimada per fabricar aquest producte mitjançant aquesta llista de material
 ConfirmValidateBom=Segur que voleu validar la llista de material amb la referència <strong>%s</strong> (podreu utilitzar-lo per crear noves Ordres de Fabricació)
@@ -62,7 +62,7 @@ ConsumeOrProduce=Consumir o Produir
 ConsumeAndProduceAll=Consumir i produir tot
 Manufactured=Fabricat
 TheProductXIsAlreadyTheProductToProduce=El producte a afegir ja és el producte a produir.
-ForAQuantityOf=Per produir una quantitat de %s
+ForAQuantityOf=Per a produir una quantitat de %s
 ConfirmValidateMo=Voleu validar aquesta Ordre de Fabricació?
 ConfirmProductionDesc=Fent clic a '%s' validareu el consum i/o la producció per a les quantitats establertes. També s’actualitzarà l'estoc i es registrarà els moviments d'estoc.
 ProductionForRef=Producció de %s
@@ -70,7 +70,7 @@ AutoCloseMO=Tancar automàticament l’Ordre de Fabricació si s’arriba a les
 NoStockChangeOnServices=Sense canvi d’estoc en serveis
 ProductQtyToConsumeByMO=Quantitat de producte que encara es pot consumir amb OP obertes
 ProductQtyToProduceByMO=Quantitat de producte que encara es pot produir mitjançant OP obertes
-AddNewConsumeLines=Afegiu una línia nova per consumir
+AddNewConsumeLines=Afegiu una nova línia per a consumir
 ProductsToConsume=Productes a consumir
 ProductsToProduce=Productes a produir
 UnitCost=Cost unitari
@@ -78,3 +78,27 @@ TotalCost=Cost total
 BOMTotalCost=El cost de produir aquesta Llista de materials en funció del cost de cada quantitat i producte a consumir (utilitza el preu de cost si està definit, altrament el preu mitjà ponderat si està definit, altrament el millor preu de compra)
 GoOnTabProductionToProduceFirst=Per tancar una Ordre de fabricació primer heu d'iniciar la producció (vegeu la pestanya '%s'). Però sí podeu cancel·lar-la.
 ErrorAVirtualProductCantBeUsedIntoABomOrMo=Un kit no es pot utilitzar en una llista de material o en una OF
+Workstation=Estació de treball
+Workstations=Estacions de treball
+WorkstationsDescription=Gestió d’estacions de treball
+WorkstationSetup = Workstations setup
+WorkstationSetupPage = Workstations setup page
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about page
+WorkstationList=Llista d’estacions de treball
+WorkstationCreate=Afegeix una nova estació de treball
+ConfirmEnableWorkstation=Esteu segur que voleu habilitar l'estació de treball <b> %s </b>?
+EnableAWorkstation=Activa una estació de treball
+ConfirmDisableWorkstation=Esteu segur que voleu desactivar l'estació de treball <b> %s </b>?
+DisableAWorkstation=Desactiva una estació de treball
+DeleteWorkstation=Supprimer
+NbOperatorsRequired=Number of operators required
+THMOperatorEstimated=Estimated operator THM
+THMMachineEstimated=Estimated machine THM
+WorkstationType=Tipus d'estació de treball
+Human=Humà
+Machine=Màquina
+HumanMachine=Humà / Màquina
+WorkstationArea=Workstation area
+Machines=Màquines
+THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
diff --git a/htdocs/langs/ca_ES/multicurrency.lang b/htdocs/langs/ca_ES/multicurrency.lang
index 65919bb8818..2b058698634 100644
--- a/htdocs/langs/ca_ES/multicurrency.lang
+++ b/htdocs/langs/ca_ES/multicurrency.lang
@@ -4,10 +4,10 @@ ErrorAddRateFail=Error en la taxa afegida
 ErrorAddCurrencyFail=Error en la moneda afegida
 ErrorDeleteCurrencyFail=Error en esborrar
 multicurrency_syncronize_error=Error de sincronització: %s
-MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Utilitza la data del document per trobar el tipus de canvi, en comptes d'utilitzar l'última conversió coneguda
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Utilitza la data del document per a trobar el tipus de canvi, en lloc d’utilitzar la conversió més recent conegut
 multicurrency_useOriginTx=Quan un objecte es crea des d'un altre, manté la conversió original de l'objecte origen (en cas contrari, fes servir l'última conversió coneguda)
 CurrencyLayerAccount=API Moneda-Layer
-CurrencyLayerAccount_help_to_synchronize=Heu de crear un compte al lloc web %s per utilitzar aquesta funcionalitat. <br> Obtingueu la vostra <b>clau d’API</b> . <br> Si utilitzeu un compte gratuït, no podeu canviar la <b>moneda d'origen</b> (per defecte, USD). <br> Si la vostra moneda principal no és USD, l'aplicació la recalcularà automàticament. <br><br> Es limita a 1000 sincronitzacions mensuals.
+CurrencyLayerAccount_help_to_synchronize=Heu de crear un compte al lloc web %s per a utilitzar aquesta funcionalitat. <br> Obtingueu la vostra <b>clau d’API</b> . <br> Si utilitzeu un compte gratuït, no podeu canviar la <b>moneda d'origen</b> (per defecte, USD). <br> Si la vostra moneda principal no és USD, l'aplicació la recalcularà automàticament. <br><br> Es limita a 1000 sincronitzacions mensuals.
 multicurrency_appId=Clau API
 multicurrency_appCurrencySource=Moneda origen
 multicurrency_alternateCurrencySource=Moneda d'origen alternativa
diff --git a/htdocs/langs/ca_ES/oauth.lang b/htdocs/langs/ca_ES/oauth.lang
index 62daa92dadc..95bb8384e1b 100644
--- a/htdocs/langs/ca_ES/oauth.lang
+++ b/htdocs/langs/ca_ES/oauth.lang
@@ -7,13 +7,13 @@ 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=Fes clic aqui per comprovar/eliminar l'autorització desada pel proveïdor OAuth %s
+ToCheckDeleteTokenOnProvider=Feu clic aquí per comprovar/eliminar l'autorització desada pel proveïdor OAuth %s
 TokenDeleted=Token eliminat
-RequestAccess=Clica aquí per demanar/renovar l'accés i rebre un nou token per desar
-DeleteAccess=Faci clic aquí per eliminar token
+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
 UseTheFollowingUrlAsRedirectURI=Utilitzeu l'URL següent com a URI de redirecció quan creeu les vostres credencials amb el vostre proveïdor de OAuth:
 ListOfSupportedOauthProviders=Introduïu les credencials proporcionades pel vostre proveïdor OAuth2. Només es mostren aquí els proveïdors compatibles OAuth2. Aquests serveis poden ser utilitzats per altres mòduls que necessiten autenticació OAuth2.
-OAuthSetupForLogin=Pàgina per generar un token OAuth
+OAuthSetupForLogin=Pàgina per a generar un token OAuth
 SeePreviousTab=Veure la pestanya anterior
 OAuthIDSecret=OAuth ID i Secret
 TOKEN_REFRESH=Refresc present de token
@@ -27,6 +27,6 @@ OAUTH_GOOGLE_DESC=Aneu a <a class="notasortlink" href="https://console.developer
 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"> a aquesta pàgina </a> i després "Registra una nova aplicació" per crear credencials d'OAuth.
+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_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 a2a57bd1d8f..4a88e4c8f61 100644
--- a/htdocs/langs/ca_ES/opensurvey.lang
+++ b/htdocs/langs/ca_ES/opensurvey.lang
@@ -5,12 +5,12 @@ OrganizeYourMeetingEasily=Organitza fàcilment les teves reunions i enquestes. P
 NewSurvey=Enquesta nova
 OpenSurveyArea=Àrea enquestes
 AddACommentForPoll=Pot afegir un comentari a  l'enquesta...
-AddComment=Afegir comentari
+AddComment=Afegeix un comentari
 CreatePoll=Crear enquesta
 PollTitle=Títol de l'enquesta
 ToReceiveEMailForEachVote=Rebre un correu electrònic per cada vot
 TypeDate=Tipus de data
-TypeClassic=Tipus estándar
+TypeClassic=Tipus estàndard
 OpenSurveyStep2=Selecciona les dates entre els dies lliures (gris). Els dies seleccionats són verds. Pots anul·lar la selecció d'un dia prèviament seleccionat fent clic de nou en ell
 RemoveAllDays=Eliminar tots els dies
 CopyHoursOfFirstDay=Copia hores del primer dia
@@ -19,7 +19,7 @@ SelectedDays=Dies seleccionats
 TheBestChoice=Actualment la millor opció és
 TheBestChoices=Actualment les millors opcions són
 with=amb
-OpenSurveyHowTo=Si està d'acord per votar en aquesta enquesta, ha de donar el seu nom, triar els valors que s'ajusten millor per a vostè i validi amb el botó de més al final de la línia.
+OpenSurveyHowTo=Si accepteu votar en aquesta enquesta, haureu de donar el vostre nom, escollir els valors que millor s’adapten a vosaltres i validar-los amb el botó al final de la línia.
 CommentsOfVoters=Comentaris dels votants
 ConfirmRemovalOfPoll=Està segur que desitja eliminar aquesta enquesta (i tots els vots)
 RemovePoll=Eliminar enquesta
@@ -30,21 +30,21 @@ CreateSurveyStandard=Crear una enquesta estàndard
 CheckBox=Casella de selecció simple
 YesNoList=Llista (buit/sí/no)
 PourContreList=Llista (buit/a favor/en contra)
-AddNewColumn=Afegir nova columna
+AddNewColumn=Afegeix una columna nova
 TitleChoice=Títol de l'opció
 ExportSpreadsheet=Exportar resultats a un full de càlcul
 ExpireDate=Data límit
-NbOfSurveys=Número d'enquestes
-NbOfVoters=Nº de votants
+NbOfSurveys=Nombre d'enquestes
+NbOfVoters=Nombre de votants
 SurveyResults=Resultats
 PollAdminDesc=Està autoritzat per canviar totes les línies de l'enquesta amb el botó "Editar". Pot, també, eliminar una columna o una línia amb %s. També podeu afegir una nova columna amb %s.
 5MoreChoices=5 opcions més
 Against=En contra
 YouAreInivitedToVote=Està convidat a votar en aquesta enquesta
 VoteNameAlreadyExists=Aquest nom ja havia estat usat per a aquesta enquesta
-AddADate=Afegir una data
-AddStartHour=Afegir hora d'inici
-AddEndHour=Afegir hora de fi
+AddADate=Afegeix una data
+AddStartHour=Afegeix l’hora d’inici
+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
@@ -58,4 +58,4 @@ MoreChoices=Introdueixi més opcions pels votants
 SurveyExpiredInfo=L'enquesta s'ha tancat o el temps de votació s'ha acabat.
 EmailSomeoneVoted=%s ha emplenat una línia.\nPot trobar la seva enquesta en l'enllaç:\n%s
 ShowSurvey=Mostra l'enquesta
-UserMustBeSameThanUserUsedToVote=Per publicar un comentari has d'utilitzar el mateix nom d'usuari que l'utilitzat per votar.
+UserMustBeSameThanUserUsedToVote=Per a publicar un comentari, heu d'haver votat i utilitzar el mateix nom d'usuari utilitzat per a votar
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index ff1877a88a0..a840d554c15 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -10,8 +10,8 @@ OrderLine=Línia de comanda
 OrderDate=Data comanda
 OrderDateShort=Data comanda
 OrderToProcess=Comanda a processar
-NewOrder=Nova comanda
-NewOrderSupplier=Nova comanda de compra
+NewOrder=Comanda nova
+NewOrderSupplier=Comanda de compra nova
 ToOrder=Realitzar comanda
 MakeOrder=Realitzar comanda
 SupplierOrder=Comanda de compra
@@ -24,7 +24,7 @@ CustomersOrdersAndOrdersLines=Ordres de venda i detalls de la comanda
 OrdersDeliveredToBill=Comandes de venda lliurats a la factura
 OrdersToBill=Ordres de venda lliurades
 OrdersInProcess=Ordres de venda en procés
-OrdersToProcess=Ordres de venda per processar
+OrdersToProcess=Comandes de venda a processar
 SuppliersOrdersToProcess=Comandes de compra a processar
 SuppliersOrdersAwaitingReception=Comandes de compra en espera de recepció
 AwaitingReception=Esperant recepció
@@ -37,7 +37,7 @@ StatusOrderOnProcessShort=Comanda
 StatusOrderProcessedShort=Processada
 StatusOrderDelivered=Entregada
 StatusOrderDeliveredShort=Entregada
-StatusOrderToBillShort=Emès
+StatusOrderToBillShort=Lliurat
 StatusOrderApprovedShort=Aprovada
 StatusOrderRefusedShort=Rebutjada
 StatusOrderToProcessShort=A processar
@@ -49,7 +49,7 @@ StatusOrderValidated=Validada
 StatusOrderOnProcess=Comanda - En espera de recepció
 StatusOrderOnProcessWithValidation=Comanda - A l'espera de rebre o validar
 StatusOrderProcessed=Processada
-StatusOrderToBill=Emès
+StatusOrderToBill=Lliurat
 StatusOrderApproved=Aprovada
 StatusOrderRefused=Rebutjada
 StatusOrderReceivedPartially=Rebuda parcialment
@@ -97,7 +97,7 @@ ConfirmUnvalidateOrder=Vols restaurar la comanda <b>%s</b> a l'estat esborrany?
 ConfirmCancelOrder=Vols anul·lar aquesta comanda?
 ConfirmMakeOrder=Vols confirmar la creació d'aquesta comanda a data de <b>%s</b>?
 GenerateBill=Facturar
-ClassifyShipped=Classificar enviat
+ClassifyShipped=Classifica enviada
 DraftOrders=Esborranys de comandes
 DraftSuppliersOrders=Esborrany de comandes de compra
 OnProcessOrders=Comandes en procés
@@ -107,10 +107,10 @@ RefOrderSupplier=Ref. comanda pel proveïdor
 RefOrderSupplierShort=Ref. comanda proveïdor
 SendOrderByMail=Envia comanda per e-mail
 ActionsOnOrder=Esdeveniments sobre la comanda
-NoArticleOfTypeProduct=No hi ha articles de tipus 'producte' i per tant enviables en aquesta comanda
+NoArticleOfTypeProduct=No hi ha cap article del tipus "producte", de manera que no es pot enviar cap article per a aquesta comanda
 OrderMode=Mètode de comanda
 AuthorRequest=Autor/Sol·licitant
-UserWithApproveOrderGrant=Usuaris habilitats per aprovar les comandes
+UserWithApproveOrderGrant=Usuaris amb permís "aprovar comandes".
 PaymentOrderRef=Pagament comanda %s
 ConfirmCloneOrder=Vols clonar aquesta comanda <b>%s</b>?
 DispatchSupplierOrder=Recepció de l'ordre de compra %s
@@ -148,14 +148,14 @@ PDFProformaDescription=Una plantilla completa de factura Proforma
 CreateInvoiceForThisCustomer=Facturar comandes
 CreateInvoiceForThisSupplier=Facturar comandes
 NoOrdersToInvoice=Sense comandes facturables
-CloseProcessedOrdersAutomatically=Classificar automàticament com "Processades" les comandes seleccionades.
+CloseProcessedOrdersAutomatically=Classifica com a "Processades" totes les comandes seleccionades.
 OrderCreation=Creació comanda
 Ordered=Comandat
 OrderCreated=Les vostres comandes s'han creat
 OrderFail=S'ha produït un error durant la creació de les seves comandes
 CreateOrders=Crear comandes
 ToBillSeveralOrderSelectCustomer=Per crear una factura per nombroses comandes, faci primer clic sobre el client i després esculli "%s".
-OptionToSetOrderBilledNotEnabled=Està desactivada l'opció del mòdul Workflow per canviar automàticament l'estat de la comanda com a "Facturada" quan la factura es valida, així que haurà d'establir manualment l'estat de la comanda com a "Facturada".
+OptionToSetOrderBilledNotEnabled=L'opció del mòdul Flux de treball, per establir la comanda com a "Facturada" automàticament quan es valida la factura, no està habilitada, de manera que haureu d'establir l'estat de les comandes a "Facturada" manualment després de generar la factura.
 IfValidateInvoiceIsNoOrderStayUnbilled=Si la validació de la factura és "No", l'ordre romandrà a l'estat "No facturat" fins que es validi la factura.
 CloseReceivedSupplierOrdersAutomatically=Tanqueu l'ordre d'estat "%s" automàticament si es reben tots els productes.
 SetShippingMode=Indica el tipus d'enviament
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index acae89147c1..77a93f1499e 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -23,7 +23,7 @@ MessageForm=Missatge al formulari de pagament en línia
 MessageOK=Missatge a la pàgina de devolució d'un pagament validat
 MessageKO=Missatge a la pàgina de devolució d'un pagament cancel·lat
 ContentOfDirectoryIsNotEmpty=El contingut d'aquest directori no és buit.
-DeleteAlsoContentRecursively=Marqueu per eliminar tot el contingut recursivament
+DeleteAlsoContentRecursively=Marqueu per a suprimir tot el contingut recursivament
 PoweredBy=Impulsat per
 YearOfInvoice=Any de la data de factura
 PreviousYearOfInvoice=Any anterior de la data de la factura
@@ -77,12 +77,13 @@ Notify_TASK_DELETE=Tasca eliminada
 Notify_EXPENSE_REPORT_VALIDATE=Informe de despeses validat (cal aprovar)
 Notify_EXPENSE_REPORT_APPROVE=Informe de despeses aprovat
 Notify_HOLIDAY_VALIDATE=Sol·licitud de sol licitud validada (cal aprovar)
-Notify_HOLIDAY_APPROVE=Deixa la sol · licitud aprovada
+Notify_HOLIDAY_APPROVE=Sol·licitud de permís aprovada
+Notify_ACTION_CREATE=S'ha afegit l'acció a l'Agenda
 SeeModuleSetup=Vegi la configuració del mòdul %s
 NbOfAttachedFiles=Número arxius/documents adjunts
 TotalSizeOfAttachedFiles=Mida total dels arxius/documents adjunts
-MaxSize=Tamany màxim
-AttachANewFile=Adjuntar nou arxiu/document
+MaxSize=Mida màxima
+AttachANewFile=Adjunta un fitxer/document nou
 LinkedObject=Objecte adjuntat
 NbOfActiveNotifications=Nombre de notificacions (número de correus electrònics del destinatari)
 PredefinedMailTest=__(Hola)__\nAquest és un missatge de prova enviat a __EMAIL__.\nLes línies estan separades per una tornada de carro.\n\n__USER_SIGNATURE__
@@ -100,7 +101,7 @@ PredefinedMailContentSendFichInter=__(Hola)__\n\nTrobeu la intervenció __REF__
 PredefinedMailContentLink=Podeu fer clic a l'enllaç següent per fer el pagament si encara no està fet.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendActionComm=Recordatori d'esdeveniments "__EVENT_LABEL__" el dia __EVENT_DATE__ a les __EVENT_TIME__ <br> <br> Aquest és un missatge automàtic, no respongueu.
-DemoDesc=Dolibarr és un ERP/CRM per a la gestió de negocis (professionals o associacions), compost de mòduls funcionals independents i opcionals. Una demostració que incloga tots aquests mòduls no té sentit perquè no utilitzarà tots els mòduls al mateix temps. Per això, hi han disponibles diferents tipus de perfils de demostració.
+DemoDesc=Dolibarr és un ERP/CRM compacte que admet diversos mòduls empresarials. Una demostració que mostri tots els mòduls no té cap sentit, ja que aquest escenari no es produeix mai (diversos centenars disponibles). Per tant, hi ha disponibles diversos perfils de demostració.
 ChooseYourDemoProfil=Selecciona el perfil de demo que cobreixi millor les teves necessitats...
 ChooseYourDemoProfilMore=o construeix el teu perfil<br>(selecció de mòduls manual)
 DemoFundation=Gestió de socis d'una entitat
@@ -119,11 +120,11 @@ ModifiedById=Id de l'usuari que ha fet l'últim canvi
 ValidatedById=ID d'usuari que a validat
 CanceledById=ID d'usuari que ha cancel·lat
 ClosedById=ID d'usuari que a tancat
-CreatedByLogin=Login d'usuari que a creat
+CreatedByLogin=Usuari que ha creat
 ModifiedByLogin=Codi d'usuari que ha fet l'últim canvi
-ValidatedByLogin=Login d'usuari que ha validat
-CanceledByLogin=Login d'usuari que ha cancel·lat
-ClosedByLogin=Login d'usuari que a tancat
+ValidatedByLogin=Usuari que ha validat
+CanceledByLogin=Usuari que ha cancel·lat
+ClosedByLogin=Usuari que ha tancat
 FileWasRemoved=L'arxiu %s s'ha eliminat
 DirWasRemoved=La carpeta %s s'ha eliminat
 FeatureNotYetAvailable=Funcionalitat encara no disponible en aquesta versió
@@ -136,7 +137,7 @@ Bottom=Inferior
 Left=Esquerra
 Right=Dreta
 CalculatedWeight=Pes calculat
-CalculatedVolume=Volume calculat
+CalculatedVolume=Volum calculat
 Weight=Pes
 WeightUnitton=tona
 WeightUnitkg=kg
@@ -177,23 +178,23 @@ BugTracker=Incidències
 SendNewPasswordDesc=Aquest formulari et permet sol·licitar una nova contrasenya. S'enviarà a la teva adreça de correu electrònic. <br> El canvi es farà efectiu una vegada facis clic a l'enllaç de confirmació del correu electrònic. <br> Comprova la teva safata d'entrada.
 BackToLoginPage=Tornar a la pàgina de connexió
 AuthenticationDoesNotAllowSendNewPassword=El mode d'autenticació de Dolibarr està configurat com "<b>%s</b>".<br>En aquest mode Dolibarr no pot conèixer ni modificar la seva contrasenya<br>Contacti amb l'administrador per conèixer les modalitats de canvi.
-EnableGDLibraryDesc=Instala o habilita la llibreria GD en la teva instal·lació PHP per poder utilitzar aquesta opció.
+EnableGDLibraryDesc=Instal·leu o activeu la biblioteca GD a la instal·lació de PHP per a utilitzar aquesta opció.
 ProfIdShortDesc=<b>Prof Id %s </b> és una informació que depèn del país del tercer. <br>Per exemple, per al país <b>%s</b>, és el codi <b>%s</b>.
 DolibarrDemo=Demo de Dolibarr ERP/CRM
 StatsByNumberOfUnits=Estadístiques de suma quantitat de productes/serveis
 StatsByNumberOfEntities=Estadístiques en nombre d'entitats referents (número de factura o ordre ...)
-NumberOfProposals=Número de pressupostos
+NumberOfProposals=Nombre de pressupostos
 NumberOfCustomerOrders=Nombre de comandes de venda
-NumberOfCustomerInvoices=Número de factures de client
-NumberOfSupplierProposals=Nombre de propostes de venedor
+NumberOfCustomerInvoices=Nombre de factures de client
+NumberOfSupplierProposals=Nombre de pressupostos de proveïdor
 NumberOfSupplierOrders=Nombre de comandes de compra
 NumberOfSupplierInvoices=Nombre de factures de venedor
 NumberOfContracts=Nombre de contractes
 NumberOfMos=Nombre d'ordres de fabricació
-NumberOfUnitsProposals=Número d'unitats en pressupostos
+NumberOfUnitsProposals=Nombre d'unitats en pressupostos
 NumberOfUnitsCustomerOrders=Nombre d'unitats per comandes de venda
-NumberOfUnitsCustomerInvoices=Número d'unitats en factures de client
-NumberOfUnitsSupplierProposals=Nombre d'unitats en propostes de venedor
+NumberOfUnitsCustomerInvoices=Nombre d'unitats en factures de client
+NumberOfUnitsSupplierProposals=Nombre d'unitats en pressupostos de proveïdor
 NumberOfUnitsSupplierOrders=Nombre d'unitats en comandes de compra
 NumberOfUnitsSupplierInvoices=Nombre d'unitats a les factures del venedor
 NumberOfUnitsContracts=Nombre d’unitats en contractes
@@ -215,12 +216,13 @@ EMailTextExpenseReportValidated=L'informe de despeses %s ha estat validat.
 EMailTextExpenseReportApproved=S'ha aprovat l'informe de despeses %s.
 EMailTextHolidayValidated=S'ha validat la sol licitud %s.
 EMailTextHolidayApproved=S'ha aprovat la sol licitud %s.
+EMailTextActionAdded=L'acció %s s'ha afegit a l'agenda.
 ImportedWithSet=Lot d'importació (import key)
 DolibarrNotification=Notificació automàtica
 ResizeDesc=Introduïu l'ample <b>O</b> la nova alçada. La relació es conserva en canviar la mida...
-NewLength=Nou ample
-NewHeight=Nova alçada
-NewSizeAfterCropping=Noves dimensions després de retallar
+NewLength=Amplada nova
+NewHeight=Alçada nova
+NewSizeAfterCropping=Mida nova després de retallar
 DefineNewAreaToPick=Indiqueu la zona d'imatge a conservar (Clic sobre la imatge i arrossegueu fins a la cantonada oposada)
 CurrentInformationOnImage=Aquesta eina va ser dissenyada per ajudar-vos a canviar la mida o retallar una imatge. Aquesta és la informació de la imatge editada actual
 ImageEditor=Editor d'imatge
@@ -230,18 +232,18 @@ ThisIsListOfModules=Li mostrem un llistat de mòduls preseleccionats per a aques
 UseAdvancedPerms=Usar els drets avançats en els permisos dels mòduls
 FileFormat=Format d'arxiu
 SelectAColor=Tria un color
-AddFiles=Afegir arxius
+AddFiles=Afegeix arxius
 StartUpload=Transferir
 CancelUpload=Cancel·lar transferència
 FileIsTooBig=L'arxiu és massa gran
-PleaseBePatient=Preguem esperi uns instants...
-NewPassword=Nova contrasenya
+PleaseBePatient=Si us plau sigui pacient...
+NewPassword=Contrasenya nova
 ResetPassword=Restablir la contrasenya
 RequestToResetPasswordReceived=S'ha rebut una sol·licitud per canviar la teva contrasenya.
 NewKeyIs=Aquesta és la nova contrasenya per iniciar sessió
 NewKeyWillBe=La seva nova contrasenya per iniciar sessió en el software serà
 ClickHereToGoTo=Clica aquí per anar a %s
-YouMustClickToChange=però, primer ha de fer clic en el següent enllaç per validar aquest canvi de contrasenya
+YouMustClickToChange=De totes formes, primer heu de fer clic al següent enllaç per a validar aquest canvi de contrasenya
 ForgetIfNothing=Si vostè no ha sol·licitat aquest canvi, simplement ignori aquest e-mail. Les seves credencials són guardades de forma segura
 IfAmountHigherThan=si l'import es major que <strong>%s</strong>
 SourcesRepository=Repositori de fonts
@@ -259,6 +261,7 @@ ContactCreatedByEmailCollector=Contacte / adreça creada pel recollidor de corre
 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
+PrefixSession=Prefix per a l'identificador de sessió
 
 ##### Export #####
 ExportsArea=Àrea d'exportacions
diff --git a/htdocs/langs/ca_ES/paybox.lang b/htdocs/langs/ca_ES/paybox.lang
index a83d626c618..0da9d902659 100644
--- a/htdocs/langs/ca_ES/paybox.lang
+++ b/htdocs/langs/ca_ES/paybox.lang
@@ -18,12 +18,11 @@ YourPaymentHasBeenRecorded=Aquesta pàgina confirma que el pagament s'ha registr
 YourPaymentHasNotBeenRecorded=El vostre pagament no s'ha registrat i la transacció s'ha cancel·lat. Gràcies.
 AccountParameter=Paràmetres del compte
 UsageParameter=Paràmetres d'ús
-InformationToFindParameters=Informació per trobar la seva configuració de compte %s
+InformationToFindParameters=Ajuda per a trobar la vostra informació del compte %s
 PAYBOX_CGI_URL_V2=Url del mòdul CGI Paybox de pagament
-VendorName=Nom del venedor
 CSSUrlForPaymentForm=Url del full d'estil CSS per al formulari de pagament
-NewPayboxPaymentReceived=Nou pagament Paybox rebut
-NewPayboxPaymentFailed=Nou intent de pagament Paybox sense èxit
+NewPayboxPaymentReceived=S'ha rebut el nou pagament de Paybox
+NewPayboxPaymentFailed=S'ha provat el nou pagament de Paybox, però ha fallat
 PAYBOX_PAYONLINE_SENDEMAIL=Notificació per correu electrònic després de l'intent de pagament (èxit o fracàs)
 PAYBOX_PBX_SITE=Valor per PBX SITE
 PAYBOX_PBX_RANG=valor per PBX Rang
diff --git a/htdocs/langs/ca_ES/productbatch.lang b/htdocs/langs/ca_ES/productbatch.lang
index 8ca82527e6c..798e4d56cbb 100644
--- a/htdocs/langs/ca_ES/productbatch.lang
+++ b/htdocs/langs/ca_ES/productbatch.lang
@@ -1,17 +1,17 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Utilitzar numeració per lots/series
-ProductStatusOnBatch=Si (es necessita lot/serie)
-ProductStatusNotOnBatch=No (no s'utilitza lot/serie)
+ManageLotSerial=Utilitza el número de lot/sèrie
+ProductStatusOnBatch=Sí (es requereix un lot/sèrie)
+ProductStatusNotOnBatch=No (lot/sèrie no utilitzat)
 ProductStatusOnBatchShort=Si
 ProductStatusNotOnBatchShort=No
-Batch=Lot/Serie
-atleast1batchfield=Data de caducitat o Data de venda o Lot/Numero de Serie
-batch_number=Número de Lot/Serie
-BatchNumberShort=Lot/Serie
+Batch=Lot/Sèrie
+atleast1batchfield=Data de caducitat o data de venda o número de lot/sèrie
+batch_number=Número de lot/sèrie
+BatchNumberShort=Lot/Sèrie
 EatByDate=Data de caducitat
 SellByDate=Data límit de venda
-DetailBatchNumber=Detalls del lot/serie
-printBatch=Lot/Serie %s
+DetailBatchNumber=Detalls del lot/sèrie
+printBatch=Lot/Sèrie: %s
 printEatby=Caducitat: %s
 printSellby=Límit venda: %s
 printQty=Quant.: %d
@@ -21,4 +21,4 @@ ProductDoesNotUseBatchSerial=Aquest producte no utilitza lot/número de sèrie
 ProductLotSetup=Configuració del mòdul lot/sèries
 ShowCurrentStockOfLot=Mostra l'estoc actual de la parella producte/lot
 ShowLogOfMovementIfLot=Mostra el registre de moviments de la parella producte/lot
-StockDetailPerBatch=Detalls del stock per lot
+StockDetailPerBatch=Detall d’estoc per lot
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index 49bfe4daa99..ab089492c72 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -15,12 +15,12 @@ Service=Servei
 ProductId=ID producte/servei
 Create=Crear
 Reference=Referència
-NewProduct=Nou producte
-NewService=Nou servei
+NewProduct=Producte nou
+NewService=Servei nou
 ProductVatMassChange=Actualització d'Impostos Global 
 ProductVatMassChangeDesc=Aquesta eina actualitza el tipus d'IVA establert a <b> <u> TOTS </u> </b> els productes i serveis!
 MassBarcodeInit=Inicialització massiu de codis de barres
-MassBarcodeInitDesc=Pot utilitzar aquesta pàgina per inicialitzar el codi de barres en els objectes que no tenen un codi de barres definit. Comprovi abans que el mòdul de codis de barres estar ben configurat
+MassBarcodeInitDesc=Aquesta pàgina es pot utilitzar per a inicialitzar un codi de barres en els objectes que no tenen un codi de barres definit. Comproveu abans que la configuració del mòdul de codi de barres està completada.
 ProductAccountancyBuyCode=Codi comptable (compra)
 ProductAccountancyBuyIntraCode=Codi comptable (compra intracomunitària)
 ProductAccountancyBuyExportCode=Codi comptable (compra d'importació)
@@ -48,7 +48,7 @@ LastRecordedProducts=Últims %s productes registrats
 LastRecordedServices=Últims %s serveis registrats
 CardProduct0=Producte
 CardProduct1=Servei
-Stock=Stock
+Stock=Estoc
 MenuStocks=Estocs
 Stocks=Estocs i ubicació (magatzem) de productes
 Movements=Moviments
@@ -77,10 +77,10 @@ CostPriceDescription=Aquest camp de preus (sense IVA) es pot utilitzar per emmag
 CostPriceUsage=Aquest valor pot utilitzar-se per al càlcul de marges
 SoldAmount=Import venut
 PurchasedAmount=Import comprat
-NewPrice=Nou preu
+NewPrice=Preu nou
 MinPrice=Min. preu de venda
 EditSellingPriceLabel=Edita l'etiqueta de preu de venda
-CantBeLessThanMinPrice=El preu de venda no ha de ser inferior al mínim per a aquest producte (%s sense IVA). Aquest missatge pot estar causat per un descompte molt gran.
+CantBeLessThanMinPrice=El preu de venda no pot ser inferior al mínim permès per a aquest producte (%s sense IVA). Aquest missatge també pot aparèixer si escriviu un descompte massa gran.
 ContractStatusClosed=Tancat
 ErrorProductAlreadyExists=Un producte amb la referència %s ja existeix.
 ErrorProductBadRefOrLabel=El valor de la referència o etiqueta és incorrecte
@@ -93,7 +93,7 @@ ShowService=Mostrar servei
 ProductsAndServicesArea=Àrea productes i serveis
 ProductsArea=Àrea Productes
 ServicesArea=Àrea Serveis
-ListOfStockMovements=Llistat de moviments de stock
+ListOfStockMovements=Llista de moviments d’estoc
 BuyingPrice=Preu de compra
 PriceForEachProduct=Productes amb preus específics
 SupplierCard=Targeta venedor
@@ -106,12 +106,13 @@ NoteNotVisibleOnBill=Nota (no visible en les factures, pressupostos, etc.)
 ServiceLimitedDuration=Si el servei és de durada limitada:
 FillWithLastServiceDates=Emplena les dates de l'última línia de servei
 MultiPricesAbility=Segments de preus múltiples per producte / servei (cada client està en un segment de preus)
-MultiPricesNumPrices=Nº de preus
+MultiPricesNumPrices=Nombre de preus
 DefaultPriceType=Base de preus per defecte (contra impostos) en afegir preus de venda nous
-AssociatedProductsAbility=Activa els kits (productes virtuals)
+AssociatedProductsAbility=Activa els kits (conjunt de diversos productes)
+VariantsAbility=Activa les variants (variacions de productes, per exemple, color, mida)
 AssociatedProducts=Kits
-AssociatedProductsNumber=Número de productes que componen aquest kit
-ParentProductsNumber=Nº de productes que aquest compon
+AssociatedProductsNumber=Nombre de productes que componen aquest kit
+ParentProductsNumber=Nombre de productes on està inclòs
 ParentProducts=Productes pare
 IfZeroItIsNotAVirtualProduct=Si és 0, aquest producte no és un kit
 IfZeroItIsNotUsedByVirtualProduct=Si és 0, aquest producte no s'utilitza en cap kit
@@ -131,13 +132,13 @@ ExportDataset_service_1=Serveis
 ImportDataset_produit_1=Productes
 ImportDataset_service_1=Serveis
 DeleteProductLine=Eliminar línia de producte
-ConfirmDeleteProductLine=Esteu segur de voler eliminar aquesta línia de producte?
+ConfirmDeleteProductLine=Esteu segur que voleu suprimir aquesta línia de producte?
 ProductSpecial=Especial
 QtyMin=Min. quantitat de compra
 PriceQtyMin=Preu mínim
 PriceQtyMinCurrency=Preu (moneda) per aquesta quantitat (sense descompte)
 VATRateForSupplierProduct=Preu de l'IVA (per a aquest proveïdor/product)
-DiscountQtyMin=Descompte per aquest quantitat
+DiscountQtyMin=Descompte per aquesta quantitat.
 NoPriceDefinedForThisSupplier=Sense preu ni quantitat definida per aquest proveïdor / producte
 NoSupplierPriceDefinedForThisProduct=No hi ha cap preu / quantitat de proveïdor definit per a aquest producte
 PredefinedProductsToSell=Producte predefinit
@@ -148,12 +149,12 @@ PredefinedServicesToPurchase=Serveis predefinits per comprar
 PredefinedProductsAndServicesToPurchase=Productes / serveis predefinits per comprar
 NotPredefinedProducts=Sense productes/serveis predefinits
 GenerateThumb=Generar l'etiqueta
-ServiceNb=Servei nº %s
+ServiceNb=Servei núm. %s
 ListProductServiceByPopularity=Llistat de productes/serveis per popularitat
 ListProductByPopularity=Llistat de productes/serveis per popularitat
 ListServiceByPopularity=Llistat de serveis per popularitat
 Finished=Producte fabricat
-RowMaterial=Matèria prima
+RowMaterial=Matèria primera
 ConfirmCloneProduct=Estàs segur que vols clonar el producte o servei <b>%s</b>?
 CloneContentProduct=Clona tota la informació principal del producte/servei
 ClonePricesProduct=Clonar preus
@@ -161,14 +162,16 @@ CloneCategoriesProduct=Etiquetes i categories de clons enllaçades
 CloneCompositionProduct=Clonar virtualment un producte/servei
 CloneCombinationsProduct=Clonar variants de producte
 ProductIsUsed=Aquest producte és utilitzat
-NewRefForClone=Ref. del nou producte/servei
+NewRefForClone=Ref. del producte/servei nou
 SellingPrices=Preus de venda
 BuyingPrices=Preus de compra
 CustomerPrices=Preus de client
 SuppliersPrices=Preus del proveïdor
 SuppliersPricesOfProductsOrServices=Preus del venedor (de productes o serveis)
-CustomCode=Duana / mercaderia / codi HS
+CustomCode=Duanes | Productes bàsics | Codi HS
 CountryOrigin=País d'origen
+RegionStateOrigin=Regió d'origen
+StateOrigin=Estat | Província d'origen
 Nature=Naturalesa del producte (material/acabat)
 NatureOfProductShort=Naturalesa del producte
 NatureOfProductDesc=Matèria primera o producte acabat
@@ -216,7 +219,7 @@ unitDM=dm
 unitCM=cm
 unitMM=mm
 unitFT=peu
-unitIN=pulzada
+unitIN=polzada
 unitM2=Metre quadrat
 unitDM2=dm²
 unitCM2=cm²
@@ -239,17 +242,17 @@ AlwaysUseFixedPrice=Utilitzar el preu fixat
 PriceByQuantity=Preus diferents per quantitat
 DisablePriceByQty=Desactivar els preus per quantitat
 PriceByQuantityRange=Rang de quantitats
-MultipriceRules=Regles de nivell de preu
+MultipriceRules=Preus automàtics per segment
 UseMultipriceRules=Utilitzeu les regles del segment de preus (definides a la configuració del mòdul de producte) per calcular automàticament els preus de tots els altres segments segons el primer segment
 PercentVariationOver=%% variació sobre %s
 PercentDiscountOver=%% descompte sobre %s
-KeepEmptyForAutoCalculation=Mantingueu-lo buit per obtenir-ho calculat automàticament pel pes o el volum dels productes
+KeepEmptyForAutoCalculation=Mantingueu-lo buit per a calcular-ho automàticament a partir del pes o volum dels productes
 VariantRefExample=Exemples: COL, TALLA
 VariantLabelExample=Exemples: Color, Talla
 ### composition fabrication
 Build=Fabricar
 ProductsMultiPrice=Productes i preus per cada nivell de preu
-ProductsOrServiceMultiPrice=Preus de client (productes o serveis, multi-preus)
+ProductsOrServiceMultiPrice=Preus per als clients (de productes o serveis, multipreus)
 ProductSellByQuarterHT=Facturació de productes trimestral abans d'impostos
 ServiceSellByQuarterHT=Facturació de serveis trimestral abans d'impostos
 Quarter1=1º trimestre
@@ -258,7 +261,7 @@ Quarter3=3º trimestre
 Quarter4=4º trimestre
 BarCodePrintsheet=Imprimeix codi de barres
 PageToGenerateBarCodeSheets=Amb aquesta eina, podeu imprimir fulls adhesius de codis de barres. Trieu el format de la vostra pàgina d'etiqueta, tipus de codi de barres i valor del codi de barres, i feu clic al botó <b> %s </b>.
-NumberOfStickers=Nùmero d'etiquetes per imprimir a la pàgina
+NumberOfStickers=Nombre d'adhesius per imprimir a la pàgina
 PrintsheetForOneBarCode=Imprimir varies etiquetes per codi de barres
 BuildPageToPrint=Generar pàgines a imprimir
 FillBarCodeTypeAndValueManually=Emplenar tipus i valor del codi de barres manualment
@@ -276,10 +279,10 @@ AddCustomerPrice=Afegir preus per client
 ForceUpdateChildPriceSoc=Indica el mateix preu a les filials dels clients
 PriceByCustomerLog=Registre de preus de clients anteriors
 MinimumPriceLimit=El preu mínim no pot ser inferior a %s
-MinimumRecommendedPrice=El preu mínim recomenat es: %s
+MinimumRecommendedPrice=El preu mínim recomanat és: %s
 PriceExpressionEditor=Editor d'expressions de preus
 PriceExpressionSelected=Expressió de preus seleccionat
-PriceExpressionEditorHelp1="price = 2 + 2" o "2 + 2" per configurar un preu. Utilitzi ; per separar expresions
+PriceExpressionEditorHelp1="price = 2 + 2" o "2 + 2" per definir el preu. Utilitzeu ; per separar expressions
 PriceExpressionEditorHelp2=Pots accedir als atributs complementaris amb variables com <b>#extrafield_myextrafieldkey#</b> i variables globals amb <b>#global_mycode#</b>
 PriceExpressionEditorHelp3=En productes/serveis i preus de proveïdor, hi ha disponibles les següents variables<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
 PriceExpressionEditorHelp4=Només en els preus de productes/serveis: <b>#supplier_min_price#</b><br>Només en els preus dels proveïdors: <b>#supplier_quantity# i #supplier_tva_tx#</b>
@@ -308,10 +311,10 @@ GlobalVariableUpdaterHelpFormat1=El format per a la sol·licitud és {"URL": "ht
 UpdateInterval=Interval d'actualització (minuts)
 LastUpdated=Última actualització
 CorrectlyUpdated=Actualitzat correctament
-PropalMergePdfProductActualFile=Els fitxers utilitzats per afegir-se en el PDF Azur són
+PropalMergePdfProductActualFile=Els fitxers que s’utilitzen per a afegir-se al PDF Azur són
 PropalMergePdfProductChooseFile=Selecciona fitxers PDF
 IncludingProductWithTag=Inclòs productes/serveis amb etiqueta
-DefaultPriceRealPriceMayDependOnCustomer=Preu per defecte, el preu real depén de client
+DefaultPriceRealPriceMayDependOnCustomer=Preu predeterminat, el preu real pot dependre del client
 WarningSelectOneDocument=Selecciona com a mínim un document
 DefaultUnitToShow=Unitat
 NbOfQtyInProposals=Qtat. en pressupostos
@@ -328,7 +331,7 @@ WidthUnits=Unitat d’amplada
 LengthUnits=Unitat de longitud
 HeightUnits=Unitat d'alçada
 SurfaceUnits=Unitat de superfície
-SizeUnits=Unitat de tamany
+SizeUnits=Unitat de mida
 DeleteProductBuyPrice=Elimina preu de compra
 ConfirmDeleteProductBuyPrice=Esteu segur de voler eliminar aquest preu de compra?
 SubProduct=Subproducte
@@ -356,9 +359,9 @@ ProductCombinations=Variants
 PropagateVariant=Propaga variants
 HideProductCombinations=Ocultar les variants en el selector de productes
 ProductCombination=Variant
-NewProductCombination=Nova variant
+NewProductCombination=Variant nova
 EditProductCombination=Editant variant
-NewProductCombinations=Nous variants
+NewProductCombinations=Variants noves
 EditProductCombinations=Editant variants
 SelectCombination=Selecciona la combinació
 ProductCombinationGenerator=Generador de variants
@@ -368,11 +371,11 @@ ImpactOnPriceLevel=Impacte en el nivell de preus %s
 ApplyToAllPriceImpactLevel= Aplica a tots els nivells
 ApplyToAllPriceImpactLevelHelp=En fer clic aquí, establireu el mateix impacte de preu en tots els nivells
 WeightImpact=Impacte en el pes
-NewProductAttribute=Nou atribut
-NewProductAttributeValue=Nou valor de l'atribut
-ErrorCreatingProductAttributeValue=Ha ocorregut un error al crear el valor de l'atribut. Això pot ser perque ja no existeixca un valor amb aquesta referència
+NewProductAttribute=Atribut nou
+NewProductAttributeValue=Valor d'atribut nou
+ErrorCreatingProductAttributeValue=S'ha produït un error en crear el valor de l'atribut. Podria ser perquè ja hi ha un valor existent amb aquesta referència
 ProductCombinationGeneratorWarning=Si continua, abans de generar noves variants, totes les anteriors seran ELIMINADES. Les ja existents s'actualitzaran amb els nous valors
-TooMuchCombinationsWarning=Generar una gran quantitat de variants pot donar lloc a un ús de CPU alta, ús de memòria i que Dolibarr no siga capaç de crearles. Habilitar l'opció "%s" pot ajudar a reduir l'ús de memòria.
+TooMuchCombinationsWarning=La generació de moltes variants pot provocar un elevat consum de la CPU i ús de memòria i Dolibarr no les podrà crear. Habilitant l'opció "%s" pot ajudar a reduir l'ús de memòria.
 DoNotRemovePreviousCombinations=No elimineu les variants anteriors
 UsePercentageVariations=Utilitzar variants percentuals
 PercentageVariation=Variant percentual
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index d7b36bb013a..d9a8e813264 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -7,7 +7,7 @@ ProjectsArea=Àrea de projectes
 ProjectStatus=Estat el projecte
 SharedProject=Projecte compartit
 PrivateProject=Contactes del projecte
-ProjectsImContactFor=Projectes on sóc explícitament un contacte
+ProjectsImContactFor=Projectes dels qui en soc explícitament un contacte
 AllAllowedProjects=Tots els projectes que puc llegir (meu + públic)
 AllProjects=Tots els projectes
 MyProjectsDesc=Aquesta vista mostra aquells projectes dels quals sou un contacte.
@@ -20,12 +20,12 @@ MyTasksDesc=Aquesta vista es limita als projectes o a les tasques als quals sou
 OnlyOpenedProject=Només visibles els projectes oberts (els projectes en estat d'esborrany o tancats no són visibles)
 ClosedProjectsAreHidden=Els projectes tancats no són visibles.
 TasksPublicDesc=Aquesta vista mostra tots els projectes i tasques en els que vostè té dret a tenir visibilitat.
-TasksDesc=Aquesta vista mostra tots els projectes i tasques (les sevas autoritzacions li ofereixen una visió completa).
+TasksDesc=Aquesta vista presenta tots els projectes i tasques (els permisos d'usuari us concedeixen permís per veure-ho tot).
 AllTaskVisibleButEditIfYouAreAssigned=Totes les tasques per a projectes qualificats són visibles, però podeu ingressar només el temps per a la tasca assignada a l'usuari seleccionat. Assigneu la tasca si necessiteu introduir-hi el temps.
 OnlyYourTaskAreVisible=Només són visibles les tasques que tens assignades. Assigna't tasques si no són visibles i vols afegir-hi les hores.
 ImportDatasetTasks=Tasques de projectes
 ProjectCategories=Etiquetes de projecte
-NewProject=Nou projecte
+NewProject=Projecte nou
 AddProject=Crear projecte
 DeleteAProject=Eliminar un projecte
 DeleteATask=Eliminar una tasca
@@ -65,10 +65,10 @@ Task=Tasca
 TaskDateStart=Data d'inici
 TaskDateEnd=Data de finalització
 TaskDescription=Descripció de tasca
-NewTask=Nova tasca
+NewTask=Tasca nova
 AddTask=Crear tasca
 AddTimeSpent=Crea temps dedicat
-AddHereTimeSpentForDay=Afegeix aqui el temps dedicat per aquest dia/tasca
+AddHereTimeSpentForDay=Afegiu aquí el temps dedicat a aquest dia/tasca
 AddHereTimeSpentForWeek=Afegeix aquí el temps dedicat per aquesta setmana/tasca
 Activity=Activitat
 Activities=Tasques/activitats
@@ -85,6 +85,7 @@ ProgressCalculated=Progressió calculada
 WhichIamLinkedTo=al qual estic vinculat
 WhichIamLinkedToProject=que estic vinculat al projecte
 Time=Temps
+TimeConsumed=Consumit
 ListOfTasks=Llistat de tasques
 GoToListOfTimeConsumed=Ves al llistat de temps consumit
 GanttView=Vista de Gantt
@@ -120,7 +121,7 @@ ValidateProject=Validar projecte
 ConfirmValidateProject=Vols validar aquest projecte?
 CloseAProject=Tancar projecte
 ConfirmCloseAProject=Vols tancar aquest projecte?
-AlsoCloseAProject=Tancar també el projecte (mantindre obert si encara necessita seguir les tasques de producció en ell)
+AlsoCloseAProject=Tanqueu el projecte també (manteniu-lo obert si encara heu de seguir les tasques de producció)
 ReOpenAProject=Reobrir projecte
 ConfirmReOpenAProject=Vols reobrir aquest projecte?
 ProjectContact=Contactes del projecte
@@ -139,7 +140,7 @@ LinkedToAnotherCompany=Enllaçat a una altra empresa
 TaskIsNotAssignedToUser=Tasca no assignada a l'usuari. Utilitza el botó '<strong>%s</strong>' per assignar una tasca ara.
 ErrorTimeSpentIsEmpty=El temps dedicat està buit
 ThisWillAlsoRemoveTasks=Aquesta operació també destruirà les tasques del projecte (<b>%s</b> tasques en aquest moment) i tots els seus temps dedicats.
-IfNeedToUseOtherObjectKeepEmpty=Si els elements (factura, comanda, ...) pertanyen a un tercer que no és el seleccionat, havent aquests estar lligats al projecte a crear, deixeu buit per permetre el projecte a multi-tercers.
+IfNeedToUseOtherObjectKeepEmpty=Si alguns objectes (factura, comanda...), pertanyents a un altre tercer, han d'estar vinculats al projecte a crear, manteniu-los buits perquè el projecte sigui multitercers.
 CloneTasks=Clonar les tasques
 CloneContacts=Clonar els contactes
 CloneNotes=Clonar les notes
@@ -208,7 +209,7 @@ ProjectOverview=Informació general
 ManageTasks=Utilitzeu projectes per seguir les tasques i / o informar el temps dedicat (fulls de temps)
 ManageOpportunitiesStatus=Utilitza els projectes per seguir oportunitats
 ProjectNbProjectByMonth=Nombre de projectes creats per mes
-ProjectNbTaskByMonth=Nº de tasques creades per mes
+ProjectNbTaskByMonth=Nombre de tasques creades per mes
 ProjectOppAmountOfProjectsByMonth=Quantitat de clients potencials per mes
 ProjectWeightedOppAmountOfProjectsByMonth=Quantitat ponderada de clients potencials per mes
 ProjectOpenedProjectByOppStatus=Projecte obert | lead per l'estat de lead
@@ -254,7 +255,7 @@ TimeSpentForInvoice=Temps dedicat
 OneLinePerUser=Una línia per usuari
 ServiceToUseOnLines=Servei d'ús a les línies
 InvoiceGeneratedFromTimeSpent=La factura %s s'ha generat a partir del temps dedicat al projecte
-ProjectBillTimeDescription=Comproveu si heu introduït el full de temps en les tasques del projecte I teniu previst generar factures des del full de temps per facturar al client del projecte (no comproveu si voleu crear la factura que no es basa en els fulls de temps introduïts). Nota: Per generarla  factura, aneu a la pestanya "Temps introduït" del projecte i seleccioneu les línies que cal incloure.
+ProjectBillTimeDescription=Comproveu si heu introduït el full de temps en les tasques del projecte I teniu previst generar factures des del full de temps per a facturar al client del projecte (no comproveu si voleu crear la factura que no es basa en els fulls de temps introduïts). Nota: Per a generar la factura, aneu a la pestanya "Temps introduït" del projecte i seleccioneu les línies que cal incloure.
 ProjectFollowOpportunity=Segueix l’oportunitat
 ProjectFollowTasks=Seguir les tasques o el temps dedicat
 Usage=Ús
@@ -262,7 +263,7 @@ UsageOpportunity=Ús: Oportunitat
 UsageTasks=Ús: Tasques
 UsageBillTimeShort=Ús: temps de facturació
 InvoiceToUse=Esborrany de factura a utilitzar
-NewInvoice=Nova factura
+NewInvoice=Factura nova
 OneLinePerTask=Una línia per tasca
 OneLinePerPeriod=Una línia per període
 RefTaskParent=Ref. Tasca pare
diff --git a/htdocs/langs/ca_ES/receiptprinter.lang b/htdocs/langs/ca_ES/receiptprinter.lang
index d0aa69ce402..cee89d1b087 100644
--- a/htdocs/langs/ca_ES/receiptprinter.lang
+++ b/htdocs/langs/ca_ES/receiptprinter.lang
@@ -5,28 +5,28 @@ PrinterUpdated=Impressora %s actualitzada
 PrinterDeleted=Impressora %s esborrada
 TestSentToPrinter=Prova enviada a la impressora %s
 ReceiptPrinter=Impressores de tiquets
-ReceiptPrinterDesc=Configuració d'impresora de tiquets
+ReceiptPrinterDesc=Configuració d'impressores de tiquets
 ReceiptPrinterTemplateDesc=Configuració de plantilles
-ReceiptPrinterTypeDesc=Descripció del tipus d'impresora de tiquets
-ReceiptPrinterProfileDesc=Descripció del perfil d'impresora de tiquets
+ReceiptPrinterTypeDesc=Descripció del tipus d'impressora de tiquets
+ReceiptPrinterProfileDesc=Descripció del perfil de la impressora de tiquets
 ListPrinters=Llista d'impressores
 SetupReceiptTemplate=Configuració de plantilla
 CONNECTOR_DUMMY=Impressora de proves
-CONNECTOR_NETWORK_PRINT=Impresora en xarxa
+CONNECTOR_NETWORK_PRINT=Impressora de xarxa
 CONNECTOR_FILE_PRINT=Impressora local
 CONNECTOR_WINDOWS_PRINT=Impressora local en Windows
 CONNECTOR_CUPS_PRINT=Impressora CUPS
-CONNECTOR_DUMMY_HELP=Impresora de proves, no fa res
+CONNECTOR_DUMMY_HELP=Impressora falsa per a provar, no fa res
 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=Nom de la impressora CUPS, exemple: HPRT_TP805L
 PROFILE_DEFAULT=Perfil per defecte
-PROFILE_SIMPLE=Perfil simpre
+PROFILE_SIMPLE=Perfil simple
 PROFILE_EPOSTEP=Perfil Epos Tep
 PROFILE_P822D=Perfil P822D
 PROFILE_STAR=Perfil Star
-PROFILE_DEFAULT_HELP=Perfil per defecte per a les impresores Epson
+PROFILE_DEFAULT_HELP=Perfil predeterminat adequat per a impressores Epson
 PROFILE_SIMPLE_HELP=Perfil simple sense gràfics
 PROFILE_EPOSTEP_HELP=Perfil Epos Tep
 PROFILE_P822D_HELP=Perfil P822D sense gràfics
diff --git a/htdocs/langs/ca_ES/recruitment.lang b/htdocs/langs/ca_ES/recruitment.lang
index 538b7c54ea1..f9b8ebf2176 100644
--- a/htdocs/langs/ca_ES/recruitment.lang
+++ b/htdocs/langs/ca_ES/recruitment.lang
@@ -20,7 +20,7 @@
 # Module label 'ModuleRecruitmentName'
 ModuleRecruitmentName = Contractació
 # Module description 'ModuleRecruitmentDesc'
-ModuleRecruitmentDesc = Gestiona i segueix les campanyes de contractació de nous llocs de treball
+ModuleRecruitmentDesc = Gestiona i segueix les campanyes de contractació de llocs de treball nous
 
 #
 # Admin page
@@ -38,7 +38,7 @@ EnablePublicRecruitmentPages=Activa les pàgines públiques de treballs actius
 About = Sobre
 RecruitmentAbout = Quant a la contractació
 RecruitmentAboutPage = Pàgina quant a la contractació
-NbOfEmployeesExpected=Nº previst d'empleats
+NbOfEmployeesExpected=Nombre previst d'empleats
 JobLabel=Descripció del lloc de treball
 WorkPlace=Lloc de treball
 DateExpected=Data prevista
@@ -54,7 +54,7 @@ JobOfferToBeFilled=Lloc de treball a cobrir
 ThisIsInformationOnJobPosition=Informació del lloc de treball a ocupar
 ContactForRecruitment=Contacte per a la contractació
 EmailRecruiter=El reclutador de correu electrònic
-ToUseAGenericEmail=Per utilitzar un correu electrònic genèric. Si no està definit, s’utilitzarà el correu electrònic del responsable de la contractació
+ToUseAGenericEmail=Per a utilitzar un correu electrònic genèric. Si no està definit, s’utilitzarà el correu electrònic del responsable de la contractació
 NewCandidature=Candidatura nova
 ListOfCandidatures=Llista de candidatures
 RequestedRemuneration=Retribució sol·licitada
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=L’oferta de feina està tancada. El lloc s'ha cobe
 JobClosedTextCanceled=L’oferta de feina està tancada.
 ExtrafieldsJobPosition=Atributs complementaris (llocs de treball)
 ExtrafieldsCandidatures=Atributs complementaris (sol·licituds de feina)
+MakeOffer=Feu una oferta
diff --git a/htdocs/langs/ca_ES/resource.lang b/htdocs/langs/ca_ES/resource.lang
index f4b0d69ddf6..a608f69d929 100644
--- a/htdocs/langs/ca_ES/resource.lang
+++ b/htdocs/langs/ca_ES/resource.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - resource
 MenuResourceIndex=Recursos
-MenuResourceAdd=Nou recurs
+MenuResourceAdd=Recurs nou
 DeleteResource=Elimina recurs
 ConfirmDeleteResourceElement=Estàs segur de voler eliminar el recurs d'aquest element?
 NoResourceInDatabase=Sense recursos a la base de dades.
@@ -31,7 +31,7 @@ DictionaryResourceType=Tipus de recurs
 SelectResource=Seleccionar recurs
 
 IdResource=Id de recurs
-AssetNumber=Número de serie
+AssetNumber=Número de sèrie
 ResourceTypeCode=Codi de tipus de recurs
 ImportDataset_resource_1=Recursos
 
diff --git a/htdocs/langs/ca_ES/salaries.lang b/htdocs/langs/ca_ES/salaries.lang
index f4567d2fd49..de594952360 100644
--- a/htdocs/langs/ca_ES/salaries.lang
+++ b/htdocs/langs/ca_ES/salaries.lang
@@ -1,18 +1,18 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Compte comptable utilitzat per usuaris tercers
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=S'utilitzarà un compte comptable dedicat definit en la fitxa d'usuari per a omplir el Llibre Major, o com valor predeterminar de la comptabilitat del Llibre Major si no es defineix un compte comptable en la fitxa d'usuari.
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=El compte comptable dedicat definit a la fitxa d'usuari només s’utilitzarà per a la comptabilitat auxiliar. Aquest s'utilitzarà per al llibre major i com a valor per defecte de la comptabilitat auxiliar si no es defineix un compte comptable d'usuari dedicat.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Compte comptable per defecte per als pagaments salarials
 Salary=Sou
 Salaries=Sous
-NewSalaryPayment=Nou pagament de sous
+NewSalaryPayment=Pagament de salari nou
 AddSalaryPayment=Afegeix pagament de sou
 SalaryPayment=Pagament de sous
 SalariesPayments=Pagaments de sous
 ShowSalaryPayment=Veure pagament de sous
 THM=Tarifa per hora mitjana
-TJM=Tarifa diaria mitjana
+TJM=Tarifa mitjana diària
 CurrentSalary=Salari actual
-THMDescription=Aquest valor es pot utilitzar per calcular el cost del temps consumit en un projecte introduït pels usuaris si s'utilitza el projecte de mòdul
+THMDescription=Aquest valor es pot utilitzar per a calcular el cost del temps consumit en un projecte introduït pels usuaris si s'utilitza el mòdul de projecte
 TJMDescription=Aquest valor només és informatiu i no s'utilitza en cap càlcul
 LastSalaries=Últims %s pagaments de salari
 AllSalaries=Tots els pagaments de salari
diff --git a/htdocs/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang
index 421112e34da..a973ace4aee 100644
--- a/htdocs/langs/ca_ES/sendings.lang
+++ b/htdocs/langs/ca_ES/sendings.lang
@@ -15,7 +15,7 @@ StatisticsOfSendings=Estadístiques d'enviaments
 NbOfSendings=Nombre d'enviaments
 NumberOfShipmentsByMonth=Nombre d'enviaments per mes
 SendingCard=Fitxa d'enviament
-NewSending=Nou enviament
+NewSending=Enviament nou
 CreateShipment=Crear enviament
 QtyShipped=Qt. enviada
 QtyShippedShort=Quant. env.
@@ -30,16 +30,17 @@ OtherSendingsForSameOrder=Altres enviaments d'aquesta comanda
 SendingsAndReceivingForSameOrder=Enviaments i recepcions per aquesta comanda
 SendingsToValidate=Enviaments a validar
 StatusSendingCanceled=Anul·lada
+StatusSendingCanceledShort=Cancel·lat
 StatusSendingDraft=Esborrany
 StatusSendingValidated=Validat (productes a enviar o enviats)
 StatusSendingProcessed=Processat
 StatusSendingDraftShort=Esborrany
 StatusSendingValidatedShort=Validat
 StatusSendingProcessedShort=Processat
-SendingSheet=Nota d'entrga
+SendingSheet=Full d’enviament
 ConfirmDeleteSending=Estàs segur que vols eliminar aquest enviament?
 ConfirmValidateSending=Estàs segur que vols validar aquest enviament amb referència <b>%s</b>?
-ConfirmCancelSending=Estàs segur que vols cancelar aquest enviament?
+ConfirmCancelSending=Esteu segur que voleu cancel·lar aquest enviament?
 DocumentModelMerou=Model Merou A5
 WarningNoQtyLeftToSend=Alerta, cap producte en espera d'enviament.
 StatsOnShipmentsOnlyValidated=Estadístiques realitzades únicament sobre les expedicions validades
@@ -50,7 +51,7 @@ DateReceived=Data real de recepció
 ClassifyReception=Marca rebut
 SendShippingByEMail=Envia expedició per e-mail
 SendShippingRef=Enviament de l'expedició %s
-ActionsOnShipping=Events sobre l'expedició
+ActionsOnShipping=Esdeveniments en l'enviament
 LinkToTrackYourPackage=Enllaç per al seguiment del seu paquet
 ShipmentCreationIsDoneFromOrder=De moment, la creació d'una nova expedició es realitza des de la fitxa de comanda.
 ShipmentLine=Línia d'expedició
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index a567ac331f0..5de1e46400b 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -3,13 +3,13 @@ WarehouseCard=Fitxa magatzem
 Warehouse=Magatzem
 Warehouses=Magatzems
 ParentWarehouse=Magatzem pare
-NewWarehouse=Nou magatzem o zona d'emmagatzematge
+NewWarehouse=Magatzem / Ubicació d'estoc nova
 WarehouseEdit=Edició magatzem
-MenuNewWarehouse=Nou magatzem
+MenuNewWarehouse=Magatzem nou
 WarehouseSource=Magatzem origen
 WarehouseSourceNotDefined=Sense magatzems definits,
 AddWarehouse=Crea un magatzem
-AddOne=Afegir un
+AddOne=Afegeix-ne un
 DefaultWarehouse=Magatzem predeterminat
 WarehouseTarget=Magatzem destinació
 ValidateSending=Elimina l'enviament
@@ -17,8 +17,8 @@ CancelSending=Cancel·la l'enviament
 DeleteSending=Elimina l'enviament
 Stock=Estoc
 Stocks=Estocs
-MissingStocks=Estoc que falta
-StockAtDate=Existències en data
+MissingStocks=Estocs que falten
+StockAtDate=Estocs en data
 StockAtDateInPast=Data passada
 StockAtDateInFuture=Data en el futur
 StocksByLotSerial=Estocs per lot/sèrie
@@ -27,7 +27,7 @@ LotSerialList=Llista de lots/sèries
 Movements=Moviments
 ErrorWarehouseRefRequired=El nom de referència del magatzem és obligatori
 ListOfWarehouses=Llistat de magatzems
-ListOfStockMovements=Llistat de moviments de estoc
+ListOfStockMovements=Llistat de moviments d'estoc
 ListOfInventories=Llista d'inventaris
 MovementId=ID del moviment
 StockMovementForId=ID de moviment %d
@@ -46,7 +46,7 @@ Units=Unitats
 Unit=Unitat
 StockCorrection=Regularització d'estoc
 CorrectStock=Regularització d'estoc
-StockTransfer=Transferencia d'estoc
+StockTransfer=Transferència d’estoc
 TransferStock=Transferència d'estoc
 MassStockTransferShort=Transferència d'estoc massiu
 StockMovement=Moviment d'estoc
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Valor d'estocs
 UserWarehouseAutoCreate=Crea un usuari de magatzem automàticament quan es crea un usuari
 AllowAddLimitStockByWarehouse=Gestioneu també valors mínims d'estoc desitjat per emparellament (producte-magatzem), a més de valors mínims d'estoc desitjat per producte
 RuleForWarehouse=Regles per als magatzems
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Estableix un magatzem per a les comandes de venda
 UserDefaultWarehouse=Estableix un magatzem per Usuaris
 MainDefaultWarehouse=Magatzem predeterminat
@@ -102,9 +103,9 @@ IdWarehouse=Id. magatzem
 DescWareHouse=Descripció magatzem
 LieuWareHouse=Localització magatzem
 WarehousesAndProducts=Magatzems i productes
-WarehousesAndProductsBatchDetail=Magatzems i productes (amb detalls per lot/serie)
+WarehousesAndProductsBatchDetail=Magatzems i productes (amb detall per lot/sèrie)
 AverageUnitPricePMPShort=Preu mitjà ponderat
-AverageUnitPricePMPDesc=El preu unitari mitjà d’entrada que hem de pagar als proveïdors per incorporar el producte a les nostres existències.
+AverageUnitPricePMPDesc=El preu unitari mitjà d’entrada que hem hagut de pagar als proveïdors per incorporar el producte al nostre estoc.
 SellPriceMin=Preu de venda unitari
 EstimatedStockValueSellShort=Valor per vendre
 EstimatedStockValueSell=Valor per vendre
@@ -112,7 +113,7 @@ EstimatedStockValueShort=Valor compra (PMP)
 EstimatedStockValue=Valor de compra (PMP)
 DeleteAWarehouse=Eliminar un magatzem
 ConfirmDeleteWarehouse=Vols eliminar el magatzem <b>%s</b>?
-PersonalStock=Stoc personal %s
+PersonalStock=Estoc personal %s
 ThisWarehouseIsPersonalStock=Aquest magatzem representa l'estoc personal de %s %s
 SelectWarehouseForStockDecrease=Tria el magatzem a utilitzar en el decrement d'estoc
 SelectWarehouseForStockIncrease=Tria el magatzem a utilitzar en l'increment d'estoc
@@ -127,24 +128,24 @@ UseRealStockByDefault=Utilitza estoc real, en lloc d’estoc virtual, per a la f
 ReplenishmentCalculation=La quantitat a demanar serà (quantitat desitjada - estoc real) en lloc de (quantitat desitjada - estoc virtual)
 UseVirtualStock=Utilitza estoc virtual
 UsePhysicalStock=Utilitzar estoc físic
-CurentSelectionMode=Mode de sel·leció actual
+CurentSelectionMode=Mètode de selecció actual
 CurentlyUsingVirtualStock=Estoc virtual
 CurentlyUsingPhysicalStock=Estoc físic
 RuleForStockReplenishment=Regla pels reaprovisionaments d'estoc
 SelectProductWithNotNullQty=Seleccioneu com a mínim un producte amb un valor no nul i un proveïdor
 AlertOnly= Només alertes
-IncludeProductWithUndefinedAlerts = Incloure també estocs negatius per als productes sense la quantitat desitjada definida, per restaurar-los a 0
-WarehouseForStockDecrease=Per la disminució d'estoc s'utilitzara el magatzem <b>%s</b>
-WarehouseForStockIncrease=Pe l'increment d'estoc s'utilitzara el magatzem <b>%s</b>
+IncludeProductWithUndefinedAlerts = Incloure també estoc negatiu per als productes sense la quantitat desitjada definida, per a restaurar-los a 0
+WarehouseForStockDecrease=El magatzem <b>%s</b> s’utilitzarà per a disminuir l’estoc
+WarehouseForStockIncrease=El magatzem <b>%s</b> s'utilitzarà per a augmentar l'estoc
 ForThisWarehouse=Per aquest magatzem
 ReplenishmentStatusDesc=Aquesta és una llista de tots els productes amb un estoc inferior a l'estoc desitjat (o inferior al valor d'alerta si la casella de selecció "només alerta" està marcada). Amb la casella de selecció, podeu crear comandes de compra per suplir la diferència.
 ReplenishmentStatusDescPerWarehouse=Si voleu una reposició basada en la quantitat desitjada definida per magatzem, heu d’afegir un filtre al magatzem.
 ReplenishmentOrdersDesc=Aquesta és una llista de totes les comandes de compra oberta incloent productes predefinits. Només s'obren ordres amb productes predefinits, de manera que les comandes que poden afectar les existències, són visibles aquí.
 Replenishments=reaprovisionament
-NbOfProductBeforePeriod=Quantitat del producte %s en estoc abans del periode seleccionat (< %s)
+NbOfProductBeforePeriod=Quantitat del producte %s en estoc abans del període seleccionat (< %s)
 NbOfProductAfterPeriod=Quantitat de producte %s en estoc després del període seleccionat (> %s)
 MassMovement=Moviments en massa
-SelectProductInAndOutWareHouse=Seleccioneu un magatzem d'origen i un magatzem destí, un producte i una quantitat i feu clic a "%s". Un cop fet això per a tots els moviments necessaris, feu clic a "%s".
+SelectProductInAndOutWareHouse=Seleccioneu un magatzem d'origen i un magatzem de destí, un producte i una quantitat i feu clic a "%s". Un cop fet això per a tots els moviments necessaris, feu clic a "%s".
 RecordMovement=Registre de transferència
 ReceivingForSameOrder=Recepcions d'aquesta comanda
 StockMovementRecorded=Moviments d'estoc registrat
@@ -165,7 +166,7 @@ MovementCorrectStock=Ajustament d'estoc del producte %s
 MovementTransferStock=Transferència d'estoc de producte %s a un altre magatzem
 InventoryCodeShort=Codi Inv./Mov.
 NoPendingReceptionOnSupplierOrder=No hi ha cap recepció pendent deguda a l'ordre de compra obert
-ThisSerialAlreadyExistWithDifferentDate=Aquest número de lot/serie (<strong%s</strong>) ja existeix, però amb una data de caducitat o venda diferent (trobat <strong>%s</strong> però ha introduït <strong>%s</strong>).
+ThisSerialAlreadyExistWithDifferentDate=Aquest número de lot/sèrie (<strong> %s </strong>) ja existeix però amb diferent data de caducitat o venda (s'ha trobat <strong> %s </strong> però heu introduït <strong> %s </strong>).
 OpenAll=Actiu per a totes les accions
 OpenInternal=Actiu sols per accions internes
 UseDispatchStatus=Utilitzeu un estat d'enviament (aprovació / rebuig) per a les línies de productes en la recepció de l'ordre de compra
@@ -176,9 +177,9 @@ 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
-NewInventory=Nou inventari
+NewInventory=Inventari nou
 inventorySetup = Configuració de l'inventari
-inventoryCreatePermission=Crea un nou inventari
+inventoryCreatePermission=Crea un inventari nou
 inventoryReadPermission=Veure inventaris
 inventoryWritePermission=Actualitza els inventaris
 inventoryValidatePermission=Valida l'inventari
@@ -186,7 +187,7 @@ inventoryTitle=Inventari
 inventoryListTitle=Inventaris
 inventoryListEmpty=Cap inventari en progrés
 inventoryCreateDelete=Crea/elimina l'inventari
-inventoryCreate=Crea nou
+inventoryCreate=Crea un nou
 inventoryEdit=Edita
 inventoryValidate=Validat
 inventoryDraft=En servei
@@ -201,7 +202,7 @@ SelectFournisseur=Categoria del proveïdor
 inventoryOnDate=Inventari
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Els moviments d’estoc tindran la data de l'inventari (en lloc de la data de validació de l'inventari)
 inventoryChangePMPPermission=Permet canviar el valor PMP d'un producte
-ColumnNewPMP=Nova unitat PMP
+ColumnNewPMP=Unitat PMP nova
 OnlyProdsInStock=No afegeixis producte sense estoc
 TheoricalQty=Qtat. teòrica
 TheoricalValue=Qtat. teòrica
@@ -233,10 +234,11 @@ InventoryForASpecificProduct=Inventari d’un producte específic
 StockIsRequiredToChooseWhichLotToUse=Es requereix estoc per a triar quin lot utilitzar
 ForceTo=Obligar a
 AlwaysShowFullArbo=Mostra l'arbre complet de magatzems a la finestra emergent dels enllaços de magatzem (Advertència: pot disminuir el rendiment de manera espectacular)
-StockAtDatePastDesc=Podeu veure aquí el valor (accions reals) en una data determinada en el passat
-StockAtDateFutureDesc=Podeu veure aquí l'estoc (accions virtuals) en una data determinada en endavant
+StockAtDatePastDesc=Aquí podeu veure l'estoc (estoc real) en una data determinada del passat
+StockAtDateFutureDesc=Aquí podeu veure l'estoc (estoc virtual) en una data determinada en el futur
 CurrentStock=Estoc actual
-InventoryRealQtyHelp=Estableix el valor a 0 per restablir qty <br> Mantenir el camp buit o suprimir la línia per mantenir-la sense canvis
+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=Actualitza per escaneig
 UpdateByScaningProductBarcode=Actualització per escaneig (codi de barres de producte)
 UpdateByScaningLot=Actualització per escaneig (codi de barres lot|sèrie)
+DisableStockChangeOfSubProduct=Desactiva el canvi d'estoc de tots els subproductes d'aquest kit durant aquest moviment.
diff --git a/htdocs/langs/ca_ES/stripe.lang b/htdocs/langs/ca_ES/stripe.lang
index 70f55a466e2..1f519da9659 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 pagament en línia de Stripe per als pagaments amb targetes credit / cebit a través de <a href="http://www.stripe.com" target="_blank"> Stripe </a>. Això es pot utilitzar per permetre als vostres clients fer pagaments ad-hoc o pagaments relacionats amb un objecte particular de Dolibarr (factura, comanda ...)
+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, ...)
 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
@@ -22,24 +22,24 @@ ToOfferALinkForOnlinePaymentOnContractLine=URL per oferir una pàgina de pagamen
 ToOfferALinkForOnlinePaymentOnFreeAmount=URL per oferir una pàgina de pagament en línia %s de qualsevol quantitat sense cap objecte associat
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL per oferir una pàgina de pagament en línia %s per a una subscripció per membres
 ToOfferALinkForOnlinePaymentOnDonation=URL per oferir una pàgina de pagament en línia %s per al pagament d’una donació
-YouCanAddTagOnUrl=També podeu afegir el paràmetre URL <b>&tag= <i>valor</i> </b> a qualsevol d'aquestes URLs (obligatori només per al pagament no vinculat a cap objecte) per afegir la vostra pròpia etiqueta de comentari de pagament. <br> Per a la URL de pagaments no vinculta a cap objecte existent, també podeu afegir el paràmetre <strong>&noidempotency=1</strong> de manera que el mateix enllaç amb una mateixa etiqueta es pot utilitzar diverses vegades (alguns modes de pagament poden limitar els intents de pagament a 1 per a cada enllaç si no s'utilitza aquest paràmetre)
+YouCanAddTagOnUrl=També podeu afegir el paràmetre URL <b> &tag=<i>valor</i></b> a qualsevol d’aquests URL (obligatori només per al pagament que no estigui vinculat a un objecte) per a afegir la vostra pròpia etiqueta de comentari de pagament. <br>Per a l'URL de pagaments sense objecte existent, també podeu afegir el paràmetre <strong> &noidempotency=1 </strong>, de manera que es pot utilitzar el mateix enllaç amb la mateixa etiqueta diverses vegades (alguns modes de pagament poden limitar el pagament a 1 per a cada enllaç diferent sense aquest paràmetre)
 SetupStripeToHavePaymentCreatedAutomatically=Configureu el vostre Stripe amb l'URL <b>%s</b> per fer que el pagament es creï automàticament quan es valide mitjançant Stripe.
 AccountParameter=Paràmetres del compte
 UsageParameter=Paràmetres d'ús
-InformationToFindParameters=Informació per trobar la seva configuració de compte %s
+InformationToFindParameters=Ajuda per a trobar la vostra informació del compte %s
 STRIPE_CGI_URL_V2=URL CGI del mòdul Stripe per al pagament
 CSSUrlForPaymentForm=Url del full d'estil CSS per al formulari de pagament
-NewStripePaymentReceived=S'ha rebut un nou pagament de Stripe
-NewStripePaymentFailed=S'ha intentat el pagament de Stripe però, ha fallat
+NewStripePaymentReceived=S'ha rebut un pagament nou de Stripe
+NewStripePaymentFailed=S'ha intentat el pagament nou de Stripe, però ha fallat
 FailedToChargeCard=No s'ha pogut fer el càrrec a la targeta
 STRIPE_TEST_SECRET_KEY=Clau secreta de test
 STRIPE_TEST_PUBLISHABLE_KEY=Clau de test publicable
 STRIPE_TEST_WEBHOOK_KEY=Clau de prova de Webhook
 STRIPE_LIVE_SECRET_KEY=Clau secreta
-STRIPE_LIVE_PUBLISHABLE_KEY=Clau pubicable
+STRIPE_LIVE_PUBLISHABLE_KEY=Clau publicable
 STRIPE_LIVE_WEBHOOK_KEY=Webhook clau en directe
-ONLINE_PAYMENT_WAREHOUSE=Les existències per utilitzar per disminuir les existències quan es fa el pagament en línia <br> (Pendent de fer Quan es fa una opció per reduir l'estoc en una acció a la factura i es genera la factura el pagament en línia?)
-StripeLiveEnabled=Stripe live activat (del contrari en mode test/sandbox)
+ONLINE_PAYMENT_WAREHOUSE=Estoc a utilitzar per a disminuir l'estoc quan es fa el pagament en línia <br>(Pendent de fer quan l'opció per a reduir l'estoc es fa en una acció a la factura i el pagament en línia es genera la seva factura?)
+StripeLiveEnabled=Stripe live activat (en cas contrari, mode de prova/sandbox)
 StripeImportPayment=Importar pagaments per Stripe
 ExampleOfTestCreditCard=Exemple de targeta de crèdit per a la prova: %s => vàlid, %s => error CVC, %s => caducat, %s => falla la càrrega
 StripeGateways=Passarel·les Stripe
@@ -62,7 +62,7 @@ ConfirmDeleteCard=Estàs segur que vols eliminar aquesta targeta de crèdit o de
 CreateCustomerOnStripe=Crea un client a Stripe
 CreateCardOnStripe=Crea una targeta a Stripe
 ShowInStripe=Mostra a Stripe
-StripeUserAccountForActions=Compte d'usuari per utilitzar en alguns e-mails de notificació d'esdeveniments Stripe (pagaments Stripe)
+StripeUserAccountForActions=Compte d'usuari que s'utilitzarà per a la notificació per correu electrònic d'alguns esdeveniments de Stripe (pagaments de Stripe)
 StripePayoutList=Llista de pagaments de Stripe
 ToOfferALinkForTestWebhook=Enllaç a la configuració de Stripe WebHook per trucar a l’IPN (mode de prova)
 ToOfferALinkForLiveWebhook=Enllaç a la configuració de Stripe WebHook per trucar a l’IPN (mode en directe)
diff --git a/htdocs/langs/ca_ES/supplier_proposal.lang b/htdocs/langs/ca_ES/supplier_proposal.lang
index b7f9c5a4ba4..5a6546a4e81 100644
--- a/htdocs/langs/ca_ES/supplier_proposal.lang
+++ b/htdocs/langs/ca_ES/supplier_proposal.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
 SupplierProposal=Pressupostos de proveïdor
 supplier_proposalDESC=Gestiona les peticions de preu de proveïdors
-SupplierProposalNew=Nova petició de preu
+SupplierProposalNew=Sol·licitud de preu nova
 CommRequest=Petició de preu
 CommRequests=Peticions de preu
 SearchRequest=Busca una petició
@@ -13,12 +13,13 @@ SupplierProposalArea=Àrea de pressupostos de proveïdor
 SupplierProposalShort=Pressupost de proveïdor
 SupplierProposals=Pressupostos de proveïdor
 SupplierProposalsShort=Pressupostos de proveïdor
-NewAskPrice=Nova petició de preu
+AskPrice=Petició de preu
+NewAskPrice=Sol·licitud de preu nova
 ShowSupplierProposal=Mostra una petició de preu
 AddSupplierProposal=Crea una petició de preu
 SupplierProposalRefFourn=Ref. proveïdor
 SupplierProposalDate=Data de lliurament
-SupplierProposalRefFournNotice=Abans de tancar-ho com a "Acceptat", pensa en captar les referències del proveïdor.
+SupplierProposalRefFournNotice=Abans de tancar-ho com a "Acceptat", penseu a captar les referències dels proveïdors.
 ConfirmValidateAsk=Estàs segur que vols validar aquest preu de sol·licitud sota el nom <b>%s</b>?
 DeleteAsk=Elimina la petició
 ValidateAsk=Validar petició
@@ -48,7 +49,7 @@ DefaultModelSupplierProposalToBill=Model per defecte en tancar una petició de p
 DefaultModelSupplierProposalClosed=Model per defecte en tancar una petició de preu (rebutjada)
 ListOfSupplierProposals=Llista de sol·licituds de pressupostos a proveïdor
 ListSupplierProposalsAssociatedProject=Llista de pressupostos de proveïdor associats al projecte
-SupplierProposalsToClose=Pressupostos de proveïdor per tancar
+SupplierProposalsToClose=Pressupostos de proveïdor per a tancar
 SupplierProposalsToProcess=Pressupostos de proveïdor a processar
 LastSupplierProposals=Últims %s preus de sol·licitud
 AllPriceRequests=Totes les peticions
diff --git a/htdocs/langs/ca_ES/ticket.lang b/htdocs/langs/ca_ES/ticket.lang
index ee5f34745e3..8e111a62ae9 100644
--- a/htdocs/langs/ca_ES/ticket.lang
+++ b/htdocs/langs/ca_ES/ticket.lang
@@ -58,7 +58,6 @@ OriginEmail=Origen de correu electrònic
 Notify_TICKET_SENTBYMAIL=Envia el missatge del tiquet per correu electrònic
 
 # Status
-NotRead=No llegit
 Read=Llegit
 Assigned=Assignat
 InProgress=En progrés
@@ -105,9 +104,9 @@ TicketPublicInterfaceTopicHelp=Aquest text apareixerà com el títol de la inter
 TicketPublicInterfaceTextHelpMessageLabelAdmin=Text d'ajuda a l'entrada del missatge
 TicketPublicInterfaceTextHelpMessageHelpAdmin=Aquest text apareixerà a sobre de l'àrea d'entrada de missatges per a l'usuari.
 ExtraFieldsTicket=Extra atributs
-TicketCkEditorEmailNotActivated=L'editor HTML no està activat. Poseu FCKEDITOR_ENABLE_MAIL contingut a 1 per obtenir-lo.
+TicketCkEditorEmailNotActivated=L'editor HTML no està activat. Poseu el contingut de FCKEDITOR_ENABLE_MAIL a 1 per a obtenir-lo.
 TicketsDisableEmail=No enviïs missatges de correu electrònic per a la creació de bitllets o la gravació de missatges
-TicketsDisableEmailHelp=De manera predeterminada, s'envien correus electrònics quan es creen nous tiquets o missatges. Activeu aquesta opció per desactivar totes les *all* notificacions per correu electrònic
+TicketsDisableEmailHelp=De manera predeterminada, s'envien correus electrònics quan es creen nous tiquets o missatges. Activeu aquesta opció per a desactivar *totes* les notificacions per correu electrònic
 TicketsLogEnableEmail=Activa el 'log' (registre d'activitat) per correu electrònic
 TicketsLogEnableEmailHelp=En cada canvi, s'enviarà un correu ** a cada contacte ** associat al tiquet.
 TicketParams=Paràmetres
@@ -124,12 +123,13 @@ TicketsActivatePublicInterfaceHelp=La interfície pública permet qualsevol visi
 TicketsAutoAssignTicket=Assigna automàticament l'usuari que va crear el tiquet
 TicketsAutoAssignTicketHelp=Quan es crea un tiquet, l'usuari pot assignar-se automàticament al tiquet.
 TicketNumberingModules=Mòdul de numeració de tiquets
+TicketsModelModule=Plantilles de document per a tiquets
 TicketNotifyTiersAtCreation=Notifica la creació de tercers
 TicketsDisableCustomerEmail=Desactiveu sempre els correus electrònics quan es crea un tiquet des de la interfície pública
-TicketsPublicNotificationNewMessage=Enviar correu(s) electonic(s) quan s'afegeix un nou missatge
-TicketsPublicNotificationNewMessageHelp=Enviar correu(s) electrònic(s) quan un nou missatge s'afegeix des d'una interfície pública (cap a l'usuari assignat o la notificació del correu electrònic cap a (actualitzar) i/o les notificacions del correu electrònic cap a)
+TicketsPublicNotificationNewMessage=Envia correus electrònics quan s'afegeixi un missatge nou
+TicketsPublicNotificationNewMessageHelp=Envia correus electrònics quan s'afegeixi un missatge nou des de la interfície pública (a l'usuari assignat o al correu electrònic de notificacions a (actualitzar) i/o al correu electrònic de notificacions)
 TicketPublicNotificationNewMessageDefaultEmail=Notificar correu electrònic cap a (actualitzar)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Enviar un correu nou missatge de notificació cap a aquesta adreça si el tiquet no te usuari assignat o l'usuari no te correu electrònic.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Envia notificacions de missatges nous per correu electrònic a aquesta adreça si el tiquet no té assignat cap usuari o l’usuari no en té cap.
 #
 # Index & list page
 #
@@ -155,7 +155,7 @@ CreateTicket=Crea un tiquet
 EditTicket=Editar el tiquet
 TicketsManagement=Gestió de tiquets
 CreatedBy=Creat per
-NewTicket=Nou tiquet
+NewTicket=Tiquet nou
 SubjectAnswerToTicket=Resposta de tiquet
 TicketTypeRequest=Tipus de sol·licitud
 TicketCategory=Grup
@@ -192,7 +192,7 @@ TicketDurationAuto=Durada calculada
 TicketDurationAutoInfos=Durada calculada automàticament a partir de la intervenció relacionada
 TicketUpdated=Tiquet actualitzat
 SendMessageByEmail=Envia un missatge per correu electrònic
-TicketNewMessage=Mou missatge
+TicketNewMessage=Missatge nou
 ErrorMailRecipientIsEmptyForSendTicketMessage=El destinatari està buit. Email no enviat
 TicketGoIntoContactTab=Aneu a la pestanya "Contactes" per seleccionar-los
 TicketMessageMailIntro=Introducció
@@ -225,13 +225,12 @@ UnableToCreateInterIfNoSocid=No es pot crear una intervenció quan no s'hagi def
 TicketMailExchanges=Intercanvis de correus
 TicketInitialMessageModified=Missatge inicial modificat
 TicketMessageSuccesfullyUpdated=Missatge actualitzat amb èxit
-TicketChangeStatus=Canvi de estatus
-TicketConfirmChangeStatus=Confirmar el canvi d'estatus : %s ?
-TicketLogStatusChanged=Estatus canviat : %s a %s
+TicketChangeStatus=Canvia l'estat
+TicketConfirmChangeStatus=Confirmeu el canvi d'estat: %s?
+TicketLogStatusChanged=Estat canviat: %s a %s
 TicketNotNotifyTiersAtCreate=No es notifica a l'empresa a crear
 Unread=No llegit
 TicketNotCreatedFromPublicInterface=No disponible El tiquet no s'ha creat des de la interfície pública.
-PublicInterfaceNotEnabled=La interfície pública no s'ha activat
 ErrorTicketRefRequired=El nom de referència del tiquet és obligatori
 
 #
@@ -242,7 +241,7 @@ NoLogForThisTicket=Encara no hi ha 'log' per aquest tiquet
 TicketLogAssignedTo=Tiquet %s assignat a %s
 TicketLogPropertyChanged=Tiquet %s modificat: classificació de %s a %s
 TicketLogClosedBy=Tiquet %s tancat per %s
-TicketLogReopen=El tiquet %s s'ha re-obert
+TicketLogReopen=El tiquet %s s'ha reobert
 
 #
 # Public pages
@@ -252,14 +251,14 @@ ShowListTicketWithTrackId=Mostra la llista d'entrades a partir de l'identificado
 ShowTicketWithTrackId=Mostra tiquets de l'identificador de traça 
 TicketPublicDesc=Podeu crear un tiquet d'assistència o consultar des d'una identificació (ID) existent.
 YourTicketSuccessfullySaved=S'ha desat el tiquet amb èxit!
-MesgInfosPublicTicketCreatedWithTrackId=S'ha creat un nou tiquet amb l'ID %s i la ref. %s.
+MesgInfosPublicTicketCreatedWithTrackId=S'ha creat un tiquet nou amb l'ID %s i la ref. %s.
 PleaseRememberThisId=Guardeu el número de traça que us podríem demanar més tard.
 TicketNewEmailSubject=Confirmació de la creació de tiquet - Ref %s (ID de l’entrada pública %s)
-TicketNewEmailSubjectCustomer=Nou tiquet de suport
+TicketNewEmailSubjectCustomer=Tiquet de suport nou
 TicketNewEmailBody=Aquest és un correu electrònic automàtic per confirmar que heu registrat un nou tiquet.
 TicketNewEmailBodyCustomer=Aquest és un correu electrònic automàtic per confirmar que un nou tiquet acaba de ser creat al vostre compte.
 TicketNewEmailBodyInfosTicket=Informació per al seguiment del tiquet
-TicketNewEmailBodyInfosTrackId=Traça de tiquet numero: %s
+TicketNewEmailBodyInfosTrackId=Número de seguiment de tiquet: %s
 TicketNewEmailBodyInfosTrackUrl=Podeu veure el progrés del tiquet fent clic a l'enllaç de dalt.
 TicketNewEmailBodyInfosTrackUrlCustomer=Podeu veure el progrés del tiquet a la interfície específica fent clic al següent enllaç
 TicketEmailPleaseDoNotReplyToThisEmail=No respongueu directament a aquest correu electrònic. Utilitzeu l'enllaç per respondre des de la mateixa interfície.
@@ -273,13 +272,13 @@ Subject=Assumpte
 ViewTicket=Vista del tiquet
 ViewMyTicketList=Veure la meva llista de tiquets
 ErrorEmailMustExistToCreateTicket=Error: adreça de correu electrònic no trobada a la nostra base de dades
-TicketNewEmailSubjectAdmin=S'ha creat un nou tiquet: Ref %s (ID d'entrada pública %s)
+TicketNewEmailSubjectAdmin=S'ha creat un tiquet nou - Ref %s (ID de tiquet públic %s)
 TicketNewEmailBodyAdmin=<p>S'ha creat una entrada amb ID #%s, veure informació :</p>
 SeeThisTicketIntomanagementInterface=Consulteu el tiquet a la interfície de gestió
 TicketPublicInterfaceForbidden=La interfície pública de les entrades no estava habilitada
 ErrorEmailOrTrackingInvalid=Valor incorrecte per a identificació de seguiment o correu electrònic
 OldUser=Usuari antic
-NewUser=Nou usuari
+NewUser=Usuari nou
 NumberOfTicketsByMonth=Nombre d’entrades mensuals
 NbOfTickets=Nombre d’entrades
 # notifications
diff --git a/htdocs/langs/ca_ES/trips.lang b/htdocs/langs/ca_ES/trips.lang
index 04c987be86f..f8a508426a3 100644
--- a/htdocs/langs/ca_ES/trips.lang
+++ b/htdocs/langs/ca_ES/trips.lang
@@ -6,20 +6,20 @@ TripsAndExpensesStatistics=Estadístiques de l'informe de despeses
 TripCard=Informe de despesa de targeta
 AddTrip=Crear informe de despeses
 ListOfTrips=Llistat de informes de despeses
-ListOfFees=Llistat notes de honoraris
+ListOfFees=Llista de taxes
 TypeFees=Tipus de despeses
 ShowTrip=Mostra l'informe de despeses
-NewTrip=Nou informe de despeses
+NewTrip=Informe de despeses nou
 LastExpenseReports=Últims %s informes de despeses 
 AllExpenseReports=Tots els informes de despeses
 CompanyVisited=Empresa/organització visitada
 FeesKilometersOrAmout=Import o quilòmetres
-DeleteTrip=Eliminar informe de despeses
+DeleteTrip=Suprimeix l'informe de despeses
 ConfirmDeleteTrip=Estàs segur que vols eliminar aquest informe de despeses?
 ListTripsAndExpenses=Llistat d'informes de despeses
 ListToApprove=Pendent d'aprovació
 ExpensesArea=Àrea d'informes de despeses
-ClassifyRefunded=Classificar 'Retornat'
+ClassifyRefunded=Classifica "Retornat"
 ExpenseReportWaitingForApproval=S'ha generat un nou informe de vendes per aprovació
 ExpenseReportWaitingForApprovalMessage=S'ha enviat un nou informe de despeses i està pendent d'aprovació. <br> - Usuari: %s <br> - Període: %s <br> Cliqueu aquí per validar: %s
 ExpenseReportWaitingForReApproval=S'ha generat un informe de despeses per a re-aprovació
@@ -27,16 +27,16 @@ ExpenseReportWaitingForReApprovalMessage=S'ha enviat un informe de despeses i es
 ExpenseReportApproved=S'ha aprovat un informe de despeses
 ExpenseReportApprovedMessage=S'ha aprovat l'informe de despeses %s. <br> - Usuari: %s <br> - Aprovat per: %s <br> Feu clic aquí per veure l'informe de despeses: %s
 ExpenseReportRefused=S'ha rebutjat un informe de despeses
-ExpenseReportRefusedMessage=El informe de despeses %s s'ha denegat. <br> - Usuari: %s <br> - Rebutjada per: %s <br> - Motiu de denegació: %s <br> Cliqueu aquí per veure l'informe de despeses: %s
+ExpenseReportRefusedMessage=L'informe de despeses %s s'ha denegat. <br> - Usuari: %s <br> - Rebutjat per: %s <br> - Motiu de denegació: %s <br> Cliqueu aquí per a veure l'informe de despeses: %s
 ExpenseReportCanceled=S'ha cancel·lat un informe de despeses
 ExpenseReportCanceledMessage=L'informe de despeses %s s'ha cancel·lat. <br> - Usuari: %s <br> - Cancel·lat per: %s <br> - Motiu de cancel·lació: %s <br> Cliqueu aquí per veure l'informe de despeses: %s
 ExpenseReportPaid=S'ha pagat un informe de despeses
-ExpenseReportPaidMessage=El informe de despeses %s s'ha pagat. <br> - Usuari: %s <br> - Pagat per: %s <br> Feu clic aquí per veure l'informe de despeses: %s
+ExpenseReportPaidMessage=L'informe de despeses %s s'ha pagat. <br> - Usuari: %s <br> - Pagat per: %s <br> Feu clic aquí per a veure l'informe de despeses: %s
 TripId=Id d'informe de despeses
 AnyOtherInThisListCanValidate=Persona a informar per a validar
 TripSociete=Informació de l'empresa
 TripNDF=Informacions de l'informe de despeses
-PDFStandardExpenseReports=Plantilla estàndard per generar un document PDF per l'informe de despeses
+PDFStandardExpenseReports=Plantilla estàndard per a generar un document PDF per a l'informe de despeses
 ExpenseReportLine=Línia de l'informe de despeses
 TF_OTHER=Altres
 TF_TRIP=Transport
@@ -73,7 +73,7 @@ EX_PAR_VP=PV d'aparcament
 EX_CAM_VP=PV de manteniment i reparació
 DefaultCategoryCar=Mode de transport per defecte
 DefaultRangeNumber=Número de rang per defecte
-UploadANewFileNow=Carrega ara un nou document
+UploadANewFileNow=Carrega ara un document nou
 Error_EXPENSEREPORT_ADDON_NotDefined=Error, la regla per a la numeració d'informes de despeses no es va definir a la configuració del mòdul "Informe de despeses"
 ErrorDoubleDeclaration=Has declarat un altre informe de despeses en un altre rang de dates semblant
 AucuneLigne=Encara no hi ha informe de despeses declarat
@@ -88,32 +88,32 @@ MOTIF_REFUS=Raó
 MOTIF_CANCEL=Raó
 DATE_REFUS=Data de denegació
 DATE_SAVE=Data de validació
-DATE_CANCEL=Data de cancelació
+DATE_CANCEL=Data de cancel·lació
 DATE_PAIEMENT=Data de pagament
 BROUILLONNER=Reobrir
 ExpenseReportRef=Ref. de l'informe de despeses
 ValidateAndSubmit=Validar i sotmetre a aprovació
 ValidatedWaitingApproval=Validat (pendent d'aprovació)
-NOT_AUTHOR=No ets l'autor d'aquest informe de despeses. L'operació s'ha cancelat.
+NOT_AUTHOR=No sou l’autor d’aquest informe de despeses. Operació cancel·lada.
 ConfirmRefuseTrip=Estàs segur que vols denegar aquest informe de despeses?
 ValideTrip=Aprova l'informe de despeses
 ConfirmValideTrip=Estàs segur que vols aprovar aquest informe de despeses?
 PaidTrip=Pagar un informe de despeses
-ConfirmPaidTrip=Estàs segur que vols canviar l'estatus d'aquest informe de despeses a "Pagat"?
+ConfirmPaidTrip=Esteu segur que voleu canviar l'estat d'aquest informe de despeses a "Pagat"?
 ConfirmCancelTrip=Estàs segur que vols cancel·lar aquest informe de despeses?
 BrouillonnerTrip=Tornar l'informe de despeses a l'estat "Esborrany"
-ConfirmBrouillonnerTrip=Estàs segur que vols moure aquest informe de despeses al estatus de "Esborrany"?
+ConfirmBrouillonnerTrip=Esteu segur que voleu traslladar aquest informe de despeses a l'estat "Esborrany"?
 SaveTrip=Valida l'informe de despeses
 ConfirmSaveTrip=Estàs segur que vols validar aquest informe de despeses?
-NoTripsToExportCSV=No hi ha informe de despeses per exportar en aquest període
+NoTripsToExportCSV=No hi ha cap informe de despeses per a exportar en aquest període.
 ExpenseReportPayment=Informe de despeses pagades
-ExpenseReportsToApprove=Informes de despeses per aprovar
+ExpenseReportsToApprove=Informes de despeses per a aprovar
 ExpenseReportsToPay=Informes de despeses a pagar
 ConfirmCloneExpenseReport=Estàs segur de voler clonar aquest informe de despeses ?
 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=Podeu crear o actualitzar les regles del càlcul. Aquesta part s'utilitzarà quan l'usuari crei un nou informe de despeses
+ExpenseReportRulesDesc=Podeu crear o actualitzar qualsevol regla de càlcul. Aquesta part s'utilitzarà quan l'usuari crei un informe de despeses nou
 expenseReportOffset=Decàleg
 expenseReportCoef=Coeficient
 expenseReportTotalForFive=Exemple amb <u>d</u> = 5
@@ -124,13 +124,13 @@ expenseReportCatDisabled=Categoria deshabilitada: consulteu el diccionari c_exp_
 expenseReportRangeDisabled=S'ha desactivat el rang: consulteu el diccionari c_exp_tax_range
 expenseReportPrintExample=offset + (d x coef) = %s
 ExpenseReportApplyTo=Aplicar a
-ExpenseReportDomain=Domini al que aplicar
+ExpenseReportDomain=Domini a aplicar
 ExpenseReportLimitOn=Limitar a
 ExpenseReportDateStart=Data inici
 ExpenseReportDateEnd=Data fi
 ExpenseReportLimitAmount=Import límit
 ExpenseReportRestrictive=Restrictiu
-AllExpenseReport=Tot tipus d'informe de despeses
+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
diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang
index 8ec96cdf243..0d7ea59bf46 100644
--- a/htdocs/langs/ca_ES/users.lang
+++ b/htdocs/langs/ca_ES/users.lang
@@ -6,7 +6,7 @@ Permission=Permís
 Permissions=Permisos
 EditPassword=Canviar contrasenya
 SendNewPassword=Enviar una contrasenya nova
-SendNewPasswordLink=Envia enllaç per reiniciar la contrasenya
+SendNewPasswordLink=Envia restabliment de contrasenya
 ReinitPassword=Generar una contrasenya nova
 PasswordChangedTo=Contrasenya modificada en: %s
 SubjectNewPassword=La teva nova paraula de pas per a %s
@@ -26,7 +26,7 @@ ConfirmDeleteGroup=Vols eliminar el grup <b>%s</b>?
 ConfirmEnableUser=Vols habilitar l'usuari <b>%s</b>?
 ConfirmReinitPassword=Vols generar una nova contrasenya per a l'usuari <b>%s</b>?
 ConfirmSendNewPassword=Vols generar i enviar una nova contrasenya per a l'usuari <b>%s</b>?
-NewUser=Nou usuari
+NewUser=Usuari nou
 CreateUser=Crear usuari
 LoginNotDefined=L'usuari no està definit
 NameNotDefined=El nom no està definit
@@ -40,14 +40,14 @@ DolibarrUsers=Usuaris Dolibarr
 LastName=Cognoms
 FirstName=Nom
 ListOfGroups=Llistat de grups
-NewGroup=Nou grup
+NewGroup=Grup nou
 CreateGroup=Crear el grup
 RemoveFromGroup=Eliminar del grup
 PasswordChangedAndSentTo=Contrasenya canviada i enviada a <b>%s</b>.
 PasswordChangeRequest=Sol·licitud per canviar la contrasenya de <b>%s</b>
 PasswordChangeRequestSent=Petició de canvi de contrasenya per a <b>%s</b> enviada a <b>%s</b>.
-IfLoginExistPasswordRequestSent=Si aquest inici de sessió és un compte vàlid, s'ha enviat un correu electrònic per restablir la contrasenya.
-IfEmailExistPasswordRequestSent=Si aquest correu electrònic és un compte vàlid, s'ha enviat un correu electrònic per restablir la contrasenya.
+IfLoginExistPasswordRequestSent=Si aquest inici de sessió és un compte vàlid, s'ha enviat un correu electrònic per a restablir la contrasenya.
+IfEmailExistPasswordRequestSent=Si aquest correu electrònic és un compte vàlid, s'ha enviat un correu electrònic per a restablir la contrasenya.
 ConfirmPasswordReset=Confirma la restauració de la contrasenya
 MenuUsersAndGroups=Usuaris i grups
 LastGroupsCreated=Últims %s grups creats
@@ -81,7 +81,7 @@ UserWillBeExternalUser=L'usuari creat serà un usuari extern (ja que està lliga
 IdPhoneCaller=ID trucant (telèfon)
 NewUserCreated=usuari %s  creat
 NewUserPassword=Contrasenya canviada per a %s
-NewPasswordValidated=La vostra nova contrasenya s’ha validat i s’ha d’utilitzar ara per iniciar la sessió.
+NewPasswordValidated=La vostra contrasenya nova s'ha validat i s'ha d'utilitzar ara per a iniciar la sessió.
 EventUserModified=Usuari %s modificat
 UserDisabled=Usuari %s deshabilitat
 UserEnabled=Usuari %s activat
@@ -92,12 +92,12 @@ GroupDeleted=Grup %s eliminat
 ConfirmCreateContact=Vols crear un compte de Dolibarr per a aquest contacte?
 ConfirmCreateLogin=Vols crear un compte de Dolibarr per a aquest soci?
 ConfirmCreateThirdParty=Vols crear un tercer per a aquest soci?
-LoginToCreate=Login a crear
+LoginToCreate=Nom d'usuari a crear
 NameToCreate=Nom del tercer a crear
 YourRole=Els seus rols
 YourQuotaOfUsersIsReached=Ha arribat a la seva quota d'usuaris actius!
-NbOfUsers=Nº d'usuaris
-NbOfPermissions=Nº de permisos
+NbOfUsers=Nombre d'usuaris
+NbOfPermissions=Nombre de permisos
 DontDowngradeSuperAdmin=Només un superadmin pot degradar un superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Vista jeràrquica
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index 7adb65909be..2e035ce7bf6 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -4,7 +4,7 @@ WebsiteSetupDesc=Creeu aquí els llocs web que voleu utilitzar. A continuació,
 DeleteWebsite=Elimina la pàgina web
 ConfirmDeleteWebsite=Esteu segur que voleu suprimir aquest lloc web? Totes les seves pàgines i contingut també se suprimiran. Els fitxers penjats (com al directori de suports, el mòdul ECM, ...) romandran.
 WEBSITE_TYPE_CONTAINER=Tipus de pàgina/contenidor
-WEBSITE_PAGE_EXAMPLE=Pàgina web per utilitzar com a exemple
+WEBSITE_PAGE_EXAMPLE=Pàgina web per a utilitzar com a exemple
 WEBSITE_PAGENAME=Nom/alies de pàgina
 WEBSITE_ALIASALT=Noms de pàgina alternatius / àlies
 WEBSITE_ALIASALTDesc=Utilitzeu aquí la llista d'altres noms / àlies, per la qual cosa també es pot accedir a la pàgina amb altres noms / àlies (per exemple, el nom antic després de canviar el nom de l'àlies per mantenir el vincle d'enllaç a l'antic vincle / nom de treball). La sintaxi és: <br> alternativament1, alternativament2, ...
@@ -30,7 +30,6 @@ EditInLine=Editar en línia
 AddWebsite=Afegir lloc web
 Webpage=Pàgina/contenidor web
 AddPage=Afegeix pàgina/contenidor
-HomePage=Pàgina d'inici
 PageContainer=Pàgina
 PreviewOfSiteNotYetAvailable=Vista prèvia del seu lloc web <strong>%s</strong> encara no està disponible. Primer ha de '<strong>Importar plantilla web</strong>' o sols '<strong>Afegir pàgina/contenidor</strong>'.
 RequestedPageHasNoContentYet=La pàgina sol·licitada amb l'identificador %s encara no té contingut, o el fitxer de memòria cau .tpl.php s'ha eliminat. Edita el contingut de la pàgina per solucionar-ho.
@@ -52,7 +51,7 @@ ReadPerm=Llegit
 WritePerm=Escriu
 TestDeployOnWeb=Prova / implantació a la web
 PreviewSiteServedByWebServer=<LI>Vista prèvia %s en una nova pestanya.</LI><br><br>El %s serà servit per un servidor web extern (com ara Apache, Nginx, IIS). Heu d'instal·lar i configurar aquest servidor abans d'apuntar al directori:<br><strong>%s</strong><br> URL servit per un servidor extern:<br><strong>%s</strong><br>
-PreviewSiteServedByDolibarr=<u> Previsualitza  %s en una nova pestanya. </li> <br> <br> El servidor %s serà servit pel servidor Dolibarr d'aquesta manera no es necessita instal·la cap servidor web addicional (com ara Apache, Nginx, IIS).<br>L'inconvenient és que l'URL de les pàgines no son amigables i començen per la ruta del vostre Dolibarr. <br>URL servit per Dolibarr:<br><strong> %s </strong> <br> <br> Per utilitzar el vostre propi servidor web extern per a servir a aquest lloc web, creeu un amfitrió ('host') virtual al vostre servidor web que apunti al directori<br><strong> %s </strong><br>, llavors introduïu el nom d'aquest servidor virtual i feu clic a l'altre botó de vista prèvia (botó de 'preview').
+PreviewSiteServedByDolibarr=<u> Previsualitza %s en una nova pestanya. </u><br> <br> El %s serà servit pel servidor Dolibarr així que no cal instal·lar cap servidor web addicional (com ara Apache, Nginx, IIS).<br>L'inconvenient és que l'URL de les pàgines no són amigables i comencen per la ruta del vostre Dolibarr. <br>URL servit per Dolibarr:<br><strong> %s </strong> <br> <br> Per a utilitzar el vostre propi servidor web extern per a servir a aquest lloc web, creeu un amfitrió virtual al vostre servidor web que apunti al directori<br><strong> %s </strong><br>, llavors introduïu el nom d'aquest servidor virtual i feu clic a l'altre botó de vista prèvia.
 VirtualHostUrlNotDefined=No s'ha definit la URL de l'amfitrió virtual que serveix el servidor web extern
 NoPageYet=Encara sense pàgines
 YouCanCreatePageOrImportTemplate=Podeu crear una pàgina nova o importar una plantilla completa del lloc web
@@ -87,7 +86,7 @@ MyContainerTitle=Títol del meu lloc web
 AnotherContainer=Així s’inclou contingut d’una altra pàgina / contenidor (pot ser que tingueu un error aquí si activeu el codi dinàmic perquè pot no existir el subconjunt incrustat)
 SorryWebsiteIsCurrentlyOffLine=Ho sentim, actualment aquest lloc web està fora de línia. Per favor com a més endavant ...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Activa la taula del compte del lloc web
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activeu la taula per emmagatzemar comptes del lloc web (login/contrasenya) per a cada lloc web de tercers
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activeu la taula per a emmagatzemar comptes de lloc web (nom d'usuari / contrasenya) per a cada lloc web / tercer
 YouMustDefineTheHomePage=Primer heu de definir la pàgina d'inici predeterminada
 OnlyEditionOfSourceForGrabbedContentFuture=Avís: la creació d'una pàgina web mitjançant la importació d'una pàgina web externa es reserva per a usuaris experimentats. Segons la complexitat de la pàgina d'origen, el resultat de la importació pot diferir de l'original. També si la pàgina font utilitza estils CSS comuns o Javascript en conflicte, pot trencar l'aspecte o les funcions de l'editor del lloc web quan es treballi en aquesta pàgina. Aquest mètode és una manera més ràpida de crear una pàgina, però es recomana crear la vostra pàgina nova des de zero o des d’una plantilla de pàgina suggerida. <br> Tingueu en compte també que l'editor en línia pot no funcionar correctament quan s'utilitza en una pàgina creada a partir d'importar una externa.
 OnlyEditionOfSourceForGrabbedContent=Només l'edició de codi HTML és possible quan el contingut s'ha capturat d'un lloc extern
@@ -101,7 +100,7 @@ EmptyPage=Pàgina buida
 ExternalURLMustStartWithHttp=L'URL externa ha de començar amb http:// o https://
 ZipOfWebsitePackageToImport=Carregueu el fitxer Zip del paquet de plantilles del lloc web
 ZipOfWebsitePackageToLoad=o trieu un paquet de plantilles de lloc web incrustat disponible
-ShowSubcontainers=Inclou contingut dinàmic
+ShowSubcontainers=Mostra contingut dinàmic
 InternalURLOfPage=URL interna de la pàgina
 ThisPageIsTranslationOf=Aquesta pàgina/contenidor és una traducció de
 ThisPageHasTranslationPages=Aquesta pàgina/contenidor té traducció
@@ -115,7 +114,7 @@ DeleteAlsoMedias=Voleu suprimir també tots els fitxers de mitjans específics d
 MyWebsitePages=Les meves pàgines web
 SearchReplaceInto=Cercar | Substituïu-lo a
 ReplaceString=Cadena nova
-CSSContentTooltipHelp=Introduïu aquí contingut CSS. Per evitar qualsevol conflicte amb el CSS de l’aplicació, assegureu-vos que preposeu tota declaració amb la classe .bodywebsite. Per exemple: <br><br> #mycssselector, input.myclass: hover {...} <br> ha de ser <br> .bodywebsite #mycssselector, .bodywebsite input.myclass: hover {...} <br><br> Nota: Si teniu un fitxer gran sense aquest prefix, podeu fer servir 'lessc' per convertir-lo per afegir el prefix .bodywebs site arreu.
+CSSContentTooltipHelp=Introduïu aquí contingut CSS. Per a evitar qualsevol conflicte amb el CSS de l’aplicació, assegureu-vos que preposeu tota declaració amb la classe .bodywebsite. Per exemple: <br><br> #mycssselector, input.myclass: hover {...} <br> ha de ser <br> .bodywebsite #mycssselector, .bodywebsite input.myclass: hover {...} <br><br> Nota: Si teniu un fitxer gran sense aquest prefix, podeu fer servir 'lessc' per a convertir-lo per a afegir el prefix .bodywebsite arreu.
 LinkAndScriptsHereAreNotLoadedInEditor=Avís: aquest contingut només es produeix quan s'accedeix al lloc des d'un servidor. No s'utilitza en mode Edit, de manera que si necessiteu carregar fitxers Javascript també en mode d'edició, només heu d'afegir la vostra etiqueta 'script src = ...' a la pàgina.
 Dynamiccontent=Exemple d’una pàgina amb contingut dinàmic
 ImportSite=Importa la plantilla del lloc web
@@ -137,3 +136,4 @@ RSSFeedDesc=Podeu obtenir un feed RSS dels darrers articles amb el tipus "blogpo
 PagesRegenerated=%s pàgina (es) / contenidor (s) regenerada
 RegenerateWebsiteContent=Regenera els fitxers de memòria cau del lloc web
 AllowedInFrames=Es permet en marcs
+DefineListOfAltLanguagesInWebsiteProperties=Definiu la llista de tots els idiomes disponibles a les propietats del lloc web.
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index 6d70774d3ac..d41189fe88b 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -3,8 +3,8 @@ CustomersStandingOrdersArea=Cobraments per ordres de domiciliació bancària
 SuppliersStandingOrdersArea=Pagaments per transferència bancària
 StandingOrdersPayment=Ordres de cobrament per domiciliació
 StandingOrderPayment=Ordre de cobrament per domiciliació
-NewStandingOrder=Nova ordre de domiciliació bancària
-NewPaymentByBankTransfer=Nou pagament mitjançant transferència bancària
+NewStandingOrder=Domiciliació nova
+NewPaymentByBankTransfer=Pagament nou per transferència bancària
 StandingOrderToProcess=A processar
 PaymentByBankTransferReceipts=Ordres de transferència bancària
 PaymentByBankTransferLines=Línies d'ordres de transferència bancària
@@ -23,9 +23,9 @@ RequestStandingOrderTreated=Peticions processades d'ordres de cobrament per domi
 RequestPaymentsByBankTransferToTreat=Peticions de transferència bancària a processar
 RequestPaymentsByBankTransferTreated=Peticions de transferència bancària processades
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Encara no és possible. L'estat de la domiciliació ter que ser 'abonada' abans de poder realitzar devolucions a les seves línies
-NbOfInvoiceToWithdraw=Nº de factures de client qualificades que esperen una ordre de domiciliació
+NbOfInvoiceToWithdraw=Nombre de factures de client qualificades que esperen una ordre de domiciliació
 NbOfInvoiceToWithdrawWithInfo=Número de factures a client en espera de domiciliació per a clients que tenen el número de compte definida
-NbOfInvoiceToPayByBankTransfer=Nº de factures de proveïdors qualificats que esperen un pagament per transferència bancària
+NbOfInvoiceToPayByBankTransfer=Nombre de factures de proveïdors qualificades que esperen un pagament per transferència
 SupplierInvoiceWaitingWithdraw=Factura de venedor en espera de pagament mitjançant transferència bancària
 InvoiceWaitingWithdraw=Factura esperant per domiciliació bancària
 InvoiceWaitingPaymentByBankTransfer=Factura en espera de transferència bancària
@@ -39,12 +39,13 @@ WithdrawStatistics=Estadístiques del pagament mitjançant domiciliació bancàr
 CreditTransferStatistics=Estadístiques de transferència bancària
 Rejects=Devolucions
 LastWithdrawalReceipt=Últims %s rebuts domiciliats
-MakeWithdrawRequest=Fer una petició de pagament per domiciliació bancària
-MakeBankTransferOrder=Fes una petició de transferència bancària
+MakeWithdrawRequest=Fes una sol·licitud de domiciliació
+MakeBankTransferOrder=Fes una sol·licitud de transferència
 WithdrawRequestsDone=%s domiciliacions registrades
+BankTransferRequestsDone=S'han registrat %s sol·licituds de transferència
 ThirdPartyBankCode=Codi bancari de tercers
 NoInvoiceCouldBeWithdrawed=Cap factura s'ha carregat amb èxit. Comproveu que els tercers de les factures tenen un IBAN vàlid i que IBAN té un RUM (Referència de mandat exclusiva) amb mode <strong>%s</strong>.
-ClassCredited=Classificar com "Abonada"
+ClassCredited=Classifica com "Abonada"
 ClassCreditedConfirm=Esteu segur de voler classificar aquesta domiciliació com abonada al seu compte bancari?
 TransData=Data enviament
 TransMetod=Mètode enviament
@@ -92,21 +93,21 @@ WithBankUsingBANBIC=Per als comptes bancaris que utilitzen el codi BAN/BIC/SWIFT
 BankToReceiveWithdraw=Recepció del compte bancari
 BankToPayCreditTransfer=Compte bancari utilitzat com a font de pagaments
 CreditDate=Abonada el
-WithdrawalFileNotCapable=No és possible generar el fitxer bancari de domiciliació pel país %s (El país no esta suportat)
+WithdrawalFileNotCapable=No es pot generar el fitxer de rebut de domiciliació del vostre país %s (El vostre país no és compatible)
 ShowWithdraw=Mostra l'ordre de domiciliació
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tanmateix, si la factura té com a mínim una ordre de pagament de domiciliació bancària que encara no ha estat processada, no es definirà com a pagament per permetre la gestió prèvia de la retirada.
-DoStandingOrdersBeforePayments=Aquesta pestanya et permet sol·licitar una ordre de domiciliació. Un cop fet, ves al menú Banc->Cobrament per domiciliació per generar i gestionar l’ordre de domiciliació. Quan es tanqui l’ordre de domiciliació, es registrarà automàticament el cobrament de les factures i es tancaran les factures si no queda cobrament pendent.
-DoCreditTransferBeforePayments=Aquesta pestanya et permet sol·licitar una ordre de transferència bancària. Un cop fet, ves al menú Banc->Pagament per transferència bancària per generar i gestionar l’ordre de transferència bancària. Quan es tanqui l’ordre de transferència bancària, es registrarà automàticament el pagament de les factures i es tancaran les factures si no queda pagament pendent.
+DoStandingOrdersBeforePayments=Aquesta pestanya us permet sol·licitar una ordre de pagament per domiciliació bancària. Un cop fet això, aneu al menú Banc-> Pagament mitjançant domiciliació bancària per a generar i gestionar l’ordre de domiciliació bancària. Quan es tanca la comanda de domiciliació bancària, el pagament de les factures es registrarà automàticament i es tancaran les factures si la resta de pagament és nul·la.
+DoCreditTransferBeforePayments=Aquesta pestanya et permet sol·licitar una ordre de transferència bancària. Un cop feta, ves al menú Banc->Pagament per transferència bancària per agenerar i gestionar l’ordre de transferència bancària. Quan es tanqui l’ordre de transferència bancària, es registrarà automàticament el pagament de les factures i es tancaran les factures si no queda cap pagament pendent.
 WithdrawalFile=Fitxer de comanda de dèbit
 CreditTransferFile=Fitxer de transferència de crèdit
-SetToStatusSent=Classificar com "Arxiu enviat"
+SetToStatusSent=Estableix l'estat "Fitxer enviat"
 ThisWillAlsoAddPaymentOnInvoice=També registrarà els pagaments en les factures i els classificarà com a "Pagats" si resten a pagar és nul
 StatisticsByLineStatus=Estadístiques per estats de línies
 RUM=UMR
 DateRUM=Data de signatura del mandat
 RUMLong=Referència de mandat única (UMR)
 RUMWillBeGenerated=Si està buit, es generarà una UMR (Referència de mandat únic) una vegada que es guardi la informació del compte bancari.
-WithdrawMode=Modo de domiciliació bancària (FRST o RECUR)
+WithdrawMode=Mode de domiciliació bancària (FRST o RECUR)
 WithdrawRequestAmount=Import de la domiciliació
 BankTransferAmount=Import de la petició de transferència bancària:
 WithdrawRequestErrorNilAmount=No és possible crear una domiciliació sense import
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Data d'execució
 CreateForSepa=Crea un fitxer de domiciliació bancària
-ICS=Identificador de creditor CI
+ICS=Identificador de creditor CI per domiciliació bancària
+ICSTransfer=Identificador de creditor CI per transferència bancària
 END_TO_END=Etiqueta XML "EndToEndId" de SEPA - Id. Única assignada per transacció
 USTRD=Etiqueta XML de la SEPA "no estructurada"
 ADDDAYS=Afegiu dies a la data d'execució
@@ -146,3 +148,5 @@ InfoRejectSubject=Rebut de domiciliació bancària rebutjat
 InfoRejectMessage=Hola,<br><br>el rebut domiciliat de la factura %s relacionada amb la companyia %s, amb un import de %s ha estat rebutjada pel banc.<br><br>--<br>%s
 ModeWarning=No s'ha establert l'opció de treball en real, ens aturarem després d'aquesta simulació
 ErrorCompanyHasDuplicateDefaultBAN=L’empresa amb l’identificador %s té més d’un compte bancari per defecte. No hi ha manera de saber quin utilitzar.
+ErrorICSmissing=Falta ICS al compte bancari %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/ca_ES/workflow.lang b/htdocs/langs/ca_ES/workflow.lang
index 0cbac959060..a673ed97ca0 100644
--- a/htdocs/langs/ca_ES/workflow.lang
+++ b/htdocs/langs/ca_ES/workflow.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - workflow
-WorkflowSetup=Configuració del mòdul workflow
+WorkflowSetup=Configuració del mòdul de flux de treball
 WorkflowDesc=Aquest mòdul ofereix algunes accions automàtiques. Per defecte, el flux de treball està obert (podeu fer les coses en l'ordre que vulgueu), però aquí podeu activar algunes accions automàtiques.
-ThereIsNoWorkflowToModify=No hi ha modificacions disponibles del fluxe de treball amb els mòduls activats.
+ThereIsNoWorkflowToModify=No hi ha disponibles modificacions del flux de treball amb els mòduls activats.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crea automàticament una comanda de client després de signar un pressupost (la nova comanda tindrà el mateix import que el pressupost)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crea automàticament una comanda de client després de signar un pressupost (la comanda nova tindrà el mateix import que el pressupost)
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crea automàticament una factura del client després de signar un pressupost (la nova factura tindrà el mateix import que el pressupost)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear automàticament una factura a client després de validar un contracte
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crea automàticament una factura de client després de tancar una comanda de client (la nova factura tindrà el mateix import que la comanda)
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classifica les recepcions com a "facturades" quan
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Tanca totes les intervencions vinculades quan es tanca un tiquet
 AutomaticCreation=Creació automàtica
 AutomaticClassification=Classificació automàtica
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index cc61eeb86f0..93353881a95 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -16,6 +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
 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,6 +50,7 @@ CountriesExceptMe=Všechny země kromě %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Hlavní účetní účetnictví pro zákazníky, které nejsou definovány v nastavení
 MainAccountForSuppliersNotDefined=Hlavní účty účetnictví pro dodavatele, které nejsou definovány v nastavení
@@ -144,7 +147,7 @@ NotVentilatedinAccount=Neprověřeno v účetním účtu
 XLineSuccessfullyBinded=%s Produkty / služby úspěšně spojené s účtem účetnictví
 XLineFailedToBeBinded=%s produkty / služby nebyly vázány na žádný účetní účet
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Počet prvků pro vazbu zobrazených na stránce (maximální doporučeno: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Začněte třídění stránky "Vazba na pověření" pomocí nejnovějších prvků
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Zahájit třídění na stránce „Prověření hotovo“ od nejnovějších prvků
 
@@ -198,7 +201,8 @@ Docdate=Datum
 Docref=Reference
 LabelAccount=Štítek účtu
 LabelOperation=Operace štítků
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Písmenový kód
 Lettering=Nápis
 Codejournal=Deník
@@ -206,7 +210,8 @@ JournalLabel=Označení časopisu
 NumPiece=počet kusů
 TransactionNumShort=Num. transakce
 AccountingCategory=Personalizované skupiny
-GroupByAccountAccounting=Seskupte účetní účet
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Zde můžete definovat některé skupiny účetních účtů. Budou se používat pro personalizované účetní výkazy.
 ByAccounts=Podle účtů
 ByPredefinedAccountGroups=Podle předdefinovaných skupin
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Platba není spojena s žádným produktem / službou
 OpeningBalance=Počáteční zůstatek
 ShowOpeningBalance=Zobrazit počáteční zůstatek
 HideOpeningBalance=Skrýt počáteční zůstatek
-ShowSubtotalByGroup=Zobrazit mezisoučet podle skupiny
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Skupina účtů
 PcgtypeDesc=Skupina účtů se používá jako předdefinovaná kritéria pro filtrování a seskupování pro některé účetní výkazy. Například „PŘÍJMY“ nebo „VÝDAJE“ se používají jako skupiny pro účetní účty produktů k sestavení výkazu nákladů / výnosů.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Zde si přečtěte seznam výkazů výdajů vázaných (
 DescVentilExpenseReportMore=Pokud nastavíte účetní účet na řádcích výkazu druhů výdajů, aplikace bude schopna provést veškerou vazbu mezi řádky výkazu výdajů a účetním účtem vašeho účtovacího schématu, a to jedním kliknutím tlačítkem <strong> "%s" </strong>. Pokud účet nebyl nastaven na slovník poplatků nebo máte stále nějaké řádky, které nejsou vázány na žádný účet, budete muset provést ruční vazbu z nabídky "<strong> %s </strong>".
 DescVentilDoneExpenseReport=Poraďte se zde seznam v souladu se zprávami výdajů a jejich poplatků účtování účtu
 
+Closure=Annual closure
 DescClosure=Zde se podívejte na počet pohybů za měsíc, kteří nejsou validováni a fiskální roky již otevřeny
 OverviewOfMovementsNotValidated=Krok 1 / Přehled pohybů neověřených. (Nezbytné uzavřít fiskální rok)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Ověřte pohyby
 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
-SelectMonthAndValidate=Vyberte měsíc a potvrďte pohyby
 
 ValidateHistory=Ověřit automaticky
 AutomaticBindingDone=Automatické vázání provedeno
@@ -293,6 +300,7 @@ Accounted=Účtováno v knize
 NotYetAccounted=Zatím nebyl zaznamenán v knize
 ShowTutorial=Zobrazit výuku
 NotReconciled=Nesladěno
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +345,7 @@ Modelcsv_LDCompta10=Export pro LD Compta (v10 a vyšší)
 Modelcsv_openconcerto=Export pro OpenConcerto (Test)
 Modelcsv_configurable=Export CSV konfigurovatelný
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Export pro Sage 50 Švýcarsko
 Modelcsv_winfic=Exportovat Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 4a4c07061e4..e272aa6e780 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Zobrazení
 SetupArea=Nastavení
 UploadNewTemplate=Nahrát novou šablonu(y)
 FormToTestFileUploadForm=Formulář pro testování uploadu souborů (dle nastavení)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Poznámka: Ano má efekt pouze tehdy, pokud je aktivní modul <b>%s</b>
 RemoveLock=Odebrat / přejmenovat soubor <b> %s </b>, pokud existuje, povolit použití nástroje Update / Install.
 RestoreLock=Obnovte soubor <b>%s,</b> pouze s opravněním ke čtení, chcete-li zakázat jakékoliv použití aktualizačního nástroje.
@@ -85,7 +87,6 @@ ShowPreview=Zobrazit náhled
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Náhled není k dispozici
 ThemeCurrentlyActive=Téma aktivní
-CurrentTimeZone=Časové pásmo PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Data jsou uložena a vrácena databázovým serverem, jako kdyby byly uchovávány jako předložený řetězec. Časová zóna je účinná pouze při použití funkce UNIX_TIMESTAMP (která by Dolibarr neměla používat, takže databáze TZ by neměla mít žádný vliv, i když byla změněna po zadání dat).
 Space=Mezera
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Tato oblast poskytuje uživatelských funkcí. Pomocí nabí
 Purge=Očistit
 PurgeAreaDesc=Tato stránka umožňuje odstranit všechny soubory generované nebo uložené v Dolibarr (dočasné soubory nebo všechny soubory v adresáři <b> %s </b>). Použití této funkce není obvykle nutné. Je poskytována jako řešení pro uživatele, jejichž Dolibarr hostuje poskytovatel, který nenabízí oprávnění k odstranění souborů generovaných webovým serverem.
 PurgeDeleteLogFile=Odstranit soubory protokolu, včetně <b> %s </b> definované pro modul Syslog (bez rizika ztráty dat)
-PurgeDeleteTemporaryFiles=Odstraňte všechny dočasné soubory (bez rizika ztráty dat). Poznámka: Odstranění se provede pouze v případě, že dočasný adresář byl vytvořen před 24 hodinami.
-PurgeDeleteTemporaryFilesShort=Odstranit dočasné soubory
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 PurgeDeleteAllFilesInDocumentsDir=Odstranit všechny soubory v adresáři: <b> %s </b>. <br> Tímto odstraníte všechny generované dokumenty související s prvky (subjekty, faktury atd.), Soubory nahrané do modulu ECM, zálohování databází a dočasné soubory.
 PurgeRunNow=Vyčistit nyní
 PurgeNothingToDelete=Žádný adresář nebo soubor k odstranění
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferovaní partneři
 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>
 HelpCenterDesc1=Tato oblast slouží k získání nápovědy a podpory systému Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Příklady s aktuální konfigurací
 ListOfDirectories=Seznam adresářů šablon OpenDocument
 ListOfDirectoriesForModelGenODT=Seznam adresářů obsahující soubory šablon s formátem OpenDocument. <br> <br> Zde vložte úplnou cestu adresářů. <br> Přidejte návrat vozíku mezi adresářem eah. <br> Chcete-li přidat adresář modulu GED, přidejte zde <b> DOL_DATA_ROOT / ecm / yourdirectoryname </b>. <br> <br> Soubory v těchto adresářích musí končit <b> .odt </b> nebo <b> .ods </b>.
 NumberOfModelFilesFound=Počet souborů šablon ODT / ODS nalezených v těchto adresářích
-ExampleOfDirectoriesForModelGen=Příklady syntaxe: <br> c: \\ mydir <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Chcete-li vědět, jak vytvořit své ODT šablony dokumentů před jejich uložením do těchto adresářů, přečtěte si wiki dokumentace:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Pozice Jméno / Příjmení
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametry k zajištění URL
 SecurityTokenIsUnique=Pro každou adresu URL použijte jedinečný bezpečnostní parametr
 EnterRefToBuildUrl=Zadejte odkaz na objekt %s
 GetSecuredUrl=Získejte vypočtenou URL
-ButtonHideUnauthorized=Skrýt tlačítka pro uživatele, kteří nejsou administrátory, pro neoprávněné akce namísto zobrazování šedých vypnutých tlačítek
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Staré Sazba DPH
 NewVATRates=Nová sazba DPH
 PriceBaseTypeToChange=Změňte ceny podle základní referenční hodnoty definované na
@@ -668,7 +670,7 @@ Module54000Desc=Přímý tisk (bez otevírání dokumentů) pomocí rozhraní Cu
 Module55000Name=Anketa, průzkum nebo hlasování
 Module55000Desc=Vytvořte ankety, průzkumy nebo hlasování online (jako Doodle, Studs, RDVz atd ...)
 Module59000Name=Okraje
-Module59000Desc=Modul pro správu marže
+Module59000Desc=Module to follow margins
 Module60000Name=Provize
 Module60000Desc=Modul pro správu provize
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ YouUseBestDriver=Používáte ovladač %s, který je v současné době nejlepš
 YouDoNotUseBestDriver=Používáte ovladač %s, ale doporučuje se ovladač %s.
 NbOfObjectIsLowerThanNoPb=V databázi máte pouze %s %s. To nevyžaduje žádnou zvláštní optimalizaci.
 SearchOptim=Optimalizace pro vyhledávače
-YouHaveXObjectUseSearchOptim=V databázi máte %s %s. Konstantu %s byste měli přidat k 1 v Home-Setup-Other. Omezte vyhledávání na začátek řetězců, což umožňuje databázi používat indexy a měli byste získat okamžitou odpověď.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=Máte %s %s v databázi a konstanta %s je nastavena na 1 v Home-Setup-Other.
 BrowserIsOK=Používáte webový prohlížeč %s. Tento prohlížeč je v pořádku pro zabezpečení a výkon.
 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.
@@ -1596,8 +1598,13 @@ ServiceSetup=Nastavení modulu služeb
 ProductServiceSetup=Nastavení modulů produktů a služeb
 NumberOfProductShowInSelect=Maximální počet produktů, které mají být zobrazeny v seznamu výběrových kombinací (0 = žádný limit)
 ViewProductDescInFormAbility=Zobrazovat popisy produktů ve formulářích (jinak se zobrazí v popupu popisků)
+DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
+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=Aktivovat v servisním / Attached kartě výrobku Soubory možnost sloučit produkt PDF dokument k návrhu PDF Azur-li výrobek / služba je v návrhu
-ViewProductDescInThirdpartyLanguageAbility=Zobrazte popisy produktů v jazyce subjektu
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 UseSearchToSelectProductTooltip=Také, pokud máte velké množství produktů (> 100 000), můžete zvýšit rychlost nastavením konstantního PRODUCT_DONOTSEARCH_ANYWHERE na 1 v nabídce Setup-> Other. Hledání bude omezeno na začátek řetězce.
 UseSearchToSelectProduct=Počkejte, než stisknete klávesu před načtením obsahu seznamu combo produktu (Může se tím zvýšit výkon, pokud máte velké množství produktů, ale je méně vhodný)
 SetDefaultBarcodeTypeProducts=Výchozí typ čárového kódu použít pro produkty
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalizované nabídky, které nejsou propojeny s
 NewMenu=Nová nabídka
 MenuHandler=Ovládání nabídek
 MenuModule=Zdrojový modul
-HideUnauthorizedMenu= Skrýt neautorizovaná menu (šedá)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id nabídka
 DetailMenuHandler=Ovládání nabídek, kde se má zobrazit nové menu
 DetailMenuModule=Název modulu, pokud položky nabídky pocházejí z modulu
@@ -1983,11 +1990,12 @@ EMailHost=Hostitel poštovního IMAP serveru
 MailboxSourceDirectory=Adresář zdrojové schránky
 MailboxTargetDirectory=Adresář cílové schránky
 EmailcollectorOperations=Operace prováděné sběratelem
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Maximální počet e-mailů shromážděných za sběr
 CollectNow=Sbírat nyní
 ConfirmCloneEmailCollector=Opravdu chcete klonovat sběratel e-mailů %s?
-DateLastCollectResult=Datum poslední vyzvednutí vyzkoušeno
-DateLastcollectResultOk=Datum poslední sbírat úspěšně
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Poslední výsledek
 EmailCollectorConfirmCollectTitle=Potvrzení sběru e-mailu
 EmailCollectorConfirmCollect=Chcete nyní spustit kolekci tohoto sběratele?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Vstupní kód nabídky (hlavní menu)
 ECMAutoTree=Zobrazit automatický strom ECM
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/cs_CZ/banks.lang b/htdocs/langs/cs_CZ/banks.lang
index 5dea684e67a..2a7b3acfdfa 100644
--- a/htdocs/langs/cs_CZ/banks.lang
+++ b/htdocs/langs/cs_CZ/banks.lang
@@ -173,10 +173,11 @@ SEPAMandate=Mandát SEPA
 YourSEPAMandate=Váš mandát SEPA
 FindYourSEPAMandate=Toto je vaše mandát SEPA, který autorizuje naši společnost, aby inkasovala inkasní příkaz k vaší bance. Vraťte jej podepsanou (skenování podepsaného dokumentu) nebo pošlete jej poštou
 AutoReportLastAccountStatement=Automaticky vyplňte pole "číslo bankovního výpisu" s posledním číslem výpisu při odsouhlasení
-CashControl=POS peněžní oplocení
-NewCashFence=Nový peněžní plot
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Zbarvujte pohyby
 BankColorizeMovementDesc=Pokud je tato funkce povolena, můžete vybrat konkrétní barvu pozadí pro pohyby debetů nebo kreditů
 BankColorizeMovementName1=Barva pozadí pro debetní pohyb
 BankColorizeMovementName2=Barva pozadí pro pohyb úvěru
 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
diff --git a/htdocs/langs/cs_CZ/blockedlog.lang b/htdocs/langs/cs_CZ/blockedlog.lang
index bb64468a731..2637c5675ae 100644
--- a/htdocs/langs/cs_CZ/blockedlog.lang
+++ b/htdocs/langs/cs_CZ/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donace logické odstranění
 logMEMBER_SUBSCRIPTION_CREATE=Členové odběry byly vytvořeny
 logMEMBER_SUBSCRIPTION_MODIFY=Členský odběr byl změněn
 logMEMBER_SUBSCRIPTION_DELETE=Členská logická smazání odběru
-logCASHCONTROL_VALIDATE=Zaznamenávání peněžních plotů
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Stažení faktury od zákazníka
 BlockedLogBillPreview=Zobrazení náhledu zákaznické faktury
 BlockedlogInfoDialog=Podrobnosti o protokolu
diff --git a/htdocs/langs/cs_CZ/boxes.lang b/htdocs/langs/cs_CZ/boxes.lang
index b7104985e78..e6624e679e4 100644
--- a/htdocs/langs/cs_CZ/boxes.lang
+++ b/htdocs/langs/cs_CZ/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Nejnovější %s upravené dary
 BoxTitleLastModifiedExpenses=Nejnovější %s upravené výkazy výdajů
 BoxTitleLatestModifiedBoms=Poslední %s upravené kusovníky
 BoxTitleLatestModifiedMos=Poslední upravené výrobní zakázky %s
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Globální aktivita (faktury, návrhy, objednávky)
 BoxGoodCustomers=Dobří zákazníci
 BoxTitleGoodCustomers=%s Dobří zákazníci
+BoxScheduledJobs=Naplánované úlohy
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Nepodařilo se obnovit RSS zdroj. Poslední úspěšné datum obnovení: %s
 LastRefreshDate=Nejnovější datum obnovení
 NoRecordedBookmarks=Nejsou definované žádné záložky.
@@ -92,8 +95,8 @@ LastXMonthRolling=Nejnovější %s měsíc válcování
 ChooseBoxToAdd=Přidání widgetu do hlavního panelu
 BoxAdded=Widget byl přidán do hlavního panelu
 BoxTitleUserBirthdaysOfMonth=Narozeniny tohoto měsíce (uživatelé)
-BoxLastManualEntries=Poslední manuální zápisy v účetnictví
-BoxTitleLastManualEntries=%s nejnovější manuální zápisy
+BoxLastManualEntries=Latest record in accountancy entered manually or without source document
+BoxTitleLastManualEntries=%s latest record entered manually or without source document
 NoRecordedManualEntries=V účetnictví nejsou zaznamenány žádné manuální záznamy
 BoxSuspenseAccount=Počítání účetních operací s dočasným účtem
 BoxTitleSuspenseAccount=Počet nepřidělených linek
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Účet pozastavení není definován
 BoxLastCustomerShipments=Poslední zásilky zákazníků
 BoxTitleLastCustomerShipments=Nejnovější %s zásilky zákazníků
 NoRecordedShipments=Žádná zaznamenaná zásilka zákazníka
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Účetnictví
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/cs_CZ/cashdesk.lang b/htdocs/langs/cs_CZ/cashdesk.lang
index e83a9e313de..58ca4072acb 100644
--- a/htdocs/langs/cs_CZ/cashdesk.lang
+++ b/htdocs/langs/cs_CZ/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Zápatí
 AmountAtEndOfPeriod=Částka na konci období (den, měsíc nebo rok)
 TheoricalAmount=Teoretická částka
 RealAmount=Skutečná částka
-CashFence=Hotovostní plot
-CashFenceDone=Peněžní oplatek za období
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Některé z faktur
 Paymentnumpad=Zadejte Pad pro vložení platby
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Modul číslování pro prodej POS
 CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> se používá k přidání čísla terminálu
 TakeposGroupSameProduct=Seskupte stejné produktové řady
 StartAParallelSale=Zahajte nový paralelní prodej
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Zavřete hotovostní plot
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Hotovostní zpráva
 MainPrinterToUse=Hlavní tiskárna k použití
 OrderPrinterToUse=Objednejte tiskárnu k použití
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/cs_CZ/categories.lang b/htdocs/langs/cs_CZ/categories.lang
index 53d6caa3877..fc7d27f5efa 100644
--- a/htdocs/langs/cs_CZ/categories.lang
+++ b/htdocs/langs/cs_CZ/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Oblast projektů značek/kategorií
 UsersCategoriesArea=Kategorie značek/kategorií uživatelů
 SubCats=Podkategorie
 CatList=Výpis tagů/kategorií
+CatListAll=List of tags/categories (all types)
 NewCategory=Nový tag/kategorie
 ModifCat=Upravit tag/kategorii
 CatCreated=Tag/kategorie byla vytvořená
@@ -65,16 +66,22 @@ UsersCategoriesShort=Uživatelské značky/kategorie
 StockCategoriesShort=Značky/kategorie skladů
 ThisCategoryHasNoItems=Tato kategorie neobsahuje žádné položky.
 CategId=ID tagu/kategorie
-CatSupList=Seznam tagů/kategorií dodavatelů
-CatCusList=Seznam tagů/kategorií zákazníků/cílů
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Seznam tagů/kategorií produktů
 CatMemberList=Seznam tagů/kategorií uživatelů
-CatContactList=Seznam kontaktů tagů/kategorií
-CatSupLinks=Spojení mezi dodavateli a tagy/kategoriemi
+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=Spojení mezi zákazníky/cíly a tagy/kategoriemi
 CatContactsLinks=Odkazy mezi kontakty/adresami a značkami/kategoriemi
 CatProdLinks=Spojení mezi produkty/službami a tagy/kategoriemi
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Spojení mezi uživateli a tagy/kategoriemi
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Odebrat z tagů/kategorií
 ExtraFieldsCategories=Doplňkové atributy
 CategoriesSetup=Nastavení tagů/kategorií
diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang
index 19b9513ae7c..7f16ddead5c 100644
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Zkontrolujte ID DPH uvnitř Společenství na webovýc
 VATIntraManualCheck=Můžete také zkontrolovat ručně na evropských stránkách <a href="%s" target="_blank">%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=Typ právnické osoby
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Zaměstnanci
 ProspectLevelShort=Potenciální
diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang
index 9e64b689ff2..b725f1ab696 100644
--- a/htdocs/langs/cs_CZ/compta.lang
+++ b/htdocs/langs/cs_CZ/compta.lang
@@ -111,7 +111,7 @@ Refund=Vrácení
 SocialContributionsPayments=Sociální / platby daně za
 ShowVatPayment=Zobrazit platbu DPH
 TotalToPay=Celkem k zaplacení
-BalanceVisibilityDependsOnSortAndFilters=pouze tehdy, pokud je řazen tabulka vzestupně na %s a filtrován 1 bankovního účtu je vidět v tomto seznamu Balance
+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=Zákaznický účetní kód
 SupplierAccountancyCode=dodavatelský účetní kód
 CustomerAccountancyCodeShort=Cust. účet. kód
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Opravdu chcete vymazat tuto sociální / daňovo
 ExportDataset_tax_1=Sociální a fiskální daně a platby
 CalcModeVATDebt=Režim <b>%sDPH zápočtu na závazky%s.</b>
 CalcModeVATEngagement=Režim <b>%sDPH z rozšířených příjmů%s.</b>
-CalcModeDebt=Analýza známých zaznamenaných faktur, a to i v případě, že ještě nejsou účtovány v účetní evidenci.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analýza známých zaznamenaných plateb, i když ještě nejsou účtovány v Ledgeru.
 CalcModeBookkeeping=Analýza údajů publikovaných v tabulce Účetnictví účetnictví.
 CalcModeLT1= Mod <b>%sRE na zákaznické faktury - dodavatelské faktury%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Bilance příjmů a výdajů, roční shrnutí
 AnnualByCompanies=Bilance příjmů a výdajů podle předem definovaných skupin účtů
 AnnualByCompaniesDueDebtMode=Bilance výnosů a nákladů, podrobnosti podle předdefinovaných skupin, režim <b> %sClaims-Debts%s</b> uvedl  <b>Účtování závazků</b> .
 AnnualByCompaniesInputOutputMode=Bilance výnosů a nákladů, podrobnosti podle předdefinovaných skupin, režim <b> %sInvestice-Výdaje%s </b> uvedl <b> hotovostní účetnictví </b>.
-SeeReportInInputOutputMode=Viz %sanalýza plateb %spro výpočet skutečných plateb, i když ještě nejsou účtovány v Ledgeru.
-SeeReportInDueDebtMode=Viz %sanalýza faktur %s pro výpočet založený na známých zaznamenaných fakturách, i když ještě nejsou účtovány v Ledgeru.
-SeeReportInBookkeepingMode=Viz část <b> %sKontrola report %s</b> pro výpočet na <b> Tabulce účtů účetnictví </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=- 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í.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Zobrazuje záznam ve vašem účtu s účetn
 SeePageForSetup=Viz menu <a href="%s"> %s </a> pro nastavení
 DepositsAreNotIncluded=- Zálohové faktury nejsou zahrnuty
 DepositsAreIncluded=- Zálohové faktury jsou zahrnuty
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Nahlásit daň 2 subjektu
 LT2ReportByCustomers=Oznámte daň 3 subjektu
 LT1ReportByCustomersES=Zpráva třetí strany RE
 LT2ReportByCustomersES=Zpráva o třetí straně IRPF
 VATReport=Zpráva o dani z prodeje
 VATReportByPeriods=Zpráva o dani z prodeje podle období
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Zpráva o dani z prodeje podle sazeb
 VATReportByThirdParties=Zpráva o dani z prodeje subjekty
 VATReportByCustomers=Zpráva o dani z prodeje zákazníkem
diff --git a/htdocs/langs/cs_CZ/cron.lang b/htdocs/langs/cs_CZ/cron.lang
index b2b351ec4e2..2301936582d 100644
--- a/htdocs/langs/cs_CZ/cron.lang
+++ b/htdocs/langs/cs_CZ/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Smazat naplánovanou úlohu
 Permission23104 = Provést naplánovanou úlohu
 # Admin
 CronSetup=Nastavení naplánovaných úloh
-URLToLaunchCronJobs=URL ke kontrole a spuštění úlohy v případě potřeby
-OrToLaunchASpecificJob=Nebo zkontrolovat a zahájit konkrétní práci
+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=Bezpečnostní klíč URL spuštění úlohy
 FileToLaunchCronJobs=Příkazový řádek pro kontrolu a spuštění kvalifikovaných úloh v cronu
 CronExplainHowToRunUnix=Na Unixových systémech by jste měli použít následující položku crontab ke spuštění příkazového řádku každých 5 minut
 CronExplainHowToRunWin=V prostředí Microsoft  Windows můžete pomocí nástrojů Naplánované úlohy spustit příkazový řádek každých 5 minut
 CronMethodDoesNotExists=Třída %s neobsahuje žádné metody %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Profily úloh Cron jsou definovány do souboru deskriptoru modulu. Když je modul aktivován, jsou načteny a dostupné, takže můžete spravovat úlohy z nabídky nástrojů admin %s.
 CronJobProfiles=Seznam předdefinovaných úloh profilu cron
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Počet spuštění
 CronMaxRun=Maximální počet spuštění
 CronEach=Každý
 JobFinished=Práce zahájena a dokončena
+Scheduled=Scheduled
 #Page card
 CronAdd= Přidat práci
 CronEvery=Vykonat práci každý
@@ -56,7 +58,7 @@ CronNote=Komentář
 CronFieldMandatory=Pole %s je povinné
 CronErrEndDateStartDt=Datum ukončení nemůže být před datem zahájení
 StatusAtInstall=Stav při instalaci modulu
-CronStatusActiveBtn=Umožnit
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Zakázat
 CronTaskInactive=Tato úloha je zakázána
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Záloha lokální databáze
 MakeLocalDatabaseDump=Vytvoření výpisu místní databáze. Parametry jsou: komprese ('gz' nebo 'bz' nebo 'none'), zálohovací typ ('mysql', 'pgsql', 'auto'),
 WarningCronDelayed=Pozor, pokud jde o výkonnost, bez ohledu na to, co je příštím datem provedení povolených úloh, mohou být vaše úlohy zpožděny maximálně do %s hodin, než budou spuštěny.
 DATAPOLICYJob=Čistič dat a anonymizér
+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/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index a9028d01278..0be889628dc 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Žádná chyba, jsme se nedopustili
 # Errors
 ErrorButCommitIsDone=Byly nalezeny chyby, ale přesto jsme provedli ověření. Snad to pojede ....
 ErrorBadEMail=E-mail %s je špatný
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s je špatně
 ErrorBadValueForParamNotAString=Špatná hodnota parametru. Připojí se obecně, když chybí překlad.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Přihlášení %s již existuje.
 ErrorGroupAlreadyExists=Skupina %s již existuje.
 ErrorRecordNotFound=Záznam není nalezen.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Některá povinná pole nebyla vyplněna.  Neflákejte to !!
 ErrorSubjectIsRequired=Předmět e-mailu je povinný
 ErrorFailedToCreateDir=Nepodařilo se vytvořit adresář. Zkontrolujte, zda má uživatel webového serveru oprávnění zapisovat do adresáře dokumentů Dolibarr. Pokud je v tomto PHP aktivován parametr <b> safe_mode</b>, zkontrolujte, zda jsou soubory Dolibarr php vlastní uživateli (nebo skupinou) webového serveru.
 ErrorNoMailDefinedForThisUser=Pro tohoto uživatele není definován žádný e-mail
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Tato funkce vyžaduje zapnutí javascriptu pro práci. Změňte nastavení v zobrazení nastavení.
 ErrorTopMenuMustHaveAParentWithId0=Nabídka typu "Top" nemůže mít nadřazenou nabídku. Vložte 0 do rodičovského menu nebo zvolte nabídku typu "Vlevo".
 ErrorLeftMenuMustHaveAParentId=Nabídka typu "Left" musí mít nadřazený identifikátor.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Toto jméno profilu již existuje pro tuto exportní
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP shoda není dokončena.
 ErrorLDAPMakeManualTest=Soubor .ldif byl vygenerován v adresáři %s. Pokuste se jej z příkazového řádku ručně načíst a získat další informace o chybách.
 ErrorCantSaveADoneUserWithZeroPercentage=Nelze uložit akci s "stav nebyl spuštěn", pokud je vyplněn také pole "provedeno".
-ErrorRefAlreadyExists=Ref používané pro vytváření již existuje.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Zadejte prosím název výpisu banky, na kterém má být záznam zaznamenán (formát YYYYMM nebo YYYYMMDD)
 ErrorRecordHasChildren=Záznam se nepodařilo smazat, protože má některé podřízené záznamy.
 ErrorRecordHasAtLeastOneChildOfType=Objekt má alespoň jeden podřízený záznam typu %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Musíte zvolit, zda je článek p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Sleva, kterou se pokoušíte použít, je větší než platba. Rozdělte slevu ve 2 menších slevách dříve. A moc to nepřehánějte ....
 ErrorFileNotFoundWithSharedLink=Soubor nebyl nalezen. Může být změněn klíč sdílení nebo nedávno odstraněn soubor.
 ErrorProductBarCodeAlreadyExists=Výrobní čárový kód %s již existuje u jiného odkazu na produkt.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Všimněte si také, že použití virtuálního produktu k automatickému zvýšení / snížení podprogramů není možné, pokud alespoň jeden subprodukt (nebo subprodukt subproduktů) potřebuje číslo seriálu / šarže.
+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=Popis je povinný pro linky s volným produktem
 ErrorAPageWithThisNameOrAliasAlreadyExists=Stránka / kontejner <strong> %s</strong> má stejný název nebo jiný alias, než ten, který se pokoušíte použít
 ErrorDuringChartLoad=Při načtení tabulky účtů došlo k chybě. Pokud nebylo načteno několik účtů, můžete je zadat ručně.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Chyba, řetězec, který chcete nahradit, je prázdný
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+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=Veřejné rozhraní nebylo povoleno
+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
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Váš parametr PHP upload_max_filesize (%s) je vyšší než parametr PHP post_max_size (%s). Toto není konzistentní nastavení.
 WarningPasswordSetWithNoAccount=Pro tohoto člena bylo nastaveno heslo. Nebyl však vytvořen žádný uživatelský účet. Toto heslo je uloženo, ale nemůže být použito pro přihlášení k Dolibarr. Může být použito externím modulem / rozhraním, ale pokud nemáte pro člena definováno žádné přihlašovací jméno ani heslo, můžete vypnout možnost "Správa přihlášení pro každého člena" z nastavení modulu člena. Pokud potřebujete spravovat přihlašovací údaje, ale nepotřebujete žádné heslo, můžete toto pole ponechat prázdné, abyste se tomuto varování vyhnuli. Poznámka: E-mail může být také použit jako přihlašovací jméno, pokud je člen připojen k uživateli.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Vaše přihlašovací údaje byly změně
 WarningAnEntryAlreadyExistForTransKey=Položka již existuje pro překladatelské klíč pro tento jazyk
 WarningNumberOfRecipientIsRestrictedInMassAction=Upozornění: počet různých příjemců je omezen na <b> %s </b> při použití hromadných akcí v seznamech
 WarningDateOfLineMustBeInExpenseReportRange=Upozornění: datum řádku není v rozsahu výkazu výdajů
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Projekt je uzavřen. Nejprve je musíte znovu otevřít.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Některé bankovní transakce byly odstraněny poté, co byly vygenerovány potvrzení včetně těchto. Počet kontrol a celkový příjem se tedy může lišit od počtu a celkového počtu v seznamu. Špek pro případnou kontrolu !!
-WarningFailedToAddFileIntoDatabaseIndex=Výstraha: Nepodařilo se přidat položku souboru do indexové tabulky databáze ECM
+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.
diff --git a/htdocs/langs/cs_CZ/exports.lang b/htdocs/langs/cs_CZ/exports.lang
index 85d98be9e68..34c0d9b41d6 100644
--- a/htdocs/langs/cs_CZ/exports.lang
+++ b/htdocs/langs/cs_CZ/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Klíč (sloupec), který chcete použít pro <b> aktualizaci
 NbInsert=Počet vložených řádků: %s
 NbUpdate=Počet aktualizovaných řádků: %s
 MultipleRecordFoundWithTheseFilters=Bylo nalezeno více záznamů s těmito filtry: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang
index aad25597cf4..ffa9e363aa8 100644
--- a/htdocs/langs/cs_CZ/mails.lang
+++ b/htdocs/langs/cs_CZ/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emaily zadávané uživatelem
 MailingModuleDescDolibarrUsers=Uživatelé s e-maily
 MailingModuleDescThirdPartiesByCategories=Subjekty (podle kategorií)
 SendingFromWebInterfaceIsNotAllowed=Odesílání z webového rozhraní není povoleno.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Řádek  %s v souboru
@@ -125,12 +126,13 @@ TagMailtoEmail=E-mail příjemce (včetně html odkazu "mailto:")
 NoEmailSentBadSenderOrRecipientEmail=Žádný e-mail nebyl odeslán. Špatný e-mail odesílatele nebo příjemce. Ověřte profil uživatele.
 # Module Notifications
 Notifications=Upozornění
-NoNotificationsWillBeSent=Nejsou plánovány žádná e-mailová oznámení pro tuto událost nebo společnost
-ANotificationsWillBeSent=1 notifikace bude zaslána e-mailem
-SomeNotificationsWillBeSent=%s oznámení bude zasláno e-mailem
-AddNewNotification=Aktivace cíle pro  nové e-mailové upozornění
-ListOfActiveNotifications=Seznam všech aktivních cílů / událostí pro oznámení emailem
-ListOfNotificationsDone=Vypsat všechny odeslané e.mailové oznámení
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Konfigurace odesílání e-maiů byla nastavena tak, aby '%s'. Tento režim nelze použít k odesílání hromadných e-mailů.
 MailSendSetupIs2=Nejprve je nutné jít s admin účtem, do nabídky%sHome - Nastavení - e-maily%s pro změnu parametru <strong>"%s"</strong> do režimu použít "%s". V tomto režimu, můžete zadat nastavení serveru SMTP vašeho  poskytovatele služeb internetu a používat hromadnou e-mailovou funkci.
 MailSendSetupIs3=Pokud máte nějaké otázky o tom, jak nastavit SMTP server, můžete se zeptat na%s, nebo si prostudujte dokumentaci vašeho poskytovatele. \nPoznámka: V současné době bohužel většina serverů nasazuje služby pro filtrování nevyžádané pošty a různé způsoby ověřování odesilatele. Bez detailnějších znalostí a nastavení vašeho SMTP serveru se vám bude vracet většina zpráv jako nedoručené.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Importovaný soubor musí mít formát <strong> e-mai
 UseFormatInputEmailToTarget=Zadejte řetězec s formátem <strong> e-mail; jméno; první jméno; další </strong>
 MailAdvTargetRecipients=Příjemci (rozšířený výběr)
 AdvTgtTitle=Vyplňte vstupní pole, chcete-li předvolit subjekty nebo kontakty / adresy, na které chcete cílit
-AdvTgtSearchTextHelp=Jako zástupné znaky použijte %%. Chcete-li například najít všechny položky jako <b> jean, joe, jim</b>, můžete zadat <b> j%%</b>, můžete také použít; jako oddělovač pro hodnotu a použití pro tuto hodnotu. Například<b>jim%%; jimo; jima% </b> bude zaměřen na všechny jean, joe, začít s jim, ale ne jimo a ne všechno, co začíná jima
+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=Pomocí intervalu vyberte hodnotu int nebo float
 AdvTgtMinVal=Minimální hodnota
 AdvTgtMaxVal=Maximální hodnota
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Vytvořte filtr
 AdvTgtOrCreateNewFilter=Název nového filtru
 NoContactWithCategoryFound=Žádný kontakt / adresa s nalezenou kategorií
 NoContactLinkedToThirdpartieWithCategoryFound=Žádný kontakt / adresa s nalezenou kategorií
-OutGoingEmailSetup=Nastavení odchozí pošty
-InGoingEmailSetup=Příchozí nastavení e-mailu
-OutGoingEmailSetupForEmailing=Nastavení odchozí pošty (pro modul %s)
-DefaultOutgoingEmailSetup=Výchozí nastavení odchozí pošty
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informace
 ContactsWithThirdpartyFilter=Kontakty s filtrem subjektu
 Unanswered=Unanswered
 Answered=Odpovězeno
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index b2fcda76ae4..e5c81c5c737 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Pro tento typ e-mailu není k dispozici žádná šablona
 AvailableVariables=K dispozici substituční proměnné
 NoTranslation=Překlad není
 Translation=Překlad
+CurrentTimeZone=Časové pásmo PHP (server)
 EmptySearchString=Zadejte neprázdná kritéria vyhledávání
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Nebyl nalezen žádný záznam
 NoRecordDeleted=Žádný záznam nebyl smazán
 NotEnoughDataYet=Nedostatek dat
@@ -85,6 +87,8 @@ 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
+HomePage=Domovská stránka
 RecordSaved=Záznam uložen
 RecordDeleted=Záznam smazán
 RecordGenerated=Záznam byl vygenerován
@@ -220,6 +224,7 @@ Value=Hodnota
 PersonalValue=Osobní hodnota
 NewObject=Nové %s
 NewValue=Nová hodnota
+OldValue=Old value %s
 CurrentValue=Současná hodnota
 Code=Kód
 Type=Typ
@@ -433,6 +438,7 @@ RemainToPay=Zbývá platit
 Module=Modul/aplikace
 Modules=Moduly/aplikace
 Option=Volba
+Filters=Filters
 List=Seznam
 FullList=Plný seznam
 FullConversation=Plná konverzace
@@ -650,6 +656,7 @@ SupplierPreview=Náhled dodavatele
 ShowCustomerPreview=Zobrazit náhled zákazníka
 ShowSupplierPreview=Zobrazit náhled dodavatele
 RefCustomer=Ref. zákazník
+InternalRef=Internal ref.
 Currency=Měna
 InfoAdmin=Informace pro správce
 Undo=Zrušit
@@ -671,7 +678,7 @@ SendMail=Odeslat e-mail
 Email=E-mail
 NoEMail=Žádný e-mail
 AlreadyRead=Již jste si přečetli
-NotRead=Nepřečetl
+NotRead=Nepřečtený
 NoMobilePhone=Žádné telefonní číslo
 Owner=Majitel
 FollowingConstantsWillBeSubstituted=Následující konstanty budou nahrazeny odpovídající hodnotou.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=Pozdržen
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/cs_CZ/modulebuilder.lang b/htdocs/langs/cs_CZ/modulebuilder.lang
index 51093a410ec..325c3fe3b52 100644
--- a/htdocs/langs/cs_CZ/modulebuilder.lang
+++ b/htdocs/langs/cs_CZ/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP stránku pro vytvoření / úpravu / prohlížení zá
 PageForAgendaTab=Stránka PHP pro kartu události
 PageForDocumentTab=Stránka PHP pro kartu dokumentu
 PageForNoteTab=Stránka PHP pro kartu poznámky
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Cesta k zip modulu / aplikačního balíčku
 PathToModuleDocumentation=Cesta k souboru dokumentace modulu/aplikace (%s)
 SpaceOrSpecialCharAreNotAllowed=Mezery nebo speciální znaky nejsou povoleny.
@@ -77,7 +78,7 @@ IsAMeasure=Je to opatření
 DirScanned=Adresář naskenován
 NoTrigger=Žádný spouštěč
 NoWidget=Žádný widget
-GoToApiExplorer=Přejděte na prohlížeč rozhraní API
+GoToApiExplorer=API explorer
 ListOfMenusEntries=Seznam položek menu
 ListOfDictionariesEntries=Seznam položek slovníků
 ListOfPermissionsDefined=Seznam definovaných oprávnění
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Pokud máte znalosti o SQL a PHP, můžete použít pr
 SeeTopRightMenu=Viz <span class="fa fa-bug"> </span> v pravé horní nabídce
 AddLanguageFile=Přidat jazyk
 YouCanUseTranslationKey=Zde můžete použít klíč, který je překladatelským klíčem nalezeným v jazykovém souboru (viz záložka "Jazyky")
-DropTableIfEmpty=(Vymazat tabulku, pokud je prázdná)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=Tabulka %s neexistuje
 TableDropped=Tabulka %s byla smazána
 InitStructureFromExistingTable=Vytvořte řetězec struktury pole existující tabulky
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Použijte specifickou adresu URL editoru
 UseSpecificFamily = Použijte konkrétní rodinu
 UseSpecificAuthor = Použijte specifického autora
 UseSpecificVersion = Použijte specifickou počáteční verzi
-ModuleMustBeEnabled=Nejprve musí být aktivován modul / aplikace
 IncludeRefGeneration=Odkaz na objekt musí být generován automaticky
 IncludeRefGenerationHelp=Zaškrtněte toto, pokud chcete zahrnout kód pro automatické generování reference
 IncludeDocGeneration=Chci z objektu vygenerovat nějaké dokumenty
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Typ polí: <br> varchar (99), dvojitý (24,8), reálný, text,
 AsciiToHtmlConverter=Převodník ASCII na HTML
 AsciiToPdfConverter=Převodník ASCII na PDF
 TableNotEmptyDropCanceled=Tabulka není prázdná. Odstranění tabulky bylo zrušeno.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/cs_CZ/mrp.lang b/htdocs/langs/cs_CZ/mrp.lang
index a3e64ead7a8..e86ca5e8c48 100644
--- a/htdocs/langs/cs_CZ/mrp.lang
+++ b/htdocs/langs/cs_CZ/mrp.lang
@@ -78,3 +78,27 @@ TotalCost=Celkové náklady
 BOMTotalCost=Náklady na výrobu tohoto kusovníku na základě nákladů na každé spotřebované množství a produkt (použijte cenu Cena, pokud je definována, jinak průměrná vážená cena, pokud je definována, jinak nejlepší kupní cena)
 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang
index ba0a69321c7..23b567fc52b 100644
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/htdocs/langs/cs_CZ/other.lang
@@ -5,8 +5,6 @@ Tools=Nástroje
 TMenuTools=Nástroje
 ToolsDesc=Všechny nástroje, které nejsou zahrnuty v jiných položkách nabídky, jsou zde seskupeny. <br> Všechny nástroje jsou přístupné v levém menu.
 Birthday=Narozeniny
-BirthdayDate=datum narozenin
-DateToBirth=Datum narození
 BirthdayAlertOn=Připomenutí narozenin aktivní
 BirthdayAlertOff=Připomenutí narozenin neaktivní
 TransKey=Překlad klíčů TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Předchozí měsíc (číslo 1-12) data faktury
 TextPreviousMonthOfInvoice=Předchozí měsíc (text) data faktury
 NextMonthOfInvoice=Následující měsíc (číslo 1-12) data faktury
 TextNextMonthOfInvoice=Následující měsíc (text) data faktury
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip soubor generovaný do <b> %s </b>.
 DocFileGeneratedInto=Soubor Doc generován do <b> %s </b>.
 JumpToLogin=Odpojeno. Přejít na přihlašovací stránku ...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Zpráva o výdajích ověřena (vyžaduje se schv
 Notify_EXPENSE_REPORT_APPROVE=Zpráva o výdajích byla schválena
 Notify_HOLIDAY_VALIDATE=Zanechat žádost ověřenou (vyžaduje se schválení)
 Notify_HOLIDAY_APPROVE=Zanechat žádost schválenou
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=Viz nastavení modulu %s
 NbOfAttachedFiles=Počet připojených souborů/dokumentů
 TotalSizeOfAttachedFiles=Celková velikost připojených souborů/dokumentů
@@ -99,6 +100,7 @@ PredefinedMailContentSendShipping=__(Ahoj)__\n\nNajděte prosím dodací lhůtu
 PredefinedMailContentSendFichInter=__(Ahoj)__\n\nNajděte zásah __REF__\n\n\n__(S pozdravem)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Klepnutím na níže uvedený odkaz proveďte platbu, pokud ještě není hotovo.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Ahoj)__\n\n\n__(S pozdravem)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr je kompaktní ERP/CRM systém, který se  skládá z více funkčních modulů. Demo, které obsahuje všechny moduly vám nepředstaví všechny možnosti, protože v reálné situaci všechny moduly najednou používat nebudete.  Pro lepší a snadnější seznámení s celým systémem máte k dispozici několik demo profilů lépe vystihujících vaše požadavky. 
 ChooseYourDemoProfil=Vyberte demo profil, který nejlépe odpovídá vaší činnosti, nebo zaměření ...
 ChooseYourDemoProfilMore=... nebo vytvořit vlastní profil <br> (manuální výběr požadovaných modulů)
@@ -137,7 +139,7 @@ Right=Pravý
 CalculatedWeight=Vypočtená hmotnost
 CalculatedVolume=Vypočtený objem
 Weight=Hmotnost
-WeightUnitton=tuna
+WeightUnitton=tón
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ EMailTextExpenseReportValidated=Zpráva o výdajích %s byla ověřena.
 EMailTextExpenseReportApproved=Zpráva o výdajích %s byla schválena.
 EMailTextHolidayValidated=Oprávnění %s bylo ověřeno.
 EMailTextHolidayApproved=Opustit požadavek %s byl schválen.
+EMailTextActionAdded=The action %s has been added to the Agenda.
 ImportedWithSet=Import souboru dat
 DolibarrNotification=Automatické upozornění
 ResizeDesc=Zadejte novou šířku <b>nebo</b> novou výšku. Poměry budou uchovávány při změně velikosti ...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Kontakt/adresa vytvořená sběratelem e-mailů z
 ProjectCreatedByEmailCollector=Projekt vytvořený sběratelem e-mailů z e-mailu MSGID %s
 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
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exportní plocha
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 239f764a81b..9f144427c41 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Více cenových segmentů na produkt / službu (každý zákazník je v jednom cenovém segmentu)
 MultiPricesNumPrices=Počet cen
 DefaultPriceType=Základ cen za prodlení (s versus bez daně) při přidávání nových prodejních cen
-AssociatedProductsAbility=Activate kits (virtual products)
+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=Počet výchozích balení výrobku
@@ -167,8 +168,10 @@ BuyingPrices=Nákupní ceny
 CustomerPrices=Zákaznické ceny
 SuppliersPrices=Ceny prodejců
 SuppliersPricesOfProductsOrServices=Ceny prodejců (produktů nebo služeb)
-CustomCode=Kód cla / komodity / HS
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Země původu
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Druh produktu (materiál / hotový)
 NatureOfProductShort=Druh produktu
 NatureOfProductDesc=Surovina nebo hotový produkt
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Použijte pevnou cenu
 PriceByQuantity=Různé ceny podle množství
 DisablePriceByQty=Zakázat ceny podle množství
 PriceByQuantityRange=Množstevní rozsah
-MultipriceRules=Pravidla segmentu cen
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Použijte pravidla segmentu cen (definovaná v nastavení modulu produktu) pro automatické výpočty cen všech ostatních segmentů podle prvního segmentu
 PercentVariationOver=%% variace přes %s
 PercentDiscountOver=%% sleva na %s
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index e75df1f5d9e..88f500f0753 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -76,15 +76,16 @@ MyActivities=Moje úkoly / činnosti
 MyProjects=Moje projekty
 MyProjectsArea=Moje projekty Oblast
 DurationEffective=Efektivní doba trvání
-ProgressDeclared=Hlášený progres
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Průběh úkolu
 CurentlyOpenedTasks=Aktuálně otevřené úkoly
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=Deklarovaný pokrok je menší %s než vypočtená progrese
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Deklarovaný pokrok je více %s než vypočtená progrese
-ProgressCalculated=Vypočítaný progres
+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=se kterým jsem spojen
 WhichIamLinkedToProject=které jsem propojil s projektem
 Time=Čas
+TimeConsumed=Consumed
 ListOfTasks=Seznam úkolů
 GoToListOfTimeConsumed=Přejít na seznam času spotřebovaného
 GanttView=Gantt View
diff --git a/htdocs/langs/cs_CZ/recruitment.lang b/htdocs/langs/cs_CZ/recruitment.lang
index e8f2b878873..e60db728965 100644
--- a/htdocs/langs/cs_CZ/recruitment.lang
+++ b/htdocs/langs/cs_CZ/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/cs_CZ/sendings.lang b/htdocs/langs/cs_CZ/sendings.lang
index 94d137ed4a6..61d599a95a7 100644
--- a/htdocs/langs/cs_CZ/sendings.lang
+++ b/htdocs/langs/cs_CZ/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Další zásilky pro tuto objednávku
 SendingsAndReceivingForSameOrder=Zásilky a potvrzení o této objednávce
 SendingsToValidate=Zásilky se ověřují
 StatusSendingCanceled=Zrušený
+StatusSendingCanceledShort=Zrušený
 StatusSendingDraft=Návrh
 StatusSendingValidated=Ověřené (výrobky pro dodávku nebo již dodány)
 StatusSendingProcessed=Zpracované
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Nejprve musíte potvrdit objednávku před tím
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Více kompletních modelů dokumentů pro potvrzení o doručení (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstanta EXPEDITION_ADDON_NUMBER není definována
 SumOfProductVolumes=Součet objemu produktů
 SumOfProductWeights=Součet hmotnosti produktů
diff --git a/htdocs/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang
index 25558173d1a..ef41559e9f1 100644
--- a/htdocs/langs/cs_CZ/stocks.lang
+++ b/htdocs/langs/cs_CZ/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Hodnota skladů
 UserWarehouseAutoCreate=Vytvoření uživatelského skladu automaticky při vytváření uživatele
 AllowAddLimitStockByWarehouse=Spravujte také hodnotu pro minimální a požadovanou zásobu na párování (produktový sklad) kromě hodnoty pro minimální a požadovanou zásobu na produkt
 RuleForWarehouse=Pravidlo pro sklady
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Nastavit sklad na prodejní objednávky
 UserDefaultWarehouse=Nastavit sklad na Uživatelé
 MainDefaultWarehouse=Výchozí sklad
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/cs_CZ/ticket.lang b/htdocs/langs/cs_CZ/ticket.lang
index 83a4e3cd4e6..268ab00719c 100644
--- a/htdocs/langs/cs_CZ/ticket.lang
+++ b/htdocs/langs/cs_CZ/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Vstupenka - Typy
 TicketDictCategory=Vstupenka - skupiny
 TicketDictSeverity=Vstupenka - závažnosti
 TicketDictResolution=Vstupenka - rozlišení
-TicketTypeShortBUGSOFT=Logika Dysfonctionnement
-TicketTypeShortBUGHARD=Dysfonctionnement matériel -nějaký mišmaš ???
-TicketTypeShortCOM=Obchodní otázka
 
+TicketTypeShortCOM=Obchodní otázka
 TicketTypeShortHELP=Žádost o funkční pomoc
 TicketTypeShortISSUE=Problém, chyba nebo problém
 TicketTypeShortREQUEST=Žádost o změnu nebo vylepšení
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Jiný
 TicketSeverityShortLOW=Nízký
 TicketSeverityShortNORMAL=Normální
 TicketSeverityShortHIGH=Vysoký
-TicketSeverityShortBLOCKING=Kritické / Blokování
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Pole '%s' nesprávné
 MenuTicketMyAssign=Moje jízdenky
@@ -60,7 +58,6 @@ OriginEmail=Zdroj e-mailu
 Notify_TICKET_SENTBYMAIL=Odeslat e-mailem zprávu o lince
 
 # Status
-NotRead=Nepřečetl
 Read=Číst
 Assigned=Přidělené
 InProgress=probíhá
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Veřejné rozhraní umožňuje všem návšt
 TicketsAutoAssignTicket=Automaticky přiřadit uživateli, který vytvořil lístek
 TicketsAutoAssignTicketHelp=Při tvorbě vstupenky může být uživateli automaticky přiřazen lístek.
 TicketNumberingModules=Modul číslování vstupenek
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Upozornit subjekt na vytvoření
 TicketsDisableCustomerEmail=Pokud je lístek vytvořen z veřejného rozhraní, vždy zakažte e-maily
 TicketsPublicNotificationNewMessage=Po přidání nové zprávy odešlete e-mail(y)
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Stav změněn: %s až %s
 TicketNotNotifyTiersAtCreate=Neinformovat společnost na vytvoření
 Unread=Nepřečtený
 TicketNotCreatedFromPublicInterface=Není dostupný. Vstupenka nebyla vytvořena z veřejného rozhraní.
-PublicInterfaceNotEnabled=Veřejné rozhraní nebylo povoleno
 ErrorTicketRefRequired=Je vyžadován referenční název vstupenky
 
 #
diff --git a/htdocs/langs/cs_CZ/website.lang b/htdocs/langs/cs_CZ/website.lang
index cf30e5bd64d..1fb8d39059e 100644
--- a/htdocs/langs/cs_CZ/website.lang
+++ b/htdocs/langs/cs_CZ/website.lang
@@ -30,7 +30,6 @@ EditInLine=Úpravy v řádku
 AddWebsite=Přidat webovou stránku
 Webpage=Webová stránka / kontejner
 AddPage=Přidat stránku / kontejner
-HomePage=Domovská stránka
 PageContainer=Strana
 PreviewOfSiteNotYetAvailable=Náhled vašeho webu <strong> %s </strong> zatím není k dispozici. Nejprve musíte '<strong> Importovat celou šablonu webových stránek </strong>' nebo jen '<strong> Přidat stránku / kontejner </strong>'.
 RequestedPageHasNoContentYet=Požadovaná stránka s ID %s nemá dosud žádný obsah nebo byl odstraněn soubor cache .tpl.php. Upravte obsah stránky pro vyřešení tohoto problému.
@@ -101,7 +100,7 @@ EmptyPage=Prázdná stránka
 ExternalURLMustStartWithHttp=Externí adresa URL musí začít s http: // nebo https: //
 ZipOfWebsitePackageToImport=Nahrajte soubor ZIP balíčku šablony webové stránky
 ZipOfWebsitePackageToLoad=nebo Vyberte dostupný balíček integrovaných webových stránek
-ShowSubcontainers=Zahrnout dynamický obsah
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Interní adresa URL stránky
 ThisPageIsTranslationOf=Tato stránka / kontejner je překladem
 ThisPageHasTranslationPages=Tato stránka / kontejner obsahuje překlad
@@ -137,3 +136,4 @@ RSSFeedDesc=Pomocí této adresy URL můžete získat RSS kanál nejnovějších
 PagesRegenerated=%s regenerováno stránky / kontejnery
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/cs_CZ/withdrawals.lang b/htdocs/langs/cs_CZ/withdrawals.lang
index 1d5f1bb8ada..3e1ffcb7b3c 100644
--- a/htdocs/langs/cs_CZ/withdrawals.lang
+++ b/htdocs/langs/cs_CZ/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Poslední %s přímého inkasa debetní
 MakeWithdrawRequest=Zadejte žádost o platbu inkasem
 MakeBankTransferOrder=Proveďte žádost o převod
 WithdrawRequestsDone=%s zaznamenané žádosti o inkaso
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Kód banky subjektu
 NoInvoiceCouldBeWithdrawed=Žádná faktura nebyla odepsána úspěšně. Zkontrolujte, zda jsou faktury u společností s platným IBAN a zda má IBAN UMR (Unique Mandate Reference) s režimem <strong> %s </strong>.
 ClassCredited=Označit přidání kreditu
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Datum provedení
 CreateForSepa=Vytvořte soubor s inkasem
-ICS=Identifikátor věřitele CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - jedinečný identifikátor přiřazený ke každé transakci
 USTRD="Nestrukturovaná" značka SEPA XML
 ADDDAYS=Přidání dnů do data provedení
@@ -146,3 +148,5 @@ InfoRejectSubject=Příkaz k inkasu odmítnut
 InfoRejectMessage=Dobrý den, <br> <br> příkaz k inkasu faktury %s týkající se společnosti %s, částkou %s, byla bankou odmítnuta. <br> <br> - <br> %s
 ModeWarning=Volba pro reálný režim nebyl nastaven, můžeme zastavit tuto simulaci
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/cs_CZ/workflow.lang b/htdocs/langs/cs_CZ/workflow.lang
index 3e06aed94aa..748bd0e27d6 100644
--- a/htdocs/langs/cs_CZ/workflow.lang
+++ b/htdocs/langs/cs_CZ/workflow.lang
@@ -16,8 +16,10 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Klasifikujte propojenou prodejní o
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Označte návrh dodavatele propojeného zdroje jako fakturovaný při validaci dodavatele (a pokud je částka faktury shodná s celkovou částkou propojeného návrhu)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Zařadit propojenou objednávku zdroje jako fakturovanou fakturaci dodavatele (a pokud je částka faktury shodná s celkovou částkou propojené objednávky)
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+descWORKFLOW_BILL_ON_RECEPTION=Po ověření objednávky propojeného dodavatele klasifikujte recepce na „účtované“
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Když je lístek uzavřen, ukončete všechny zásahy spojené s lístkem
 AutomaticCreation=Automatická tvorba
 AutomaticClassification=Automatická klasifikace
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 3af2cf33fbc..4f65c3b5d02 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=Denne ydelse
 ThisProduct=Dette produkt
 DefaultForService=forvalg ydelse
 DefaultForProduct=Forvalg produkt
+ProductForThisThirdparty=Produkt til denne tredjepart
+ServiceForThisThirdparty=Service for denne tredjepart
 CantSuggest=Kan ikke foreslå
 AccountancySetupDoneFromAccountancyMenu=Hovedparten af opsætningen for regnskabet sker fra menuen %s
 ConfigAccountingExpert=Konfiguration af modulregnskabet (dobbelt indtastning)
@@ -48,6 +50,7 @@ CountriesExceptMe=Alle lande undtagen %s
 AccountantFiles=Eksporter kildedokumenter
 ExportAccountingSourceDocHelp=Med dette værktøj kan du eksportere de kildehændelser (liste og PDF-filer), der blev brugt til at generere din regnskab. For at eksportere dine tidsskrifter skal du bruge menuindgangen %s - %s.
 VueByAccountAccounting=Vis efter regnskabskonto
+VueBySubAccountAccounting=Vis efter regnskabsmæssig underkonto
 
 MainAccountForCustomersNotDefined=Standardkonto for kunder, der ikke er defineret i opsætningen
 MainAccountForSuppliersNotDefined=Hoved kontokort for leverandører, der ikke er defineret i opsætningen
@@ -144,7 +147,7 @@ NotVentilatedinAccount=Ikke bundet til regnskabskontoen
 XLineSuccessfullyBinded=%s varer/ydelser blev bundet til en regnskabskonto
 XLineFailedToBeBinded=%s varer/ydelser blev ikke bundet til en regnskabskonto
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Antal elementer, der skal bindes vist efter side (maks. Anbefalet: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maksimalt antal linjer på listen og bind siden (anbefales: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Vis siden "Ikke bogførte linjer" med de nyeste poster først
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Vis siden "Ikke bogførte linjer" med de nyeste poster først
 
@@ -198,7 +201,8 @@ Docdate=Dato
 Docref=Reference
 LabelAccount=Kontonavn
 LabelOperation=Bilagstekst
-Sens=Sens
+Sens=Retning
+AccountingDirectionHelp=For en kundes regnskabskonto skal du bruge kredit til at registrere en betaling, du har modtaget <br>. For en leverandørs regnskabskonto skal du bruge Debet til at registrere en betaling, du foretager
 LetteringCode=Bogstaver kode
 Lettering=Skrift
 Codejournal=Kladde
@@ -206,7 +210,8 @@ JournalLabel=Journalmærke
 NumPiece=Partsnummer
 TransactionNumShort=Transaktionsnr.
 AccountingCategory=Regnskabskontogrupper
-GroupByAccountAccounting=Gruppér efter regnskabskonto
+GroupByAccountAccounting=Gruppér efter hovedkontokonto
+GroupBySubAccountAccounting=Gruppér efter underkonto konto
 AccountingAccountGroupsDesc=Du kan definere her nogle grupper af regnskabskonto. De vil blive brugt til personlige regnskabsrapporter.
 ByAccounts=Konti
 ByPredefinedAccountGroups=Efter foruddefinerede grupper
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Betaling er ikke knyttet til noget produkt / tjeneste
 OpeningBalance=Åbnings balance
 ShowOpeningBalance=Vis åbningsbalance
 HideOpeningBalance=Skjul åbningsbalancen
-ShowSubtotalByGroup=Vis subtotal efter grupper
+ShowSubtotalByGroup=Vis subtotal efter niveau
 
 Pcgtype=Kontoens gruppe
 PcgtypeDesc=Kontogruppe bruges som foruddefinerede 'filter' og 'gruppering' kriterier for nogle regnskabsrapporter. For eksempel bruges 'INKOMST' eller 'UDGIFT' som grupper til regnskabsmæssige regnskaber for produkter til at oprette omkostnings- / indkomstrapporten.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Her vises listen over udgiftsrapporter linjer bundet (el
 DescVentilExpenseReportMore=Hvis du opsætter regnskabskonto på typen af ​​udgiftsrapporter, vil applikationen kunne foretage hele bindingen mellem dine udgiftsrapporter og kontoen for dit kontoplan, kun med et klik med knappen <strong> "%s" </strong>. Hvis kontoen ikke var angivet i gebyrordbog, eller hvis du stadig har nogle linjer, der ikke er bundet til nogen konto, skal du lave en manuel binding fra menuen "<strong> %s</strong>".
 DescVentilDoneExpenseReport=Her vises listen over linjerne for udgiftsrapporter og deres gebyrkonto
 
+Closure=Årlig lukning
 DescClosure=Se her antallet af bevægelser pr. Måned, der ikke er valideret og regnskabsår, der allerede er åbent
 OverviewOfMovementsNotValidated=Trin 1 / Oversigt over bevægelser, der ikke er valideret. (Nødvendigt at lukke et regnskabsår)
+AllMovementsWereRecordedAsValidated=Alle bevægelser blev registreret som godkendt
+NotAllMovementsCouldBeRecordedAsValidated=Ikke alle bevægelser kunne registreres som godkendt
 ValidateMovements=Valider bevægelser
 DescValidateMovements=Enhver ændring eller sletning af skrivning, bogstaver og sletning er forbudt. Alle poster til en øvelse skal valideres, ellers er lukning ikke mulig
-SelectMonthAndValidate=Vælg måned og valider bevægelser
 
 ValidateHistory=Automatisk Bogføring
 AutomaticBindingDone=Automatisk Bogføring
@@ -293,6 +300,7 @@ Accounted=Regnskab i hovedbog
 NotYetAccounted=Endnu ikke indregnet i hovedbog
 ShowTutorial=Vis selvstudie
 NotReconciled=Ikke afstemt
+WarningRecordWithoutSubledgerAreExcluded=Advarsel, alle handlinger uden underskrevet konto defineret filtreres og udelukkes fra denne visning
 
 ## Admin
 BindingOptions=Bindende muligheder
@@ -337,6 +345,7 @@ Modelcsv_LDCompta10=Eksport til LD Compta (v10 og nyere)
 Modelcsv_openconcerto=Eksport til OpenConcerto (Test)
 Modelcsv_configurable=Eksporter CSV Konfigurerbar
 Modelcsv_FEC=Eksport FEC
+Modelcsv_FEC2=Eksport FEC (med datagenereringsskrivning / omvendt dokument)
 Modelcsv_Sage50_Swiss=Eksport til Sage 50 Schweiz
 Modelcsv_winfic=Eksport Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Eksport til Gestinum (v3)
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index d7714c0c1df..57b913ae14a 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Udseende
 SetupArea=Indstillinger
 UploadNewTemplate=Upload nye skabelon(er)
 FormToTestFileUploadForm=Formular til test af fil upload (ifølge opsætning)
+ModuleMustBeEnabled=Modulet / applikationen <b> %s </b> skal være aktiveret
+ModuleIsEnabled=Modulet / applikationen <b> %s </b> er blevet aktiveret
 IfModuleEnabled=Note: ja er kun effektivt, hvis <b>modul %s</b> er aktiveret
 RemoveLock=Fjern/omdøbe fil <b> %s </b> hvis den eksisterer, for at tillade brug af Update/Install værktøjet.
 RestoreLock=Gendan filen <b> %s </b>, kun med tilladelse for "læsning", for at deaktivere yderligere brug af Update/Install-værktøjet.
@@ -85,7 +87,6 @@ ShowPreview=Vis forhåndsvisning
 ShowHideDetails=Vis skjul detaljer
 PreviewNotAvailable=Preview ikke tilgængeligt
 ThemeCurrentlyActive=Tema aktuelt aktive
-CurrentTimeZone=Aktuelle tidszone
 MySQLTimeZone=Tidszone MySql (database)
 TZHasNoEffect=Datoer gemmes og returneres af databaseserveren som om de blev holdt som sendt streng. Tidszonen har kun virkning, når du bruger UNIX_TIMESTAMP-funktionen (som ikke skal bruges af Dolibarr, så databasen TZ skal ikke have nogen effekt, selvom den er ændret efter indtastning af data).
 Space=Mellemrum
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Dette område giver administrationsfunktioner. Brug menuen t
 Purge=Ryd
 PurgeAreaDesc=På denne side kan du slette alle filer, der er genereret eller gemt af Dolibarr (midlertidige filer eller alle filer i <b> %s </b> bibliotek). Brug af denne funktion er normalt ikke nødvendig. Den leveres som en løsning for brugere, hvis Dolibarr er vært for en udbyder, der ikke tilbyder tilladelser til at slette filer genereret af webserveren.
 PurgeDeleteLogFile=Slet log-filer, herunder <b>%s</b> oprettet til Syslog-modul (ingen risiko for at miste data)
-PurgeDeleteTemporaryFiles=Slet alle midlertidige filer (ingen risiko for at miste data). Bemærk: Sletning udføres kun, hvis "temp" biblioteket blev oprettet for 24 timer siden.
-PurgeDeleteTemporaryFilesShort=Slet midlertidige filer
+PurgeDeleteTemporaryFiles=Slet alle logfiler og midlertidige filer (ingen risiko for at miste data). Bemærk: Sletning af midlertidige filer udføres kun, hvis temp-biblioteket blev oprettet for mere end 24 timer siden.
+PurgeDeleteTemporaryFilesShort=Slet logfiler og midlertidige filer
 PurgeDeleteAllFilesInDocumentsDir=Slet alle filer i mappen: <b> %s </b>. <br> Dette vil slette alle genererede dokumenter relateret til elementer (tredjeparter, fakturaer osv. ..), filer uploadet til ECM modulet, database backup dumps og midlertidige filer.
 PurgeRunNow=Rensningsanordningen nu
 PurgeNothingToDelete=Ingen mappe eller filer, der skal slettes.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Foretrukne partnere
 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>
 HelpCenterDesc1=Her er nogle ressourcer til at få hjælp og support med Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Eksempler med den nuværende konfiguration
 ListOfDirectories=Liste over OpenDocument-skabeloner mapper
 ListOfDirectoriesForModelGenODT=Liste over mapper, som indeholder skabeloner filer med OpenDocument format.<br><br>her fulde sti til mapper.<br>Føjer vognretur mellem eah mappe.<br / >for At tilføje en mappe af GED modul, tilføje her <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Filer i disse mapper skal ende med <b>.odt</b> eller <b>.ods</b>.
 NumberOfModelFilesFound=Antal ODT / ODS-template filer, der findes i disse mapper
-ExampleOfDirectoriesForModelGen=Eksempler på syntaks: <br> c: \\ mydir <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Eksempler på syntaks: <br> c: \\ myapp \\ mydocumentdir \\ mysubdir <br> / home / myapp / mydocumentdir / mysubdir <br> DOL_DATA_ROOT / ecm / ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> At vide hvordan du opretter dine odt dokumentskabeloner, før gemme dem i disse mapper, skal du læse wiki dokumentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Placering af fornavn / navn
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametre for at sikre URL'er
 SecurityTokenIsUnique=Brug en unik securekey parameter for hver enkelt webadresse
 EnterRefToBuildUrl=Indtast reference for objekter %s
 GetSecuredUrl=Få beregnet URL
-ButtonHideUnauthorized=Skjul knapper til brugere uden for administrasjon for uautoriserede handlinger i stedet for at vise gråaktiverede knapper
+ButtonHideUnauthorized=Skjul uautoriserede handlingsknapper også for interne brugere (bare ellers gråtonet)
 OldVATRates=Gammel momssats
 NewVATRates=Ny momssats
 PriceBaseTypeToChange=Rediger priser med basisreferenceværdi defineret på
@@ -668,7 +670,7 @@ Module54000Desc=Direkte udskrivning (uden at åbne dokumenterne) ved hjælp af I
 Module55000Name=Afstemning, Undersøgelse eller Afstemning
 Module55000Desc=Opret online afstemninger, undersøgelser eller stemmer (som Doodle, Studs, RDVz osv. ..)
 Module59000Name=Margin
-Module59000Desc=Modul til at styre avancer
+Module59000Desc=Modul til at følge margener
 Module60000Name=Kommissioner
 Module60000Desc=Modul til at håndtere Kommissioner
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ YouUseBestDriver=Du bruger driver %s, som er den bedste driver, der for øjeblik
 YouDoNotUseBestDriver=Du bruger driveren %s, men driveren %s anbefales.
 NbOfObjectIsLowerThanNoPb=Du har kun %s %s i databasen. Dette kræver ingen særlig optimering.
 SearchOptim=Søg optimering
-YouHaveXObjectUseSearchOptim=Du har %s %s i databasen. Du skal tilføje den konstante %s til 1 i Home-Setup-Other. Begræns søgningen til begyndelsen af strenge, hvilket gør det muligt for databasen at bruge indekser, og du skal få et øjeblikkeligt svar.
+YouHaveXObjectUseSearchOptim=Du har %s %s i databasen. Du kan tilføje konstanten %s til 1 i Hjem-Setup-Andre. Begræns søgningen til begyndelsen af strenge, som gør det muligt for databasen at bruge indekser, og du skal få et øjeblikkeligt svar.
 YouHaveXObjectAndSearchOptimOn=Du har %s %s i databasen, og konstant %s er indstillet til 1 i Home-Setup-Other.
 BrowserIsOK=Du bruger browseren %s. Denne browser er ok for sikkerhed og ydeevne.
 BrowserIsKO=Du bruger browseren %s. Denne browser er kendt for at være et dårligt valg for sikkerhed, ydeevne og pålidelighed. Vi anbefaler at bruge Firefox, Chrome, Opera eller Safari.
@@ -1596,8 +1598,13 @@ ServiceSetup=Installation af servicemoduler
 ProductServiceSetup=Opsætning af Varer/ydelser-modul
 NumberOfProductShowInSelect=Maksimalt antal produkter, der skal vises i kombinationsvalglister (0 = ingen grænse)
 ViewProductDescInFormAbility=Vis produktbeskrivelser i formularer (ellers vist i en værktøjstip-popup)
+DoNotAddProductDescAtAddLines=Tilføj ikke produktbeskrivelse (fra produktkort) på indsend tilføjelseslinjer på formularer
+OnProductSelectAddProductDesc=Sådan bruges beskrivelsen af produkterne, når du tilføjer et produkt som en linje i et dokument
+AutoFillFormFieldBeforeSubmit=Udfyld automatisk indtastningsfeltet med beskrivelsen af produktet
+DoNotAutofillButAutoConcat=Udfyld ikke indtastningsfeltet automatisk med produktbeskrivelse. Produktbeskrivelsen sammenkædes automatisk med den indtastede beskrivelse.
+DoNotUseDescriptionOfProdut=Produktbeskrivelse vil aldrig blive inkluderet i beskrivelsen af dokumentlinjer
 MergePropalProductCard=Aktivér i produkt / tjeneste Vedhæftede filer fanen en mulighed for at fusionere produkt PDF-dokument til forslag PDF azur hvis produkt / tjeneste er i forslaget
-ViewProductDescInThirdpartyLanguageAbility=Vis produktbeskrivelser på tredjeparts sprog
+ViewProductDescInThirdpartyLanguageAbility=Vis produktbeskrivelser i formularer på tredjeparts sprog (ellers på brugerens sprog)
 UseSearchToSelectProductTooltip=Også hvis du har et stort antal produkter (> 100 000), kan du øge hastigheden ved at indstille konstant PRODUCT_DONOTSEARCH_ANYWHERE til 1 i Setup-> Other. Søgningen er så begrænset til starten af ​​strengen.
 UseSearchToSelectProduct=Vent, indtil du trykker på en tast, inden du læser indholdet af produktkombinationslisten (dette kan øge ydeevnen, hvis du har et stort antal produkter, men det er mindre praktisk)
 SetDefaultBarcodeTypeProducts=Standard stregkodetype, der skal bruges til varer
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personlige menuer, der ikke er knyttet til en topmenu
 NewMenu=Ny menu
 MenuHandler=Menu handling
 MenuModule=Kilde modul
-HideUnauthorizedMenu= Skjul uautoriserede menuer (grå)
+HideUnauthorizedMenu=Skjul uautoriserede menuer også for interne brugere (bare gråtonet ellers)
 DetailId=Id menuen
 DetailMenuHandler=Menu handling, hvor der viser ny menu
 DetailMenuModule=Modul navn, hvis menuen indrejse kommer fra et modul
@@ -1983,11 +1990,12 @@ EMailHost=Vært af e-mail-IMAP-server
 MailboxSourceDirectory=Postkasse kilde bibliotek
 MailboxTargetDirectory=Postkasse målkatalog
 EmailcollectorOperations=Operationer at gøre af samleren
+EmailcollectorOperationsDesc=Opgaver udføres fra øverste til nederste ordre
 MaxEmailCollectPerCollect=Maks antal Emails indsamlet pr. Samling
 CollectNow=Indsamle nu
 ConfirmCloneEmailCollector=Er du sikker på, at du vil klone Email samleren %s?
-DateLastCollectResult=Dato seneste indsamlet prøvet
-DateLastcollectResultOk=Dato seneste indsamling succesfuld
+DateLastCollectResult=Dato for seneste indsamlingsforsøg
+DateLastcollectResultOk=Dato for seneste succes med indsamling
 LastResult=Seneste resultat
 EmailCollectorConfirmCollectTitle=Email samle bekræftelse
 EmailCollectorConfirmCollect=Vil du køre kollektionen for denne samler nu?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Besked fra en samtale startet af en første e-mail sendt fra D
 WithoutDolTrackingID=Besked fra en samtale startet af en første e-mail, der IKKE blev sendt fra Dolibarr
 WithDolTrackingIDInMsgId=Besked sendt fra Dolibarr
 WithoutDolTrackingIDInMsgId=Besked IKKE sendt fra Dolibarr
-CreateCandidature=Opret kandidatur
+CreateCandidature=Opret jobansøgning
 FormatZip=Postnummer
 MainMenuCode=Menu indtastningskode (hovedmenu)
 ECMAutoTree=Vis automatisk ECM-træ
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Land (hvis det er specifikt for et givet land)
 YouMayFindSecurityAdviceHere=Du kan finde sikkerhedsrådgivning her
 ModuleActivatedMayExposeInformation=Dette modul kan udsætte følsomme data. Hvis du ikke har brug for det, skal du deaktivere det.
 ModuleActivatedDoNotUseInProduction=Et modul designet til udviklingen er blevet aktiveret. Aktivér det ikke i et produktionsmiljø.
+CombinationsSeparator=Separatorkarakter til produktkombinationer
+SeeLinkToOnlineDocumentation=Se link til online dokumentation i topmenuen for eksempler
+SHOW_SUBPRODUCT_REF_IN_PDF=Hvis funktionen "%s" i modul <b> %s </b> bruges, skal du vise detaljer om delprodukter af et sæt på PDF.
+AskThisIDToYourBank=Kontakt din bank for at få dette ID
diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang
index add4d042a86..c1fb2a83106 100644
--- a/htdocs/langs/da_DK/banks.lang
+++ b/htdocs/langs/da_DK/banks.lang
@@ -173,10 +173,11 @@ SEPAMandate=SEPA mandat
 YourSEPAMandate=Dit SEPA mandat
 FindYourSEPAMandate=Dette er dit SEPA-mandat til at give vores firma tilladelse til at foretage en direkte debitering til din bank. Ret det underskrevet (scan af det underskrevne dokument) eller send det pr. Mail til
 AutoReportLastAccountStatement=Udfyld automatisk feltet 'antal kontoudtog' med det sidste erklæringsnummer, når du foretager afstemning
-CashControl=POS kontant terminal
-NewCashFence=Nyt kontanthegn
+CashControl=POS kasse apparats kontrol
+NewCashFence=Ny kasse apparat  lukker
 BankColorizeMovement=Farvelæg bevægelser
 BankColorizeMovementDesc=Hvis denne funktion er aktiveret, kan du vælge specifik baggrundsfarve til debet- eller kreditbevægelser
 BankColorizeMovementName1=Baggrundsfarve til debetbevægelse
 BankColorizeMovementName2=Baggrundsfarve til kreditbevægelse
 IfYouDontReconcileDisableProperty=Hvis du ikke foretager bankafstemninger på nogle bankkonti, skal du deaktivere ejerskab "%s" på dem for at fjerne denne advarsel.
+NoBankAccountDefined=Ingen bankkonto defineret
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index a996f7a199a..07502e953de 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -207,7 +207,7 @@ UnvalidateBill=Fjern godkendelse af faktura
 NumberOfBills=Antal fakturaer
 NumberOfBillsByMonth=Antal fakturaer pr. Måned
 AmountOfBills=Mængden af fakturaer
-AmountOfBillsHT=Fakturabeløb (ekskl. Skat)
+AmountOfBillsHT=Fakturabeløb (ekskl. moms)
 AmountOfBillsByMonthHT=Mængden af ​​fakturaer efter måned (ekskl. moms)
 UseSituationInvoices=Tillad midlertidig faktura
 UseSituationInvoicesCreditNote=Tillad midlertidig faktura kreditnota
@@ -531,6 +531,7 @@ TypeContact_invoice_supplier_external_SERVICE=Leverandørens kontakt
 InvoiceFirstSituationAsk=Første faktura
 InvoiceFirstSituationDesc=<B> Situationsfakturaerne </b> er bundet til situationer, der er relateret til en progression, for eksempel fremdriften af ​​en konstruktion. Hver situation er bundet til en faktura.
 InvoiceSituation=Kontoudtog
+PDFInvoiceSituation=Kontoudtog
 InvoiceSituationAsk=Faktura efter kontoudtog
 InvoiceSituationDesc=Opret en ny situation efter en allerede eksisterende
 SituationAmount=Kontoudtog beløb (netto)
@@ -575,3 +576,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Leverandørfaktura slettet
 UnitPriceXQtyLessDiscount=Enhedspris x Antal - Rabat
 CustomersInvoicesArea=Kunde fakturerings område
 SupplierInvoicesArea=Leverandør fakturerings område 
+FacParentLine=Faktura Line Parent
+SituationTotalRayToRest=Resten til at betale uden skat
+PDFSituationTitle=Situation nr. %d
+SituationTotalProgress=Samlet fremskridt %d %%
diff --git a/htdocs/langs/da_DK/blockedlog.lang b/htdocs/langs/da_DK/blockedlog.lang
index 186fadbf852..cc7298bf441 100644
--- a/htdocs/langs/da_DK/blockedlog.lang
+++ b/htdocs/langs/da_DK/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logisk sletning
 logMEMBER_SUBSCRIPTION_CREATE=Medlem abonnement oprettet
 logMEMBER_SUBSCRIPTION_MODIFY=Medlems abonnement ændret
 logMEMBER_SUBSCRIPTION_DELETE=Medlems abonnement logisk sletning
-logCASHCONTROL_VALIDATE=Registrering af kontanthegn
+logCASHCONTROL_VALIDATE=Optagelse ved lukning af kasse apparatet 
 BlockedLogBillDownload=Kundefaktura download
 BlockedLogBillPreview=Kunde faktura preview
 BlockedlogInfoDialog=Log detaljer
diff --git a/htdocs/langs/da_DK/boxes.lang b/htdocs/langs/da_DK/boxes.lang
index 1481c03b97f..dfa01d60748 100644
--- a/htdocs/langs/da_DK/boxes.lang
+++ b/htdocs/langs/da_DK/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Nyeste %s modificerede styklister
 BoxTitleLatestModifiedMos=Seneste %s ændrede produktionsordrer
+BoxTitleLastOutstandingBillReached=Kunder med maksimalt udestående overskredet
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Blytragt
 FailedToRefreshDataInfoNotUpToDate=Kunne ikke opdatere RSS-flux. Seneste succesfulde opdateringsdato: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=Ingen bogmærker defineret.
@@ -83,8 +86,8 @@ BoxTitleLatestModifiedSupplierOrders=Leverandør Ordrer: senest %s ændret
 BoxTitleLastModifiedCustomerBills=Kundefakturaer: sidst %s ændret
 BoxTitleLastModifiedCustomerOrders=Salgsordrer: sidst %s ændret
 BoxTitleLastModifiedPropals=Seneste %s tilrettede tilbud
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Seneste %s ændrede job
+BoxTitleLatestModifiedCandidatures=Seneste %s ændrede kandidaturer
 ForCustomersInvoices=Kundernes fakturaer
 ForCustomersOrders=Customers orders
 ForProposals=Tilbud
@@ -92,8 +95,8 @@ LastXMonthRolling=The latest %s month rolling
 ChooseBoxToAdd=Add widget to your dashboard
 BoxAdded=Box blev tilføjet til dit instrumentbræt
 BoxTitleUserBirthdaysOfMonth=Fødselsdage i denne måned (brugere)
-BoxLastManualEntries=Sidste manuelle poster i regnskab
-BoxTitleLastManualEntries=%s seneste manuelle indtastninger
+BoxLastManualEntries=Seneste post i regnskab indtastet manuelt eller uden kildedokument
+BoxTitleLastManualEntries=%s seneste post indtastet manuelt eller uden kildedokument
 NoRecordedManualEntries=Der er ikke registreret nogen manuelle poster i regnskab
 BoxSuspenseAccount=Tæl regnskab drift med midlertidig konto
 BoxTitleSuspenseAccount=Antal ikke-tildelte linjer
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Midlertidig konto er ikke defineret
 BoxLastCustomerShipments=Sidste kunde forsendelser
 BoxTitleLastCustomerShipments=Nyeste %s forsendelser kunde
 NoRecordedShipments=Ingen registreret kundeforsendelse
+BoxCustomersOutstandingBillReached=Kunder med en udestående grænse nået
 # Pages
 AccountancyHome=Bogføring
+ValidatedProjects=Validerede projekter
diff --git a/htdocs/langs/da_DK/cashdesk.lang b/htdocs/langs/da_DK/cashdesk.lang
index bcba80e2087..9f5abd81617 100644
--- a/htdocs/langs/da_DK/cashdesk.lang
+++ b/htdocs/langs/da_DK/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Sidefod
 AmountAtEndOfPeriod=Beløb ved udgangen af perioden (dag, måned eller år)
 TheoricalAmount=Teoretisk mængde
 RealAmount=Reelt beløb
-CashFence=Kontant begrænsning 
-CashFenceDone=Cash fence gjort for perioden
+CashFence=Lukning af kasseapperat
+CashFenceDone=Lukning af kasseapparat udført for perioden
 NbOfInvoices=Antal fakturaer
 Paymentnumpad=numerisk tastatur til at indtaste betaling
 Numberspad=Numerisk tastatur
@@ -77,7 +77,7 @@ POSModule=POS Modulet
 BasicPhoneLayout=Brug grundlæggende layout til telefoner
 SetupOfTerminalNotComplete=Opsætning af terminal %s er ikke afsluttet
 DirectPayment=Direkte betaling
-DirectPaymentButton=Add a "Direct cash payment" button
+DirectPaymentButton=Tilføj en "Direkte kontant betaling" -knap
 InvoiceIsAlreadyValidated=Fakturaen er allerede valideret
 NoLinesToBill=Ingen linjer til fakturering
 CustomReceipt=Tilpasset kvittering
@@ -94,13 +94,14 @@ TakeposConnectorMethodDescription=Eksternt modul med ekstra funktioner. Mulighed
 PrintMethod=Udskrivningsmetode
 ReceiptPrinterMethodDescription=Kraftig metode med en masse parametre. Fuld tilpasning med skabeloner. Kan ikke udskrive fra cloud.
 ByTerminal=Med terminal
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
+TakeposNumpadUsePaymentIcon=Brug ikonet i stedet for tekst på betalingsknapperne på numpad
 CashDeskRefNumberingModules=Nummereringsmodul til POS-salg
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b>  tag bruges til at tilføje terminal nummere
 TakeposGroupSameProduct=Grupper sammen produktlinjer
 StartAParallelSale=Start et nyt parallelt salg
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Luk kontantindhold
+SaleStartedAt=Salget startede den %s
+ControlCashOpening=Kontroller kontant beholdning ved åbning af POS
+CloseCashFence=Luk kontrol af kasseapparatet 
 CashReport=Kontantrapport
 MainPrinterToUse=Fortrukket printer til brug
 OrderPrinterToUse=Bestil printer, der skal bruges
@@ -117,8 +118,9 @@ HideCategoryImages=Skjul Kategori billeder
 HideProductImages=Skjul produktbilleder
 NumberOfLinesToShow=Antal linjer af billeder, der skal vises
 DefineTablePlan=Definer tabeller planlægger
-GiftReceiptButton=Add a "Gift receipt" button
-GiftReceipt=Gift receipt
-ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
-AllowDelayedPayment=Allow delayed payment
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+GiftReceiptButton=Tilføj en "gavekvittering" -knap
+GiftReceipt=Gavekvittering
+ModuleReceiptPrinterMustBeEnabled=Modul kvitterings printer skal først være aktiveret
+AllowDelayedPayment=Tillad forsinket betaling
+PrintPaymentMethodOnReceipts=Udskriv betalingsmetode på billetter | kvitteringer
+WeighingScale=Vægt skala 
diff --git a/htdocs/langs/da_DK/categories.lang b/htdocs/langs/da_DK/categories.lang
index 18b12b53318..881d4fe22c6 100644
--- a/htdocs/langs/da_DK/categories.lang
+++ b/htdocs/langs/da_DK/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projekter tags/kategorier område
 UsersCategoriesArea=Brugere tags / kategorier område
 SubCats=Sub-kategorier
 CatList=Liste over tags/kategorier
+CatListAll=Liste over tags / kategorier (alle typer)
 NewCategory=Nyt tag/kategori
 ModifCat=Rediger tag/kategori
 CatCreated=Tag/kategori oprettet
@@ -65,16 +66,22 @@ UsersCategoriesShort=Brugere tags / kategorier
 StockCategoriesShort=Lagermærker / kategorier
 ThisCategoryHasNoItems=Denne kategori indeholder ikke nogen produkter.
 CategId=Tag/kategori id
-CatSupList=Liste over leverandør tags / kategorier
-CatCusList=Liste over kunde/potentiel kunde tags/kategorier
+ParentCategory=Overordnet tag / kategori
+ParentCategoryLabel=Mærke for overordnet tag / kategori
+CatSupList=Liste over leverandørmærker / kategorier
+CatCusList=Liste over kunder / potentielle tags / kategorier
 CatProdList=Liste over tags/kategorier for varer
 CatMemberList=Liste over medlemmer tags/kategorier
-CatContactList=Liste over kontaktmærker/kategorier
-CatSupLinks=Links mellem leverandører og tags/kategorier
+CatContactList=Liste over kontaktkoder / kategorier
+CatProjectsList=Liste over projekter tags / kategorier
+CatUsersList=Liste over brugers tags / kategorier
+CatSupLinks=Links mellem leverandører og tags / kategorier
 CatCusLinks=Links mellem kunder/potentielle kunder og tags/kategorier
 CatContactsLinks=Links mellem kontakter / adresser og tags / kategorier
 CatProdLinks=Links mellem varer/ydelser og tags/kategorier
-CatProJectLinks=Links mellem projekter og tags/kategorier
+CatMembersLinks=Links mellem medlemmer og tags / kategorier
+CatProjectsLinks=Links mellem projekter og tags/kategorier
+CatUsersLinks=Links mellem brugere og tags / kategorier
 DeleteFromCat=Fjern fra tags/kategori
 ExtraFieldsCategories=Supplerende attributter
 CategoriesSetup=Tags/kategorier opsætning
diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index 76b286db769..c01f19fef89 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Kontroller moms nummer på EU webside
 VATIntraManualCheck=Du kan også tjekke manuelt på Europa-Kommissionens websted <a href="%s" target="_blank"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Kontrol er ikke muligt. Denne service leveres ikke af medlemsstaten (%s).
 NorProspectNorCustomer=Ikke mulighedder eller kunde
-JuridicalStatus=Juridisk enhedstype
+JuridicalStatus=Forretningsenhedstype
 Workforce=Arbejdskraft
 Staff=Medarbejdere
 ProspectLevelShort=Potentiale
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index 22641410445..67d0f186df3 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -111,7 +111,7 @@ Refund=Tilbagebetaling
 SocialContributionsPayments=Betalinger af skat/afgift
 ShowVatPayment=Vis momsbetaling
 TotalToPay=At betale i alt
-BalanceVisibilityDependsOnSortAndFilters=Balancen er kun synlig i denne liste, hvis tabellen sorteres stigende på %s og filtreret til 1 bankkonto
+BalanceVisibilityDependsOnSortAndFilters=Saldo er kun synlig på denne liste, hvis tabellen er sorteret på %s og filtreret på 1 bankkonto (uden andre filtre)
 CustomerAccountancyCode=Regnskabskode for kunde
 SupplierAccountancyCode=Sælgers regnskabskode
 CustomerAccountancyCodeShort=Cust. konto. kode
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Er du sikker på, at du vil slette denne betalin
 ExportDataset_tax_1=Betalinger af skatter/afgifter
 CalcModeVATDebt=Indstilling <b> %sMoms på forpligtelseskonto%s </b>.
 CalcModeVATEngagement=Mode <b> %sVAT på indkomst-udgifter%s </ b>.
-CalcModeDebt=Analyse af kendte registrerede fakturaer, selvom de endnu ikke er bogført i hovedbogen.
+CalcModeDebt=Analyse af kendte registrerede dokumenter, selvom de endnu ikke er bogført i hovedbogen.
 CalcModeEngagement=Analyse af kendte registrerede betalinger, selvom de endnu ikke er indregnet i hovedbogen.
 CalcModeBookkeeping=Analyse af data journaliseret i bogførings tabelen.
 CalcModeLT1= Mode <b> %sRE på kundefakturaer - leverandører invoices%s </b>
@@ -154,10 +154,10 @@ AnnualSummaryInputOutputMode=Balance mellem indtægter og udgifter, årligt samm
 AnnualByCompanies=Indkomst- og udgiftsbalance, pr. Foruddefinerede regnskabet
 AnnualByCompaniesDueDebtMode=Indkomst- og udgiftsbalance, detaljer ved foruddefinerede grupper, tilstand <b> %sClaims-Debts%s </b> sagde <b> Forpligtelsesregnskab </b>.
 AnnualByCompaniesInputOutputMode=Indkomst- og udgiftsbalance, detaljer ved foruddefinerede grupper, tilstand <b> %sIncomes-Expenses%s </b> sagde <b> kontantregnskab </b>.
-SeeReportInInputOutputMode=Se %sanalyse af betaling%s for en beregning af faktiske betalinger foretaget, selvom de endnu ikke er opført i hovedbogen.
-SeeReportInDueDebtMode=Se %sanalyse af faktura%s for en beregning baseret på kendte registrerede fakturaer, selvom de endnu ikke er opført i hovedbogen.
-SeeReportInBookkeepingMode=Se <b> %skassekladde report%s </b> til en beregning på <b> kasssekladdens tabelen </b>
-RulesAmountWithTaxIncluded=- De viste beløb er med alle inkl. moms
+SeeReportInInputOutputMode=Se <b> %sanalyse af betalinger%s </b> for en beregning baseret på <b> registrerede betalinger </b> foretaget, selvom de endnu ikke er registreret i Ledger
+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.
 RulesCADue=- Det inkluderer kundens forfaldne fakturaer, uanset om de er betalt eller ej.<br> - Det er baseret på faktureringsdatoen for disse fakturaer.<br>
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Det viser kontoer i din hovedbog med regnskab
 SeePageForSetup=Se menuen <a href="%s"> %s </a> til opsætning
 DepositsAreNotIncluded=- Betalingsfakturaer er ikke inkluderet
 DepositsAreIncluded=- Fakturaer med forudbetaling er inkluderet
+LT1ReportByMonth=Skat 2-rapport efter måned
+LT2ReportByMonth=Skat 3-rapport efter måned
 LT1ReportByCustomers=Indberette skat 2 af tredjepart
 LT2ReportByCustomers=Indberette skat 3 af tredjepart
 LT1ReportByCustomersES=Rapport fra tredjemand RE
 LT2ReportByCustomersES=Rapport fra tredjepart IRPF
 VATReport=Salgsskat rapport
 VATReportByPeriods=Salgsskat rapport efter periode
+VATReportByMonth=Salgsmoms rapport efter måned
 VATReportByRates=Salgsskat rapport med satser
 VATReportByThirdParties=Salgsskatterapport fra tredjepart
 VATReportByCustomers=Salgsskat rapport af kunde
diff --git a/htdocs/langs/da_DK/cron.lang b/htdocs/langs/da_DK/cron.lang
index af3f09161a9..ed3fbc88478 100644
--- a/htdocs/langs/da_DK/cron.lang
+++ b/htdocs/langs/da_DK/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup=Planlagt opsætning af jobstyring
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+URLToLaunchCronJobs=URL til at kontrollere og starte kvalificerede cron-job fra en browser
+OrToLaunchASpecificJob=Eller for at kontrollere og starte et bestemt job fra en browser
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Kommandolinje for at kontrollere og starte kvalificerede cron-job
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=På Microsoft (tm) Windows-miljø kan du bruge Scheduled Task-værktøjer til at køre kommandolinjen hvert 5. minut
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Metode %s af klasse %s er i sortliste over forbudte metoder
 CronJobDefDesc=Cron-jobprofiler er defineret i modulbeskrivelsesfilen. Når modulet er aktiveret, er de indlæst og tilgængeligt, så du kan administrere jobene fra adminværktøjsmenuen %s.
 CronJobProfiles=Liste over forud definerede cron jobprofiler
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Antal lanceringer
 CronMaxRun=Maksimalt antal lanceringer
 CronEach=Every
 JobFinished=Job startet og gennemført
+Scheduled=Planlagt
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -56,7 +58,7 @@ CronNote=Kommentar
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status ved modul installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Tidsplan
 CronStatusInactiveBtn=Deaktivere
 CronTaskInactive=This job is disabled
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Opret en lokal database dump. Parametre er: komprimering ('gz' eller 'bz' eller 'ingen'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' eller filnavn til opbygning, antal backupfiler
 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=Datarenser og anonymizer
+JobXMustBeEnabled=Job %s skal være aktiveret
+# Cron Boxes
+LastExecutedScheduledJob=Sidste udførte planlagte job
+NextScheduledJobExecute=Næste planlagte job, der skal udføres
+NumberScheduledJobError=Antal planlagte job med fejl
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index 9306acbcee1..96148c9c1a8 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -1,12 +1,14 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=No error, we commit
+NoErrorCommitIsDone=Ingen fejl, vi begår
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=E-mail%s er forkert
+ErrorBadMXDomain=E-mail %s virker forkert (domæne har ingen gyldig MX-post)
 ErrorBadUrl=Url %s er forkert
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b> %s </b> findes allerede.
 ErrorLoginAlreadyExists=Log ind %s eksisterer allerede.
 ErrorGroupAlreadyExists=Gruppe %s eksisterer allerede.
 ErrorRecordNotFound=Optag ikke fundet.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Nogle krævede felter ikke var fyldt.
 ErrorSubjectIsRequired=Emne er påkrævet
 ErrorFailedToCreateDir=Det lykkedes ikke at oprette en mappe. Kontroller, at web-serveren bruger har tilladelse til at skrive i Dolibarr dokumenter bibliotek. Hvis parameter <b>safe_mode</b> er aktiveret på dette PHP, kontrollere, at Dolibarr php filer ejer til web-serveren bruger (eller gruppe).
 ErrorNoMailDefinedForThisUser=Ingen e-mail defineret for denne bruger
+ErrorSetupOfEmailsNotComplete=Opsætningen af e-mails er ikke afsluttet
 ErrorFeatureNeedJavascript=Denne funktion kræver, at javascript aktiveres for at fungere. Skift dette i setup - display.
 ErrorTopMenuMustHaveAParentWithId0=En menu af type 'Top' kan ikke have en forælder menuen. Sæt 0 i moderselskabet menu eller vælge en menu af typen »Venstre«.
 ErrorLeftMenuMustHaveAParentId=En menu af typen »Venstre« skal have en forælder id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matchende er ikke komplet.
 ErrorLDAPMakeManualTest=A. LDIF-fil er blevet genereret i mappen %s. Prøv at indlæse den manuelt fra kommandolinjen for at få flere informationer om fejl.
 ErrorCantSaveADoneUserWithZeroPercentage=Kan ikke gemme en handling med "status ikke startet", hvis feltet "udført af" også er udfyldt.
-ErrorRefAlreadyExists=Ref bruges til oprettelse eksisterer allerede.
+ErrorRefAlreadyExists=Reference <b> %s </b> findes allerede.
 ErrorPleaseTypeBankTransactionReportName=Indtast venligst kontoudskriftsnavnet, hvor indgangen skal rapporteres (Format YYYYMM eller YYYYMMDD)
 ErrorRecordHasChildren=Kunne ikke slette rekord, da det har nogle børneposter.
 ErrorRecordHasAtLeastOneChildOfType=Objektet har mindst et under objekt af type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Du skal vælge, om artiklen er en
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Den rabat, du forsøger at anvende, er større end det der forblive at betale. Opdel rabatten i 2 mindre rabatter før.
 ErrorFileNotFoundWithSharedLink=Filen blev ikke fundet. Det kan være, at dele nøglen blev ændret eller filen blev fjernet for nylig.
 ErrorProductBarCodeAlreadyExists=Produktets stregkode %s eksisterer allerede på en anden produktreference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Bemærk også, at brug af virtuelt produkt med automatisk forøgelse / nedsættelse af underprodukter ikke er mulig, når mindst et underprodukt (eller underprodukt af underprodukter) har brug for et serienummer / parti nummer.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Bemærk også, at det ikke er muligt at bruge sæt til automatisk forøgelse / formindskelse af underprodukter, når mindst et underprodukt (eller underprodukt af underprodukter) har brug for et serienummer / lotnummer.
 ErrorDescRequiredForFreeProductLines=Beskrivelse er obligatorisk for linjer med gratis produkt
 ErrorAPageWithThisNameOrAliasAlreadyExists=Siden / beholderen <strong> %s </ strong> har samme navn eller alternativt alias som den, du forsøger at bruge
 ErrorDuringChartLoad=Fejl ved indlæsning af kontoplan. Hvis nogle konti ikke blev indlæst, kan du stadig indtaste dem manuelt.
@@ -240,9 +243,19 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Ikke tilstrækkelig mængde
 ErrorOnlyOneFieldForGroupByIsPossible=Kun 1 felt for 'Group by' er muligt (andre kasseres)
 ErrorTooManyDifferentValueForSelectedGroupBy=Fundet for mange forskellig værdi (mere end <b>%s</b>) til feltet '<b>%s</b>', så vi ikke kan bruge det som en 'gruppe af' for grafik. Feltet 'Gruppe Af' er blevet fjernet. Kan være du ønskede at bruge det som en X-akse?
 ErrorReplaceStringEmpty=Fejl, strengen, der skal erstattes til, er tom
-ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
-ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
-ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorProductNeedBatchNumber=Fejl, produkt '<b> %s </b>' har brug for meget / serienummer
+ErrorProductDoesNotNeedBatchNumber=Fejl, produkt '<b> %s </b>' accepterer ikke meget / serienummer
+ErrorFailedToReadObject=Fejl, objektet af typen <b> kunne ikke læses %s </b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Fejl, parameter <b> %s </b> skal aktiveres i <b> conf / conf.php <b> for at tillade brug af kommandolinjegrænsefladen af den interne jobplanlægning
+ErrorLoginDateValidity=Fejl, dette login er uden for gyldighedsdatointervallet
+ErrorValueLength=Feltets længde '<b> %s </b>' skal være højere end '<b> %s </b>'
+ErrorReservedKeyword=Ordet '<b> %s </b>' er et forbeholdt nøgleord
+ErrorNotAvailableWithThisDistribution=Ikke tilgængelig med denne distribution
+ErrorPublicInterfaceNotEnabled=Offentlig grænseflade var ikke aktiveret
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Sprog for den nye side skal defineres, hvis det er indstillet som en oversættelse af en anden side
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Sprog på den nye side må ikke være kildesproget, hvis det er indstillet som en oversættelse af en anden side
+ErrorAParameterIsRequiredForThisOperation=En parameter er obligatorisk for denne handling
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Din PHP-parameter upload_max_filesize (%s) er højere end PHP-parameter post_max_size (%s). Dette er ikke en ensartet opsætning.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Advarsel, antallet af forskellige modtagere er begrænset til <b> %s </ b>, når du bruger massehandlingerne på lister
 WarningDateOfLineMustBeInExpenseReportRange=Advarsel, datoen for linjen ligger ikke inden for udgiftsrapporten
+WarningProjectDraft=Projektet er stadig i kladdetilstand. Glem ikke at validere det, hvis du planlægger at bruge opgaver.
 WarningProjectClosed=Projektet er lukket. Du skal genåbne det først.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Nogle banktransaktioner blev fjernet, efter at kvitteringen inklusive dem blev genereret. Så nb af kontroller og det samlede antal modtagelser kan afvige fra antal og total på listen.
-WarningFailedToAddFileIntoDatabaseIndex=Advarsel, kunne ikke tilføje filpost i ECM-databasens indekstabel
+WarningFailedToAddFileIntoDatabaseIndex=Advarsel! Kunne ikke tilføje filindtastning i ECM-databaseindekstabellen
+WarningTheHiddenOptionIsOn=Advarsel, den skjulte mulighed <b> %s </b> er aktiveret.
+WarningCreateSubAccounts=Advarsel, du kan ikke oprette en underkonto direkte, du skal oprette en tredjepart eller en bruger og tildele dem en regnskabskode for at finde dem på denne liste
+WarningAvailableOnlyForHTTPSServers=Kun tilgængelig, hvis du bruger HTTPS-sikret forbindelse.
diff --git a/htdocs/langs/da_DK/exports.lang b/htdocs/langs/da_DK/exports.lang
index 5f05261b9c9..3b1b4072def 100644
--- a/htdocs/langs/da_DK/exports.lang
+++ b/htdocs/langs/da_DK/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Nøgle (kolonne), der skal bruges til <b> opdatering </ b> e
 NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+StocksWithBatch=Lager og placering (lager) af produkter med batch / serienummer
diff --git a/htdocs/langs/da_DK/mailmanspip.lang b/htdocs/langs/da_DK/mailmanspip.lang
index bab4b3576b4..b0f19f96de9 100644
--- a/htdocs/langs/da_DK/mailmanspip.lang
+++ b/htdocs/langs/da_DK/mailmanspip.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - mailmanspip
-MailmanSpipSetup=Mailman and SPIP module Setup
-MailmanTitle=Mailman mailing list system
-TestSubscribe=To test subscription to Mailman lists
-TestUnSubscribe=To test unsubscribe from Mailman lists
-MailmanCreationSuccess=Subscription test was executed successfully
-MailmanDeletionSuccess=Unsubscription test was executed successfully
-SynchroMailManEnabled=A Mailman update will be performed
-SynchroSpipEnabled=A Spip update will be performed
-DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
-DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
-DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
-DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
+MailmanSpipSetup=Mailman og SPIP-modul Sætop
+MailmanTitle=Mailman post list system
+TestSubscribe=At teste abonnement på Mailman lister
+TestUnSubscribe=For at afprøve afmeldingen fra Mailman lister
+MailmanCreationSuccess=Abonnements testen blev udført med succes
+MailmanDeletionSuccess=Unsubscription test blev udført med succes
+SynchroMailManEnabled=En Mailman opdatering vil blive udført
+SynchroSpipEnabled=En Spip opdatering vil blive udført
+DescADHERENT_MAILMAN_ADMINPW=Mailman administrator adgangskode
+DescADHERENT_MAILMAN_URL=URL til Mailman abonnementer
+DescADHERENT_MAILMAN_UNSUB_URL=URL til Mailman abonnementer
+DescADHERENT_MAILMAN_LISTS=Liste (r) til automatisk registrering af nye medlemmer (adskilt af komma)
 SPIPTitle=SPIP Content Management System
 DescADHERENT_SPIP_SERVEUR=SPIP Server
-DescADHERENT_SPIP_DB=SPIP database name
+DescADHERENT_SPIP_DB=SPIP database navn
 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
+DescADHERENT_SPIP_PASS=SPIP database kodeord
+AddIntoSpip=Tilføj til SPIP
+AddIntoSpipConfirmation=Er du sikker på, at du vil tilføje denne medlem til SPIP?
+AddIntoSpipError=Kunne ikke tilføje brugeren i SPIP
+DeleteIntoSpip=Fjern fra SPIP
+DeleteIntoSpipConfirmation=Er du sikker på, at du vil fjerne denne medlem fra SPIP?
+DeleteIntoSpipError=Kunne ikke undertrykke brugeren fra SPIP
+SPIPConnectionFailed=Kunne ikke oprette forbindelse til SPIP
+SuccessToAddToMailmanList=%s med succes tilføjet mailman liste %s eller SPIP database
+SuccessToRemoveToMailmanList=%s med succes fjernet fra mailman liste %s eller SPIP database
diff --git a/htdocs/langs/da_DK/mails.lang b/htdocs/langs/da_DK/mails.lang
index bfd9b1dd5ea..e0275f61e0b 100644
--- a/htdocs/langs/da_DK/mails.lang
+++ b/htdocs/langs/da_DK/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails indlæst af brugeren
 MailingModuleDescDolibarrUsers=Brugere med e-mails
 MailingModuleDescThirdPartiesByCategories=Tredjeparter (efter kategorier)
 SendingFromWebInterfaceIsNotAllowed=Afsendelse fra webgrænseflade er ikke tilladt.
+EmailCollectorFilterDesc=Alle filtre skal matche for at en e-mail bliver indsamlet
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s filtjenester
@@ -125,12 +126,13 @@ TagMailtoEmail=Modtager E-mail (herunder html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Adviséringer
-NoNotificationsWillBeSent=Ingen e-mail-meddelelser er planlagt for denne begivenhed, og firmaet
-ANotificationsWillBeSent=1 anmeldelse vil blive sendt via email
-SomeNotificationsWillBeSent=%s meddelelser vil blive sendt via email
-AddNewNotification=Activate a new email notification target
-ListOfActiveNotifications=List all active targets for email notification
-ListOfNotificationsDone=List alle e-mail meddelelser
+NotificationsAuto=Underretninger Auto.
+NoNotificationsWillBeSent=Ingen automatiske e-mail-underretninger er planlagt for denne begivenhedstype og virksomhed
+ANotificationsWillBeSent=1 automatisk underretning sendes via e-mail
+SomeNotificationsWillBeSent=%s automatiske meddelelser sendes via e-mail
+AddNewNotification=Abonner på en ny automatisk e-mail-underretning (mål / begivenhed)
+ListOfActiveNotifications=Liste over alle aktive abonnementer (mål / begivenheder) til automatisk e-mail-underretning
+ListOfNotificationsDone=Liste over alle sendte automatiske e-mail-meddelelser
 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.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Udfyld indtastningsfelter for at vælge tredjeparter eller kontaktpersoner / adresser, der skal målrettes
-AdvTgtSearchTextHelp=Brug %% som jokertegn. For eksempel for at finde alle emner som <b> jean, joe, jim </ b>, kan du indtaste <b> j%% </ b>, du kan også bruge; som separator for værdi og brug! for undtagen denne værdi. For eksempel <b> jean; joe; jim%%;! Jimo;! Jima% </ b> vil målrette alle jean, joe, start med jim men ikke jimo og ikke alt der starter med jima
+AdvTgtSearchTextHelp=Brug %% som wildcards. For eksempel for at finde alle varer som <b> jean, joe, jim </b>, kan du indtaste <b> j%% </b>, du kan også bruge; som separator for værdi, og brug! for undtagen denne værdi. For eksempel <b> jean; joe; jim%%;! Jimo;! Jima%% </b> vil målrette mod alle jean, joe, start med jim, men ikke jimo og ikke alt, der starter med jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Minimum value
 AdvTgtMaxVal=Maximum value
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Udgående e-mail opsætning
-InGoingEmailSetup=Indgående e-mail opsætning
-OutGoingEmailSetupForEmailing=Udgående e-mail opsætning (til modul%s)
-DefaultOutgoingEmailSetup=Standard udgående e-mail opsætning
+OutGoingEmailSetup=Udgående e-mails
+InGoingEmailSetup=Indgående e-mails
+OutGoingEmailSetupForEmailing=Udgående e-mails (for modul %s)
+DefaultOutgoingEmailSetup=Samme konfiguration end den globale opsætning af udgående e-mail
 Information=Information
 ContactsWithThirdpartyFilter=Kontakter med tredjepart filter
-Unanswered=Unanswered
+Unanswered=Ubesvaret
 Answered=Besvaret
-IsNotAnAnswer=Is not answer (initial email)
-IsAnAnswer=Is an answer of an initial email
+IsNotAnAnswer=Er ikke svar (indledende e-mail)
+IsAnAnswer=Er et svar på en indledende e-mail
+RecordCreatedByEmailCollector=Post oprettet af Email Collector %s fra e-mail %s
+DefaultBlacklistMailingStatus=Standard kontaktstatus for afvisning af masse-e-mail
+DefaultStatusEmptyMandatory=Tom men obligatorisk
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index b388aeabcdd..340e9f756c2 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -24,11 +24,13 @@ FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Database forbindelse
-NoTemplateDefined=Ingen skabelon til rådighed for denne Email-type
+NoTemplateDefined=Ingen skabelon til rådighed for denne e-mail-type
 AvailableVariables=Tilgængelige erstatnings variabler
 NoTranslation=Ingen oversættelse
 Translation=Oversættelse
+CurrentTimeZone=Aktuelle tidszone
 EmptySearchString=Indtast ikke tomme søgekriterier
+EnterADateCriteria=Indtast et datokriterium
 NoRecordFound=Ingen poster fundet
 NoRecordDeleted=Ingen post slettet
 NotEnoughDataYet=Ikke nok data
@@ -47,7 +49,7 @@ ErrorSQL=SQL Fejl
 ErrorLogoFileNotFound=Logo fil '%s' blev ikke fundet
 ErrorGoToGlobalSetup=Gå til 'Firma/Organisation' opsætning for at rette dette
 ErrorGoToModuleSetup=Gå til modulopsætning for at rette dette
-ErrorFailedToSendMail=Det lykkedes ikke at sende Email (sender=%s, receiver= %s)
+ErrorFailedToSendMail=Det lykkedes ikke at sende e-mail (afsender=%s, modtager= %s)
 ErrorFileNotUploaded=Filen blev ikke uploadet. Kontroller, at størrelse ikke overstiger det maksimalt tilladte, at den frie plads der er til rådighed på disken, og at der ikke allerede en fil med samme navn i denne mappe.
 ErrorInternalErrorDetected=Fejl opdaget
 ErrorWrongHostParameter=Forkert vært parameter
@@ -85,6 +87,8 @@ 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
+HomePage=Hjemmeside
 RecordSaved=Data gemt
 RecordDeleted=Post slettet
 RecordGenerated=Data genereret
@@ -220,6 +224,7 @@ Value=Værdi
 PersonalValue=Personlige værdi
 NewObject=Ny %s
 NewValue=Ny værdi
+OldValue=Gammel værdi %s
 CurrentValue=Nuværende værdi
 Code=Kode
 Type=Type
@@ -236,7 +241,7 @@ Designation=Beskrivelse
 DescriptionOfLine=Beskrivelse af linje
 DateOfLine=Dato for linje
 DurationOfLine=Linjens varighed
-Model=Dokumenter skabeloner
+Model=Skabelon
 DefaultModel=Standard dokument skabelon
 Action=Begivenhed
 About=Om
@@ -248,7 +253,7 @@ Limit=Grænseværdi
 Limits=Grænseværdier
 Logout=Log ud
 NoLogoutProcessWithAuthMode=Ingen applikations afbrydelses funktion med autentificeringstilstand <b>%s</b>
-Connection=Logind
+Connection=Log ind
 Setup=Opsætning
 Alert=Alarm
 MenuWarnings=Indberetninger
@@ -355,25 +360,25 @@ UnitPriceHT=Enhedspris (ekskl.)
 UnitPriceHTCurrency=Enhedspris (ekskl.) (Valuta)
 UnitPriceTTC=Enhedspris
 PriceU=Salgspris
-PriceUHT=Salgspris (netto)
+PriceUHT=Pris (netto)
 PriceUHTCurrency=Salgspris (Valuta)
-PriceUTTC=Brutto(Inkl.Moms)
+PriceUTTC=Brutto (inkl. moms)
 Amount=Beløb
 AmountInvoice=Fakturabeløbet
 AmountInvoiced=Beløb faktureres
 AmountInvoicedHT=Faktureret beløb (ekskl. Moms)
-AmountInvoicedTTC=Faktureret beløb (inkl. Moms)
+AmountInvoicedTTC=Faktureret beløb (inkl. moms)
 AmountPayment=Indbetalingsbeløb
 AmountHTShort=Beløb (ekskl.)
 AmountTTCShort=Beløb (inkl. moms)
-AmountHT=Beløb (ekskl. Skat)
+AmountHT=Beløb (ekskl. moms)
 AmountTTC=Beløb (inkl. moms)
 AmountVAT=Momsbeløb
 MulticurrencyAlreadyPaid=Allerede betalt, original valuta
 MulticurrencyRemainderToPay=Manglene betaling , original valuta
 MulticurrencyPaymentAmount=Betalingsbeløb, oprindelig valuta
-MulticurrencyAmountHT=Beløb (ekskl. Skat), original valuta
-MulticurrencyAmountTTC=Beløb (inkl. Moms), oprindelig valuta
+MulticurrencyAmountHT=Beløb (ekskl. moms), original valuta
+MulticurrencyAmountTTC=Beløb (inkl. moms), oprindelig valuta
 MulticurrencyAmountVAT=Momsbeløb, oprindelige valuta
 MulticurrencySubPrice=Beløb subpris multi valuta
 AmountLT1=Momsbeløb 2
@@ -387,15 +392,15 @@ PriceQtyMinHTCurrency=Prismængde min. (ekskl. skat) (valuta)
 Percentage=Procent
 Total=I alt
 SubTotal=Sum
-TotalHTShort=I alt (ekskl.)
+TotalHTShort=I alt (u/moms)
 TotalHT100Short=I alt 100%% (ekskl.)
-TotalHTShortCurrency=I alt (ekskl. I valuta)
-TotalTTCShort=I alt (Inkl. moms)
-TotalHT=I alt (ekskl. Skat)
-TotalHTforthispage=I alt (ekskl. Skat) for denne side
+TotalHTShortCurrency=I alt (ekskl. i valuta)
+TotalTTCShort=I alt (m/moms)
+TotalHT=I alt (u/moms)
+TotalHTforthispage=I alt (ekskl. moms) for denne side
 Totalforthispage=I alt for denne side
-TotalTTC=I alt (Inkl. Moms)
-TotalTTCToYourCredit=I alt (Inkl. Moms) til din kredit
+TotalTTC=I alt (m/moms)
+TotalTTCToYourCredit=I alt (inkl. moms) til din kredit
 TotalVAT=Moms i alt
 TotalVATIN=IGST i alt
 TotalLT1=Total Moms 2
@@ -404,10 +409,10 @@ TotalLT1ES=RE i alt
 TotalLT2ES=IRPF i alt
 TotalLT1IN=I alt CGST
 TotalLT2IN=I alt SGST
-HT=Ekskl. skat
-TTC=Inkl. Moms
-INCVATONLY=Inkl. Moms
-INCT=Inkl. Alle skatter 
+HT=Ekskl. moms
+TTC=Inkl. moms
+INCVATONLY=Inkl. moms
+INCT=Inkl. moms og afgifter
 VAT=Moms
 VATIN=IGST
 VATs=Salgs Moms
@@ -433,6 +438,7 @@ RemainToPay=Manglende betaling
 Module=Modul/Applikation
 Modules=Moduler/Applikationer
 Option=Valgmulighed
+Filters=Filtre
 List=Liste
 FullList=Fuldstændig liste
 FullConversation=Fuld samtale
@@ -503,7 +509,7 @@ Other=Anden
 Others=Andre
 OtherInformations=Anden information
 Quantity=Antal
-Qty=Qty
+Qty=Antal
 ChangedBy=Ændret af
 ApprovedBy=Godkendt af
 ApprovedBy2=Godkendt af (sekundær)
@@ -550,10 +556,10 @@ AddPhoto=Tilføj billede
 DeletePicture=Billede slette
 ConfirmDeletePicture=Bekræft billed sletning?
 Login=Login
-LoginEmail=Logind (email)
-LoginOrEmail=Logind eller Email
+LoginEmail=Login (e-mail)
+LoginOrEmail=Login eller e-mail
 CurrentLogin=Nuværende login
-EnterLoginDetail=Indtast logind oplysninger
+EnterLoginDetail=Indtast login-oplysninger
 January=Januar
 February=Februar
 March=Marts
@@ -650,6 +656,7 @@ SupplierPreview=Forhandler forhåndsvisning
 ShowCustomerPreview=Vis forhåndsvisning til kunde
 ShowSupplierPreview=Vis sælger forhåndsvisning
 RefCustomer=Ref. Kunde
+InternalRef=Intern ref.
 Currency=Valuta
 InfoAdmin=Oplysninger til administratorer
 Undo=Fortryd
@@ -662,16 +669,16 @@ FeatureNotYetSupported=Funktion endnu ikke understøttet
 CloseWindow=Luk vindue
 Response=Responds
 Priority=Prioritet
-SendByMail=Send via email
-MailSentBy=Email sendt fra
+SendByMail=Send via e-mail
+MailSentBy=E-mail sendt af
 NotSent=Ikke sendt
 TextUsedInTheMessageBody=Email indhold
 SendAcknowledgementByMail=Send bekræftelses Email
-SendMail=Send Email
-Email=EMail
+SendMail=Send e-mail
+Email=E-mail
 NoEMail=Ingen Email
 AlreadyRead=Har allerede læst
-NotRead=Ikke læst
+NotRead=Ulæst
 NoMobilePhone=Ingen mobil telefon
 Owner=Ejer
 FollowingConstantsWillBeSubstituted=Følgende konstanterne skal erstatte med tilsvarende værdi.
@@ -1107,3 +1114,9 @@ UpToDate=Opdateret
 OutOfDate=Umoderne
 EventReminder=Påmindelse om begivenhed
 UpdateForAllLines=Opdatering til alle linjer
+OnHold=I venteposition
+Civility=Høflighed
+AffectTag=Påvirke tags
+ConfirmAffectTag=Bulk Tags påvirker
+ConfirmAffectTagQuestion=Er du sikker på, at du vil påvirke tags til den %s valgte post (er)?
+CategTypeNotFound=Ingen tag-type fundet for typen af poster
diff --git a/htdocs/langs/da_DK/modulebuilder.lang b/htdocs/langs/da_DK/modulebuilder.lang
index d576de3f2db..7d0df081858 100644
--- a/htdocs/langs/da_DK/modulebuilder.lang
+++ b/htdocs/langs/da_DK/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP side til at oprette / redigere / se en post
 PageForAgendaTab=PHP side for fanen begivenhed
 PageForDocumentTab=PHP-side for dokumentfanen
 PageForNoteTab=PHP side til notatfane
+PageForContactTab=PHP-side til kontaktfanen
 PathToModulePackage=Sti til zip af modul / applikationspakke
 PathToModuleDocumentation=Sti til fil af modul / applikationsdokumentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Mellemrum eller specialtegn er ikke tilladt.
@@ -77,7 +78,7 @@ IsAMeasure=Er en foranstaltning
 DirScanned=Directory scannet
 NoTrigger=Ingen udløser
 NoWidget=Ingen widget
-GoToApiExplorer=Gå til API Explorer
+GoToApiExplorer=API udforske 
 ListOfMenusEntries=Liste over menupunkter
 ListOfDictionariesEntries=Liste over poster i ordbøger
 ListOfPermissionsDefined=Liste over definerede tilladelser
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Hvis du har kendskab til SQL og PHP, kan du bruge guide
 SeeTopRightMenu=Se <span class = "fa fa-bug"> </span> i øverste højre menu
 AddLanguageFile=Tilføj sprogfil
 YouCanUseTranslationKey=Du kan her bruge en nøgle, der er oversættelsessnøglen fundet i sprogfilen (se fanen "Sprog").
-DropTableIfEmpty=(Slet tabel hvis tom)
+DropTableIfEmpty=(Ødelæg tabel, hvis det er tomt)
 TableDoesNotExists=Tabellen %s findes ikke
 TableDropped=Tabel %s slettet
 InitStructureFromExistingTable=Byg strukturen array streng af en eksisterende tabel
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Brug en bestemt editor webadresse
 UseSpecificFamily = Brug en bestemt familie
 UseSpecificAuthor = Brug en bestemt forfatter
 UseSpecificVersion = Brug en bestemt initial version
-ModuleMustBeEnabled=Modulet / applikationen skal være aktiveret først
 IncludeRefGeneration=Reference til objekt skal genereres automatisk
 IncludeRefGenerationHelp=Kontroller dette, hvis du vil inkludere kode til at styre genereringen af referencen automatisk
 IncludeDocGeneration=Jeg vil generere nogle dokumenter fra objektet
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Felttype:<br> varchar (99), dobbelt (24,8), reel, tekst, html,
 AsciiToHtmlConverter=Ascii til HTML-konverter
 AsciiToPdfConverter=Ascii til PDF konverter
 TableNotEmptyDropCanceled=Tabellen er ikke tom. Drop er annulleret.
+ModuleBuilderNotAllowed=Modulbyggeren er tilgængelig, men ikke tilladt for din bruger.
diff --git a/htdocs/langs/da_DK/mrp.lang b/htdocs/langs/da_DK/mrp.lang
index 063976415c0..22f0fc4aa08 100644
--- a/htdocs/langs/da_DK/mrp.lang
+++ b/htdocs/langs/da_DK/mrp.lang
@@ -78,3 +78,27 @@ TotalCost=Udgifter i alt
 BOMTotalCost=Omkostningerne til at fremstille denne BOM baseret på prisen for hver mængde og produkt, der skal forbruges (brug Prisen, hvis defineret, ellers Gennemsnit Vægtet pris, hvis defineret, ellers den bedste købspris)
 GoOnTabProductionToProduceFirst=Du skal først have startet produktionen for at lukke en produktionsordre (se fanen '%s'). Men du kan annullere det.
 ErrorAVirtualProductCantBeUsedIntoABomOrMo=Et sæt kan ikke bruges i en stykliste eller en MO
+Workstation=Arbejdsstation
+Workstations=Arbejdsstationer
+WorkstationsDescription=Arbejdsstationsadministration
+WorkstationSetup = Opsætning af arbejdsstationer
+WorkstationSetupPage = Opsætningsside for arbejdsstationer
+WorkstationAbout = Om arbejdsstation
+WorkstationAboutPage = Arbejdsstationer om side
+WorkstationList=Arbejdsstationsliste
+WorkstationCreate=Tilføj ny arbejdsstation
+ConfirmEnableWorkstation=Er du sikker på, at du vil aktivere arbejdsstation <b> %s </b>?
+EnableAWorkstation=Aktivér en arbejdsstation
+ConfirmDisableWorkstation=Er du sikker på, at du vil deaktivere arbejdsstationen <b> %s </b>?
+DisableAWorkstation=Deaktiver en arbejdsstation
+DeleteWorkstation=Fjerne
+NbOperatorsRequired=Antal krævede operatører
+THMOperatorEstimated=Anslået operatør THM
+THMMachineEstimated=Anslået maskine THM
+WorkstationType=Arbejdsstationstype
+Human=Person
+Machine=Maskine
+HumanMachine=Person / maskine
+WorkstationArea=Arbejdsstationsområde
+Machines=Maskiner
+THMEstimatedHelp=Denne sats gør det muligt at definere en overslagspris for varen
diff --git a/htdocs/langs/da_DK/orders.lang b/htdocs/langs/da_DK/orders.lang
index 42464a28ed3..11b4d53dfbd 100644
--- a/htdocs/langs/da_DK/orders.lang
+++ b/htdocs/langs/da_DK/orders.lang
@@ -55,7 +55,7 @@ StatusOrderRefused=Afvist
 StatusOrderReceivedPartially=Delvist modtaget
 StatusOrderReceivedAll=Alle varer modtaget
 ShippingExist=En forsendelse findes
-QtyOrdered=Qty bestilt
+QtyOrdered=Antal bestilt
 ProductQtyInDraft=Produkt mængde i udkast ordrer
 ProductQtyInDraftOrWaitingApproved=Produkt mængde i udkast eller godkendte ordrer, endnu ikke bestilt
 MenuOrdersToBill=Ordrer leveret
@@ -137,7 +137,7 @@ Error_OrderNotChecked=Ingen ordrer til faktura valgt
 # Order modes (how we receive order). Not the "why" are keys stored into dict.lang
 OrderByMail=Mail
 OrderByFax=Fax
-OrderByEMail=EMail
+OrderByEMail=E-mail
 OrderByWWW=Online
 OrderByPhone=Telefon
 # Documents models
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index 31fb1453cd4..cf4145b5f03 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -5,8 +5,6 @@ Tools=Værktøj
 TMenuTools=Værktøjer
 ToolsDesc=Alle værktøjer, der ikke er inkluderet i andre menupunkter, er grupperet her. <br> Alle værktøjerne er tilgængelige via menuen til venstre.
 Birthday=Fødselsdag
-BirthdayDate=Fødselsdato
-DateToBirth=Fødselsdato
 BirthdayAlertOn=fødselsdag alarm aktive
 BirthdayAlertOff=fødselsdag alarm inaktive
 TransKey=Oversættelse af nøgle TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Forrige måned (nummer 1-12) på faktura dato
 TextPreviousMonthOfInvoice=Forrige måned (tekst) af faktura dato
 NextMonthOfInvoice=Følgende måned (nummer 1-12) på faktura dato
 TextNextMonthOfInvoice=Følgende måned (tekst) af faktura dato
+PreviousMonth=Forrige måned
+CurrentMonth=Indeværende måned
 ZipFileGeneratedInto=Zip-fil genereret til <b> %s </ b>.
 DocFileGeneratedInto=Doc-fil genereret til <b> %s </ b>.
 JumpToLogin=Afbrudt. Gå til login side ...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Udgiftsrapport valideret (godkendelse krævet)
 Notify_EXPENSE_REPORT_APPROVE=Udgiftsrapport godkendt
 Notify_HOLIDAY_VALIDATE=Anmodning om tilladelse er godkendt (godkendelse kræves)
 Notify_HOLIDAY_APPROVE=Anmodning om tilladelse godkendt
+Notify_ACTION_CREATE=Føjede handling til dagsorden
 SeeModuleSetup=Se opsætning af modul %s
 NbOfAttachedFiles=Antal vedhæftede filer / dokumenter
 TotalSizeOfAttachedFiles=Samlede størrelse på vedhæftede filer / dokumenter
@@ -99,6 +100,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nFind forsendelse __REF__ vedhæ
 PredefinedMailContentSendFichInter=__(Hello)__\n\nFind intervention __REF__ vedhæftet\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Du kan klikke på linket herunder for at foretage din betaling, hvis den ikke allerede er færdig.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hej)__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Begivenhedspåmindelse "__EVENT_LABEL__" den __EVENT_DATE__ kl. __EVENT_TIME__ <br> <br> Dette er en automatisk besked, bedes du ikke svare.
 DemoDesc=Dolibarr er en kompakt ERP / CRM, der understøtter flere forretningsmoduler. En demo, der viser alle moduler, giver ingen mening, da dette scenario aldrig forekommer (flere hundrede tilgængelige). Så flere demo profiler er tilgængelige.
 ChooseYourDemoProfil=Vælg den demoprofil, der passer bedst til dine behov ...
 ChooseYourDemoProfilMore=... eller bygg din egen profil <br> (manuel modulvalg)
@@ -214,6 +216,7 @@ EMailTextExpenseReportValidated=Udgiftsrapport %s er godkendt.
 EMailTextExpenseReportApproved=Udgiftsrapport %s er godkendt.
 EMailTextHolidayValidated=Anmodning om orlov/ferie %s er godkendt.
 EMailTextHolidayApproved=Anmodning om ferie %s er godkendt.
+EMailTextActionAdded=Handlingen %s er føjet til dagsordenen.
 ImportedWithSet=Indførsel datasæt
 DolibarrNotification=Automatisk anmeldelse
 ResizeDesc=Indtast nye bredde <b>OR</b> ny højde. Ratio vil blive holdt i resizing ...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Kontakt / adresse skabt via e-mail indsamler fra
 ProjectCreatedByEmailCollector=Projekt skabt via e-mail indsamler fra mail MSGID %s
 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
+PrefixSession=Præfiks til session-id
 
 ##### Export #####
 ExportsArea=Eksport område
@@ -278,9 +282,9 @@ LinesToImport=Linjer at importere
 
 MemoryUsage=Brug af hukommelse
 RequestDuration=Anmodningens varighed
-ProductsPerPopularity=Products/Services by popularity
+ProductsPerPopularity=Produkter / Ydelser efter popularitet
 PopuProp=Produkter/tjenester efter popularitet i forslag
 PopuCom=Produkter/tjenester efter popularitet i ordrer
 ProductStatistics=Produkter / services statistik
 NbOfQtyInOrders=Antal i ordrer
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Vælg den type objekt, der skal analyseres ...
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index d266cdfa657..dc8281f3a00 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -70,7 +70,7 @@ UpdateDefaultPrice=Opdater standardpris
 UpdateLevelPrices=Opdater priser for hvert niveau
 AppliedPricesFrom=Anvendt fra
 SellingPrice=Salgspris
-SellingPriceHT=Salgspris (ekskl. Skat)
+SellingPriceHT=Salgspris (ekskl. moms)
 SellingPriceTTC=Salgspris (inkl. moms)
 SellingMinPriceTTC=Minimumssalgspris (inkl. Skat)
 CostPriceDescription=Dette prisfelt (ekskl. Skat) kan bruges til at gemme det gennemsnitlige beløb, dette produkt koster for din virksomhed. Det kan være enhver pris, du selv beregner, for eksempel ud fra den gennemsnitlige købspris plus gennemsnitlige produktions- og distributionsomkostninger.
@@ -104,24 +104,25 @@ SetDefaultBarcodeType=Vælg stregkodetype
 BarcodeValue=Stregkodeværdi
 NoteNotVisibleOnBill=Note (ikke synlig på fakturaer, tilbud ...)
 ServiceLimitedDuration=Hvis varen er en ydelse med begrænset varighed:
-FillWithLastServiceDates=Fill with last service line dates
+FillWithLastServiceDates=Udfyld med sidste servicelinjedatoer
 MultiPricesAbility=Flere prissegmenter pr. Produkt / service (hver kunde er i et prissegment)
 MultiPricesNumPrices=Antal priser
 DefaultPriceType=Prisgrundlag pr. Standard (med eller uden skat) ved tilføjelse af nye salgspriser
-AssociatedProductsAbility=Activate kits (virtual products)
-AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this kit
+AssociatedProductsAbility=Aktivér sæt (sæt med flere produkter)
+VariantsAbility=Aktiver varianter (variationer af produkter, f.eks. Farve, størrelse)
+AssociatedProducts=Sæt
+AssociatedProductsNumber=Antal produkter, der udgør dette sæt
 ParentProductsNumber=Antal forældrevarer
 ParentProducts=Moderselskaber
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
+IfZeroItIsNotAVirtualProduct=Hvis 0, er dette produkt ikke et sæt
+IfZeroItIsNotUsedByVirtualProduct=Hvis 0, bruges dette produkt ikke af noget sæt
 KeywordFilter=Keyword filter
 CategoryFilter=Kategori filter
 ProductToAddSearch=Søg produkt for at tilføje
 NoMatchFound=Ingen match fundet
 ListOfProductsServices=Liste over produkter / tjenester
-ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of kits with this product as a component
+ProductAssociationList=Liste over produkter / tjenester, der er komponent (er) i dette sæt
+ProductParentList=Liste over sæt med dette produkt som en komponent
 ErrorAssociationIsFatherOfThis=En af valgte produkt er moderselskab med aktuelle produkt
 DeleteProduct=Slet en vare/ydelse
 ConfirmDeleteProduct=Er du sikker på du vil slette denne vare/ydelse?
@@ -167,8 +168,10 @@ BuyingPrices=Købspriser
 CustomerPrices=Kundepriser
 SuppliersPrices=Leverandørpriser
 SuppliersPricesOfProductsOrServices=Sælgerpriser (af produkter eller tjenester)
-CustomCode=Told / vare / HS-kode
+CustomCode=Told | Råvare | HS-kode
 CountryOrigin=Oprindelsesland
+RegionStateOrigin=Region oprindelse
+StateOrigin=Stat | provinsens oprindelse
 Nature=Produktets art (materiale / færdig)
 NatureOfProductShort=Produktets art
 NatureOfProductDesc=Råmateriale eller færdigt produkt
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Brug den faste pris
 PriceByQuantity=Forskellige priser efter mængde
 DisablePriceByQty=Deaktiver priserne efter antal
 PriceByQuantityRange=Mængdeområde
-MultipriceRules=Prissegmentregler
+MultipriceRules=Automatiske priser for segment
 UseMultipriceRules=Brug prissegmentregler (defineret i opsætning af produktmodul) til automatisk beregning af priser for alle andre segmenter i henhold til første segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% rabat over %s
@@ -287,7 +290,7 @@ PriceExpressionEditorHelp5=Tilgængelige globale værdier:
 PriceMode=Pris-tilstand
 PriceNumeric=Numero
 DefaultPrice=Standard pris
-DefaultPriceLog=Log of previous default prices
+DefaultPriceLog=Log over tidligere standardpriser
 ComposedProductIncDecStock=Forøg / sænk lagerbeholdning ved forældreændring
 ComposedProduct=Børneprodukter
 MinSupplierPrice=Min købskurs
@@ -340,7 +343,7 @@ UseProductFournDesc=Tilføj en funktion til at definere beskrivelser af produkte
 ProductSupplierDescription=Leverandørbeskrivelse for produktet
 UseProductSupplierPackaging=Brug emballage til leverandørpriser (genberegn mængder i henhold til emballage, der er angivet på leverandørpris, når du tilføjer / opdaterer linje i leverandørdokumenter)
 PackagingForThisProduct=Emballage
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
+PackagingForThisProductDesc=Ved leverandørbestilling bestiller du automatisk denne mængde (eller et multiplum af denne mængde). Må ikke være mindre end det mindste købsmængde
 QtyRecalculatedWithPackaging=Mængden af linjen blev beregnet om efter leverandøremballage
 
 #Attributes
@@ -364,9 +367,9 @@ SelectCombination=Vælg kombination
 ProductCombinationGenerator=Varianter generator
 Features=Funktioner
 PriceImpact=Prispåvirkning
-ImpactOnPriceLevel=Impact on price level %s
-ApplyToAllPriceImpactLevel= Apply to all levels
-ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
+ImpactOnPriceLevel=Effekt på prisniveau %s
+ApplyToAllPriceImpactLevel= Anvend på alle niveauer
+ApplyToAllPriceImpactLevelHelp=Ved at klikke her indstiller du den samme prispåvirkning på alle niveauer
 WeightImpact=Vægtpåvirkning
 NewProductAttribute=Ny attribut
 NewProductAttributeValue=Ny attributværdi
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index b0bac561043..56f72838a88 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -76,15 +76,16 @@ MyActivities=Mine opgaver / aktiviteter
 MyProjects=Mine projekter
 MyProjectsArea=Mine projekter Område
 DurationEffective=Effektiv varighed
-ProgressDeclared=Erklæret fremskridt
+ProgressDeclared=Erklæret reel fremskridt
 TaskProgressSummary=Opgave fremskridt
 CurentlyOpenedTasks=Aktuelt åbne opgaver
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=Den erklærede fremgang er mindre %s end den beregnede progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Den erklærede fremgang er mere %s end den beregnede progression
-ProgressCalculated=Beregnede fremskridt
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=Den erklærede reelle fremgang er mindre %s end fremskridt med forbrug
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Den erklærede reelle fremgang er mere %s end fremskridt med forbrug
+ProgressCalculated=Fremskridt med hensyn til forbrug
 WhichIamLinkedTo=som jeg er knyttet til
 WhichIamLinkedToProject=som jeg er knyttet til projektet
 Time=Tid
+TimeConsumed=Forbruges
 ListOfTasks=Liste over opgaver
 GoToListOfTimeConsumed=Gå til listen over tid forbrugt
 GanttView=Gantt View
@@ -211,9 +212,9 @@ ProjectNbProjectByMonth=Antal oprettet projekter pr. Måned
 ProjectNbTaskByMonth=Antal oprettet opgaver efter måned
 ProjectOppAmountOfProjectsByMonth=Mængden af ​​kundeemner pr. Måned
 ProjectWeightedOppAmountOfProjectsByMonth=Vægtet antal kundeemner pr. Måned
-ProjectOpenedProjectByOppStatus=Open project|lead by lead status
-ProjectsStatistics=Statistics on projects or leads
-TasksStatistics=Statistics on tasks of projects or leads
+ProjectOpenedProjectByOppStatus=Åbn projekt | ført efter leadstatus
+ProjectsStatistics=Statistik over projekter eller kundeemner
+TasksStatistics=Statistik over opgaver for projekter eller leads
 TaskAssignedToEnterTime=Opgave tildelt. Indtastning af tid på denne opgave skal være muligt.
 IdTaskTime=Id opgave tid
 YouCanCompleteRef=Hvis du ønsker at afslutte ref med et eller flere suffiks, anbefales det at tilføje et - tegn for at adskille det, så den automatiske nummerering stadig fungerer korrekt til næste projekter. For eksempel %s-MYSUFFIX
diff --git a/htdocs/langs/da_DK/propal.lang b/htdocs/langs/da_DK/propal.lang
index d742aaccad7..01e676de7d8 100644
--- a/htdocs/langs/da_DK/propal.lang
+++ b/htdocs/langs/da_DK/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send tilbud med posten
 DatePropal=Dato for tilbud
 DateEndPropal=Gyldighed udløber
 ValidityDuration=Gyldighedstid
-CloseAs=Sæt status til
 SetAcceptedRefused=Sæt accepteret/afvist
 ErrorPropalNotFound=Propal %s blev ikke fundet
 AddToDraftProposals=Tilføj skabelon
@@ -57,7 +56,7 @@ CreateEmptyPropal=Opret tomt kommercielt forslag eller fra listen over produkter
 DefaultProposalDurationValidity=Standard gyldighedstid for tilbud (i dage)
 UseCustomerContactAsPropalRecipientIfExist=Brug kontakt/adresse med type 'Kontakt opfølgnings forslag', hvis det er defineret i stedet for tredjepartsadresse som forslag modtageradresse
 ConfirmClonePropal=Er du sikker på, du vil klone tilbuddet <b>%s</b>?
-ConfirmReOpenProp=Er du sikker på du vil genåbne tilbuddet <b>%s</b>?
+ConfirmReOpenProp=Er du sikker på, at du vil åbne det tilbud igen <b> %s </b>?
 ProposalsAndProposalsLines=Tilbud og linjer
 ProposalLine=Tilbudslinje
 AvailabilityPeriod=Tilgængelighed forsinkelse
@@ -85,3 +84,8 @@ ProposalCustomerSignature=Skriftlig accept, firmastempel, dato og underskrift
 ProposalsStatisticsSuppliers=Forhandler forslagsstatistik
 CaseFollowedBy=Sag efterfulgt af
 SignedOnly=Kun underskrevet
+IdProposal=Forslags-id
+IdProduct=Produkt-id
+PrParentLine=Forslagsforældrelinje
+LineBuyPriceHT=Købspris Beløb fratrukket skat for linje
+
diff --git a/htdocs/langs/da_DK/recruitment.lang b/htdocs/langs/da_DK/recruitment.lang
index 3895222dc56..a747076bfdd 100644
--- a/htdocs/langs/da_DK/recruitment.lang
+++ b/htdocs/langs/da_DK/recruitment.lang
@@ -27,10 +27,10 @@ ModuleRecruitmentDesc = Administrer og følg rekrutteringskampagner til nye stil
 #
 RecruitmentSetup = Rekrutteringsopsætning
 Settings = Indstillinger
-RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentSetupPage = Indtast her opsætningen af de vigtigste muligheder for rekrutteringsmodulet
 RecruitmentArea=Rekrutteringsområde
-PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
-EnablePublicRecruitmentPages=Enable public pages of open jobs
+PublicInterfaceRecruitmentDesc=Offentlige sider med job er offentlige webadresser, der skal vises og besvares ved åbne job. Der er et andet link til hvert åbent job, der findes på hver jobjournal.
+EnablePublicRecruitmentPages=Aktivér offentlige sider med åbne job
 
 #
 # About page
@@ -46,30 +46,31 @@ FutureManager=Fremtidig leder
 ResponsibleOfRecruitement=Ansættelsesansvarlig
 IfJobIsLocatedAtAPartner=Hvis jobbet er placeret på en partner sted
 PositionToBeFilled=Stilling
-PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+PositionsToBeFilled=Jobstillinger
+ListOfPositionsToBeFilled=Liste over jobstillinger
+NewPositionToBeFilled=Nye jobstillinger
 
-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)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+JobOfferToBeFilled=Jobposition, der skal besættes
+ThisIsInformationOnJobPosition=Oplysninger om den stilling, der skal besættes
+ContactForRecruitment=Kontakt for rekruttering
+EmailRecruiter=E-mail-rekrutterer
+ToUseAGenericEmail=At bruge en generisk e-mail. Hvis det ikke er defineret, vil e-mailen til den ansvarlige for rekrutteringen blive brugt
+NewCandidature=Ny applikation
+ListOfCandidatures=Liste over applikationer
+RequestedRemuneration=Anmodet vederlag
+ProposedRemuneration=Foreslået vederlag
+ContractProposed=Foreslået kontrakt
+ContractSigned=Kontrakt underskrevet
+ContractRefused=Kontrakten blev afvist
+RecruitmentCandidature=Ansøgning
+JobPositions=Jobstillinger
+RecruitmentCandidatures=Ansøgninger
+InterviewToDo=Interview at gøre
+AnswerCandidature=Ansøgning svar
+YourCandidature=Din ansøgning
+YourCandidatureAnswerMessage=Tak for din ansøgning. <br> ...
+JobClosedTextCandidateFound=Jobpositionen er lukket. Stillingen er besat.
+JobClosedTextCanceled=Jobpositionen er lukket.
+ExtrafieldsJobPosition=Supplerende attributter (jobstillinger)
+ExtrafieldsCandidatures=Supplerende attributter (jobansøgninger)
+MakeOffer=Giv et tilbud
diff --git a/htdocs/langs/da_DK/sendings.lang b/htdocs/langs/da_DK/sendings.lang
index d430c0fe7ac..4d4c7a5a07d 100644
--- a/htdocs/langs/da_DK/sendings.lang
+++ b/htdocs/langs/da_DK/sendings.lang
@@ -17,10 +17,10 @@ NumberOfShipmentsByMonth=Antal forsendelser pr. Måned
 SendingCard=Forsendelse kort
 NewSending=Ny afsendelse
 CreateShipment=Opret afsendelse
-QtyShipped=Qty afsendt
+QtyShipped=Antal afsendt
 QtyShippedShort=Antal skibe.
 QtyPreparedOrShipped=Antal forberedt eller afsendt
-QtyToShip=Qty til skibet
+QtyToShip=Antal til afsendelse
 QtyToReceive=Antal at modtage
 QtyReceived=Antal modtagne
 QtyInOtherShipments=Antal i andre forsendelser
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Andre sendings for denne ordre
 SendingsAndReceivingForSameOrder=Forsendelser og kvitteringer for denne ordre
 SendingsToValidate=Henvist til bekræfte
 StatusSendingCanceled=Aflyst
+StatusSendingCanceledShort=Aflyst
 StatusSendingDraft=Udkast
 StatusSendingValidated=Bekræftet (varer til afsendelse eller allerede afsendt)
 StatusSendingProcessed=Forarbejdet
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Du skal først bekræfte ordren, inden du kan f
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Mere komplet dokument model for levering kvitteringer (logo. ..)
+DocumentModelStorm=Mere komplet dokumentmodel for leveringskvitteringer og ekstrafields kompatibilitet (logo ...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstant EXPEDITION_ADDON_NUMBER ikke defineret
 SumOfProductVolumes=Summen af ​​produktmængder
 SumOfProductWeights=Summen af ​​produktvægt
diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index 5c024d33a93..e4de3145acb 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Bevægelses-id %d
 ListMouvementStockProject=Liste over lagerbevægelser forbundet med projektet
 StocksArea=Pakhuse
 AllWarehouses=Alle lagre
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
+IncludeEmptyDesiredStock=Inkluder også negativ bestand med udefineret ønsket lager
 IncludeAlsoDraftOrders=Medtag også udkast til ordrer
 Location=Placering
 LocationSummary=Kort placerings navn
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Lager værdi
 UserWarehouseAutoCreate=Opret et brugerlager automatisk, når du opretter en bruger
 AllowAddLimitStockByWarehouse=Administrer også værdi for minimum og ønsket lager pr. Parring (produktlager) ud over værdien for minimum og ønsket lager pr. Produkt
 RuleForWarehouse=Regel for lagre
+WarehouseAskWarehouseDuringPropal=Sæt et lager på salgsproportal
 WarehouseAskWarehouseDuringOrder=Indstil et lager med salgsordrer
 UserDefaultWarehouse=Indstil et lager til brugere
 MainDefaultWarehouse=Standardlager
@@ -122,9 +123,9 @@ DesiredStockDesc=Dette lagerbeløb er den værdi, der bruges til at fylde lagere
 StockToBuy=At bestille
 Replenishment=genopfyldning
 ReplenishmentOrders=Replenishment ordrer
-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=I henhold til stigning / formindskelse af aktieoptioner kan fysisk aktie og virtuel aktie (fysisk aktie + åbne ordrer) variere
+UseRealStockByDefault=Brug ægte lager i stedet for virtuel lager til genopfyldningsfunktion
+ReplenishmentCalculation=Mængden til ordren vil være (ønsket mængde - reel lager) i stedet for (ønsket mængde - virtuel lager)
 UseVirtualStock=Brug virtuelt lager
 UsePhysicalStock=Brug fysisk lager
 CurentSelectionMode=Aktuel valgtilstand
@@ -236,7 +237,8 @@ AlwaysShowFullArbo=Vis hele træets lagertrin ved pop op af warehouse-links (Adv
 StockAtDatePastDesc=Du kan her se aktien (ægte aktier) på en given dato i fortiden
 StockAtDateFutureDesc=Du kan her se bestanden (virtuel bestand) på en given dato fremover
 CurrentStock=Aktuel lager
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|serial barcode)
+InventoryRealQtyHelp=Sæt værdi til 0 for at nulstille antal <br> Hold feltet tomt, eller fjern linjen for at forblive uændret
+UpdateByScaning=Opdater 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.
diff --git a/htdocs/langs/da_DK/ticket.lang b/htdocs/langs/da_DK/ticket.lang
index 9bc8f5b81c7..86d053f9cc4 100644
--- a/htdocs/langs/da_DK/ticket.lang
+++ b/htdocs/langs/da_DK/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Opgaver - Typer
 TicketDictCategory=Opgave - Grupper
 TicketDictSeverity=Opgave - Sværhedsgrader
 TicketDictResolution=Opgave - Afsluttet
-TicketTypeShortBUGSOFT=Funktionssvigt logik
-TicketTypeShortBUGHARD=Funktionssvigt udstyr
-TicketTypeShortCOM=Kommercielt spørgsmål
 
+TicketTypeShortCOM=Kommercielt spørgsmål
 TicketTypeShortHELP=Anmodning om hjælp
 TicketTypeShortISSUE=Problem, fejl eller problemer
 TicketTypeShortREQUEST=Skift eller anmodning om forbedring
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Andre
 TicketSeverityShortLOW=Lav
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Høj
-TicketSeverityShortBLOCKING=Kritiske / Blokering
+TicketSeverityShortBLOCKING=Kritisk, blokering
 
 ErrorBadEmailAddress=Felt '%s' forkert
 MenuTicketMyAssign=Mine opgaver
@@ -60,7 +58,6 @@ OriginEmail=Email kilde
 Notify_TICKET_SENTBYMAIL=Send opgaver besked via Email
 
 # Status
-NotRead=Ikke læst
 Read=Læs
 Assigned=Tildelt
 InProgress=I gang
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Offentlig grænseflade tillader alle besøgen
 TicketsAutoAssignTicket=Tildel automatisk brugeren, der oprettede opgaven
 TicketsAutoAssignTicketHelp=Når du opretter en opgave, kan brugeren automatisk tildeles opgaven.
 TicketNumberingModules=Opgave nummerering modul
+TicketsModelModule=Dokumentskabeloner til billetter
 TicketNotifyTiersAtCreation=Underret tredjepart ved oprettelsen
 TicketsDisableCustomerEmail=Deaktiver altid Emails, når en opgave oprettes fra den offentlige grænseflade
 TicketsPublicNotificationNewMessage=Send e-mail (s), når en ny besked tilføjes
@@ -164,7 +162,7 @@ TicketCategory=Gruppe
 SeeTicket=Se opgave
 TicketMarkedAsRead=Opgaven er blevet markeret som læst
 TicketReadOn=Læs videre
-TicketCloseOn=Udløbsdato
+TicketCloseOn=lukke dato
 MarkAsRead=Markér opgaven som læst
 TicketHistory=Opgave historik
 AssignUser=Tildel til bruger
@@ -224,7 +222,7 @@ InitialMessage=Indledende besked
 LinkToAContract=Link til en kontrakt
 TicketPleaseSelectAContract=Vælg en kontrakt
 UnableToCreateInterIfNoSocid=Kan ikke oprette en intervention, når der ikke er defineret nogen tredjepart
-TicketMailExchanges=Email udvekslinger
+TicketMailExchanges=Email udveksling
 TicketInitialMessageModified=Indledende besked ændret
 TicketMessageSuccesfullyUpdated=Meddelelsen er opdateret
 TicketChangeStatus=Skift status
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status ændret: %s til %s
 TicketNotNotifyTiersAtCreate=Ikke underret firma på create
 Unread=Ulæst
 TicketNotCreatedFromPublicInterface=Ikke tilgængelig. Opgaven blev ikke oprettet fra den offentlige grænseflade.
-PublicInterfaceNotEnabled=Den offentlige grænseflade var ikke aktiveret
 ErrorTicketRefRequired=Opgave reference navn er påkrævet
 
 #
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index 35d95b5bc5e..ec009b5ebf1 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -30,7 +30,6 @@ EditInLine=Rediger inline
 AddWebsite=Tilføj hjemmeside
 Webpage=Webside / container
 AddPage=Tilføj side / container
-HomePage=Hjemmeside
 PageContainer=Side
 PreviewOfSiteNotYetAvailable=Forhåndsvisning af dit websted <strong> %s </ strong> endnu ikke tilgængeligt. Du skal først <strong> Importer en fuld hjemmeside skabelon </ strong> 'eller bare <strong> Tilføj en side / container </ strong>'.
 RequestedPageHasNoContentYet=Den ønskede side med id %s har intet indhold endnu, eller cache-filen .tpl.php blev fjernet. Rediger indholdet på siden for at løse dette.
@@ -101,7 +100,7 @@ EmptyPage=Tom side
 ExternalURLMustStartWithHttp=Ekstern webadresse skal starte med http: // eller https: //
 ZipOfWebsitePackageToImport=Upload Zip-filen i webstedsskabelonpakken
 ZipOfWebsitePackageToLoad=eller vælg en tilgængelig indbygget websteds skabelonpakke
-ShowSubcontainers=Inkluder dynamisk indhold
+ShowSubcontainers=Vis dynamisk indhold
 InternalURLOfPage=Intern webadresse for siden
 ThisPageIsTranslationOf=Denne side / container er en oversættelse af
 ThisPageHasTranslationPages=Denne side / container har oversættelse
@@ -137,3 +136,4 @@ RSSFeedDesc=Du kan få et RSS-feed af de nyeste artikler med typen 'blogpost' ve
 PagesRegenerated=%sside (r) / container (r) regenereret
 RegenerateWebsiteContent=Genopret cache-filer på webstedet
 AllowedInFrames=Tilladt i rammer
+DefineListOfAltLanguagesInWebsiteProperties=Definer liste over alle tilgængelige sprog i webstedets egenskaber.
diff --git a/htdocs/langs/da_DK/withdrawals.lang b/htdocs/langs/da_DK/withdrawals.lang
index 0ae1c22b6f9..7ddd6401d6f 100644
--- a/htdocs/langs/da_DK/withdrawals.lang
+++ b/htdocs/langs/da_DK/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Seneste %s direkte debit kvitteringer
 MakeWithdrawRequest=Lav en anmodning om direkte debitering
 MakeBankTransferOrder=Foretag en kreditoverførselsanmodning
 WithdrawRequestsDone=%s anmodninger om direkte debitering indbetalt
+BankTransferRequestsDone=%s kredit overførselsanmodninger registreret
 ThirdPartyBankCode=Tredjeparts bankkode
 NoInvoiceCouldBeWithdrawed=Ingen faktura debiteres med succes. Kontroller, at fakturaer er på virksomheder med en gyldig IBAN, og at IBAN har en UMR (Unique Mandate Reference) med tilstanden <strong> %s </ strong>.
 ClassCredited=Klassificere krediteres
@@ -63,7 +64,7 @@ InvoiceRefused=Faktura nægtet (Oplad afvisningen til kunden)
 StatusDebitCredit=Status debet / kredit
 StatusWaiting=Venter
 StatusTrans=Transmitteret
-StatusDebited=Debited
+StatusDebited=Debiteret
 StatusCredited=Krediteres
 StatusPaid=Betalt
 StatusRefused=Afviste
@@ -79,13 +80,13 @@ StatusMotif8=Andre grunde
 CreateForSepaFRST=Opret direkte debit fil (SEPA FRST)
 CreateForSepaRCUR=Opret direkte debitering fil (SEPA RCUR)
 CreateAll=Opret direkte debitfil (alle)
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
+CreateFileForPaymentByBankTransfer=Opret fil til kreditoverførsel
 CreateSepaFileForPaymentByBankTransfer=Opret kreditoverførselsfil (SEPA)
 CreateGuichet=Kun kontor
 CreateBanque=Kun bank
 OrderWaiting=Venter på behandling
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
+NotifyTransmision=Registrer filoverførsel af ordre
+NotifyCredit=Registrer ordrekredit
 NumeroNationalEmetter=National Transmitter Antal
 WithBankUsingRIB=For bankkonti ved hjælp af RIB
 WithBankUsingBANBIC=For bankkonti ved hjælp af IBAN / BIC / SWIFT
@@ -97,8 +98,8 @@ ShowWithdraw=Vis direkte debiteringsordre
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Hvis fakturaen dog har mindst en betalingsordre til direkte debitering, der endnu ikke er behandlet, indstilles den ikke til at blive betalt for at tillade forudgående udtræksstyring.
 DoStandingOrdersBeforePayments=Denne fane giver dig mulighed for at anmode om en betalingsordre med direkte debitering. Når det er gjort, skal du gå til menuen Bank-> Betaling med direkte debet for at generere og administrere direkte debetordre. Når ordre med direkte debitering lukkes, registreres betaling på fakturaer automatisk, og fakturaer lukkes, hvis resten til betaling er null.
 DoCreditTransferBeforePayments=Denne fane giver dig mulighed for at anmode om en kredit overførselsordre. Når det er gjort, skal du gå til menuen Bank-> Betaling med kreditoverførsel for at generere og administrere kredit overførselsordren. Når pengeoverførsel er lukket, vil betaling på fakturaer oplysninger registreres automatisk, og fakturaer lukkes, hvis resten til løn er nul.\n 
-WithdrawalFile=Debit order file
-CreditTransferFile=Credit transfer file
+WithdrawalFile=Debiteringsfil
+CreditTransferFile=Kreditoverførselsfil
 SetToStatusSent=Sæt til status "Fil sendt"
 ThisWillAlsoAddPaymentOnInvoice=Dette registrerer også betalinger på fakturaer og klassificerer dem som "Betalt", hvis resterende betaling er null
 StatisticsByLineStatus=Statistikker efter status af linjer
@@ -124,14 +125,15 @@ SEPAFrstOrRecur=Betalings type
 ModeRECUR=Tilbagevendende betaling
 ModeFRST=Engangsbetaling
 PleaseCheckOne=Tjek venligst kun en
-CreditTransferOrderCreated=Credit transfer order %s created
+CreditTransferOrderCreated=Kreditoverførselsordre %s oprettet
 DirectDebitOrderCreated=Direkte debitering %s oprettet
 AmountRequested=Beløb anmodet
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Udførelsesdato
 CreateForSepa=Opret direkte debitering fil
-ICS=Kreditor identifikator CI
+ICS=Kreditor identifikator CI til direkte debitering
+ICSTransfer=Kreditor identifikator CI til bankoverførsel
 END_TO_END=SEPA XML-tag "EndToEndId" - Unikt id tildelt pr. Transaktion
 USTRD="Ustruktureret" SEPA XML-tag
 ADDDAYS=Tilføj dage til udførelsesdato
@@ -145,4 +147,6 @@ InfoTransData=Beløb: %s <br> Methodology: %s <br> Dato: %s
 InfoRejectSubject=Betalingsordren afvises
 InfoRejectMessage=Hej, <br> <br> Betalingsordre for faktura %s relateret til firmaet %s, med et beløb på %s er blevet afvist af banken. <br> <br> <br> <br> %s
 ModeWarning=Mulighed for real mode ikke var indstillet, vi stopper efter denne simulation
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+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
diff --git a/htdocs/langs/da_DK/workflow.lang b/htdocs/langs/da_DK/workflow.lang
index a9659eb77ee..c129a7244fb 100644
--- a/htdocs/langs/da_DK/workflow.lang
+++ b/htdocs/langs/da_DK/workflow.lang
@@ -16,8 +16,10 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Klassificer den tilknyttede kildes
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Klassificer tilsluttet kildeleverandørforslag som faktureret, når leverandørfakturaen er bekræftet (og hvis fakturaens størrelse er det samme som det samlede beløb for det linkede forslag)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Klassificer købt købsordre med kilden som faktureret, når leverandørfakturaen er bekræftet (og hvis fakturaens størrelse er den samme som det samlede beløb for den tilknyttede ordre)
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+descWORKFLOW_BILL_ON_RECEPTION=Klassificer modtagelser til "faktureret", når en linket leverandørordre valideres
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Luk alle indgreb, der er knyttet til billetten, når en billet er lukket
 AutomaticCreation=Automatisk oprettelse
 AutomaticClassification=Automatisk klassificering
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Klassificer tilknyttet kildeforsendelse som lukket, når kundefaktura er valideret
diff --git a/htdocs/langs/de_AT/accountancy.lang b/htdocs/langs/de_AT/accountancy.lang
index f2d0909a71e..2caaa72c1fd 100644
--- a/htdocs/langs/de_AT/accountancy.lang
+++ b/htdocs/langs/de_AT/accountancy.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - accountancy
 MenuBankAccounts=Kontonummern
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index 1e86ef15672..2cae2180393 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -72,6 +72,7 @@ Module70Name=Eingriffe
 Module70Desc=Eingriffsverwaltung
 Module80Name=Sendungen
 Module310Desc=Mitgliederverwaltun
+Module59000Desc=Module to follow margins
 Permission31=Produkte/Services einsehen
 Permission32=Produkte/Services erstellen/bearbeiten
 Permission34=Produkte/Services löschen
@@ -147,6 +148,7 @@ LDAPMembersTypesSynchro=Mitgliedertypen
 LDAPSynchronization=LDAP Synchronisierung
 LDAPFunctionsNotAvailableOnPHP=LDAP Funktionen nicht verfügbar in Deinem PHP
 LDAPFieldFullname=vollständiger Name
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 ClickToDialSetup=Click-to-Dial-Moduleinstellungen
 MailToSendShipment=Sendungen
 MailToSendIntervention=Eingriffe
diff --git a/htdocs/langs/de_AT/boxes.lang b/htdocs/langs/de_AT/boxes.lang
index 08c21e780d9..33329e3f2b2 100644
--- a/htdocs/langs/de_AT/boxes.lang
+++ b/htdocs/langs/de_AT/boxes.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxCurrentAccounts=Aktueller Saldo
+BoxCustomersOrdersPerMonth=Bestellungen pro Monat
diff --git a/htdocs/langs/de_AT/mails.lang b/htdocs/langs/de_AT/mails.lang
index 3c3f69af33e..dc53b9e6bab 100644
--- a/htdocs/langs/de_AT/mails.lang
+++ b/htdocs/langs/de_AT/mails.lang
@@ -8,5 +8,3 @@ MailingArea=E-Mail-Kampagnenübersicht
 MailNoChangePossible=Die Empfängerliste einer freigegebenen E-Mail-Kampagne kann nicht mehr geändert werden
 LimitSendingEmailing=Aus Sicherheits- und Zeitüberschreitungsgründen ist der Online-Versadn von E-Mails auf <b>%s</b> Empfänger je Sitzung beschränkt.
 IdRecord=Eintrags ID
-ANotificationsWillBeSent=1 Benachrichtigung wird per E-Mail versandt
-ListOfNotificationsDone=Liste aller versandten E-Mail-Benachrichtigungen
diff --git a/htdocs/langs/de_AT/mrp.lang b/htdocs/langs/de_AT/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/de_AT/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/de_AT/products.lang b/htdocs/langs/de_AT/products.lang
index d4e36dd82c8..454cbcab118 100644
--- a/htdocs/langs/de_AT/products.lang
+++ b/htdocs/langs/de_AT/products.lang
@@ -17,6 +17,7 @@ ProductStatusOnBuyShort=Verfügbar
 ProductStatusNotOnBuyShort=Veraltet
 SellingPriceTTC=Verkaufspreis (brutto)
 CantBeLessThanMinPrice=Der aktuelle Verkaufspreis unterschreitet die Preisuntergrenze dieses Produkts (%s ohne MwSt.)
+AssociatedProductsAbility=Enable Kits (set of several products)
 NoMatchFound=Keine Treffer gefunden
 DeleteProduct=Produkt/Service löschen
 ConfirmDeleteProduct=Möchten Sie dieses Produkt/Service wirklich löschen?
@@ -30,4 +31,3 @@ ListProductByPopularity=Liste der Produkte/Services nach Beliebtheit
 ListServiceByPopularity=Liste der Services nach Beliebtheit
 Finished=Eigenerzeugung
 NewRefForClone=Artikel Nr. des neuen Produkts/Services
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/de_AT/withdrawals.lang b/htdocs/langs/de_AT/withdrawals.lang
index 1e452c7a2bd..3ae942e5927 100644
--- a/htdocs/langs/de_AT/withdrawals.lang
+++ b/htdocs/langs/de_AT/withdrawals.lang
@@ -5,3 +5,4 @@ StatusWaiting=Wartestellung
 StatusMotif2=Abbuchung angefochten
 StatusMotif5=Fehlerhafte Kontodaten
 OrderWaiting=Wartestellung
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang
index afe0da5d99f..0a0ec0ef160 100644
--- a/htdocs/langs/de_CH/accountancy.lang
+++ b/htdocs/langs/de_CH/accountancy.lang
@@ -104,7 +104,7 @@ VentilatedinAccount=Erfolgreich mit dem Buchhaltungskonto verknüpft!
 NotVentilatedinAccount=Nicht mit einem Buchhaltungskonto verknüpft
 XLineSuccessfullyBinded=%s Produkte / Leistungen erfolgreich mit einem Buchhaltungskonto verknüpft.
 XLineFailedToBeBinded=%s Produkte / Leistungen konnten nicht mit einem Buchhaltungskonto verknüpft werden.
-ACCOUNTING_LIMIT_LIST_VENTILATION=Zu verbindende Elemente pro Bildschirmseite (Empfohlen max. 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Sortiere nach den neuesten zu verknüpfenden Positionen
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Sortiere nach den neuesten zu verknüpften Positionen
 ACCOUNTING_LENGTH_DESCRIPTION=Produkt- und Dienstleistungsbeschreibungen abkürzen (Wir empfehlen nach 50 Zeichen)
@@ -139,7 +139,6 @@ LetteringCode=Beschriftung
 JournalLabel=Journalbezeichnung
 TransactionNumShort=Transaktionsnummer
 AccountingCategory=Eigene Kontogruppen
-GroupByAccountAccounting=Sortiere nach Buchhaltungskonto
 AccountingAccountGroupsDesc=Trage hier deine eigenen Buchhaltungs - Kontogruppen ein. Daraus kannst du spezielle Berichte erzeugen.
 ByAccounts=Nach Konto
 ByPredefinedAccountGroups=Nach Gruppe
@@ -187,7 +186,6 @@ DescClosure=Du siehst hier die Bewegungen pro Monat des offenen Geschäftsjahres
 OverviewOfMovementsNotValidated=Schritt 1: Nicht frei gegebene Bewegungen (Die müssen für den Jahresabschluss bearbeitet sein).
 ValidateMovements=Kontobewegungen freigeben
 DescValidateMovements=Für den Abschluss müssen alle Kontobewegungen frei gegeben sein. Danach sind sie nicht mehr änderbar.
-SelectMonthAndValidate=Wähle den Monat, um dessen Bewegungen frei zu geben.
 ValidateHistory=Automatisch verknüpfen
 AutomaticBindingDone=Automatisches Verknüpfen abgeschlossen
 ErrorAccountancyCodeIsAlreadyUse=Hoppla, dieses Buchhaltungskonto wird noch verwendet - du kannst es deshalb nicht löschen.
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index 951b6e8c534..b81530cabec 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -74,8 +74,6 @@ 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)
-PurgeDeleteTemporaryFiles=Lösche alle Temporären Dateien. Dabei gehen keine Arbeitsdaten verloren.\nHinweis: Das funktioniert nur, wenn das Verzeichnis 'Temp' seit 24h da ist.
-PurgeDeleteTemporaryFilesShort=Temporärdateien löschen
 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.
@@ -205,7 +203,6 @@ HideDescOnPDF=Verstecke Produktbeschreibungen
 HideRefOnPDF=Verstecke Produktnummern
 HideDetailsOnPDF=Verstecke Produktzeilen
 PlaceCustomerAddressToIsoLocation=ISO Position für die Kundenadresse verwenden
-ButtonHideUnauthorized=Buttons für Nicht-Admins ausblenden anstatt ausgrauen?
 OldVATRates=Alter MwSt. Satz
 NewVATRates=Neuer MwSt. Satz
 MassConvert=Massenkonvertierung starten
@@ -323,6 +320,7 @@ Module50400Name=Doppelte Buchhaltung
 Module54000Desc=Direktdruck (ohne die Dokumente zu öffnen) mittels CUPS IPP.\nDer Server muss dazu CUPS am Laufen haben und Zugriff auf einen Drucker haben.
 Module55000Name=Befragung, Umfrage oder Abstimmung
 Module55000Desc=Modul zur Erstellung von Online-Umfragen, Umfragen oder Abstimmungen (wie Doodle, Studs, Rdvz,....)
+Module59000Desc=Module to follow margins
 Module62000Name=Lieferbedingungen
 Module62000Desc=Hinzufügen von Funktionen zur Verwaltung von Lieferbedingungen (Incoterms)
 Module63000Desc=Hier kannst du deine Ressourcen (Drucker, Räume, Fahrzeuge) Kalenderereignissen zuweisen.
@@ -464,6 +462,7 @@ 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
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 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
diff --git a/htdocs/langs/de_CH/banks.lang b/htdocs/langs/de_CH/banks.lang
index b0dd8f505a0..68eae87b2c8 100644
--- a/htdocs/langs/de_CH/banks.lang
+++ b/htdocs/langs/de_CH/banks.lang
@@ -86,8 +86,6 @@ SEPAMandate=SEPA - Mandat
 YourSEPAMandate=Dein SEPA - Mandat
 FindYourSEPAMandate=Dein SEPA - Mandat berechtigt uns, Aufträge via LSV direkt deinem Bankkonto zu belasten. Bitte schick uns das unterschrieben retour, oder Scanne- und Maile es an
 AutoReportLastAccountStatement=Das Feld "Kontoauszug" automatisch mit der letzten bekannten Kontoauszugsnummer ausfüllen, beim Ausgleichen.
-CashControl=POS - Bartransaktion
-NewCashFence=Neue Bartransaktion
 BankColorizeMovement=Transaktionen einfärben
 BankColorizeMovementDesc=Wenn du das einschaltest, kannst du für Belastungen und Gutschriften separate Farben für die Anzeige wählen.
 BankColorizeMovementName1=Hintergrundfarbe für Belastungen
diff --git a/htdocs/langs/de_CH/boxes.lang b/htdocs/langs/de_CH/boxes.lang
index e597dd56def..e4f64b3302a 100644
--- a/htdocs/langs/de_CH/boxes.lang
+++ b/htdocs/langs/de_CH/boxes.lang
@@ -37,6 +37,7 @@ BoxTitleLatestModifiedBoms=Die neuesten %s geänderten Materiallisten (BOMs)
 BoxTitleLatestModifiedMos=Die neuesten %s geänderten Fertigungsaufträge
 BoxGoodCustomers=Guter Kunde
 LastRefreshDate=Datum der letzten Aktualisierung
+NoRecordedBookmarks=Keine Lesezeichen gesetzt. Klicken Sie <a href="%s">hier</a>, um ein Lesezeichen zu setzen.
 NoRecordedCustomers=Keine erfassten Kunden
 NoRecordedContacts=Keine erfassten Kontakte
 NoRecordedInterventions=Keine verzeichneten Einsätze
@@ -56,7 +57,6 @@ LastXMonthRolling=%s letzte Monate gleitend
 ChooseBoxToAdd=Box zum Dashboard hinzufügen
 BoxAdded=Box zum Dashboard hinzugefügt
 BoxTitleUserBirthdaysOfMonth=Benutzer - Geburtstage dieses Monates
-BoxLastManualEntries=Die neuesten von Hand gebuchten Einträge
 NoRecordedManualEntries=Es gibt keine manuell hinzugefügte Einträge in der Buchhaltung
 BoxSuspenseAccount=Anzahl Buchungen in Wartestellung
 BoxTitleSuspenseAccount=Nicht kontierte Positionen
diff --git a/htdocs/langs/de_CH/categories.lang b/htdocs/langs/de_CH/categories.lang
index 589f21b1d0e..974a26170ae 100644
--- a/htdocs/langs/de_CH/categories.lang
+++ b/htdocs/langs/de_CH/categories.lang
@@ -58,15 +58,11 @@ AccountsCategoriesShort=Kontenschlagworte / -kategorien
 ProjectsCategoriesShort=Projektschlagworte / -kateorien
 UsersCategoriesShort=Benutzerschlagworte und -kategorien
 CategId=Schlagwort / Kategorie ID
-CatSupList=Liste der Lieferantenschlagworte / -kategorien
-CatCusList=Liste der Kunden-/ Interessentenschlagworte / -kategorien
 CatProdList=Liste der Produktschlagworte / -kategorien
 CatMemberList=Liste der Mitgliederschlagworte / -kategorien
-CatContactList=Liste der Kontaktschlagworte / -kategorien
-CatSupLinks=Verbindung zwischen Lieferanten und Schlagwörtern / Kategorien
 CatCusLinks=Verbindung zwischen Kunden-/Leads und Schlagwörtern / Kategorien
 CatProdLinks=Verbindung zwischen Produkten/Leistungen und Schlagwörtern / Kategorien
-CatProJectLinks=Verknüpfungen zwischen Projekten und Schlagwörtern / Kategorien
+CatProjectsLinks=Verknüpfungen zwischen Projekten und Schlagwörtern / Kategorien
 ExtraFieldsCategories=Ergänzende Eigenschaften
 CategoriesSetup=Suchwörter/Kategorien Einrichten
 CategorieRecursiv=Automatisch mit übergeordnetem Schlagwort / Kategorie verbinden
diff --git a/htdocs/langs/de_CH/cron.lang b/htdocs/langs/de_CH/cron.lang
index cc4ff19f7eb..137bb7f08e8 100644
--- a/htdocs/langs/de_CH/cron.lang
+++ b/htdocs/langs/de_CH/cron.lang
@@ -4,6 +4,5 @@ EnabledAndDisabled=Aktiviert und deaktiviert
 CronDtStart=Nicht vor
 CronDtEnd=Nicht nach
 JobFinished=Job gestarted und beendet
-UseMenuModuleToolsToAddCronJobs=Öffnen Sie das Menü "Start - Module Werkzeuge - Cronjob Liste" um geplante Skript-Aufgaben zu sehen und zu verändern.
 JobDisabled=Job deaktiviert
 MakeLocalDatabaseDumpShort=Lokale Datenbanksicherung
diff --git a/htdocs/langs/de_CH/mails.lang b/htdocs/langs/de_CH/mails.lang
index 3bcda95e62c..b279747d723 100644
--- a/htdocs/langs/de_CH/mails.lang
+++ b/htdocs/langs/de_CH/mails.lang
@@ -28,10 +28,6 @@ ToAddRecipientsChooseHere=Fügen Sie Empfänger über die Listenauswahl hinzu
 NbOfEMailingsSend=E-Mail-Kampagne versandt
 TagUnsubscribe=Abmelde Link
 NoEmailSentBadSenderOrRecipientEmail=Kein E-Mail gesendet. Ungültige Absender oder Empfänger Adresse. Benutzerprofil kontrollieren.
-NoNotificationsWillBeSent=Für dieses Ereignis und diesen Geschäftspartner sind keine Benachrichtigungen geplant
-ANotificationsWillBeSent=Eine Benachrichtigung wird per E-Mail versandt
-SomeNotificationsWillBeSent=%s Benachrichtigungen werden per E-Mail versandt
-ListOfNotificationsDone=Liste aller versandten E-Mail Benachrichtigungen
 MailSendSetupIs2=Sie müssen zuerst mit einem Admin-Konto im Menü %sStart - Einstellungen - EMails%s den Parameter <strong>'%s'</strong> auf den Modus '%s' ändern. Dann können Sie die Daten des SMTP-Servers von Ihrem Internetdienstanbieter eingeben und die E-Mail-Kampagnen-Funktion nutzen.
 MailAdvTargetRecipients=Empfänger (Erweiterte Selektion)
 AdvTgtSearchIntHelp=Intervall verwenden um den Zahlenwert auszuwählen
diff --git a/htdocs/langs/de_CH/mrp.lang b/htdocs/langs/de_CH/mrp.lang
index 81048e8f8b6..0f4ccf47087 100644
--- a/htdocs/langs/de_CH/mrp.lang
+++ b/htdocs/langs/de_CH/mrp.lang
@@ -1,2 +1,7 @@
 # Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
 BOMsSetup=Einstellungen Modul Materiallisten (BOM)
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/de_CH/products.lang b/htdocs/langs/de_CH/products.lang
index ea19db34f53..b2ef1eb5c60 100644
--- a/htdocs/langs/de_CH/products.lang
+++ b/htdocs/langs/de_CH/products.lang
@@ -38,6 +38,7 @@ ServicesArea=Leistungs-Übersicht
 SupplierCard=Anbieterkarte
 SetDefaultBarcodeType=Wählen Sie den standardmässigen Barcode-Typ
 MultiPricesAbility=Preisstufen pro Produkt / Dienstleistung\n(Kunden werden einem Segment zugewiesen)
+AssociatedProductsAbility=Enable Kits (set of several products)
 ParentProducts=Übergeordnetes Produkt
 ListOfProductsServices=Liste der Produkte und Dienstleistungen
 QtyMin=Mindestmenge
@@ -64,7 +65,6 @@ BuyingPrices=Einkaufspreise
 CustomerPrices=Kunden Preise
 SuppliersPrices=Lieferantenpreise
 SuppliersPricesOfProductsOrServices=Anbieterpreise
-CustomCode=Zolltarifnummer (z.B. HSN)
 set=gesetzt
 se=gesetzt
 kilogram=Kilo
@@ -78,7 +78,6 @@ unitCM3=Kubikcentimeter
 unitMM3=Kubikmillimeter
 ServiceCodeModel=Vorlage für Dienstleistungs-Referenz
 DisablePriceByQty=Staffelpreise sperren
-MultipriceRules=Regeln für Preissegmente
 UseMultipriceRules=Mit diesen Regeln für Preisstufen kann man automatisch von der ersten Stufe aus die Preise der folgenden Stufen ausrechnen lassen.\nDie Regeln werden im Modul - Setup hinterlegt.
 KeepEmptyForAutoCalculation=Für automatische Berechnung kannst du das einfach leer lassen.
 VariantRefExample=Zum Beispiel: Col, Gr.
diff --git a/htdocs/langs/de_CH/sendings.lang b/htdocs/langs/de_CH/sendings.lang
index ec1ab38899a..e03dac2f60c 100644
--- a/htdocs/langs/de_CH/sendings.lang
+++ b/htdocs/langs/de_CH/sendings.lang
@@ -1,7 +1,12 @@
 # Dolibarr language file - Source file is en_US - sendings
 RefSending=Versand Nr.
 SendingCard=Auslieferungen
+QtyToShip=Versandmenge
 KeepToShip=Zum Versand behalten
+StatusSendingCanceledShort=widerrufen
+StatusSendingProcessed=Verarbeitete
+StatusSendingProcessedShort=Fertig
+SendingSheet=Auslieferungen
 WarningNoQtyLeftToSend=Achtung, keine Produkte für den Versand
 StatsOnShipmentsOnlyValidated=Versandstatistik (nur Freigegebene). Das Datum ist das der Freigabe (geplantes Lieferdatum ist nicht immer bekannt).
 ClassifyReception=Lieferung klassifizieren
diff --git a/htdocs/langs/de_CH/ticket.lang b/htdocs/langs/de_CH/ticket.lang
index 2c200f923ce..18ff7a30fab 100644
--- a/htdocs/langs/de_CH/ticket.lang
+++ b/htdocs/langs/de_CH/ticket.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - ticket
 TypeContact_ticket_external_SUPPORTCLI=Kundenkontakt / Störfallverfolgung
-NotRead=Ungelesen
 InProgress=In Bearbeitung
 TicketCloseOn=Schliessungsdatum
 TicketAddIntervention=Einsatz erstellen
diff --git a/htdocs/langs/de_CH/withdrawals.lang b/htdocs/langs/de_CH/withdrawals.lang
index 4a0aee41836..72755cae42a 100644
--- a/htdocs/langs/de_CH/withdrawals.lang
+++ b/htdocs/langs/de_CH/withdrawals.lang
@@ -6,3 +6,4 @@ StatusPaid=Verarbeitet
 StatusMotif4=Kundenbestellungen
 OrderWaiting=Wartend
 NumeroNationalEmetter=Nat. Überweisernummer
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index 112d1879d15..8e2382d07d4 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -16,16 +16,18 @@ ThisService=Diese Leistung
 ThisProduct=Dieses Produkt
 DefaultForService=Standard für Leistung
 DefaultForProduct=Standard für Produkt
+ProductForThisThirdparty=Produkt für diesen Partner
+ServiceForThisThirdparty=Leistungen für diesen Partner
 CantSuggest=Kann keines vorschlagen
 AccountancySetupDoneFromAccountancyMenu=Die wichtigste Teil der Konfiguration der Buchhaltung aus dem Menü %s wurde erledigt
-ConfigAccountingExpert=Configuration of the module accounting (double entry)
+ConfigAccountingExpert=Konfiguration des Moduls Buchhaltung (doppelt)
 Journalization=Journalisieren
 Journals=Journale
 JournalFinancial=Finanzjournale
 BackToChartofaccounts=Zurück zum  Kontenplan
 Chartofaccounts=Kontenplan
-ChartOfSubaccounts=Chart of individual accounts
-ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
+ChartOfSubaccounts=Plan der einzelnen Konten
+ChartOfIndividualAccountsOfSubsidiaryLedger=Plan der Einzelkonten des Nebenbuchs
 CurrentDedicatedAccountingAccount=Aktuelles dediziertes Konto
 AssignDedicatedAccountingAccount=Neues Konto zuweisen
 InvoiceLabel=Rechnungsanschrift
@@ -35,8 +37,8 @@ OtherInfo=Zusatzinformationen
 DeleteCptCategory=Buchhaltungskonto aus Gruppe entfernen
 ConfirmDeleteCptCategory=Soll dieses Buchhaltungskonto wirklich aus der Gruppe entfernt werden?
 JournalizationInLedgerStatus=Status der Journalisierung
-AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
+AlreadyInGeneralLedger=Bereits in Buchhaltungsjournale und Hauptbuch übertragen
+NotYetInGeneralLedger=Noch nicht in Buchhaltungsjournale und Hauptbuch übertragen
 GroupIsEmptyCheckSetup=Gruppe ist leer, kontrollieren Sie die persönlichen Kontogruppen
 DetailByAccount=Detail pro Konto zeigen
 AccountWithNonZeroValues=Konto mit Werten != 0
@@ -46,8 +48,9 @@ CountriesNotInEEC=Nicht-EU Länder
 CountriesInEECExceptMe=EU-Länder außer %s
 CountriesExceptMe=Alle Länder außer %s
 AccountantFiles=Belegdokumente exportieren
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+ExportAccountingSourceDocHelp=Mit diesem Tool können Sie die Quellereignisse (Liste und PDFs) exportieren, die zum Generieren Ihrer Buchhaltung verwendet wurden. Verwenden Sie zum Exportieren Ihrer Journale den Menüeintrag %s - %s.
 VueByAccountAccounting=Ansicht nach Buchhaltungskonto
+VueBySubAccountAccounting=Ansicht nach Buchhaltungsunterkonto
 
 MainAccountForCustomersNotDefined=Standardkonto für Kunden im Setup nicht definiert
 MainAccountForSuppliersNotDefined=Standardkonto für Lieferanten die nicht im Setup definiert sind
@@ -83,7 +86,7 @@ AccountancyAreaDescAnalyze=SCHRITT %s: Vorhandene Transaktionen hinzufügen oder
 
 AccountancyAreaDescClosePeriod=SCHRITT %s: Schließen Sie die Periode, damit wir in Zukunft keine Veränderungen vornehmen können.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Eine erforderliche Einrichtung wurde nicht abgeschlossen. (Kontierungsinformationen fehlen bei einigen Bankkonten)
 Selectchartofaccounts=Aktiven Kontenplan wählen
 ChangeAndLoad=ändern & laden
 Addanaccount=Fügen Sie ein Buchhaltungskonto hinzu
@@ -93,8 +96,8 @@ SubledgerAccount=Nebenbuchkonto
 SubledgerAccountLabel=Nebenbuchkonto-Bezeichnung
 ShowAccountingAccount=Buchhaltungskonten anzeigen
 ShowAccountingJournal=Buchhaltungsjournal anzeigen
-ShowAccountingAccountInLedger=Show accounting account in ledger
-ShowAccountingAccountInJournals=Show accounting account in journals
+ShowAccountingAccountInLedger=Buchhaltungskonto im Hauptbuch anzeigen
+ShowAccountingAccountInJournals=Buchhaltungskonto in Journalen anzeigen
 AccountAccountingSuggest=Buchhaltungskonto Vorschlag
 MenuDefaultAccounts=Standardkonten
 MenuBankAccounts=Bankkonten
@@ -116,7 +119,7 @@ ExpenseReportsVentilation=Spesenabrechnung Zuordnung
 CreateMvts=neue Transaktion erstellen
 UpdateMvts=Änderung einer Transaktion
 ValidTransaction=Transaktion bestätigen
-WriteBookKeeping=Register transactions in accounting
+WriteBookKeeping=Transaktionen in der Buchhaltung registrieren
 Bookkeeping=Hauptbuch
 BookkeepingSubAccount=Nebenbuch
 AccountBalance=Saldo Sachkonten
@@ -144,7 +147,7 @@ NotVentilatedinAccount=Nicht zugeordnet, zu einem Buchhaltungskonto
 XLineSuccessfullyBinded=%s Produkte/Leistungen erfolgreich an Buchhaltungskonto zugewiesen
 XLineFailedToBeBinded=%s Produkte/Leistungen waren an kein Buchhaltungskonto zugeordnet
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Anzahl der Elemente, die zum Kontieren angezeigt werden  (empfohlen max. 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximale Zeilenanzahl auf Liste und Kontierungsseite (empfohlen: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Beginnen Sie die Sortierung der Seite "Link zu realisieren“ durch die neuesten Elemente
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Beginnen Sie mit der Sortierung der Seite &quot; Zuordnung erledigt &quot; nach den neuesten Elementen
 
@@ -156,8 +159,8 @@ ACCOUNTING_MANAGE_ZERO=Verwalten der Null am Ende eines Buchhaltungskontos. \nIn
 BANK_DISABLE_DIRECT_INPUT=Deaktivieren der direkte Aufzeichnung von Transaktion auf dem Bankkonto
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Entwurfexport für Journal aktivieren
 ACCOUNTANCY_COMBO_FOR_AUX=Kombinationsliste für Nebenkonto aktivieren \n(kann langsam sein, wenn Sie viele Geschäftspartner haben)
-ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
+ACCOUNTING_DATE_START_BINDING=Definieren Sie ein Datum, an dem die Bindung und Übertragung in der Buchhaltung beginnen soll. Transaktionen vor diesem Datum werden nicht in die Buchhaltung übertragen.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Bei der Übertragung der Buchhaltung standardmäßig den Zeitraum anzeigen auswählen anzeigen
 
 ACCOUNTING_SELL_JOURNAL=Verkaufsjournal
 ACCOUNTING_PURCHASE_JOURNAL=Einkaufsjournal
@@ -177,7 +180,7 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Buchhaltungskonto in Wartestellung
 DONATION_ACCOUNTINGACCOUNT=Buchhaltungskonto für Spenden
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Buchhaltungskonto für Abonnements
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Standard-Buchhaltungskonto zur Registrierung der Kundeneinzahlung
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard-Buchhaltungskonto für gekaufte Produkte \n(wenn nicht anders im Produktblatt definiert)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Standardmäßig Buchhaltungskonto für die gekauften Produkte in der EU (wird verwendet, wenn nicht im Produktblatt definiert)
@@ -198,7 +201,8 @@ Docdate=Datum
 Docref=Referenz
 LabelAccount=Konto-Beschriftung
 LabelOperation=Bezeichnung der Operation
-Sens=Zweck
+Sens=Richtung
+AccountingDirectionHelp=Verwenden Sie für ein Buchhaltungskonto eines Kunden «Guthaben», um eine Zahlung zu erfassen, die Sie erhalten haben. <br> Verwenden Sie für ein Buchhaltungskonto eines Lieferanten «Debit», um eine von Ihnen geleistete Zahlung zu erfassen
 LetteringCode=Beschriftungscode
 Lettering=Beschriftung
 Codejournal=Journal
@@ -206,23 +210,24 @@ JournalLabel=Journal-Bezeichnung
 NumPiece=Teilenummer
 TransactionNumShort=Anz. Buchungen
 AccountingCategory=Personalisierte Gruppen
-GroupByAccountAccounting=Gruppieren nach Buchhaltungskonto
+GroupByAccountAccounting=Gruppieren nach Hauptbuchkonto
+GroupBySubAccountAccounting=Gruppieren nach Nebenbuchkonto
 AccountingAccountGroupsDesc=Hier können Kontengruppen definiert werden. Diese werden für personaliserte Buchhaltungsreports verwendet.
 ByAccounts=Pro Konto
 ByPredefinedAccountGroups=Pro vordefinierten Gruppen
 ByPersonalizedAccountGroups=Pro persönlichen Gruppierung
 ByYear=pro Jahr
 NotMatch=undefiniert
-DeleteMvt=Delete some operation lines from accounting
+DeleteMvt=Einige Operationszeilen aus der Buchhaltung löschen
 DelMonth=Monat zum Löschen
 DelYear=Jahr zu entfernen
 DelJournal=Journal zu entfernen
-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=Dadurch werden alle Vorgangszeilen der Buchhaltung für das Jahr / den Monat und / oder für ein bestimmtes Journal gelöscht (mindestens ein Kriterium ist erforderlich). Sie müssen die Funktion '%s' erneut verwenden, um den gelöschten Datensatz wieder im Hauptbuch zu haben.
+ConfirmDeleteMvtPartial=Dadurch wird die Transaktion aus der Buchhaltung gelöscht (alle mit derselben Transaktion verknüpften Vorgangszeilen werden gelöscht).
 FinanceJournal=Finanzjournal
 ExpenseReportsJournal=Spesenabrechnungsjournal
 DescFinanceJournal=Finanzjournal inklusive aller Arten von Zahlungen mit Bankkonto
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
+DescJournalOnlyBindedVisible=Dies ist eine Ansicht von Aufzeichnungen, die an ein Buchhaltungskonto gebunden sind und in den Journalen und im Hauptbuch erfasst werden können.
 VATAccountNotDefined=Steuerkonto nicht definiert
 ThirdpartyAccountNotDefined=Konto für Geschäftspartner nicht definiert
 ProductAccountNotDefined=Konto für Produkt nicht definiert
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Zahlung ist keinem Produkt oder Dienstleistung zugewi
 OpeningBalance=Eröffnungsbilanz
 ShowOpeningBalance=Eröffnungsbilanz anzeigen
 HideOpeningBalance=Eröffnungsbilanz ausblenden
-ShowSubtotalByGroup=Zwischensumme nach Gruppe anzeigen
+ShowSubtotalByGroup=Zwischensumme nach Ebene anzeigen
 
 Pcgtype=Kontenklasse
 PcgtypeDesc=Kontengruppen werden für einige Buchhaltungsberichte als vordefinierte Filter- und Gruppierungskriterien verwendet. Beispielsweise werden "EINKOMMEN" oder "AUSGABEN" als Gruppen für die Buchhaltung von Produktkonten verwendet, um die Ausgaben- / Einnahmenrechnung zu erstellen.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Kontieren Sie hier in der Liste Spesenabrechnungszeilen
 DescVentilExpenseReportMore=Wenn Sie beim Buchhaltungskonto den Typen Spesenabrechnungpositionen eingestellt haben, wird die Applikation alle Kontierungen zwischen den Spesenabrechnungspositionen und dem Buchhaltungskonto von Ihrem Kontenrahmen verwenden, durch einen einzigen Klick auf die Schaltfläche <strong> "%s" </strong>. Wenn kein Konto definiert wurde unter Stammdaten / Gebührenarten oder wenn Sie einige Zeilen nicht zu irgendeinem automatischen Konto gebunden haben, müssen Sie die Zuordnung manuell aus dem Menü  "<strong> %s </strong>“ machen.
 DescVentilDoneExpenseReport=Hier finden Sie die Liste der Aufwendungsposten und ihr Gebühren Buchhaltungskonto
 
+Closure=Jahresabschluss
 DescClosure=Informieren Sie sich hier über die Anzahl der Bewegungen pro Monat, die nicht validiert sind und die bereits in den Geschäftsjahren geöffnet sind.
 OverviewOfMovementsNotValidated=Schritt 1 / Bewegungsübersicht nicht validiert. \n(Notwendig, um ein Geschäftsjahr abzuschließen.)
+AllMovementsWereRecordedAsValidated=Alle Bewegungen wurden als validiert aufgezeichnet
+NotAllMovementsCouldBeRecordedAsValidated=Nicht alle Bewegungen konnten als validiert aufgezeichnet werden
 ValidateMovements=Bewegungen validieren
 DescValidateMovements=Jegliche Änderung oder Löschung des Schreibens, Beschriftens und Löschens ist untersagt. Alle Eingaben für eine Übung müssen validiert werden, da sonst ein Abschluss nicht möglich ist
-SelectMonthAndValidate=Monat auswählen und Bewegungen validieren
 
 ValidateHistory=automatisch zuordnen
 AutomaticBindingDone=automatische Zuordnung erledigt
@@ -293,9 +300,10 @@ Accounted=im Hauptbuch erfasst
 NotYetAccounted=noch nicht im Hauptbuch erfasst
 ShowTutorial=Tutorial anzeigen
 NotReconciled=nicht ausgeglichen
+WarningRecordWithoutSubledgerAreExcluded=Achtung, alle Vorgänge ohne definiertes Nebenbuchkonto werden gefiltert und von dieser Ansicht ausgeschlossen
 
 ## Admin
-BindingOptions=Binding options
+BindingOptions=Verbindungsoptionen
 ApplyMassCategories=Massenaktualisierung der Kategorien
 AddAccountFromBookKeepingWithNoCategories=Verfügbares Konto noch nicht in der personalisierten Gruppe
 CategoryDeleted=Die Gruppe für das Buchhaltungskonto wurde entfernt
@@ -315,9 +323,9 @@ ErrorAccountingJournalIsAlreadyUse=Dieses Journal wird bereits verwendet
 AccountingAccountForSalesTaxAreDefinedInto=Hinweis: Buchaltungskonten für Steuern sind im Menü <b>%s</b> - <b>%s</b> definiert
 NumberOfAccountancyEntries=Anzahl der Einträge
 NumberOfAccountancyMovements=Anzahl der Bewegungen
-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=Deaktivieren Sie die Bindung und Übertragung in der Buchhaltung bei Verkäufen (Kundenrechnungen werden in der Buchhaltung nicht berücksichtigt).
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Deaktivieren Sie die Bindung und Übertragung in der Buchhaltung bei Einkäufen (Lieferantenrechnungen werden in der Buchhaltung nicht berücksichtigt).
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Deaktivieren Sie die Bindung und Übertragung in der Buchhaltung für Spesenabrechnungen (Spesenabrechnungen werden bei der Buchhaltung nicht berücksichtigt).
 
 ## Export
 ExportDraftJournal=Entwurfsjournal exportieren
@@ -337,10 +345,11 @@ Modelcsv_LDCompta10=Export für LD Compta (v10 und höher)
 Modelcsv_openconcerto=Export für OpenConcerto (Test)
 Modelcsv_configurable=konfigurierbarer CSV-Export
 Modelcsv_FEC=Export nach FEC
+Modelcsv_FEC2=Export FEC (Mit Datumsgenerierung schriftlich / Dokument umgekehrt)
 Modelcsv_Sage50_Swiss=Export für Sage 50 (Schweiz)
 Modelcsv_winfic=Exportiere Winfic - eWinfic - WinSis Compta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5Export for Gestinum (v5)
+Modelcsv_Gestinumv3=Export für Gestinum (v3)
+Modelcsv_Gestinumv5Export für Gestinum (v5)
 ChartofaccountsId=Kontenplan ID
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 7af899574d9..21f0a05f884 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Benutzeroberfläche
 SetupArea=Einstellungen
 UploadNewTemplate=Neue Druckvorlage(n) hochladen
 FormToTestFileUploadForm=Formular für das Testen von Datei-Uplads (je nach Konfiguration)
+ModuleMustBeEnabled=Das Modul / die Anwendung <b> %s </b> muss aktiviert sein
+ModuleIsEnabled=Das Modul / die Anwendung <b> %s </b> wurde aktiviert
 IfModuleEnabled=Anmerkung: Ist nur wirksam wenn Modul <b>%s</b> aktiviert ist
 RemoveLock=Sie müssen die Datei <b>%s</b>  entfernen oder umbennen, falls vorhanden, um die Benutzung des Installations-/Update-Tools zu erlauben.
 RestoreLock=Stellen Sie die Datei <b>%s</b> mit ausschließlicher Leseberechtigung wieder her, um die Benutzung des Installations-/Update-Tools zu deaktivieren.
@@ -85,7 +87,6 @@ ShowPreview=Vorschau anzeigen
 ShowHideDetails=Details ein-/ausblenden
 PreviewNotAvailable=Vorschau nicht verfügbar
 ThemeCurrentlyActive=derzeit aktivierte grafische Oberfläche
-CurrentTimeZone=Aktuelle Zeitzone des PHP-Servers
 MySQLTimeZone=Aktuelle Zeitzone der SQL-Datenbank
 TZHasNoEffect=Daten werden vom Datenbank-Server gespeichert und zurückgeliefert, als würde der eingegebene String abgelegt werden. Die Zeitzone hat nur dann eine Auswirkung, wenn die UNIX_TIMESTAMP-Funktion benutzt wird (Dolibarr nutzt diese nicht, daher sollte die Datenbank-TZ keine Rolle spielen, selbst wenn diese nach Dateneingabe geändert wird).
 Space=Platz
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=In diesem Bereich finden Sie die Verwaltungsfunktionen. Verw
 Purge=Bereinigen
 PurgeAreaDesc=Auf dieser Seite können Sie alle von Dolibarr erzeugten oder gespeicherten Dateien (temporäre Dateien oder alle Dateien im Verzeichnis <b>%s</b> ) löschen. Die Verwendung dieser Funktion ist in der Regel nicht erforderlich. Es wird als Workaround für Benutzer bereitgestellt, deren Dolibarr von einem Anbieter gehostet wird, der keine Berechtigungen zum löschen von Dateien anbietet, die vom Webserver erzeugt wurden.
 PurgeDeleteLogFile=Löschen der Protokolldateien, einschließlich <b>%s</b>, die für das Syslog-Modul definiert wurden (kein Risiko Daten zu verlieren)
-PurgeDeleteTemporaryFiles=Löschen Sie alle temporären Dateien (kein Datenverlustrisiko). Hinweis: Das Löschen erfolgt nur, wenn das temporäre Verzeichnis vor über 24 Stunden erstellt wurde.
-PurgeDeleteTemporaryFilesShort=temporäre Dateien löschen
+PurgeDeleteTemporaryFiles=Alle Protokoll- und temporären Dateien löschen (kein Risiko, Daten zu verlieren). Hinweis: Das Löschen temporärer Dateien erfolgt nur, wenn das temporäre Verzeichnis vor mehr als 24 Stunden erstellt wurde.
+PurgeDeleteTemporaryFilesShort=Protokoll- und temporäre Dateien löschen
 PurgeDeleteAllFilesInDocumentsDir=Alle Dateien im Verzeichnis: <b>%s</b> löschen: <br>Dadurch werden alle erzeugten Dokumente löschen, die sich auf verknüpfte (Dritte, Rechnungen usw....), Dateien, die in das ECM Modul hochgeladen wurden, Datenbank, Backup, Dumps und temporäre Dateien beziehen.
 PurgeRunNow=Jetzt bereinigen
 PurgeNothingToDelete=Keine zu löschenden Verzeichnisse oder Dateien
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Bevorzugte Partner
 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.
 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.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Beispiele mit der aktuellen Systemkonfiguration
 ListOfDirectories=Liste der OpenDocument-Vorlagenverzeichnisse
 ListOfDirectoriesForModelGenODT=Liste der Verzeichnisse mit Vorlagendateien im OpenDocument-Format.<br><br>Fügen Sie hier den vollständigen Pfad der Verzeichnisse ein.<br>Trennen Sie jedes Verzeichnis mit einem Zeilenumbruch.<br>Verzeichnisse des ECM-Moduls fügen Sie z.B. so ein <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br> Dateien in diesen Verzeichnissen müssen mit <b>.odt</b>  oder <b>.ods</b> enden.
 NumberOfModelFilesFound=Anzahl der in diesen Verzeichnissen gefundenen .odt/.ods-Dokumentvorlagen
-ExampleOfDirectoriesForModelGen=Beispiele für Syntax:<br>c:\\mydir<br>/Home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Beispiele für die Syntax: <br> c:\\myapp\\mydocumentdir\\mysubdir <br> /home/myapp/mydocumentdir/mysubdir <br> DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Lesen Sie die Wiki Dokumentation um zu wissen, wie Sie Ihre odt Dokumentenvorlage erstellen, bevor Sie diese in den Kategorien speichern:
 FullListOnOnlineDocumentation=https://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Reihenfolge von Vor- und Nachname
@@ -406,7 +408,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=Holen der berechneten URL
-ButtonHideUnauthorized=Ausblenden von Schaltflächen für Nicht-Administrator für nicht autorisierte Aktionen, anstatt grau unterlegte deaktivierte Schaltflächen anzuzeigen.
+ButtonHideUnauthorized=Verstecke nicht autorisierte Aktionsschaltflächen auch für interne Benutzer (ansonsten nur grau)
 OldVATRates=Alter Umsatzsteuer-Satz
 NewVATRates=Neuer Umsatzsteuer-Satz
 PriceBaseTypeToChange=Ändern Sie den Basispreis definierte nach
@@ -442,7 +444,7 @@ ExtrafieldParamHelpPassword=Wenn Sie dieses Feld leer lassen, wird dieser Wert u
 ExtrafieldParamHelpselect=Die Liste der Werte muss aus Zeilen mit dem Format Schlüssel, Wert bestehen (wobei Schlüssel nicht '0' sein darf) <br><br> zum Beispiel: <br> 1, value1 <br> 2, value2 <br> Code3, Wert3 <br> ... <br><br> Damit die Liste von einer anderen ergänzenden Attributliste abhängt: <br> 1, value1 | options_ <i>parent_list_code</i> : parent_key <br> 2, value2 | options_ <i>parent_list_code</i> : parent_key <br><br> Um die Liste von einer anderen Liste abhängig zu machen: <br> 1, value1 | <i>parent_list_code</i> : parent_key <br> 2, value2 | <i>parent_list_code</i> : parent_key
 ExtrafieldParamHelpcheckbox=Die Liste der Werte muss aus Zeilen mit dem Format Schlüssel, Wert bestehen (wobei Schlüssel nicht '0' sein darf) <br><br> zum Beispiel: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
 ExtrafieldParamHelpradio=Die Liste der Werte muss aus Zeilen mit dem Format Schlüssel, Wert bestehen (wobei Schlüssel nicht '0' sein darf) <br><br> zum Beispiel: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=Die Liste der Werte stammt aus einer Tabelle <br> Syntax: table_name:label_field:id_field::filter <br> Beispiel: c_typent:libelle:id::filter <br><br> - id_field ist notwendigerweise ein primärer int-Schlüssel <br> - Filter kann ein einfacher Test sein (z. B. aktiv = 1), um nur den aktiven Wert anzuzeigen <br> Sie können $ID$ auch in Filtern verwenden, bei denen es sich um die aktuelle ID des aktuellen Objekts handelt <br> Verwenden Sie $SEL$, um ein SELECT im Filter durchzuführen <br> Wenn Sie nach Extrafeldern filtern möchten, verwenden Sie die Syntax extra.fieldcode = ... (wobei field code der Code des Extrafelds ist) <br><br> Damit die Liste von einer anderen ergänzenden Attributliste abhängt: <br> c_typent:libelle:id:options_ <i>parent_list_code</i> |parent_column:filter <br><br> Um die Liste von einer anderen Liste abhängig zu machen: <br> c_typent:libelle:id: <i>parent_list_code</i> |parent_column:filter
 ExtrafieldParamHelpchkbxlst=Die Liste der Werte stammt aus einer Tabelle <br> Syntax: table_name: label_field: id_field :: filter <br> Beispiel: c_typent: libelle: id :: filter <br><br> Filter kann ein einfacher Test sein (z. B. aktiv = 1), um nur den aktiven Wert anzuzeigen <br> Sie können $ ID $ auch in Filtern verwenden, bei denen es sich um die aktuelle ID des aktuellen Objekts handelt <br> Verwenden Sie $ SEL $, um ein SELECT im Filter durchzuführen <br> Wenn Sie nach Extrafeldern filtern möchten, verwenden Sie die Syntax extra.fieldcode = ... (wobei field code der Code des Extrafelds ist) <br><br> Damit die Liste von einer anderen ergänzenden Attributliste abhängt: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: filter <br><br> Um die Liste von einer anderen Liste abhängig zu machen: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: filter
 ExtrafieldParamHelplink=Die Parameter müssen ObjectName: Classpath <br> sein. Syntax: ObjectName: Classpath
 ExtrafieldParamHelpSeparator=Für ein einfaches Trennzeichen leer lassen <br> Setzen Sie diesen Wert für ein ausblendendes Trennzeichen auf 1 (standardmäßig für eine neue Sitzung geöffnet, der Status wird für jede Benutzersitzung beibehalten) <br> Setzen Sie diesen Wert für ein ausblendendes Trennzeichen auf 2 (standardmäßig für ausgeblendet) neue Sitzung, dann bleibt der Status für jede Benutzersitzung erhalten)
@@ -488,7 +490,7 @@ WarningPHPMailB=- Bei einigen E-Mail-Dienstanbietern (wie Yahoo) können Sie kei
 WarningPHPMailC=- Interessant ist auch die Verwendung des SMTP-Servers Ihres eigenen E-Mail-Dienstanbieters zum Senden von E-Mails, sodass alle von der Anwendung gesendeten E-Mails auch in dem Verzeichnis "Gesendet" Ihrer Mailbox gespeichert werden.
 WarningPHPMailD=Wenn die Methode 'PHP Mail' wirklich die Methode ist, die Sie verwenden möchten, können Sie diese Warnung entfernen, indem Sie die Konstante MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP unter Start - Einstellungen - Erweiterte Einstellungen zu 1 hinzufügen.
 WarningPHPMail2=Wenn Ihr E-Mail-SMTP-Anbieter den E-Mail-Client auf einige IP-Adressen beschränken muss (sehr selten), dann ist dies die IP-Adresse des Mail User Agent (MUA) für ihr Dolibarr-System: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=Wenn der Domainname in Ihrer Absender-E-Mail-Adresse durch einen SPF-Eintrag geschützt ist (beim Registrar des Domainnamens zu erfragen), müssen dem SPF-Eintrag des DNS Ihrer Domain die folgenden IP-Adressen hinzufügt werden: <strong> %s </strong>.
 ClickToShowDescription=Klicke um die Beschreibung zu sehen
 DependsOn=Diese Modul benötigt folgenden Module
 RequiredBy=Diese Modul ist für folgende Module notwendig
@@ -554,9 +556,9 @@ Module54Desc=Verwaltung von Verträgen (Dienstleistungen oder wiederkehrende Abo
 Module55Name=Barcodes
 Module55Desc=Barcode-Verwaltung
 Module56Name=Zahlung per Überweisung
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module56Desc=Verwaltung der Zahlung von Lieferanten durch Überweisungsaufträge. Es beinhaltet die Erstellung von SEPA-Dateien für europäische Länder.
 Module57Name=Zahlungen per Lastschrifteinzug
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
+Module57Desc=Verwaltung von Lastschriftaufträgen. Es beinhaltet die Erstellung von SEPA-Dateien für europäische Länder.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial-Integration
 Module60Name=Etiketten
@@ -599,7 +601,7 @@ Module520Name=Kredite / Darlehen
 Module520Desc=Verwaltung von Darlehen
 Module600Name=Benachrichtigungen über Geschäftsereignisse
 Module600Desc=E-Mail-Benachrichtigungen senden, die durch ein Geschäftsereignis ausgelöst werden: pro Benutzer (Einrichtung definiert für jeden Benutzer), pro Drittanbieter-Kontakte (Einrichtung definiert für jeden Drittanbieter) oder durch bestimmte E-Mails.
-Module600Long=Beachten Sie, dass dieses Modul E-Mails in Echtzeit sendet, wenn ein bestimmtes Geschäftsereignis stattfindet. Wenn Sie nach einer Funktion zum Senden von e-Mail-Erinnerungen für Agenda-Ereignisse suchen, gehen Sie in die Einrichtung den dem Modul Agenda.
+Module600Long=Beachten Sie, dass dieses Modul E-Mails in Echtzeit versendet, wenn ein bestimmtes Geschäftsereignis stattfindet. Wenn Sie nach einer Funktion zum Senden von e-Mail-Erinnerungen für Agenda-Ereignisse suchen, gehen Sie in die Einstellungen des Modul Agenda.
 Module610Name=Produktvarianten
 Module610Desc=Erlaubt das Erstellen von Produktvarianten, basierend auf Merkmalen (Farbe, Grösse, ...)
 Module700Name=Spenden
@@ -728,7 +730,7 @@ Permission95=Buchhaltung einsehen
 Permission101=Auslieferungen einsehen
 Permission102=Auslieferungen erstellen/bearbeiten
 Permission104=Auslieferungen freigeben
-Permission105=Send sendings by email
+Permission105=Sende Sendungen per E-Mail
 Permission106=Auslieferungen exportieren
 Permission109=Sendungen löschen
 Permission111=Finanzkonten einsehen
@@ -836,10 +838,10 @@ Permission402=Rabatte erstellen/bearbeiten
 Permission403=Rabatte freigeben
 Permission404=Rabatte löschen
 Permission430=Debug Bar nutzen
-Permission511=Read payments of salaries (yours and subordinates)
+Permission511=Zahlungen von Gehältern (Ihre und Untergebene) lesen
 Permission512=Lohnzahlungen anlegen / ändern
 Permission514=Lohn-/Gehaltszahlungen löschen
-Permission517=Read payments of salaries of everybody
+Permission517= Gehaltszahlungen von allen lesen
 Permission519=Löhne exportieren
 Permission520=Darlehen anzeigen
 Permission522=Darlehen erstellen/bearbeiten
@@ -851,10 +853,10 @@ Permission532=Leistungen erstellen/bearbeiten
 Permission534=Leistungen löschen
 Permission536=Versteckte Leistungen einsehen/verwalten
 Permission538=Leistungen exportieren
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
+Permission561=Zahlungsaufträge per Überweisung lesen
+Permission562=Zahlungsauftrag per Überweisung erstellen / ändern
+Permission563=Zahlungsauftrag per Überweisung senden / übertragen
+Permission564=Belastungen / Ablehnungen der Überweisung erfassen
 Permission601=Aufkleber lesen
 Permission602=Erstellen / Ändern von Aufklebern
 Permission609=Aufkleber löschen
@@ -1182,7 +1184,7 @@ InfoWebServer=Über Ihren Webserver
 InfoDatabase=Über Ihre Datenbank
 InfoPHP=Über PHP
 InfoPerf=Leistungs-Informationen
-InfoSecurity=About Security
+InfoSecurity=Über Sicherheit
 BrowserName=Browsername
 BrowserOS=Betriebssystem des Browsers
 ListOfSecurityEvents=Liste der sicherheitsrelevanten Ereignisse
@@ -1306,7 +1308,7 @@ YouUseBestDriver=Sie verwenden den Treiber %s, dies ist derzeit der best verfüg
 YouDoNotUseBestDriver=Sie verwenden Treiber %s, aber es wird der Treiber %s empfohlen.
 NbOfObjectIsLowerThanNoPb=Es gibt nur %s %s in der Datenbank. Das erfordert keine bestimmte Optimierung.
 SearchOptim=Such Optimierung
-YouHaveXObjectUseSearchOptim=Sie haben %s %s in der Datenbank. Sie sollten die Konstante %s zu 1 in Home-Setup-Other hinzufügen. Begrenzen Sie die Suche auf den Anfang von Zeichenfolgen. Dadurch kann die Datenbank Indizes verwenden, und Sie sollten sofort eine Antwort erhalten.
+YouHaveXObjectUseSearchOptim=Sie haben %s %s in der Datenbank. Sie können die Konstante %s in Home-Setup-Other zu 1 hinzufügen. Beschränken Sie die Suche auf den Anfang von Zeichenfolgen, damit die Datenbank Indizes verwenden kann, und Sie sollten sofort eine Antwort erhalten.
 YouHaveXObjectAndSearchOptimOn=Sie haben %s %s in der Datenbank und die Konstante %s ist in Home-Setup-Other auf 1 gesetzt.
 BrowserIsOK=Sie verwenden %s als Webbrowser. Dieser ist hinsichtlich Sicherheit und Leistung ausreichend.
 BrowserIsKO=Sie verwenden %s als Webbrowser. Dieser ist bekanntlich eine schlechte Wahl wenn es um Sicherheit, Leistung und Zuverlässigkeit geht. Wir empfehlen Firefox, Chrome, Opera oder Safari zu benutzen.
@@ -1314,7 +1316,7 @@ 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.
 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.
-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".
+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
 FillThisOnlyIfRequired=Beispiel: +2 (nur ausfüllen, wenn Sie Probleme mit der Zeitzone haben)
@@ -1421,7 +1423,7 @@ AdherentMailRequired=Für das Anlegen eines neuen Mitglieds ist eine E-Mail-Adre
 MemberSendInformationByMailByDefault=Das Kontrollkästchen für den automatischen Versand einer E-Mail-Bestätigung an Mitglieder (bei Freigabe oder neuem Abonnement) ist standardmäßig aktiviert
 VisitorCanChooseItsPaymentMode=Der Besucher kann aus verschiedenen Zahlungsmethoden auswählen
 MEMBER_REMINDER_EMAIL=Aktivieren Sie die automatische Erinnerung <b> per E-Mail </b> an abgelaufene Abonnements. Hinweis: Das Modul <strong> %s </strong> muss aktiviert und ordnungsgemäß eingerichtet sein, damit Erinnerungen gesendet werden können.
-MembersDocModules=Document templates for documents generated from member record
+MembersDocModules=Dokumentvorlagen für Dokumente, die aus dem Mitgliedsdatensatz generiert wurden
 ##### LDAP setup #####
 LDAPSetup=LDAP-Einstellungen
 LDAPGlobalParameters=Globale LDAP-Parameter
@@ -1564,9 +1566,9 @@ LDAPDescValues=Die Beispielwerte für <b>OpenLDAP</b> verfügen über folgende M
 ForANonAnonymousAccess=Für einen authentifizierten Zugang (z.B. für Schreibzugriff)
 PerfDolibarr=Leistungs-Einstellungen/Optimierungsreport
 YouMayFindPerfAdviceHere=Auf dieser Seite finden Sie einige Überprüfungen oder Hinweise zur Leistung.
-NotInstalled=Not installed.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
+NotInstalled=Nicht installiert.
+NotSlowedDownByThis=Nicht dadurch verlangsamt.
+NotRiskOfLeakWithThis=Hiermit keine Verlustgefahr.
 ApplicativeCache=geeigneter Cache
 MemcachedNotAvailable=Kein Cache Anwendung gefunden. \nSie können die Leistung durch die Installation des Cache-Server Memcached und die Aktivierung des Moduls Anwendungscache<br>hier mehr Informationen <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>\nverbessern.\nBeachten Sie, dass viele Billig-Provider keine solche Cache-Server in ihrer Infrastruktur anbieten.
 MemcachedModuleAvailableButNotSetup=Module memcached für geeigneten Cache gefunden, aber Setup-Modul ist nicht vollständig.
@@ -1596,8 +1598,13 @@ ServiceSetup=Modul Leistungen - Einstellungen
 ProductServiceSetup=Produkte und Leistungen Module Einstellungen
 NumberOfProductShowInSelect=Max. Anzahl der Produkte in Dropdownlisten (0=kein Limit)
 ViewProductDescInFormAbility=Anzeige der Produktbeschreibungen in Formularen (sonst als ToolTip-  Popup)
+DoNotAddProductDescAtAddLines=Fügen Sie beim absenden keine Produktbeschreibung (von der Produktkarte)  füge Zeilen an die Formulare\n
+OnProductSelectAddProductDesc=So verwenden Sie die Produktbeschreibung, wenn Sie ein Produkt als Dokumentzeile hinzufügen
+AutoFillFormFieldBeforeSubmit=Das Eingabefeld für die Beschreibung automatisch mit der Produktbeschreibung füllen
+DoNotAutofillButAutoConcat=Füllen Sie das Eingabefeld nicht automatisch mit der Produktbeschreibung aus. Die Produktbeschreibung wird automatisch mit der eingegebenen Beschreibung verkettet.
+DoNotUseDescriptionOfProdut=Die Produktbeschreibung wird niemals in die Beschreibung der Dokumentenzeilen aufgenommen
 MergePropalProductCard=Aktivieren einer Option unter Produkte/Leistungen  Registerkarte verknüpfte Dateien, um Produkt-PDF-Dokumente um Angebots PDF azur zusammenzuführen, wenn Produkte/Leistungen in dem Angebot sind.
-ViewProductDescInThirdpartyLanguageAbility=Anzeige der Produktbeschreibungen in der Sprache des Partners
+ViewProductDescInThirdpartyLanguageAbility=Anzeige von Produktbeschreibungen in Formularen in der Sprache des Partners (sonst in der Sprache des Benutzer)
 UseSearchToSelectProductTooltip=Wenn Sie eine große Anzahl von Produkten (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante PRODUCT_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn der Zeichenkette.
 UseSearchToSelectProduct=Warte auf Tastendruck, bevor der Inhalt der Produkt-Combo-Liste geladen wird (Dies kann die Leistung verbessern, wenn Sie eine große Anzahl von Produkten haben).
 SetDefaultBarcodeTypeProducts=Standard-Code-Typ für Produkte
@@ -1672,7 +1679,7 @@ AdvancedEditor=Erweiterter Editor
 ActivateFCKeditor=FCKEditor aktivieren für:
 FCKeditorForCompany=WYSIWIG Erstellung/Bearbeitung der Partnerinformationen und Notizen
 FCKeditorForProduct=WYSIWIG Erstellung/Bearbeitung von Produkt-/Serviceinformationen und Notizen
-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>
+FCKeditorForProductDetails=WYSIWIG Erstellung / Ausgabe von Produkt-Detailzeilen für alle Dokumente (Vorschläge, Bestellungen, Rechnungen usw.). <span class="warning"> Warnung: Die Verwendung dieser Option für diesen Fall wird nicht empfohlen, da dies beim Erstellen von PDF-Dateien zu Problemen mit Sonderzeichen und Seitenformatierung führen kann. </span>
 FCKeditorForMailing= WYSIWIG Erstellung/Bearbeitung von E-Mails
 FCKeditorForUserSignature=WYSIWIG Erstellung/Bearbeitung von Benutzer-Signaturen
 FCKeditorForMail=WYSIWYG-Erstellung/Bearbeitung für alle E-Mails (außer Werkzeuge->eMailing)
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalisierte Menüs die nicht mit dem Top-Menü ve
 NewMenu=Neues Menü
 MenuHandler=Menü-Handler
 MenuModule=Quellmodul
-HideUnauthorizedMenu= Hide unbefugte Menüs (grau)
+HideUnauthorizedMenu=Nicht autorisierte Menüs auch für interne Benutzer ausblenden (sonst nur grau)
 DetailId=Menü ID
 DetailMenuHandler=Menü-Handler für die Anzeige des neuen Menüs
 DetailMenuModule=Modulname falls Menüeintrag aus einem Modul stimmt
@@ -1738,10 +1745,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Diesen Standardwert automatisch als Ereignistyp im
 AGENDA_DEFAULT_FILTER_TYPE=Diesen Ereignisstatus automatisch in den Suchfilter für die Agenda-Ansicht übernehmen
 AGENDA_DEFAULT_FILTER_STATUS=Diesen Ereignisstatus automatisch in den Suchfilter für die Agenda-Ansicht übernehmen
 AGENDA_DEFAULT_VIEW=Welche Standardansicht soll geöffnet werden, wenn das Menü 'Agenda' geöffnet wird
-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=Aktiviere die Ereigniserinnerung <b> im Browser des Benutzers. </b> (Wenn das Erinnerungsdatum erreicht ist, wird vom Browser ein Popup angezeigt. Jeder Benutzer kann solche Benachrichtigungen in seinem Browser-Benachrichtigungs-Setup deaktivieren.)
 AGENDA_REMINDER_BROWSER_SOUND=Aktiviere Tonbenachrichtigung
-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 task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL=Aktiviere die Ereigniserinnerung <b> per E-Mail </b> (Erinnerungsoption / Verzögerung kann für jedes Ereignis definiert werden).
+AGENDA_REMINDER_EMAIL_NOTE=Hinweis: Die Häufigkeit der Aufgabe %s muss ausreichen, um sicherzustellen, dass die Erinnerung zum richtigen Zeitpunkt gesendet wird.
 AGENDA_SHOW_LINKED_OBJECT=Verknüpfte Objekte in Agenda anzeigen
 ##### Clicktodial #####
 ClickToDialSetup=Click-to-Dial Moduleinstellungen
@@ -1983,6 +1990,7 @@ EMailHost=Hostname des IMAP-Servers
 MailboxSourceDirectory=Quellverzechnis des eMail-Kontos
 MailboxTargetDirectory=Zielverzechnis des eMail-Kontos
 EmailcollectorOperations=Aktivitäten, die der eMail-Collector ausführen soll
+EmailcollectorOperationsDesc=Operationen werden von oben nach unten ausgeführt
 MaxEmailCollectPerCollect=Maximale Anzahl an einzusammelnden E-Mails je Collect-Vorgang 
 CollectNow=Jetzt abrufen
 ConfirmCloneEmailCollector=Sind Sie sicher, dass Sie den eMail-Collektor %s duplizieren möchten?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Nachricht einer Unterhaltung die durch eine erste von Dolibarr
 WithoutDolTrackingID=Nachricht einer Unterhaltung die NICHT durch eine erste von Dolibarr gesendete E-Mail initiiert wurde 
 WithDolTrackingIDInMsgId=Nachricht von Dolibarr gesendet
 WithoutDolTrackingIDInMsgId=Nachricht NICHT von Dolibarr gesendet
-CreateCandidature=Bewerbung erstellen
+CreateCandidature=Stellen-Bewerbung erstellen
 FormatZip=PLZ
 MainMenuCode=Menüpunktcode (Hauptmenü)
 ECMAutoTree=Automatischen ECM-Baum anzeigen
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Land (falls spezifisch für ein bestimmtes Land)
 YouMayFindSecurityAdviceHere=Hier finden Sie Sicherheitshinweise
 ModuleActivatedMayExposeInformation=Dieses Modul kann vertrauliche Daten verfügbar machen. Wenn Sie es nicht benötigen, deaktivieren Sie es.
 ModuleActivatedDoNotUseInProduction=Ein für die Entwicklung entwickeltes Modul wurde aktiviert. Aktivieren Sie es nicht in einer Produktionsumgebung.
+CombinationsSeparator=Trennzeichen für Produktkombinationen
+SeeLinkToOnlineDocumentation=Beispiele finden Sie unter dem Link zur Online-Dokumentation im oberen Menü
+SHOW_SUBPRODUCT_REF_IN_PDF=Wenn die Funktion "%s" des Moduls <b> %s </b> verwendet wird, werden Details zu Unterprodukten eines Satzes als PDF angezeigt.
+AskThisIDToYourBank=Wenden Sie sich an Ihre Bank, um diese ID zu erhalten
diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang
index 73e7c40f93c..ed52994e717 100644
--- a/htdocs/langs/de_DE/agenda.lang
+++ b/htdocs/langs/de_DE/agenda.lang
@@ -3,7 +3,7 @@ IdAgenda=Ereignis-ID
 Actions=Ereignisse
 Agenda=Terminplan
 TMenuAgenda=Terminplanung
-Agendas=Tagesordnungen
+Agendas=Terminpläne
 LocalAgenda=interne Kalender
 ActionsOwnedBy=Ereignis stammt von
 ActionsOwnedByShort=Eigentümer
@@ -33,7 +33,7 @@ ViewPerType=Anzeige pro Typ
 AutoActions= Automatische Befüllung der Tagesordnung
 AgendaAutoActionDesc= Hier können Sie Ereignisse definieren, die Dolibarr automatisch in der Agenda erstellen soll. Wenn nichts markiert ist, werden nur manuelle Aktionen in die Protokolle aufgenommen und in der Agenda angezeigt. Die automatische Verfolgung von Geschäftsaktionen an Objekten (Validierung, Statusänderung) wird nicht gespeichert.
 AgendaSetupOtherDesc= Diese Seite bietet Optionen, um den Export Ihrer Dolibarr-Ereignisse in einen externen Kalender (Thunderbird, Google Calendar usw.) zu ermöglichen.
-AgendaExtSitesDesc=Diese Seite erlaubt Ihnen externe Kalender zu konfigurieren.
+AgendaExtSitesDesc=Diese Seite erlaubt es, externe Kalenderquellen zu definieren, um deren Termine in der Dolibarr-Terminplanung zu sehen.
 ActionsEvents=Veranstaltungen zur automatischen Übernahme in die Agenda
 EventRemindersByEmailNotEnabled=Aufgaben-/Terminerinnerungen via E-Mail sind in den Einstellungen des Moduls %s nicht aktiviert.
 ##### Agenda event labels #####
@@ -166,4 +166,4 @@ TimeType=Erinnerungsdauer
 ReminderType=Erinnerungstyp
 AddReminder=Erstellt eine automatische Erinnerungsbenachrichtigung für dieses Ereignis
 ErrorReminderActionCommCreation=Fehler beim Erstellen der Erinnerungsbenachrichtigung für dieses Ereignis
-BrowserPush=Browser Benachrichtigung
+BrowserPush=Browser-Popup-Benachrichtigung
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index a5c59fe2608..1a24bc0bd5e 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -173,10 +173,11 @@ SEPAMandate=SEPA Mandat
 YourSEPAMandate=Ihr SEPA-Mandat
 FindYourSEPAMandate=Dies ist Ihr SEPA-Mandat, um unser Unternehmen zu ermächtigen, Lastschriftaufträge bei Ihrer Bank zu tätigen. Senden Sie es unterschrieben (Scan des unterschriebenen Dokuments) oder per Post an
 AutoReportLastAccountStatement=Füllen Sie das Feld 'Nummer des Kontoauszugs' bei der Abstimmung automatisch mit der Nummer des letzten Kontoauszugs
-CashControl=POS Kassenbestand
-NewCashFence=neuer Kassenbestand
+CashControl=POS-Kassensteuerung
+NewCashFence=Neue Kasse schließt
 BankColorizeMovement=Bewegungen färben
 BankColorizeMovementDesc=Wenn diese Funktion aktiviert ist, können Sie eine bestimmte Hintergrundfarbe für Debit- oder Kreditbewegungen auswählen
 BankColorizeMovementName1=Hintergrundfarbe für Debit-Bewegung
 BankColorizeMovementName2=Hintergrundfarbe für Kredit-Bewegung
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
+IfYouDontReconcileDisableProperty=Wenn Sie auf einigen Bankkonten keine Bankkontenabgleiche vornehmen, deaktivieren Sie die Eigenschaft "%s", um diese Warnung zu entfernen.
+NoBankAccountDefined=Kein Bankkonto definiert
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 597455e1fda..1ecc1ea7641 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -520,7 +520,7 @@ EarlyClosingReason=Grund für die vorzeitige Schließung
 EarlyClosingComment=Notiz zur vorzeitigen Schließung
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Repräsentative Follow-up Kundenrechnung
-TypeContact_facture_external_BILLING=Kundenrechnung Kontakt
+TypeContact_facture_external_BILLING=Kontakt für Kundenrechnungen
 TypeContact_facture_external_SHIPPING=Kundenversand Kontakt
 TypeContact_facture_external_SERVICE=Kundenservice Kontakt
 TypeContact_invoice_supplier_internal_SALESREPFOLL=Repräsentative Folgerechnung eines Lieferanten
@@ -577,6 +577,6 @@ UnitPriceXQtyLessDiscount=Stückpreis x Anzahl - Rabatt
 CustomersInvoicesArea=Abrechnungsbereich Kunden
 SupplierInvoicesArea=Abrechnungsbereich Lieferanten
 FacParentLine=Übergeordnete Rechnungszeile
-SituationTotalRayToRest=Remainder to pay without taxe
+SituationTotalRayToRest=Restbetrag zu zahlen ohne Steuern
 PDFSituationTitle=Situation Nr. %d
-SituationTotalProgress=Total progress %d %%
+SituationTotalProgress=Gesamtfortschritt %d %%
diff --git a/htdocs/langs/de_DE/blockedlog.lang b/htdocs/langs/de_DE/blockedlog.lang
index 76f7b5b97ce..65396077e9f 100644
--- a/htdocs/langs/de_DE/blockedlog.lang
+++ b/htdocs/langs/de_DE/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Spende automatisch gelöscht
 logMEMBER_SUBSCRIPTION_CREATE=Mitglieds-Abonnement erstellt
 logMEMBER_SUBSCRIPTION_MODIFY=Mitglieds-Abonnement geändert
 logMEMBER_SUBSCRIPTION_DELETE=Mitglieds-Abonnement automatisch löschen
-logCASHCONTROL_VALIDATE=Aufzeichnung Kassenschnitt
+logCASHCONTROL_VALIDATE=Kassenabschluss-Aufzeichnung
 BlockedLogBillDownload=Kundenrechnung herunterladen
 BlockedLogBillPreview=Kundenrechnung - Vorschau
 BlockedlogInfoDialog=Details zum Log
diff --git a/htdocs/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang
index b633a2ef019..0ebb4d77679 100644
--- a/htdocs/langs/de_DE/boxes.lang
+++ b/htdocs/langs/de_DE/boxes.lang
@@ -46,12 +46,15 @@ BoxTitleLastModifiedDonations=Zuletzt bearbeitete Spenden (maximal %s)
 BoxTitleLastModifiedExpenses=Zuletzt bearbeitete Spesenabrechnungen (maximal %s)
 BoxTitleLatestModifiedBoms=Zuletzt bearbeitete Stücklisten (maximal %s)
 BoxTitleLatestModifiedMos=Zuletzt bearbeitete Produktionsaufträge (maximal %s)
+BoxTitleLastOutstandingBillReached=Kunden mit überschrittenen Maximal-Aussenständen
 BoxGlobalActivity=Globale Aktivität (Rechnungen, Angebote, Aufträge)
 BoxGoodCustomers=Gute Kunden
 BoxTitleGoodCustomers=%s gute Kunden
+BoxScheduledJobs=Geplante Aufträge
+BoxTitleFunnelOfProspection=Interessenten Trichter
 FailedToRefreshDataInfoNotUpToDate=Fehler beim RSS-Abruf. Letzte erfolgreiche Aktualisierung: %s
 LastRefreshDate=Letzte Aktualisierung
-NoRecordedBookmarks=Keine Lesezeichen gesetzt. Klicken Sie <a href="%s">hier</a>, um ein Lesezeichen zu setzen.
+NoRecordedBookmarks=Keine Lesezeichen definiert.
 ClickToAdd=Hier klicken um hinzuzufügen.
 NoRecordedCustomers=keine erfassten Kunden
 NoRecordedContacts=keine erfassten Kontakte
@@ -83,8 +86,8 @@ BoxTitleLatestModifiedSupplierOrders=zuletzt bearbeitete Lieferantenbestellungen
 BoxTitleLastModifiedCustomerBills=Zuletzt bearbeitete Kundenrechnungen (maximal %s)
 BoxTitleLastModifiedCustomerOrders=Zuletzt bearbeitete Kundenaufträge (maximal %s)
 BoxTitleLastModifiedPropals=Zuletzt bearbeitete Angebote (maximal %s)
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Neueste %s geänderte Jobs
+BoxTitleLatestModifiedCandidatures=Neueste %s modifizierte Kandidaturen
 ForCustomersInvoices=Kundenrechnungen
 ForCustomersOrders=Kundenaufträge
 ForProposals=Angebote
@@ -92,8 +95,8 @@ LastXMonthRolling=Die letzten %s Monate gleitend
 ChooseBoxToAdd=Widget zu Ihrer Startseite hinzufügen
 BoxAdded=Widget wurde zu Ihrer Startseite hinzugefügt
 BoxTitleUserBirthdaysOfMonth=Geburtstage in diesem Monat (Benutzer)
-BoxLastManualEntries=Letzte manuelle Einträge in der Buchhaltung
-BoxTitleLastManualEntries=%s neueste manuelle Einträge
+BoxLastManualEntries=letzte Einträge in der Buchhaltung, manuell oder ohne Quelldokument eingegeben
+BoxTitleLastManualEntries=%s letzter Datensatz, der manuell oder ohne Quelldokument eingegeben wurde
 NoRecordedManualEntries=In der Buchhaltung sind keine manuellen Einträge erfasst
 BoxSuspenseAccount=Zähle die Buchhaltungsoperation mit dem Zwischenonto
 BoxTitleSuspenseAccount=Anzahl nicht zugewiesener Zeilen
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Zwischenkonto ist nicht definiert
 BoxLastCustomerShipments=Letzte Kundenlieferungen
 BoxTitleLastCustomerShipments=Neueste %s Kundensendungen
 NoRecordedShipments=Keine erfasste Kundensendung
+BoxCustomersOutstandingBillReached=Kunden mit erreichtem Aussenständen-Limit
 # Pages
 AccountancyHome=Buchführung
+ValidatedProjects=Validierte Projekte
diff --git a/htdocs/langs/de_DE/cashdesk.lang b/htdocs/langs/de_DE/cashdesk.lang
index 095e3d6e1f8..342df5e5a55 100644
--- a/htdocs/langs/de_DE/cashdesk.lang
+++ b/htdocs/langs/de_DE/cashdesk.lang
@@ -50,7 +50,7 @@ AmountAtEndOfPeriod=Betrag am Ende der Periode (Tag, Monat oder Jahr)
 TheoricalAmount=Theoretischer Betrag
 RealAmount=Realer Betrag
 CashFence=Kassenschluss
-CashFenceDone=Kassenschnitt im Zeitraum durchgeführt
+CashFenceDone=Kassenschließung für den Zeitraum durchgeführt
 NbOfInvoices=Anzahl der Rechnungen
 Paymentnumpad=Art des Pads zur Eingabe der Zahlung
 Numberspad=Nummernblock
@@ -77,7 +77,7 @@ POSModule=POS-Modul
 BasicPhoneLayout=Verwenden Sie das Basislayout für Telefone
 SetupOfTerminalNotComplete=Die Einrichtung von Terminal %s ist nicht abgeschlossen
 DirectPayment=Direktzahlung
-DirectPaymentButton=Add a "Direct cash payment" button
+DirectPaymentButton=Fügen Sie eine Schaltfläche "Direkte Barzahlung" hinzu
 InvoiceIsAlreadyValidated=Rechnung ist bereits geprüft
 NoLinesToBill=Keine Zeilen zu berechnen
 CustomReceipt=Benutzerdefinierte Quittung
@@ -94,13 +94,14 @@ TakeposConnectorMethodDescription=Externes Modul mit zusätzlichen Funktionen. M
 PrintMethod=Druckmethode
 ReceiptPrinterMethodDescription=Leistungsstarke Methode mit vielen Parametern. Vollständig anpassbar mit Vorlagen. Kann nicht aus der Cloud drucken.
 ByTerminal=über Terminal
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
+TakeposNumpadUsePaymentIcon=Verwenden Sie das Symbol anstelle des Textes auf den Zahlungsschaltflächen des Nummernblocks
 CashDeskRefNumberingModules=Nummerierungsmodul für POS-Verkäufe
 CashDeskGenericMaskCodes6 =  Das Tag <br> <b> {TN} </b> wird zum Hinzufügen der Terminalnummer verwendet
 TakeposGroupSameProduct=Gruppieren Sie dieselben Produktlinien
 StartAParallelSale=Starten Sie einen neuen Parallelverkauf
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Kasse schließen
+SaleStartedAt=Der Verkauf begann bei %s
+ControlCashOpening=Kontrollieren Sie das Popup-Fenster beim Öffnen des POS
+CloseCashFence=Schließen Sie die Kassensteuerung
 CashReport=Kassenbericht
 MainPrinterToUse=Quittungsdrucker
 OrderPrinterToUse=Drucker für Bestellungen
@@ -117,8 +118,9 @@ HideCategoryImages=Kategorie Bilder ausblenden
 HideProductImages=Produktbilder ausblenden
 NumberOfLinesToShow=Anzahl der anzuzeigenden Bildzeilen
 DefineTablePlan=Tabellenplan definieren
-GiftReceiptButton=Add a "Gift receipt" button
-GiftReceipt=Gift receipt
-ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
-AllowDelayedPayment=Allow delayed payment
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+GiftReceiptButton=Fügen Sie eine Schaltfläche "Gutschrift-Quittung" hinzu
+GiftReceipt=Gutschrift-Quittung
+ModuleReceiptPrinterMustBeEnabled=Das Modul Belegdrucker muss zuerst aktiviert worden sein
+AllowDelayedPayment=Verzögerte Zahlung zulassen
+PrintPaymentMethodOnReceipts=Zahlungsmethode auf Tickets | Quittungen drucken
+WeighingScale=Waage
diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
index c8fc85f28c9..6a04179c699 100644
--- a/htdocs/langs/de_DE/categories.lang
+++ b/htdocs/langs/de_DE/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Übersicht Projektkategorien
 UsersCategoriesArea=Bereich:  Benutzer Tags/Kategorien
 SubCats=Unterkategorie(n)
 CatList=Liste der Kategorien
+CatListAll=Liste der Schlagwörter / Kategorien (alle Typen)
 NewCategory=Neue Kategorie
 ModifCat=Kategorie bearbeiten
 CatCreated=Kategorie erstellt
@@ -65,24 +66,30 @@ UsersCategoriesShort=Benutzerkategorien
 StockCategoriesShort=Lagerort-Kategorien
 ThisCategoryHasNoItems=Diese Kategorie enthält keine Elemente.
 CategId=Kategorie-ID
-CatSupList=Liste der Lieferanten-Kategorien
-CatCusList=Liste der Kunden-/ Interessentenkategorien
+ParentCategory=Übergeordnetes Schlagwort / Kategorie
+ParentCategoryLabel=Label des übergeordneten Schlagwortes / der übergeordneten Kategorie
+CatSupList=Liste der Schlagwörter / Kategorien für Anbieter
+CatCusList=Liste der Schlagwörter / Kategorien für Kunden / Interessenten
 CatProdList=Liste der Produktkategorien
 CatMemberList=Liste der Mitgliederkategorien
-CatContactList=Liste der Kontaktkategorien
-CatSupLinks=Verbindung zwischen Lieferanten und Kategorien
+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
+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
 CatProdLinks=Verbindung zwischen Produkten/Leistungen und Kategorien
-CatProJectLinks=Verbindung zwischen Projekten und Kategorien bzw. Suchwörtern
+CatMembersLinks=Verbindung zwischen Mitgliedern und Kategorien
+CatProjectsLinks=Verbindung zwischen Projekten und Kategorien bzw. Suchwörtern
+CatUsersLinks=Verknüpfungen zwischen Benutzern und Schlagwörter / Kategorien
 DeleteFromCat=Aus Kategorie entfernen
 ExtraFieldsCategories=Ergänzende Attribute
 CategoriesSetup=Kategorie-Einstellungen
 CategorieRecursiv=Automatisch mit übergeordneter Kategorie verbinden
 CategorieRecursivHelp=Wenn die Option aktiviert ist, wird beim Hinzufügen eines Produkts zu einer Unterkategorie das Produkt auch automatisch zur übergeordneten Kategorie hinzugefügt.
 AddProductServiceIntoCategory=Folgendes Produkt / folgende Leistung dieser Kategorie hinzufügen:
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
+AddCustomerIntoCategory=Ordnen Sie dem Kunden eine Kategorie zu
+AddSupplierIntoCategory=Ordnen Sie dem Lieferanten eine Kategorie zu
 ShowCategory=Zeige Kategorie
 ByDefaultInList=Standardwert in Liste
 ChooseCategory=Kategorie auswählen
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index f8bad6b3a9e..717b52abe65 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -213,7 +213,7 @@ ProfId1MA=Prof ID 1  (R.C.)
 ProfId2MA=Prof ID 2
 ProfId3MA=Prof ID 3
 ProfId4MA=Prof ID 4
-ProfId5MA=Id prof. 5 (I.C.E.)
+ProfId5MA=Id prof. 5 (Identifiant Commun Entreprise)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Überprüfungsergebnis des MwSt-Informationsaustauschs
 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>
 ErrorVATCheckMS_UNAVAILABLE=Anfrage nicht möglich. Überprüfungsdienst wird vom Mitgliedsland nicht angeboten (%s).
 NorProspectNorCustomer=kein Interessent / kein Kunde
-JuridicalStatus=Rechtsform
+JuridicalStatus=Geschäftsentitätstyp
 Workforce=Mitarbeiter/innen
 Staff=Mitarbeiter
 ProspectLevelShort=Potenzial
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index 6d646740b35..472a03cbb90 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -111,7 +111,7 @@ Refund=Rückerstattung
 SocialContributionsPayments=Sozialabgaben-/Steuer Zahlungen
 ShowVatPayment=Zeige USt. Zahlung
 TotalToPay=Zu zahlender Gesamtbetrag
-BalanceVisibilityDependsOnSortAndFilters=Differenz ist nur in dieser Liste sichtbar, wenn die Tabelle aufsteigend nach %s sortiert ist und gefiltert mit nur 1 Bankkonto
+BalanceVisibilityDependsOnSortAndFilters=Der Kontostand ist in dieser Liste nur sichtbar, wenn die Tabelle nach %s sortiert und nach 1 Bankkonto gefiltert ist (ohne andere Filter).
 CustomerAccountancyCode=Kontierungscode Kunde
 SupplierAccountancyCode=Kontierungscode Lieferanten
 CustomerAccountancyCodeShort=Buchh. Kunden-Konto
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Möchten Sie diese Sozialabgaben-, oder Steuerza
 ExportDataset_tax_1=Steuer- und Sozialabgaben und Zahlungen
 CalcModeVATDebt=Modus <b>%s USt. auf Engagement Rechnungslegung %s</b>.
 CalcModeVATEngagement=Modus <b>%sTVA auf  Einnahmen-Ausgaben%s</b>.
-CalcModeDebt=Analyse der erfassten Rechnungen, auch wenn diese noch nicht Kontiert wurden
+CalcModeDebt=Analyse bekannter erfasster Dokumente, auch wenn diese noch nicht im Hauptbuch erfasst sind.
 CalcModeEngagement=Analyse der erfassten Zahlungen, auch wenn diese noch nicht Kontiert wurden
 CalcModeBookkeeping=Analyse der in der Tabelle Buchhaltungs-Ledger protokollierten Daten.
 CalcModeLT1= Modus <b>%sRE auf Kundenrechnungen - Lieferantenrechnungen%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Saldo der Erträge und Aufwendungen, Jahresübersic
 AnnualByCompanies=Bilanz Ertrag/Aufwand, pro vordefinierten Kontogruppen
 AnnualByCompaniesDueDebtMode=Die Ertrags-/Aufwands-Bilanz nach vordefinierten Gruppen, im Modus <b>%sForderungen-Verbindlichkeiten%s</b> meldet <b>Kameralistik</b>.
 AnnualByCompaniesInputOutputMode=Die Ertrags-/Aufwands-Bilanz im Modus <b>%sEinkünfte-Ausgaben%s</b> meldet <b>Ist-Besteuerung</b>.
-SeeReportInInputOutputMode=Zeige %sZahlungsanalyse%s für die Berechnung der aktuellen Zahlungen auch wenn diese noch nicht ins Hauptbuch übernommen wurden.
-SeeReportInDueDebtMode=Zeige %sRechnungsanalyse%s für die Berechnung der aktuellen Rechnungen auch wenn diese noch nicht ins Hauptbuch übernommen wurden.
-SeeReportInBookkeepingMode=Siehe <b>%sBuchungsreport%s</b> für die Berechnung via <b>Hauptbuch </b>
+SeeReportInInputOutputMode=Siehe <b> %sAnalyse der Zahlungen%s </b> für eine Berechnung basierend auf <b> erfassten Zahlungen </b>, auch wenn diese noch nicht ins Hauptbuch übernommen wurden.
+SeeReportInDueDebtMode=Siehe <b> %sAnalyse aufgezeichneter Dokumente%s </b> für eine Berechnung basierend auf bekannten <b> aufgezeichneten Dokumenten </b>, auch wenn diese noch nicht ins Hauptbuch übernommen wurden.
+SeeReportInBookkeepingMode=Siehe <b> %sAnalyse des Buchhaltungsbuchs-Tabelle%s </b> für einen Bericht basierend auf <b>Buchhaltungstabelle </b>
 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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Zeigt die Buchungen im Hauptbuch mit Konten <
 SeePageForSetup=Siehe Menü <a href="%s"> %s </a> für die Einrichtung
 DepositsAreNotIncluded=- Anzahlungsrechnungen sind nicht enthalten 
 DepositsAreIncluded=- Inklusive Anzahlungsrechnungen
+LT1ReportByMonth=Steuer 2 Bericht pro Monat
+LT2ReportByMonth=Steuer 3 Bericht pro Monat
 LT1ReportByCustomers=Auswertung Steuer 2 pro Partner
 LT2ReportByCustomers=Auswertung Steuer 3 pro Partner
 LT1ReportByCustomersES=Bericht von Kunden RE
 LT2ReportByCustomersES=Bericht von Partner EKSt.
 VATReport=Umsatzsteuer Report
 VATReportByPeriods=Umsatzsteuerauswertung pro Periode
+VATReportByMonth=Umsatzsteuerbericht nach Monat
 VATReportByRates=Umsatzsteuerauswertung pro Steuersatz
 VATReportByThirdParties=Umsatzsteuerauswertung pro Partner
 VATReportByCustomers=Umsatzsteuerauswertung pro Kunde
diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang
index a2b7c2ffa51..16b0ab2b940 100644
--- a/htdocs/langs/de_DE/cron.lang
+++ b/htdocs/langs/de_DE/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Lösche geplanten Job
 Permission23104 = Führe geplanten Job aus
 # Admin
 CronSetup=Jobverwaltungs-Konfiguration
-URLToLaunchCronJobs=URL zum Prüfen und Starten von speziellen Jobs
-OrToLaunchASpecificJob=Oder zum Prüfen und Starten von speziellen Jobs
+URLToLaunchCronJobs=URL zum Überprüfen und Starten qualifizierter Cron-Jobs über einen Browser
+OrToLaunchASpecificJob=Oder um einen bestimmten Job über einen Browser zu überprüfen und zu starten
 KeyForCronAccess=Sicherheitsschlüssel für URL zum Starten von Cronjobs
 FileToLaunchCronJobs=Befehlszeile zum Überprüfen und Starten von qualifizierten Cron-Jobs
 CronExplainHowToRunUnix=In Unix-Umgebung sollten Sie die folgenden crontab-Eintrag verwenden, um die Befehlszeile alle 5 Minuten ausführen
 CronExplainHowToRunWin=In Microsoft™ Windows Umgebungen kannst Du die Aufgabenplanung benutzen, um die Kommandozeile alle 5 Minuten aufzurufen.
 CronMethodDoesNotExists=Klasse %s enthält keine Methode %s
+CronMethodNotAllowed=Die Methode %s der Klasse %s befindet sich in der schwarzen Liste der verbotenen Methoden
 CronJobDefDesc=Cron-Jobprofile sind in der Moduldeskriptordatei definiert. Wenn das Modul aktiviert ist, sind diese geladen und verfügbar, so dass Sie die Jobs über das Menü admin tools %s verwalten können.
 CronJobProfiles=Liste vordefinierter Cron-Jobprofile
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Anzahl Starts
 CronMaxRun=Maximale Anzahl von Starts
 CronEach=Jede
 JobFinished=Job gestartet und beendet
+Scheduled=Geplant
 #Page card
 CronAdd= Jobs hinzufügen
 CronEvery=Jeden Job ausführen
@@ -56,7 +58,7 @@ CronNote=Kommentar
 CronFieldMandatory=Feld %s ist zwingend nötig
 CronErrEndDateStartDt=Enddatum kann nicht vor dem Startdatum liegen
 StatusAtInstall=Status bei der Modulinstallation
-CronStatusActiveBtn=Aktivieren
+CronStatusActiveBtn=Zeitplan
 CronStatusInactiveBtn=Deaktivieren
 CronTaskInactive=Dieser Job ist deaktiviert
 CronId=ID
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=lokales Datenbankbackup
 MakeLocalDatabaseDump=Erstellen Sie einen lokalen Datenbankspeicherauszug. Parameter sind: Komprimierung ('gz' oder 'bz' oder 'none'), Sicherungstyp ('mysql', 'pgsql', 'auto'), 1, 'auto' oder zu erstellender Dateiname, Anzahl der zu speichernden Sicherungsdateien
 WarningCronDelayed=Bitte beachten: Aus Leistungsgründen können Ihre Jobs um bis zu %s Stunden verzögert werden, unabhängig vom nächsten Ausführungstermin.
 DATAPOLICYJob=Datenbereiniger und Anonymisierer
+JobXMustBeEnabled=Job %s muss aktiviert sein
+# Cron Boxes
+LastExecutedScheduledJob=Zuletzt ausgeführter geplanter Job
+NextScheduledJobExecute=Nächster geplanter Job, der ausgeführt werden soll
+NumberScheduledJobError=Anzahl der fehlerhaften geplanten Jobs
diff --git a/htdocs/langs/de_DE/deliveries.lang b/htdocs/langs/de_DE/deliveries.lang
index aabd4dea18c..c3c906b07e4 100644
--- a/htdocs/langs/de_DE/deliveries.lang
+++ b/htdocs/langs/de_DE/deliveries.lang
@@ -12,7 +12,7 @@ ValidateDeliveryReceiptConfirm=Sind Sie sicher, dass Sie diesen Lieferschein bes
 DeleteDeliveryReceipt=Lieferschein löschen
 DeleteDeliveryReceiptConfirm=Möchten Sie den Lieferschein <b>%s</b> wirklich löschen?
 DeliveryMethod=Versandart
-TrackingNumber=Tracking Nummer
+TrackingNumber=Sendungsnummer
 DeliveryNotValidated=Lieferung nicht validiert
 StatusDeliveryCanceled=Storniert
 StatusDeliveryDraft=Entwurf
@@ -27,5 +27,6 @@ Recipient=Empfänger
 ErrorStockIsNotEnough=Nicht genügend Bestand
 Shippable=Versandfertig
 NonShippable=Nicht versandfertig
+ShowShippableStatus=Versandstatus anzeigen
 ShowReceiving=Zustellbestätigung anzeigen
 NonExistentOrder=Auftrag existiert nicht
diff --git a/htdocs/langs/de_DE/ecm.lang b/htdocs/langs/de_DE/ecm.lang
index 8dffa1f324e..706af0b1a82 100644
--- a/htdocs/langs/de_DE/ecm.lang
+++ b/htdocs/langs/de_DE/ecm.lang
@@ -23,7 +23,7 @@ ECMSearchByKeywords=Suche nach Stichwörtern
 ECMSearchByEntity=Suche nach Objekten/Belegarten
 ECMSectionOfDocuments=Dokumentenordner
 ECMTypeAuto=Automatisch
-ECMDocsBy=Documents linked to %s
+ECMDocsBy=Mit %s verknüpfte Dokumente
 ECMNoDirectoryYet=noch kein Verzeichnis erstellt
 ShowECMSection=Verzeichnis anzeigen
 DeleteSection=Verzeichnis löschen
@@ -38,6 +38,6 @@ ReSyncListOfDir=Liste der Verzeichnisse nochmal synchronisieren
 HashOfFileContent=Hashwert der Datei
 NoDirectoriesFound=Keine Verzeichnisse gefunden
 FileNotYetIndexedInDatabase=Datei noch nicht in Datenbank indiziert (bitte Datei nochmals hochladen)
-ExtraFieldsEcmFiles=Extrafields Ecm Files
-ExtraFieldsEcmDirectories=Extrafields Ecm Directories
-ECMSetup=ECM Setup
+ExtraFieldsEcmFiles=Extrafelder Ecm-Dateien
+ExtraFieldsEcmDirectories=Extrafelder Ecm-Verzeichnisse
+ECMSetup=DMS Einstellungen
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index 77988952bc9..b99e6a58364 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Kein Fehler, Befehl wurde ausgeführt
 # Errors
 ErrorButCommitIsDone=Fehler aufgetreten, Freigabe erfolgt dennoch
 ErrorBadEMail=Die E-Mail-Adresse %s ist nicht korrekt
+ErrorBadMXDomain=E-Mail %s scheint falsch zu sein (Domain hat keinen gültigen MX-Eintrag)
 ErrorBadUrl=URL %s ist nicht korrekt
 ErrorBadValueForParamNotAString=Ungültiger Wert für Ihren Parameter. Normalerweise passiert das, wenn die Übersetzung fehlt.
+ErrorRefAlreadyExists=Die Referenz <b> %s </b> ist bereits vorhanden.
 ErrorLoginAlreadyExists=Benutzername %s existiert bereits.
 ErrorGroupAlreadyExists=Gruppe %s existiert bereits.
 ErrorRecordNotFound=Eintrag wurde nicht gefunden.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Ein oder mehrere erforderliche Felder wurden nicht ausgefül
 ErrorSubjectIsRequired=Der E-Mail-Betreff ist obligatorisch
 ErrorFailedToCreateDir=Fehler beim Erstellen eines Verzeichnisses. Vergewissern Sie sich, dass der Webserver-Benutzer Schreibberechtigungen für das Dokumentverzeichnis des Systems besitzt. Bei aktiviertem <b>safe_mode</b> sollten die Systemdateien den Webserver-Benutzer oder die -Gruppe als Besitzer haben.
 ErrorNoMailDefinedForThisUser=Für diesen Benutzer ist keine E-Mail-Adresse eingetragen.
+ErrorSetupOfEmailsNotComplete=Das Einrichten von E-Mails ist nicht abgeschlossen
 ErrorFeatureNeedJavascript=Diese Funktion erfordert aktiviertes JavaScript. Sie können dies unter Einstellungen-Anzeige ändern.
 ErrorTopMenuMustHaveAParentWithId0=Ein Menü vom Typ 'Top' kann kein Eltern-Menü sein. Setzen Sie 0 als Eltern-Menü oder wählen Sie ein Menü vom Typ 'Links'.
 ErrorLeftMenuMustHaveAParentId=Ein Menü vom Typ 'Links' erfordert einen Eltern-Menü ID.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Dieser Profilname existiert bereits für dieses Expor
 ErrorLDAPSetupNotComplete=Der LDAP-Abgleich für dieses System ist nicht vollständig eingerichtet.
 ErrorLDAPMakeManualTest=Eine .ldif-Datei wurde im Verzeichnis %s erstellt. Laden Sie diese Datei von der Kommandozeile aus um mehr Informationen über Fehler zu erhalten.
 ErrorCantSaveADoneUserWithZeroPercentage=Ereignisse können nicht mit Status "Nicht begonnen" gespeichert werden, wenn das Feld "Erledigt durch" ausgefüllt ist.
-ErrorRefAlreadyExists=Die Nr. für den Erstellungsvorgang ist bereits vergeben
+ErrorRefAlreadyExists=Die Referenz <b> %s </b> ist bereits vorhanden.
 ErrorPleaseTypeBankTransactionReportName=Geben Sie den Kontoauszug an, in dem die Zahlung enthalten ist (Format JJJJMM oder JJJJMMTT)
 ErrorRecordHasChildren=Kann diesen Eintrag nicht löschen. Dieser Eintrag wird von mindestens einem untergeordneten Datensatz verwendet.
 ErrorRecordHasAtLeastOneChildOfType=Objekt hat mindestens einen Untereintrag vom Typ %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Sie müssen angeben ob der Artike
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Der Rabatt den Sie anwenden wollen ist grösser als der verbleibende Rechnungsbetrag. Teilen Sie den Rabatt in zwei kleinere Rabatte auf.
 ErrorFileNotFoundWithSharedLink=Datei nicht gefunden. Eventuell wurde der Sharekey verändert oder die Datei wurde gelöscht.
 ErrorProductBarCodeAlreadyExists=Der Produktbarcode %sexistiert schon bei einer anderen Produktreferenz
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Das verwenden von virtuellen Produkten welche den Lagerbestand von Unterprodukten verändern ist nicht möglich, wenn ein Unterprodukt (Oder Unter-Unterprodukt) eine Seriennummer oder Chargennummer benötigt.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Beachte auch, dass die Verwendung von Sätzen zum automatischen Erhöhen / Verringern von Unterprodukten nicht möglich ist, wenn mindestens ein Unterprodukt (oder Unterprodukt von Unterprodukten) eine Serien- / Chargennummer benötigt.
 ErrorDescRequiredForFreeProductLines=Beschreibung ist erforderlich für freie Produkte
 ErrorAPageWithThisNameOrAliasAlreadyExists=Die Seite/der Container <strong> %s </strong> hat denselben Namen oder alternativen Alias, den Sie verwenden möchten
 ErrorDuringChartLoad=Fehler beim Laden des Kontenplans. Wenn einige Konten nicht geladen wurden, können Sie sie trotzdem manuell eingeben.
@@ -240,9 +243,19 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Bestand nicht ausreichend f
 ErrorOnlyOneFieldForGroupByIsPossible=Nur ein Feld ist für 'Gruppieren nach' möglich (andere werden verworfen)
 ErrorTooManyDifferentValueForSelectedGroupBy=Es wurden zu viele unterschiedliche Werte (mehr als <b> %s </b>) für das Feld '<b> %s </b>' gefunden um 'Gruppieren nach' anzuzeigen. Das Feld 'Gruppieren nach' wurde entfernt. Vielleicht wollten Sie es als X-Achse verwenden?
 ErrorReplaceStringEmpty=Fehler: die zu ersetzende Zeichenfolge ist leer
-ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
-ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
-ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorProductNeedBatchNumber=Fehler, das Produkt '<b> %s </b>' benötigt eine Chargen- / Seriennummer
+ErrorProductDoesNotNeedBatchNumber=Fehler, dieses Produkt '<b> %s </b>' akzeptiert keine Chargen- / Seriennummer
+ErrorFailedToReadObject=Fehler, das Objekt vom Typ <b> %s </b> konnte nicht gelesen werden
+ErrorParameterMustBeEnabledToAllwoThisFeature=Fehler, Parameter <b> %s </b> muss in <b> conf / conf.php <b> aktiviert sein, damit die Befehlszeilen-Schnittstelle vom internen Job Scheduler verwendet werden kann
+ErrorLoginDateValidity=Fehler, diese Anmeldung liegt außerhalb des Gültigkeitszeitraums
+ErrorValueLength=Die Länge des Feldes '<b> %s </b>' muss höher sein als '<b> %s </b>'.
+ErrorReservedKeyword=Das Wort '<b> %s </b>' ist ein reserviertes Schlüsselwort
+ErrorNotAvailableWithThisDistribution=Nicht verfügbar mit dieser Version
+ErrorPublicInterfaceNotEnabled=Öffentliche Schnittstelle wurde nicht aktiviert
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Die Sprache der neuen Seite muss definiert werden, wenn sie als Übersetzung einer anderen Seite festgelegt ist
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Die Sprache der neuen Seite darf nicht die Ausgangssprache sein, wenn sie als Übersetzung einer anderen Seite festgelegt ist
+ErrorAParameterIsRequiredForThisOperation=Für diesen Vorgang ist ein Parameter obligatorisch
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Ihr PHP Parameter upload_max_filesize (%s) ist größer als Parameter post_max_size (%s). Dies ist eine inkonsistente Einstellung.
 WarningPasswordSetWithNoAccount=Es wurde ein Passwort für dieses Mitglied vergeben, aber kein Benutzer erstellt. Das Passwort wird gespeichert, aber kann nicht für die Anmeldung an Dolibarr verwendet werden. Es kann von einem externen Modul/einer Schnittstelle verwendet werden, aber wenn Sie kein Login oder Passwort für dieses Mitglied definiert müssen, können Sie die Option "Login für jedes Mitglied verwalten" in den Mitgliedseinstellungen deaktivieren. Wenn Sie ein Login aber kein Passwort benötige, lassen Sie dieses Feld leer, um diese Meldung zu deaktivieren. Anmerkung: Die E-Mail-Adresse kann auch zur Anmeldung verwendet werden, wenn das Mitglied mit einem Benutzer verbunden wird.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Ihr Login wurde verändert. Aus Sicherhei
 WarningAnEntryAlreadyExistForTransKey=Eine Übersetzung für diesen Übersetzungsschlüssel existiert schon für diese Sprache
 WarningNumberOfRecipientIsRestrictedInMassAction=Achtung, die Anzahl der verschiedenen Empfänger ist auf <b> %s </b> beschränkt, wenn Massenaktionen für Listen verwendet werden
 WarningDateOfLineMustBeInExpenseReportRange=Das Datum dieser Positionszeile ist ausserhalb der Datumsspanne dieser Spesenabrechnung
+WarningProjectDraft=Das Projekt befindet sich noch im Entwurfsmodus. Vergessen Sie nicht, es zu validieren, wenn Sie Aufgaben verwenden möchten.
 WarningProjectClosed=Projekt ist geschlossen. Sie müssen es zuerst wieder öffnen.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Einige Bank-Transaktionen wurden entfernt, nachdem der Kassenbon, der diese enthielt, erzeugt wurde. Daher wird sich die Anzahl der Checks und die Endsumme auf dem Kassenbon von der Anzahl und Endsumme in der Liste unterscheiden.
-WarningFailedToAddFileIntoDatabaseIndex=Warnung, Dateieintrag zur ECM-Datenbankindextabelle konnte nicht hinzugefügt werden.
+WarningFailedToAddFileIntoDatabaseIndex=Warnung: Dateieintrag zur ECM-Datenbankindextabelle konnte nicht hinzugefügt werden
+WarningTheHiddenOptionIsOn=Achtung, die versteckte Option <b> %s </b> ist aktiviert.
+WarningCreateSubAccounts=Achtung, Sie können kein Unterkonto direkt erstellen. Sie müssen einen Geschäftspartner oder einen Benutzer erstellen und ihm einen Buchungscode zuweisen, um sie in dieser Liste zu finden
+WarningAvailableOnlyForHTTPSServers=Nur verfügbar, wenn eine HTTPS-gesicherte Verbindung verwendet wird.
diff --git a/htdocs/langs/de_DE/exports.lang b/htdocs/langs/de_DE/exports.lang
index 972584e5da7..911f2646c68 100644
--- a/htdocs/langs/de_DE/exports.lang
+++ b/htdocs/langs/de_DE/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Schlüssel (Spalte), der zum <b> Aktualisieren </b> der vorh
 NbInsert=Anzahl eingefügter Zeilen: %s
 NbUpdate=Anzahl geänderter Zeilen: %s
 MultipleRecordFoundWithTheseFilters=Mehrere Ergebnisse wurden mit diesen Filtern gefunden: %s
+StocksWithBatch=Lagerbestände und Standort (Lager) von Produkten mit Chargen- / Seriennummer
diff --git a/htdocs/langs/de_DE/ftp.lang b/htdocs/langs/de_DE/ftp.lang
index b620f05a5ce..c60e50f9251 100644
--- a/htdocs/langs/de_DE/ftp.lang
+++ b/htdocs/langs/de_DE/ftp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP-Verbindungseinstellungen
-NewFTPClient=Neue FTP-Verbindung
-FTPArea=FTP-Verbindung(en)
-FTPAreaDesc=Diese Ansicht zeigt Ihnen den Inhalt eines FTP-Servers an.
-SetupOfFTPClientModuleNotComplete=Die Einstellungen des FTP-Verbindungsmoduls scheinen unvollständig zu sein.
-FTPFeatureNotSupportedByYourPHP=Ihre eingesetzte PHP-Version unterstützt keine FTP-Funktionen
-FailedToConnectToFTPServer=Fehler beim Verbindungsaufbau zum FTP-Server %s, Port %s
-FailedToConnectToFTPServerWithCredentials=Anmeldung am FTP-Server mit dem eingegebenen Benutzername / Passwort fehlgeschlagen
+FTPClientSetup=Einrichtung des FTP- oder SFTP-Client-Moduls
+NewFTPClient=Neue FTP / FTPS-Verbindungs-Konfiguration
+FTPArea=FTP / FTPS-Bereich
+FTPAreaDesc=Dieser Bildschirm zeigt eine Ansicht eines FTP- und SFTP-Servers.
+SetupOfFTPClientModuleNotComplete=Die Konfiguration des FTP- oder SFTP-Client-Moduls scheint unvollständig zu sein
+FTPFeatureNotSupportedByYourPHP=Ihr PHP unterstützt keine FTP- oder SFTP-Funktionen
+FailedToConnectToFTPServer=Verbindung zum Server fehlgeschlagen (Server %s, Port %s)
+FailedToConnectToFTPServerWithCredentials=Anmeldung am Server mit definiertem Login / Passwort fehlgeschlagen
 FTPFailedToRemoveFile=Konnte Datei <b>%s</b> nicht entfernen. Überprüfen Sie die Berechtigungen.
 FTPFailedToRemoveDir=Konnte Verzeichnis <b>%s</b> nicht entfernen. Überprüfen Sie die Berechtigungen und ob das Verzeichnis leer ist.
 FTPPassiveMode=Passives FTP
-ChooseAFTPEntryIntoMenu=Wählen Sie eine FTP-Adresse im Menü aus
+ChooseAFTPEntryIntoMenu=Wählen Sie eine FTP / SFTP-Seite aus dem Menü ...
 FailedToGetFile=Folgende Datei(en) konnte(n) nicht geladen werden: %s
diff --git a/htdocs/langs/de_DE/interventions.lang b/htdocs/langs/de_DE/interventions.lang
index ca931e06152..0822f3dda20 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 Eingriffen
+ChangeIntoRepeatableIntervention=Wechseln Sie zu wiederholbaren Serviceauftrag
 ListOfInterventions=Liste der Serviceaufträge
 ActionsOnFicheInter=Aktionen zum Serviceauftrag
 LastInterventions=%s neueste Serviceaufträge
@@ -17,10 +17,10 @@ ModifyIntervention=Ändere Serviceauftrag
 DeleteInterventionLine=Serviceauftragsposition 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?
+ConfirmModifyIntervention=Möchten Sie diesen Serviceauftrag wirklich ändern?
 ConfirmDeleteInterventionLine=Möchten Sie diese Vertragsposition wirklich löschen?
 ConfirmCloneIntervention=Möchten Sie diesen Serviceauftrag wirklich duplizieren?
-NameAndSignatureOfInternalContact=Name und Unterschrift des Mitarbeiter:
+NameAndSignatureOfInternalContact=Name und Unterschrift des Mitarbeiters:
 NameAndSignatureOfExternalContact=Name und Unterschrift des Kunden:
 DocumentModelStandard=Standard-Dokumentvorlage für Serviceaufträge
 InterventionCardsAndInterventionLines=Serviceaufträge und Serviceauftragspositionen
@@ -64,3 +64,5 @@ 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
+Reopen=entwerfen
+ConfirmReopenIntervention=Möchten Sie den Serviceauftrag <b> %s </b> wieder öffnen?
diff --git a/htdocs/langs/de_DE/intracommreport.lang b/htdocs/langs/de_DE/intracommreport.lang
index 4ce6f017ea5..c86e525cc51 100644
--- a/htdocs/langs/de_DE/intracommreport.lang
+++ b/htdocs/langs/de_DE/intracommreport.lang
@@ -31,10 +31,10 @@ IntracommReportTitle=XML-Datei der Zollerklärung vorbereiten
 
 # List
 IntracommReportList=Liste der Erkärungen
-IntracommReportNumber=Numero of declaration
-IntracommReportPeriod=Period of nalysis
+IntracommReportNumber=Numero der Erklärung
+IntracommReportPeriod=Analysezeitraum
 IntracommReportTypeDeclaration=Art der Erklärung
-IntracommReportDownload=download XML file
+IntracommReportDownload=XML-Datei herunterladen
 
 # Invoice
 IntracommReportTransportMode=Versandweg
diff --git a/htdocs/langs/de_DE/languages.lang b/htdocs/langs/de_DE/languages.lang
index 0c63da65bab..9a61df6591a 100644
--- a/htdocs/langs/de_DE/languages.lang
+++ b/htdocs/langs/de_DE/languages.lang
@@ -40,7 +40,7 @@ Language_es_PA=Spanish (Panama)
 Language_es_PY=Spanisch (Paraguay)
 Language_es_PE=Spanisch (Peru)
 Language_es_PR=Spanisch (Puerto Rico)
-Language_es_US=Spanish (USA)
+Language_es_US=Spanisch (USA)
 Language_es_UY=Spanisch (Uruguay)
 Language_es_GT=Spanisch (Guatemala)
 Language_es_VE=Spanisch (Venezuela)
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index 413cb8e07f1..3c7a87f490e 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=E-Mail-Adresse durch manuelle Eingabe hinzufüge
 MailingModuleDescDolibarrUsers=Benutzer mit E-Mail-Adresse
 MailingModuleDescThirdPartiesByCategories=Partner (nach Kategorien)
 SendingFromWebInterfaceIsNotAllowed=Versand vom Webinterface ist nicht erlaubt
+EmailCollectorFilterDesc=Alle Filter müssen übereinstimmen, damit eine E-Mail erfasst wird
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Zeile %s in der Datei
@@ -125,12 +126,13 @@ TagMailtoEmail=Empfänger E-Mail (beinhaltet html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=Kein E-Mail gesendet. Ungültige Absender- oder Empfängeradresse. Benutzerprofil kontrollieren.
 # Module Notifications
 Notifications=Benachrichtigungen
-NoNotificationsWillBeSent=Für dieses Ereignis und diesen Partner sind keine Benachrichtigungen geplant
-ANotificationsWillBeSent=Eine Benachrichtigung wird per E-Mail versendet.
-SomeNotificationsWillBeSent=%s Benachrichtigungen werden per E-Mail versendet.
-AddNewNotification=Neues E-Mail-Benachrichtigungsziel-Event aktivieren
-ListOfActiveNotifications=Liste aller aktiven Empänger/Events für E-Mail Benachrichtigungen
-ListOfNotificationsDone=Liste aller versendeten E-Mail-Benachrichtigungen
+NotificationsAuto=Benachrichtigungen Auto.
+NoNotificationsWillBeSent=Für diesen Ereignistyp und dieses Unternehmen sind keine automatischen E-Mail-Benachrichtigungen geplant
+ANotificationsWillBeSent=1 automatische Benachrichtigung wird per E-Mail gesendet
+SomeNotificationsWillBeSent=%s automatische Benachrichtigungen werden per E-Mail gesendet
+AddNewNotification=Abonnieren Sie eine neue automatische E-Mail-Benachrichtigung (Ziel / Ereignis)
+ListOfActiveNotifications=Alle aktiven Abonnements (Ziele / Ereignisse) für die automatische E-Mail-Benachrichtigung auflisten
+ListOfNotificationsDone=Alle automatisch gesendeten E-Mail-Benachrichtigungen auflisten
 MailSendSetupIs=Der E-Mail-Versand wurde auf '%s' konfiguriert. Dieser Modus kann nicht für E-Mail-Kampagnen verwendet werden.
 MailSendSetupIs2=Sie müssen zuerst mit einem Admin-Konto im Menü %sStart - Einstellungen - E-Mails%s den Parameter <strong>'%s'</strong> auf den Modus '%s' ändern. Dann können Sie die Daten des SMTP-Servers von Ihrem Internetdienstanbieter eingeben und die E-Mail-Kampagnen-Funktion nutzen.
 MailSendSetupIs3=Bei Fragen über die Einrichtung Ihres SMTP-Servers, können Sie %s fragen.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Die importierte Datei muss im folgenden Format vorlie
 UseFormatInputEmailToTarget=Geben Sie eine Zeichenkette im Format<br><strong>E-Mail-Adresse;Nachname;Vorname;Zusatzinformationen</strong> ein
 MailAdvTargetRecipients=Empfänger (Erweitere Selektion)
 AdvTgtTitle=Füllen Sie die Eingabefelder zur Vorauswahl der Partner- oder  Kontakt- / Adressen - Empänger
-AdvTgtSearchTextHelp=Verwenden Sie %% als Platzhalter. Um beispielsweise alle Elemente wie <b> jean, joe, jim </b> zu finden, können Sie auch <b> j%% </b> eingeben. als Trennzeichen für Wert und Verwendung! für außer diesem Wert. Beispiel: <b> jean; joe; jim%%;! Jimo;! Jima% </b> zielt auf alle jean, joe, beginnt mit jim, aber nicht mit jimo und nicht auf alles, was mit jima beginnt
+AdvTgtSearchTextHelp=Verwenden Sie %% als Platzhalter. Um beispielsweise alle Elemente wie <b> jean, joe, jim </b> zu finden, können Sie <b> j%% </b> eingeben, außerdem ; als Trennzeichen für Werte verwenden und ! für ohne diesen Wert. Zum Beispiel wird <b> jean; joe; jim%% ;! Jimo ;!jima%%</b> zielt auf alle die mit jean, joe, jim beginnen, aber nicht auf jimo und nicht auf alles, was mit jima beginnt
 AdvTgtSearchIntHelp=Intervall verwenden um eine Integer oder Fliesskommazahl auszuwählen
 AdvTgtMinVal=Mindestwert
 AdvTgtMaxVal=Maximalwert
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Filter erstellen
 AdvTgtOrCreateNewFilter=Name des neuen Filters
 NoContactWithCategoryFound=Kein Kontakt/Adresse mit einer Kategorie gefunden
 NoContactLinkedToThirdpartieWithCategoryFound=Kein Kontakt/Adresse mit einer Kategorie gefunden
-OutGoingEmailSetup=Postausgang
-InGoingEmailSetup=Posteingang
-OutGoingEmailSetupForEmailing=Einrichtung ausgehender E-Mails (für Modul %s)
-DefaultOutgoingEmailSetup=Standardeinstellungen für ausgehende E-Mails
+OutGoingEmailSetup=Ausgehende E-Mails
+InGoingEmailSetup=Eingehende E-Mails
+OutGoingEmailSetupForEmailing=Ausgehende E-Mails (für Modul %s)
+DefaultOutgoingEmailSetup=Gleiche Konfiguration wie beim globalen Setup für ausgehende E-Mails
 Information=Information
 ContactsWithThirdpartyFilter=Kontakte mit Drittanbieter-Filter
-Unanswered=Unanswered
+Unanswered=Unbeantwortet
 Answered=Beantwortet
-IsNotAnAnswer=Is not answer (initial email)
-IsAnAnswer=Is an answer of an initial email
+IsNotAnAnswer=Ist keine Antwort (Initial-E-Mail)
+IsAnAnswer=Ist eine Antwort auf eine Initial-E-Mail
+RecordCreatedByEmailCollector=Datensatz, der vom E-Mail-Sammler %s aus der E-Mail %s erstellt wurde
+DefaultBlacklistMailingStatus=Standardkontaktstatus für das Ablehnen von Massen-E-Mails
+DefaultStatusEmptyMandatory=Leer aber erforderlich
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 3b75f3e7964..f75c58b846a 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -18,7 +18,7 @@ FormatHourShortJQuery=HH:MI
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
-FormatDateText=%d %B %Y
+FormatDateText=%d. %B %Y
 FormatDateHourShort=%d.%m.%Y %H:%M
 FormatDateHourSecShort=%d.%m.%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
@@ -28,7 +28,9 @@ NoTemplateDefined=Für diesen E-Mail-Typ ist keine Vorlage verfügbar
 AvailableVariables=verfügbare Variablen
 NoTranslation=Keine Übersetzung
 Translation=Übersetzung
+CurrentTimeZone=Aktuelle Zeitzone des PHP-Servers
 EmptySearchString=Keine leeren Suchkriterien eingeben
+EnterADateCriteria=Geben Sie ein Datumskriterium ein
 NoRecordFound=Keinen Eintrag gefunden
 NoRecordDeleted=Keine Datensätze gelöscht
 NotEnoughDataYet=nicht genügend Daten
@@ -85,6 +87,8 @@ 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
+HomePage=Startseite
 RecordSaved=Eintrag gespeichert
 RecordDeleted=Eintrag gelöscht
 RecordGenerated=Eintrag erzeugt
@@ -197,7 +201,7 @@ ReOpen=Wiedereröffnen
 Upload=Upload
 ToLink=Link
 Select=Wählen Sie
-SelectAll=Select all
+SelectAll=Alle wählen
 Choose=Wählen
 Resize=Skalieren
 ResizeOrCrop=Grösse ändern oder zuschneiden
@@ -220,6 +224,7 @@ Value=Wert
 PersonalValue=Persönlicher Wert
 NewObject=Neu %s
 NewValue=Neuer Wert
+OldValue=Alter Wert %s
 CurrentValue=Aktueller Wert
 Code=Name
 Type=Typ
@@ -258,7 +263,7 @@ Cards=Karten
 Card=Übersicht
 Now=Jetzt
 HourStart=Startzeit
-Deadline=Deadline
+Deadline=Frist
 Date=Datum
 DateAndHour=Datum und Uhrzeit
 DateToday=heutiges Datum
@@ -267,10 +272,10 @@ DateStart=Startdatum
 DateEnd=Enddatum
 DateCreation=Erstellungsdatum
 DateCreationShort=Erstelldatum
-IPCreation=Creation IP
+IPCreation=Erstellungs-IP
 DateModification=Änderungsdatum
 DateModificationShort=Änderungsdatum
-IPModification=Modification IP
+IPModification=Änderungs-IP
 DateLastModification=Datum letzte Änderung
 DateValidation=Freigabedatum
 DateClosing=Schließungsdatum
@@ -324,7 +329,7 @@ Morning=Morgen
 Afternoon=Nachmittag
 Quadri=vierfach
 MonthOfDay=Tag des Monats
-DaysOfWeek=Days of week
+DaysOfWeek=Wochentage
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -375,7 +380,7 @@ MulticurrencyPaymentAmount=Zahlungsbetrag, Originalwährung
 MulticurrencyAmountHT=Nettobetrag, Originalwährung
 MulticurrencyAmountTTC=Betrag (Brutto), Originalwährung
 MulticurrencyAmountVAT=Steuerbetrag, Originalwährung
-MulticurrencySubPrice=Amount sub price multi currency
+MulticurrencySubPrice=Betrag Unterpreis Mehrfach-Währung
 AmountLT1=USt.-Betrag 2
 AmountLT2=USt.-Betrag 3
 AmountLT1ES=RE Betrag
@@ -433,6 +438,7 @@ RemainToPay=noch offen
 Module=Module / Anwendungen
 Modules=Module / Anwendungen
 Option=Option
+Filters=Filter
 List=Liste
 FullList=Vollständige Liste
 FullConversation=Ganzes Gespräch
@@ -494,7 +500,7 @@ By=Durch
 From=Von
 FromDate=von
 FromLocation=von
-at=at
+at=beim
 to=An
 To=An
 and=und
@@ -517,7 +523,7 @@ Draft=Entwurf
 Drafts=Entwürfe
 StatusInterInvoiced=Berechnet
 Validated=Bestätigt
-ValidatedToProduce=Validated (To produce)
+ValidatedToProduce=Validiert (zu produzieren)
 Opened=Geöffnet
 OpenAll=Öffnen (Alle)
 ClosedAll=Schließen (Alle)
@@ -650,6 +656,7 @@ SupplierPreview=Lieferantenvorschau
 ShowCustomerPreview=Zeige Kundenvorschau
 ShowSupplierPreview=Zeige Lieferantenvorschau
 RefCustomer=Ihr Zeichen
+InternalRef=Interne Referenz
 Currency=Währung
 InfoAdmin=Hinweise für Administratoren
 Undo=Rückgängig
@@ -671,7 +678,7 @@ SendMail=E-Mail versenden
 Email=E-Mail
 NoEMail=Keine E-Mail-Adresse(n) vorhanden
 AlreadyRead=Bereits gelesen
-NotRead=Nicht gelesen
+NotRead=Ungelesen
 NoMobilePhone=Kein Handy
 Owner=Eigentümer
 FollowingConstantsWillBeSubstituted=Nachfolgende Konstanten werden durch entsprechende Werte ersetzt.
@@ -888,8 +895,8 @@ Miscellaneous=Verschiedenes
 Calendar=Terminkalender
 GroupBy=Gruppiere nach ...
 ViewFlatList=Listenansicht zeigen
-ViewAccountList=View ledger
-ViewSubAccountList=View subaccount ledger
+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.
 DirectDownloadLink=Direkter Download Link
@@ -969,28 +976,28 @@ eight=Acht
 nine=Neun
 ten=Zehn
 eleven=Elf
-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
+twelve=zwölf
+thirteen=dreizehn
+fourteen=vierzehn
+fifteen=fünfzehn
+sixteen=sechszehn
+seventeen=siebzehn
+eighteen=achtzehn
+nineteen=neunzehn
+twenty=zwanzig
+thirty=dreißig
+forty=vierzig
+fifty=fünfzig
+sixty=sechzig
+seventy=siebzig
+eighty=achtzig
+ninety=neunzig
+hundred=hundert
+thousand=tausend
+million=Million
+billion=Milliarde
+trillion=Billion
+quadrillion=Billiarde
 SelectMailModel=Wähle E-Mail-Vorlage
 SetRef=Set Ref
 Select2ResultFoundUseArrows=Einige Ergebnisse gefunden. Nutzen Sie die Pfeiltasten um auszuwählen.
@@ -1021,7 +1028,7 @@ SearchIntoCustomerShipments=Kunden Lieferungen
 SearchIntoExpenseReports=Spesenabrechnungen
 SearchIntoLeaves=Urlaub
 SearchIntoTickets=Tickets
-SearchIntoCustomerPayments=Customer payments
+SearchIntoCustomerPayments=Kundenzahlungen
 SearchIntoVendorPayments=Lieferanten Zahlung
 SearchIntoMiscPayments=Sonstige Zahlungen
 CommentLink=Kommentare
@@ -1092,7 +1099,7 @@ NotUsedForThisCustomer=Wird für diesen Kunden nicht verwendet
 AmountMustBePositive=Der Betrag muss positiv sein
 ByStatus=Nach Status
 InformationMessage=Information
-Used=Used
+Used=Gebraucht
 ASAP=So schnell wie möglich
 CREATEInDolibarr=Datensatz %s erstellt
 MODIFYInDolibarr=Datensatz %s geändert
@@ -1100,10 +1107,16 @@ DELETEInDolibarr=Datensatz %s gelöscht
 VALIDATEInDolibarr=Datensatz %s bestätigt
 APPROVEDInDolibarr=Datensatz %s genehmigt
 DefaultMailModel=Standard E-Mail Modell
-PublicVendorName=Public name of vendor
+PublicVendorName=Öffentlicher Name des Anbieters
 DateOfBirth=Geburtsdatum
-SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
-UpToDate=Up-to-date
-OutOfDate=Out-of-date
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Das Sicherheitstoken ist abgelaufen, sodass die Aktion abgebrochen wurde. Bitte versuche es erneut.
+UpToDate=Aktuell
+OutOfDate=Veraltet
 EventReminder=Ereignis-Erinnerung
-UpdateForAllLines=Update for all lines
+UpdateForAllLines=Aktualisierung für alle Zeilen
+OnHold=angehalten
+Civility=Anrede/Titel
+AffectTag=Schlagwort beeinflussen
+ConfirmAffectTag=Massen-Schlagwort-Affekt
+ConfirmAffectTagQuestion=Sind Sie sicher, dass Sie Tags für die ausgewählten Datensätze von %s beeinflussen möchten?
+CategTypeNotFound=Für den Datensatztyp wurde kein Tag-Typ gefunden
diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
index b7b526b5b12..c11bfa1dff2 100644
--- a/htdocs/langs/de_DE/members.lang
+++ b/htdocs/langs/de_DE/members.lang
@@ -80,7 +80,7 @@ DeleteType=Löschen
 VoteAllowed=Stimmrecht
 Physical=natürliche Person
 Moral=juristische Person
-MorAndPhy=Moral and Physical
+MorAndPhy=juristisch und natürlich
 Reenable=Reaktivieren
 ResiliateMember=Mitglied deaktivieren
 ConfirmResiliateMember=Möchten Sie dieses Mitglied wirklich deaktivieren?
@@ -177,7 +177,7 @@ MenuMembersStats=Statistik
 LastMemberDate=Letztes Mitgliedschaftsdatum
 LatestSubscriptionDate=Letztes Beitragsdatum
 MemberNature=Art des Mitglieds
-MembersNature=Nature of members
+MembersNature=Art der Mitglieder
 Public=Informationen sind öffentlich
 NewMemberbyWeb=Neues Mitglied hinzugefügt, wartet auf Genehmigung.
 NewMemberForm=Formular neues Mitglied
diff --git a/htdocs/langs/de_DE/modulebuilder.lang b/htdocs/langs/de_DE/modulebuilder.lang
index 04d3f86d971..be2bc88b630 100644
--- a/htdocs/langs/de_DE/modulebuilder.lang
+++ b/htdocs/langs/de_DE/modulebuilder.lang
@@ -40,6 +40,7 @@ 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-Seite für Kontaktregisterkarte
 PathToModulePackage=Pfad des zu komprimierenden Moduls/Anwendungspakets
 PathToModuleDocumentation=Pfad zur Datei der Modul- / Anwendungsdokumentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Leer- oder Sonderzeichen sind nicht erlaubt.
@@ -77,7 +78,7 @@ IsAMeasure=Ist eine Maßnahme
 DirScanned=Verzeichnis gescannt
 NoTrigger=Kein Trigger
 NoWidget=Kein Widget 
-GoToApiExplorer=Gehe zum API Explorer
+GoToApiExplorer=API-Explorer
 ListOfMenusEntries=Liste der Menüeinträge
 ListOfDictionariesEntries=Liste der Wörterbucheinträge
 ListOfPermissionsDefined=Liste der definierten Berechtigungen
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Sind Kenntnisse in SQL und PHP vorhanden, können Sie d
 SeeTopRightMenu=Siehe <span class="fa fa-bug"></span>im Menü Oben Rechts
 AddLanguageFile=Sprachdatei hinzufügen
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Tabelle löschen wenn leer)
+DropTableIfEmpty=(Tabelle löschen, wenn leer)
 TableDoesNotExists=Die Tabelle %s existiert nicht
 TableDropped=Tabelle %s gelöscht
 InitStructureFromExistingTable=Erstelle die Struktur-Array-Zeichenfolge einer vorhandenen Tabelle
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Verwenden Sie eine bestimmte Editor-URL
 UseSpecificFamily = Verwenden Sie eine bestimmte Familie
 UseSpecificAuthor = Verwenden Sie einen bestimmten Autor
 UseSpecificVersion = Verwenden Sie eine bestimmte Anfangsversion
-ModuleMustBeEnabled=Das Modul / die Anwendung muss zuerst aktiviert werden
 IncludeRefGeneration=Die Objektreferen muss automatisch generiert werden
 IncludeRefGenerationHelp=Aktivieren Sie diese Option, wenn Sie Code einschließen möchten, um die Generierung der Referenz automatisch zu verwalten
 IncludeDocGeneration=Ich möchte einige Dokumente aus dem Objekt generieren
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Feldtypen:<br>varchar(99), double(24,8), real, text, html, date
 AsciiToHtmlConverter=Ascii zu HTML Konverter
 AsciiToPdfConverter=Ascii zu PDF Konverter
 TableNotEmptyDropCanceled=Tabelle nicht leer. Löschen wurde abgebrochen.
+ModuleBuilderNotAllowed=Der Modul-Generator ist verfügbar, aber für Ihren Benutzer nicht zulässig.
diff --git a/htdocs/langs/de_DE/mrp.lang b/htdocs/langs/de_DE/mrp.lang
index 731e122fa42..5efda355faf 100644
--- a/htdocs/langs/de_DE/mrp.lang
+++ b/htdocs/langs/de_DE/mrp.lang
@@ -77,4 +77,28 @@ UnitCost=Kosten pro Einheit
 TotalCost=Gesamtsumme Kosten
 BOMTotalCost=Die Herstellungskosten dieser Stückliste, basierend auf den Kosten jeder Menge und jeden verbrauchten Produktes (nutzt den Selbstkostenpreis wenn er definiert ist, ansonsten den Durchschnittspreis sofern definiert oder den besten Einkaufspreis)
 GoOnTabProductionToProduceFirst=Die Produktion muss begonnen sein, um einen Produktionsauftrag zu schließen (siehe Tab '%s'). Alternativ kann er storniert werden.
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Ein Satz kann nicht in einer Stückliste oder einem Fertigungsauftrag verwendet werden
+Workstation=Arbeitsplatz
+Workstations=Arbeitsplätze
+WorkstationsDescription=Arbeitsplatzverwaltung
+WorkstationSetup = Arbeitsplatz einrichten
+WorkstationSetupPage = Workstations setup page
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about page
+WorkstationList=Liste Arbeitsplätze
+WorkstationCreate=neuen Arbeitsplatz hinzufügen
+ConfirmEnableWorkstation=Möchten Sie den Arbeitsplatz <b> %s </b> aktivieren?
+EnableAWorkstation=einen Arbeitsplatz aktivieren
+ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
+DisableAWorkstation=Disable a workstation
+DeleteWorkstation=Supprimer
+NbOperatorsRequired=Number of operators required
+THMOperatorEstimated=Estimated operator THM
+THMMachineEstimated=Estimated machine THM
+WorkstationType=Arbeitsplatztyp
+Human=Mensch
+Machine=Maschine
+HumanMachine=Mensch & Maschine
+WorkstationArea=Workstation area
+Machines=Maschinen
+THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
diff --git a/htdocs/langs/de_DE/multicurrency.lang b/htdocs/langs/de_DE/multicurrency.lang
index cd4eece06b1..070feed47a3 100644
--- a/htdocs/langs/de_DE/multicurrency.lang
+++ b/htdocs/langs/de_DE/multicurrency.lang
@@ -20,3 +20,19 @@ MulticurrencyPaymentAmount=Zahlungsbetrag  (Originalwährung)
 AmountToOthercurrency=Betrag  (in der Währung des Empfängers)
 CurrencyRateSyncSucceed=Synchronisation des  Währungskurses erfolgreich abgeschlossen
 MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Benutze die Währung des Dokumentes für Online-Zahlungen
+TabTitleMulticurrencyRate=Kursliste
+ListCurrencyRate=Liste der Wechselkurse für die Währung
+CreateRate=Erstellen Sie einen Kurs
+FormCreateRate=Kurserstellung
+FormUpdateRate=Kursänderung
+successRateCreate=Der Kurs für die Währung %s wurde der Datenbank hinzugefügt
+ConfirmDeleteLineRate=Möchten Sie den Wechselkurs %s für die Währung %s am Datum %s wirklich entfernen?
+DeleteLineRate=Kurs löschen
+successRateDelete=Kurs gelöscht
+errorRateDelete=Fehler beim Löschen des Kurses
+successUpdateRate=Änderung vorgenommen
+ErrorUpdateRate=Fehler beim Ändern des Kurses
+Codemulticurrency=Währungscode
+UpdateRate=Ändern Sie den Kurs
+CancelUpdate=stornieren
+NoEmptyRate=Das Kursfeld darf nicht leer sein
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index 49c7e511d24..5ce758eaa4e 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -5,8 +5,6 @@ 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.
 Birthday=Geburtstag
-BirthdayDate=Geburtstag
-DateToBirth=Geburtsdatum
 BirthdayAlertOn=Geburtstagserinnerung EIN
 BirthdayAlertOff=Geburtstagserinnerung AUS
 TransKey=Übersetzung des Schlüssels TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Vorangehender Monat (1-12) des Rechnungsdatums
 TextPreviousMonthOfInvoice=Vorangehender Monat (Text) des Rechnungsdatums
 NextMonthOfInvoice=Folgender Monat (1-12) des Rechnungsdatums
 TextNextMonthOfInvoice=Folgender Monat (1-12) des Rechnungsdatum
+PreviousMonth=Vorheriger Monat
+CurrentMonth=Aktueller Monat
 ZipFileGeneratedInto=ZIP-Datei erstellt in <b>%s</b>.
 DocFileGeneratedInto=Doc Datei in <b>%s</b> generiert.
 JumpToLogin=Abgemeldet. Zur Anmeldeseite...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Spesenabrechnung überprüft (Genehmigung aussteh
 Notify_EXPENSE_REPORT_APPROVE=Spesenabrechnung genehmigt
 Notify_HOLIDAY_VALIDATE=Urlaubsantrag überprüft (Genehmigung ausstehend)
 Notify_HOLIDAY_APPROVE=Urlaubsantrag genehmigt
+Notify_ACTION_CREATE=Aktion zur Tagesplanung hinzugefügt
 SeeModuleSetup=Finden Sie im Modul-Setup %s
 NbOfAttachedFiles=Anzahl der angehängten Dateien/Dokumente
 TotalSizeOfAttachedFiles=Gesamtgröße der angehängten Dateien/Dokumente
@@ -85,8 +86,8 @@ MaxSize=Maximalgröße
 AttachANewFile=Neue Datei/Dokument anhängen
 LinkedObject=Verknüpftes Objekt
 NbOfActiveNotifications=Anzahl der Benachrichtigungen (Anzahl der E-Mail Empfänger)
-PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe lines are separated by a carriage return.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(Hello)__<br>This is a <b>test</b> mail sent to __EMAIL__ (the word test must be in bold).<br>The lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailTest=__(Hallo)__\nDies ist eine Testmail, die an __EMAIL__ gesendet wird.\nDie Zeilen sind durch einen Zeilenumbruch getrennt.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__ (Hallo) __ <br> Dies ist eine <b>-Test-</b>-Mail, die an __EMAIL__ gesendet wurde (das Wort test muss fett gedruckt sein). <br> Die Zeilen sind durch einen Zeilenumbruch getrennt. <br> <br> __USER_SIGNATURE__
 PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hallo)__\n\nDie Rechnung __REF__ finden Sie im Anhang\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Mit freundlichen Grüßen)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hallo)__\n\nWir möchten Sie daran erinnern, dass die Rechnung __REF__ offenbar nicht bezahlt wurde. Eine Kopie der Rechnung ist als Erinnerung beigefügt.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Mit freundlichen Grüßen)__\n\n__USER_SIGNATURE__
@@ -99,6 +100,7 @@ PredefinedMailContentSendShipping=__(Hallo)__\n\nAls Anlage erhalten Sie unsere
 PredefinedMailContentSendFichInter=__(Hallo)__\n\nBitte finden Sie den Serviceauftrag __REF__ im Anhang\n\n\n__(Mit freundlichen Grüßen)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Sie können den folgenden Link anklicken um die Zahlung auszuführen, falls sie noch nicht getätigt wurde.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Ereigniserinnerung "__EVENT_LABEL__" am __EVENT_DATE__ um __EVENT_TIME__ <br> <br> Dies ist eine automatische Nachricht. Bitte antworten Sie nicht.
 DemoDesc=Dolibarr ist eine Management-Software die mehrere Business-Module anbietet. Eine Demo, die alle Module beinhaltet ist nicht sinnvoll , weil der Fall nie existiert (Hunderte von verfügbaren Module). Es stehen auch einige Demo-Profile Typen zur Verfügung.
 ChooseYourDemoProfil=Bitte wählen Sie das Demo-Profil das Ihrem Anwendgsfall am ehesten entspricht
 ChooseYourDemoProfilMore=...oder bauen Sie Ihr eigenes Profil <br> (manuelle Auswahl der Module)
@@ -214,6 +216,7 @@ EMailTextExpenseReportValidated=Die Spesenabrechnung %s wurde geprüft.
 EMailTextExpenseReportApproved=Die Spesenabrechnung %s wurde genehmigt.
 EMailTextHolidayValidated=Urlaubsantrag %s wurde geprüft.
 EMailTextHolidayApproved=Urlaubsantrag %s wurde genehmigt.
+EMailTextActionAdded=Die Aktion %s wurde erfolgreich in die Terminplanung hinzugefügt.
 ImportedWithSet=Import Datensatz
 DolibarrNotification=Automatische Benachrichtigung
 ResizeDesc=Bitte geben Sie eine neue Breite <b>oder</b> Höhe ein. Das Verhältnis wird während des Zuschneidens erhalten...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Kontakt / Adresse durch das Modul E-Mail-Sammler
 ProjectCreatedByEmailCollector=Projekt durch das Modul E-Mail-Sammler aus der E-Mail erstellt. MSGID %s
 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
+PrefixSession=Präfix für Sitzungs-ID
 
 ##### Export #####
 ExportsArea=Exportübersicht
@@ -278,9 +282,9 @@ LinesToImport=Positionen zum importieren
 
 MemoryUsage=Speichernutzung
 RequestDuration=Dauer der Anfrage
-ProductsPerPopularity=Products/Services by popularity
+ProductsPerPopularity=Produkte / Dienstleistungen nach Beliebtheit
 PopuProp=Produkte / Dienstleistungen nach Beliebtheit in Angeboten
 PopuCom=Produkte / Dienstleistungen nach Beliebtheit in Bestellungen
 ProductStatistics=Produkt- / Dienstleistungsstatistik
 NbOfQtyInOrders=Menge in Bestellungen
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Wählen Sie den zu analysierenden Objekttyp aus ...
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index fca33bebb23..b29a2da4eda 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -104,24 +104,25 @@ SetDefaultBarcodeType=Wählen Sie den standardmäßigen Barcode-Typ
 BarcodeValue=Barcode-Wert
 NoteNotVisibleOnBill=Anmerkung (nicht sichtbar auf Rechnungen, Angeboten,...)
 ServiceLimitedDuration=Ist die Erbringung einer Dienstleistung zeitlich beschränkt:
-FillWithLastServiceDates=Fill with last service line dates
+FillWithLastServiceDates=Fülle mit Daten der letzten Servicezeile
 MultiPricesAbility=Mehrere Preissegmente pro Produkt / Dienstleistung (jeder Kunde befindet sich in einem Preissegment)
 MultiPricesNumPrices=Anzahl Preise
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
-AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this kit
+DefaultPriceType=Basis der Standardpreise (mit versus ohne Steuern) beim Hinzufügen neuer Verkaufspreise
+AssociatedProductsAbility=Aktiviere Kits (Set von mehreren Produkte)
+VariantsAbility=Varianten aktivieren (Produktvarianten, z. B. Farbe, Größe)
+AssociatedProducts=Sätze
+AssociatedProductsNumber=Anzahl der Produkte, aus denen dieser Satz besteht
 ParentProductsNumber=Anzahl der übergeordneten Produkte
 ParentProducts=Verwandte Produkte
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
+IfZeroItIsNotAVirtualProduct=Wenn 0, ist dieses Produkt kein Satz
+IfZeroItIsNotUsedByVirtualProduct=Bei 0 wird dieses Produkt von keinem Satz verwendet
 KeywordFilter=Stichwortfilter
 CategoryFilter=Kategoriefilter
 ProductToAddSearch=Suche hinzuzufügendes Produkt
 NoMatchFound=Kein Eintrag gefunden
 ListOfProductsServices=Liste der Produkte/Leistungen
-ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of kits with this product as a component
+ProductAssociationList=Liste der Produkte / Dienstleistungen, die Bestandteil dieses Satzes sind
+ProductParentList=Liste der Sätze mit diesem Produkt als Komponente
 ErrorAssociationIsFatherOfThis=Eines der ausgewählten Produkte ist Elternteil des aktuellen Produkts
 DeleteProduct=Produkt/Leistung löschen
 ConfirmDeleteProduct=Möchten Sie dieses Produkt/Leistung wirklich löschen?
@@ -169,6 +170,8 @@ SuppliersPrices=Lieferanten Preise
 SuppliersPricesOfProductsOrServices=Herstellerpreise (von Produkten oder Dienstleistungen)
 CustomCode=Zolltarifnummer
 CountryOrigin=Urspungsland
+RegionStateOrigin=Ursprungsregion
+StateOrigin=Ursprungs- Staat | Provinz
 Nature=Produkttyp  (Material / Fertig)
 NatureOfProductShort=Art des Produkts
 NatureOfProductDesc=Rohstoff oder Fertigprodukt
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Festen Preis nutzen
 PriceByQuantity=Unterschiedliche Preise nach Menge
 DisablePriceByQty=Preise nach Menge ausschalten
 PriceByQuantityRange=Bereich der Menge
-MultipriceRules=Regeln der Preisstufen
+MultipriceRules=Automatische Preise für Segment
 UseMultipriceRules=Verwenden Sie die im Produktmodul-Setup definierten Preissegmentregeln, um automatisch die Preise aller anderen Segmente gemäß dem ersten Segment zu berechnen
 PercentVariationOver=%%  Veränderung über %s
 PercentDiscountOver=%% Nachlass über %s
@@ -287,9 +290,9 @@ PriceExpressionEditorHelp5=verfügbare globale Werte:
 PriceMode=Preisfindungsmethode
 PriceNumeric=Nummer
 DefaultPrice=Standardpreis
-DefaultPriceLog=Log of previous default prices
+DefaultPriceLog=Protokoll der vorherigen Standardpreise
 ComposedProductIncDecStock=Erhöhen/Verringern des Lagerbestands bei verknüpften Produkten
-ComposedProduct=Kinderprodukte
+ComposedProduct=Unterprodukte
 MinSupplierPrice=Minimaler Kaufpreis
 MinCustomerPrice=Minimaler Verkaufspreis
 DynamicPriceConfiguration=Dynamische Preis Konfiguration
@@ -340,7 +343,7 @@ UseProductFournDesc=Fügen Sie eine Funktion hinzu, um die Beschreibungen der vo
 ProductSupplierDescription=Lieferantenbeschreibung für das Produkt
 UseProductSupplierPackaging=Berechne die Verpackung bei Lieferantenpreisen (berechnet neue Mengen / Lieferantenpreise gemäß der eingesetzten Verpackung, wenn Zeilen in den Lieferantendokumenten hinzugefügt / aktualisiert werden).
 PackagingForThisProduct=Verpackung
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
+PackagingForThisProductDesc=Bei Lieferantenbestellung bestellen Sie automatisch diese Menge (oder ein Vielfaches dieser Menge). Kann nicht unter der Mindestabnahmemenge liegen
 QtyRecalculatedWithPackaging=Die Menge der Zeile wurde entsprechend der Lieferantenverpackung neu berechnet
 
 #Attributes
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index 9b5ba8768f6..681c0f22f23 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -67,7 +67,7 @@ TaskDateEnd=Enddatum der Aufgabe
 TaskDescription=Aufgaben-Beschreibung
 NewTask=neue Aufgabe
 AddTask=Aufgabe erstellen
-AddTimeSpent=Erfassen verbrauchte Zeit 
+AddTimeSpent=Erfasse verwendete Zeit 
 AddHereTimeSpentForDay=Zeitaufwand für diesen Tag/Aufgabe hier erfassen
 AddHereTimeSpentForWeek=Benötigte Zeit in dieser Woche / für diese Aufgabe
 Activity=Tätigkeit
@@ -76,15 +76,16 @@ MyActivities=Meine Aufgaben/Tätigkeiten
 MyProjects=Meine Projekte
 MyProjectsArea=meine Projekte - Übersicht
 DurationEffective=Effektivdauer
-ProgressDeclared=Angegebener Fortschritt
+ProgressDeclared=Erklärte echte Fortschritte
 TaskProgressSummary=Aufgabenfortschritt
 CurentlyOpenedTasks=Aktuell offene Aufgaben
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=Der deklarierte Fortschritt ist %s weniger als der berechnete Fortschritt
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Der deklarierte Fortschritt ist %s mehr als der berechnete Fortschritt
-ProgressCalculated=Kalkulierter Fortschritt
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=Der deklarierte reale Fortschritt ist weniger %s als der Fortschritt bei der Nutzung
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Der deklarierte reale Fortschritt ist mehr %s als der Fortschritt bei der Nutzung
+ProgressCalculated=Fortschritte bei der Nutzung
 WhichIamLinkedTo=mit dem ich verbunden bin
 WhichIamLinkedToProject=Projekt mit dem ich verbunden bin
 Time=Zeitaufwand
+TimeConsumed=verwendet
 ListOfTasks=Aufgabenliste
 GoToListOfTimeConsumed=Liste der verwendeten Zeit aufrufen
 GanttView=Gantt-Diagramm
@@ -211,9 +212,9 @@ ProjectNbProjectByMonth=Anzahl der erstellten Projekte pro Monat
 ProjectNbTaskByMonth=Anzahl der erstellten Aufgaben pro Monat
 ProjectOppAmountOfProjectsByMonth=Anzahl der Leads pro Monat
 ProjectWeightedOppAmountOfProjectsByMonth=Gewichtete Anzahl von Leads pro Monat
-ProjectOpenedProjectByOppStatus=Open project|lead by lead status
-ProjectsStatistics=Statistics on projects or leads
-TasksStatistics=Statistics on tasks of projects or leads
+ProjectOpenedProjectByOppStatus=Projekt / Lead nach Leadstatus öffnen
+ProjectsStatistics=Statistiken zu Projekten oder Interessenten
+TasksStatistics=Statistiken zu Aufgaben von Projekten oder Interessenten
 TaskAssignedToEnterTime=Aufgabe zugewiesen. Eingabe der Zeit zu diese Aufgabe sollte möglich sein.
 IdTaskTime=ID Zeit Aufgabe
 YouCanCompleteRef=Wenn die Referenz mit einem Suffix ergänzt werden soll, ist es empfehlenswert, ein Trennstrich '-' zu verwenden, so dass die automatische Numerierung für weitere Projekte funktioniert. Zum Beispiel %s-MYSUFFIX
diff --git a/htdocs/langs/de_DE/propal.lang b/htdocs/langs/de_DE/propal.lang
index 0956cf4900f..de5a2e451fa 100644
--- a/htdocs/langs/de_DE/propal.lang
+++ b/htdocs/langs/de_DE/propal.lang
@@ -29,7 +29,7 @@ PropalsDraft=Entwürfe
 PropalsOpened=geöffnet
 PropalStatusDraft=Entwurf (freizugeben)
 PropalStatusValidated=Freigegeben (Angebot ist offen)
-PropalStatusSigned=Unterzeichnet  (ist zu verrechnen)
+PropalStatusSigned=unterzeichnet (abrechenbar)
 PropalStatusNotSigned=Nicht unterzeichnet (geschlossen)
 PropalStatusBilled=Verrechnet
 PropalStatusDraftShort=Entwurf
@@ -47,7 +47,6 @@ SendPropalByMail=Angebot per E-Mail versenden
 DatePropal=Angebotsdatum
 DateEndPropal=Gültig bis
 ValidityDuration=Gültigkeitsdauer
-CloseAs=Status ändern in 
 SetAcceptedRefused=Setze beauftragt / abgelehnt
 ErrorPropalNotFound=Angebot %s nicht gefunden
 AddToDraftProposals=Zu Angebots-Entwurf hinzufügen
@@ -87,5 +86,6 @@ CaseFollowedBy=Fall gefolgt von
 SignedOnly=nur signiert
 IdProposal=Angebots-ID
 IdProduct=Produkt ID
-PrParentLine=Übergeordnete Zeile des Vorschlags
-LineBuyPriceHT=Kaufpreis Betrag abzüglich Steuern für Linie
+PrParentLine=Übergeordnete Zeile des Angebots
+LineBuyPriceHT=Betrag Kaufpreis abzüglich Steuern für Zeile
+
diff --git a/htdocs/langs/de_DE/receiptprinter.lang b/htdocs/langs/de_DE/receiptprinter.lang
index dd8f3e068d1..f13265c9d26 100644
--- a/htdocs/langs/de_DE/receiptprinter.lang
+++ b/htdocs/langs/de_DE/receiptprinter.lang
@@ -54,7 +54,7 @@ DOL_DOUBLE_WIDTH=Doppelte Breite
 DOL_DEFAULT_HEIGHT_WIDTH=Standard für Höhe und Breite
 DOL_UNDERLINE=Unterstreichen aktivieren
 DOL_UNDERLINE_DISABLED=Unterstreichen deaktivieren
-DOL_BEEP=Signalton
+DOL_BEEP=Piepton
 DOL_PRINT_TEXT=Text drucken
 DateInvoiceWithTime=Rechnungsdatum und -zeit
 YearInvoice=Rechnungsjahr
diff --git a/htdocs/langs/de_DE/receptions.lang b/htdocs/langs/de_DE/receptions.lang
index 8093f6ed4aa..65e73211e22 100644
--- a/htdocs/langs/de_DE/receptions.lang
+++ b/htdocs/langs/de_DE/receptions.lang
@@ -43,5 +43,5 @@ ProductQtyInSuppliersReceptionAlreadyRecevied=Bereits erhaltene Produktmenge aus
 ValidateOrderFirstBeforeReception=Sie müssen zunächst die order validate validieren, bevor Sie Empfänge erstellen können.
 ReceptionsNumberingModules=Nummerierungsmodul für Empfänge
 ReceptionsReceiptModel=Dokumentvorlagen für Empfänge
-NoMorePredefinedProductToDispatch=No more predefined products to dispatch
+NoMorePredefinedProductToDispatch=Keine vordefinierten Produkte mehr zum Versand
 
diff --git a/htdocs/langs/de_DE/recruitment.lang b/htdocs/langs/de_DE/recruitment.lang
index f7bd9daa1bd..db4e52b8cbf 100644
--- a/htdocs/langs/de_DE/recruitment.lang
+++ b/htdocs/langs/de_DE/recruitment.lang
@@ -37,39 +37,40 @@ EnablePublicRecruitmentPages=Öffentliche Seiten von offenen Stellen aktivieren
 #
 About = Über
 RecruitmentAbout = Über Personalbeschaffung
-RecruitmentAboutPage = Recruitment about page
-NbOfEmployeesExpected=Expected nb of employees
+RecruitmentAboutPage = Personalbeschaffung über Seite
+NbOfEmployeesExpected=Erwartete Anzahl von Mitarbeitern
 JobLabel=Bezeichnung der beruflichen Position
 WorkPlace=Arbeitsplatz
 DateExpected=Erwartetes Datum
 FutureManager=Zukünftiger Manager
 ResponsibleOfRecruitement=Verantwortlich für die Rekrutierung
-IfJobIsLocatedAtAPartner=If job is located at a partner place
+IfJobIsLocatedAtAPartner=Wenn sich der Job an einem Partnerort befindet
 PositionToBeFilled=Position
 PositionsToBeFilled=Berufspositionen
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+ListOfPositionsToBeFilled=Liste der Stellen
+NewPositionToBeFilled=Neue Stellen
 
-JobOfferToBeFilled=Job position to be filled
+JobOfferToBeFilled=Zu besetzende Stelle
 ThisIsInformationOnJobPosition=Information über die zu besetzende Position
 ContactForRecruitment=Kontakt für die Personalbeschaffung
 EmailRecruiter=Recruiter per E-Mail anschreiben
-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
+ToUseAGenericEmail=So verwenden Sie eine generische E-Mail. Falls nicht definiert, wird die E-Mail-Adresse des für die Personalbeschaffung Verantwortlichen verwendet
+NewCandidature=Neue Bewerbung
+ListOfCandidatures=Liste der Bewerbungen
 RequestedRemuneration=gewünschtes Gehalt
 ProposedRemuneration=vorgeschlagenes Gehalt
 ContractProposed=Vertrag unterbreitet
 ContractSigned=Vertrag unterschrieben
-ContractRefused=Contract refused
-RecruitmentCandidature=Application
+ContractRefused=Vertrag abgelehnt
+RecruitmentCandidature=Bewerbung
 JobPositions=Berufspositionen
-RecruitmentCandidatures=Applications
+RecruitmentCandidatures=Bewerbungen
 InterviewToDo=Bewerbungsgespräch machen
-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)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+AnswerCandidature=Antwort auf die Bewerbung
+YourCandidature=Ihre Bewerbung
+YourCandidatureAnswerMessage=Vielen Dank für Ihre Bewerbung. <br> ...
+JobClosedTextCandidateFound=Die Stelle ist geschlossen. Die Position wurde besetzt.
+JobClosedTextCanceled=Die Stelle ist geschlossen.
+ExtrafieldsJobPosition=Ergänzende Attribute (Stellenangebote)
+ExtrafieldsCandidatures=Ergänzende Attribute (Bewerbungen)
+MakeOffer=Machen Sie ein Angebot
diff --git a/htdocs/langs/de_DE/salaries.lang b/htdocs/langs/de_DE/salaries.lang
index 4ceaf557fd6..e405e235988 100644
--- a/htdocs/langs/de_DE/salaries.lang
+++ b/htdocs/langs/de_DE/salaries.lang
@@ -12,10 +12,10 @@ ShowSalaryPayment=Zeige Lohnzahlung
 THM=Durchschnittlicher Stundensatz
 TJM=Durchschnittlicher Tagessatz
 CurrentSalary=aktueller  Lohn
-THMDescription=Dieser Wert kann verwendet werden, um die Kosten für die verbrauchte Zeit eines Anwender zu berechnen, wenn das Modul Projektverwaltung verwendet wird,
+THMDescription=Dieser Wert kann verwendet werden, um die Kosten für die verwendete Zeit eines Anwender zu berechnen, wenn das Modul Projektverwaltung verwendet wird,
 TJMDescription=Dieser Wert ist aktuell nur zu Informationszwecken und wird nicht für eine Berechnung verwendet
 LastSalaries=Letzte %s Lohnzahlungen
-AllSalaries=Alle Lohnzahlungen
+AllSalaries=Alle Gehaltszahlungen
 SalariesStatistics=Statistik Gehälter
 # Export
-SalariesAndPayments=Salaries and payments
+SalariesAndPayments=Gehälter und Gehaltszahlungen
diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang
index 71c8092fb07..482de9a27e7 100644
--- a/htdocs/langs/de_DE/sendings.lang
+++ b/htdocs/langs/de_DE/sendings.lang
@@ -20,7 +20,7 @@ CreateShipment=Auslieferung erstellen
 QtyShipped=Liefermenge
 QtyShippedShort=Gelieferte Menge
 QtyPreparedOrShipped=Menge vorbereitet oder versendet
-QtyToShip=Versandmenge
+QtyToShip=Liefermenge
 QtyToReceive=Menge zu erhalten
 QtyReceived=Erhaltene Menge
 QtyInOtherShipments=Menge in anderen Lieferungen
@@ -30,16 +30,17 @@ OtherSendingsForSameOrder=Weitere Lieferungen zu dieser Bestellung
 SendingsAndReceivingForSameOrder=Warenerhalt und Versand dieser Bestellung
 SendingsToValidate=Freizugebende Auslieferungen
 StatusSendingCanceled=Storniert
+StatusSendingCanceledShort=storniert
 StatusSendingDraft=Entwurf
 StatusSendingValidated=Freigegeben (Artikel versandfertig oder bereits versandt)
-StatusSendingProcessed=Verarbeitete
+StatusSendingProcessed=Erledigt
 StatusSendingDraftShort=Entwurf
 StatusSendingValidatedShort=Freigegeben
-StatusSendingProcessedShort=Fertig
+StatusSendingProcessedShort=Erledigt
 SendingSheet=Lieferschein
-ConfirmDeleteSending=Möchten Sie diesen Versand wirklich löschen?
-ConfirmValidateSending=Möchten Sie diesen Versand mit der Referenz <b>%s</b> wirklich freigeben?
-ConfirmCancelSending=Möchten Sie diesen Versand wirklich abbrechen?
+ConfirmDeleteSending=Möchten Sie diese Lieferung wirklich löschen?
+ConfirmValidateSending=Möchten Sie die Lieferung mit der Referenz <b>%s</b> wirklich freigeben?
+ConfirmCancelSending=Möchten Sie diese Auslieferung wirklich abbrechen?
 DocumentModelMerou=Merou A5-Modell
 WarningNoQtyLeftToSend=Achtung, keine weiteren Produkte für den Versand.
 StatsOnShipmentsOnlyValidated=Versandstatistik (nur freigegebene). Das Datum ist das der Freigabe (geplantes Lieferdatum ist nicht immer bekannt).
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Sie müssen den Auftrag erst bestätigen bevor
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Vollständig Dokumentvorlage für die Lieferscheine (Logo, ...)
+DocumentModelStorm=Vollständigeres Dokumentmodell für Lieferbelege und Kompatibilität mit Extrafeldern (Logo ...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstante EXPEDITION_ADDON_NUMBER nicht definiert
 SumOfProductVolumes=Summe der Produktvolumen
 SumOfProductWeights=Summe der Produktgewichte
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index 9361b1582d6..6a0685862ae 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=Lagerbewegung Nr. %d
 ListMouvementStockProject=Lagerbewegungen für Projekt
 StocksArea=Warenlager - Übersicht
 AllWarehouses=Alle Warenlager
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
+IncludeEmptyDesiredStock=Schließe auch negative Bestände mit undefinierten gewünschten Beständen ein
 IncludeAlsoDraftOrders=Fügen Sie auch Auftragsentwürfe hinzu
 Location=Standort
 LocationSummary=Kurzbezeichnung Standort
@@ -62,11 +62,12 @@ EnhancedValueOfWarehouses=Lagerwert
 UserWarehouseAutoCreate=Automatisch ein Lager erstellen wenn ein neuer Benutzer erstellt wird
 AllowAddLimitStockByWarehouse=Verwalten Sie zusätzlich zum Wert für den Mindest- und den gewünschten Bestand pro Paar (Produktlager) auch den Wert für den Mindest- und den gewünschten Bestand pro Produkt
 RuleForWarehouse=Regel für Lager
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Legen Sie ein Lager für Verkaufsaufträge fest
 UserDefaultWarehouse=Legen Sie ein Lager für Benutzer fest
 MainDefaultWarehouse=Standardlager
 MainDefaultWarehouseUser=Verwenden Sie für jeden Benutzer ein Standardlager
-MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
+MainDefaultWarehouseUserDesc=Durch Aktivieren dieser Option wird beim Anlegen eines Produkts das dem Produkt zugeordnete Lager auf dieses definiert. Wenn kein Lager auf dem Benutzer definiert ist, wird das Standardlager definiert.
 IndependantSubProductStock=Produkt- und Unterproduktbestände sind unabhängig voneinander
 QtyDispatched=Liefermenge
 QtyDispatchedShort=Menge versandt
@@ -96,15 +97,15 @@ RealStockDesc=Der aktuelle Lagerbestand ist die Stückzahl, die aktuell und phys
 RealStockWillAutomaticallyWhen=Der reale Bestand wird gemäß dieser Regel geändert (wie im Bestandsmodul definiert):
 VirtualStock=Theoretischer Lagerbestand
 VirtualStockAtDate=Virtueller Bestand zum Datum
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+VirtualStockAtDateDesc=Virtueller Lagerbestand, sobald alle anstehenden Aufträge, die vor dem Datum erledigt werden sollen, abgeschlossen sind
+VirtualStockDesc=Virtueller Bestand ist der berechnete Bestand, der verfügbar ist, sobald alle offenen / ausstehenden Aktionen (die sich auf den Bestand auswirken) abgeschlossen sind (eingegangene Bestellungen, versendete Kundenaufträge, produzierte Fertigungsaufträge usw.).
 IdWarehouse=Warenlager ID
 DescWareHouse=Beschreibung Warenlager
 LieuWareHouse=Standort Warenlager
 WarehousesAndProducts=Warenlager und Produkte
 WarehousesAndProductsBatchDetail=Warenlager und Produkte (mit Detail per lot / serial)
 AverageUnitPricePMPShort=Gewichteter Warenwert
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=Der eingegebene durchschnittliche Stückpreis, den wir an die Lieferanten zahlen mussten, um das Produkt in unseren Lagerbestand aufzunehmen.
 SellPriceMin=Verkaufspreis
 EstimatedStockValueSellShort=Verkaufswert
 EstimatedStockValueSell=Verkaufswert
@@ -122,9 +123,9 @@ DesiredStockDesc=Dieser Lagerbestand wird von der Nachbestellfunktion verwendet.
 StockToBuy=zu bestellen
 Replenishment=Nachbestellung
 ReplenishmentOrders=Nachbestellungen
-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=Je nach Erhöhung / Verringerung der Lagerbestands-Optionen können sich physische und virtuelle Lagerbestände (physische Lagerbestände + offene Aufträge) unterscheiden
+UseRealStockByDefault=Verwende für die Nachbestellfunktion realen Bestand anstelle von virtuellem Bestand
+ReplenishmentCalculation=Die zu bestellende Menge ist (gewünschte Menge - realer Bestand) anstelle von (gewünschte Menge - virtueller Bestand)
 UseVirtualStock=Theoretischen Lagerbestand benutzen
 UsePhysicalStock=Ist-Bestand verwenden
 CurentSelectionMode=Aktueller Auswahl-Modus
@@ -133,18 +134,18 @@ CurentlyUsingPhysicalStock=Aktueller Lagerbestand
 RuleForStockReplenishment=Regeln für Nachbestellungen
 SelectProductWithNotNullQty=Wählen Sie mindestens ein Produkt mit einer Bestellmenge größer Null und einen Lieferanten
 AlertOnly= Nur Warnungen
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
+IncludeProductWithUndefinedAlerts = Schließe auch negativen Lagerbestand für Produkte ein, für die keine gewünschte Menge definiert ist, um sie auf 0 zurückzusetzen
 WarehouseForStockDecrease=Das Lager <b>%s</b> wird für Entnahme verwendet 
 WarehouseForStockIncrease=Das Lager <b>%s</b> wird für Wareneingang verwendet 
 ForThisWarehouse=Für dieses Lager
 ReplenishmentStatusDesc=Dies ist eine Liste aller Produkte mit einem niedrigeren Bestand als gewünscht  (oder niedriger als der Warnwert, wenn das Kontrollkästchen "Nur Warnung" aktiviert ist). Mit dem Kontrollkästchen können Sie Bestellungen zum Ausgleichen des Bestands erstellen .
-ReplenishmentStatusDescPerWarehouse=If you want a replenishment based on desired quantity defined per warehouse, you must add a filter on the warehouse.
+ReplenishmentStatusDescPerWarehouse=Wenn Sie einen Nachschub basierend auf der gewünschten Menge pro Lager wünschen, müssen Sie dem Lager einen Filter hinzufügen.
 ReplenishmentOrdersDesc=Dies ist eine Liste aller offenen Bestellungen, einschließlich vordefinierter Produkte. Hier werden nur offene Bestellungen mit vordefinierten Produkten angezeigt, dh Bestellungen, die sich auf Lagerbestände auswirken können.
 Replenishments=Nachbestellung
 NbOfProductBeforePeriod=Menge des Produkts %s im Lager vor der gewählten Periode (< %s)
 NbOfProductAfterPeriod=Menge des Produkts %s im Lager nach der gewählten Periode (> %s)
 MassMovement=Massenbewegung
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Wählen Sie ein Quelllager und ein Ziellager, ein Produkt und eine Menge aus und klicken Sie auf "%s". Sobald dies für alle erforderlichen Bewegungen erledigt ist, klicken Sie auf "%s".
 RecordMovement=Umbuchung
 ReceivingForSameOrder=Verbuchungen zu dieser Bestellung
 StockMovementRecorded=Lagerbewegungen aufgezeichnet
@@ -233,10 +234,11 @@ InventoryForASpecificProduct=Inventar für ein bestimmtes Produkt
 StockIsRequiredToChooseWhichLotToUse=Ein Lagerbestand ist erforderlich, um das zu verwendende Buch auszuwählen
 ForceTo=Erzwingen
 AlwaysShowFullArbo=Anzeige des vollständigen Angebots (Popup des Lager-Links). Warnung: Dies kann die Leistung erheblich beeinträchtigen.
-StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDatePastDesc=Du kannst hier den Lagerbestand (Realbestand) zu einem bestimmten Datum in der Vergangenheit anzeigen
+StockAtDateFutureDesc=Du kannst hier den Lagerbestand (virtueller Bestand) zu einem bestimmten Zeitpunkt in der Zukunft anzeigen
 CurrentStock=Aktueller Lagerbestand
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+InventoryRealQtyHelp=Setze den Wert auf 0, um die Menge zurückzusetzen. <br> Feld leer lassen oder Zeile entfernen, um unverändert zu lassen
 UpdateByScaning=Update durch Scannen
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|serial barcode)
+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.
diff --git a/htdocs/langs/de_DE/suppliers.lang b/htdocs/langs/de_DE/suppliers.lang
index 6e13202b243..97d31dc4605 100644
--- a/htdocs/langs/de_DE/suppliers.lang
+++ b/htdocs/langs/de_DE/suppliers.lang
@@ -38,7 +38,7 @@ MenuOrdersSupplierToBill=Bestellungen zu Rechnungen
 NbDaysToDelivery=Lieferverzug (Tage)
 DescNbDaysToDelivery=Die längste Lieferverzögerung der Produkte aus dieser Bestellung
 SupplierReputation=Lieferanten-Reputation
-ReferenceReputation=Reference reputation
+ReferenceReputation=Referenz Ruf
 DoNotOrderThisProductToThisSupplier=hier nicht bestellen
 NotTheGoodQualitySupplier=Geringe Qualität
 ReputationForThisProduct=Reputation
diff --git a/htdocs/langs/de_DE/ticket.lang b/htdocs/langs/de_DE/ticket.lang
index 697e9678441..6405e1db2a6 100644
--- a/htdocs/langs/de_DE/ticket.lang
+++ b/htdocs/langs/de_DE/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket-Typ
 TicketDictCategory=Ticket-Kategorien
 TicketDictSeverity=Ticket-Dringlichkeiten
 TicketDictResolution=Ticket-Auflösung
-TicketTypeShortBUGSOFT=Softwarefehler
-TicketTypeShortBUGHARD=Hardwarefehler
-TicketTypeShortCOM=Anfrage an Verkauf
 
+TicketTypeShortCOM=Anfrage an Verkauf
 TicketTypeShortHELP=Erbitte funktionale Hilfestellung
 TicketTypeShortISSUE=Aspekt, Fehler oder Problem
 TicketTypeShortREQUEST=Änderungs- oder Erweiterungsanforderung
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Sonstige
 TicketSeverityShortLOW=Niedrig
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Hoch
-TicketSeverityShortBLOCKING=Kritisch/Blockierend
+TicketSeverityShortBLOCKING=Kritisch, blockierend
 
 ErrorBadEmailAddress=Feld '%s' ungültig
 MenuTicketMyAssign=Meine Tickets
@@ -60,7 +58,6 @@ OriginEmail=E-Mail Absender
 Notify_TICKET_SENTBYMAIL=Ticket Nachricht per E-Mail versenden
 
 # Status
-NotRead=Nicht gelesen
 Read=Lesen
 Assigned=Zugewiesen
 InProgress=in Bearbeitung
@@ -126,12 +123,13 @@ TicketsActivatePublicInterfaceHelp=Mit dem öffentlichen Interface können alle
 TicketsAutoAssignTicket=Den Ersteller automatisch dem Ticket zuweisen
 TicketsAutoAssignTicketHelp=Wenn ein Ticket erstellt wird, kann der Ersteller automatisch dem Ticket zugewiesen werden.
 TicketNumberingModules=Ticketnummerierungsmodul
+TicketsModelModule=Dokumentvorlagen für Tickets
 TicketNotifyTiersAtCreation=Partner über Ticketerstellung informieren
 TicketsDisableCustomerEmail=E-Mails immer deaktivieren, wenn ein Ticket über die öffentliche Oberfläche erstellt wird
 TicketsPublicNotificationNewMessage=Senden Sie E-Mails, wenn eine neue Nachricht hinzugefügt wird
-TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
+TicketsPublicNotificationNewMessageHelp=E-Mail (s) senden, wenn eine neue Nachricht von der öffentlichen Oberfläche hinzugefügt wird (an den zugewiesenen Benutzer oder die Benachrichtigungs-E-Mail an (Update) und / oder die Benachrichtigungs-E-Mail an)
 TicketPublicNotificationNewMessageDefaultEmail=Benachrichtigungen per E-Mail an (Update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Sende E-Mail-Benachrichtigungen über neue Nachrichten an diese Adresse, wenn dem Ticket kein Benutzer zugewiesen ist oder der Benutzer keine E-Mail hat.
 #
 # Index & list page
 #
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status von %s zu  %s geändert
 TicketNotNotifyTiersAtCreate=Firma bei Erstellen nicht Benachrichtigen
 Unread=Ungelesen
 TicketNotCreatedFromPublicInterface=Nicht verfügbar. Ticket wurde nicht über die öffentliche Schnittstelle erstellt.
-PublicInterfaceNotEnabled=Öffentliche Schnittstelle wurde nicht aktiviert
 ErrorTicketRefRequired=Ein Ticket-Betreff ist erforderlich
 
 #
diff --git a/htdocs/langs/de_DE/trips.lang b/htdocs/langs/de_DE/trips.lang
index 06914a60f86..12ecdfb6a6a 100644
--- a/htdocs/langs/de_DE/trips.lang
+++ b/htdocs/langs/de_DE/trips.lang
@@ -110,7 +110,7 @@ ExpenseReportPayment=Spesenabrechnung Zahlung
 ExpenseReportsToApprove=zu genehmigende Spesenabrechnungen
 ExpenseReportsToPay=zu zahlende Spesenabrechnungen
 ConfirmCloneExpenseReport=Möchten Sie den diese Spesenabrechnung wirklich duplizieren?
-ExpenseReportsIk=Spesenabrechnung Kilometerstand
+ExpenseReportsIk=Konfiguration der Kilometergebühren
 ExpenseReportsRules=Spesenabrechnungen Regeln
 ExpenseReportIkDesc=Sie können die Berechnung der Kilometerspensen pro Kategorie und Distanz dort ändern wo sie definiert wurden. <b>d</b> ist die Distanz in Kilometer
 ExpenseReportRulesDesc=Sie können Berechnungsregeln erstellen oder verändern. Dieser Teil wird verwendet, wenn Benutzer neue Spesenabrechnung erstellen
@@ -145,7 +145,7 @@ nolimitbyEX_DAY=pro Tag (keine Beschränkung)
 nolimitbyEX_MON=pro Monat (keine Beschränkung)
 nolimitbyEX_YEA=pro Jahr (Nicht Begrenzt)
 nolimitbyEX_EXP=pro Zeile (Nicht Begrenzt)
-CarCategory=Fahrzeug Kategorie
+CarCategory=Fahrzeugkategorie
 ExpenseRangeOffset=Offset Betrag: %s
 RangeIk=Reichweite
 AttachTheNewLineToTheDocument=Zeile an hochgeladenes Dokument anhängen
diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
index 2170414d12f..8e7ec9d6b08 100644
--- a/htdocs/langs/de_DE/website.lang
+++ b/htdocs/langs/de_DE/website.lang
@@ -30,7 +30,6 @@ EditInLine=Direktes bearbeiten
 AddWebsite=Website hinzufügen
 Webpage=Webseite / Container
 AddPage=Seite / Container hinzufügen
-HomePage=Startseite
 PageContainer=Seite
 PreviewOfSiteNotYetAvailable=Vorschau ihrer Webseite <strong>%s</strong> noch nicht verfügbar. Zuerst muss eine '<strong>Webseiten-Vorlage importiert</strong>' oder '<strong>Seite / Container hinzugefügt</strong>' werden.
 RequestedPageHasNoContentYet=Die Seite mit id %s hat keinen Inhalt oder die Cachedatei .tpl.php wurde gelöscht. Editieren Sie den Inhalt der Seite um das Problem zu lösen.
@@ -101,7 +100,7 @@ EmptyPage=Leere Seite
 ExternalURLMustStartWithHttp=Externe URL muss mit http:// oder https:// beginnen
 ZipOfWebsitePackageToImport=Laden Sie die Zip-Datei der Websseiten-Vorlage hoch
 ZipOfWebsitePackageToLoad=oder wählen Sie eine verfügbare eingebettete Webseiten-Vorlage
-ShowSubcontainers=Dynamische Inhalte einfügen
+ShowSubcontainers=Dynamischen Inhalt anzeigen
 InternalURLOfPage=Interne URL der Seite
 ThisPageIsTranslationOf=Diese Seite/Container ist eine Übersetzung von
 ThisPageHasTranslationPages=Es existieren Übersetzungen dieser Seite/Containers
@@ -135,5 +134,6 @@ ReplacementDoneInXPages=Ersetzt in %s Seiten oder Containern
 RSSFeed=RSS Feed
 RSSFeedDesc=Über diese URL können Sie einen RSS-Feed mit den neuesten Artikeln vom Typ "Blogpost" abrufen
 PagesRegenerated=%s Seite(n) / Container neu generiert
-RegenerateWebsiteContent=Regenerate web site cache files
-AllowedInFrames=Allowed in Frames
+RegenerateWebsiteContent=Generieren Sie Website-Cache-Dateien neu
+AllowedInFrames=In Frames erlaubt
+DefineListOfAltLanguagesInWebsiteProperties=Definiere eine Liste aller verfügbaren Sprachen in den Website-Eigenschaften.
diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang
index 8ed5c2711fc..b434b778de4 100644
--- a/htdocs/langs/de_DE/withdrawals.lang
+++ b/htdocs/langs/de_DE/withdrawals.lang
@@ -14,23 +14,23 @@ BankTransferReceipts=Überweisungsaufträge
 BankTransferReceipt=Überweisungsauftrag
 LatestBankTransferReceipts=Neueste %s Überweisungsaufträge
 LastWithdrawalReceipts=Letzte %s Abbuchungsbelege
-WithdrawalsLine=Direct debit order line
+WithdrawalsLine=Bestellposition für Lastschrift
 CreditTransferLine=Überweisungspositionen
 WithdrawalsLines=Abbuchungszeilen
 CreditTransferLines=Überweisungszeilen
-RequestStandingOrderToTreat=Requests for direct debit payment order to process
-RequestStandingOrderTreated=Requests for direct debit payment order processed
-RequestPaymentsByBankTransferToTreat=Requests for credit transfer to process
-RequestPaymentsByBankTransferTreated=Requests for credit transfer processed
+RequestStandingOrderToTreat=Anfragen zur Bearbeitung des Lastschrift-Zahlungsauftrags
+RequestStandingOrderTreated=Anfragen für Lastschrift Zahlungsauftrag bearbeitet
+RequestPaymentsByBankTransferToTreat=Anträge auf Überweisung zur Bearbeitung
+RequestPaymentsByBankTransferTreated=Anträge auf Überweisung bearbeitet
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Funktion nicht verfügbar. Der Status des Abbucher muss auf "durchgeführt"  gesetzt sein bevor eine Erklärung für die Ablehnung eingetragen werden können.
-NbOfInvoiceToWithdraw=No. of qualified customer invoices with waiting direct debit order
+NbOfInvoiceToWithdraw=Anzahl qualifizierter Kundenrechnungen mit ausstehendem Lastschriftauftrag
 NbOfInvoiceToWithdrawWithInfo=Anzahl der Kundenrechnungen mit Lastschriftaufträgen mit vorhandenen Kontoinformationen
-NbOfInvoiceToPayByBankTransfer=No. of qualified supplier invoices waiting for a payment by credit transfer
-SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit transfer
+NbOfInvoiceToPayByBankTransfer=Anzahl qualifizierter Lieferantenrechnungen, die auf eine Zahlung per Überweisung warten
+SupplierInvoiceWaitingWithdraw=Lieferantenrechnung wartet auf Zahlung per Überweisung
 InvoiceWaitingWithdraw=Rechnung wartet auf Lastschrifteinzug
 InvoiceWaitingPaymentByBankTransfer=Rechnung wartet auf Überweisung
 AmountToWithdraw=Abbuchungsbetrag
-NoInvoiceToWithdraw=No invoice open for '%s' is waiting. Go on tab '%s' on invoice card to make a request.
+NoInvoiceToWithdraw=Es wartet keine Rechnung für '%s'. Gehen Sie auf der Rechnungskarte auf die Registerkarte '%s', um eine Anfrage zu stellen.
 NoSupplierInvoiceToWithdraw=Es wartet keine Lieferantenrechnung mit offenen 'Direktgutschriftsanträgen'. Gehen Sie auf die Registerkarte '%s' auf der Rechnungskarte, um eine Anfrage zu stellen.
 ResponsibleUser=Verantwortlicher Benutzer
 WithdrawalsSetup=Einstellungen für Lastschriftaufträge
@@ -40,8 +40,9 @@ CreditTransferStatistics=Statistiken Überweisungen
 Rejects=Ablehnungen
 LastWithdrawalReceipt=Letzte 1%s Einnahmen per Lastschrift
 MakeWithdrawRequest=Erstelle eine  Lastschrift
-MakeBankTransferOrder=Make a credit transfer request
+MakeBankTransferOrder=Stelle eine Überweisungsanfrage
 WithdrawRequestsDone=%s Lastschrift-Zahlungsaufforderungen aufgezeichnet
+BankTransferRequestsDone=%s Überweisungsanforderungen aufgezeichnet
 ThirdPartyBankCode=Bankcode Geschäftspartner
 NoInvoiceCouldBeWithdrawed=Keine Rechnung mit Erfolg eingezogen. Überprüfen Sie, ob die Rechnungen auf Unternehmen mit einer gültigen IBAN Nummer verweisen und die IBAN Nummer eine eindeutige Mandatsreferenz besitzt <strong>%s</strong>.
 ClassCredited=Als eingegangen markieren
@@ -63,7 +64,7 @@ InvoiceRefused=Rechnung abgelehnt (Abweisung dem Kunden berechnen)
 StatusDebitCredit=Status Debit/Kredit
 StatusWaiting=Wartend
 StatusTrans=Gesendet
-StatusDebited=Debited
+StatusDebited=Belastet
 StatusCredited=Eingelöst
 StatusPaid=Bezahlt
 StatusRefused=Abgelehnt
@@ -79,13 +80,13 @@ StatusMotif8=Andere Gründe
 CreateForSepaFRST=Lastschriftdatei erstellen (SEPA FRST)
 CreateForSepaRCUR=Lastschriftdatei erstellen (SEPA RCUR)
 CreateAll=Lastschriftdatei erstellen (alle)
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
+CreateFileForPaymentByBankTransfer=Datei für Überweisung erstellen
 CreateSepaFileForPaymentByBankTransfer=Überweisungsdatei erstellen (SEPA)
 CreateGuichet=Nur Büro
 CreateBanque=Nur Bank
 OrderWaiting=Warte auf Bearbeitung
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
+NotifyTransmision=Datenübertragung der Bestellung aufzeichnen
+NotifyCredit=Gutschrift der Bestellung aufzeichnen
 NumeroNationalEmetter=Nationale Sendernummer
 WithBankUsingRIB=Bankkonten mit RIB
 WithBankUsingBANBIC=Bankkonten mit IBAN/BIC
@@ -95,12 +96,12 @@ CreditDate=Am
 WithdrawalFileNotCapable=Abbuchungsformular für Ihr Land %s konnte nicht erstellt werden (Dieses Land wird nicht unterstützt).
 ShowWithdraw=Zeige Lastschrift
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Wenn auf der Rechnung mindestens ein Lastschrift-Zahlungsauftrag noch nicht verarbeitet wurde, wird dieser nicht als bezahlt festgelegt, um eine vorherige Abhebungsverwaltung zu ermöglichen.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->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
+DoStandingOrdersBeforePayments=Auf dieser Registerkarte können Sie einen Lastschrift-Zahlungsauftrag anfordern. Gehen Sie anschließend in das Menü Bank-> Zahlung per Lastschrift, um den Lastschriftauftrag zu generieren und zu verwalten. Wenn der Lastschriftauftrag geschlossen wird, wird die Zahlung auf Rechnungen automatisch erfasst und die Rechnungen werden geschlossen, wenn der zu zahlende Restbetrag null ist.
+DoCreditTransferBeforePayments=Auf dieser Registerkarte können Sie einen Überweisungsauftrag anfordern. Gehen Sie anschließend in das Menü Bank-> Zahlung per Überweisung, um den Überweisungsauftrag zu generieren und zu verwalten. Wenn der Überweisungsauftrag geschlossen wird, wird die Zahlung auf Rechnungen automatisch erfasst und die Rechnungen werden geschlossen, wenn der zu zahlende Restbetrag null ist.
+WithdrawalFile=Datei für Lastschrift-Aufträge
+CreditTransferFile=Überweisungsdatei
 SetToStatusSent=Setze in Status "Datei versandt"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
+ThisWillAlsoAddPaymentOnInvoice=Hierdurch werden auch Zahlungen auf Rechnungen erfasst und als "Bezahlt" klassifiziert, wenn die verbleibende Zahlung null ist
 StatisticsByLineStatus=Statistiken nach Statuszeilen
 RUM=UMR
 DateRUM=Datum der Unterzeichnung des Mandats
@@ -124,14 +125,15 @@ SEPAFrstOrRecur=Zahlungsart
 ModeRECUR=Wiederkehrende Zahlungen
 ModeFRST=Einmalzahlung
 PleaseCheckOne=Bitte prüfen sie nur eine
-CreditTransferOrderCreated=Credit transfer order %s created
+CreditTransferOrderCreated=Überweisungsauftrag %s erstellt
 DirectDebitOrderCreated=Lastschrift %s erstellt
 AmountRequested=angeforderter Betrag
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Ausführungsdatum
 CreateForSepa=Erstellen Sie eine Lastschriftdatei
-ICS=Gläubigeridentifikator CI
+ICS=Gläubiger-ID CI für Lastschrift
+ICSTransfer=Gläubiger-ID CI für Banküberweisung
 END_TO_END="Ende-zu-Ende" SEPA-XML-Tag - Eindeutige ID, die pro Transaktion zugewiesen wird
 USTRD="Unstrukturiertes" SEPA-XML-Tag
 ADDDAYS=Füge Tage zum Abbuchungsdatum hinzu
@@ -145,4 +147,6 @@ InfoTransData=Betrag: %s<br>Verwendungszweck: %s<br>Datum: %s
 InfoRejectSubject=Lastschriftauftrag abgelehnt
 InfoRejectMessage=Hallo,<br><br> der Lastschrift-Zahlungsauftrag der Rechnung %s im Zusammenhang mit dem Unternehmen %s, mit einem Betrag von %s wurde von der Bank abgelehnt <br> -- <br> %s
 ModeWarning=Echtzeit-Modus wurde nicht aktiviert, wir stoppen nach der Simulation.
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+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=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/de_DE/workflow.lang b/htdocs/langs/de_DE/workflow.lang
index 9cde674b9e3..255f578fa39 100644
--- a/htdocs/langs/de_DE/workflow.lang
+++ b/htdocs/langs/de_DE/workflow.lang
@@ -16,8 +16,10 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Kennzeichne die verknüpften Auftr
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Setzt das verknüpfte Lieferantenangebot auf "abgerechnet", sofern die Lieferanrenrechnung erstellt wurde und sofern der Rechnungsbetrag identisch zur Angebotsumme ist. 
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Kennzeichne die verknüpfte Einkaufsbestellung als abgerechnet wenn die Lieferantenrechnung erstellt wurde und wenn die Beträge überein stimmen.
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+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=Close all interventions linked to the ticket when a ticket is closed
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Schließen Sie alle mit dem Ticket verknüpften Interaktionen, wenn ein Ticket geschlossen wird
 AutomaticCreation=automatische Erstellung
 AutomaticClassification=Automatische Klassifikation
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/de_DE/zapier.lang b/htdocs/langs/de_DE/zapier.lang
index 4d874ef8f7f..1051734af8b 100644
--- a/htdocs/langs/de_DE/zapier.lang
+++ b/htdocs/langs/de_DE/zapier.lang
@@ -26,4 +26,4 @@ ModuleZapierForDolibarrDesc = Modul: Zapier für Dolibarr
 # Admin page
 #
 ZapierForDolibarrSetup = Zapier für Dolibarr einrichten
-ZapierDescription=Interface with Zapier
+ZapierDescription=Schnittstelle mit Zapier
diff --git a/htdocs/langs/el_CY/mrp.lang b/htdocs/langs/el_CY/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/el_CY/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/el_CY/products.lang b/htdocs/langs/el_CY/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/el_CY/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index 1189c759ce7..a3cd1adf61e 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=Αυτή η υπηρεσία
 ThisProduct=Αυτό το προϊόν
 DefaultForService=Προεπιλογή για υπηρεσία
 DefaultForProduct=Προεπιλογή για το προϊόν
+ProductForThisThirdparty=Product for this thirdparty
+ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Δεν μπορώ να προτείνω
 AccountancySetupDoneFromAccountancyMenu=Η μεγαλύτερη ρύθμιση της λογιστικής γίνεται από το μενού %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -48,6 +50,7 @@ CountriesExceptMe=Όλες οι χώρες εκτός από το %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Κύριος λογαριασμός λογιστικής για πελάτες που δεν έχουν οριστεί στη ρύθμιση
 MainAccountForSuppliersNotDefined=Κύριος λογαριασμός λογιστικής για προμηθευτές που δεν καθορίζονται στη ρύθμιση
@@ -144,7 +147,7 @@ NotVentilatedinAccount=Δεν δεσμεύεται στον λογαριασμό
 XLineSuccessfullyBinded=%s προϊόντα / υπηρεσίες με επιτυχία δεσμεύεται σε λογιστικό λογαριασμό
 XLineFailedToBeBinded=%s προϊόντα / υπηρεσίες δεν δεσμεύονται σε κανένα λογιστικό λογαριασμό
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Αριθμός στοιχείων που δεσμεύονται με τη σελίδα (μέγιστη συνιστώμενη τιμή: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ξεκινήστε τη διαλογή της σελίδας &quot;Δεσμευτική ενέργεια&quot; από τα πιο πρόσφατα στοιχεία
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ξεκινήστε τη διαλογή της σελίδας &quot;Δεσμευτική πραγματοποίηση&quot; από τα πιο πρόσφατα στοιχεία
 
@@ -198,7 +201,8 @@ Docdate=Ημερομηνία
 Docref=Παραπομπή
 LabelAccount=Ετικέτα λογαριασμού
 LabelOperation=Λειτουργία ετικετών
-Sens=Σημασία
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Κωδικός γράμματος
 Lettering=Γράμματα
 Codejournal=Ημερολόγιο
@@ -206,7 +210,8 @@ JournalLabel=Ετικέτα περιοδικών
 NumPiece=Αριθμός τεμαχίου
 TransactionNumShort=Αριθ. συναλλαγή
 AccountingCategory=Προσωποποιημένες ομάδες
-GroupByAccountAccounting=Ομαδοποίηση κατά λογιστικό λογαριασμό
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Μπορείτε να ορίσετε εδώ ορισμένες ομάδες λογιστικού λογαριασμού. Θα χρησιμοποιηθούν για εξατομικευμένες λογιστικές εκθέσεις.
 ByAccounts=Με λογαριασμούς
 ByPredefinedAccountGroups=Με προκαθορισμένες ομάδες
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Πληρωμή που δεν συνδέεται με
 OpeningBalance=Opening balance
 ShowOpeningBalance=Εμφάνιση αρχικού υπολοίπου
 HideOpeningBalance=Κρύψιμο αρχικού υπολοίπου
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Ομάδα του λογαριασμού
 PcgtypeDesc=Η ομάδα λογαριασμού χρησιμοποιείται ως προκαθορισμένα κριτήρια «φίλτρου» και «ομαδοποίησης» για ορισμένες λογιστικές αναφορές. Για παράδειγμα, τα «ΕΙΣΟΔΗΜΑ» ή «ΕΞΟΔΑ» χρησιμοποιούνται ως ομάδες λογιστικών λογαριασμών προϊόντων για τη δημιουργία της αναφοράς εξόδων / εσόδων.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Συμβουλευτείτε εδώ τον κατάλο
 DescVentilExpenseReportMore=Εάν ρυθμίσετε τον λογαριασμό λογαριασμών σε γραμμές αναφοράς τύπου εξόδων, η εφαρμογή θα είναι σε θέση να κάνει όλη τη δέσμευση μεταξύ των γραμμών αναφοράς δαπανών σας και του λογαριασμού λογιστικής του λογαριασμού σας, με ένα μόνο κλικ με το κουμπί <strong>&quot;%s&quot;</strong> . Εάν ο λογαριασμός δεν έχει οριστεί σε λεξικό τελών ή αν έχετε ακόμα ορισμένες γραμμές που δεν δεσμεύονται σε κανένα λογαριασμό, θα πρέπει να κάνετε μια χειροκίνητη σύνδεση από το μενού &quot; <strong>%s</strong> &quot;.
 DescVentilDoneExpenseReport=Συμβουλευτείτε εδώ τον κατάλογο των γραμμών των εκθέσεων δαπανών και του λογιστικού λογαριασμού τους
 
+Closure=Annual closure
 DescClosure=Συμβουλευτείτε εδώ τον αριθμό των κινήσεων ανά μήνα που δεν έχουν επικυρωθεί και τα οικονομικά έτη είναι ήδη ανοιχτά
 OverviewOfMovementsNotValidated=Βήμα 1 / Επισκόπηση των κινήσεων που δεν έχουν επικυρωθεί. (Είναι απαραίτητο να κλείσετε ένα οικονομικό έτος)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Επικυρώστε τις κινήσεις
 DescValidateMovements=Απαγορεύεται οποιαδήποτε τροποποίηση ή διαγραφή γραφής, γράμματος και διαγραφής. Όλες οι καταχωρήσεις για μια άσκηση πρέπει να επικυρωθούν, διαφορετικά το κλείσιμο δεν θα είναι δυνατό
-SelectMonthAndValidate=Επιλέξτε μήνα και επικυρώστε τις κινήσεις
 
 ValidateHistory=Δεσμεύστε αυτόματα
 AutomaticBindingDone=Έγινε αυτόματη σύνδεση
@@ -293,6 +300,7 @@ Accounted=Πληρώθηκε σε
 NotYetAccounted=Δεν έχει ακόμη καταλογιστεί στο βιβλίο
 ShowTutorial=Εμφάνιση εκπαιδευτικού προγράμματος
 NotReconciled=Δεν ταιριάζουν
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +345,7 @@ 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_Sage50_Swiss=Εξαγωγή για Sage 50 Ελβετία
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 9066b5bbf90..32f57690ea4 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Εμφάνιση
 SetupArea=Ρύθμιση
 UploadNewTemplate=Μεταφόρτωση νέου(-ων) προτύπου(-ων)
 FormToTestFileUploadForm=Έντυπο για να ελέγξετε το αρχείο μεταφόρτωσης (ανάλογα με τις ρυθμίσεις)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Σημείωση: ναι, είναι αποτελεσματική μόνο αν το module <b>%s</b> είναι ενεργοποιημένο
 RemoveLock=Αφαιρέστε/μετονομάστε το αρχείο <b>%s</b>, αν υπάρχει, για να επιτραπεί η χρήση του εργαλείου ενημέρωσης/εγκατάστασης.
 RestoreLock=Επαναφέρετε το  αρχείο <b>%s</b>, με δικαίωμα ανάγνωσης μόνο, για να απενεργοποιηθεί οποιαδήποτε χρήση του εργαλείου ενημέρωσης/εγκατάστασης.
@@ -85,7 +87,6 @@ ShowPreview=Εμφάνιση προ επισκόπησης
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Η προ επισκόπηση δεν είναι διαθέσιμη
 ThemeCurrentlyActive=Θεματική Επι του Παρόντος Ενεργή
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (βάση δεδομένων)
 TZHasNoEffect=Οι ημερομηνίες αποθηκεύονται και επιστρέφονται από το διακομιστή βάσης δεδομένων σαν να κρατήθηκαν ως υποβληθείσες συμβολοσειρές. Η ζώνη ώρας έχει ισχύ μόνο όταν χρησιμοποιείτε τη συνάρτηση UNIX_TIMESTAMP (η οποία δεν πρέπει να χρησιμοποιείται από τον Dolibarr, ώστε η βάση δεδομένων TZ να μην επηρεαστεί, ακόμη και αν αλλάξει μετά την εισαγωγή των δεδομένων).
 Space=Κενό
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Αυτή η περιοχή παρέχει λειτουργί
 Purge=Εκκαθάριση
 PurgeAreaDesc=Αυτή η σελίδα σας επιτρέπει να διαγράψετε όλα τα αρχεία που κατασκευάζονται ή αποθηκεύονται από την Dolibarr (προσωρινά αρχεία ή όλα τα αρχεία σε <b>%s </ b> directory).  Η χρήση αυτής της λειτουργίας δεν είναι απαραίτητη.  Παρέχεται για χρήστες των οποίων η Dolibarr φιλοξενείται από πάροχο, που δεν προσφέρει δικαίωμα διαγραφής αρχείων που κατασκευάστηκαν από τον web server.
 PurgeDeleteLogFile=Διαγράψτε τα αρχεία καταγραφής, συμπεριλαμβανομένων<b>%s</b> που είναι ορισμένα για τη χρήση της μονάδας Syslog (χωρίς κίνδυνο απώλειας δεδομένων)
-PurgeDeleteTemporaryFiles=Διαγράψτε όλα τα προσωρινά αρχεία (χωρίς κίνδυνο απώλειας δεδομένων). Σημείωση: η διαγραφή γίνεται μόνο αν ο κατάλογος Temp δημιουργήθηκε πριν από 24 ώρες
-PurgeDeleteTemporaryFilesShort=Διαγραφή προσωρινών αρχείων
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 PurgeDeleteAllFilesInDocumentsDir=Διαγράψτε όλα τα αρχεία στον κατάλογο: <b>%s</b> . <br> Αυτό θα διαγράψει όλα τα παραγόμενα έγγραφα που σχετίζονται με στοιχεία (τρίτα μέρη, τιμολόγια κ.λπ.), αρχεία που έχουν φορτωθεί στη μονάδα ECM, αρχεία από αντίγραφα ασφαλείας βάσεων δεδομένων και προσωρινά αρχεία.
 PurgeRunNow=Διαγραφή τώρα
 PurgeNothingToDelete=Δεν υπάρχει κατάλογος ή αρχείο για διαγραφή.
@@ -256,6 +257,7 @@ 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>
 HelpCenterDesc1=Εδώ είναι μερικοί πόροι για να λάβετε βοήθεια και υποστήριξη με τον Dolibarr.
@@ -375,7 +377,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=Παραδείγματα σύνταξης:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<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=Θέση ονόματος/επιθέτου
@@ -406,7 +408,7 @@ UrlGenerationParameters=Παράμετροι για δημιουργία ασφ
 SecurityTokenIsUnique=Χρησιμοποιήστε μια μοναδική παράμετρο securekey για κάθε διεύθυνση URL
 EnterRefToBuildUrl=Εισάγετε αναφοράς για %s αντικείμενο
 GetSecuredUrl=Πάρτε υπολογιζόμενο URL
-ButtonHideUnauthorized=Απόκρυψη κουμπιών για μη χρήστες διαχειριστή για μη εξουσιοδοτημένες ενέργειες αντί να εμφανίζονται κουμπιά απενεργοποιημένου με γκρι
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Παλιός συντελεστής ΦΠΑ
 NewVATRates=Νέος συντελεστής ΦΠΑ
 PriceBaseTypeToChange=Τροποποίηση τιμών με βάση την τιμή αναφοράς όπως ρυθμίστηκε στο
@@ -668,7 +670,7 @@ Module54000Desc=Άμεση εκτύπωση (χωρίς το άνοιγμα τω
 Module55000Name=Δημοσκόπηση, έρευνα ή ψηφοφορία
 Module55000Desc=Δημιουργήστε online δημοσκοπήσεις, έρευνες ή ψηφοφορίες (όπως Doodle, Studs, RDVz κ.λπ. ...)
 Module59000Name=Περιθώρια
-Module59000Desc=Πρόσθετο για την διαχείριση των περιθωρίων
+Module59000Desc=Module to follow margins
 Module60000Name=Προμήθειες
 Module60000Desc=Ένθεμα για τη διαχείριση των προμηθειών
 Module62000Name=Διεθνείς Εμπορικοί Όροι
@@ -1306,7 +1308,7 @@ YouUseBestDriver=Χρησιμοποιείτε τον οδηγό %s ο οποίο
 YouDoNotUseBestDriver=Χρησιμοποιείτε τον οδηγό %s αλλά συνιστάται ο οδηγός %s.
 NbOfObjectIsLowerThanNoPb=Έχετε μόνο %s %s στη βάση δεδομένων. Αυτό δεν απαιτεί ιδιαίτερη βελτιστοποίηση.
 SearchOptim=Βελτιστοποίηση αναζήτησης
-YouHaveXObjectUseSearchOptim=Έχετε %s %s στη βάση δεδομένων. Θα πρέπει να προσθέσετε το σταθερό %s σε 1 στο Home-Setup-Other. Περιορίστε την αναζήτηση στην αρχή των συμβολοσειρών, η οποία επιτρέπει στη βάση δεδομένων να χρησιμοποιεί ευρετήρια και θα πρέπει να πάρετε μια άμεση απάντηση.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=Έχετε %s %s στη βάση δεδομένων και σταθερή %s έχει οριστεί σε 1 στο Home-Setup-Other.
 BrowserIsOK=Χρησιμοποιείτε το πρόγραμμα περιήγησης web %s. Αυτό το πρόγραμμα περιήγησης είναι εντάξει για την ασφάλεια και την απόδοση.
 BrowserIsKO=Χρησιμοποιείτε το πρόγραμμα περιήγησης web %s. Αυτό το πρόγραμμα περιήγησης είναι γνωστό ότι αποτελεί κακή επιλογή για ασφάλεια, απόδοση και αξιοπιστία. Σας συνιστούμε να χρησιμοποιήσετε Firefox, Chrome, Opera ή Safari.
@@ -1596,8 +1598,13 @@ ServiceSetup=Υπηρεσίες εγκατάστασης μονάδας
 ProductServiceSetup=Προϊόντα και Υπηρεσίες εγκατάστασης μονάδων
 NumberOfProductShowInSelect=Μέγιστος αριθμός προϊόντων που θα εμφανίζονται σε λίστες επιλογών συνδυασμού (0 = κανένα όριο)
 ViewProductDescInFormAbility=Εμφάνιση περιγραφών προϊόντων σε φόρμες (διαφορετικά εμφανίζεται σε αναδυόμενο παράθυρο εργαλείου)
+DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
+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=Εμφάνιση των περιγραφών προϊόντων στη γλώσσα του τρίτου μέρους
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 UseSearchToSelectProductTooltip=Επίσης, αν έχετε μεγάλο αριθμό προϊόντων (&gt; 100.000), μπορείτε να αυξήσετε την ταχύτητα ρυθμίζοντας σταθερά το PRODUCT_DONOTSEARCH_ANYWHERE στο 1 στο Setup-&gt; Other. Η αναζήτηση θα περιορίζεται στην αρχή της συμβολοσειράς.
 UseSearchToSelectProduct=Περιμένετε έως ότου πιέσετε ένα κλειδί πριν φορτώσετε το περιεχόμενο της λίστας σύνθετων προϊόντων (Αυτό μπορεί να αυξήσει την απόδοση εάν έχετε μεγάλο αριθμό προϊόντων, αλλά είναι λιγότερο βολικό)
 SetDefaultBarcodeTypeProducts=Προεπιλεγμένος τύπος barcode για χρήση σε προϊόντα
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Εξατομικευμένα μενού που δεν
 NewMenu=New menu
 MenuHandler=Χειριστής μενού
 MenuModule=Source module
-HideUnauthorizedMenu= Απόκρυψη μη εξουσιοδοτημένων μενού (γκρι)
+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
@@ -1983,11 +1990,12 @@ EMailHost=Υποδοχή διακομιστή IMAP ηλεκτρονικού τα
 MailboxSourceDirectory=Κατάλογος προέλευσης γραμματοκιβωτίου
 MailboxTargetDirectory=Κατάλογος προορισμού γραμματοκιβωτίου
 EmailcollectorOperations=Λειτουργίες από συλλέκτη
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Μέγιστος αριθμός μηνυμάτων ηλεκτρονικού ταχυδρομείου που συλλέγονται ανά συλλογή
 CollectNow=Συλλέξτε τώρα
 ConfirmCloneEmailCollector=Είστε βέβαιοι ότι θέλετε να κλωνοποιήσετε τον συλλέκτη e-mail %s?
-DateLastCollectResult=Η τελευταία συλλογή δοκιμάστηκε
-DateLastcollectResultOk=Ημερομηνία τελευταίας συλλογής επιτυχούς
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Τελευταίο αποτέλεσμα
 EmailCollectorConfirmCollectTitle=Το email συλλέγει επιβεβαίωση
 EmailCollectorConfirmCollect=Θέλετε να εκτελέσετε τη συλλογή για αυτόν τον συλλέκτη τώρα;
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Κωδικός εισόδου μενού (mainmenu)
 ECMAutoTree=Εμφάνιση αυτόματης δομής ECM
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index 7cd78ac18a0..5fc0cb30463 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -173,10 +173,11 @@ SEPAMandate=Εντολές άμεσης χρέωσης
 YourSEPAMandate=Οι εντολές άμεσης χρέωσης σας.
 FindYourSEPAMandate=Αυτή είναι η εντολή ΕΧΠΕ για να εξουσιοδοτήσετε την εταιρεία μας να κάνει άμεση εντολή χρέωσης στην τράπεζά σας. Επιστρέψτε το υπογεγραμμένο (σάρωση του υπογεγραμμένου εγγράφου) ή στείλτε το ταχυδρομικώς η με mail
 AutoReportLastAccountStatement=Συμπληρώστε αυτόματα το πεδίο ' αριθμός τραπεζικού λογαριασμού ' με τον τελευταίο αριθμό τραπεζικής δήλωσης όταν κάνετε τη συμφωνία.
-CashControl=Χρηματοκιβώτιο μετρητών POS
-NewCashFence=Νέο φράχτη μετρητών
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 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
diff --git a/htdocs/langs/el_GR/blockedlog.lang b/htdocs/langs/el_GR/blockedlog.lang
index 8172e83ec81..10f44bd0947 100644
--- a/htdocs/langs/el_GR/blockedlog.lang
+++ b/htdocs/langs/el_GR/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=Η καταχώριση αρχειοθετημένου αρχείου καταγραφής δεν είναι έγκυρη. Αυτό σημαίνει ότι κάποιος (ένας εισβολέας;) έχει τροποποιήσει ορισμένα δεδομένα αυτής της εγγραφής μετά την εγγραφή του ή έχει διαγράψει την προηγούμενη αρχειοθετημένη εγγραφή (ελέγξτε τη γραμμή με την προηγούμενη # υπάρχει).
 OkCheckFingerprintValidity=Η αρχειοθετημένη εγγραφή είναι έγκυρη. Τα δεδομένα αυτής της γραμμής δεν τροποποιήθηκαν και η καταχώριση ακολουθεί την προηγούμενη.
 OkCheckFingerprintValidityButChainIsKo=Το αρχειοθετημένο ημερολόγιο φαίνεται έγκυρο σε σύγκριση με το προηγούμενο, αλλά η αλυσίδα είχε καταστραφεί προηγουμένως.
 AddedByAuthority=Αποθηκεύεται σε απομακρυσμένη εξουσία
@@ -35,7 +35,7 @@ logDON_DELETE=Δωρεά λογική διαγραφή
 logMEMBER_SUBSCRIPTION_CREATE=Δημιουργία συνδρομής μέλους
 logMEMBER_SUBSCRIPTION_MODIFY=Η συνδρομή μέλους τροποποιήθηκε
 logMEMBER_SUBSCRIPTION_DELETE=Συνδρομή λογικής διαγραφής μέλους
-logCASHCONTROL_VALIDATE=Εγγραφή φράχτη μετρητών
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Λήψη τιμολογίου πελατών
 BlockedLogBillPreview=Προβολή τιμολογίου πελατών
 BlockedlogInfoDialog=Στοιχεία καταγραφής
diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang
index bc59ca654da..40e21765069 100644
--- a/htdocs/langs/el_GR/boxes.lang
+++ b/htdocs/langs/el_GR/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Τελευταία %s τροποποίηση δω
 BoxTitleLastModifiedExpenses=Τελευταίες αναφορές τροποποιημένων δαπανών %s
 BoxTitleLatestModifiedBoms=Τα τελευταία %s τροποποιημένα BOMs
 BoxTitleLatestModifiedMos=Οι τελευταίες %s τροποποιημένες παραγγελίες κατασκευής
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Η γενική δραστηριότητα για (τιμολόγια, προσφορές, παραγγελίες)
 BoxGoodCustomers=Καλοί πελάτες
 BoxTitleGoodCustomers=%s καλών πελατών
+BoxScheduledJobs=Προγραμματισμένες εργασίες
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Αποτυχία ανανέωσης ροής RSS. Τελευταία επιτυχημένη ημερομηνία ανανέωσης: %s
 LastRefreshDate=Ημερομηνία τελευταίας ανανέωσης
 NoRecordedBookmarks=Δεν υπάρχουν σελιδοδείκτες που ορίζονται. Κάντε κλικ <a href="%s">εδώ</a> για να προσθέσετε σελιδοδείκτες.
@@ -92,8 +95,8 @@ LastXMonthRolling=Ο τελευταίος κύλινδρος %s μήνα
 ChooseBoxToAdd=Προσθέστε widget στον πίνακα ελέγχου
 BoxAdded=Το Widget προστέθηκε στον πίνακα ελέγχου σας
 BoxTitleUserBirthdaysOfMonth=Γενέθλια αυτού του μήνα (χρήστες)
-BoxLastManualEntries=Τελευταίες μη αυτόματες καταχωρήσεις στη λογιστική
-BoxTitleLastManualEntries=%s τελευταίες μη αυτόματες καταχωρήσεις
+BoxLastManualEntries=Latest record in accountancy entered manually or without source document
+BoxTitleLastManualEntries=%s latest record entered manually or without source document
 NoRecordedManualEntries=Δεν καταγράφονται μη καταχωρημένα μητρώα στη λογιστική
 BoxSuspenseAccount=Αρίθμηση λογιστικής λειτουργίας με λογαριασμό αναμονής
 BoxTitleSuspenseAccount=Αριθμός μη διατεθέντων γραμμών
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Ο λογαριασμός Suspense δεν έχει ο
 BoxLastCustomerShipments=Τελευταίες αποστολές πελάτη
 BoxTitleLastCustomerShipments=Τελευταίες %s αποστολές πελάτη
 NoRecordedShipments=Καμία καταγεγραμμένη αποστολή πελάτη
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Λογιστική
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/el_GR/cashdesk.lang b/htdocs/langs/el_GR/cashdesk.lang
index 53dcd336847..52d5e03abb0 100644
--- a/htdocs/langs/el_GR/cashdesk.lang
+++ b/htdocs/langs/el_GR/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Υποσέλιδο
 AmountAtEndOfPeriod=Ποσό στο τέλος της περιόδου (ημέρα, μήνας ή έτος)
 TheoricalAmount=Θεωρητικό ποσό
 RealAmount=Πραγματικό ποσό
-CashFence=Φραγή μετρητών
-CashFenceDone=Μετρητά φράχτη για την περίοδο
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Πλήθος τιμολογίων
 Paymentnumpad=Τύπος πλακέτας για να πληκτρολογήσετε την πληρωμή
 Numberspad=Αριθμητικό Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> ετικέτα χρησιμοποιείται για την προσθήκη του αριθμού τερματικού
 TakeposGroupSameProduct=Ομαδοποιήστε τις ίδιες σειρές προϊόντων
 StartAParallelSale=Ξεκινήστε μια νέα παράλληλη πώληση
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Κλείστε το φράχτη μετρητών
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Έκθεση μετρητών
 MainPrinterToUse=Κύριος εκτυπωτής προς χρήση
 OrderPrinterToUse=Παραγγείλετε τον εκτυπωτή για χρήση
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/el_GR/categories.lang b/htdocs/langs/el_GR/categories.lang
index 258447b74e0..02ad08d26d6 100644
--- a/htdocs/langs/el_GR/categories.lang
+++ b/htdocs/langs/el_GR/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Περιοχή ετικετών / κατηγοριών χρηστών
 SubCats=Υποκατηγορίες
 CatList=Λίστα Ετικετών/Κατηγοριών
+CatListAll=List of tags/categories (all types)
 NewCategory=Νέα Ετικέτα/Κατηγορία
 ModifCat=Τροποποίηση Ετικέτας/Κατηγορίας
 CatCreated=Ετικέτα/Κατηγορία δημιουργήθηκε
@@ -65,16 +66,22 @@ UsersCategoriesShort=Ετικέτες / κατηγορίες χρηστών
 StockCategoriesShort=Ετικέτες / κατηγορίες αποθήκης
 ThisCategoryHasNoItems=Αυτή η κατηγορία δεν περιέχει στοιχεία.
 CategId=Ετικέτα/κατηγορία id
-CatSupList=Λίστα ετικετών / κατηγοριών πωλητών
-CatCusList=Λίστα πελάτη/προοπτικής ετικέτες/κατηγορίες
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Λίστα προϊόντων ετικέτες/κατηγορίες
 CatMemberList=Λίστα μελών ετικέτες/κατηγορίες
-CatContactList=Λίστα ετικετών/κατηγοριών επαφών
-CatSupLinks=Συνδέσεις μεταξύ προμηθευτών και ετικετών/κατηγοριών
+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=Συνδέσεις μεταξύ πελατών/προοπτικών και ετικετών/κατηγοριών
 CatContactsLinks=Σύνδεσμοι μεταξύ επαφών / διευθύνσεων και ετικετών / κατηγοριών
 CatProdLinks=Συνδέσεις μεταξύ προϊόντων/υπηρεσιών και ετικετών/κατηγοριών
-CatProJectLinks=Links between projects 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=Αφαίρεση αυτής της ετικέτας/κατηγορίας
 ExtraFieldsCategories=Συμπληρωματικά χαρακτηριστικά
 CategoriesSetup=Ρύθμιση ετικετών/κατηγοριών
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index 318aa1d98d3..976e2709e1a 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Ελέγξτε το ενδοκοινοτικό ανα
 VATIntraManualCheck=Μπορείτε επίσης να ελέγξετε χειροκίνητα στον ιστότοπο της Ευρωπαϊκής Επιτροπής <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Δεν προοπτική, ούτε πελάτης
-JuridicalStatus=Τύπος νομικού προσώπου
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Εργαζόμενοι
 ProspectLevelShort=Δυναμική
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index 274e8851e74..d814080d930 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Πληρωμές Κοινωνικών/Φορολογικών εισφορών
 ShowVatPayment=Εμφάνιση πληρωμής φόρου
 TotalToPay=Σύνολο πληρωμής
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=Κωδικός λογιστικής πελάτη
 SupplierAccountancyCode=Κωδικός Προμηθευτή
 CustomerAccountancyCodeShort=Cust. account. code
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Είστε σίγουροι ότι θέλετε
 ExportDataset_tax_1=Κοινωνικές/Φορολογικές εισφορές και πληρωμές
 CalcModeVATDebt=Κατάσταση <b>%sΦΠΑ επί των λογιστικών υποχρεώσεων%s</b>
 CalcModeVATEngagement=Κατάσταση <b>%sΦΠΑ επί των εσόδων-έξοδα%s</b>.
-CalcModeDebt=Ανάλυση γνωστών καταγεγραμμένων τιμολογίων, ακόμη και αν δεν έχουν ακόμη καταλογιστεί στο βιβλίο.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Ανάλυση γνωστών καταγεγραμμένων πληρωμών, ακόμη και αν δεν έχουν ακόμη καταλογιστεί στο Ledger.
 CalcModeBookkeeping=Ανάλυση δεδομένων που έχουν καταχωρηθεί στον πίνακα Λογαριασμού Λογιστηρίου.
 CalcModeLT1= Λειτουργία <b>%sRE στα τιμολόγια πελατών - τιμολόγια προμηθευτών%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Υπόλοιπο των εσόδων και εξό
 AnnualByCompanies=Ισοζύγιο εσόδων και εξόδων, βάσει προκαθορισμένων ομάδων λογαριασμού
 AnnualByCompaniesDueDebtMode=Ισοζύγιο εσόδων και εξόδων, λεπτομέρεια κατά προκαθορισμένες ομάδες, τρόπος <b>%sClaims-Debts%s</b> δήλωσε τη <b>λογιστική δέσμευσης</b> .
 AnnualByCompaniesInputOutputMode=Ισοζύγιο εσόδων και εξόδων, λεπτομέρεια κατά προκαθορισμένες ομάδες, τρόπος <b>%sIncomes-Expenses%s</b> δήλωσε <b>ταμειακή λογιστική</b> .
-SeeReportInInputOutputMode=Ανατρέξτε στο %sanalysis of payments%s για έναν υπολογισμό σχετικά με τις πραγματικές πληρωμές, ακόμη και αν δεν έχουν ακόμη λογιστικοποιηθεί στο Ledger.
-SeeReportInDueDebtMode=Ανατρέξτε στο %sanalysis των τιμολογίων%s για έναν υπολογισμό βασισμένο σε γνωστά καταγεγραμμένα τιμολόγια, ακόμη και αν δεν έχουν ακόμη καταλογιστεί στο Ledger.
-SeeReportInBookkeepingMode=Δείτε <b>%sBookeeping report%s</b> για έναν υπολογισμό στον <b>πίνακα &quot;</b> <b>Λογαριασμός Λογιστηρίου&quot;</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=- Περιλαμβάνει εκκρεμή τιμολόγια, έξοδα, ΦΠΑ, δωρεές είτε πληρώνονται είτε όχι. Περιλαμβάνει επίσης πληρωμένους μισθούς. <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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Εμφανίζει ρεκόρ στο Λογα
 SeePageForSetup=Δείτε το μενού <a href="%s">%s</a> για τη ρύθμιση
 DepositsAreNotIncluded=- Δεν συμπεριλαμβάνονται τα τιμολόγια για τις προκαταβολές
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Αναφέρετε τον φόρο 2 από τρίτους
 LT2ReportByCustomers=Αναφορά φόρου 3 από τρίτους
 LT1ReportByCustomersES=Αναφορά Πελ./Προμ. RE
 LT2ReportByCustomersES=Έκθεση του τρίτου IRPF
 VATReport=Έκθεση φορολογίας πώλησης
 VATReportByPeriods=Έκθεση φορολογίας πώλησης ανά περίοδο
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Πώληση φορολογική έκθεση με τιμές
 VATReportByThirdParties=Έκδοση φορολογικού δελτίου από τρίτους
 VATReportByCustomers=Πώληση φορολογική έκθεση από τον πελάτη
diff --git a/htdocs/langs/el_GR/cron.lang b/htdocs/langs/el_GR/cron.lang
index c2fe5100a6a..fcf0424f06d 100644
--- a/htdocs/langs/el_GR/cron.lang
+++ b/htdocs/langs/el_GR/cron.lang
@@ -6,16 +6,17 @@ Permission23102 = Δημιουργία/ενημέρωση προγραμματι
 Permission23103 = Διαγραφή προγραμματισμένης εργασίας
 Permission23104 = Εκτέλεση προγραμματισμένης εργασίας
 # Admin
-CronSetup= Προγραμματισμένη ρύθμιση διαχείρισης των εργασιών
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Ή να ελέγξετε και να ξεκινήσει μία συγκεκριμένη εργασία
+CronSetup=Προγραμματισμένη ρύθμιση διαχείρισης των εργασιών
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=Κλειδί ασφαλείας για το URL για να ξεκινήσει η εργασία cron
-FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+FileToLaunchCronJobs=Γραμμή εντολών για έλεγχο και εκκίνηση ειδικών εργασιών cron
 CronExplainHowToRunUnix=Στο Unix περιβάλλον θα πρέπει να χρησιμοποιήσετε την ακόλουθη καταχώρηση crontab για να τρέχει η γραμμή εντολών καθένα 5 λεπτά
-CronExplainHowToRunWin=Σε Microsoft (tm) Windows περιβάλλον μπορείτε να χρησιμοποιήσετε τα εργαλεία Προγραμματισμένη εργασία ώστε να εκτελείτε η γραμμή εντολών καθένα 5 λεπτά
+CronExplainHowToRunWin=Στο περιβάλλον Microsoft (tm) των Windows μπορείτε να χρησιμοποιήσετε τα εργαλεία προγραμματισμένης εργασίας για να εκτελέσετε τη γραμμή εντολών κάθε 5 λεπτά
 CronMethodDoesNotExists=Class %s does not contains any method %s
-CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
-CronJobProfiles=List of predefined cron job profiles
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
+CronJobDefDesc=Τα προφίλ εργασίας Cron ορίζονται στο αρχείο περιγραφικής ενότητας. Όταν η ενότητα είναι ενεργοποιημένη, φορτώνεται και είναι διαθέσιμη, ώστε να μπορείτε να διαχειριστείτε τις εργασίες από το μενού εργαλείων admin %s.
+CronJobProfiles=Λίστα προκαθορισμένων προφίλ εργασίας cron
 # Menu
 EnabledAndDisabled=Ενεργοποίηση και απενεργοποίηση
 # Page list
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=Δεν έχουν καταχωρηθεί εργασίες
 CronPriority=Προτεραιότητα
 CronLabel=Ετικέτα
-CronNbRun=Nb. έναρξης
-CronMaxRun=Max number launch
+CronNbRun=Αριθμός εκτοξεύσεων
+CronMaxRun=Μέγιστος αριθμός εκτοξεύσεων
 CronEach=Κάθε
 JobFinished=Ξεκίνησε και τελείωσε
+Scheduled=Scheduled
 #Page card
 CronAdd= Προσθήκη εργασίας
 CronEvery=Execute job each
@@ -55,29 +57,35 @@ CronSaveSucess=Επιτυχής αποθήκευση
 CronNote=Σχόλιο
 CronFieldMandatory=Τα πεδία %s είναι υποχρεωτικά
 CronErrEndDateStartDt=Η ημερομηνία λήξης δεν μπορεί να είναι πριν από την ημερομηνία έναρξης
-StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Ενεργοποίηση
+StatusAtInstall=Κατάσταση κατά την εγκατάσταση της μονάδας
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Απενεργοποίηση
 CronTaskInactive=Αυτή η εργασία είναι απενεργοποιημένη
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronModuleHelp=Όνομα του καταλόγου μονάδων Dolibarr (επίσης λειτουργούν με εξωτερική μονάδα Dolibarr). <BR> Για παράδειγμα, για να καλέσουμε τη μέθοδο fetch του προϊόντος Dolibarr Product / htdocs / <u>product</u> / class / product.class.php, η τιμή για την ενότητα είναι <br> <i>προϊόν</i>
+CronClassFileHelp=Η σχετική διαδρομή και το όνομα του αρχείου για φόρτωση (η διαδρομή είναι σχετική με τον κεντρικό κατάλογο διακομιστή ιστού). <BR> Για παράδειγμα, για να καλέσετε τη μέθοδο λήψης του προϊόντος Dolibarr Product htdocs / product / class / <u>product.class.php</u> , η τιμή για το όνομα αρχείου κλάσης είναι <br> <i>προϊόν / κλάση / product.class.php</i>
+CronObjectHelp=Το όνομα αντικειμένου που θα φορτωθεί. <BR> Για παράδειγμα, για να καλέσετε τη μέθοδο λήψης του προϊόντος Dolibarr Product /htdocs/product/class/product.class.php, η τιμή για το όνομα του αρχείου κλάσης είναι <br> <i>Προϊόν</i>
+CronMethodHelp=Η μέθοδος αντικειμένου για την εκκίνηση. <BR> Για παράδειγμα, για να καλέσετε τη μέθοδο λήψης του προϊόντος Dolibarr Product /htdocs/product/class/product.class.php, η τιμή για τη μέθοδο είναι <br> <i>φέρω</i>
+CronArgsHelp=Τα επιχειρήματα της μεθόδου. <BR> Για παράδειγμα, για να καλέσετε τη μέθοδο λήψης του προϊόντος Dolibarr Product /htdocs/product/class/product.class.php, η τιμή για τους paramters μπορεί να είναι <br> <i>0, ProductRef</i>
 CronCommandHelp=Γραμμή εντολών του συστήματος προς εκτέλεση.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Από
 # Info
 # Common
 CronType=Είδος εργασίας
-CronType_method=Call method of a PHP Class
+CronType_method=Μέθοδος κλήσης μιας κλάσης PHP
 CronType_command=Εντολή Shell
-CronCannotLoadClass=Cannot load class file %s (to use class %s)
-CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+CronCannotLoadClass=Δεν είναι δυνατή η φόρτωση του αρχείου κλάσης %s (για χρήση της κλάσης %s)
+CronCannotLoadObject=Το αρχείο κλάσης %s φορτώθηκε, αλλά το αντικείμενο %s δεν βρέθηκε σε αυτό
+UseMenuModuleToolsToAddCronJobs=Μεταβείτε στο μενού &quot; <a href="%s">Αρχική σελίδα - Εργαλεία διαχειριστή - Προγραμματισμένες εργασίες</a> &quot; για να δείτε και να επεξεργαστείτε προγραμματισμένες εργασίες.
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Αντίγραφο ασφαλείας τοπικής βάσης δεδομένων
-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
+MakeLocalDatabaseDump=Δημιουργήστε μια τοπική χωματερή βάση δεδομένων. Οι παράμετροι είναι: συμπίεση (&#39;gz&#39; ή &#39;bz&#39; ή &#39;none&#39;), backup type (&#39;mysql&#39;, &#39;pgsql&#39;, &#39;auto&#39;),
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Cleaner δεδομένων και ανώνυμος
+JobXMustBeEnabled=Job %s must be enabled
+# 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/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 393b97c7174..0cdb22a79d6 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Κανένα σφάλμα
 # Errors
 ErrorButCommitIsDone=Σφάλματα που διαπιστώθηκαν αλλά παρόλα αυτά επικυρώνει
 ErrorBadEMail=Το μήνυμα ηλεκτρονικού ταχυδρομείου %s είναι λάθος
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=%s url είναι λάθος
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Είσοδος %s υπάρχει ήδη.
 ErrorGroupAlreadyExists=Ομάδα %s υπάρχει ήδη.
 ErrorRecordNotFound=Εγγραφή δεν βρέθηκε.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Ορισμένα από τα απαιτούμενα πεδί
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Αποτυχία δημιουργίας φακέλου. Βεβαιωθείτε ότι ο Web server χρήστης έχει δικαιώματα να γράψει στο φάκελο εγγράφων του Dolibarr. Αν η <b>safe_mode</b> παράμετρος είναι ενεργοποιημένη για την PHP, ελέγξτε ότι τα αρχεία php του Dolibarr ανήκουν στον web server χρήστη (ή ομάδα).
 ErrorNoMailDefinedForThisUser=Δεν έχει οριστεί mail για αυτόν το χρήστη
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Αυτό το χαρακτηριστικό χρειάζεται ενεργοποιημένη την javascript. Αλλάξτε την ρύθμιση στο Ρυθμίσεις - Εμφάνιση.
 ErrorTopMenuMustHaveAParentWithId0=Ένα μενού του «Top» τύπου δεν μπορεί να έχει ένα μενού γονέα. Βάλτε 0 στο μενού του γονέα ή να επιλέξετε ένα μενού του τύπου «αριστερά».
 ErrorLeftMenuMustHaveAParentId=Ένα μενού της «Αριστεράς» τύπου πρέπει να έχει ένα id γονέα.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Αυτό το όνομα προφίλ υπάρχει
 ErrorLDAPSetupNotComplete=Η αντιστοίχιση Dolibarr-LDAP δεν είναι πλήρης.
 ErrorLDAPMakeManualTest=Ένα αρχείο. Ldif έχει δημιουργηθεί στον φάκελο %s. Προσπαθήστε να το φορτώσετε χειροκίνητα από την γραμμή εντολών για να έχετε περισσότερες πληροφορίες σχετικά με τα σφάλματα.
 ErrorCantSaveADoneUserWithZeroPercentage=Δεν είναι δυνατή η αποθήκευση μιας ενέργειας με &quot;κατάσταση δεν έχει ξεκινήσει&quot; εάν συμπληρώνεται επίσης το πεδίο &quot;done by&quot;.
-ErrorRefAlreadyExists=Κωδικός που χρησιμοποιείται για τη δημιουργία ήδη υπάρχει.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Παρακαλούμε εισάγετε το όνομα του τραπεζικού λογαριασμού όπου πρέπει να αναφέρεται η καταχώρηση (Format YYYYMM ή YYYYMMDD)
 ErrorRecordHasChildren=Δεν ήταν δυνατή η διαγραφή της εγγραφής, δεδομένου ότι έχει ορισμένα αρχεία παιδιών.
 ErrorRecordHasAtLeastOneChildOfType=Το αντικείμενο έχει τουλάχιστον ένα παιδί τύπου %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Πρέπει να επιλέξε
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Η έκπτωση που προσπαθείτε να εφαρμόσετε είναι μεγαλύτερη από την αποπληρωμή. Διαχωρίστε την έκπτωση σε 2 μικρότερες εκπτώσεις πριν.
 ErrorFileNotFoundWithSharedLink=Το αρχείο δεν βρέθηκε. Μπορεί να τροποποιηθεί το κλειδί κοινής χρήσης ή να καταργηθεί πρόσφατα το αρχείο.
 ErrorProductBarCodeAlreadyExists=Ο γραμμωτός κώδικας προϊόντος %s υπάρχει ήδη σε άλλη αναφορά προϊόντος.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Σημειώστε επίσης ότι η χρήση εικονικού προϊόντος για την αυτόματη αύξηση / μείωση υποπροϊόντων δεν είναι δυνατή όταν τουλάχιστον ένα υποπροϊόν (ή υποπροϊόν των υποπροϊόντων) χρειάζεται έναν αριθμό σειράς / παρτίδας.
+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=Η περιγραφή είναι υποχρεωτική για γραμμές με δωρεάν προϊόν
 ErrorAPageWithThisNameOrAliasAlreadyExists=Η σελίδα / κοντέινερ <strong>%s</strong> έχει το ίδιο όνομα ή εναλλακτικό ψευδώνυμο με εκείνο που προσπαθείτε να χρησιμοποιήσετε
 ErrorDuringChartLoad=Σφάλμα κατά τη φόρτωση του γραφήματος λογαριασμών. Εάν δεν έχουν φορτωθεί μερικοί λογαριασμοί, μπορείτε να τις εισαγάγετε με μη αυτόματο τρόπο.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Σφάλμα, η συμβολοσειρά για αντ
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Public interface was not enabled
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Η παράμετρος PHP upload_max_filesize (%s) είναι υψηλότερη από την παράμετρο PHP post_max_size (%s). Αυτό δεν είναι μια σταθερή ρύθμιση.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Προειδοποίηση, ο αριθμός διαφορετικών παραληπτών περιορίζεται στο <b>%s</b> όταν χρησιμοποιείτε τις μαζικές ενέργειες σε λίστες
 WarningDateOfLineMustBeInExpenseReportRange=Προειδοποίηση, η ημερομηνία της γραμμής δεν βρίσκεται στο εύρος της έκθεσης δαπανών
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Το έργο είναι κλειστό. Πρέπει πρώτα να το ανοίξετε ξανά.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Ορισμένες τραπεζικές συναλλαγές καταργήθηκαν μετά την ενσωμάτωσής τους εκεί οπου δημιουργήθηκαν. Επομένως, οι έλεγχοι και το σύνολο της απόδειξης μπορεί να διαφέρουν από τον αριθμό και το σύνολο της λίστας.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/el_GR/exports.lang b/htdocs/langs/el_GR/exports.lang
index bf03b366fa0..28459f2238d 100644
--- a/htdocs/langs/el_GR/exports.lang
+++ b/htdocs/langs/el_GR/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Τώρα, επιλέξτε τη μορφή αρχείου στο σύνθετο πλαίσιο και κάντε κλικ στο &quot;Δημιουργία&quot; για να δημιουργήσετε το αρχείο εξαγωγής ...
 AvailableFormats=Διαθέσιμες μορφές
 LibraryShort=Library
+ExportCsvSeparator=Csv διαχωριστικό χαρακτήρων
+ImportCsvSeparator=Csv διαχωριστικό χαρακτήρων
 Step=Step
 FormatedImport=Βοηθός εισαγωγής
 FormatedImportDesc1=Αυτή η ενότητα σάς επιτρέπει να ενημερώσετε υπάρχοντα δεδομένα ή να προσθέσετε νέα αντικείμενα στη βάση δεδομένων από ένα αρχείο χωρίς τεχνικές γνώσεις, χρησιμοποιώντας έναν βοηθό.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Πλήκτρο (στήλη) που χρησιμοποιεί
 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/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
index cd95cc106e2..42009943751 100644
--- a/htdocs/langs/el_GR/mails.lang
+++ b/htdocs/langs/el_GR/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Εισαγωγή μηνυμάτων ηλεκτρ
 MailingModuleDescDolibarrUsers=Χρήστες με μηνύματα ηλεκτρονικού ταχυδρομείου
 MailingModuleDescThirdPartiesByCategories=Τρίτα μέρη (κατά κατηγορίες)
 SendingFromWebInterfaceIsNotAllowed=Η αποστολή από τη διεπαφή ιστού δεν επιτρέπεται.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Σειρά %s στο αρχείο
@@ -125,12 +126,13 @@ TagMailtoEmail=E-mail παραλήπτη (συμπεριλαμβανομένου
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=Δεν υπάρχουν ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου που έχουν προγραμματιστεί για αυτό το συμβάν και την εταιρεία
-ANotificationsWillBeSent=1 ειδοποίηση θα σταλεί μέσω e-mail
-SomeNotificationsWillBeSent=%s Θα αποστέλλονται ειδοποιήσεις μέσω e-mail
-AddNewNotification=Ενεργοποιήστε ένα νέο στόχο ειδοποίησης μέσω ηλεκτρονικού ταχυδρομείου
-ListOfActiveNotifications=List all active targets for email notification
-ListOfNotificationsDone=Λίστα όλων των ειδοποιήσεων ηλεκτρονικού ταχυδρομείου που αποστέλλονται
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Διαμόρφωση αποστολή email έχει ρυθμιστεί σε '%s'. Αυτή η λειτουργία δεν μπορεί να χρησιμοποιηθεί για να σταλθούν μαζικά μηνύματα ηλεκτρονικού ταχυδρομείου.
 MailSendSetupIs2=Θα πρέπει πρώτα να πάτε, με έναν λογαριασμό διαχειριστή, στο μενού %s Αρχική - Ρύθμιση - Emails %s για να αλλάξετε την παράμετρο <strong>'%s'</strong> για να χρησιμοποιήσετε τη λειτουργία '%s'. Με αυτόν τον τρόπο, μπορείτε να μεταβείτε στις ρυθμίσεις του διακομιστή SMTP παρέχεται από τον Internet Service Provider και να χρησιμοποιήσετε τη Μαζική αποστολή ηλεκτρονικού ταχυδρομείου.
 MailSendSetupIs3=Αν έχετε οποιαδήποτε απορία σχετικά με το πώς να ρυθμίσετε το διακομιστή SMTP σας, μπορείτε να ζητήσετε στο %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Συμπληρώστε τα πεδία εισαγωγής για να επιλέξετε εκ των προτέρων τα τρίτα μέρη ή τις επαφές / διευθύνσεις που θέλετε να στοχεύσετε
-AdvTgtSearchTextHelp=Χρησιμοποιήστε %% ως μπαλαντέρ. Για παράδειγμα, για να βρείτε όλα τα στοιχεία όπως το <b>jean, joe, jim</b> , μπορείτε να εισάγετε το <b>j%%</b> , μπορείτε επίσης να χρησιμοποιήσετε. ως διαχωριστικό για αξία και χρήση! για εκτός αυτής της τιμής. Για παράδειγμα, το <b>jean, joe, jim%%;! Jimo;! Jima%</b> θα στοχεύσει όλους τους Jean, joe, ξεκινήστε με τον Jim αλλά όχι το jimo και όχι με όλα όσα αρχίζουν με jima
+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=Ελάχιστη τιμή
 AdvTgtMaxVal=Μέγιστη τιμή
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Εγκατάσταση εξερχόμενου email (για ενότητα %s)
-DefaultOutgoingEmailSetup=Προεπιλεγμένη ρύθμιση εξερχόμενων email
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Πληροφορίες
 ContactsWithThirdpartyFilter=Επαφές με φίλτρο τρίτου μέρους
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index 420fc166108..e889ec49edd 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Δεν υπάρχει διαθέσιμο πρότυπο για
 AvailableVariables=Διαθέσιμες μεταβλητές αντικατάστασης
 NoTranslation=Δεν μεταφράστηκε
 Translation=Μετάφραση
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Δεν υπάρχουν καταχωρημένα στοιχεία
 NoRecordDeleted=Δεν διαγράφηκε εγγραφή
 NotEnoughDataYet=Τα δεδομένα δεν είναι επαρκή
@@ -85,6 +87,8 @@ FileWasNotUploaded=Επιλέχθηκε ένα αρχείο για επισύν
 NbOfEntries=Αριθ. Εγγραφών
 GoToWikiHelpPage=Online βοήθεια (απαιτείται σύνδεση στο internet)
 GoToHelpPage=Βοήθεια
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Η εγγραφή αποθηκεύτηκε
 RecordDeleted=Η εγγραφή διγραφηκε
 RecordGenerated=Η εγγραφή δημιουργήθηκε
@@ -220,6 +224,7 @@ Value=Τιμή
 PersonalValue=Προσωπική Τιμή
 NewObject=Νέο %s
 NewValue=Νέα Τιμή
+OldValue=Old value %s
 CurrentValue=Τρέχουσα Τιμή
 Code=Κωδικός
 Type=Τύπος
@@ -433,6 +438,7 @@ RemainToPay=Πληρώστε
 Module=Ενότητα / Εφαρμογή
 Modules=Ενότητες / Εφαρμογές
 Option=Επιλογή
+Filters=Filters
 List=Λίστα
 FullList=Πλήρης Λίστα
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ SupplierPreview=Προβολή προμηθευτή
 ShowCustomerPreview=Εμφάνιση Προεπισκόπησης Πελάτη
 ShowSupplierPreview=Εμφάνιση προεπισκόπησης προμηθευτή
 RefCustomer=Κωδ. Πελάτη
+InternalRef=Internal ref.
 Currency=Νόμισμα
 InfoAdmin=Πληροφορία για τους διαχειριστές
 Undo=Αναίρεση
@@ -671,7 +678,7 @@ SendMail=Αποστολή email
 Email=Email
 NoEMail=Χωρίς email
 AlreadyRead=Διαβάσατε ήδη
-NotRead=Δεν διαβάζεται
+NotRead=Unread
 NoMobilePhone=Χωρείς κινητό τηλέφωνο
 Owner=Ιδιοκτήτης
 FollowingConstantsWillBeSubstituted=Οι ακόλουθες σταθερές θα αντικαταστασθούν με τις αντίστοιχες τιμές
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Υπενθύμιση συμβάντος
 UpdateForAllLines=Update for all lines
+OnHold=Σε Αναμονή
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/el_GR/modulebuilder.lang b/htdocs/langs/el_GR/modulebuilder.lang
index 6f8f201d666..0c97a5a3b30 100644
--- a/htdocs/langs/el_GR/modulebuilder.lang
+++ b/htdocs/langs/el_GR/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=Σελίδα PHP για δημιουργία / επεξε
 PageForAgendaTab=Σελίδα PHP για καρτέλα συμβάντος
 PageForDocumentTab=PHP σελίδα για καρτέλα έγγραφο
 PageForNoteTab=Σελίδα PHP για την καρτέλα σημείωσης
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Διαδρομή προς φερμουάρ του πακέτου ενότητας / εφαρμογής
 PathToModuleDocumentation=Διαδρομή αρχείου τεκμηρίωσης ενότητας / εφαρμογής (%s)
 SpaceOrSpecialCharAreNotAllowed=Δεν επιτρέπονται χώροι ή ειδικοί χαρακτήρες.
@@ -77,7 +78,7 @@ IsAMeasure=Είναι ένα μέτρο
 DirScanned=Κατάλογος σάρωση
 NoTrigger=Δεν ενεργοποιείται
 NoWidget=Δεν γραφικό στοιχείο
-GoToApiExplorer=Μεταβείτε στον εξερευνητή API
+GoToApiExplorer=API explorer
 ListOfMenusEntries=Λίστα καταχωρήσεων μενού
 ListOfDictionariesEntries=Λίστα καταχωρήσεων λεξικών
 ListOfPermissionsDefined=Λίστα καθορισμένων δικαιωμάτων
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Αν έχετε γνώσεις SQL και PHP, μπορ
 SeeTopRightMenu=Βλέπω <span class="fa fa-bug"></span> στο πάνω δεξιό μενού
 AddLanguageFile=Προσθήκη αρχείου γλώσσας
 YouCanUseTranslationKey=Μπορείτε να χρησιμοποιήσετε εδώ ένα κλειδί που είναι το κλειδί μετάφρασης που βρίσκεται στο αρχείο γλώσσας (δείτε την καρτέλα &quot;Γλώσσες&quot;)
-DropTableIfEmpty=(Διαγραφή πίνακα εάν είναι κενή)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=Ο πίνακας %s δεν υπάρχει
 TableDropped=Ο πίνακας %s διαγράφηκε
 InitStructureFromExistingTable=Δημιουργήστε τη συμβολοσειρά συστοιχιών δομής ενός υπάρχοντος πίνακα
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Χρησιμοποιήστε μια συγκεκριμέ
 UseSpecificFamily = Χρησιμοποιήστε μια συγκεκριμένη οικογένεια
 UseSpecificAuthor = Χρησιμοποιήστε έναν συγκεκριμένο συντάκτη
 UseSpecificVersion = Χρησιμοποιήστε μια συγκεκριμένη αρχική έκδοση
-ModuleMustBeEnabled=Η μονάδα / εφαρμογή πρέπει πρώτα να ενεργοποιηθεί
 IncludeRefGeneration=Η αναφορά του αντικειμένου πρέπει να δημιουργείται αυτόματα
 IncludeRefGenerationHelp=Ελέγξτε αν θέλετε να συμπεριλάβετε κώδικα για να διαχειριστείτε την αυτόματη παραγωγή της αναφοράς
 IncludeDocGeneration=Θέλω να δημιουργήσω κάποια έγγραφα από το αντικείμενο
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Τύπος πεδίων: <br> varchar (99), διπλό (24,8),
 AsciiToHtmlConverter=Μεταροπέας από Ascii σε HTML
 AsciiToPdfConverter=Μεταροπέας από Ascii σε PDF
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/el_GR/mrp.lang b/htdocs/langs/el_GR/mrp.lang
index 25e91a2a182..898842cfab0 100644
--- a/htdocs/langs/el_GR/mrp.lang
+++ b/htdocs/langs/el_GR/mrp.lang
@@ -78,3 +78,27 @@ TotalCost=Συνολικό κόστος
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
 GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
 ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
+Workstation=Workstation
+Workstations=Workstations
+WorkstationsDescription=Workstations management
+WorkstationSetup = Workstations setup
+WorkstationSetupPage = Workstations setup page
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index 28a0f808756..83a5818fdcc 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -5,8 +5,6 @@ Tools=Εργαλεία
 TMenuTools=Εργαλεία
 ToolsDesc=Όλα τα εργαλεία που δεν περιλαμβάνονται σε άλλες καταχωρίσεις μενού ομαδοποιούνται εδώ. <br> Όλα τα εργαλεία μπορούν να προσπελαστούν μέσω του αριστερού μενού.
 Birthday=Γενέθλια
-BirthdayDate=Ημερομηνία γενέθλια
-DateToBirth=Ημερομηνία γέννησης
 BirthdayAlertOn=Ειδοποίηση γενεθλίων ενεργή
 BirthdayAlertOff=Ειδοποίηση γενεθλίων ανενεργή
 TransKey=Μετάφραση του κλειδιού TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Προηγούμενος μήνας (αριθμός 1-12)
 TextPreviousMonthOfInvoice=Προηγούμενος μήνας (κείμενο) της ημερομηνίας του τιμολογίου
 NextMonthOfInvoice=Μετά τον μήνα (αριθμός 1-12) της ημερομηνίας του τιμολογίου
 TextNextMonthOfInvoice=Μετά τον μήνα (κείμενο) της ημερομηνίας του τιμολογίου
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Το αρχείο Zip δημιουργήθηκε σε <b>%s</b> .
 DocFileGeneratedInto=Το αρχείο Doc δημιουργήθηκε σε <b>%s</b> .
 JumpToLogin=Ασύνδετος. Μετάβαση στη σελίδα σύνδεσης ...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Έκθεση εξόδων επικυρωμένη
 Notify_EXPENSE_REPORT_APPROVE=Η έκθεση εξόδων εγκρίθηκε
 Notify_HOLIDAY_VALIDATE=Ακύρωση αίτησης επικυρωμένου (απαιτείται έγκριση)
 Notify_HOLIDAY_APPROVE=Αφήστε την αίτηση να εγκριθεί
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=Δείτε την ρύθμιση του module %s
 NbOfAttachedFiles=Πλήθος επισυναπτώμενων αρχείων/εγγράφων
 TotalSizeOfAttachedFiles=Συνολικό μέγεθος επισυναπτώμενων αρχείων/εγγράφων
@@ -99,6 +100,7 @@ PredefinedMailContentSendShipping=__ (Γεια σας) __ Παρακαλούμε
 PredefinedMailContentSendFichInter=__ (Γεια σας) __ Βρείτε την παρέμβαση __REF__ επισυνάπτεται __ (ειλικρινά) __ __USER_SIGNATURE__
 PredefinedMailContentLink=Μπορείτε να κάνετε κλικ στον παρακάτω σύνδεσμο για να πραγματοποιήσετε την πληρωμή σας, αν δεν έχει γίνει ήδη. %s
 PredefinedMailContentGeneric=__ (Γεια σας) __ __ (ειλικρινά) __ __USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Το Dolibarr είναι ένα συμπαγές ERP / CRM που υποστηρίζει διάφορες λειτουργικές μονάδες. Ένα demo που παρουσιάζει όλες τις μονάδες δεν έχει νόημα καθώς το σενάριο αυτό δεν εμφανίζεται ποτέ (αρκετές εκατοντάδες διαθέσιμες). Έτσι, πολλά προφίλ επίδειξης είναι διαθέσιμα.
 ChooseYourDemoProfil=Επιλέξτε το προφίλ επίδειξης που ταιριάζει καλύτερα στις ανάγκες σας ...
 ChooseYourDemoProfilMore=... ή να δημιουργήσετε το δικό σας προφίλ <br> (επιλογή χειροκίνητης μονάδας)
@@ -137,7 +139,7 @@ Right=Δικαίωμα
 CalculatedWeight=Υπολογισμένο βάρος
 CalculatedVolume=Υπολογισμένος όγκος
 Weight=Βάρος
-WeightUnitton=τόνο
+WeightUnitton=τόνος
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ EMailTextExpenseReportValidated=Η έκθεση δαπανών %s έχει επ
 EMailTextExpenseReportApproved=Η έκθεση δαπανών %s έχει εγκριθεί.
 EMailTextHolidayValidated=Ακύρωση αίτησης %s έχει επικυρωθεί.
 EMailTextHolidayApproved=Το αίτημα άδειας %s έχει εγκριθεί.
+EMailTextActionAdded=The action %s has been added to the Agenda.
 ImportedWithSet=Η εισαγωγή των δεδομένων που
 DolibarrNotification=Αυτόματη ειδοποίηση
 ResizeDesc=Εισάγετε το νέο πλάτος <b>ή το</b> νέο ύψος. Λόγος θα διατηρηθούν κατά τη διάρκεια της αλλαγής μεγέθους ...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Επαφή / διεύθυνση που δημιο
 ProjectCreatedByEmailCollector=Έργο που δημιουργήθηκε από τον συλλέκτη ηλεκτρονικού ταχυδρομείου από το ηλεκτρονικό ταχυδρομείο MSGID %s
 TicketCreatedByEmailCollector=Εισιτήριο που δημιουργήθηκε από τον συλλέκτη ηλεκτρονικού ταχυδρομείου από το ηλεκτρονικό ταχυδρομείο MSGID %s
 OpeningHoursFormatDesc=Χρησιμοποιήστε το "-" για να διαχωρίσετε τις ώρες ανοίγματος και κλεισίματος. <br> Χρησιμοποιήστε "κενό" για να εισάγετε διαφορετικές περιοχές. <br> Παράδειγμα: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index 6570f5f1b60..60cfc0b3233 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Πολλαπλά τμήματα τιμών ανά προϊόν / υπηρεσία (κάθε πελάτης βρίσκεται σε ένα τμήμα τιμών)
 MultiPricesNumPrices=Αριθμός τιμής
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+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=Αριθμός μητρικής συσκευασίας προϊόντος
@@ -167,8 +168,10 @@ BuyingPrices=Τιμές Αγοράς
 CustomerPrices=Τιμές Πελατών
 SuppliersPrices=Τιμές πωλητών
 SuppliersPricesOfProductsOrServices=Τιμές πωλητών (προϊόντων ή υπηρεσιών)
-CustomCode=Τελωνείο / εμπορεύματα / κωδικός ΕΣ
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Χώρα προέλευσης
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Φύση προϊόντος (υλικό / τελικό)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Διαφορετικές τιμές από την ποσότητα
 DisablePriceByQty=Απενεργοποιήστε τις τιμές ανά ποσότητα
 PriceByQuantityRange=Quantity range
-MultipriceRules=Κανόνες τμήματος τιμών
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Χρησιμοποιήστε κανόνες για το τμήμα των τιμών (που ορίζονται στην εγκατάσταση μονάδας προϊόντος) για να υπολογίσετε αυτόματα τις τιμές όλων των άλλων τμημάτων σύμφωνα με τον πρώτο τομέα
 PercentVariationOver=Παραλλαγή %% μέσω %s
 PercentDiscountOver=%% έκπτωση πάνω από %s
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index de4fe4901f7..f63a0fbc3e6 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -76,15 +76,16 @@ MyActivities=Οι εργασίες/δραστηρ. μου
 MyProjects=Τα έργα μου
 MyProjectsArea=Τα έργα μου Περιοχή
 DurationEffective=Αποτελεσματική διάρκεια
-ProgressDeclared=Χαρακτηρίστηκε σε εξέλιξη
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Πρόοδος εργασιών
 CurentlyOpenedTasks=Ανοιχτές εργασίες
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=Η δηλωμένη πρόοδος είναι μικρότερη %s από την υπολογισμένη εξέλιξη
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Η δηλωμένη πρόοδος είναι περισσότερο %s από την υπολογισμένη εξέλιξη
-ProgressCalculated=Υπολογιζόμενη πρόοδος
+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=με το οποίο είμαι συνδεδεμένος
 WhichIamLinkedToProject=που είμαι συνδεδεμένος με το έργο
 Time=Χρόνος
+TimeConsumed=Consumed
 ListOfTasks=Κατάλογος εργασιών
 GoToListOfTimeConsumed=Μεταβείτε στη λίστα του χρόνου που καταναλώνετε
 GanttView=Gantt View
diff --git a/htdocs/langs/el_GR/recruitment.lang b/htdocs/langs/el_GR/recruitment.lang
index 979cbd02335..6bd34b116f7 100644
--- a/htdocs/langs/el_GR/recruitment.lang
+++ b/htdocs/langs/el_GR/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/el_GR/sendings.lang b/htdocs/langs/el_GR/sendings.lang
index d72b07464cb..d4bf5fdbe92 100644
--- a/htdocs/langs/el_GR/sendings.lang
+++ b/htdocs/langs/el_GR/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Άλλες αποστολές για αυτό το σ
 SendingsAndReceivingForSameOrder=Αποστολές και αποδείξεις για αυτήν την παραγγελία
 SendingsToValidate=Αποστολές για επικύρωση
 StatusSendingCanceled=Ακυρώθηκε
+StatusSendingCanceledShort=Ακυρώθηκε
 StatusSendingDraft=Σχέδιο
 StatusSendingValidated=Επικυρωμένη (προϊόντα για αποστολή ή που έχουν ήδη αποσταλεί)
 StatusSendingProcessed=Επεξεργασμένα
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Θα πρέπει πρώτα να επικυρ
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Πληρέστερο πρότυπο έγγραφο για αποδεικτικά παράδοσης (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Σταθερή EXPEDITION_ADDON_NUMBER δεν ορίζεται
 SumOfProductVolumes=Άθροισμα όγκου του προϊόντος
 SumOfProductWeights=Άθροισμα το βάρος των προϊόντων
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index 50808768598..454db71ae7c 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Αποθήκες αξία
 UserWarehouseAutoCreate=Δημιουργήστε αυτόματα μια αποθήκη χρήστη κατά τη δημιουργία ενός χρήστη
 AllowAddLimitStockByWarehouse=Διαχειριστείτε επίσης την τιμή για το ελάχιστο και το επιθυμητό απόθεμα ανά ζεύγος (αποθήκη προϊόντων) επιπλέον της τιμής για το ελάχιστο και το επιθυμητό απόθεμα ανά προϊόν
 RuleForWarehouse=Rule for warehouses
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/el_GR/ticket.lang b/htdocs/langs/el_GR/ticket.lang
index 67327d94483..65f2b2d8d39 100644
--- a/htdocs/langs/el_GR/ticket.lang
+++ b/htdocs/langs/el_GR/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Τύπος εισιτηρίου
 TicketDictCategory=Εισιτήριο - Ομαδοποιεί
 TicketDictSeverity=Εισιτήριο - Βαρύτητα
 TicketDictResolution=Εισιτήριο - Ανάλυση
-TicketTypeShortBUGSOFT=Λογική δυσλειτουργίας
-TicketTypeShortBUGHARD=Dysfonctionnement υλικά
-TicketTypeShortCOM=Εμπορική ερώτηση
 
+TicketTypeShortCOM=Εμπορική ερώτηση
 TicketTypeShortHELP=Αίτημα για λειτουργική βοήθεια
 TicketTypeShortISSUE=Θέμα, σφάλμα ή πρόβλημα
 TicketTypeShortREQUEST=Αίτημα αλλαγής ή βελτίωσης
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Άλλο
 TicketSeverityShortLOW=Χαμηλή
 TicketSeverityShortNORMAL=Κανονικός
 TicketSeverityShortHIGH=Υψηλή
-TicketSeverityShortBLOCKING=Κρίσιμη / Αποκλεισμός
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Το πεδίο &#39;%s&#39; είναι εσφαλμένο
 MenuTicketMyAssign=Τα εισιτήριά μου
@@ -60,7 +58,6 @@ OriginEmail=Πηγή ηλεκτρονικού ταχυδρομείου
 Notify_TICKET_SENTBYMAIL=Στείλτε μήνυμα εισιτηρίου μέσω ηλεκτρονικού ταχυδρομείου
 
 # Status
-NotRead=Δεν διαβάζεται
 Read=Ανάγνωση
 Assigned=Ανατεθεί
 InProgress=Σε εξέλιξη
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Η δημόσια διεπαφή επιτρέ
 TicketsAutoAssignTicket=Ορίστε αυτόματα τον χρήστη που δημιούργησε το εισιτήριο
 TicketsAutoAssignTicketHelp=Κατά τη δημιουργία ενός εισιτηρίου, ο χρήστης μπορεί να αντιστοιχιστεί αυτόματα στο εισιτήριο.
 TicketNumberingModules=Μονάδα αρίθμησης εισιτηρίων
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Ειδοποιήστε τρίτο μέρος στη δημιουργία
 TicketsDisableCustomerEmail=Πάντα να απενεργοποιείτε τα μηνύματα ηλεκτρονικού ταχυδρομείου όταν δημιουργείται ένα εισιτήριο από τη δημόσια διασύνδεση
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Η κατάσταση άλλαξε: %s to %s
 TicketNotNotifyTiersAtCreate=Μην ειδοποιείτε την εταιρεία στη δημιουργία
 Unread=Αδιάβαστος
 TicketNotCreatedFromPublicInterface=Μη διαθέσιμος. Το εισιτήριο δεν δημιουργήθηκε από το δημόσιο περιβάλλον.
-PublicInterfaceNotEnabled=Η δημόσια διεπαφή δεν ήταν ενεργοποιημένη
 ErrorTicketRefRequired=Το όνομα αναφοράς Eισιτηρίου είναι υποχρεωτικό
 
 #
diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang
index 50dd8e48759..7ed1f8aab8f 100644
--- a/htdocs/langs/el_GR/website.lang
+++ b/htdocs/langs/el_GR/website.lang
@@ -30,7 +30,6 @@ EditInLine=Επεξεργασία εν σειρά
 AddWebsite=Προσθήκη ιστοτόπου
 Webpage=Ιστοσελίδα / δοχείο
 AddPage=Προσθήκη σελίδας / δοχείου
-HomePage=Αρχική σελίδα
 PageContainer=Σελίδα
 PreviewOfSiteNotYetAvailable=<strong>Δεν</strong> είναι ακόμα διαθέσιμη η προεπισκόπηση του ιστοτόπου σας <strong>%s</strong> . Πρέπει πρώτα να <strong>εισαγάγετε ένα πλήρες πρότυπο ιστότοπου</strong> ή απλά να <strong>προσθέσετε μια σελίδα / κοντέινερ</strong> .
 RequestedPageHasNoContentYet=Η σελίδα που ζητήθηκε με id %s δεν έχει ακόμα περιεχόμενο, ή το αρχείο cache .tpl.php καταργήθηκε. Επεξεργαστείτε το περιεχόμενο της σελίδας για να το επιλύσετε.
@@ -101,7 +100,7 @@ EmptyPage=Κενή σελίδα
 ExternalURLMustStartWithHttp=Η εξωτερική διεύθυνση URL πρέπει να ξεκινά με http: // ή https: //
 ZipOfWebsitePackageToImport=Μεταφορτώστε το αρχείο Zip του πακέτου πρότυπου ιστότοπου
 ZipOfWebsitePackageToLoad=ή Επιλέξτε ένα διαθέσιμο πακέτο πρότυπου ιστότοπου
-ShowSubcontainers=Συμπεριλάβετε δυναμικό περιεχόμενο
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Εσωτερική διεύθυνση URL της σελίδας
 ThisPageIsTranslationOf=Αυτή η σελίδα / δοχείο είναι μια μετάφραση του
 ThisPageHasTranslationPages=Αυτή η σελίδα / κοντέινερ έχει μετάφραση
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang
index b4cebd19f0c..69377126e89 100644
--- a/htdocs/langs/el_GR/withdrawals.lang
+++ b/htdocs/langs/el_GR/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Τελευταίες εισπράξεις άμεσης χ
 MakeWithdrawRequest=Πραγματοποιήστε αίτημα πληρωμής με άμεση χρέωση
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s καταγράφονται τα αιτήματα πληρωμής άμεσης χρέωσης
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Τραπεζικός κωδικός τρίτου μέρους
 NoInvoiceCouldBeWithdrawed=Κανένα τιμολόγιο δεν χρεώθηκε με επιτυχία. Βεβαιωθείτε ότι τα τιμολόγια είναι σε εταιρείες με έγκυρο αριθμό IBAN και ότι ο IBAN έχει UMR (Unique Mandate Reference) με τον τρόπο <strong>%s</strong> .
 ClassCredited=Ταξινομήστε πιστώνεται
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Ημερομηνία εκτέλεσης
 CreateForSepa=Δημιουργήστε αρχείο άμεσης χρέωσης
-ICS=Αναγνωριστικό πιστωτή CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END=&quot;EndToEndId&quot; Ετικέτα XML SEPA - Μοναδική ταυτότητα που αντιστοιχεί σε κάθε συναλλαγή
 USTRD=&quot;Μη δομημένη&quot; ετικέτα XML SEPA
 ADDDAYS=Προσθήκη ημερών στην Ημερομηνία Εκτέλεσης
@@ -146,3 +148,5 @@ InfoRejectSubject=Η εντολή πληρωμής άμεσης χρέωσης 
 InfoRejectMessage=Γεια σας, <br><br> η εντολή πληρωμής άμεσης χρέωσης του τιμολογίου %s σχετικά με την εταιρεία %s, με το ποσό %s απορρίφθηκε από την τράπεζα. <br><br> - <br> %s
 ModeWarning=Επιλογή για την πραγματική κατάσταση, δεν είχε καθοριστεί, σταματάμε μετά από αυτή την προσομοίωση
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/el_GR/workflow.lang b/htdocs/langs/el_GR/workflow.lang
index 0c31b6ae167..bfad87b4b66 100644
--- a/htdocs/langs/el_GR/workflow.lang
+++ b/htdocs/langs/el_GR/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Αυτόματη δημιουργία
 AutomaticClassification=Αυτόματη ταξινόμηση
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/en_AU/accountancy.lang b/htdocs/langs/en_AU/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/en_AU/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/en_AU/admin.lang b/htdocs/langs/en_AU/admin.lang
index 0980facb414..fd46f1407d3 100644
--- a/htdocs/langs/en_AU/admin.lang
+++ b/htdocs/langs/en_AU/admin.lang
@@ -1,7 +1,9 @@
 # Dolibarr language file - Source file is en_US - admin
 OldVATRates=Old GST rate
 NewVATRates=New GST rate
+Module59000Desc=Module to follow margins
 DictionaryVAT=GST Rates or Sales Tax Rates
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 OptionVatMode=GST due
 LinkColor=Colour of links
 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.
diff --git a/htdocs/langs/en_AU/mrp.lang b/htdocs/langs/en_AU/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/en_AU/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/en_AU/products.lang b/htdocs/langs/en_AU/products.lang
index 6e900475275..2a38b9b0181 100644
--- a/htdocs/langs/en_AU/products.lang
+++ b/htdocs/langs/en_AU/products.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
+AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/en_AU/withdrawals.lang b/htdocs/langs/en_AU/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/en_AU/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/en_CA/accountancy.lang b/htdocs/langs/en_CA/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/en_CA/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang
index 62dd510c5e0..a5226efb4db 100644
--- a/htdocs/langs/en_CA/admin.lang
+++ b/htdocs/langs/en_CA/admin.lang
@@ -1,7 +1,9 @@
 # Dolibarr language file - Source file is en_US - admin
+Module59000Desc=Module to follow margins
 LocalTax1Management=PST Management
 CompanyZip=Postal code
 LDAPFieldZip=Postal code
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 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. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_CA/compta.lang b/htdocs/langs/en_CA/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/en_CA/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/en_CA/mrp.lang b/htdocs/langs/en_CA/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/en_CA/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/en_CA/products.lang b/htdocs/langs/en_CA/products.lang
index 6e900475275..2a38b9b0181 100644
--- a/htdocs/langs/en_CA/products.lang
+++ b/htdocs/langs/en_CA/products.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
+AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/en_CA/withdrawals.lang b/htdocs/langs/en_CA/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/en_CA/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang
index 9a42aff0270..d759a22f0c6 100644
--- a/htdocs/langs/en_GB/accountancy.lang
+++ b/htdocs/langs/en_GB/accountancy.lang
@@ -49,6 +49,7 @@ VentilatedinAccount=Linked successfully to the financial account
 NotVentilatedinAccount=Not linked to the financial account
 XLineSuccessfullyBinded=%s products/services successfully linked to the finance account
 XLineFailedToBeBinded=%s products/services were not linked to any finance account
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin sorting the page "Links to do" by the most recent elements
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin sorting the page "Links done" by the most recent elements
 ACCOUNTING_LENGTH_GACCOUNT=Length of the General Ledger accounts (If you set value to 6 here, the account '706' will appear as '706000' on screen)
@@ -61,10 +62,8 @@ ACCOUNTING_SERVICE_BUY_ACCOUNT=Default services purchase account (used if not de
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default services sales account (used if not defined in the service sheet)
 LabelAccount=Account name
 LabelOperation=Account operation
-Sens=Meaning
 NumPiece=Item number
 AccountingCategory=Personalised groups
-GroupByAccountAccounting=Group by finance account
 AccountingAccountGroupsDesc=Here you can define some groups of financial accounts. They will be used for personalised accounting reports.
 ByPersonalizedAccountGroups=By personalised groups
 FeeAccountNotDefined=Account for fees not defined
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index 11a52c3a368..6d8b2831bb3 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -42,9 +42,11 @@ 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
+Module59000Desc=Module to follow margins
 DictionaryAccountancyJournal=Finance journals
 CompanyZip=Postcode
 LDAPFieldZip=Postcode
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 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
 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.
diff --git a/htdocs/langs/en_GB/mrp.lang b/htdocs/langs/en_GB/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/en_GB/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/en_GB/products.lang b/htdocs/langs/en_GB/products.lang
index 844ae30d7c1..757f0c2e880 100644
--- a/htdocs/langs/en_GB/products.lang
+++ b/htdocs/langs/en_GB/products.lang
@@ -1,3 +1,3 @@
 # Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
+AssociatedProductsAbility=Enable Kits (set of several products)
 PrintsheetForOneBarCode=Print several labels for one barcode
diff --git a/htdocs/langs/en_GB/sendings.lang b/htdocs/langs/en_GB/sendings.lang
index ed103dc3a4b..61058b10825 100644
--- a/htdocs/langs/en_GB/sendings.lang
+++ b/htdocs/langs/en_GB/sendings.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - sendings
 StatusSendingCanceled=Cancelled
+StatusSendingCanceledShort=Cancelled
diff --git a/htdocs/langs/en_GB/withdrawals.lang b/htdocs/langs/en_GB/withdrawals.lang
index b1d58194878..3ec4f7ab0ec 100644
--- a/htdocs/langs/en_GB/withdrawals.lang
+++ b/htdocs/langs/en_GB/withdrawals.lang
@@ -13,4 +13,5 @@ WithdrawalFileNotCapable=Unable to generate Payment receipt file for your countr
 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.
+ICS=Creditor Identifier CI for direct debit
 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
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/en_IN/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
index 4b3c42b80b1..cf746fd99b8 100644
--- a/htdocs/langs/en_IN/admin.lang
+++ b/htdocs/langs/en_IN/admin.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - admin
 Module20Name=Quotations
 Module20Desc=Management of quotations
+Module59000Desc=Module to follow margins
 Permission21=Read quotations
 Permission22=Create/modify quotations
 Permission24=Validate quotations
@@ -13,6 +14,7 @@ ProposalsNumberingModules=Quotation numbering models
 ProposalsPDFModules=Quotation documents models
 FreeLegalTextOnProposal=Free text on quotations
 WatermarkOnDraftProposal=Watermark on draft quotations (none if empty)
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 MailToSendProposal=Customer quotations
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_IN/mrp.lang b/htdocs/langs/en_IN/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/en_IN/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/en_IN/products.lang b/htdocs/langs/en_IN/products.lang
index 6e900475275..2a38b9b0181 100644
--- a/htdocs/langs/en_IN/products.lang
+++ b/htdocs/langs/en_IN/products.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
+AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/en_IN/withdrawals.lang b/htdocs/langs/en_IN/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/en_IN/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/en_SG/accountancy.lang b/htdocs/langs/en_SG/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/en_SG/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/en_SG/admin.lang b/htdocs/langs/en_SG/admin.lang
index c1d306ec390..b68a0680537 100644
--- a/htdocs/langs/en_SG/admin.lang
+++ b/htdocs/langs/en_SG/admin.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
+Module59000Desc=Module to follow margins
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/en_SG/compta.lang b/htdocs/langs/en_SG/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/en_SG/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/en_SG/mrp.lang b/htdocs/langs/en_SG/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/en_SG/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/en_SG/products.lang b/htdocs/langs/en_SG/products.lang
index 6e900475275..2a38b9b0181 100644
--- a/htdocs/langs/en_SG/products.lang
+++ b/htdocs/langs/en_SG/products.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
+AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/en_SG/withdrawals.lang b/htdocs/langs/en_SG/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/en_SG/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 33ba4d9fea7..9e084932477 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -16,6 +16,8 @@ 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)
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index bd83272a3e7..35ba0390ad5 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -349,7 +349,7 @@ UpdateServerOffline=Update server offline
 WithCounter=Manage a counter
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
 GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
+GenericMaskCodes3=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>
@@ -444,8 +444,8 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+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
@@ -541,6 +541,8 @@ 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
@@ -639,6 +641,8 @@ 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
@@ -670,7 +674,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -805,7 +809,8 @@ 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 (not only third parties for which that 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=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
@@ -1308,7 +1313,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1598,8 +1603,13 @@ 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
+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 the language of the third party
+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
@@ -1874,7 +1884,7 @@ 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 line. Enter any value of your choice, but without special characters.
+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
@@ -2089,4 +2099,6 @@ ModuleActivatedDoNotUseInProduction=A module designed for the development has be
 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
\ No newline at end of file
+AskThisIDToYourBank=Contact your bank to get this ID
+AdvancedModeOnly=Permision available in Advanced permission mode only
+ConfFileIsReadableOrWritableByAnyUsers=The conf file is reabable or writable by any users. Give permission to web server user and group only.
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 8971e80a8f8..33e0c01aad6 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -119,6 +119,7 @@ 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
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index a0dc27f86c4..f0f5dfd0a8e 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -180,3 +180,5 @@ BankColorizeMovementDesc=If this function is enable, you can choose specific bac
 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.
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 76ea80b53c8..45246dcc412 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -494,12 +494,14 @@ 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
 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.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
@@ -562,7 +564,8 @@ ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated au
 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 order)
-BillCreated=%s bill(s) created
+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
diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang
index 0bba5605d0f..44cb183050a 100644
--- a/htdocs/langs/en_US/blockedlog.lang
+++ b/htdocs/langs/en_US/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
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index b8ba5073d03..7c656426e5f 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -1,4 +1,5 @@
 # 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
@@ -95,8 +96,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 1afeb6e3727..23e6cf0d724 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -65,6 +65,7 @@ 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
@@ -85,6 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
 PaymentSupplierInvoice=vendor invoice payment
 PaymentSocialContribution=Social/fiscal tax payment
 PaymentVat=VAT payment
+AutomaticCreationPayment=Automatically create a total payment
 ListPayment=List of payments
 ListOfCustomerPayments=List of customer payments
 ListOfSupplierPayments=List of vendor payments
@@ -104,6 +106,8 @@ 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
@@ -134,9 +138,13 @@ NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception date
 NbOfCheques=No. of checks
 PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
+PayVAT=Pay a VAT declaration
+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 ?
 DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+DeleteVAT=Delete a VAT declaration
+ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
+ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
 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>.
@@ -235,6 +243,7 @@ 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
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Simple report
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -253,7 +262,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 during this 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
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 5634905da6e..545fcdb62fb 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -59,6 +59,7 @@ ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or a
 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.
@@ -226,6 +227,7 @@ ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were
 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.
 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.
@@ -255,6 +257,7 @@ 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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 7fd93be7b71..2d02c5ddcf9 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -175,3 +175,5 @@ 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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index e196120c27d..a5cd750e3d6 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -224,6 +224,7 @@ Value=Value
 PersonalValue=Personal value
 NewObject=New %s
 NewValue=New value
+OldValue=Old value %s
 CurrentValue=Current value
 Code=Code
 Type=Type
@@ -655,6 +656,7 @@ 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
@@ -1113,7 +1115,9 @@ OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
 OnHold=On hold
+Civility=Civility
 AffectTag=Affect Tag
 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
diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index 902f167d819..5ca0dbc6981 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -8,11 +8,11 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
 Bom=Bills of Material
-BillOfMaterials=Bill of Material
+BillOfMaterials=Bill of Materials
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
+NewBOM=New bill of materials
 ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
@@ -22,7 +22,7 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+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
@@ -30,8 +30,8 @@ ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the produc
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Materials?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
@@ -77,4 +77,26 @@ 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
\ No newline at end of file
+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=Supprimer
+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
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 0a7b3723ab1..7a895bb1ca5 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -215,6 +216,7 @@ 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...
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index f0c4a5362b8..9ecc11ed93d 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -108,7 +108,7 @@ 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 other products)
+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
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 2aedbd53377..279bf99d162 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -267,4 +267,5 @@ NewInvoice=New invoice
 OneLinePerTask=One line per task
 OneLinePerPeriod=One line per period
 RefTaskParent=Ref. Parent Task
-ProfitIsCalculatedWith=Profit is calculated using
\ No newline at end of file
+ProfitIsCalculatedWith=Profit is calculated using
+AddPersonToTask=Add also to tasks
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 1b54e53d6de..ad4946ee9f9 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index debfeaa9d27..7d5b57f7da9 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -26,7 +26,7 @@ NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw statu
 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 
+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
@@ -45,6 +45,7 @@ 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
@@ -148,4 +149,5 @@ 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 
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang
index 646b97ec31d..15fd8ef07c2 100644
--- a/htdocs/langs/en_US/workflow.lang
+++ b/htdocs/langs/en_US/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed 
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
\ No newline at end of file
diff --git a/htdocs/langs/es_AR/accountancy.lang b/htdocs/langs/es_AR/accountancy.lang
index 96c58aaf400..ab876d97846 100644
--- a/htdocs/langs/es_AR/accountancy.lang
+++ b/htdocs/langs/es_AR/accountancy.lang
@@ -16,3 +16,4 @@ Journals=Diarios Contables
 JournalFinancial=Diarios Financieros
 AssignDedicatedAccountingAccount=Nueva cuenta para asignar
 InvoiceLabel=Etiqueta de la factura
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index 6b938db0388..38c1f9272dd 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -61,7 +61,6 @@ AllowToSelectProjectFromOtherCompany=En el documento de un tercero, puede elegir
 JavascriptDisabled=JavaScript desactivado
 UsePreviewTabs=Usar pestañas de vista previa
 ShowPreview=Mostrar vista previa
-CurrentTimeZone=TimeZone PHP (servidor)
 MySQLTimeZone=TimeZone MySql (base de datos)
 TZHasNoEffect=Las fechas son almacenadas y devueltas por el servidor de base de datos como si se mantuvieran como una cadena enviada. La zona horaria solo tiene efecto cuando se usa la función UNIX_TIMESTAMP (que Dolibarr no debe usar, por lo que la base de datos TZ no debería tener ningún efecto, incluso si se cambia después de ingresar los datos).
 Space=Espacio
@@ -112,8 +111,6 @@ 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=Elimine los archivos de registro, incluido el <b> %s </b> definido para el módulo Syslog (sin riesgo de perder datos)
-PurgeDeleteTemporaryFiles=Eliminar todos los archivos temporales (no hay risgo de perder información), Nota: La eliminación se realizará sólo si la carpeta temporal sólo fue creada hace 24 horas.
-PurgeDeleteTemporaryFilesShort=Borrar archivos temporales
 PurgeDeleteAllFilesInDocumentsDir=Elimine 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 la base de datos y archivos temporales. archivos.
 PurgeRunNow=Purga ahora
 PurgeNothingToDelete=No hay directorio o archivos para eliminar.
@@ -254,7 +251,6 @@ LastActivationIP=IP de última activación
 UpdateServerOffline=Actualizar servidor fuera de línea
 WithCounter=Administrar un contador
 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.
-ExampleOfDirectoriesForModelGen=Ejemplo de  sintaxis:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 String=Cuerda
 Module30Name=Facturas
 Module40Desc=Gestión de proveedores y compras (órdenes de compra y facturas de proveedores)
@@ -264,6 +260,7 @@ Module80Name=Envíos
 Module80Desc=Gestión de envíos y remitos
 Module510Name=Sueldos
 Module4000Name=ARH
+Module59000Desc=Module to follow margins
 Module62000Name=Incotérminos
 Permission23001=Leer tarea programada
 Permission23002=Crear/actualizar tarea programada
@@ -527,7 +524,7 @@ LDAPContactObjectClassListExample=Lista de atributos de registro que definen obj
 LDAPFieldZip=Cremallera
 LDAPFieldCompany=Compañía
 ViewProductDescInFormAbility=Mostrar descripción de productos en formularios (de otro forma es mostrado en una venta emergente tooltip popup)
-ViewProductDescInThirdpartyLanguageAbility=Mostrar descripciones de productos en el lenguaje del tercero
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 Target=Destino
 Sell=Vender
 PositionIntoComboList=Posición de la línea en las listas de combo
diff --git a/htdocs/langs/es_AR/blockedlog.lang b/htdocs/langs/es_AR/blockedlog.lang
index 5b0a4d9d1b5..080e82c85c5 100644
--- a/htdocs/langs/es_AR/blockedlog.lang
+++ b/htdocs/langs/es_AR/blockedlog.lang
@@ -24,7 +24,6 @@ logBILL_SENTBYMAIL=Factura de cliente enviada por corre
 logBILL_DELETE=Borrado lógico de una factura de cliente
 logDON_DELETE=Borrado lógico de una donación
 logMEMBER_SUBSCRIPTION_DELETE=Borrado lógico de una suscripción de miembro
-logCASHCONTROL_VALIDATE=Registro de flujo de efectivo
 ListOfTrackedEvents=Lista de eventos rastreados
 logDOC_DOWNLOAD=Descarga de un documento validado para imprimir o enviar
 DataOfArchivedEvent=Datos completos del evento archivado
diff --git a/htdocs/langs/es_AR/boxes.lang b/htdocs/langs/es_AR/boxes.lang
index a76803696e3..398b7e343ee 100644
--- a/htdocs/langs/es_AR/boxes.lang
+++ b/htdocs/langs/es_AR/boxes.lang
@@ -62,7 +62,6 @@ ForCustomersOrders=Órdenes de Clientes
 LastXMonthRolling=Los últimos %s meses consecutivo s
 ChooseBoxToAdd=Agregar widget a su dashboard
 BoxAdded=El widget fue agregado a su tablero
-BoxLastManualEntries=Últimas entradas contables
 NoRecordedManualEntries=No hay registros contables manuales
 BoxSuspenseAccount=Operación de cuenta contable con cuenta temporal
 BoxTitleSuspenseAccount=Número de líneas no sin asignar
diff --git a/htdocs/langs/es_AR/companies.lang b/htdocs/langs/es_AR/companies.lang
index 5e7e576b77f..3dd71f9bcdc 100644
--- a/htdocs/langs/es_AR/companies.lang
+++ b/htdocs/langs/es_AR/companies.lang
@@ -209,7 +209,6 @@ VATIntraCheckableOnEUSite=Consulte el ID de IVA intracomunitario en el sitio web
 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
-JuridicalStatus=Tipo de entidad legal
 ProspectLevel=Cliente potencia
 OthersNotLinkedToThirdParty=Otros, no vinculados a un tercero
 ProspectStatus=Estado del cliente potencial
diff --git a/htdocs/langs/es_AR/cron.lang b/htdocs/langs/es_AR/cron.lang
index f3f72b8cb2f..e9709b188f5 100644
--- a/htdocs/langs/es_AR/cron.lang
+++ b/htdocs/langs/es_AR/cron.lang
@@ -4,8 +4,6 @@ Permission23102 =Crear/actualizar tarea programada
 Permission23103 =Eliminar tarea programada
 Permission23104 =Ejecutar tarea programada
 CronSetup=Configuración para administración de tareas programadas
-URLToLaunchCronJobs=URL para verificar y ejecutar tareas programadas calificadas
-OrToLaunchASpecificJob=O para verificar y ejecutar una tarea específica
 KeyForCronAccess=Clave de seguridad para la URL para ejecutar tareas programadas
 FileToLaunchCronJobs=Línea de comandos para verificar y ejecutar tareas programadas calificadas
 CronExplainHowToRunUnix=O el ambiente de Unix que deberías utilizar para una entrada programada para ejecutar el comando cada 5 minutos
@@ -37,7 +35,6 @@ CronNote=Comentar
 CronFieldMandatory=Los campos %s son obligatorios
 CronErrEndDateStartDt=La fecha de finalización no puede ser anterior a la fecha de inicio
 StatusAtInstall=Estado de la instalación del módulo
-CronStatusActiveBtn=Habilitar
 CronStatusInactiveBtn=Deshabilitar
 CronTaskInactive=Esta tarea está deshabilitada
 CronClassFile=Nombre de archivo y clase
diff --git a/htdocs/langs/es_AR/mails.lang b/htdocs/langs/es_AR/mails.lang
index 02b4225c64c..13fbbbe92c7 100644
--- a/htdocs/langs/es_AR/mails.lang
+++ b/htdocs/langs/es_AR/mails.lang
@@ -99,12 +99,6 @@ TagSignature=Firma del emisor
 EMailRecipient=Correo del destinatario
 TagMailtoEmail=Correo del destinatario (incluyendo el enlace htm "mailto:")
 NoEmailSentBadSenderOrRecipientEmail=No se han enviado correos. El correo del emisor o destinatario están incorrectos. Verifique el perfil del usuario.
-NoNotificationsWillBeSent=No se han planificado notificaciones por correo para este evento y compañía
-ANotificationsWillBeSent=1 notificación werá enviada por correo
-SomeNotificationsWillBeSent=%s notificaciones serán enviadas por correo
-AddNewNotification=Activar una nueva notificación por mail para ese objetivo/evento
-ListOfActiveNotifications=Listar todos los objetivos/eventos activos para la notificación por correo
-ListOfNotificationsDone=Listar todas las notificaciones enviadas por correo
 MailSendSetupIs=La configuración de envío de correo ha sido establecida a '%s'. Este modo no puede ser utilizado para envío masivo de correos.
 MailSendSetupIs2=Debes dirigirte primero, utilizando una cuenta de administrador, al menú %s Inicio - Configuración - Correos%s para cambiar el parámetro <strong>'%s'</strong> para utilizar el modo '%s'. Con este modo, podrás entrar en la configuración del servidor SMTP provisto por tu proveedor de internet y utilizar la funcionalidad de envío masivo de correos.
 MailSendSetupIs3=Si tienes alguna consulta acerca de cómo configurar tu servidor SMTP, puedes preguntarle a %s.
@@ -113,7 +107,6 @@ NbOfTargetedContacts=Cantidad de contactos de correo objetivo
 UseFormatFileEmailToTarget=El archivo importado debe tener el formato <strong>correo;nombre;primer nombre;otro</strong>
 UseFormatInputEmailToTarget=Ingrese una cadena con el formato <strong>correo;nombre;primer nombre;otro</strong>
 AdvTgtTitle=Complete los campos para agregar los terceros o contactos/direcciones de correo al objetivo
-AdvTgtSearchTextHelp=Utilice %% como comodines. Por ejemplo para encontrar todos los item como <b>jean, joe, jim</b>, puedes ingresar <b>j%%</b>, también puedes usar ; como separador de valores, y usar ! para exceptuarlo. Por ejemplo  <b>jean;joe;jim%%;!jimo;!jima%</b> para ubicar a todos los jean, joe, comenzando con jim pero no jimo ni nada que comience con jima
 AdvTgtSearchIntHelp=Utilice el intervalo para seleccionar entero o valor decimal
 AdvTgtMaxVal=Valor máximo
 AdvTgtSearchDtHelp=Utilice intervalos para seleccionar el valor de fecha
@@ -128,7 +121,4 @@ AdvTgtAddContact=Agregar correos acorde al criterio
 AdvTgtOrCreateNewFilter=Nombre del filtro nuevo
 NoContactWithCategoryFound=No se encontraron contactos/direcciones con la categoría buscada
 NoContactLinkedToThirdpartieWithCategoryFound=No se encontraron contactos/direcciones con la categoría buscada
-OutGoingEmailSetup=Configuración de correo saliente
-InGoingEmailSetup=Configuración de correo entrante
-DefaultOutgoingEmailSetup=Configuración de correo saliente por defecto
 ContactsWithThirdpartyFilter=Contactos con filtro de terceros
diff --git a/htdocs/langs/es_AR/mrp.lang b/htdocs/langs/es_AR/mrp.lang
index 0fcf28a866f..5c5780af355 100644
--- a/htdocs/langs/es_AR/mrp.lang
+++ b/htdocs/langs/es_AR/mrp.lang
@@ -13,4 +13,7 @@ BOMsSetup=Configuración de módulo de BOM
 ListOfBOMs=Lista de Listas de materiales - BOM
 ListOfManufacturingOrders=Lista de Ordenes de Fabricación
 NewBOM=Nueva Lista de materiales
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
 MenuMRP=Ordenes de Fabricación
diff --git a/htdocs/langs/es_AR/products.lang b/htdocs/langs/es_AR/products.lang
index 1b8705686ca..32aef2d5d67 100644
--- a/htdocs/langs/es_AR/products.lang
+++ b/htdocs/langs/es_AR/products.lang
@@ -63,6 +63,7 @@ PriceRemoved=Precio removido
 SetDefaultBarcodeType=Definir tipo de código de barras
 NoteNotVisibleOnBill=Nota (No visible en facturas, presupuestos...)
 ServiceLimitedDuration=Si un producto es un servicio con duración limitada:
+AssociatedProductsAbility=Enable Kits (set of several products)
 KeywordFilter=Filtro por Palabra Clave
 CategoryFilter=Filtro por Categoría
 ExportDataset_produit_1=Productos
@@ -73,4 +74,3 @@ PriceQtyMin=Precio para cantidad mín.
 PriceQtyMinCurrency=Precio (moneda) para esta cant. (sin descuento)
 PredefinedProductsToSell=Producto Predefinido
 SuppliersPrices=Precio de Proveedor
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_AR/sendings.lang b/htdocs/langs/es_AR/sendings.lang
index 0fab9dbcf71..d573200cc64 100644
--- a/htdocs/langs/es_AR/sendings.lang
+++ b/htdocs/langs/es_AR/sendings.lang
@@ -1,48 +1,41 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=Ref. viaje
-Sending=Viaje
-Sendings=Viajes
-AllSendings=Todos los viajes
-Shipment=Viaje
-Shipments=Viajes
-ShowSending=Mostrar viajes
+AllSendings=Todos los Envíos
+ShowSending=Mostrar Envíos
 Receivings=Comprobantes de entrega
 SendingsArea=Área de envíos
-ListOfSendings=Lista de viajes
-LastSendings=Últimos %s viajes
-NbOfSendings=Cantidad de viajes
-NumberOfShipmentsByMonth=Cantidad de viajes por mes
-SendingCard=Ficha del viaje
-NewSending=Nuevo viaje
-CreateShipment=Crear viaje
+ListOfSendings=Lista de envíos
+NbOfSendings=Cantidad de envíos
+NumberOfShipmentsByMonth=Cantidad de envíos por mes
+SendingCard=Ficha del envío
 QtyShipped=Cantidad enviada
 QtyShippedShort=Cantidad enviada
 QtyPreparedOrShipped=Cantidad preparada o enviada
 QtyToShip=Cantidad para enviar
 QtyToReceive=Cantidad para recibir
 QtyReceived=Cantidad recibida
-QtyInOtherShipments=Cantidad en otros viajes
+QtyInOtherShipments=Cantidad en otros envíos
 KeepToShip=Pendiente de enviar
-OtherSendingsForSameOrder=Otros viajes para esta orden
+OtherSendingsForSameOrder=Otros envíos para este pedido
 SendingsAndReceivingForSameOrder=Viajes y recepciones de esta orden
-SendingsToValidate=Viajes para validar
+SendingsToValidate=Envíos para validar
 StatusSendingCanceled=Cancelado
+StatusSendingCanceledShort=Cancelada
 StatusSendingValidated=Validado (productos para enviar o ya enviados)
-SendingSheet=Hoja de viaje
-ConfirmDeleteSending=¿Estás seguro que quieres eliminar este viaje?
-ConfirmValidateSending=¿Estás seguro que quieres validar este viaje con referencia <b>%s</b>?
-ConfirmCancelSending=¿Estás seguro que quieres cancelar este viaje?
+SendingSheet=Remito
+ConfirmDeleteSending=¿Estás seguro que quieres eliminar este envío?
+ConfirmValidateSending=¿Estás seguro que quiere validar este envío con referencia <b>%s</b>?
+ConfirmCancelSending=¿Estás seguro que quieres cancelar este envío?
 WarningNoQtyLeftToSend=Advertencia, no hay productos esperando para ser enviados.
 StatsOnShipmentsOnlyValidated=Estadísticas realizadas sólo sobre viajes validados. La fecha utilizada es la de validación del viaje (la fecha de entrega prevista no siempre se conoce).
 RefDeliveryReceipt=Ref. comprobante de entrega
 StatusReceipt=Estado del comprobante de entrega
 DateReceived=Fecha de entrega
-SendShippingByEMail=Enviar detalles del viaje por correo
+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=Por el momento, la creación de un nuevo viaje se realiza desde la ficha de la orden.
-ShipmentLine=Línea del viaje
+ShipmentLine=Línea del envío
 ProductQtyInCustomersOrdersRunning=Cantidad de productos de órdenes de venta abiertas
 ProductQtyInSuppliersOrdersRunning=Cantidad de productos de órdenes de compra abiertas
 ProductQtyInShipmentAlreadySent=Cantidad de productos enviados de órdenes de venta abiertas
diff --git a/htdocs/langs/es_AR/ticket.lang b/htdocs/langs/es_AR/ticket.lang
index 20fc88f15a7..c608fa6569c 100644
--- a/htdocs/langs/es_AR/ticket.lang
+++ b/htdocs/langs/es_AR/ticket.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - ticket
 TicketTypeShortPROJET=Projecto
-NotRead=Sin leer
 Read=Leído
 Waiting=Esperando
 Type=Tipo
diff --git a/htdocs/langs/es_AR/withdrawals.lang b/htdocs/langs/es_AR/withdrawals.lang
index 7c806c8b5f3..5e623914282 100644
--- a/htdocs/langs/es_AR/withdrawals.lang
+++ b/htdocs/langs/es_AR/withdrawals.lang
@@ -76,7 +76,7 @@ PleaseCheckOne=Por favor marque uno sólo
 DirectDebitOrderCreated=Orden de débito automático %s creada
 AmountRequested=Monto solicitada
 CreateForSepa=Crear archivo de débito automático
-ICS=Identificador CI de acreedor
+ICS=Creditor Identifier CI for direct debit
 END_TO_END=Etiqueta "EndToEndId" SEPA XML: identificación única asignada por transacción
 USTRD=Etiqueta "Unstructured" SEPA XML
 ADDDAYS=Agregar días a la fecha de ejecución
diff --git a/htdocs/langs/es_BO/accountancy.lang b/htdocs/langs/es_BO/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/es_BO/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_BO/admin.lang b/htdocs/langs/es_BO/admin.lang
index c1d306ec390..b68a0680537 100644
--- a/htdocs/langs/es_BO/admin.lang
+++ b/htdocs/langs/es_BO/admin.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
+Module59000Desc=Module to follow margins
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_BO/compta.lang b/htdocs/langs/es_BO/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/es_BO/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_BO/mrp.lang b/htdocs/langs/es_BO/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/es_BO/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_BO/products.lang b/htdocs/langs/es_BO/products.lang
index 6e900475275..2a38b9b0181 100644
--- a/htdocs/langs/es_BO/products.lang
+++ b/htdocs/langs/es_BO/products.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
+AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/es_BO/withdrawals.lang b/htdocs/langs/es_BO/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/es_BO/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_CL/accountancy.lang b/htdocs/langs/es_CL/accountancy.lang
index 764defc64a4..cdb95b2da16 100644
--- a/htdocs/langs/es_CL/accountancy.lang
+++ b/htdocs/langs/es_CL/accountancy.lang
@@ -92,7 +92,7 @@ VentilatedinAccount=Vinculado exitosamente a la cuenta de contabilidad
 NotVentilatedinAccount=No vinculado a la cuenta de contabilidad
 XLineSuccessfullyBinded=%s productos / servicios vinculados con éxito a una cuenta de contabilidad
 XLineFailedToBeBinded=%s productos / servicios no estaban vinculados a ninguna cuenta de contabilidad
-ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a enlazar mostrados por página (máximo recomendado: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comience la clasificación de la página "Encuadernación para hacer" por los elementos más recientes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comience la clasificación de la página "Encuadernación realizada" por los elementos más recientes
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar descripción de productos y servicios en listados después de x caracteres (Mejor = 50)
@@ -122,7 +122,6 @@ ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Cuenta contable por defecto para los servi
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Cuenta contable por defecto para los servicios vendidos y exportados fuera de la EEC (usado si no está definido en la hoja de servicios)
 LabelAccount=Cuenta
 LabelOperation=Operación de etiqueta
-Sens=Significado
 LetteringCode=Codigo de letras
 JournalLabel=Etiqueta de revista
 NumPiece=Pieza número
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 71fb8fe9887..4c3bf933e4f 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -60,7 +60,6 @@ AllowToSelectProjectFromOtherCompany=En el documento de un tercero, puede elegir
 JavascriptDisabled=JavaScript deshabilitado
 UsePreviewTabs=Usa pestañas de vista previa
 ShowPreview=Mostrar vista previa
-CurrentTimeZone=TimeZone PHP (servidor)
 MySQLTimeZone=TimeZone MySql (base de datos)
 TZHasNoEffect=Las fechas son almacenadas y devueltas por el servidor de bases de datos como si se mantuvieran como una cadena enviada. La zona horaria tiene efecto solo cuando se usa la función UNIX_TIMESTAMP (que no debe ser utilizada por Dolibarr, por lo que la base de datos TZ no debería tener ningún efecto, incluso si se cambia después de ingresar los datos).
 Space=Espacio
@@ -290,7 +289,6 @@ UrlGenerationParameters=Parámetros para asegurar URLs
 SecurityTokenIsUnique=Use un parámetro de clave segura único para cada URL
 EnterRefToBuildUrl=Ingrese la referencia para el objeto %s
 GetSecuredUrl=Obtener URL calculado
-ButtonHideUnauthorized=Ocultar botones para usuarios no administradores para acciones no autorizadas en lugar de mostrar botones deshabilitados en gris
 OldVATRates=Tasa de IVA anterior
 NewVATRates=Nueva tasa de IVA
 PriceBaseTypeToChange=Modificar en precios con el valor de referencia base definido en
@@ -457,7 +455,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 encuestas en línea, encuestas o votos (como Doodle, Studs, RDVz, etc.)
-Module59000Desc=Módulo para administrar márgenes
+Module59000Desc=Module to follow margins
 Module60000Desc=Módulo para gestionar comisiones
 Module62000Desc=Añadir características para gestionar Incoterms.
 Module63000Desc=Gestionar recursos (impresoras, coches, salas, ...) para asignar a eventos.
@@ -885,7 +883,6 @@ ConditionIsCurrently=La condición es actualmente %s
 YouUseBestDriver=Utiliza el controlador %s, que es el mejor controlador disponible en la actualidad.
 YouDoNotUseBestDriver=Utiliza el controlador %s, pero se recomienda el controlador %s.
 SearchOptim=Optimización de búsqueda
-YouHaveXObjectUseSearchOptim=Tiene %s %s en la base de datos. Debe agregar la constante %s a 1 en Home-Setup-Other. Limite la búsqueda al comienzo de las cadenas, lo que hace posible que la base de datos use índices y debería obtener una respuesta inmediata.
 YouHaveXObjectAndSearchOptimOn=Tiene %s %s en la base de datos y la constante %s se establece en 1 en Home-Setup-Other.
 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.
@@ -1088,7 +1085,7 @@ 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=Mostrar descripciones de productos en formularios (de lo contrario, se muestra en una ventana emergente de información sobre herramientas)
 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
-ViewProductDescInThirdpartyLanguageAbility=Mostrar descripciones de los productos en el idioma del tercero.
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 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)
 SetDefaultBarcodeTypeProducts=Tipo de código de barras predeterminado para usar en productos
@@ -1153,7 +1150,6 @@ MenuDeleted=Menú borrado
 NotTopTreeMenuPersonalized=Menús personalizados no vinculados a una entrada del menú superior
 MenuHandler=Controlador de menú
 MenuModule=Módulo fuente
-HideUnauthorizedMenu=Ocultar menús no autorizados (gris)
 DetailId=Menú Id
 DetailMenuHandler=Manejador de menú donde mostrar el nuevo menú
 DetailMenuModule=Nombre del módulo si la entrada del menú proviene de un módulo
@@ -1365,8 +1361,6 @@ EMailHost=Host del servidor de correo electrónico IMAP
 EmailcollectorOperations=Operaciones a realizar por coleccionista.
 MaxEmailCollectPerCollect=Número máximo de correos electrónicos recogidos por cobro
 ConfirmCloneEmailCollector=¿Está seguro de que desea clonar el recopilador de correo electrónico %s?
-DateLastCollectResult=Fecha de última recopilación probada
-DateLastcollectResultOk=Fecha última recogida exitosa
 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
diff --git a/htdocs/langs/es_CL/banks.lang b/htdocs/langs/es_CL/banks.lang
index 851975f9121..5c4a24c2f6d 100644
--- a/htdocs/langs/es_CL/banks.lang
+++ b/htdocs/langs/es_CL/banks.lang
@@ -125,6 +125,4 @@ SEPAMandate=Mandato de la SEPA
 YourSEPAMandate=Su mandato de SEPA
 FindYourSEPAMandate=Este es su mandato de SEPA para autorizar a nuestra empresa a realizar un pedido de débito directo a su banco. Devuélvalo firmado (escaneo del documento firmado) o envíelo por correo a
 AutoReportLastAccountStatement=Rellene automáticamente el campo &#39;número de extracto bancario&#39; con el último número de extracto al realizar la conciliación
-CashControl=Cerca de efectivo POS
-NewCashFence=Nueva valla de efectivo
 BankColorizeMovementDesc=Si esta función está habilitada, puede elegir un color de fondo específico para los movimientos de débito o crédito
diff --git a/htdocs/langs/es_CL/blockedlog.lang b/htdocs/langs/es_CL/blockedlog.lang
index 49d3348ac1a..c97c5e815d6 100644
--- a/htdocs/langs/es_CL/blockedlog.lang
+++ b/htdocs/langs/es_CL/blockedlog.lang
@@ -10,7 +10,6 @@ logBILL_UNPAYED=Factura del cliente fijada sin pagar
 logBILL_VALIDATE=Factura del cliente validada
 logBILL_SENTBYMAIL=Factura del cliente enviar por correo
 logMEMBER_SUBSCRIPTION_DELETE=Suscripción de miembros de eliminación lógica
-logCASHCONTROL_VALIDATE=Grabación de la cerca de efectivo
 ListOfTrackedEvents=Lista de eventos rastreados
 logDOC_PREVIEW=Vista previa de un documento validado para imprimir o descargar.
 ImpossibleToReloadObject=Objeto original (escriba %s, id %s) no vinculado (consulte la columna &#39;Datos completos&#39; para obtener datos guardados inalterables)
diff --git a/htdocs/langs/es_CL/boxes.lang b/htdocs/langs/es_CL/boxes.lang
index e8b72e33d75..f59f9eb19a8 100644
--- a/htdocs/langs/es_CL/boxes.lang
+++ b/htdocs/langs/es_CL/boxes.lang
@@ -31,6 +31,7 @@ BoxTitleLatestModifiedBoms=Ultimas %s Listas de Materiales modificadas
 BoxTitleLatestModifiedMos=Últimas %s Ordenes de Fabricación modificadas
 BoxGlobalActivity=Actividad global (facturas, propuestas, pedidos)
 BoxTitleGoodCustomers=%s Buenos clientes
+BoxScheduledJobs=Trabajos programados
 FailedToRefreshDataInfoNotUpToDate=Error al actualizar el flujo de RSS. Última fecha de actualización correcta: %s
 LastRefreshDate=Última fecha de actualización
 NoRecordedBookmarks=No hay marcadores definidos
diff --git a/htdocs/langs/es_CL/cashdesk.lang b/htdocs/langs/es_CL/cashdesk.lang
index 2d9ac0386f3..c81210b6a0b 100644
--- a/htdocs/langs/es_CL/cashdesk.lang
+++ b/htdocs/langs/es_CL/cashdesk.lang
@@ -30,7 +30,6 @@ Header=Encabezamiento
 Footer=Pie de página
 TheoricalAmount=Cantidad teórica
 RealAmount=Cantidad real
-CashFenceDone=Cerca de efectivo hecha para el período.
 NbOfInvoices=N° de facturas
 OrderNotes=pedidos
 CashDeskBankAccountFor=Cuenta predeterminada para usar para pagos en
diff --git a/htdocs/langs/es_CL/categories.lang b/htdocs/langs/es_CL/categories.lang
index e6f54ab9caa..8a54c49822d 100644
--- a/htdocs/langs/es_CL/categories.lang
+++ b/htdocs/langs/es_CL/categories.lang
@@ -58,15 +58,10 @@ ProjectsCategoriesShort=Etiquetas / categorías de proyectos
 UsersCategoriesShort=Etiquetas / categorías de usuarios
 StockCategoriesShort=Etiquetas / categorías de almacén
 CategId=ID de etiqueta / categoría
-CatSupList=Lista de etiquetas / categorías de proveedores
-CatCusList=Lista de etiquetas / categorías de clientes / prospectos
 CatProdList=Lista de etiquetas / categorías de productos
 CatMemberList=Lista de etiquetas / categorías de miembros
-CatContactList=Lista de etiquetas / categorías de contacto
-CatSupLinks=Enlaces entre proveedores y etiquetas / categorías
 CatCusLinks=Enlaces entre clientes / prospectos y etiquetas / categorías
 CatProdLinks=Enlaces entre productos / servicios y etiquetas / categorías
-CatProJectLinks=Enlaces entre proyectos y etiquetas / categorías
 ExtraFieldsCategories=Atributos complementarios
 CategoriesSetup=Configuración de etiquetas / categorías
 CategorieRecursiv=Enlace con la etiqueta / categoría principal automáticamente
diff --git a/htdocs/langs/es_CL/companies.lang b/htdocs/langs/es_CL/companies.lang
index a1b385f9d95..6b70cfe2d00 100644
--- a/htdocs/langs/es_CL/companies.lang
+++ b/htdocs/langs/es_CL/companies.lang
@@ -156,7 +156,6 @@ VATIntraCheckableOnEUSite=Compruebe la identificación del IVA intracomunitaria
 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
-JuridicalStatus=Tipo de entidad jurídica
 ProspectLevel=Potencial prospectivo
 OthersNotLinkedToThirdParty=Otros, no vinculados a un tercero
 ProspectStatus=Estado de la perspectiva
diff --git a/htdocs/langs/es_CL/compta.lang b/htdocs/langs/es_CL/compta.lang
index 4a4fb6fe85e..0f7a9f7764c 100644
--- a/htdocs/langs/es_CL/compta.lang
+++ b/htdocs/langs/es_CL/compta.lang
@@ -91,7 +91,6 @@ NewLocalTaxPayment=Nuevo impuesto %s pago
 Refund=Reembolso
 SocialContributionsPayments=Pagos de impuestos sociales/fiscales
 ShowVatPayment=Mostrar el pago del IVA
-BalanceVisibilityDependsOnSortAndFilters=El saldo es visible en esta lista solo si la tabla se ordena de forma ascendente en %s y se filtra para 1 cuenta bancaria
 CustomerAccountancyCode=Código de contabilidad del cliente
 SupplierAccountancyCode=Código contable del proveedor
 CustomerAccountancyCodeShort=Cust. cuenta. código
@@ -117,7 +116,6 @@ ConfirmDeleteSocialContribution=¿Estás seguro de que deseas eliminar este pago
 ExportDataset_tax_1=Impuestos y pagos sociales y fiscales
 CalcModeVATDebt=Modo <b>%sIVA sobre compromisos contables%s</b>.
 CalcModeVATEngagement=Modo <b>%s IVA en ingresos-gastos%s</b>.
-CalcModeDebt=Análisis de facturas registradas conocidas incluso si aún no se contabilizan en el libro mayor.
 CalcModeEngagement=Análisis de los pagos registrados conocidos, incluso si aún no se contabilizan en el Libro mayor.
 CalcModeBookkeeping=Análisis de los datos registrados en la tabla de Contabilidad.
 CalcModeLT1=Modo<b> %sRE en facturas de clientes - facturas de proveedores %s</b>
@@ -130,9 +128,6 @@ AnnualSummaryInputOutputMode=Balance de ingresos y gastos, resumen anual
 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>.
-SeeReportInInputOutputMode=Consulte %sanálisis de pagos%s para obtener un cálculo de los pagos efectuados, incluso si aún no se contabilizaron en el Libro mayor.
-SeeReportInDueDebtMode=Consulte %sanálisis de facturas %s para un cálculo basado en facturas registradas conocidas, incluso si aún no se contabilizaron en Libro mayor.
-SeeReportInBookkeepingMode=Consulte <b>%sInforme de facturación%s</b> para realizar un cálculo en <b>Tabla Libro mayor contable</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>
diff --git a/htdocs/langs/es_CL/cron.lang b/htdocs/langs/es_CL/cron.lang
index 2e5a82e0aca..cd31d44645c 100644
--- a/htdocs/langs/es_CL/cron.lang
+++ b/htdocs/langs/es_CL/cron.lang
@@ -4,8 +4,6 @@ Permission23102 =Crear / actualizar trabajo programado
 Permission23103 =Eliminar trabajo programado
 Permission23104 =Ejecutar trabajo programado
 CronSetup=Configuración programada de gestión de trabajos
-URLToLaunchCronJobs=URL para verificar e iniciar trabajos cron calificados
-OrToLaunchASpecificJob=O para verificar e iniciar un trabajo específico
 KeyForCronAccess=Clave de seguridad para URL para iniciar trabajos cron
 FileToLaunchCronJobs=Línea de comando para verificar e iniciar trabajos cron calificados
 CronExplainHowToRunUnix=En el entorno Unix, debe usar la siguiente entrada crontab para ejecutar la línea de comando cada 5 minutos
@@ -40,7 +38,6 @@ CronArgs=Parámetros
 CronSaveSucess=Guardado exitosamente
 CronFieldMandatory=Fields %s es obligatorio
 CronErrEndDateStartDt=La fecha de finalización no puede ser anterior a la fecha de inicio
-CronStatusActiveBtn=Habilitar
 CronStatusInactiveBtn=Inhabilitar
 CronTaskInactive=Este trabajo está deshabilitado
 CronId=Carné de identidad
diff --git a/htdocs/langs/es_CL/errors.lang b/htdocs/langs/es_CL/errors.lang
index f5567607900..5eb96141ab7 100644
--- a/htdocs/langs/es_CL/errors.lang
+++ b/htdocs/langs/es_CL/errors.lang
@@ -63,7 +63,6 @@ ErrorExportDuplicateProfil=Este nombre de perfil ya existe para este conjunto de
 ErrorLDAPSetupNotComplete=La coincidencia Dolibarr-LDAP no está completa.
 ErrorLDAPMakeManualTest=Se ha generado un archivo .ldif en el directorio %s. Intente cargarlo manualmente desde la línea de comando para tener más información sobre los errores.
 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.
-ErrorRefAlreadyExists=La referencia utilizada para la creación ya existe.
 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.
 ErrorRecordIsUsedCantDelete=No se puede borrar el registro. Ya está usado o incluido en otro objeto.
@@ -177,7 +176,6 @@ ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Solo se pueden enviar facturas va
 ErrorDiscountLargerThanRemainToPaySplitItBefore=El descuento que intentas aplicar es más grande que el que queda por pagar. Divida el descuento en 2 descuentos más pequeños antes.
 ErrorFileNotFoundWithSharedLink=Archivo no fue encontrado. Puede ser que la clave compartida se haya modificado o que el archivo se haya eliminado recientemente.
 ErrorProductBarCodeAlreadyExists=El código de barras del producto %s ya existe en otra referencia del producto.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Tenga en cuenta también que no es posible utilizar productos virtuales para aumentar / disminuir automáticamente subproductos cuando al menos un subproducto (o subproducto de subproductos) necesita un número de serie / lote.
 ErrorDescRequiredForFreeProductLines=La descripción es obligatoria para líneas con producto gratis
 ErrorAPageWithThisNameOrAliasAlreadyExists=La página / contenedor <strong>%s</strong> tiene el mismo nombre o alias alternativo que el que intenta utilizar
 ErrorDuringChartLoad=Error al cargar el cuadro de cuentas. Si algunas cuentas no se cargaron, aún puede ingresarlas manualmente.
diff --git a/htdocs/langs/es_CL/mails.lang b/htdocs/langs/es_CL/mails.lang
index 381e5510788..a65acf18f23 100644
--- a/htdocs/langs/es_CL/mails.lang
+++ b/htdocs/langs/es_CL/mails.lang
@@ -98,12 +98,6 @@ TagUnsubscribe=Darse de baja enlace
 EMailRecipient=Receptor de E-mail
 TagMailtoEmail=Correo electrónico del destinatario (incluido el enlace html &quot;mailto:&quot;)
 NoEmailSentBadSenderOrRecipientEmail=Sin correo electrónico enviado Correo electrónico malo del remitente o del destinatario. Verificar el perfil del usuario.
-NoNotificationsWillBeSent=No se planean notificaciones por correo electrónico para este evento y compañía
-ANotificationsWillBeSent=1 notificación será enviada por correo electrónico
-SomeNotificationsWillBeSent=%s notificaciones serán enviadas por correo electrónico
-AddNewNotification=Activar un nuevo objetivo / evento de notificación por correo electrónico
-ListOfActiveNotifications=Enumerar todos los objetivos / eventos activos para recibir notificaciones por correo electrónico
-ListOfNotificationsDone=Enumerar todas las notificaciones de correo electrónico enviadas
 MailSendSetupIs=La configuración del envío de correo electrónico se ha configurado en '%s'. Este modo no se puede usar para enviar correos masivos.
 MailSendSetupIs2=Primero debe ir, con una cuenta de administrador, al menú %sHome-Configuración - EMails%s para cambiar el parámetro <strong>'%s'</strong> para usar el modo '%s'. Con este modo, puede ingresar a la configuración del servidor SMTP proporcionado por su Proveedor de servicios de Internet y usar la función de envío masivo de correos electrónicos.
 MailSendSetupIs3=Si tiene alguna pregunta sobre cómo configurar su servidor SMTP, puede solicitarlo al %s.
@@ -112,7 +106,6 @@ NbOfTargetedContacts=Número actual de correos electrónicos de contacto dirigid
 UseFormatFileEmailToTarget=El archivo importado debe tener formato <strong> correo electrónico; nombre; nombre; otro </ strong>
 UseFormatInputEmailToTarget=Ingrese una cadena con formato <strong> correo electrónico; nombre; nombre; otro </ strong>
 AdvTgtTitle=Rellene los campos de entrada para preseleccionar los terceros o contactos / direcciones para orientar
-AdvTgtSearchTextHelp=Utilice %% como comodines. Por ejemplo, para encontrar todos los elementos como <b>jean, joe, jim</b> , puede ingresar <b>j%%</b> , también puede usar; como separador de valor, y uso! Para excepto este valor. Por ejemplo, <b>jean; joe; jim%%;! Jimo;! Jima%</b> apuntará a todos los jean, joe, comienza con jim pero no jimo y no todo lo que comienza con jima
 AdvTgtSearchIntHelp=Use intervalo para seleccionar el valor int o float
 AdvTgtMaxVal=Valor máximo
 AdvTgtSearchDtHelp=Usar intervalo para seleccionar el valor de la fecha
@@ -126,6 +119,3 @@ AdvTgtAddContact=Añadir emails según criterio
 AdvTgtLoadFilter=Filtro de carga
 NoContactWithCategoryFound=Sin contacto / dirección con una categoría encontrada
 NoContactLinkedToThirdpartieWithCategoryFound=Sin contacto / dirección con una categoría encontrada
-OutGoingEmailSetup=Configuración de correo electrónico saliente
-InGoingEmailSetup=Configuración de correo electrónico entrante
-DefaultOutgoingEmailSetup=Configuración predeterminada de correo electrónico saliente
diff --git a/htdocs/langs/es_CL/modulebuilder.lang b/htdocs/langs/es_CL/modulebuilder.lang
index b1a0f954a41..062d82e135d 100644
--- a/htdocs/langs/es_CL/modulebuilder.lang
+++ b/htdocs/langs/es_CL/modulebuilder.lang
@@ -88,7 +88,6 @@ UseSpecificEditorName =Usa un nombre de editor específico
 UseSpecificEditorURL =Usa un editor URL específico
 UseSpecificFamily =Usa una familia específica
 UseSpecificVersion =Usa una versión inicial específica
-ModuleMustBeEnabled=El módulo / aplicación debe ser habilitado primero
 IncludeDocGenerationHelp=Si marca esto, se generará algún código para agregar un cuadro "Generar documento" en el registro.
 ShowOnCombobox=Mostrar valor en el cuadro combinado
 KeyForTooltip=Clave para información sobre herramientas
diff --git a/htdocs/langs/es_CL/products.lang b/htdocs/langs/es_CL/products.lang
index 5619277c9d4..ddb4957ee49 100644
--- a/htdocs/langs/es_CL/products.lang
+++ b/htdocs/langs/es_CL/products.lang
@@ -61,6 +61,7 @@ NoteNotVisibleOnBill=Nota (no visible en las facturas, cotizaciones, etc.)
 ServiceLimitedDuration=Si el producto es un servicio de duración limitada:
 MultiPricesAbility=Múltiples segmentos de precios por producto / servicio (cada cliente está en un segmento de precios)
 MultiPricesNumPrices=Cantidad de precios
+AssociatedProductsAbility=Enable Kits (set of several products)
 ParentProductsNumber=Número de producto de embalaje principal
 ParentProducts=Productos para padres
 KeywordFilter=Filtro de palabras clave
@@ -99,7 +100,6 @@ NewRefForClone=Referencia de nuevo producto/servicio
 CustomerPrices=Precios de cliente
 SuppliersPrices=Precios del proveedor
 SuppliersPricesOfProductsOrServices=Precios de venta (de productos o servicios).
-CustomCode=Código de Aduanas / Productos / HS
 ProductCodeModel=Plantilla de referencia de producto
 ServiceCodeModel=Plantilla de referencia de servicio
 AlwaysUseNewPrice=Utilice siempre el precio actual del producto/servicio
@@ -107,7 +107,6 @@ AlwaysUseFixedPrice=Usa el precio fijo
 PriceByQuantity=Diferentes precios por cantidad
 DisablePriceByQty=Deshabilitar precios por cantidad
 PriceByQuantityRange=Rango Cantidad
-MultipriceRules=Reglas del segmento de precios
 UseMultipriceRules=Utilice las reglas de segmento de precios (definidas en la configuración del módulo del producto) para calcular automáticamente los precios de todos los demás segmentos de acuerdo con el primer segmento
 KeepEmptyForAutoCalculation=Manténgase vacío para que esto se calcule automáticamente a partir del peso o volumen de productos
 VariantRefExample=Ejemplos: COL, SIZE
diff --git a/htdocs/langs/es_CL/projects.lang b/htdocs/langs/es_CL/projects.lang
index fd50392c8ea..7ef9525fbda 100644
--- a/htdocs/langs/es_CL/projects.lang
+++ b/htdocs/langs/es_CL/projects.lang
@@ -43,10 +43,6 @@ AddHereTimeSpentForDay=Agregue aquí el tiempo dedicado a este día / tarea
 Activities=Tareas / actividades
 MyActivities=Mis tareas / actividades
 MyProjectsArea=Mi área de proyectos
-ProgressDeclared=Progreso declarado
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=El progreso declarado es menos %s que la progresión calculada
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=El progreso declarado es más %s que la progresión calculada
-ProgressCalculated=Progreso calculado
 Time=Hora
 ListOfTasks=Lista de tareas
 GoToListOfTimeConsumed=Ir a la lista de tiempo consumido
diff --git a/htdocs/langs/es_CL/sendings.lang b/htdocs/langs/es_CL/sendings.lang
index f250e751edb..b09b9b53d2d 100644
--- a/htdocs/langs/es_CL/sendings.lang
+++ b/htdocs/langs/es_CL/sendings.lang
@@ -18,6 +18,7 @@ OtherSendingsForSameOrder=Otros envíos para esta orden
 SendingsAndReceivingForSameOrder=Envíos y recibos para esta orden
 SendingsToValidate=Envíos para validar
 StatusSendingCanceled=Cancelado
+StatusSendingCanceledShort=Cancelado
 StatusSendingValidated=Validado (productos para enviar o ya enviados)
 StatusSendingProcessed=Procesada
 StatusSendingProcessedShort=Procesada
diff --git a/htdocs/langs/es_CL/ticket.lang b/htdocs/langs/es_CL/ticket.lang
index 7e8bb612452..f0511ad43e0 100644
--- a/htdocs/langs/es_CL/ticket.lang
+++ b/htdocs/langs/es_CL/ticket.lang
@@ -14,7 +14,6 @@ TypeContact_ticket_internal_CONTRIBUTOR=Colaborador
 TypeContact_ticket_external_SUPPORTCLI=Contacto con el cliente / seguimiento de incidentes
 OriginEmail=Fuente de correo electrónico
 Notify_TICKET_SENTBYMAIL=Enviar mensaje de Ticket por correo electrónico
-NotRead=No leer
 Read=Leer
 NeedMoreInformation=Esperando informacion
 Waiting=Esperando
diff --git a/htdocs/langs/es_CL/withdrawals.lang b/htdocs/langs/es_CL/withdrawals.lang
index ae95201deba..a205a30add6 100644
--- a/htdocs/langs/es_CL/withdrawals.lang
+++ b/htdocs/langs/es_CL/withdrawals.lang
@@ -79,6 +79,7 @@ PleaseCheckOne=Por favor marque uno solo
 DirectDebitOrderCreated=Orden de débito directo %s creado
 AmountRequested=Monto solicitado
 CreateForSepa=Crear un archivo de débito directo
+ICS=Creditor Identifier CI for direct debit
 END_TO_END=Etiqueta XML SEPA &quot;EndToEndId&quot; - ID única asignada por transacción
 USTRD=Etiqueta XML no estructurada de SEPA
 InfoCreditSubject=Pago de la orden de pago de débito directo %s por el banco
diff --git a/htdocs/langs/es_CO/accountancy.lang b/htdocs/langs/es_CO/accountancy.lang
index ccd905cc761..08958e517aa 100644
--- a/htdocs/langs/es_CO/accountancy.lang
+++ b/htdocs/langs/es_CO/accountancy.lang
@@ -83,6 +83,7 @@ VentilatedinAccount=Enlazado exitosamente a la cuenta contable.
 NotVentilatedinAccount=No vinculado a la cuenta contable.
 XLineSuccessfullyBinded=%s productos / servicios vinculados con éxito a una cuenta contable
 XLineFailedToBeBinded=%s productos / servicios no estaban vinculados a ninguna cuenta contable
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comience la clasificación de la página "Enlace para hacer" según los elementos más recientes.
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comience la clasificación de la página "Encuadernación hecha" por los elementos más recientes.
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar la descripción de productos y servicios en las listas después de x caracteres (Mejor = 50)
@@ -107,7 +108,6 @@ LetteringCode=Codigo de letras
 Codejournal=diario
 NumPiece=Número de pieza
 TransactionNumShort=Num. transacción
-GroupByAccountAccounting=Grupo por cuenta contable
 AccountingAccountGroupsDesc=Puede definir aquí algunos grupos de cuentas contables. Serán utilizados para informes contables personalizados.
 ByPredefinedAccountGroups=Por grupos predefinidos.
 DelYear=Año para borrar
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index f9161cc6931..b8ca38f6387 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -51,7 +51,6 @@ JavascriptDisabled=JavaScript desactivado
 UsePreviewTabs=Use las pestañas de vista previa
 ShowPreview=Mostrar vista previa
 ThemeCurrentlyActive=Tema activo actualmente
-CurrentTimeZone=Zona horaria de PHP (servidor)
 MySQLTimeZone=TimeZone MySql (base de datos)
 TZHasNoEffect=Las fechas son almacenadas y devueltas por el servidor de base de datos como si se mantuvieran como una cadena enviada. La zona horaria tiene efecto solo cuando se usa la función UNIX_TIMESTAMP (que Dolibarr no debe usar, por lo que la base de datos TZ no debería tener ningún efecto, incluso si se cambia después de ingresar los datos).
 Space=Espacio
@@ -99,7 +98,6 @@ MenuForUsers=Menú para usuarios.
 SystemInfo=Información del sistema
 SystemToolsArea=Área de herramientas del sistema
 PurgeDeleteLogFile=Elimine los archivos de registro, incluido el <b> %s </b> definido para el módulo Syslog (sin riesgo de perder datos)
-PurgeDeleteTemporaryFilesShort=Borrar archivos temporales
 PurgeRunNow=Purga ahora
 PurgeNothingToDelete=No hay directorio o archivos para eliminar.
 PurgeNDirectoriesDeleted=Se eliminaron los archivos o directorios de <b> %s </b>.
@@ -242,7 +240,6 @@ LanguageFilesCachedIntoShmopSharedMemory=Archivos .lang cargados en memoria comp
 ListOfDirectories=Lista de directorios de plantillas de OpenDocument
 ListOfDirectoriesForModelGenODT=Lista de directorios que contienen archivos de plantillas con formato OpenDocument. <br> <br> Ruta aquí completa de los directorios. Agregue un retorno de carro entre cada directorio. <br> Para agregar un directorio del módulo GED, agregue aquí <b > DOL_DATA_ROOT / ecm / yourdirectoryname </b>. Los archivos en esos directorios deben terminar con <b> .odt </b> o <b> .ods </b>.
 NumberOfModelFilesFound=Número de archivos de plantilla ODT / ODS encontrados en estos directorios
-ExampleOfDirectoriesForModelGen=Ejemplos de sintaxis: <br> c: \\ mydir <br> / home / mydir <br> DOL_DATA_ROOT / ecm / ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Para saber cómo crear sus plantillas de documento odt, antes de almacenarlas en esos directorios, lea la documentación de la wiki:
 FirstnameNamePosition=Posición del nombre / apellido
 KeyForWebServicesAccess=Clave para usar servicios web (parámetro "dolibarrkey" en servicios web)
@@ -260,7 +257,6 @@ UrlGenerationParameters=Parámetros para proteger las URL
 SecurityTokenIsUnique=Utilice un parámetro de clave segura único para cada URL
 EnterRefToBuildUrl=Introduzca la referencia para el objeto %s
 GetSecuredUrl=Obtener URL calculada
-ButtonHideUnauthorized=Ocultar botones para usuarios no administradores para acciones no autorizadas en lugar de mostrar botones deshabilitados en gris
 OldVATRates=Vieja tasa de IVA
 NewVATRates=Nueva tasa de IVA
 PriceBaseTypeToChange=Modificar en precios con valor de referencia base definido en
@@ -372,7 +368,7 @@ Module40000Desc=Utilizar monedas alternativas en precios y documentos.
 Module50000Name=Caja de pago
 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
-Module59000Desc=Módulo para gestionar márgenes.
+Module59000Desc=Module to follow margins
 Module60000Desc=Módulo para gestionar comisiones.
 Module62000Desc=Añadir características para gestionar Incoterms.
 Permission11=Lea las facturas de los clientes.
@@ -863,7 +859,7 @@ 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.
 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
-ViewProductDescInThirdpartyLanguageAbility=Mostrar las descripciones de los productos en el idioma del tercero.
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 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)
 SetDefaultBarcodeTypeProducts=Tipo de código de barras predeterminado para usar en productos
@@ -925,7 +921,6 @@ NotTopTreeMenuPersonalized=Menús personalizados no vinculados a una entrada del
 NewMenu=Nuevo menu
 MenuHandler=Manejador de menú
 MenuModule=Módulo fuente
-HideUnauthorizedMenu=Ocultar menús no autorizados (gris)
 DetailId=Menú de identificación
 DetailMenuHandler=Manejador de menú donde mostrar nuevo menú.
 DetailMenuModule=Nombre del módulo si la entrada del menú proviene de un módulo
diff --git a/htdocs/langs/es_CO/boxes.lang b/htdocs/langs/es_CO/boxes.lang
index 6a5f709d318..1253f30ed1a 100644
--- a/htdocs/langs/es_CO/boxes.lang
+++ b/htdocs/langs/es_CO/boxes.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxScheduledJobs=Trabajos programados
 ForCustomersInvoices=Facturas de clientes
 ForProposals=Propuestas
diff --git a/htdocs/langs/es_CO/compta.lang b/htdocs/langs/es_CO/compta.lang
index a8bd33a6a73..0466a9ef875 100644
--- a/htdocs/langs/es_CO/compta.lang
+++ b/htdocs/langs/es_CO/compta.lang
@@ -10,6 +10,7 @@ FeatureIsSupportedInInOutModeOnly=Función solo disponible en el modo de contabi
 VATReportBuildWithOptionDefinedInModule=Las cantidades que se muestran aquí se calculan utilizando las reglas definidas por la configuración del módulo de impuestos.
 LTReportBuildWithOptionDefinedInModule=Las cantidades que se muestran aquí se calculan utilizando las reglas definidas por la configuración de la Compañía.
 Param=Configuración
+RemainingAmountPayment=Cantidad del pago restante:
 Accountparent=Cuenta para padres
 Accountsparent=Cuentas de los padres
 MenuReportInOut=Ingresos / Gastos
@@ -66,6 +67,7 @@ AddSocialContribution=Añadir impuesto social / fiscal
 ContributionsToPay=Impuestos sociales / fiscales a pagar.
 AccountancyTreasuryArea=Área de facturación y pago.
 PaymentCustomerInvoice=Pago factura a cliente
+PaymentSupplierInvoice=pago de factura del proveedor
 PaymentSocialContribution=Pago de impuestos sociales / fiscales
 PaymentVat=Pago del IVA
 ListPayment=Lista de pagos
@@ -91,8 +93,8 @@ NewLocalTaxPayment=Nuevo pago de impuestos %s
 Refund=Reembolso
 SocialContributionsPayments=Pago de impuestos sociales / fiscales
 ShowVatPayment=Mostrar pago del IVA
-BalanceVisibilityDependsOnSortAndFilters=El saldo es visible en esta lista solo si la tabla está ordenada en forma ascendente en %s y se filtra para 1 cuenta bancaria
 CustomerAccountancyCode=Código de contabilidad del cliente
+SupplierAccountancyCode=Código contable del proveedor
 CustomerAccountancyCodeShort=Cust. cuenta. código
 SupplierAccountancyCodeShort=Cenar. cuenta. código
 Turnover=Facturación facturada
@@ -117,7 +119,6 @@ ConfirmDeleteSocialContribution=¿Está seguro de que desea eliminar este pago f
 ExportDataset_tax_1=Impuestos y pagos sociales y fiscales.
 CalcModeVATDebt=Modo <b> %sVAT en contabilidad de compromiso%s </b>.
 CalcModeVATEngagement=Modo <b> %sVAT en ingresos-expenses%s </b>.
-CalcModeDebt=Análisis de facturas registradas conocidas incluso si aún no se han contabilizado en el libro de contabilidad.
 CalcModeEngagement=Análisis de pagos registrados conocidos, incluso si aún no se han contabilizado en el Libro mayor.
 CalcModeBookkeeping=Análisis de los datos registrados en la tabla de Contabilidad.
 CalcModeLT1=Modo <b> %sRE en facturas de clientes: facturas de proveedores%s </b>
@@ -131,11 +132,11 @@ AnnualSummaryInputOutputMode=Balance de ingresos y gastos, resumen anual.
 AnnualByCompanies=Saldo de ingresos y gastos, por grupos de cuentas predefinidos.
 AnnualByCompaniesDueDebtMode=Balance de ingresos y gastos, detalle por grupos predefinidos, modo <b> %sClaims-Debts%s </b> dijo <b> Contabilidad de compromisos </b>.
 AnnualByCompaniesInputOutputMode=Balance de ingresos y gastos, detalle por grupos predefinidos, modo <b> %sIncomes-Expenses%s </b>, dijo <b> contabilidad de caja </b>.
-SeeReportInInputOutputMode=Consulte %sanálisis de pagos%s para obtener un cálculo de los pagos reales realizados incluso si aún no se han contabilizado en el Libro mayor.
-SeeReportInDueDebtMode=Consulte %sanálisis de facturas%s para un cálculo basado en facturas registradas conocidas, incluso si aún no se han contabilizado en el Libro mayor.
-SeeReportInBookkeepingMode=Consulte <b> %sRestauración report%s </b> para obtener un cálculo de la <b> tabla del Libro mayor de contabilidad </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.
+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.
 RulesAmountOnInOutBookkeepingRecord=Incluye el registro en su Libro mayor con cuentas contables que tiene el grupo "GASTOS" o "INGRESOS"
 RulesResultBookkeepingPredefined=Incluye el registro en su Libro mayor con cuentas contables que tiene el grupo "GASTOS" o "INGRESOS"
@@ -186,6 +187,7 @@ RefExt=Ref externo
 ToCreateAPredefinedInvoice=Para crear una factura de plantilla, cree una factura estándar, luego, sin validarla, haga clic en el botón "%s".
 LinkedOrder=Enlace a pedido
 CalculationRuleDesc=Para calcular el IVA total, hay dos métodos: <br> El método 1 es redondear la tina en cada línea, luego sumarlos. <br> El método 2 es sumar todas la tina en cada línea, luego redondear el resultado. <br> El resultado final puede diferir de unos céntimos. El modo predeterminado es el modo <b> %s </b>.
+CalculationRuleDescSupplier=Según el proveedor, elija el método apropiado para aplicar la misma regla de cálculo y obtener el mismo resultado esperado por su proveedor.
 TurnoverPerProductInCommitmentAccountingNotRelevant=El informe del volumen de negocios recogido por producto no está disponible. Este informe solo está disponible para facturación facturada.
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=El informe del volumen de negocios recaudado por tasa de impuesto de venta no está disponible. Este informe solo está disponible para facturación facturada.
 AccountancyJournal=Diario de código contable
@@ -195,6 +197,7 @@ ACCOUNTING_VAT_PAY_ACCOUNT=Cuenta contable por defecto para el pago del IVA.
 ACCOUNTING_ACCOUNT_CUSTOMER=Cuenta contable utilizada para terceros clientes.
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=La cuenta contable dedicada definida en la tarjeta de terceros se utilizará solo para la contabilidad de Libro mayor auxiliar. Este se usará para el Libro mayor general y como valor predeterminado de la contabilidad del Libro mayor auxiliar si no se define una cuenta de cuenta del cliente dedicada a un tercero.
 ACCOUNTING_ACCOUNT_SUPPLIER=Cuenta contable utilizada para terceros proveedores.
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=La cuenta de contabilidad dedicada definida en la tarjeta de un tercero 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 no se define la cuenta de contabilidad del proveedor dedicada en un tercero.
 ConfirmCloneTax=Confirmar el clon de un impuesto social / fiscal.
 CloneTaxForNextMonth=Clonala para el mes que viene.
 SimpleReport=Informe simple
@@ -216,3 +219,7 @@ ByVatRate=Por impuesto de venta
 TurnoverbyVatrate=Facturación facturada por impuesto de venta
 TurnoverCollectedbyVatrate=Volumen de negocios recaudado por tasa de impuesto de venta
 PurchasebyVatrate=Tasa de impuesto de compra por venta
+PurchaseTurnoverCollected=Volumen de compras recogido
+RulesPurchaseTurnoverDue=- Incluye las facturas vencidas del proveedor, ya sean pagadas o no. <br> - Se basa en la fecha de facturación de estas facturas. <br>
+RulesPurchaseTurnoverIn=- Incluye todos los pagos efectivos de facturas hechas a proveedores. <br> - Se basa en la fecha de pago de estas facturas <br>
+ReportPurchaseTurnoverCollected=Volumen de compras recogido
diff --git a/htdocs/langs/es_CO/cron.lang b/htdocs/langs/es_CO/cron.lang
index 5ef1f0eb645..0c30b974b96 100644
--- a/htdocs/langs/es_CO/cron.lang
+++ b/htdocs/langs/es_CO/cron.lang
@@ -1,4 +1,9 @@
 # Dolibarr language file - Source file is en_US - cron
+Permission23101 =Leer trabajo programado
+Permission23102 =Crear / actualizar trabajo programado
+Permission23103 =Eliminar trabajo programado
+Permission23104 =Ejecutar trabajo programado
+CronList=Trabajos programados
 CronMethod=Método
 CronModule=Módulo
 CronArgs=Parámetros
diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
index f4a6163ecd8..cf729c5dde4 100644
--- a/htdocs/langs/es_CO/main.lang
+++ b/htdocs/langs/es_CO/main.lang
@@ -21,6 +21,7 @@ FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 NoTemplateDefined=No hay plantilla disponible para este tipo de correo electrónico.
 AvailableVariables=Variables de sustitución disponibles
+CurrentTimeZone=Zona horaria de PHP (servidor)
 NoRecordFound=No se encontraron registros
 NoRecordDeleted=Ningún registro eliminado
 Errors=Los errores
diff --git a/htdocs/langs/es_CO/mrp.lang b/htdocs/langs/es_CO/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/es_CO/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_CO/products.lang b/htdocs/langs/es_CO/products.lang
index 2493b627165..19e7fb865c4 100644
--- a/htdocs/langs/es_CO/products.lang
+++ b/htdocs/langs/es_CO/products.lang
@@ -54,6 +54,7 @@ BarcodeValue=Valor de código de barras
 NoteNotVisibleOnBill=Nota (no visible en facturas, propuestas ...)
 ServiceLimitedDuration=Si el producto es un servicio con duración limitada:
 MultiPricesNumPrices=Numero de precios
+AssociatedProductsAbility=Enable Kits (set of several products)
 ParentProductsNumber=Número de producto de embalaje principal
 ParentProducts=Productos para padres
 KeywordFilter=Filtro de palabras clave
@@ -85,7 +86,6 @@ CloneCombinationsProduct=Variantes de productos clonados.
 ProductIsUsed=Este producto es usado
 NewRefForClone=Árbitro. de nuevo producto / servicio
 CustomerPrices=Precios al cliente
-CustomCode=Aduanas / productos / código HS
 p=u
 d=re
 g=sol
@@ -98,7 +98,6 @@ AlwaysUseFixedPrice=Usar el precio fijo
 PriceByQuantity=Diferentes precios por cantidad.
 DisablePriceByQty=Desactivar precios por cantidad.
 PriceByQuantityRange=Rango Cantidad
-MultipriceRules=Reglas del segmento de precios
 UseMultipriceRules=Utilice reglas de segmento de precios (definidas en la configuración del módulo del producto) para calcular automáticamente los precios de todos los demás segmentos de acuerdo con el primer segmento
 PercentVariationOver=variación %% sobre %s
 KeepEmptyForAutoCalculation=Manténgalo vacío para que esto se calcule automáticamente por peso o volumen de productos
diff --git a/htdocs/langs/es_CO/projects.lang b/htdocs/langs/es_CO/projects.lang
index 5bb088ffa15..9fff1ff1340 100644
--- a/htdocs/langs/es_CO/projects.lang
+++ b/htdocs/langs/es_CO/projects.lang
@@ -45,8 +45,6 @@ AddHereTimeSpentForDay=Agregue aquí el tiempo dedicado a este día / tarea
 Activities=Tareas / actividades
 MyActivities=Mis tareas / actividades
 MyProjectsArea=Mis proyectos area
-ProgressDeclared=Progreso declarado
-ProgressCalculated=Progreso calculado
 Time=Hora
 ListOfTasks=Lista de tareas
 GoToListOfTimeConsumed=Ir a la lista de tiempo consumido
diff --git a/htdocs/langs/es_CO/sendings.lang b/htdocs/langs/es_CO/sendings.lang
index 96689e2c322..ea9f35bd5dd 100644
--- a/htdocs/langs/es_CO/sendings.lang
+++ b/htdocs/langs/es_CO/sendings.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - sendings
 StatusSendingCanceled=Cancelado
+StatusSendingCanceledShort=Cancelado
diff --git a/htdocs/langs/es_CO/ticket.lang b/htdocs/langs/es_CO/ticket.lang
index 05339775ed1..e0099d503d0 100644
--- a/htdocs/langs/es_CO/ticket.lang
+++ b/htdocs/langs/es_CO/ticket.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ticket
 TypeContact_ticket_internal_CONTRIBUTOR=Contribuyente
-NotRead=No leer
 Type=Tipo
 Subject=Tema
diff --git a/htdocs/langs/es_CO/withdrawals.lang b/htdocs/langs/es_CO/withdrawals.lang
index 33ea339dcd8..4c73e87c98e 100644
--- a/htdocs/langs/es_CO/withdrawals.lang
+++ b/htdocs/langs/es_CO/withdrawals.lang
@@ -4,3 +4,4 @@ WithdrawalsReceipts=Órdenes de débito directo
 WithdrawalReceipt=Orden de domiciliación bancaria
 StatusPaid=Pagado
 StatusRefused=Rechazado
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_DO/accountancy.lang b/htdocs/langs/es_DO/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/es_DO/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang
index 6dbaf311a2a..5284148aebb 100644
--- a/htdocs/langs/es_DO/admin.lang
+++ b/htdocs/langs/es_DO/admin.lang
@@ -1,11 +1,13 @@
 # Dolibarr language file - Source file is en_US - admin
 OldVATRates=Tasa de ITBIS antigua
 NewVATRates=Tasa de ITBIS nueva
+Module59000Desc=Module to follow margins
 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)
 UnitPriceOfProduct=Precio unitario sin ITBIS de un producto
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 OptionVatMode=Opción de carga de ITBIS
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_DO/compta.lang b/htdocs/langs/es_DO/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/es_DO/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_DO/mrp.lang b/htdocs/langs/es_DO/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/es_DO/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_DO/products.lang b/htdocs/langs/es_DO/products.lang
index 6e900475275..2a38b9b0181 100644
--- a/htdocs/langs/es_DO/products.lang
+++ b/htdocs/langs/es_DO/products.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
+AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/es_DO/withdrawals.lang b/htdocs/langs/es_DO/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/es_DO/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_EC/accountancy.lang b/htdocs/langs/es_EC/accountancy.lang
index ffe1b3a23e6..828b60ac54e 100644
--- a/htdocs/langs/es_EC/accountancy.lang
+++ b/htdocs/langs/es_EC/accountancy.lang
@@ -90,7 +90,7 @@ VentilatedinAccount=Vinculado con éxito a la cuenta contable
 NotVentilatedinAccount=No vinculado a la cuenta contable
 XLineSuccessfullyBinded=%s productos/servicios vinculados con éxito a una cuenta de contabilidad
 XLineFailedToBeBinded=Los productos/servicios de%s no estaban vinculados a ninguna cuenta contable
-ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a unir mostrados por página (máximo recomendado: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comienza la clasificación de la página "Vinculación a hacer" por los elementos más recientes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comienza la clasificación de la página "Encuadernación realizada" por los elementos más recientes
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar la descripción de los productos y servicios en los listados después de los caracteres x (Mejor
@@ -112,11 +112,14 @@ TransitionalAccount=Cuenta de transferencia bancaria transitoria
 ACCOUNTING_ACCOUNT_SUSPENSE=Cuenta de cuenta de espera
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Cuenta contable para registrar suscripciones
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta contable por defecto para los productos comprados (se usa si no se define en la hoja de productos)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Cuenta contable por defecto para los productos comprados en EEC (se usa si no se define en la hoja de productos)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Cuenta contable por defecto para los productos comprados e importados fuera de la CEE (usado si no está definido en la hoja de productos)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cuenta contable por defecto para los productos vendidos (utilizada si no se define en la hoja del producto)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Cuenta contable por defecto para los productos vendidos en la CEE (utilizada si no se define en la hoja de producto)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Cuenta contable por defecto para los productos vendidos y exportados fuera de la CEE (usado si no está definido en la hoja de producto)
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Cuenta contable por defecto para los servicios comprados (utilizado si no se define en la hoja de servicio)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Cuenta contable por defecto para los servicios comprados en EEC (utilizada si no está definida en la hoja de servicios)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Cuenta contable por defecto para los servicios comprados e importados fuera de la CEE (se usa si no se define en la hoja de servicios)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Contabilidad por defecto para los servicios vendidos (utilizado si no se define en la hoja de servicio)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Cuenta contable por defecto para los servicios vendidos en la CEE (utilizada si no se define en la hoja de servicios)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Cuenta contable por defecto para los servicios vendidos y exportados fuera de la CEE (usado si no está definido en la hoja de servicios)
@@ -126,7 +129,6 @@ LetteringCode=Codigo de letras
 Codejournal=diario
 NumPiece=Número de pieza
 TransactionNumShort=Num. transacción
-GroupByAccountAccounting=Grupo por cuenta contable
 AccountingAccountGroupsDesc=Puede definir aquí algunos grupos de cuentas contables. Se usarán para informes de contabilidad personalizados.
 DelMonth=Mes para borrar
 DelJournal=Diario para borrar
@@ -211,6 +213,7 @@ Modelcsv_openconcerto=Exportar para OpenConcerto (prueba)
 Modelcsv_configurable=Exportar CSV Configurable
 Modelcsv_FEC=Exportar FEC
 Modelcsv_Sage50_Swiss=Exportación para Sage 50 Suiza
+Modelcsv_winfic=Exportar Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=ID de la cuenta de cuentas
 InitAccountancy=Contabilidad inicial
 InitAccountancyDesc=Esta página se puede utilizar para inicializar una cuenta de contabilidad en productos y servicios que no tiene definida una cuenta de contabilidad para ventas y compras.
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index 63854f4450c..61e86a47149 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -60,7 +60,6 @@ AllowToSelectProjectFromOtherCompany=En el documento de un cliente, puede elegir
 JavascriptDisabled=JavaScript desactivado
 UsePreviewTabs=Usar pestañas de vista previa
 ShowPreview=Mostrar vista previa
-CurrentTimeZone=Zona horaria PHP (servidor)
 MySQLTimeZone=Zona horaria MySQL (base de datos)
 TZHasNoEffect=Las fechas son almacenadas y devueltas por el servidor de base de datos como si se mantuvieran como una cadena enviada. La zona horaria tiene efecto solo cuando se usa la función UNIX_TIMESTAMP (que no debe ser utilizada por Dolibarr, por lo que la base de datos TZ no debería tener ningún efecto, incluso si se cambia después de ingresar los datos)
 Space=Espacio
@@ -112,7 +111,6 @@ 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>). 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 archivo de registro <b>%s</b> definido para el módulo de Registro del Sistema (Syslog) (sin riesgo de perder datos)
-PurgeDeleteTemporaryFiles=Elimine todos los archivos temporales (sin riesgo de perder datos). Nota: La eliminación se realiza solo si el directorio temporal se creó hace 24 horas.
 PurgeDeleteAllFilesInDocumentsDir=Eliminar todos los archivos en el directorio: <b>%s</b>. <br> Esto eliminará todos los documentos generados relacionados con los elementos (terceros, facturas, etc.), los archivos cargados en el módulo ECM, los volcados de respaldo de la base de datos y archivos temporales.
 PurgeRunNow=Purgar ahora
 PurgeNothingToDelete=Sin directorio o archivos que desea eliminar.
@@ -285,7 +283,6 @@ LanguageFilesCachedIntoShmopSharedMemory=Archivos .lang cargados en la memoria c
 ListOfDirectories=Lista de directorios de plantillas OpenDocument
 ListOfDirectoriesForModelGenODT=Open to Document. <br> <br> Ponga aquí la ruta completa de los directorios. <br> Para un directorio del módulo GED, añádalo aquí <b> DOL_DATA_ROOT / ecm / yourdirectoryname </b>. <br> <br> Los archivos de esos deben ser eliminados con <b> .odt </b> o <b> .ods </b>.
 NumberOfModelFilesFound=Número de archivos de plantilla ODT / ODS encontrados en estos directorios
-ExampleOfDirectoriesForModelGen=Ejemplos de sintaxis: <br> c:\\mydir <br> / home / mydir <br> DOL_DATA_ROOT / ecm / ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Para saber cómo crear sus plantillas de documentos ODT, antes de guardarlos en esos directorios, leer la documentación wiki:
 FirstnameNamePosition=Posición del Nombre / Apellido
 DescWeather=Las siguientes imágenes se mostrarán en el tablero cuando el número de acciones tardías alcance los siguientes valores:
@@ -310,7 +307,6 @@ UrlGenerationParameters=Parámetros para asegurar URL
 SecurityTokenIsUnique=Use un parámetro de SecureKey único para cada URL
 EnterRefToBuildUrl=Insertar la referencia del objeto %s
 GetSecuredUrl=Obtener URL calculada
-ButtonHideUnauthorized=Ocultar botones para usuarios no administradores para acciones no autorizadas en lugar de mostrar botones deshabilitados en gris
 OldVATRates=Antigua tasa de IVA
 NewVATRates=Nueva tasa de IVA
 PriceBaseTypeToChange=Modificar los precios con el valor base de referencia definida en
@@ -495,7 +491,7 @@ Module50400Name=Contabilidad (doble entrada)
 Module54000Desc=Impresión directa (sin abrir los documentos) utilizando la interfaz IPP de Cups (la impresora debe estar visible desde el servidor y CUPS debe estar instalada en el servidor).
 Module55000Name=Sondeo, encuesta o votación
 Module55000Desc=Cree encuestas en línea, encuestas o votos (como Doodle, Studs, RDVz, etc.)
-Module59000Desc=Módulo para administración los márgenes
+Module59000Desc=Module to follow margins
 Module60000Desc=Módulo para gestionar las comisiones
 Module62000Desc=Añadir características para gestionar Incoterms.
 Module63000Desc=Gestionar recursos (impresoras, coches, salas, ...) para asignar a eventos.
@@ -945,7 +941,6 @@ ConditionIsCurrently=Condición actual %s
 YouUseBestDriver=Utiliza el controlador %s, que es el mejor controlador actualmente disponible.
 YouDoNotUseBestDriver=Utiliza el controlador %s, pero se recomienda el controlador %s.
 SearchOptim=Optimización de la búsqueda
-YouHaveXObjectUseSearchOptim=Tiene %s %s en la base de datos. Debe agregar la constante %s a 1 en Home-Setup-Other. Limite la búsqueda al comienzo de las cadenas, lo que hace posible que la base de datos use índices y debería obtener una respuesta inmediata.
 YouHaveXObjectAndSearchOptimOn=Tiene %s %s en la base de datos y la constante %s se establece en 1 en Home-Setup-Other.
 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.
@@ -1162,7 +1157,7 @@ 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=Mostrar descripciones de productos en formularios (de lo contrario, se muestra en una ventana emergente de información sobre herramientas)
 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
-ViewProductDescInThirdpartyLanguageAbility=Mostrar descripciones de productos en el idioma del tercero.
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 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)
 SetDefaultBarcodeTypeProducts=Tipo de código de barras predeterminado para utilizar en los productos
@@ -1227,7 +1222,6 @@ IfYouUsePointOfSaleCheckModule=Si utiliza el módulo de Punto de Venta (POS) pro
 NotTopTreeMenuPersonalized=Menús personalizados no vinculados a una entrada de menú superior
 MenuHandler=Manejador de menús
 MenuModule=Módulo fuente
-HideUnauthorizedMenu= Ocultar menús no autorizados
 DetailId=Identificación del menú
 DetailMenuHandler=Manejador de menús donde mostrar el nuevo menú
 DetailMenuModule=Nombre del módulo
@@ -1452,8 +1446,6 @@ EMailHost=Host de correo electrónico del servidor IMAP
 EmailcollectorOperations=Operaciones a realizar por coleccionista.
 MaxEmailCollectPerCollect=Número máximo de correos electrónicos recopilados por recopilación
 ConfirmCloneEmailCollector=¿Está seguro de que desea clonar el recopilador de correo electrónico %s?
-DateLastCollectResult=Fecha de último cobro probado
-DateLastcollectResultOk=Fecha más reciente de cobrar exitosamente
 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
@@ -1501,4 +1493,5 @@ RESTRICT_ON_IP=Permitir el acceso a alguna IP de host solamente (comodín no per
 MakeAnonymousPing=Realice un Ping anónimo '+1' al servidor de la base Dolibarr (hecho 1 vez solo después de la instalación) para permitir que la base cuente la cantidad de instalación de Dolibarr.
 FeatureNotAvailableWithReceptionModule=Función no disponible cuando la recepción del módulo está habilitada
 EmailTemplate=Plantilla para correo electrónico
+EMailsWillHaveMessageID=Los correos electrónicos tendrán una etiqueta 'Referencias' que coincida con esta sintaxis
 JumpToBoxes=Vaya a Configuración -> Widgets
diff --git a/htdocs/langs/es_EC/banks.lang b/htdocs/langs/es_EC/banks.lang
index e9526d449e9..94929d9f3b4 100644
--- a/htdocs/langs/es_EC/banks.lang
+++ b/htdocs/langs/es_EC/banks.lang
@@ -117,6 +117,4 @@ ShowVariousPayment=Mostrar pago misceláneo
 AddVariousPayment=Agregar pago misceláneo
 FindYourSEPAMandate=Este es su mandato de SEPA para autorizar a nuestra empresa a realizar un pedido de débito directo a su banco. Devuélvalo firmado (escaneo del documento firmado) o envíelo por correo a
 AutoReportLastAccountStatement=Rellene automáticamente el campo 'número de extracto bancario' con el último número de extracto al realizar la conciliación
-CashControl=POS Limite de efectivo
-NewCashFence=Nuevo limite de efectivo
 BankColorizeMovementDesc=Si esta función está habilitada, puede elegir un color de fondo específico para los movimientos de débito o crédito
diff --git a/htdocs/langs/es_EC/blockedlog.lang b/htdocs/langs/es_EC/blockedlog.lang
index ffd95d6e203..4f7bb9a99a4 100644
--- a/htdocs/langs/es_EC/blockedlog.lang
+++ b/htdocs/langs/es_EC/blockedlog.lang
@@ -1,7 +1,13 @@
 # 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
+logPAYMENT_VARIOUS_CREATE=Pago (no asignado a una factura) creado
+logPAYMENT_VARIOUS_MODIFY=Pago (no asignado a una factura) modificado
+logPAYMENT_VARIOUS_DELETE=Pago (no asignado a una factura) eliminación lógica
 logPAYMENT_ADD_TO_BANK=Pago agregado al banco
 logDONATION_PAYMENT_DELETE=Eliminación lógica del pago de donaciones.
 logBILL_UNPAYED=Factura del cliente sin pagar
diff --git a/htdocs/langs/es_EC/boxes.lang b/htdocs/langs/es_EC/boxes.lang
index 68072918006..6ae463eaff3 100644
--- a/htdocs/langs/es_EC/boxes.lang
+++ b/htdocs/langs/es_EC/boxes.lang
@@ -34,6 +34,7 @@ BoxTitleLatestModifiedBoms=Últimas BOMs modificadas %s
 BoxTitleLatestModifiedMos=Últimas órdenes de fabricación modificadas %s
 BoxGlobalActivity=Actividad global (facturas, propuestas, pedidos)
 BoxTitleGoodCustomers=%s Buenos clientes
+BoxScheduledJobs=Trabajos programados
 FailedToRefreshDataInfoNotUpToDate=Error al actualizar el flujo de RSS. Última fecha de actualización exitosa: %s
 LastRefreshDate=Fecha de actualización más reciente
 NoRecordedBookmarks=No se han definido marcadores.
diff --git a/htdocs/langs/es_EC/cashdesk.lang b/htdocs/langs/es_EC/cashdesk.lang
index 3361d257dc5..91bfc85b052 100644
--- a/htdocs/langs/es_EC/cashdesk.lang
+++ b/htdocs/langs/es_EC/cashdesk.lang
@@ -31,8 +31,6 @@ Footer=Pie de página
 AmountAtEndOfPeriod=Cantidad al final del período (día, mes o año)
 TheoricalAmount=Cantidad teórica
 RealAmount=Cantidad real
-CashFence=Valla de efectivo
-CashFenceDone=Cerca de efectivo hecha para el período.
 NbOfInvoices=Nb de facturas
 Paymentnumpad=Tipo de Pad para ingresar el pago
 Numberspad=Pad de números
@@ -56,7 +54,6 @@ CashDeskRefNumberingModules=Módulo de numeración para ventas POS
 CashDeskGenericMaskCodes6 =<br><b>{TN} </b>la etiqueta se usa para agregar el número de terminal
 TakeposGroupSameProduct=Agrupar las mismas líneas de productos
 StartAParallelSale=Comience una nueva venta paralela
-CloseCashFence=Cerca de efectivo
 CashReport=Informe de caja
 MainPrinterToUse=Impresora principal para usar
 OrderPrinterToUse=Solicitar impresora para usar
diff --git a/htdocs/langs/es_EC/categories.lang b/htdocs/langs/es_EC/categories.lang
index 48cdc8b6202..3545e7ba532 100644
--- a/htdocs/langs/es_EC/categories.lang
+++ b/htdocs/langs/es_EC/categories.lang
@@ -46,11 +46,8 @@ UsersCategoriesShort=Etiquetas/categorías de usuarios
 StockCategoriesShort=Etiquetas / categorías de almacén
 ThisCategoryHasNoItems=Esta categoría no contiene ningún artículo.
 CategId=ID de etiqueta/categoría
-CatSupList=Lista de etiquetas / categorías de proveedores
-CatCusList=Lista de etiquetas/categorías de cliente/prospecto
 CatProdList=Lista de productos etiquetas/categorías
 CatMemberList=Lista de miembros tags/categories
-CatContactList=Lista de etiquetas/categorías de contacto
 CatCusLinks=Enlaces entre clientes/prospectos y etiquetas/categorías
 CatContactsLinks=Enlaces entre contactos / direcciones y etiquetas / categorías
 ExtraFieldsCategories=Atributos complementarios
diff --git a/htdocs/langs/es_EC/companies.lang b/htdocs/langs/es_EC/companies.lang
index 398cf5448d1..8a15891b3f1 100644
--- a/htdocs/langs/es_EC/companies.lang
+++ b/htdocs/langs/es_EC/companies.lang
@@ -207,7 +207,6 @@ VATIntraCheckableOnEUSite=Consulte el ID de IVA intracomunitario en el sitio web
 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
-JuridicalStatus=Tipo de entidad jurídica
 ProspectLevel=Prospecto potencial
 OthersNotLinkedToThirdParty=Otros, no vinculados a cliente/proveedor
 ProspectStatus=Estado del prospecto
diff --git a/htdocs/langs/es_EC/compta.lang b/htdocs/langs/es_EC/compta.lang
index e77516e0630..5933896e5b7 100644
--- a/htdocs/langs/es_EC/compta.lang
+++ b/htdocs/langs/es_EC/compta.lang
@@ -94,7 +94,6 @@ NewLocalTaxPayment=Nuevo pago de impuestos %s
 Refund=Reembolso
 SocialContributionsPayments=Pagos de impuestos sociales y fiscales
 ShowVatPayment=Mostrar pago de IVA
-BalanceVisibilityDependsOnSortAndFilters=El equilibrio es visible en esta lista sólo si la tabla está ordenada ascendiendo en%s y filtrada para una cuenta bancaria
 CustomerAccountancyCode=Código de contabilidad del cliente
 SupplierAccountancyCode=Código contable del proveedor
 CustomerAccountancyCodeShort=Cuenta de cliente. código
@@ -120,7 +119,6 @@ ConfirmDeleteSocialContribution=¿Seguro que desea eliminar este pago de impuest
 ExportDataset_tax_1=Impuestos y pagos sociales y fiscales
 CalcModeVATDebt=Modo <b>%sVAT en la contabilidad de compromiso%s </b>.
 CalcModeVATEngagement=Modo <b>%sVAT en los ingresos-gastos%s </b>.
-CalcModeDebt=Análisis de facturas registradas conocidas incluso si aún no se contabilizan en el libro mayor.
 CalcModeEngagement=Análisis de los pagos registrados conocidos, incluso si aún no se contabilizan en el Libro mayor.
 CalcModeBookkeeping=Análisis de los datos registrados en la tabla de Contabilidad.
 CalcModeLT1= Modo <b>%sRE en facturas de clientes - facturas de proveedores%s </b>
@@ -133,9 +131,6 @@ AnnualSummaryDueDebtMode=Balance de ingresos y gastos, resumen anual
 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>.
-SeeReportInInputOutputMode=Vea %s el análisis de pagos %s para cálcular los pagos efectuados, incluso si aún no se contabilizaron en el Libro mayor.
-SeeReportInDueDebtMode=Vea %s el análisis de facturas %s para un cálculo basado en facturas registradas conocidas, incluso si aún no se contabilizaron en el Libro mayor.
-SeeReportInBookkeepingMode=Consulte el informe <b>%s Libro Mayor %s </b> para un cálculo en <b> la tabla contable del Libro Mayor </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.
diff --git a/htdocs/langs/es_EC/cron.lang b/htdocs/langs/es_EC/cron.lang
index 1bcb97a8f7b..7dbff235dc7 100644
--- a/htdocs/langs/es_EC/cron.lang
+++ b/htdocs/langs/es_EC/cron.lang
@@ -4,8 +4,6 @@ Permission23102 =Crear / actualizar trabajo programado
 Permission23103 =Eliminar trabajo programado
 Permission23104 =Ejecutar trabajo programado
 CronSetup=Configuración de administración de trabajos programada
-URLToLaunchCronJobs=URL para verificar e iniciar trabajos calificados de cron
-OrToLaunchASpecificJob=O para comprobar y lanzar un trabajo específico
 KeyForCronAccess=Clave de seguridad para la URL para iniciar trabajos cron
 FileToLaunchCronJobs=Línea de comandos para comprobar y poner en marcha trabajos calificados de cron
 CronExplainHowToRunUnix=En el entorno Unix, debe utilizar la siguiente entrada crontab para ejecutar la línea de comandos cada 5 minutos
@@ -41,7 +39,6 @@ CronArgs=Parámetros
 CronSaveSucess=Guardado exitosamente
 CronFieldMandatory=Los campos%s son obligatorios
 CronErrEndDateStartDt=La fecha de finalización no puede ser anterior a la fecha de inicio
-CronStatusActiveBtn=Habilitar
 CronStatusInactiveBtn=En rehabilitación
 CronTaskInactive=Este trabajo está deshabilitado
 CronId=Carné de identidad
diff --git a/htdocs/langs/es_EC/errors.lang b/htdocs/langs/es_EC/errors.lang
index d857d9acdeb..50196eff061 100644
--- a/htdocs/langs/es_EC/errors.lang
+++ b/htdocs/langs/es_EC/errors.lang
@@ -59,7 +59,6 @@ ErrorExportDuplicateProfil=Este nombre de perfil ya existe para este conjunto de
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP no está completo.
 ErrorLDAPMakeManualTest=Se ha generado un archivo .ldif en el directorio%s. Trate de cargarlo manualmente desde la línea de comandos para obtener más información sobre los errores.
 ErrorCantSaveADoneUserWithZeroPercentage=No se puede guardar una acción con "estado no iniciado" si el campo "hecho por" también se llena.
-ErrorRefAlreadyExists=La referencia usada para la creación ya existe.
 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=El objeto tiene al menos un hijo del tipo%s
@@ -178,7 +177,6 @@ ErrorObjectMustHaveLinesToBeValidated=El objeto%s debe tener líneas a validar.
 ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Sólo se pueden enviar facturas validadas mediante la acción masiva "Enviar por correo electrónico".
 ErrorDiscountLargerThanRemainToPaySplitItBefore=El descuento que usted intenta aplicar es más grande que permanecer para pagar. Divida el descuento en 2 descuentos más pequeños antes.
 ErrorFileNotFoundWithSharedLink=Archivo no fue encontrado. Puede ser que la clave compartida se haya modificado o que el archivo se haya eliminado recientemente.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Tenga en cuenta que no es posible utilizar productos virtuales para aumentar/disminuir automáticamente subproductos cuando al menos un subproducto (o subproducto de subproductos) necesita un número de serie/lote.
 ErrorDescRequiredForFreeProductLines=La descripción es obligatoria para campos con producto gratis
 ErrorDuringChartLoad=Error al cargar el plan de cuentas. Si no se cargaron algunas cuentas, aún puede ingresarlas manualmente.
 ErrorBadSyntaxForParamKeyForContent=Mala sintaxis para param keyforcontent. Debe tener un valor que comience con %s o %s
diff --git a/htdocs/langs/es_EC/mails.lang b/htdocs/langs/es_EC/mails.lang
index b24a2b0d5f6..d726c01c4b9 100644
--- a/htdocs/langs/es_EC/mails.lang
+++ b/htdocs/langs/es_EC/mails.lang
@@ -95,12 +95,6 @@ TagSignature=Firma del usuario enviado
 EMailRecipient=Receptor de E-mail
 TagMailtoEmail=Correo electrónico del destinatario (incluido el enlace html "mailto:")
 NoEmailSentBadSenderOrRecipientEmail=No hay correo electrónico enviado. Correo electrónico incorrecto del remitente o del destinatario. Verifique el perfil de usuario.
-NoNotificationsWillBeSent=No hay notificaciones por correo electrónico para este evento y la empresa
-ANotificationsWillBeSent=Se enviará una notificación por correo electrónico
-SomeNotificationsWillBeSent=Las notificaciones de %s se enviarán por correo electrónico
-AddNewNotification=Activar un nuevo destino / evento de notificación por correo electrónico
-ListOfActiveNotifications=Lista todos los destinos / eventos activos para la notificación por correo electrónico
-ListOfNotificationsDone=Lista todas las notificaciones por correo electrónico enviadas
 MailSendSetupIs=La configuración del envío de correo electrónico se ha configurado en '%s'. Este modo no se puede utilizar para enviar correos electrónicos masivos.
 MailSendSetupIs2=Primero debe ir, con una cuenta de administrador, al menú %s Home - Setup - EMails%s para cambiar el parámetro <strong> '%s' </strong> para usar el modo '%s'. Con este modo, puede ingresar la configuración del servidor SMTP proporcionado por su proveedor de servicios de Internet y usar la función de correo electrónico masivo.
 MailSendSetupIs3=Si tiene alguna pregunta sobre cómo configurar su servidor SMTP, puede preguntar a %s.
@@ -109,7 +103,6 @@ NbOfTargetedContacts=Número actual de correos electrónicos de contacto
 UseFormatFileEmailToTarget=El archivo importado debe tener formato <strong> correo electrónico; nombre; nombre; otro </ strong>
 UseFormatInputEmailToTarget=Introduzca una cadena con formato <strong> correo electrónico; nombre; nombre; otro </strong>
 AdvTgtTitle=Rellene los campos de entrada para preseleccionar los clientes/proveedores o contactos/direcciones de destino
-AdvTgtSearchTextHelp=Utilizar como comodines %%. Por ejemplo, para encontrar todos los elementos como <b>jean, joe, jim</b>, puede ingresar <b>j%%</b>, también puede usar ; como separador de valor, y uso ! para excepto este valor. Por ejemplo, <b>jean;joe;jim%%;!Jimo;!Jima%</b> apuntará a todos los jean, joe, comienza con jim pero no jimo y no todo lo que comienza con jima
 AdvTgtSearchIntHelp=Utilice el intervalo para seleccionar el valor int o float
 AdvTgtMaxVal=Valor máximo
 AdvTgtSearchDtHelp=Usar el intervalo para seleccionar el valor de fecha
@@ -123,7 +116,5 @@ AdvTgtAddContact=Añadir emails según criterio.
 AdvTgtLoadFilter=Filtro de carga
 NoContactWithCategoryFound=No hay contacto/dirección con una categoría encontrada
 NoContactLinkedToThirdpartieWithCategoryFound=No hay contacto/dirección con una categoría encontrada
-OutGoingEmailSetup=Configuración de correo saliente
-InGoingEmailSetup=Configuración de correo entrante
 ContactsWithThirdpartyFilter=Contactos con filtro de terceros
 Answered=Contestada
diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
index f7bc16c0fc9..8452c16f0ec 100644
--- a/htdocs/langs/es_EC/main.lang
+++ b/htdocs/langs/es_EC/main.lang
@@ -22,6 +22,7 @@ FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Conexión con la base de datos
 NoTemplateDefined=No hay plantilla disponible para este tipo de correo electrónico
 AvailableVariables=Variables de sustitución disponibles
+CurrentTimeZone=Zona horaria PHP (servidor)
 NoRecordFound=Ningún registro encontrado
 NoRecordDeleted=Ningún registro eliminado
 NoError=No hay error
@@ -64,6 +65,7 @@ FileWasNotUploaded=Se ha seleccionado un archivo para adjuntarlo, pero todavía
 NbOfEntries=Numero de entradas
 GoToWikiHelpPage=Lea la ayuda en línea (acceso a Internet es necesario)
 GoToHelpPage=Leer la ayuda
+HomePage=Página Principal
 DolibarrInHttpAuthenticationSoPasswordUseless=El modo de autenticación Dolibarr está configurado en <b>%s</b> en el archivo de configuración <b>conf.php</b>. <br> Esto significa que la base de datos de contraseñas es externa a Dolibarr, por lo que cambiar este campo puede no tener efecto.
 Undefined=Indefinido
 PasswordForgotten=¿Contraseña olvidada?
@@ -102,6 +104,7 @@ RemoveLink=Retire enlace
 AddToDraft=Añadir a redactar
 Update=Actualizar
 Close=Cerrado
+CloseAs=Establecer el estado en
 CloseBox=Retire widget desde su panel de control
 ConfirmSendCardByMail=¿Realmente desea enviar el contenido de esta tarjeta por correo a <b>%s</b>?
 Delete=Borrar
diff --git a/htdocs/langs/es_EC/modulebuilder.lang b/htdocs/langs/es_EC/modulebuilder.lang
index ffad475bff9..3c61371c2a3 100644
--- a/htdocs/langs/es_EC/modulebuilder.lang
+++ b/htdocs/langs/es_EC/modulebuilder.lang
@@ -48,7 +48,6 @@ SqlFileKey=Archivo SQL para las claves
 SqlFileKeyExtraFields=Archivo SQL para claves de atributos complementarios
 UseAsciiDocFormat=Puede usar el formato Markdown, pero se recomienda usar el formato Asciidoc (omparison entre .md y .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 NoTrigger=Sin disparador
-GoToApiExplorer=Ir a explorador de API
 ListOfDictionariesEntries=Lista de entradas de diccionarios
 ListOfPermissionsDefined=Lista de permisos definidos
 SeeExamples=Ver ejemplos aquí
@@ -83,7 +82,6 @@ UseSpecificEditorURL =Use una URL de editor específica
 UseSpecificFamily =Use una familia específica
 UseSpecificAuthor =Use un autor específico
 UseSpecificVersion =Use una versión inicial específica
-ModuleMustBeEnabled=El módulo / aplicación debe habilitarse primero
 IncludeDocGenerationHelp=Si marca esto, se generará algún código para agregar un cuadro "Generar documento" en el registro.
 ShowOnCombobox=Mostrar valor en el cuadro combinado
 KeyForTooltip=Clave para información sobre herramientas
diff --git a/htdocs/langs/es_EC/products.lang b/htdocs/langs/es_EC/products.lang
index 59bf558386b..c75401d2e14 100644
--- a/htdocs/langs/es_EC/products.lang
+++ b/htdocs/langs/es_EC/products.lang
@@ -61,6 +61,7 @@ NoteNotVisibleOnBill=Nota (no visible en facturas, propuestas...)
 ServiceLimitedDuration=Si el producto es un servicio con duración limitada:
 MultiPricesAbility=Múltiples segmentos de precios por producto / servicio (cada cliente está en un segmento de precios)
 MultiPricesNumPrices=Número de precios
+AssociatedProductsAbility=Enable Kits (set of several products)
 ParentProductsNumber=Número de producto de embalaje principal
 ParentProducts=Productos para los padres
 KeywordFilter=Filtro de palabras clave
@@ -102,7 +103,6 @@ NewRefForClone=Árbitro. de nuevo producto/servicio
 CustomerPrices=Precios de los clientes
 SuppliersPrices=Precios del proveedor
 SuppliersPricesOfProductsOrServices=Precios de proveedor (de productos o servicios)
-CustomCode=Código de Aduanas / Productos / HS
 Nature=Naturaleza del producto (material / acabado)
 g=gramo
 m=metro
@@ -116,7 +116,6 @@ AlwaysUseFixedPrice=Utilizar el precio fijo
 PriceByQuantity=Diferentes precios por cantidad
 DisablePriceByQty=Deshabilitar precios por cantidad
 PriceByQuantityRange=Rango Cantidad
-MultipriceRules=Reglas del segmento de precios
 UseMultipriceRules=Utilice las reglas de segmento de precios (definidas en la configuración del módulo del producto) para calcular automáticamente los precios de todos los demás segmentos de acuerdo con el primer segmento
 KeepEmptyForAutoCalculation=Manténgase vacío para que esto se calcule automáticamente de peso o volumen de productos
 VariantRefExample=Ejemplos: COL, TAMAÑO
diff --git a/htdocs/langs/es_EC/projects.lang b/htdocs/langs/es_EC/projects.lang
index ec9d4afe521..593d95f821b 100644
--- a/htdocs/langs/es_EC/projects.lang
+++ b/htdocs/langs/es_EC/projects.lang
@@ -46,10 +46,6 @@ AddTimeSpent=Crear tiempo
 AddHereTimeSpentForDay=Añadir aquí el tiempo dedicado a este día/tarea
 Activities=Tareas / actividades
 MyProjectsArea=Mis proyectos
-ProgressDeclared=Progreso declarado
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=El progreso declarado es menos %s que la progresión calculada
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=El progreso declarado es más %s que la progresión calculada
-ProgressCalculated=Progreso calculado
 Time=Hora
 ListOfTasks=Lista de tareas
 GoToListOfTimeConsumed=Ir a la lista de tiempo consumido
@@ -116,6 +112,7 @@ OpportunityProbability=Probabilidad de clientes potenciales
 OpportunityProbabilityShort=Probabilidad de plomo.
 OpportunityAmount=Cantidad de clientes potenciales
 OpportunityAmountShort=Cantidad de clientes potenciales
+OpportunityWeightedAmountShort=Opp. cantidad ponderada
 OpportunityAmountAverageShort=Cantidad de plomo promedio
 OpportunityAmountWeigthedShort=Cantidad de plomo ponderada
 WonLostExcluded=Ganado/perdido excluido
diff --git a/htdocs/langs/es_EC/sendings.lang b/htdocs/langs/es_EC/sendings.lang
index 08d25169ac0..db824ebf01e 100644
--- a/htdocs/langs/es_EC/sendings.lang
+++ b/htdocs/langs/es_EC/sendings.lang
@@ -17,6 +17,7 @@ OtherSendingsForSameOrder=Otros envíos para este pedido
 SendingsAndReceivingForSameOrder=Envíos y recibos para este pedido
 SendingsToValidate=Envíos para validar
 StatusSendingCanceled=Cancelado
+StatusSendingCanceledShort=Cancelado
 StatusSendingValidated=Validado (productos para enviar o ya enviar)
 StatusSendingProcessed=Procesada
 StatusSendingValidatedShort=validado
diff --git a/htdocs/langs/es_EC/ticket.lang b/htdocs/langs/es_EC/ticket.lang
index 1b7ecded84a..ae99f099a88 100644
--- a/htdocs/langs/es_EC/ticket.lang
+++ b/htdocs/langs/es_EC/ticket.lang
@@ -5,14 +5,12 @@ TicketDictType=Tipos - Tickets
 TicketDictCategory=Ticket - Grupos
 TicketDictSeverity=Ticket - Prioridades
 TicketTypeShortISSUE=Problema o Error
-TicketSeverityShortBLOCKING=Crítico/Bloqueo
 ErrorBadEmailAddress=Campo '%s' incorrecto
 MenuListNonClosed=Tikests abiertos
 TypeContact_ticket_internal_CONTRIBUTOR=Contribuyente
 TypeContact_ticket_external_SUPPORTCLI=Contacto con el cliente / seguimiento de incidentes
 OriginEmail=Origen del correo electrónico
 Notify_TICKET_SENTBYMAIL=Enviar mensaje del ticket por correo electrónico
-NotRead=No leer
 Read=Leer
 NeedMoreInformation=Esperando información
 Waiting=Esperando
diff --git a/htdocs/langs/es_EC/withdrawals.lang b/htdocs/langs/es_EC/withdrawals.lang
index ba83f5af30c..baadc69e3b1 100644
--- a/htdocs/langs/es_EC/withdrawals.lang
+++ b/htdocs/langs/es_EC/withdrawals.lang
@@ -77,6 +77,7 @@ SEPAFormYourBIC=Su código de identificación bancaria (BIC)
 PleaseCheckOne=Por favor, marque uno solo
 DirectDebitOrderCreated=Orden de domiciliación %s creada
 CreateForSepa=Crear un archivo de débito directo
+ICS=Creditor Identifier CI for direct debit
 END_TO_END=Etiqueta XML SEPA "EndToEndId": identificación única asignada por transacción
 USTRD=Etiqueta XML SEPA "no estructurada"
 ADDDAYS=Agregar días a la fecha de ejecución
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 62560e80262..cdfb3c7cb51 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -16,9 +16,11 @@ ThisService=Este servicio
 ThisProduct=Este producto
 DefaultForService=Predeterminado para el servicio
 DefaultForProduct=Predeterminado para el producto
+ProductForThisThirdparty=Producto para este tercero
+ServiceForThisThirdparty=Servicio para este tercero
 CantSuggest=No se puede sugerir
 AccountancySetupDoneFromAccountancyMenu=La mayor parte de la configuración de la contabilidad se realiza desde el menú %s
-ConfigAccountingExpert=Configuración de la contabilidad del módulo (doble entrada)
+ConfigAccountingExpert=Configuración del módulo contable (doble partida)
 Journalization=Procesar diarios
 Journals=Diarios
 JournalFinancial=Diarios financieros
@@ -48,6 +50,7 @@ CountriesExceptMe=Todos los países excepto %s
 AccountantFiles=Exportar documentos de origen
 ExportAccountingSourceDocHelp=Con esta herramienta, puede exportar los eventos de origen (lista y PDF) que se utilizaron para generar su contabilidad. Para exportar sus diarios, use la entrada de menú %s - %s.
 VueByAccountAccounting=Ver por cuenta contable
+VueBySubAccountAccounting=Ver por subcuenta contable
 
 MainAccountForCustomersNotDefined=Cuenta contable para clientes no definida en la configuración
 MainAccountForSuppliersNotDefined=Cuenta contable para proveedores no definida en la configuración
@@ -144,7 +147,7 @@ NotVentilatedinAccount=Cuenta sin contabilización en la contabilidad
 XLineSuccessfullyBinded=%s productos/servicios relacionada correctamente a una cuenta contable
 XLineFailedToBeBinded=%s productos/servicios sin cuenta contable
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a contabilizar que se muestran por página (máximo recomendado: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Número máximo de líneas en la lista y la página de enlace (recomendado: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ordenar las páginas de contabilización "A contabilizar" por los elementos más recientes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ordenar las páginas de contabilización "Contabilizadas" por los elementos más recientes
 
@@ -177,28 +180,29 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Cuenta operaciones pendientes de asignar
 DONATION_ACCOUNTINGACCOUNT=Cuenta contable para registrar donaciones
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Cuenta contable para registrar subscripciones
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Cuenta contable por defecto para registrar el depósito del cliente
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Cuenta contable por defecto para registrar el anticipo del cliente
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta contable predeterminada para los productos comprados (si no se define en el producto)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Cuenta contable por defecto para los productos comprados en EEC (se usa si no se define en la hoja de productos)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Cuenta contable por defecto para los productos comprados e importados fuera de la EEC (usado si no está definido en la hoja de productos)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cuenta contable predeterminada para los productos vendidos (si no se define en el producto)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Cuenta contable predeterminada para los productos vendidos en la CEE (si no se define en el producto)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Cuenta contable predeterminada para los productos vendidos fuera de la CEE (si no se define en el producto)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta contable predeterminada para los productos comprados (usada si no se define en el producto)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Cuenta contable por defecto para los productos comprados en CEE (usada si no se define en el producto)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Cuenta contable por defecto para los productos comprados e importados fuera de la CEE (usada si no se define en el producto)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cuenta contable predeterminada para los productos vendidos (usada si no se define en el producto)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Cuenta contable predeterminada para los productos vendidos en la CEE (usada si no se define en el producto)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Cuenta contable predeterminada para los productos vendidos fuera de la CEE (usada si no se define en el producto)
 
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Cuenta contable predeterminada para los servicios comprados (si no se define en el servicio)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Cuenta contable por defecto para los servicios comprados en EEC (utilizada si no está definida en la hoja de servicios)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Cuenta contable por defecto para los servicios comprados e importados fuera de la CEE (se usa si no se define en la hoja de servicios)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cuenta contable predeterminada para los servicios vendidos (si no se define en el servico)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Cuenta contable predeterminada para los servicios vendidos en la CEE (si no se define en el servico)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Cuenta contable predeterminada para los servicios vendidos fuera de la CEE (si no se define en el producto)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Cuenta contable predeterminada para los servicios comprados (usada si no se define en el servicio)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Cuenta contable por defecto para los servicios comprados en CEE (usada si no se define en el servicio)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Cuenta contable por defecto para los servicios comprados e importados fuera de la CEE (usada si no se define en el servicio)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cuenta contable predeterminada para los servicios vendidos (usada si no se define en el servicio)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Cuenta contable predeterminada para los servicios vendidos en la CEE (usada si no se define en el servicio)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Cuenta contable predeterminada para los servicios vendidos fuera de la CEE (usada si no se define en el producto)
 
 Doctype=Tipo de documento
 Docdate=Fecha
 Docref=Referencia
 LabelAccount=Descripción
 LabelOperation=Etiqueta operación
-Sens=Sentido
+Sens=Dirección
+AccountingDirectionHelp=Para una cuenta contable de un cliente, use Crédito para registrar un pago que recibió <br> Para una cuenta contable de un proveedor, use Débito para registrar un pago que usted realice
 LetteringCode=Cogido de letras
 Lettering=Letras
 Codejournal=Diario
@@ -206,7 +210,8 @@ JournalLabel=Etiqueta del diario
 NumPiece=Apunte
 TransactionNumShort=Núm. transacción
 AccountingCategory=Grupos personalizados
-GroupByAccountAccounting=Agrupar por cuenta contable
+GroupByAccountAccounting=Agrupar por cuenta del Libro Mayor
+GroupBySubAccountAccounting=Agrupar por cuenta de libro mayor auxiliar
 AccountingAccountGroupsDesc=Puedes definir aquí algunos grupos de cuentas contables. Se usarán para informes de contabilidad personalizados.
 ByAccounts=Por cuentas
 ByPredefinedAccountGroups=Por grupos predefinidos
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Pagos no vinculados a un producto/servicio
 OpeningBalance=Saldo inicial
 ShowOpeningBalance=Mostrar saldo inicial
 HideOpeningBalance=Ocultar saldo inicial
-ShowSubtotalByGroup=Mostrar subtotal por grupo
+ShowSubtotalByGroup=Mostrar subtotal por nivel
 
 Pcgtype=Grupo de cuenta
 PcgtypeDesc=Los grupos de cuentas se utilizan como criterios predefinidos de "filtro" y "agrupación" para algunos informes contables. Por ejemplo, 'INGRESOS' o 'GASTOS' se utilizan como grupos para las cuentas contables de productos para construir el informe de gastos / ingresos.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consulte aquí la lista de líneas de informes de gastos
 DescVentilExpenseReportMore=Si configura la cuentas contables de los tipos de informes de gastos, la aplicación será capaz de hacer el enlace entre sus líneas de informes de gastos y las cuentas contables, simplemente con un clic en el botón <strong>"%s"</strong> , Si no se ha establecido la cuenta contable en el diccionario o si todavía tiene algunas líneas no contabilizadas a alguna cuenta, tendrá que hacer una contabilización manual desde el menú "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consulte aquí las líneas de informes de gastos y sus cuentas contables
 
+Closure=Cierre anual
 DescClosure=Consulte aquí el número de movimientos por mes que no están validados y los años fiscales ya abiertos
 OverviewOfMovementsNotValidated=Paso 1 / Resumen de movimientos no validados. (Necesario para cerrar un año fiscal)
+AllMovementsWereRecordedAsValidated=Todos los movimientos se registraron como validados
+NotAllMovementsCouldBeRecordedAsValidated=No todos los movimientos pueden registrarse como validados
 ValidateMovements=Validar movimientos
 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
-SelectMonthAndValidate=Seleccionar mes y validar movimientos
 
 ValidateHistory=Vincular automáticamente
 AutomaticBindingDone=Vinculación automática finalizada
@@ -293,6 +300,7 @@ Accounted=Contabilizada en el Libro Mayor
 NotYetAccounted=Aún no contabilizada en el Libro Mayor
 ShowTutorial=Ver Tutorial
 NotReconciled=No reconciliado
+WarningRecordWithoutSubledgerAreExcluded=Advertencia, todas las operaciones sin una cuenta de libro mayor auxiliar definida se filtran y excluyen de esta vista
 
 ## Admin
 BindingOptions=Opciones de enlace
@@ -332,15 +340,16 @@ Modelcsv_quadratus=Exportar a Quadratus QuadraCompta
 Modelcsv_ebp=Exportar a EBP
 Modelcsv_cogilog=Eportar a Cogilog
 Modelcsv_agiris=Exportar a Agiris
-Modelcsv_LDCompta=Exportar para LD Compta (v9 y superior) (En pruebas)
-Modelcsv_LDCompta10=Exportar para LD Compta (v10 & superior)
+Modelcsv_LDCompta=Exportar a LD Compta (v9 y superior) (En pruebas)
+Modelcsv_LDCompta10=Exportar a LD Compta (v10 & superior)
 Modelcsv_openconcerto=Exportar a OpenConcerto (En pruebas)
 Modelcsv_configurable=Exportación CSV Configurable
 Modelcsv_FEC=Exportación FEC
+Modelcsv_FEC2=Exportar a FEC (con escritura de generación de fechas / documento invertido)
 Modelcsv_Sage50_Swiss=Exportación a Sage 50 Suiza
-Modelcsv_winfic=Exportar Winfic - eWinfic - WinSis Compta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5Export for Gestinum (v5)
+Modelcsv_winfic=Exportar a Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Exportar a Gestinum (v3)
+Modelcsv_Gestinumv5Export para Gestinum (v5)
 ChartofaccountsId=Id plan contable
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 12d860d8ecc..81056fb58e1 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -56,6 +56,8 @@ 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>
 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.
@@ -73,7 +75,7 @@ DisableJavascriptNote=Nota: Para propósitos de prueba o depuración. Para la op
 UseSearchToSelectCompanyTooltip=También si tiene un gran número de terceros (> 100 000), puede aumentar la velocidad mediante el establecimiento COMPANY_DONOTSEARCH_ANYWHERE constante a 1 en Configuración-> Otros. La búsqueda será limitada a la creación de cadena.
 UseSearchToSelectContactTooltip=También si usted tiene un gran número de terceros (> 100 000), puede aumentar la velocidad mediante el establecimiento CONTACT_DONOTSEARCH_ANYWHERE constante a 1 en Configuración-> Otros. La búsqueda será limitada a la creación de cadena.
 DelaiedFullListToSelectCompany=Esperar a que presione una tecla antes de cargar el contenido de la lista combinada de terceros <br>Esto puede incrementar el rendimiento si tiene un gran número de terceros, pero es menos conveniente.
-DelaiedFullListToSelectContact=Espera a que presione una tecla antes de cargar el contenido de la lista de contactos. <br> Esto puede incrementar el rendimiento si tiene un gran número de contactos, pero es menos conveniente.
+DelaiedFullListToSelectContact=Esperar a que presione una tecla antes de cargar el contenido de la lista de contactos. <br> Esto puede incrementar el rendimiento si tiene un gran número de contactos, pero es menos conveniente.
 NumberOfKeyToSearch=Número de caracteres para desencadenar la búsqueda: %s
 NumberOfBytes=Número de Bytes
 SearchString=Buscar cadena
@@ -85,7 +87,6 @@ ShowPreview=Ver vista previa
 ShowHideDetails=Mostrar-Ocultar detalles
 PreviewNotAvailable=Vista previa no disponible
 ThemeCurrentlyActive=Tema actualmente activo
-CurrentTimeZone=Zona horaria PHP (Servidor)
 MySQLTimeZone=Zona horaria MySql (base de datos)
 TZHasNoEffect=Las fechas se guardan y devueltas por el servidor de base de datos tal y como si se las hubieran enviado como una cadena. La zona horaria solamente tiene efecto si se usa la función UNIX_TIMESTAMP (que no debe ser usada por Dolibarr, por lo que la zona horaria de la base de datos no debe tener efecto, aunque se haya cambiado después de introducir los datos).
 Space=Área
@@ -103,7 +104,7 @@ NoMaxSizeByPHPLimit=Ninguna limitación interna en su servidor PHP
 MaxSizeForUploadedFiles=Tamaño máximo de los documentos a subir (0 para prohibir la subida)
 UseCaptchaCode=Utilización de código gráfico (CAPTCHA) en la página de inicio de sesión
 AntiVirusCommand=Ruta completa hacia el comando del antivirus
-AntiVirusCommandExample=Ejemplo para ClamAv Daemon (requiere clamav-daemon): //usr/bin/clamdscan<br> Ejemplo para ClamWin (muy lento): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe\n 
+AntiVirusCommandExample=Ejemplo para ClamAv Daemon (requiere clamav-daemon): /usr/bin/clamdscan<br> Ejemplo para ClamWin (muy lento): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe\n 
 AntiVirusParam= Parámetros complementarios en la línea de comandos
 AntiVirusParamExample=Ejemplo para ClamAv Daemon: --fdpass<br>Ejemplo para ClamWin: -- database="CC:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Configuración del módulo Contabilidad
@@ -153,8 +154,8 @@ 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=Eliminar todos los archivos temporales (sin riesgo de perder datos). Nota: la eliminación se realiza solo si el directorio temporal se creó hace 24 horas.
-PurgeDeleteTemporaryFilesShort=Eliminar archivos temporales
+PurgeDeleteTemporaryFiles=Eliminar todos los archivos de registro y temporales (sin riesgo de perder datos). Nota: La eliminación de archivos temporales se realiza solo si el directorio temporal se creó hace más de 24 horas.
+PurgeDeleteTemporaryFilesShort=Eliminar archivos de registro y temporales
 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
 PurgeNothingToDelete=Sin directorios o archivos a eliminar.
@@ -203,7 +204,7 @@ FeatureDisabledInDemo=Opción deshabilitada en demo
 FeatureAvailableOnlyOnStable=Funcionaliad disponible únicamente en versiones oficiales estables
 BoxesDesc=Los paneles son componentes que muestran algunos datos que pueden añadirse para personalizar algunas páginas. Puede elegir entre mostrar o no el panel mediante la selección de la página de destino y haciendo clic en 'Activar', o haciendo clic en la papelera para desactivarlo.
 OnlyActiveElementsAreShown=Sólo los elementos de <a href="%s">módulos activados</a> son mostrados.
-ModulesDesc=Los módulos/aplicaciones definen qué funcionalidad está habilitada en el software. Algunos módulos requieren permisos que se deben conceder a los usuarios después de activar el módulo. Haga clic en el botón de on/off <span class="small valignmiddle">%s</span>de cada módulo para habilitar o deshabilitar un módulo / aplicación.
+ModulesDesc=Los módulos/aplicaciones definen qué funcionalidad está habilitada en el software. Algunos módulos requieren permisos que se deben conceder a los usuarios después de activar el módulo. Haga clic en el botón de on/off <span class="small valignmiddle">%s</span>de cada módulo para habilitar o deshabilitar un módulo/aplicación.
 ModulesMarketPlaceDesc=Puede encontrar más módulos para descargar en sitios web externos en Internet ...
 ModulesDeployDesc=Si los permisos en su sistema de archivos lo permiten, puede utilizar esta herramienta para instalar un módulo externo. El módulo estará entonces visible en la pestaña <strong>%s</strong>.
 ModulesMarketPlaces=Buscar módulos externos...
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 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>
 HelpCenterDesc1=Aquí hay algunos recursos para obtener ayuda y soporte de Dolibarr
@@ -274,7 +276,7 @@ NoticePeriod=Plazo de aviso
 NewByMonth=Nuevo por mes
 Emails=E-Mails
 EMailsSetup=Configuración e-mails
-EMailsDesc=Esta página le permite definir las opciones para enviar e-mails.
+EMailsDesc=Esta página le permite definir los parámetros u opciones para enviar e-mails.
 EmailSenderProfiles=Perfiles de remitentes de e-mails
 EMailsSenderProfileDesc=Puede mantener esta sección vacía. Si indica algunos e-mails aquí, se agregarán a la lista de posibles remitentes en el combobox cuando escriba un nuevo e-mail
 MAIN_MAIL_SMTP_PORT=Puerto del servidor SMTP (Por defecto en php.ini: <b>%s</b>)
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Ejemplos con la configuración actual
 ListOfDirectories=Listado de directorios de plantillas OpenDocument
 ListOfDirectoriesForModelGenODT=Listado de directorios que contienen las plantillas de archivos con el formato OpenDocument.<br>Ponga aquí la ruta completa de directorios.<br>Añada un retorno de carro entre cada directorio<br> Para agregar un directorio del módulo GED, agregue aquí <b>DOL_DATA_ROOT/ecm/sunombrededirectorio.</b><br><br>Los archivos de esos directorios deben terminar con <b>.odt</b> o <b>.ods</b>.
 NumberOfModelFilesFound=Número de archivos de plantillas ODT/ODS encontrados en estos directorios
-ExampleOfDirectoriesForModelGen=Ejemplos de sintaxis:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Ejemplos de sintaxis: <br>c:\\myapp\\mydocumentdir\\mysubdir<br> /home/myapp/mydocumentdir/mysubdir <br> DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=Colocando los siguientes tags en la plantilla, obtendrá una sustitución con el valor personalizado al generar el documento:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Crear_un_modelo_de_documento_ODT
 FirstnameNamePosition=Orden visualización nombre/apellidos
@@ -406,7 +408,7 @@ UrlGenerationParameters=Seguridad de las URLs
 SecurityTokenIsUnique=¿Usar un parámetro securekey único para cada URL?
 EnterRefToBuildUrl=Introduzca la referencia del objeto %s
 GetSecuredUrl=Obtener la URL calculada
-ButtonHideUnauthorized=Ocultar botones de acciones no autorizadas a los usuarios no administradores en vez de mostrarlos atenuados
+ButtonHideUnauthorized=Ocultar los botones de acción no autorizados también para los usuarios internos (solo en gris de lo contrario)
 OldVATRates=Tasa de IVA antigua
 NewVATRates=Tasa de IVA nueva
 PriceBaseTypeToChange=Cambiar el precio cuya referencia de base es
@@ -668,7 +670,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 gestionar los márgenes de beneficio
+Module59000Desc=Módulo para seguir márgenes
 Module60000Name=Comisiones
 Module60000Desc=Módulo para gestionar las comisiones de venta
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ YouUseBestDriver=Está usando el driver %s, actualmente es el mejor driver dispo
 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.
 SearchOptim=Buscar optimización
-YouHaveXObjectUseSearchOptim=Tiene %s %s en su base de datos. Debería añadir la constante %s a 1 en Inicio-Configuración-Varios, limitando la búsqueda al principio de la cadena lo que hace posible que la base de datos use el índice y se obtenga una respuesta inmediata.
+YouHaveXObjectUseSearchOptim=Tiene %s %s en la base de datos. Puede agregar la constante %s a 1 en Inicio-Configuración-Otros. Limite la búsqueda al comienzo de las cadenas, lo que hace posible que la base de datos use índices y debería obtener una respuesta inmediata.
 YouHaveXObjectAndSearchOptimOn=Tiene %s %s en su base de datos y la constante %s configurada como 1 en Inicio-Configuración-Varios
 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.
@@ -1314,7 +1316,7 @@ 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".
 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=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".
+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 ".
 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)
@@ -1421,7 +1423,7 @@ 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í"
 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=Document templates for documents generated from member record
+MembersDocModules=Plantillas de documentos para documentos generados a partir de registros de miembros
 ##### LDAP setup #####
 LDAPSetup=Configuración del módulo LDAP
 LDAPGlobalParameters=Parámetros globales
@@ -1596,8 +1598,13 @@ 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)
+DoNotAddProductDescAtAddLines=No agregue la descripción del producto (de la tarjeta del producto) al enviar, agregue líneas en los formularios
+OnProductSelectAddProductDesc=Cómo utilizar la descripción de los productos al agregar un producto como 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.
+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=Visualización de las descripciones de productos en el idioma del tercero
+ViewProductDescInThirdpartyLanguageAbility=Mostrar descripciones de productos en formularios en el idioma del tercero (de lo contrario, en el idioma del usuario)
 UseSearchToSelectProductTooltip=También si usted tiene una gran cantidad de producto (> 100 000), puede aumentar la velocidad mediante el establecimiento PRODUCT_DONOTSEARCH_ANYWHERE constante a 1 en Configuración-> Otros. La búsqueda será limitada al inicio de la cadena.
 UseSearchToSelectProduct=Esperar a que presione una tecla antes de cargar el contenido de la lista combinada de productos (Esto puede incrementar el rendimiento si tiene un gran número de productos, pero es menos conveniente) 
 SetDefaultBarcodeTypeProducts=Tipo de código de barras utilizado por defecto para los productos
@@ -1672,7 +1679,7 @@ AdvancedEditor=Editor avanzado
 ActivateFCKeditor=Activar editor avanzado para :
 FCKeditorForCompany=Creación/edición WYSIWIG de la descripción y notas de los terceros
 FCKeditorForProduct=Creación/edición WYSIWIG de la descripción y notas de los productos/servicios
-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>
+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>
 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)
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Menús personalizados no enlazados a un menú superio
 NewMenu=Nuevo menú
 MenuHandler=Gestor de menús
 MenuModule=Módulo origen
-HideUnauthorizedMenu= Ocultar también los menús no autorizados a usuarios internos (si no sólo atenuados)
+HideUnauthorizedMenu=Ocultar menús no autorizados también para usuarios internos (solo en gris de lo contrario)
 DetailId=Identificador del menú
 DetailMenuHandler=Nombre del gestor de menús
 DetailMenuModule=Nombre del módulo si la entrada del menú es resultante de un módulo
@@ -1738,10 +1745,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Establecer automáticamente este valor por defecto
 AGENDA_DEFAULT_FILTER_TYPE=Establecer por defecto este tipo de evento en el filtro de búsqueda en la vista de la agenda
 AGENDA_DEFAULT_FILTER_STATUS=Establecer por defecto este estado de eventos en el filtro de búsqueda en la vista de la agenda
 AGENDA_DEFAULT_VIEW=Establecer la vista por defecto al seleccionar el menú 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=Habilitar el recordatorio de eventos <b> en el navegador del usuario </b> (Cuando se alcanza la fecha de recordatorio, el navegador muestra una ventana emergente. Cada usuario puede deshabilitar dichas notificaciones desde la configuración de notificaciones del navegador).
 AGENDA_REMINDER_BROWSER_SOUND=Activar sonido de notificación
-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 task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL=Habilitar el recordatorio de eventos <b> por correo electrónico </b> (la opción de recordatorio/retraso se puede definir en cada evento).
+AGENDA_REMINDER_EMAIL_NOTE=Nota: La frecuencia de la tarea %s debe ser suficiente para asegurarse de que los recordatorios se envíen en el momento correcto.
 AGENDA_SHOW_LINKED_OBJECT=Mostrar el link en la agenda
 ##### Clicktodial #####
 ClickToDialSetup=Configuración del módulo Click To Dial
@@ -1763,7 +1770,7 @@ 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.
-CashDeskForceDecreaseStockDesc=Disminuir primero lo más antiguo en las fechas de compra y venta.
+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 #####
 BookmarkSetup=Configuración del módulo Marcadores
@@ -1983,11 +1990,12 @@ EMailHost=Host del servidor de e-mail IMAP
 MailboxSourceDirectory=Directorio fuente del buzón
 MailboxTargetDirectory=Directorio de destino del buzón
 EmailcollectorOperations=Operaciones a realizar por el colector
+EmailcollectorOperationsDesc=Las operaciones se ejecutan de arriba hacia abajo.
 MaxEmailCollectPerCollect=Número máximo de e-mails recolectados por la recolección
 CollectNow=Recoger ahora
 ConfirmCloneEmailCollector=¿Está seguro de que desea clonar el recolector de e-mails %s?
-DateLastCollectResult=Fecha de última recolección probada
-DateLastcollectResultOk=Fecha última recolección exitosa
+DateLastCollectResult=Fecha del último intento de recopilación
+DateLastcollectResultOk=Fecha del último éxito de recopilación
 LastResult=Último resultado
 EmailCollectorConfirmCollectTitle=Confirmación recolección e-mail
 EmailCollectorConfirmCollect=¿Desea ejecutar la recolección de este recolector ahora?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Mensaje de una conversación iniciada por un primer e-mail env
 WithoutDolTrackingID=Mensaje de una conversación iniciada por un primer e-mail NO enviado desde Dolibarr
 WithDolTrackingIDInMsgId=Mensaje enviado desde Dolibarr
 WithoutDolTrackingIDInMsgId=Mensaje NO enviado desde Dolibarr
-CreateCandidature=Crear candidatura
+CreateCandidature=Crear solicitud de empleo
 FormatZip=Código postal
 MainMenuCode=Código de entrada del menú (menú principal)
 ECMAutoTree=Mostrar arbol automático GED
@@ -2065,7 +2073,7 @@ NotAPublicIp=No es una IP pública
 MakeAnonymousPing=Realice un Ping anónimo '+1' al servidor de la base Dolibarr (realizado 1 vez tras la instalación) para permitir que la base cuente la cantidad de instalación de Dolibarr.
 FeatureNotAvailableWithReceptionModule=Función no disponible cuando el módulo Recepción está activado
 EmailTemplate=Plantilla para e-mail
-EMailsWillHaveMessageID=Los correos electrónicos tendrán una etiqueta 'Referencias' que coincida con esta sintaxis
+EMailsWillHaveMessageID=Los e-mais tendrán una etiqueta 'Referencias' que coincida con esta sintaxis
 PDF_USE_ALSO_LANGUAGE_CODE=Si desea duplicar algunos textos en su PDF en 2 idiomas diferentes en el mismo PDF generado, debe establecer aquí este segundo idioma para que el PDF generado contenga 2 idiomas diferentes en la misma página, el elegido al generar el PDF y este ( solo unas pocas plantillas PDF lo admiten). Mantener vacío para 1 idioma por PDF.
 FafaIconSocialNetworksDesc=Ingrese aquí el código de un ícono FontAwesome. Si no sabe qué es FontAwesome, puede usar el valor genérico fa-address-book.
 FeatureNotAvailableWithReceptionModule=Función no disponible cuando el módulo Recepción está activado
@@ -2076,10 +2084,14 @@ MeasuringScaleDesc=La escala es el número de lugares que tiene que mover la par
 TemplateAdded=Plantilla añadida
 TemplateUpdated=Plantilla actualizada
 TemplateDeleted=Plantilla eliminada
-MailToSendEventPush=Correo electrónico de recordatorio de evento
+MailToSendEventPush=E-mail de recordatorio de evento
 SwitchThisForABetterSecurity=Cambiar el valor a %s es lo recomendado para una mayor seguridad
 DictionaryProductNature= Naturaleza del producto
 CountryIfSpecificToOneCountry=País (si es específico de un país determinado)
 YouMayFindSecurityAdviceHere=Puede encontrar un aviso de seguridad aqui.
 ModuleActivatedMayExposeInformation=Este modulo puede exponer datos sensibles. Si no lo necesita, desactivelo.
 ModuleActivatedDoNotUseInProduction=Un modulo diseñado para desarrollo ha sido habilitado. No lo habilite en un entorno de produccion.
+CombinationsSeparator=Carácter separador para las combinaciones de productos
+SeeLinkToOnlineDocumentation=Ver enlace a la documentación online del menú superior para ejemplos
+SHOW_SUBPRODUCT_REF_IN_PDF=Si se utiliza la función "%s" del módulo <b>%s</b>, muestra los detalles de los subproductos de un kit en PDF.
+AskThisIDToYourBank=Comuníquese con su banco para obtener esta identificación
diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index ecf2af5c4f4..ecf81d8bad2 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Número de eventos
 ListOfActions=Listado de eventos
 EventReports=Informes de eventos
 Location=Localización
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Evento asignado a cualquier usuario del grupo
 EventOnFullDay=Evento para todo el día
 MenuToDoActions=Eventos incompletos
 MenuDoneActions=Eventos terminados
@@ -63,7 +63,7 @@ ShipmentClassifyClosedInDolibarr=Expedición %s clasificada como pagada
 ShipmentUnClassifyCloseddInDolibarr=Envío %s clasificado como reabierto
 ShipmentBackToDraftInDolibarr=Envío %s ha sido devuelto al estado de borrador
 ShipmentDeletedInDolibarr=Expedición %s eliminada
-ReceptionValidatedInDolibarr=Reception %s validated
+ReceptionValidatedInDolibarr=Recepción %s validada
 OrderCreatedInDolibarr=Pedido %s creado
 OrderValidatedInDolibarr=Pedido %s validado
 OrderDeliveredInDolibarr=Pedido %s clasificado como enviado
@@ -86,8 +86,8 @@ ProposalDeleted=Presupuesto eliminado
 OrderDeleted=Pedido eliminado
 InvoiceDeleted=Factura eliminada
 DraftInvoiceDeleted=Borrador de factura eliminado
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_DELETEInDolibarr=Contact %s deleted
+CONTACT_CREATEInDolibarr=Contacto %s creado
+CONTACT_DELETEInDolibarr=Contacto %s eliminado
 PRODUCT_CREATEInDolibarr=Producto %s creado
 PRODUCT_MODIFYInDolibarr=Producto %s modificado
 PRODUCT_DELETEInDolibarr=Producto %s eliminado
@@ -152,6 +152,7 @@ ActionType=Tipo de evento
 DateActionBegin=Fecha de inicio del evento
 ConfirmCloneEvent=¿Esta seguro de querer clonar el evento <b>%s</b>?
 RepeatEvent=Repetir evento
+OnceOnly=Una sola vez
 EveryWeek=Cada semana
 EveryMonth=Cada mes
 DayOfMonth=Día del mes
@@ -160,9 +161,9 @@ DateStartPlusOne=Fecha inicio +1 hora
 SetAllEventsToTodo=Establecer todos los eventos para hacer
 SetAllEventsToInProgress=Establecer todos los eventos en progreso
 SetAllEventsToFinished=Establecer todos los eventos para finalizar
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+ReminderTime=Período de recordatorio antes del evento
+TimeType=Tipo de duración
+ReminderType=Tipo de devolución de llamada
+AddReminder=Crea una notificación de recordatorio automática para este evento
+ErrorReminderActionCommCreation=Error al crear la notificación de recordatorio para este evento
+BrowserPush=Notificación emergente del navegador
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index 38c78945dc7..748edda9c76 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -173,10 +173,11 @@ SEPAMandate=Mandato SEPA
 YourSEPAMandate=Su mandato SEPA
 FindYourSEPAMandate=Este es su mandato SEPA para autorizar a nuestra empresa a realizar un petición de débito directo a su banco. Gracias por devolverlo firmado (escaneo del documento firmado) o enviado por correo a
 AutoReportLastAccountStatement=Rellenar automáticamente el campo 'número de extracto bancario' con el último número de extracto cuando realice la conciliación
-CashControl=Caja de efectivo POS
-NewCashFence=Nueva Caja de efectivo
+CashControl=Cierre de caja del POS
+NewCashFence=Nuevo 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=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
+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
diff --git a/htdocs/langs/es_ES/blockedlog.lang b/htdocs/langs/es_ES/blockedlog.lang
index 3e23cf955d5..576218090d6 100644
--- a/htdocs/langs/es_ES/blockedlog.lang
+++ b/htdocs/langs/es_ES/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Supresión lógica de la donación.
 logMEMBER_SUBSCRIPTION_CREATE=Suscripción de miembro creada
 logMEMBER_SUBSCRIPTION_MODIFY=Suscripción de miembro modificada
 logMEMBER_SUBSCRIPTION_DELETE=Suscripción miembro eliminación lógica
-logCASHCONTROL_VALIDATE=Registro de la caja de efectivo
+logCASHCONTROL_VALIDATE=Registro de cierres de caja
 BlockedLogBillDownload=Descarga de factura de cliente
 BlockedLogBillPreview=Vista previa de la factura del cliente
 BlockedlogInfoDialog=Detalles del registro
diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang
index c5871f7db00..cc519ff040a 100644
--- a/htdocs/langs/es_ES/boxes.lang
+++ b/htdocs/langs/es_ES/boxes.lang
@@ -27,7 +27,7 @@ BoxTitleLastSuppliers=Últimos %s proveedores registrados
 BoxTitleLastModifiedSuppliers=Últimos %sproveedores modificados
 BoxTitleLastModifiedCustomers=Últimos %s clientes modificados
 BoxTitleLastCustomersOrProspects=Últimos %s clientes o clientes potenciales
-BoxTitleLastCustomerBills=Últimas %s facturas de clientes modificadas
+BoxTitleLastCustomerBills=Últimas %s facturas a clientes modificadas
 BoxTitleLastSupplierBills=Últimas %s facturas de proveedor modificadas
 BoxTitleLastModifiedProspects=Últimos %s presupuestos modificados
 BoxTitleLastModifiedMembers=Últimos %s miembros
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Últimas %s donaciones modificadas
 BoxTitleLastModifiedExpenses=Últimos %s informes de gastos modificados
 BoxTitleLatestModifiedBoms=Últimas %s Listas de materiales modificadas 
 BoxTitleLatestModifiedMos=Últimas %s Órdenes de Fabricación modificadas 
+BoxTitleLastOutstandingBillReached=Clientes con máximo pendiente superado
 BoxGlobalActivity=Actividad global
 BoxGoodCustomers=Buenos clientes
 BoxTitleGoodCustomers=%s buenos clientes
+BoxScheduledJobs=Tareas programadas
+BoxTitleFunnelOfProspection=Embudo de oportunidad
 FailedToRefreshDataInfoNotUpToDate=Error al actualizar el RSS. Último refresco correcto: %s
 LastRefreshDate=Último refresco
 NoRecordedBookmarks=No hay marcadores personales.
@@ -83,8 +86,8 @@ BoxTitleLatestModifiedSupplierOrders=Últimos %s pedidos de clientes modificados
 BoxTitleLastModifiedCustomerBills=Últimas %s  facturas a clientes modificadas
 BoxTitleLastModifiedCustomerOrders=Últimos %s pedidos de clientes modificados
 BoxTitleLastModifiedPropals=Últimos %s presupuestos modificados
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Últimos %s trabajos modificados 
+BoxTitleLatestModifiedCandidatures=Últimas %s candidaturas modificadas 
 ForCustomersInvoices=Facturas a clientes
 ForCustomersOrders=Pedidos de clientes
 ForProposals=Presupuestos
@@ -92,8 +95,8 @@ LastXMonthRolling=Los últimos %s meses consecutivos
 ChooseBoxToAdd=Añadir panel a su tablero
 BoxAdded=El widget fué agregado a su panel de control
 BoxTitleUserBirthdaysOfMonth=Cumpleaños de este mes (usuarios)
-BoxLastManualEntries=Últimas entradas manuales en contabilidad
-BoxTitleLastManualEntries=%s últimas entradas manuales
+BoxLastManualEntries=Último registro contable introducido manualmente o sin documento fuente
+BoxTitleLastManualEntries=%s último registro ingresado manualmente o sin documento fuente
 NoRecordedManualEntries=Sin registros de entradas manuales en contabilidad
 BoxSuspenseAccount=Cuenta contable operación con cuenta suspendida
 BoxTitleSuspenseAccount=Número de líneas no asignadas
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=La cuenta de suspenso no está definida
 BoxLastCustomerShipments=Últimos envíos a clientes
 BoxTitleLastCustomerShipments=Últimos %s envíos a clientes 
 NoRecordedShipments=Ningún envío a clientes registrado
+BoxCustomersOutstandingBillReached=Clientes con límite pendiente alcanzado
 # Pages
 AccountancyHome=Contabilidad
+ValidatedProjects=Proyectos validados
diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang
index bf0b61bff10..d9501021ef0 100644
--- a/htdocs/langs/es_ES/cashdesk.lang
+++ b/htdocs/langs/es_ES/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=Módulo POS
 BasicPhoneLayout=Utilizar diseño básico para teléfonos.
 SetupOfTerminalNotComplete=La configuración del terminal %s no está completa
 DirectPayment=Pago directo
-DirectPaymentButton=Add a "Direct cash payment" button
+DirectPaymentButton=Añadir un botón "Pago directo en efectivo"
 InvoiceIsAlreadyValidated=La factura ya está validada
 NoLinesToBill=No hay líneas para facturar
 CustomReceipt=Recibo personalizado
@@ -94,31 +94,33 @@ TakeposConnectorMethodDescription=Módulo externo para impresión directa.
 PrintMethod=Método de impresión
 ReceiptPrinterMethodDescription=Método potente con muchos parámetros. Completamente personalizable con plantillas. No se puede imprimir desde la nube.
 ByTerminal=Por terminal
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
+TakeposNumpadUsePaymentIcon=Usar icono de pago en lugar del texto en los botones de pago del teclado numérico
 CashDeskRefNumberingModules=Módulo de numeración para el TPV
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag es usado para añadir el número de terminal
 TakeposGroupSameProduct=Agrupar mismas líneas de producto
 StartAParallelSale=Nueva venta simultánea 
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Cierre de caja
+SaleStartedAt=Oferta comenzada en %s
+ControlCashOpening=Controle la ventana emergente de efectivo al abrir POS
+CloseCashFence=Control de cierre de caja
 CashReport=Arqueo
 MainPrinterToUse=Impresora principal
 OrderPrinterToUse=Impresora de pedido
 MainTemplateToUse=Plantilla de impresión
 OrderTemplateToUse=Plantilla de impresión para pedidos
 BarRestaurant=Bar Restaurante
-AutoOrder=Order by the customer himself
+AutoOrder=Auto pedido
 RestaurantMenu=Carta
 CustomerMenu=Carta de cliente
-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
+ScanToMenu=Escanee el código QR para ver el menú
+ScanToOrder=Escanee el código QR para realizar un pedido
+Appearance=Apariencia
+HideCategoryImages=Ocultar imágenes de categoría
+HideProductImages=Ocultar imágenes de productos
+NumberOfLinesToShow=Número de líneas de imágenes para mostrar
+DefineTablePlan=Definir plan de tablas
+GiftReceiptButton=Agregar un botón "Ticket regalo"
+GiftReceipt=Ticket regalo
+ModuleReceiptPrinterMustBeEnabled=Debe activarse primero el módulo de impresora de tickets
+AllowDelayedPayment=Permitir pago aplazado
+PrintPaymentMethodOnReceipts=Imprimir método de pago en tickets|recibos
+WeighingScale=Balanza
diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang
index a48a95c6da2..b50d6c93e65 100644
--- a/htdocs/langs/es_ES/categories.lang
+++ b/htdocs/langs/es_ES/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Área etiquetas/categorías Proyectos
 UsersCategoriesArea=Área etiquetas/categorías Usuarios
 SubCats=Subcategorías
 CatList=Listado de etiquetas/categorías
+CatListAll=Lista de etiquetas / categorías (todos los tipos)
 NewCategory=Nueva etiqueta/categoría
 ModifCat=Modificar etiqueta/categoría
 CatCreated=Etiqueta/categoría creada
@@ -65,24 +66,30 @@ UsersCategoriesShort=Área etiquetas/categorías Usuarios
 StockCategoriesShort=Etiquetas/categorías almacenes
 ThisCategoryHasNoItems=Esta categoría no contiene ningún objeto
 CategId=Id etiqueta/categoría
+ParentCategory=Etiqueta/categoría principal
+ParentCategoryLabel=Etiqueta de etiqueta/categoría principal
 CatSupList=Listado de etiquetas/categorías de proveedores
-CatCusList=Listado de etiquetas/categorías de clientes
+CatCusList=Listado de etiquetas/categorías de clientes/potenciales
 CatProdList=Listado de etiquetas/categorías de productos
 CatMemberList=Listado de etiquetas/categorías de miembros
 CatContactList=Listado de etiquetas/categorías de contactos
-CatSupLinks=Enlaces entre proveedores y etiquetas/categorías
+CatProjectsList=Listado de etiquetas/categorías de proyectos
+CatUsersList=Listado de etiquetas/categorías de usuarios
+CatSupLinks=Vínculos entre proveedores y etiquetas/categorías
 CatCusLinks=Enlaces entre clientes/clientes potenciales y etiquetas/categorías
 CatContactsLinks=Enlaces entre contactos/direcciones y etiquetas/categorías
 CatProdLinks=Enlaces entre productos/servicios y etiquetas/categorías
-CatProJectLinks=Enlaces entre proyectos y etiquetas/categorías
+CatMembersLinks=Enlace entre miembros y etiquetas/categorías
+CatProjectsLinks=Enlaces entre proyectos y etiquetas/categorías
+CatUsersLinks=Vínculos entre usuarios y etiquetas/categorías
 DeleteFromCat=Eliminar de la etiqueta/categoría
 ExtraFieldsCategories=Campos adicionales
 CategoriesSetup=Configuración de etiquetas/categorías
 CategorieRecursiv=Enlazar con la etiqueta/categoría automáticamente
 CategorieRecursivHelp=Si la opción está activada, cuando agrega un producto a una subcategoría, el producto también se agregará a la categoría principal.
 AddProductServiceIntoCategory=Añadir el siguiente producto/servicio
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
+AddCustomerIntoCategory=Asignar categoría al cliente
+AddSupplierIntoCategory=Asignar categoría a proveedor
 ShowCategory=Mostrar etiqueta/categoría
 ByDefaultInList=Por defecto en lista
 ChooseCategory=Elija una categoría
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index 6a1e2a35020..3a99ea2432b 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=Número EORI
 ProfId6AT=-
 ProfId1AU=ABN
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=N° colegiado
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=Número EORI
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=UID-Nummer
+ProfId1CH=Número UID
 ProfId2CH=-
 ProfId3CH=Número federado
 ProfId4CH=Num registro de comercio
-ProfId5CH=EORI number
+ProfId5CH=Número EORI
 ProfId6CH=-
 ProfId1CL=R.U.T.
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Id prof. 1 (USt.-IdNr)
 ProfId2DE=Id prof. 2 (USt.-Nr)
 ProfId3DE=Id prof. 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=Número EORI
 ProfId6DE=-
 ProfId1ES=CIF/NIF
 ProfId2ES=Núm. seguridad social
 ProfId3ES=CNAE
 ProfId4ES=Núm. colegiado
-ProfId5ES=EORI number
+ProfId5ES=Número EORI
 ProfId6ES=-
 ProfId1FR=SIREN
 ProfId2FR=SIRET
 ProfId3FR=NAF (Ex APE)
 ProfId4FR=RCS/RM
-ProfId5FR=EORI number
+ProfId5FR=Número EORI
 ProfId6FR=-
 ProfId1GB=Número registro
 ProfId2GB=-
@@ -202,12 +202,12 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=Número EORI
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=Número EORI
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
@@ -225,13 +225,13 @@ ProfId1NL=Número KVK
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=EORI number
+ProfId5NL=Número EORI
 ProfId6NL=-
 ProfId1PT=NIPC
 ProfId2PT=Núm. seguridad social
 ProfId3PT=Num reg. comercial
 ProfId4PT=Conservatorio
-ProfId5PT=EORI number
+ProfId5PT=Número EORI
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +255,7 @@ ProfId1RO=CUI
 ProfId2RO=Prof ID 2 (Numero de registro)
 ProfId3RO=CAEN
 ProfId4RO=EUID
-ProfId5RO=EORI number
+ProfId5RO=Número EORI
 ProfId6RO=-
 ProfId1RU=OGRN
 ProfId2RU=INN
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Verificar el CIF/NIF intracomunitario en la web de la
 VATIntraManualCheck=Puede también realizar una verificación manual en la web de la comisión europea <a href="%s" target="_blank">%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=Forma jurídica
+JuridicalStatus=Tipo de entidad comercial
 Workforce=Personal
 Staff=Empleados
 ProspectLevelShort=Potencial
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index b0b4b087cb1..2fd8288fc12 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -69,7 +69,7 @@ SocialContribution=Impuestos sociales o fiscales
 SocialContributions=Impuestos sociales o fiscales
 SocialContributionsDeductibles=Impuestos sociales o fiscales deducibles
 SocialContributionsNondeductibles=Impuestos sociales o fiscales no deducibles
-DateOfSocialContribution=Date of social or fiscal tax
+DateOfSocialContribution=Fecha del impuesto social o fiscal
 LabelContrib=Etiqueta
 TypeContrib=Tipo
 MenuSpecialExpenses=Pagos especiales
@@ -111,7 +111,7 @@ Refund=Devolución
 SocialContributionsPayments=Pagos tasas sociales/fiscales
 ShowVatPayment=Ver pagos IVA
 TotalToPay=Total a pagar
-BalanceVisibilityDependsOnSortAndFilters=El balance es visible en esta lista sólo si la tabla está ordenada ascendente en %s y se filtra para 1 cuenta bancaria
+BalanceVisibilityDependsOnSortAndFilters=El saldo es visible en esta lista solo si la tabla se ordena en %s y se filtra en 1 cuenta bancaria (sin otros filtros)
 CustomerAccountancyCode=Código contable cliente
 SupplierAccountancyCode=Código contable proveedor
 CustomerAccountancyCodeShort=Cód. cuenta cliente
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=¿Está seguro de querer eliminar este pago de t
 ExportDataset_tax_1=tasas sociales y fiscales y pagos
 CalcModeVATDebt=Modo <b>%sIVA sobre facturas emitidas%s</b>.
 CalcModeVATEngagement=Modo <b>%sIVA sobre facturas cobradas%s</b>.
-CalcModeDebt=Análisis de facturas registradas conocidas incluso si aún no se encuentran contabilizadas en el libro mayor.
+CalcModeDebt=Análisis de documentos registrados conocidos incluso si aún no están contabilizados en el libro mayor.
 CalcModeEngagement=Análisis de los pagos registrados conocidos, incluso si aún no se encuentran contabilizados en el Libro mayor.
 CalcModeBookkeeping=Análisis de los datos registrados en el Libro mayor
 CalcModeLT1= Modo <b>%sRE facturas a clientes - facturas de proveedores%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Resumen anual del balance de ingresos y gastos
 AnnualByCompanies=Balance de ingresos y gastos, por grupos de cuenta predefinidos
 AnnualByCompaniesDueDebtMode=Balance de ingresos y gastos, desglosado por terceros, en modo<b>%sCréditos-Deudas%s</b> llamada <b>contabilidad de compromiso</b>.
 AnnualByCompaniesInputOutputMode=Balance de ingresos y gastos, desglosado por terceros, en modo <b>%sIngresos-Gastos%s</b> llamada <b>contabilidad de caja</b>.
-SeeReportInInputOutputMode=Consulte %sanálisis de pagos%s para obtener un cálculo de los pagos efectuados, incluso si aún no se han contabilizado en el Libro mayor.
-SeeReportInDueDebtMode=Consulte %sanálisis de facturas %s para un cálculo basado en facturas registradas conocidas, incluso si aún no se han contabilizado en Libro mayor.
-SeeReportInBookkeepingMode=Consulte el <b>%sInforme de facturación%s</b> para realizar un cálculo en la <b>Tabla Libro mayor</b>
+SeeReportInInputOutputMode=Consulte <b> %sanálisis de pagos%s </b> para obtener un cálculo basado en <b> pagos registrados </b> realizados incluso si aún no están contabilizados en el Libro Mayor
+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
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Muestra un registro en su libro mayor con cue
 SeePageForSetup=Vea el menú <a href="%s">%s</a> para configurarlo
 DepositsAreNotIncluded=- Las facturas de anticipo no están incluidas
 DepositsAreIncluded=- Las facturas de anticipo están incluidas
+LT1ReportByMonth=Informe de impuestos 2 por mes
+LT2ReportByMonth=Informe de impuestos 3 por mes
 LT1ReportByCustomers=Informe por tercero del RE
 LT2ReportByCustomers=Informe por tercero del IRPF
 LT1ReportByCustomersES=Informe de RE por tercero
 LT2ReportByCustomersES=Informe de IRPF por tercero del
 VATReport=Informe IVA
 VATReportByPeriods=Informe de IVA por período
+VATReportByMonth=Informe de impuestos de venta por mes
 VATReportByRates=Informe de impuestos por tasa
 VATReportByThirdParties=Informe de impuestos por terceros
 VATReportByCustomers=Informe IVA por cliente
diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang
index caf7a7d363b..7e663f919a8 100644
--- a/htdocs/langs/es_ES/contracts.lang
+++ b/htdocs/langs/es_ES/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Servicios activos
 MenuExpiredServices=Servicios expirados
 MenuClosedServices=Servicios cerrados
 NewContract=Nuevo contrato
-NewContractSubscription=New contract or subscription
+NewContractSubscription=Nuevo contrato o suscripción
 AddContract=Crear contrato
 DeleteAContract=Eliminar un contrato
 ActivateAllOnContract=Activar todos los servicios
@@ -99,6 +99,6 @@ TypeContact_contrat_internal_SALESREPFOLL=Comercial seguimiento del contrato
 TypeContact_contrat_external_BILLING=Contacto cliente de facturación del contrato
 TypeContact_contrat_external_CUSTOMER=Contacto cliente seguimiento del contrato
 TypeContact_contrat_external_SALESREPSIGN=Contacto cliente firmante del contrato
-HideClosedServiceByDefault=Hide closed services by default
-ShowClosedServices=Show Closed Services
-HideClosedServices=Hide Closed Services
+HideClosedServiceByDefault=Ocultar servicios cerrados por defecto
+ShowClosedServices=Mostrar servicios cerrados
+HideClosedServices=Ocultar servicios cerrados
diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang
index 27dcaa7e9e9..bc2036a769d 100644
--- a/htdocs/langs/es_ES/cron.lang
+++ b/htdocs/langs/es_ES/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Borrar Tarea Programada
 Permission23104 = Ejecutar Taraea programada
 # Admin
 CronSetup=Configuración del módulo Programador
-URLToLaunchCronJobs=URL para combrobar y ejecutar tareas
-OrToLaunchASpecificJob=O para ejecutar una tarea en concreto
+URLToLaunchCronJobs=URL para verificar e iniciar tareas cron calificados desde un navegador
+OrToLaunchASpecificJob=O para verificar e iniciar una tarea específica desde un navegador
 KeyForCronAccess=Clave para la URL para ejecutar tareas Cron
 FileToLaunchCronJobs=Comando para ejecutar tareas Cron
 CronExplainHowToRunUnix=En entornos Unix se debe utilizar la siguiente entrada crontab para ejecutar el comando cada 5 minutos
 CronExplainHowToRunWin=En entornos Microsoft (tm) Windows, puede utilizar las herramienta  tareas programadas para ejecutar el comando cada 5 minutos
 CronMethodDoesNotExists=La clase %s no contiene ningún método %s
+CronMethodNotAllowed=El método %s de la clase %s está en la lista negra de métodos prohibidos
 CronJobDefDesc=Los perfiles de trabajo de Cron se definen en el archivo descriptor del módulo. Cuando el módulo está activado, se cargan y están disponibles para que pueda administrar los trabajos desde el menú de herramientas de administración %s.
 CronJobProfiles=Lista de perfiles de trabajos cron predefinidos
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Número de ejecuciones
 CronMaxRun=Número máximo ejecuciones
 CronEach=Toda(s)
 JobFinished=Tareas lanzadas y finalizadas
+Scheduled=Programada
 #Page card
 CronAdd= Tarea Nueva
 CronEvery=Ejecutar la tarea cada
@@ -56,7 +58,7 @@ CronNote=Comentario
 CronFieldMandatory=campos %s son obligatorios
 CronErrEndDateStartDt=La fecha de finalizacion no puede ser anterior a la fecha de inicio
 StatusAtInstall=Estado en la instalación del módulo
-CronStatusActiveBtn=Activo
+CronStatusActiveBtn=Calendario
 CronStatusInactiveBtn=Inactivo
 CronTaskInactive=Esta tarea esta inactiva
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Copia local de la base de datos
 MakeLocalDatabaseDump=Crear una copia local de la base de datos. Los parámetros son: compresión ('gz' o 'bz' o 'ninguno'), tipo de copia de seguridad ('mysql' o 'pgsql'), 1, 'auto' o nombre de archivo para construir, nº de archivos de copia de seguridad a mantener
 WarningCronDelayed=Atención: para mejorar el rendimiento, cualquiera que sea la próxima fecha de ejecución de las tareas activas, sus tareas pueden retrasarse un máximo de %s horas antes de ejecutarse
 DATAPOLICYJob=Limpiador de datos y anonimizador
+JobXMustBeEnabled=La tarea %s debe estar habilitada
+# Cron Boxes
+LastExecutedScheduledJob=Última tarea programada ejecutada
+NextScheduledJobExecute=Siguiente tarea programada para ejecutar
+NumberScheduledJobError=Número de tareas programadas con error
diff --git a/htdocs/langs/es_ES/deliveries.lang b/htdocs/langs/es_ES/deliveries.lang
index 3bd711bdeea..f766e2d6734 100644
--- a/htdocs/langs/es_ES/deliveries.lang
+++ b/htdocs/langs/es_ES/deliveries.lang
@@ -27,5 +27,6 @@ Recipient=Destinatario
 ErrorStockIsNotEnough=No hay suficiente stock
 Shippable=Enviable
 NonShippable=No enviable
+ShowShippableStatus=Mostrar estado del envío
 ShowReceiving=Mostrar nota de recepción
 NonExistentOrder=Pedido inexistente
diff --git a/htdocs/langs/es_ES/ecm.lang b/htdocs/langs/es_ES/ecm.lang
index 54ec4c75ac9..6a4b189771f 100644
--- a/htdocs/langs/es_ES/ecm.lang
+++ b/htdocs/langs/es_ES/ecm.lang
@@ -23,7 +23,7 @@ ECMSearchByKeywords=Buscar por palabras clave
 ECMSearchByEntity=Buscar por objeto
 ECMSectionOfDocuments=Directorios de documentos
 ECMTypeAuto=Automático
-ECMDocsBy=Documents linked to %s
+ECMDocsBy=Documentos vinculados a %s
 ECMNoDirectoryYet=No se ha creado el directorio
 ShowECMSection=Mostrar directorio
 DeleteSection=Eliminación directorio
@@ -38,6 +38,6 @@ ReSyncListOfDir=Resincronizar la lista de directorios
 HashOfFileContent=Hash de contenido de archivo
 NoDirectoriesFound=No se encontraron directorios
 FileNotYetIndexedInDatabase=Archivo aún no indexado en la base de datos (intente volver a cargarlo)
-ExtraFieldsEcmFiles=Archivos Ecm de campos extra
-ExtraFieldsEcmDirectories=Directorios Ecm de campos extra
-ECMSetup=Configuración de ECM
+ExtraFieldsEcmFiles=campos adicionales de archivos GED
+ExtraFieldsEcmDirectories=Campos adicionales de Directorios GED
+ECMSetup=Configuración de GED
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 2bc9c1698ef..a25529bdd52 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Sin errores,  es válido
 # Errors
 ErrorButCommitIsDone=Errores encontrados, pero es válido a pesar de todo
 ErrorBadEMail=E-mail %s incorrecto
+ErrorBadMXDomain=El e-mail %s parece incorrecto (el dominio no tiene un registro MX válido)
 ErrorBadUrl=Url %s inválida
 ErrorBadValueForParamNotAString=Valor incorrecto para su parámetro. Generalmente aparece cuando no existe traducción.
+ErrorRefAlreadyExists=La referencia <b>%s</b> ya existe.
 ErrorLoginAlreadyExists=El login %s ya existe.
 ErrorGroupAlreadyExists=El grupo %s ya existe.
 ErrorRecordNotFound=Registro no encontrado
@@ -36,7 +38,7 @@ ErrorBadSupplierCodeSyntax=La sintaxis del código proveedor es incorrecta
 ErrorSupplierCodeRequired=Código proveedor obligatorio
 ErrorSupplierCodeAlreadyUsed=Código de proveedor ya utilizado
 ErrorBadParameters=Parámetros incorrectos
-ErrorWrongParameters=Wrong or missing parameters
+ErrorWrongParameters=Parámetros inválidos o faltantes
 ErrorBadValueForParameter=valor '%s' incorrecto para el parámetro '%s'
 ErrorBadImageFormat=El archivo de imagen es de un formato no soportado (Su PHP no soporta las funciones de conversión de este formato de imagen)
 ErrorBadDateFormat=El valor '%s' tiene un formato de fecha no reconocido
@@ -48,6 +50,7 @@ ErrorFieldsRequired=No se indicaron algunos campos obligatorios
 ErrorSubjectIsRequired=El asunto del e-mail es obligatorio
 ErrorFailedToCreateDir=Error en la creación de un directorio. Compruebe que el usuario del servidor Web tiene derechos de escritura en los directorios de documentos de Dolibarr. Si el  parámetro <b>safe_mode</b> está activo en este PHP, Compruebe que los archivos php Dolibarr pertenecen al usuario del servidor Web.
 ErrorNoMailDefinedForThisUser=E-Mail no definido para este usuario
+ErrorSetupOfEmailsNotComplete=La configuración de los e-mailss no está completa
 ErrorFeatureNeedJavascript=Esta funcionalidad precisa de javascript activo para funcionar. Modifique en configuración->entorno.
 ErrorTopMenuMustHaveAParentWithId0=Un menú del tipo 'Superior' no puede tener un menú padre. Ponga 0 en el ID padre o busque un menú del tipo 'Izquierdo'
 ErrorLeftMenuMustHaveAParentId=Un menú del tipo 'Izquierdo' debe de tener un ID de padre
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=El nombre de este perfil ya existe para este conjunto
 ErrorLDAPSetupNotComplete=La configuración Dolibarr-LDAP es incompleta.
 ErrorLDAPMakeManualTest=Se ha creado unn archivo .ldif en el directorio %s. Trate de cargar manualmente este archivo desde la línea de comandos para obtener más detalles acerca del error.
 ErrorCantSaveADoneUserWithZeroPercentage=No se puede cambiar una acción al estado no comenzada si tiene un usuario realizante de  la acción.
-ErrorRefAlreadyExists=La referencia utilizada para la creación ya existe
+ErrorRefAlreadyExists=La referencia <b>%s</b> ya existe.
 ErrorPleaseTypeBankTransactionReportName=Por favor escriba el nombre del extracto bancario donde se informa del registro (Formato AAAAMM o AAAAMMDD)
 ErrorRecordHasChildren=No se puede eliminar el registro porque tiene registros hijos.
 ErrorRecordHasAtLeastOneChildOfType=El objeto tiene al menos un hijo del tipo %s
@@ -120,7 +123,7 @@ ErrorLoginHasNoEmail=Este usuario no tiene e-mail. Imposible continuar.
 ErrorBadValueForCode=Valor incorrecto para el código. Vuelva a intentar con un nuevo valor...
 ErrorBothFieldCantBeNegative=Los campos %s y %s no pueden ser negativos
 ErrorFieldCantBeNegativeOnInvoice=El campo <strong>%s</strong> no puede ser negativo en este tipo de factura. Si necesita agregar una línea de descuento, simplemente cree el descuento primero (desde el campo '%s' en la ficha de terceros) y aplíquelo a la factura.
-ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
+ErrorLinesCantBeNegativeForOneVATRate=El total de líneas (neto de impuestos) no puede ser negativo para un IVA no nulo (se encontró un total negativo para el IVA <b> %s </b> %%).
 ErrorLinesCantBeNegativeOnDeposits=Las líneas no pueden ser negativas en un depósito. Si lo hace, tendrá problemas para consumir el depósito en la factura final.
 ErrorQtyForCustomerInvoiceCantBeNegative=Las cantidades en las líneas de facturas a clientes no pueden ser negativas
 ErrorWebServerUserHasNotPermission=La cuenta de ejecución del servidor web <b>%s</b> no dispone de los permisos para esto
@@ -136,8 +139,8 @@ ErrorNewValueCantMatchOldValue=El nuevo valor no puede ser igual al antiguo
 ErrorFailedToValidatePasswordReset=No se ha podido restablecer la contraseña. Es posible que este enlace ya se haya utilizado (este enlace sólo puede usarse una vez). Si no es el caso, trate de reiniciar el proceso de restablecimiento de contraseña desde el principio.
 ErrorToConnectToMysqlCheckInstance=Error de conexión con la base de datos. Compruebe que el servidor de base de datos está en marcha (por ejemplo, con mysql/maríadb, pudes lanzarlo con la línea de comando 'sudo service mysql start').
 ErrorFailedToAddContact=Error en la adición del contacto
-ErrorDateMustBeBeforeToday=The date must be lower than today
-ErrorDateMustBeInFuture=The date must be greater than today
+ErrorDateMustBeBeforeToday=La fecha debe ser anterior a la de hoy
+ErrorDateMustBeInFuture=La fecha debe ser posterior a hoy
 ErrorPaymentModeDefinedToWithoutSetup=Se ha establecido el modo de pago al tipo %s pero en la configuración del módulo de facturas no se ha indicado la información para mostrar de este modo de pago.
 ErrorPHPNeedModule=Error, su PHP debe tener instalado el módulo <b>%s</b> para usar esta funcionalidad.
 ErrorOpenIDSetupNotComplete=Ha configurado Dolibarr para aceptar la autentificación OpenID, pero la URL del servicio OpenID no se encuentra definida en la constante %s
@@ -185,7 +188,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Definición incorrecta de la mat
 ErrorSavingChanges=Ha ocurrido un error al guardar los cambios
 ErrorWarehouseRequiredIntoShipmentLine=El almacén es obligatorio en la línea a enviar
 ErrorFileMustHaveFormat=El archivo debe tener el formato %s
-ErrorFilenameCantStartWithDot=Filename can't start with a '.'
+ErrorFilenameCantStartWithDot=El nombre de archivo no puede comenzar con '.'
 ErrorSupplierCountryIsNotDefined=El país de este proveedor no está definido, corríjalo en su ficha
 ErrorsThirdpartyMerge=No se han podido fusionar los dos registros. Petición cancelada. 
 ErrorStockIsNotEnoughToAddProductOnOrder=No hay stock suficiente del producto %s para añadirlo a un nuevo pedido.
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Debe elegir si el artículo es un
 ErrorDiscountLargerThanRemainToPaySplitItBefore=El descuento que usted intenta aplicar es más grande que el resto a pagar. Divida el descuento en 2 descuentos más pequeños antes.
 ErrorFileNotFoundWithSharedLink=Archivo no encontrado. Puede ser que la clave compartida se haya modificado o que el archivo se haya eliminado recientemente.
 ErrorProductBarCodeAlreadyExists=El código de barras del producto %s ya existe en otra referencia de producto.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Tenga en cuenta también que no es posible utilizar productos virtuales para aumentar/disminuir automáticamente subproductos cuando al menos un subproducto (o subproducto de subproductos) necesita un número de serie/lote.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Tenga en cuenta también que el uso de kits para aumentar / disminuir automáticamente los subproductos no es posible cuando al menos un subproducto (o subproducto de subproductos) necesita un número de serie / lote.
 ErrorDescRequiredForFreeProductLines=La descripción es obligatoria para las líneas libres
 ErrorAPageWithThisNameOrAliasAlreadyExists=La página/contenedor <strong>%s</strong> tiene el mismo nombre o alias alternativo que el que intenta utilizar
 ErrorDuringChartLoad=Error al cargar plan contable. Si no se cargaron algunas cuentas, aún puede introducirlas manualmente.
@@ -240,9 +243,19 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No hay suficiente cantidad
 ErrorOnlyOneFieldForGroupByIsPossible=Solo es posible un campo para 'Agrupar por' (otros se descartan)
 ErrorTooManyDifferentValueForSelectedGroupBy=Se encontraron demasiados valores diferentes (más de <b>%s</b>) para el campo '<b>%s</b>', así que no podemos usarlo como 'Agrupar por' para gráficos. El campo 'Agrupar por' ha sido eliminado. ¿Puede ser que quieras usarlo como un eje X?
 ErrorReplaceStringEmpty=Error, la cadena para reemplazar está vacía
-ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
-ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
-ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorProductNeedBatchNumber=Error, el producto '<b> %s </b>' necesita un lote/número de serie
+ErrorProductDoesNotNeedBatchNumber=Error, el producto '<b> %s </b>' no acepta un número de serie/lote
+ErrorFailedToReadObject=Error, no se pudo leer el objeto de tipo <b> %s </b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, el parámetro <b> %s </b> debe estar habilitado en <b> conf / conf.php <b> para permitir el uso de la interfaz de línea de comandos por parte del programador de trabajos interno
+ErrorLoginDateValidity=Error, este inicio de sesión está fuera del rango de fechas de validez
+ErrorValueLength=Longitud del campo '<b>%s</b>' debe ser superior a '<b>%s</b>'
+ErrorReservedKeyword=La palabra '<b>%s</b>' es una palabra reservada
+ErrorNotAvailableWithThisDistribution=No disponible con esta distribución
+ErrorPublicInterfaceNotEnabled=La interfaz pública no estaba habilitada
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=El idioma de la nueva página debe definirse si se establece como una traducción de otra página.
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=El idioma de la nueva página no debe ser el idioma de origen si está configurado como traducción de otra página.
+ErrorAParameterIsRequiredForThisOperation=Un parámetro es obligatorio para esta operación.
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=El parámetro PHP upload_max_filesize (%s) es más alto que el parámetro PHP post_max_size (%s). Esta no es una configuración consistente.
 WarningPasswordSetWithNoAccount=Se fijó una contraseña para este miembro. Sin embargo, no se ha creado ninguna cuenta de usuario. Así que esta contraseña no se puede utilizar para acceder a Dolibarr. Puede ser utilizada por un módulo/interfaz externo, pero si no necesitar definir accesos de un miembro, puede desactivar la opción "Administrar un inicio de sesión para cada miembro" en la configuración del módulo miembros. Si necesita administrar un inicio de sesión, pero no necesita ninguna contraseña, puede dejar este campo vacío para evitar esta advertencia. Nota: También puede usarse el correo electrónico como inicio de sesión si el miembro está vinculada a un usuario.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Su cuenta de acceso ha sido modificada. P
 WarningAnEntryAlreadyExistForTransKey=Ya existe una entrada para la clave de traducción para este idioma
 WarningNumberOfRecipientIsRestrictedInMassAction=Atención, el número de destinatarios diferentes está limitado a <b>%s</b>cuando se usan las acciones masivas en las listas
 WarningDateOfLineMustBeInExpenseReportRange=Advertencia, la fecha de la línea no está en el rango del informe de gastos
+WarningProjectDraft=El proyecto todavía está en modo borrador. No olvide validarlo si planea usar tareas.
 WarningProjectClosed=El proyecto está cerrado. Debe volver a abrirlo primero.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Algunas transacciones bancarias se eliminaron después de que se generó el recibo. Por lo tanto, el número de cheques y el total del recibo pueden diferir del número y el total en el listado.
-WarningFailedToAddFileIntoDatabaseIndex=Atención, no se pudo agregar la entrada del archivo en la tabla de índice de la base de datos ECM
+WarningFailedToAddFileIntoDatabaseIndex=Advertencia, no se pudo agregar la entrada de archivo en la tabla de índice de la base de datos de GED
+WarningTheHiddenOptionIsOn=Advertencia, la opción oculta <b> %s </b> está activada.
+WarningCreateSubAccounts=Advertencia, no puede crear directamente una subcuenta, debe crear un tercero o un usuario y asignarles un código de contabilidad para encontrarlos en esta lista.
+WarningAvailableOnlyForHTTPSServers=Disponible solo si usa una conexión segura HTTPS.
diff --git a/htdocs/langs/es_ES/exports.lang b/htdocs/langs/es_ES/exports.lang
index 056236382aa..9a0e7decd49 100644
--- a/htdocs/langs/es_ES/exports.lang
+++ b/htdocs/langs/es_ES/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Clave (columna) a usar para <b>actualizar</b> datos existent
 NbInsert=Número de líneas añadidas: %s
 NbUpdate=Número de líneas actualizadas: %s
 MultipleRecordFoundWithTheseFilters=Se han encontrado varios registros con estos filtros: %s
+StocksWithBatch=Existencias y ubicación (almacén) de productos con número de lote / serie
diff --git a/htdocs/langs/es_ES/ftp.lang b/htdocs/langs/es_ES/ftp.lang
index c363097056f..4dcb9e6c0ce 100644
--- a/htdocs/langs/es_ES/ftp.lang
+++ b/htdocs/langs/es_ES/ftp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Configuración del módulo cliente FTP
-NewFTPClient=Nueva conexión cliente FTP
-FTPArea=Área FTP
-FTPAreaDesc=Esta pantalla presenta una vista de servidor FTP
-SetupOfFTPClientModuleNotComplete=La configuración del módulo de cliente FTP parece incompleta
-FTPFeatureNotSupportedByYourPHP=Su PHP no soporta las funciones FTP
-FailedToConnectToFTPServer=No se pudo conectar con el servidor FTP  (servidor: %s, puerto %s)
-FailedToConnectToFTPServerWithCredentials=No se pudo conectar con el login/contraseña FTP configurados
+FTPClientSetup=Configuración del módulo de cliente FTP o SFTP
+NewFTPClient=Nueva configuración de conexión FTP / FTPS
+FTPArea=Área FTP / FTPS
+FTPAreaDesc=Esta pantalla muestra una vista de un servidor FTP y SFTP.
+SetupOfFTPClientModuleNotComplete=La configuración del módulo de cliente FTP o SFTP parece estar incompleta
+FTPFeatureNotSupportedByYourPHP=Su PHP no admite funciones FTP o SFTP
+FailedToConnectToFTPServer=No se pudo conectar al servidor (servidor %s, puerto %s)
+FailedToConnectToFTPServerWithCredentials=Error al iniciar sesión en el servidor con inicio de sesión/contraseña definidos
 FTPFailedToRemoveFile=No se pudo eliminar el archivo <b>%s</b>.
 FTPFailedToRemoveDir=No se pudo eliminar el directorio <b>%s</b> (Compruebe los permisos y que el directorio está vacío).
 FTPPassiveMode=Modo pasivo
-ChooseAFTPEntryIntoMenu=Elija una entrada de FTP en el menú ...
+ChooseAFTPEntryIntoMenu=Elija un sitio FTP / SFTP del menú ...
 FailedToGetFile=No se pudieron obtener los archivos %s
diff --git a/htdocs/langs/es_ES/install.lang b/htdocs/langs/es_ES/install.lang
index cf53fbdae48..db506fac1b6 100644
--- a/htdocs/langs/es_ES/install.lang
+++ b/htdocs/langs/es_ES/install.lang
@@ -87,7 +87,7 @@ GoToSetupArea=Acceso a Dolibarr (área de configuración)
 MigrationNotFinished=La versión de la base de datos no está completamente actualizada: vuelva a ejecutar el proceso de actualización.
 GoToUpgradePage=Acceder a la página de migración de nuevo
 WithNoSlashAtTheEnd=Sin el signo "/" al final
-DirectoryRecommendation= <span class="warning"> IMPORTANTE </span>: debe usar un directorio que esté fuera de las páginas web (por lo tanto, no use un subdirectorio del parámetro anterior).
+DirectoryRecommendation=<span class="warning"> IMPORTANTE </span>: debe usar un directorio que esté fuera de las páginas web (por lo tanto, no use un subdirectorio del parámetro anterior).
 LoginAlreadyExists=Ya existe
 DolibarrAdminLogin=Login del usuario administrador de Dolibarr
 AdminLoginAlreadyExists=La cuenta de administrador Dolibarr '<b>%s</b>' ya existe. Vuelva atrás si desea crear otra.
diff --git a/htdocs/langs/es_ES/interventions.lang b/htdocs/langs/es_ES/interventions.lang
index b2e1eb7e66f..3a655b6a95e 100644
--- a/htdocs/langs/es_ES/interventions.lang
+++ b/htdocs/langs/es_ES/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Duración línea intervención
 InterLineDesc=Descripción línea intervención
 RepeatableIntervention=Plantilla de intervención
 ToCreateAPredefinedIntervention=Para crear una intervención predefinida o recurrente, cree una intervención común y conviértala en plantilla de intervención
+Reopen=Reabrir
+ConfirmReopenIntervention=¿Está seguro de querer volver a abrir la intervención <b> %s </b>?
diff --git a/htdocs/langs/es_ES/intracommreport.lang b/htdocs/langs/es_ES/intracommreport.lang
index 6931efda553..5e0a87e64ee 100644
--- a/htdocs/langs/es_ES/intracommreport.lang
+++ b/htdocs/langs/es_ES/intracommreport.lang
@@ -1,5 +1,5 @@
 Module68000Name = Informe intracomunitario
-Module68000Desc = Gestión de informes intracomm (soporte para formato francés DEB / DES)
+Module68000Desc = Gestión de informe intracomunitario (soporte para formato francés DEB / DES)
 IntracommReportSetup = Configuración del módulo de intracommreport
 IntracommReportAbout = Acerca de intracommreport
 
@@ -32,7 +32,7 @@ IntracommReportTitle=Preparación de un archivo XML en formato ProDouane
 # List
 IntracommReportList=Lista de declaraciones generadas
 IntracommReportNumber=Número de declaración
-IntracommReportPeriod=Período de análisis
+IntracommReportPeriod=Periodo de análisis
 IntracommReportTypeDeclaration=Tipo de declaración
 IntracommReportDownload=descargar archivo XML
 
diff --git a/htdocs/langs/es_ES/languages.lang b/htdocs/langs/es_ES/languages.lang
index d8a30708395..2bfc571a284 100644
--- a/htdocs/langs/es_ES/languages.lang
+++ b/htdocs/langs/es_ES/languages.lang
@@ -40,7 +40,7 @@ Language_es_PA=Español (Panamá)
 Language_es_PY=Español (Paraguay)
 Language_es_PE=Español (Perú)
 Language_es_PR=Español (Puerto Rico)
-Language_es_US=Spanish (USA)
+Language_es_US=Español (EE. UU.)
 Language_es_UY=Español (Uruguay)
 Language_es_GT=Español (Guatemala)
 Language_es_VE=Español (Venezuela)
diff --git a/htdocs/langs/es_ES/loan.lang b/htdocs/langs/es_ES/loan.lang
index 6d864af06fd..45cadda49d5 100644
--- a/htdocs/langs/es_ES/loan.lang
+++ b/htdocs/langs/es_ES/loan.lang
@@ -23,9 +23,9 @@ AddLoan=Crear crédito
 FinancialCommitment=Prestamo
 InterestAmount=Interés
 CapitalRemain=Capital restante
-TermPaidAllreadyPaid = This term is allready paid
-CantUseScheduleWithLoanStartedToPaid = Can't use scheduler for a loan with payment started
-CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule
+TermPaidAllreadyPaid = Este plazo ya está pagado
+CantUseScheduleWithLoanStartedToPaid = No se puede usar el programador para un préstamo con el pago iniciado
+CantModifyInterestIfScheduleIsUsed = No puede modificar el interés si usa el programador
 # Admin
 ConfigLoan=Configuración del módulo préstamos
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Cuenta contable por defecto para el capital
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index 947cb08fdef..a992897cd19 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=E-mails enviados por usuario
 MailingModuleDescDolibarrUsers=Usuarios con e-mails
 MailingModuleDescThirdPartiesByCategories=Terceros (por categoría)
 SendingFromWebInterfaceIsNotAllowed=El envío desde la interfaz web no está permitido.
+EmailCollectorFilterDesc=Todos los filtros deben coincidir para que se recopile un e-mail
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Línea %s en archivo
@@ -125,12 +126,13 @@ TagMailtoEmail=Email del destinatario (incluyendo el enlace html "mailto:")
 NoEmailSentBadSenderOrRecipientEmail=No se ha enviado el e-mail. El remitente o destinatario es incorrecto. Compruebe los datos del usuario.
 # Module Notifications
 Notifications=Notificaciones
-NoNotificationsWillBeSent=Ninguna notificación por e-mail está prevista para este evento y empresa
-ANotificationsWillBeSent=1 notificación va a ser enviada por e-mail
-SomeNotificationsWillBeSent=%s notificaciones van a ser enviadas por e-mail
-AddNewNotification=Activar un nuevo destinatario de notificaciones
-ListOfActiveNotifications=Listado de destinatarios activos para notifiaciones por e-mail
-ListOfNotificationsDone=Listado de notificaciones enviadas
+NotificationsAuto=Notificaciones automáticas.
+NoNotificationsWillBeSent=No se planean notificaciones automáticas por e-mail para este tipo de evento y empresa.
+ANotificationsWillBeSent=Se enviará 1 notificación automática por e-mail
+SomeNotificationsWillBeSent=%s se enviarán notificaciones automáticas por e-mail
+AddNewNotification=Suscríbase a una nueva notificación automática por e-mail (destinatario/evento)
+ListOfActiveNotifications=Lista de todas las suscripciones activas (destinatarios/eventos) para la notificación automática por e-mail
+ListOfNotificationsDone=Lista de todas las notificaciones automáticas enviadas por e-mail
 MailSendSetupIs=La configuración de e-mailings está a '%s'. Este modo no puede ser usado para enviar e-mails masivos.
 MailSendSetupIs2=Antes debe, con una cuenta de administrador, en el menú %sInicio - Configuración - E-Mails%s, cambiar el parámetro <strong>'%s'</strong> para usar el modo '%s'. Con este modo puede configurar un servidor SMTP de su proveedor de servicios de internet.
 MailSendSetupIs3=Si tiene preguntas de como configurar su servidor SMTP, puede contactar con %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Los ficheros importados deben tener el formato <stron
 UseFormatInputEmailToTarget=Entra una cadena con el formato <strong>email;nombre;apellido;otros</strong>
 MailAdvTargetRecipients=Destinatarios (selección avanzada)
 AdvTgtTitle=Rellene los campos para preseleccionar los terceros o contactos/direcciones a enviar
-AdvTgtSearchTextHelp=Use %% como comodín. Por ejemplo para encontrar todos los elementos como <b>juan, jose,jorge</b>, puede indicar <b>j%%</b>, también puede usar ; como separador de valor y usar ! para omitir el valor. Por ejemplo <b>juan;jose;jor%%!jimo;!jima%</b> hará como destinatarios todos los juan, jose, los que empiecen por jor pero no jimo o jima.
+AdvTgtSearchTextHelp=Utilice %% como comodines. Por ejemplo, para encontrar todos los elementos como <b> jean, joe, jim </b>, puede ingresar <b> j%% </b>, también puede usar; como separador de valor y uso! para excepto este valor. Por ejemplo, <b> jean; joe; jim%%;! Jimo;! Jima%% </b> apuntará a todos jean, joe, comience con jim pero no jimo y no todo lo que comience con jima
 AdvTgtSearchIntHelp=Use un intervaldo para seleccionar valor int o float
 AdvTgtMinVal=Valor mínimo
 AdvTgtMaxVal=Valor máxio
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Crear filtro
 AdvTgtOrCreateNewFilter=Nombre del nuevo filtro
 NoContactWithCategoryFound=No se han encontrado contactos/direcciones con alguna categoría
 NoContactLinkedToThirdpartieWithCategoryFound=No se han encontrado contactos/direcciones con alguna categoría
-OutGoingEmailSetup=Configuración del correo saliente
-InGoingEmailSetup=Configuración del correo entrante
-OutGoingEmailSetupForEmailing=Configuración del correo electrónico saliente (para el módulo %s)
-DefaultOutgoingEmailSetup=Configuración de correo saliente predeterminada
+OutGoingEmailSetup=E-mails salientes
+InGoingEmailSetup=E-mails entrantes
+OutGoingEmailSetupForEmailing=E-mails salientes (para el módulo %s)
+DefaultOutgoingEmailSetup=Misma configuración que la configuración global de e-mail saliente
 Information=Información
 ContactsWithThirdpartyFilter=Contactos con filtro de terceros.
-Unanswered=Unanswered
+Unanswered=Sin respuesta
 Answered=Contestado
-IsNotAnAnswer=Is not answer (initial email)
-IsAnAnswer=Is an answer of an initial email
+IsNotAnAnswer=No responde (e-mail inicial)
+IsAnAnswer=Es una respuesta de un e-mail inicial.
+RecordCreatedByEmailCollector=Registro creado por el Recopilador de E-Mails %s del e-mail %s
+DefaultBlacklistMailingStatus=Estado de contacto predeterminado para rechazar el envío masivo de correos electrónicos
+DefaultStatusEmptyMandatory=Vacío pero obligatorio
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index e60664f5d0f..bdc22f9fe03 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Sin plantilla definida para este tipo de e-mail
 AvailableVariables=Variables de substitución disponibles
 NoTranslation=Sin traducción
 Translation=Traducción
+CurrentTimeZone=Zona horaria PHP (Servidor)
 EmptySearchString=Ingrese una cadena de búsqueda no vacía
+EnterADateCriteria=Ingrese un criterio de fecha
 NoRecordFound=No se han encontrado registros
 NoRecordDeleted=No se ha eliminado el registro
 NotEnoughDataYet=No hay suficientes datos
@@ -85,6 +87,8 @@ 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
+HomePage=Página de inicio
 RecordSaved=Registro guardado
 RecordDeleted=Registro eliminado
 RecordGenerated=Registro generado
@@ -175,7 +179,7 @@ SaveAndStay=Guardar y permanecer
 SaveAndNew=Guardar y nuevo
 TestConnection=Probar la conexión
 ToClone=Copiar
-ConfirmCloneAsk=¿Estás seguro de que quieres clonar el objeto <b>%s</b>?
+ConfirmCloneAsk=¿Está seguro de que quieres clonar el objeto <b>%s</b>?
 ConfirmClone=Seleccione los datos que desea copiar:
 NoCloneOptionsSpecified=No hay datos definidos para copiar
 Of=de
@@ -197,7 +201,7 @@ ReOpen=Reabrir
 Upload=Enviar archivo
 ToLink=Enlace
 Select=Seleccionar
-SelectAll=Select all
+SelectAll=Seleccionar todo
 Choose=Elegir
 Resize=Redimensionar
 ResizeOrCrop=Cambiar el tamaño o cortar
@@ -220,6 +224,7 @@ Value=Valor
 PersonalValue=Valor personalizado
 NewObject=Nuevo %s
 NewValue=Nuevo valor
+OldValue=Valor antiguo %s
 CurrentValue=Valor actual
 Code=Código
 Type=Tipo
@@ -258,7 +263,7 @@ Cards=Fichas
 Card=Ficha
 Now=Ahora
 HourStart=Hora de inicio
-Deadline=Deadline
+Deadline=Fecha límite
 Date=Fecha
 DateAndHour=Fecha y hora
 DateToday=Fecha de hoy
@@ -267,10 +272,10 @@ DateStart=Fecha de inicio
 DateEnd=Fecha de fin
 DateCreation=Fecha de creación
 DateCreationShort=Fecha creación
-IPCreation=Creation IP
+IPCreation=IP de creación
 DateModification=Fecha de modificación
 DateModificationShort=Fecha modif.
-IPModification=Modification IP
+IPModification=IP de modificación
 DateLastModification=Última fecha de modificación
 DateValidation=Fecha de validación
 DateClosing=Fecha de cierre
@@ -433,6 +438,7 @@ RemainToPay=Queda por pagar
 Module=Módulo
 Modules=Módulos
 Option=Opción
+Filters=Filtros
 List=Listado
 FullList=Listado completo
 FullConversation=Conversación completa
@@ -650,6 +656,7 @@ SupplierPreview=Historial proveedor
 ShowCustomerPreview=Ver historial cliente
 ShowSupplierPreview=Ver historial proveedor
 RefCustomer=Ref. cliente
+InternalRef=Ref. Interna
 Currency=Divisa
 InfoAdmin=Información para los administradores
 Undo=Anular
@@ -671,7 +678,7 @@ SendMail=Enviar e-mail
 Email=Correo
 NoEMail=Sin e-mail
 AlreadyRead=Ya leído
-NotRead=No lleído
+NotRead=No leído
 NoMobilePhone=Sin teléfono móvil
 Owner=Propietario
 FollowingConstantsWillBeSubstituted=Las siguientes constantes serán substituidas por su valor correspondiente.
@@ -1099,11 +1106,17 @@ MODIFYInDolibarr=Registro %s modificado
 DELETEInDolibarr=Registro %s eliminado
 VALIDATEInDolibarr=Registro %s validado
 APPROVEDInDolibarr=Registro %s aprobado
-DefaultMailModel=Model de email por defecto
+DefaultMailModel=Modelo de email por defecto
 PublicVendorName=Nombre público del proveedor
 DateOfBirth=Fecha de nacimiento
 SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=El token de seguridad ha expirado, así que la acción ha sido cancelada. Por favor, vuelve a intentarlo.
 UpToDate=A hoy
 OutOfDate=Fuera de plazo
 EventReminder=Recordatorio evento
-UpdateForAllLines=Update for all lines
+UpdateForAllLines=Actualización para todas las líneas
+OnHold=En espera
+Civility=Civilidad
+AffectTag=Afectar etiqueta
+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
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index abe80887b89..726d56b3bb8 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -19,8 +19,8 @@ MembersCards=Carnés de miembros
 MembersList=Listado de miembros
 MembersListToValid=Listado de miembros borrador (a validar)
 MembersListValid=Listado de miembros validados
-MembersListUpToDate=Lista de miembros válidos con suscripción actualizada
-MembersListNotUpToDate=Lista de miembros válidos con suscripción desactualizada
+MembersListUpToDate=Listado de miembros válidos con suscripción actualizada
+MembersListNotUpToDate=Listado de miembros válidos con suscripción caducada
 MembersListResiliated=Listado de los miembros dados de baja
 MembersListQualified=Listado de los miembros cualificados
 MenuMembersToValidate=Miembros borrador
diff --git a/htdocs/langs/es_ES/modulebuilder.lang b/htdocs/langs/es_ES/modulebuilder.lang
index a2a857957a9..7f8008aa4cd 100644
--- a/htdocs/langs/es_ES/modulebuilder.lang
+++ b/htdocs/langs/es_ES/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=Página PHP para crear/editar/ver un registro
 PageForAgendaTab=Página de PHP para la pestaña de eventos
 PageForDocumentTab=Página de PHP para la pestaña de documento
 PageForNoteTab=Página de PHP para la pestaña de notas
+PageForContactTab=Página PHP para la pestaña de contacto
 PathToModulePackage=Ruta al zip del módulo/aplicación
 PathToModuleDocumentation=Ruta a la documentación del módulo/aplicación (%s)
 SpaceOrSpecialCharAreNotAllowed=Espacios o caracteres especiales no son permitidos.
@@ -77,13 +78,13 @@ IsAMeasure=Es una medida
 DirScanned=Directorio analizado
 NoTrigger=No hay trigger
 NoWidget=No hay widget
-GoToApiExplorer=Ir al Explorador de API
+GoToApiExplorer=Explorador de API
 ListOfMenusEntries=Lista de entradas de menú
 ListOfDictionariesEntries=Listado de entradas de diccionarios
 ListOfPermissionsDefined=Listado de permisos definidos
 SeeExamples=Vea ejemplos aquí
 EnabledDesc=Condición para tener este campo activo (Ejemplos: 1 o $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=¿Es visible el campo? (Ejemplos: 0 = Nunca visible, 1 = Visible en la lista y crear / actualizar / ver formularios, 2 = Visible solo en la lista, 3 = Visible solo en el formulario crear / actualizar / ver (no en la lista), 4 = Visible en la lista y solo actualizar / ver formulario (no crear), 5 = Visible solo en el formulario de vista final de la lista (no crear, no actualizar)<br><br>El uso de un valor negativo significa que el campo no se muestra de forma predeterminada en la lista, pero se puede seleccionar para verlo).<br><br>Puede ser una expresión, por ejemplo:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+VisibleDesc=¿Es visible el campo? (Ejemplos: 0 = Nunca visible, 1 = Visible en la lista y crear/actualizar/ver formularios, 2 = Visible solo en la lista, 3 = Visible solo en el formulario crear/actualizar/ver (no en la lista), 4 = Visible en la lista y solo actualizar/ver formulario (no crear), 5 = Visible solo en el formulario de vista final de la lista (no crear, no actualizar)<br><br>El uso de un valor negativo significa que el campo no se muestra de forma predeterminada en la lista, pero se puede seleccionar para verlo).<br><br>Puede ser una expresión, por ejemplo:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
 DisplayOnPdfDesc=Muestre este campo en documentos PDF compatibles, puede administrar la posición con el campo "Posición". <br/> Actualmente, conocidos modelos compatibles PDF son: eratosthene (pedidos), espadon (notas de envios), sponge (facturas), cyan (presupuesto), cornas (pedido a proveedor) <br/> <br/> <strong> Para documento: </strong> <br/> 0 = No se ven las <br/> 1 = mostrar <br/> 2 = mostrar sólo si no está vacío <br/> <br/> <strong> Para las líneas de documentos: </strong> <br/> 0 = no mostradas <br/> 1 =  se muestran en una columna <br/> 3 = se muestra en la columna de descripción de línea después de la descripción <br/> 4 = se muestra en la columna de descripción después de la descripción solo si no está vacía
 DisplayOnPdf=Mostrar en PDF
 IsAMeasureDesc=¿Se puede acumular el valor del campo para obtener un total en el listado? (Ejemplos: 1 o 0)
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Si tiene conocimientos de SQL y PHP, puede usar el asis
 SeeTopRightMenu=Ver <span class="fa fa-bug"></span> en el menú superior derecho
 AddLanguageFile=Añadir archivo de idioma
 YouCanUseTranslationKey=Aquí puede usar una clave que es la clave de traducción encontrada en el archivo de idioma (ver pestaña "Idiomas")
-DropTableIfEmpty=(Eliminar tabla si está vacía)
+DropTableIfEmpty=(Destruya la tabla si está vacía)
 TableDoesNotExists=La tabla %s no existe
 TableDropped=Tabla %s eliminada
 InitStructureFromExistingTable=Construir la estructura de array de una tabla existente
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Usar un editor específico URL
 UseSpecificFamily = Usar una familia específica
 UseSpecificAuthor = Usar un autor especifico
 UseSpecificVersion = Usar una versión inicial específica
-ModuleMustBeEnabled=El módulo debe ser activado primero
 IncludeRefGeneration=La referencia del objeto debe generarse automáticamente
 IncludeRefGenerationHelp=Marque esto si desea incluir código para gestionar la generación automática de la referencia
 IncludeDocGeneration=Quiero generar algunos documentos del objeto.
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Tipo de campos: <br> varchar(99), double(24,8), real, text, htm
 AsciiToHtmlConverter=Conversor de ASCII a HTML
 AsciiToPdfConverter=Conversor de ASCII a PDF
 TableNotEmptyDropCanceled=La tabla no está vacía. La eliminación ha sido cancelada.
+ModuleBuilderNotAllowed=El constructor de módulos está disponible pero no permitido para su usuario.
diff --git a/htdocs/langs/es_ES/mrp.lang b/htdocs/langs/es_ES/mrp.lang
index 34538f681bb..d0eb0a49644 100644
--- a/htdocs/langs/es_ES/mrp.lang
+++ b/htdocs/langs/es_ES/mrp.lang
@@ -77,4 +77,28 @@ UnitCost=Costo unitario
 TotalCost=Coste total
 BOMTotalCost=El costo para 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, o el mejor precio de compra)
 GoOnTabProductionToProduceFirst=Primero debe haber iniciado la producción para cerrar una orden de fabricación (consulte la pestaña '%s'). Pero puedes cancelarlo.
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Un kit no se puede usar en una Lista de Materiales (BOM) o una Orden de Fabricación (MO)
+Workstation=Puesto de trabajo
+Workstations=Estaciones de trabajo
+WorkstationsDescription=Gestión de estaciones de trabajo
+WorkstationSetup = Configuración de estaciones de trabajo
+WorkstationSetupPage = Página de configuración de estaciones de trabajo
+WorkstationAbout = Acerca de la estación de trabajo
+WorkstationAboutPage = Estaciones de trabajo sobre la página
+WorkstationList=Lista de estaciones de trabajo
+WorkstationCreate=Agregar nueva estación de trabajo
+ConfirmEnableWorkstation=¿Está seguro de que desea habilitar la estación de trabajo <b> %s </b>?
+EnableAWorkstation=Habilitar una estación de trabajo
+ConfirmDisableWorkstation=¿Está seguro de que desea desactivar la estación de trabajo <b> %s </b>?
+DisableAWorkstation=Deshabilitar una estación de trabajo
+DeleteWorkstation=SuprimIr
+NbOperatorsRequired=Número de operadores necesarios
+THMOperatorEstimated=THM estimado del operador
+THMMachineEstimated=THM estimado de la máquina
+WorkstationType=Tipo de estación de trabajo
+Human=Humano
+Machine=Máquina
+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.
diff --git a/htdocs/langs/es_ES/multicurrency.lang b/htdocs/langs/es_ES/multicurrency.lang
index 858b5a9a695..976d9b08fd8 100644
--- a/htdocs/langs/es_ES/multicurrency.lang
+++ b/htdocs/langs/es_ES/multicurrency.lang
@@ -20,8 +20,8 @@ MulticurrencyPaymentAmount=Importe total, divisa original
 AmountToOthercurrency=Cantidad a (en moneda de la cuenta receptora)
 CurrencyRateSyncSucceed=La sincronización de la tasa de cambio se realizó con éxito
 MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use la moneda del documento para pagos en línea
-TabTitleMulticurrencyRate=Lista de tarifas
-ListCurrencyRate=Lista de tipos de cambio de la moneda
+TabTitleMulticurrencyRate=Listado de tarifas
+ListCurrencyRate=Listado de tipos de cambio de la moneda
 CreateRate=Crea una tarifa
 FormCreateRate=Tasa de creación
 FormUpdateRate=Modificación de tarifas
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index 12b15246da7..14aa5ba7ccc 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -141,11 +141,12 @@ OrderByEMail=Correo
 OrderByWWW=En línea
 OrderByPhone=Teléfono
 # Documents models
-PDFEinsteinDescription=Una plantilla de orden completo 
-PDFEratostheneDescription=Una plantilla de orden completa
+PDFEinsteinDescription=Un modelo de pedido completo (implementación anterior de la plantilla Eratosthene)
+PDFEratostheneDescription=Un modelo de pedido completo
 PDFEdisonDescription=Modelo de pedido simple
-PDFProformaDescription=Una plantilla de factura Proforma completa
+PDFProformaDescription=Un modelo de factura Proforma completo
 CreateInvoiceForThisCustomer=Facturar pedidos
+CreateInvoiceForThisSupplier=Facturar pedidos
 NoOrdersToInvoice=Sin pedidos facturables
 CloseProcessedOrdersAutomatically=Clasificar automáticamente como "Procesados" los pedidos seleccionados.
 OrderCreation=Creación pedido
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index dcaaa909282..0e4f2c2c4e6 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -5,8 +5,6 @@ Tools=Utilidades
 TMenuTools=Utilidades
 ToolsDesc=Todas las utilidades que no están incluidas en otras entradas del menú se encuentran aquí.<br>Están disponibles en el menú de la izquierda.
 Birthday=Aniversario
-BirthdayDate=Fecha de cumpleaños
-DateToBirth=Fecha de nacimiento
 BirthdayAlertOn=alerta aniversario activada
 BirthdayAlertOff=alerta aniversario desactivada
 TransKey=Traducción de la clave TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Mes anterior (texto) de la fecha de la factura
 TextPreviousMonthOfInvoice=Mes anterior (texto) de la fecha de la factura
 NextMonthOfInvoice=Mes siguiente (número 1-12) de la fecha de la factura
 TextNextMonthOfInvoice=Mes siguiente (texto) de la fecha de la factura
+PreviousMonth=Mes anterior
+CurrentMonth=Mes actual
 ZipFileGeneratedInto=Archivo zip generado en <b>%s</b>.
 DocFileGeneratedInto=Fichero documentación generado en <b>%s</b>.
 JumpToLogin=Desconectado. Ir a la página de inicio de sesión ...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Informe de gastos validado (se requiere aprobaci
 Notify_EXPENSE_REPORT_APPROVE=Informe de gastos aprobado
 Notify_HOLIDAY_VALIDATE=Petición días libres validada (se requiere aprobación)
 Notify_HOLIDAY_APPROVE=Petición días libres aprobada
+Notify_ACTION_CREATE=Acción agregada a la agenda
 SeeModuleSetup=Vea la configuración del módulo %s
 NbOfAttachedFiles=Número archivos/documentos adjuntos
 TotalSizeOfAttachedFiles=Tamaño total de los archivos/documentos adjuntos
@@ -99,6 +100,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nNos ponemos en contacto con ust
 PredefinedMailContentSendFichInter=__(Hello)__\n\nNos ponemos en contacto con usted para facilitarle la intervención __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Puede hacer clic en el siguiente enlace para realizar su pago, si aún no lo ha hecho.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hola)__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Recordatorio de evento "__EVENT_LABEL__" el __EVENT_DATE__ a las __EVENT_TIME__ <br> <br> Este es un mensaje automático, no responda.
 DemoDesc=Dolibarr es un ERP/CRM para la gestión de negocios (profesionales o asociaciones), compuesto de módulos funcionales independientes y opcionales. Una demostración que incluya todos estos módulos no tiene sentido porque no utilizará todos los módulos. Además, tiene disponibles varios tipos de perfiles de demostración.
 ChooseYourDemoProfil=Elija el perfil de demostración que mejor se adapte a sus necesidades ...
 ChooseYourDemoProfilMore=... o construya su perfil<br>(modo de selección manual)
@@ -214,6 +216,7 @@ EMailTextExpenseReportValidated=El informe de gastos %s ha sido validado.
 EMailTextExpenseReportApproved=El informe de gastos %s ha sido aprobado.
 EMailTextHolidayValidated=La petición de lías libres %s ha sido validada.
 EMailTextHolidayApproved=La petición de lías libres %s ha sido aprobada.
+EMailTextActionAdded=La acción %s se ha agregado a la Agenda.
 ImportedWithSet=Lote de importación (import key)
 DolibarrNotification=Notificación automática
 ResizeDesc=Introduzca el nuevo ancho <b>O</b> la nueva altura. La relación se conserva al cambiar el tamaño ...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contacto/dirección creada por el recolector de e
 ProjectCreatedByEmailCollector=Proyecto creado por el recolector de e-mails del MSGID de e-mail %s
 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
+PrefixSession=Prefijo para ID de sesión
 
 ##### Export #####
 ExportsArea=Área de exportaciones
@@ -278,9 +282,9 @@ LinesToImport=Líneas a importar
 
 MemoryUsage=Uso de memoria
 RequestDuration=Duración de la solicitud
-ProductsPerPopularity=Products/Services by popularity
+ProductsPerPopularity=Productos/Servicios por popularidad
 PopuProp=Productos/Servicios por popularidad en Presupuestos
 PopuCom=Productos/Servicios por popularidad en Pedidos
 ProductStatistics=Estadísticas de productos/servicios
 NbOfQtyInOrders=Cantidad en pedidos
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Seleccione el tipo de objeto a analizar...
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index 340ead2edf3..6511c425686 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Complete con las fechas de la última línea de servici
 MultiPricesAbility=Varios segmentos de precios por producto/servicio (cada cliente está en un segmento)
 MultiPricesNumPrices=Nº de precios
 DefaultPriceType=Base de precios por defecto (con versus sin impuestos) al agregar nuevos precios de venta
-AssociatedProductsAbility=Activar kits (productos virtuales)
+AssociatedProductsAbility=Habilitar kits (conjunto de varios productos)
+VariantsAbility=Habilitar variantes (variaciones de productos, por ejemplo, color, tamaño)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Número de productos que componen este kit
 ParentProductsNumber=Nº de productos que este producto compone
@@ -120,8 +121,8 @@ CategoryFilter=Filtro por categoría
 ProductToAddSearch=Buscar productos a adjuntar
 NoMatchFound=No se han encontrado resultados
 ListOfProductsServices=Listado de productos/servicios
-ProductAssociationList=Lista de productos / servicios que son componentes de este kit
-ProductParentList=Lista de kits con este producto como componente
+ProductAssociationList=Listado de productos/servicios que son componentes de este kit
+ProductParentList=Listado de kits con este producto como componente
 ErrorAssociationIsFatherOfThis=Uno de los productos seleccionados es padre del producto en curso
 DeleteProduct=Eliminar un producto/servicio
 ConfirmDeleteProduct=¿Está seguro de querer eliminar este producto/servicio?
@@ -167,8 +168,10 @@ BuyingPrices=Precios de compra
 CustomerPrices=Precios a clientes
 SuppliersPrices=Precios de proveedores
 SuppliersPricesOfProductsOrServices=Precios de proveedores (productos o servicios)
-CustomCode=Código aduanero
+CustomCode=Aduanas|Producto|Código HS
 CountryOrigin=País de origen
+RegionStateOrigin=Región de origen
+StateOrigin=Estado|Provincia de origen
 Nature=Naturaleza del producto (materia prima/producto acabado)
 NatureOfProductShort=Naturaleza del producto
 NatureOfProductDesc=Materia prima o producto terminado
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Usar el precio fijado
 PriceByQuantity=Precios diferentes por cantidad
 DisablePriceByQty=Desactivar precios por cantidad
 PriceByQuantityRange=Rango cantidad
-MultipriceRules=Reglas para segmento de precios
+MultipriceRules=Precios automáticos por segmento
 UseMultipriceRules=Use las reglas de segmentación de precios (definidas en la configuración de módulo de productos) para autocalcular los precios de todos los demás segmentos de acuerdo con el primer segmento
 PercentVariationOver=%% variación sobre %s
 PercentDiscountOver=%% descuento sobre %s
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 2adccf038e2..31513b0cd20 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -7,7 +7,7 @@ ProjectsArea=Área Proyectos
 ProjectStatus=Estado del proyecto
 SharedProject=Proyecto compartido
 PrivateProject=Contactos proyecto
-ProjectsImContactFor=Projects for which I am explicitly a contact
+ProjectsImContactFor=Proyectos de los que soy contacto explícito
 AllAllowedProjects=Todos los proyectos que puedo leer (míos + públicos)
 AllProjects=Todos los proyectos
 MyProjectsDesc=Esta vista está limitada a aquellos proyectos en los que usted es un contacto
@@ -76,15 +76,16 @@ MyActivities=Mis tareas/actividades
 MyProjects=Mis proyectos
 MyProjectsArea=Mi Área de proyectos
 DurationEffective=Duración efectiva
-ProgressDeclared=Progresión declarada
+ProgressDeclared=Progreso real declarado
 TaskProgressSummary=Progreso de la tarea
 CurentlyOpenedTasks=Tareas actualmente abiertas
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=El progreso declarado es menos de %s de la progresión calculada
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=El progreso declarado es más de %s que la progresión calculada
-ProgressCalculated=Progresión calculada
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=El progreso real declarado es menor %s que el progreso en el consumo
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=El progreso real declarado es más %s que el progreso en el consumo
+ProgressCalculated=Avances en el consumo
 WhichIamLinkedTo=que estoy vinculado a
 WhichIamLinkedToProject=que estoy vinculado al proyecto
 Time=Tiempo
+TimeConsumed=Consumido
 ListOfTasks=Listado de tareas
 GoToListOfTimeConsumed=Ir al listado de tiempos consumidos
 GanttView=Vista de Gantt
@@ -163,7 +164,7 @@ OpportunityProbabilityShort=Prob. Opor.
 OpportunityAmount=Importe oportunidad
 OpportunityAmountShort=Importe oportunidad
 OpportunityWeightedAmount=Cantidad ponderada de oportunidad
-OpportunityWeightedAmountShort=Opp. cantidad ponderada
+OpportunityWeightedAmountShort=Cantidad ponderada op.
 OpportunityAmountAverageShort=Importe medio oportunidad
 OpportunityAmountWeigthedShort=Importe ponderado oportunidad
 WonLostExcluded=Excluidos Ganados/Perdidos
@@ -211,9 +212,9 @@ ProjectNbProjectByMonth=Nº de proyectos creados por mes
 ProjectNbTaskByMonth=Nº de tareas creadas por mes
 ProjectOppAmountOfProjectsByMonth=Importe de oportunidades por mes
 ProjectWeightedOppAmountOfProjectsByMonth=Importe medio oportinidades por mes
-ProjectOpenedProjectByOppStatus=Open project|lead by lead status
-ProjectsStatistics=Statistics on projects or leads
-TasksStatistics=Statistics on tasks of projects or leads
+ProjectOpenedProjectByOppStatus=Proyecto abierto|Oportunidad por estado de lead
+ProjectsStatistics=Estadísticas de proyectos o leads
+TasksStatistics=Estadísticas sobre tareas de proyectos o leads
 TaskAssignedToEnterTime=Tarea asignada. Debería poder introducir tiempos en esta tarea.
 IdTaskTime=Id
 YouCanCompleteRef=Si desea completar la referencia con alguna información (para usarlo como filtros de búsqueda), se recomienda añadir un carácter - para separarlo, la numeración automática seguirá funcionando correctamente para los próximos proyectos. Por ejemplo %s-ABC. 
@@ -266,4 +267,4 @@ NewInvoice=Nueva factura
 OneLinePerTask=Una línea por tarea
 OneLinePerPeriod=Una línea por período
 RefTaskParent=Ref. Tarea principal
-ProfitIsCalculatedWith=Profit is calculated using
+ProfitIsCalculatedWith=El beneficio se calcula usando
diff --git a/htdocs/langs/es_ES/propal.lang b/htdocs/langs/es_ES/propal.lang
index 37119bea66f..b0d6536d10d 100644
--- a/htdocs/langs/es_ES/propal.lang
+++ b/htdocs/langs/es_ES/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Enviar presupuesto por e-mail
 DatePropal=Fecha presupuesto
 DateEndPropal=Fecha fin de validez
 ValidityDuration=Duración de validez
-CloseAs=Establecer estado a
 SetAcceptedRefused=Establecer aceptado/rechazado
 ErrorPropalNotFound=Presupuesto %s inexistente
 AddToDraftProposals=Añadir a presupuesto borrador
@@ -76,12 +75,17 @@ TypeContact_propal_external_BILLING=Contacto cliente de facturación presupuesto
 TypeContact_propal_external_CUSTOMER=Contacto cliente seguimiento presupuesto
 TypeContact_propal_external_SHIPPING=Contacto cliente para envíos
 # Document models
-DocModelAzurDescription=Una plantilla de propuesta completa (implementación anterior de la plantilla Cyan)
-DocModelCyanDescription=Una plantilla de propuesta completa
+DocModelAzurDescription=Un modelo de presupuesto completa (implementación anterior de la plantilla Cyan)
+DocModelCyanDescription=Un modelo de presupuesto completo
 DefaultModelPropalCreate=Modelo por defecto
 DefaultModelPropalToBill=Modelo por defecto al cerrar un presupuesto (a facturar)
 DefaultModelPropalClosed=Modelo por defecto al cerrar un presupuesto (no facturado)
 ProposalCustomerSignature=Aceptación por escrito, sello de la empresa, fecha y firma
 ProposalsStatisticsSuppliers=Estadísticas presupuestos de proveedores
 CaseFollowedBy=Caso seguido por
-SignedOnly=Signed only
+SignedOnly=Solo firmado
+IdProposal=ID de Presupuesto
+IdProduct=ID del Producto
+PrParentLine=Presupuesto de línea principal
+LineBuyPriceHT=Precio de compra Importe neto de impuestos por línea
+
diff --git a/htdocs/langs/es_ES/receiptprinter.lang b/htdocs/langs/es_ES/receiptprinter.lang
index b14d6f8d5ec..1908b68dc31 100644
--- a/htdocs/langs/es_ES/receiptprinter.lang
+++ b/htdocs/langs/es_ES/receiptprinter.lang
@@ -54,7 +54,7 @@ DOL_DOUBLE_WIDTH=Tamaño de doble ancho
 DOL_DEFAULT_HEIGHT_WIDTH=Altura y ancho predeterminados
 DOL_UNDERLINE=Habilitar subrayado
 DOL_UNDERLINE_DISABLED=Desactivar subrayado
-DOL_BEEP=Sonido beep
+DOL_BEEP=Pitido
 DOL_PRINT_TEXT=Imprimir texto
 DateInvoiceWithTime=Fecha y hora de factura
 YearInvoice=Año de factura
@@ -77,6 +77,6 @@ DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Saldo de cuenta del cliente
 DOL_VALUE_MYSOC_NAME=Nombre de la empresa
 VendorLastname=Apellidos del vendedor
 VendorFirstname=Nombre del vendedor
-VendorEmail=Vendor email
+VendorEmail=E-mail del proveedor
 DOL_VALUE_CUSTOMER_POINTS=Puntos del cliente
 DOL_VALUE_OBJECT_POINTS=Puntos de objetos
diff --git a/htdocs/langs/es_ES/receptions.lang b/htdocs/langs/es_ES/receptions.lang
index 7fe1143884d..72efe825bb6 100644
--- a/htdocs/langs/es_ES/receptions.lang
+++ b/htdocs/langs/es_ES/receptions.lang
@@ -43,5 +43,5 @@ ProductQtyInSuppliersReceptionAlreadyRecevied=Cantidad en pedidos a proveedores
 ValidateOrderFirstBeforeReception=Antes de poder realizar recepciones debe validar el pedido.
 ReceptionsNumberingModules=Módulo de numeración para recepciones
 ReceptionsReceiptModel=Modelos de documentos para recepciones.
-NoMorePredefinedProductToDispatch=No more predefined products to dispatch
+NoMorePredefinedProductToDispatch=No hay más productos predefinidos para enviar
 
diff --git a/htdocs/langs/es_ES/recruitment.lang b/htdocs/langs/es_ES/recruitment.lang
index e542b1ec190..26cacddf8cc 100644
--- a/htdocs/langs/es_ES/recruitment.lang
+++ b/htdocs/langs/es_ES/recruitment.lang
@@ -71,5 +71,6 @@ YourCandidature=Su aplicación
 YourCandidatureAnswerMessage=Gracias por su aplicación. <br> ...
 JobClosedTextCandidateFound=El puesto de trabajo esta cerrado. El puesto ha sido ocupado.
 JobClosedTextCanceled=El puesto de trabajo esta cerrado
-ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+ExtrafieldsJobPosition=Campos adicionales (puestos de trabajo)
+ExtrafieldsCandidatures=Campos adicionales (solicitudes de empleo)
+MakeOffer=Realizar un presupuesto
diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang
index 92f5556b279..f45396f7142 100644
--- a/htdocs/langs/es_ES/sendings.lang
+++ b/htdocs/langs/es_ES/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Otros envíos de este pedido
 SendingsAndReceivingForSameOrder=Envíos y recepciones de este pedido
 SendingsToValidate=Envíos a validar
 StatusSendingCanceled=Anulado
+StatusSendingCanceledShort=Anulado
 StatusSendingDraft=Borrador
 StatusSendingValidated=Validado (productos a enviar o enviados)
 StatusSendingProcessed=Procesado
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Antes de poder realizar envíos debe validar el
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Modelo completo de nota de entrega / recepción (logo...)
+DocumentModelStorm=Modelo de documento más completo para recibos de entrega y compatibilidad de campos adicionales (logotipo ...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constante EXPEDITION_ADDON_NUMBER no definida
 SumOfProductVolumes=Suma del volumen de los productos
 SumOfProductWeights=Suma del peso de los productos
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index 75b1e30418d..c40c86b03c9 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -34,7 +34,7 @@ StockMovementForId=ID movimiento %d
 ListMouvementStockProject=Listado de movimientos de stock asociados al proyecto
 StocksArea=Área almacenes
 AllWarehouses=Todos los almacenes
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
+IncludeEmptyDesiredStock=Incluir también stock negativo con stock deseado indefinido
 IncludeAlsoDraftOrders=Incluir también pedidos borrador
 Location=Lugar
 LocationSummary=Nombre corto del lugar
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Valor de stocks
 UserWarehouseAutoCreate=Crear automáticamente existencias/almacén propio del usuario en la creación del usuario
 AllowAddLimitStockByWarehouse=Administrar también el valor del stock mínimo y deseado de la cupla (producto-almacén) además del valor del stock mínimo y deseado por producto
 RuleForWarehouse=Regla para almacenes
+WarehouseAskWarehouseDuringPropal=Establecer un almacén para presupuestos de venta
 WarehouseAskWarehouseDuringOrder=Indicar un almacén en pedidos de clientes
 UserDefaultWarehouse=Indicar un almacén en usuarios
 MainDefaultWarehouse=Almacén por defecto
@@ -122,9 +123,9 @@ DesiredStockDesc=Esta cantidad será el valor que se utilizará para llenar el s
 StockToBuy=A pedir
 Replenishment=Reaprovisionamiento
 ReplenishmentOrders=Ordenes de reaprovisionamiento
-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=Según las opciones de aumento/disminución, el stock físico y virtual (stock físico + pedidos en curso) puede diferir
+UseRealStockByDefault=Usar stock real, en lugar de stock virtual, para la función de reaprovisionamiento
+ReplenishmentCalculation=La cantidad a ordenar será (cantidad deseada - stock real) en lugar de (cantidad deseada - stock virtual)
 UseVirtualStock=Usar stock virtual
 UsePhysicalStock=Usar stock físico
 CurentSelectionMode=Modo de selección actual
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Establezca el valor en 0 para restablecer la cantidad <br>
 UpdateByScaning=Actualizar 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.
diff --git a/htdocs/langs/es_ES/stripe.lang b/htdocs/langs/es_ES/stripe.lang
index 14579cc11a6..cf8d22d6a15 100644
--- a/htdocs/langs/es_ES/stripe.lang
+++ b/htdocs/langs/es_ES/stripe.lang
@@ -28,7 +28,6 @@ AccountParameter=Parámetros de la cuenta
 UsageParameter=Parámetros de uso
 InformationToFindParameters=Información para encontrar a su configuración de cuenta %s
 STRIPE_CGI_URL_V2=URL CGI del módulo Stripe para el pago
-VendorName=Nombre del vendedor
 CSSUrlForPaymentForm=Url de la hoja de estilo CSS para el formulario de pago
 NewStripePaymentReceived=Nuevo pago de Stripe recibido
 NewStripePaymentFailed=Nuevo pago de Stripe intentado, pero ha fallado
diff --git a/htdocs/langs/es_ES/supplier_proposal.lang b/htdocs/langs/es_ES/supplier_proposal.lang
index 14c74f9721c..4fea43e5c77 100644
--- a/htdocs/langs/es_ES/supplier_proposal.lang
+++ b/htdocs/langs/es_ES/supplier_proposal.lang
@@ -13,6 +13,7 @@ SupplierProposalArea=Área presupuestos de proveedores
 SupplierProposalShort=Presupuesto de proveedor
 SupplierProposals=Presupuestos de proveedor
 SupplierProposalsShort=Presupuestos de proveedor
+AskPrice=Presupuesto
 NewAskPrice=Nuevo presupuesto
 ShowSupplierProposal=Mostrar presupuesto
 AddSupplierProposal=Crear un presupuesto
diff --git a/htdocs/langs/es_ES/suppliers.lang b/htdocs/langs/es_ES/suppliers.lang
index 17b9bc3a831..d66117c0ab4 100644
--- a/htdocs/langs/es_ES/suppliers.lang
+++ b/htdocs/langs/es_ES/suppliers.lang
@@ -38,7 +38,7 @@ MenuOrdersSupplierToBill=Pedidos a proveedor a facturar
 NbDaysToDelivery=Tiempo de entrega en días
 DescNbDaysToDelivery=El mayor retraso en las entregas de productos de este pedido
 SupplierReputation=Reputación del proveedor
-ReferenceReputation=Reference reputation
+ReferenceReputation=Referencias de reputación
 DoNotOrderThisProductToThisSupplier=No realizar pedidos
 NotTheGoodQualitySupplier=Mala calidad
 ReputationForThisProduct=Reputación
diff --git a/htdocs/langs/es_ES/ticket.lang b/htdocs/langs/es_ES/ticket.lang
index ccc27036015..2ff65db0cfc 100644
--- a/htdocs/langs/es_ES/ticket.lang
+++ b/htdocs/langs/es_ES/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Tipo de tickets
 TicketDictCategory=Categorías de tickets
 TicketDictSeverity=Gravedad de los tickets
 TicketDictResolution=Ticket - Resolución
-TicketTypeShortBUGSOFT=Mal funcionamiento del software
-TicketTypeShortBUGHARD=Mal funcionamiento del hardware
-TicketTypeShortCOM=Pregunta comercial
 
+TicketTypeShortCOM=Pregunta comercial
 TicketTypeShortHELP=Solicitud de ayuda funcional
 TicketTypeShortISSUE=Asunto, error o problema
 TicketTypeShortREQUEST=Solicitud de cambio o mejora
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Otro
 TicketSeverityShortLOW=Bajo
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Alto
-TicketSeverityShortBLOCKING=Crítico / Bloqueo
+TicketSeverityShortBLOCKING=Crítico, Bloqueo
 
 ErrorBadEmailAddress=El campo '%s' es incorrecto
 MenuTicketMyAssign=Mis tickets
@@ -60,7 +58,6 @@ OriginEmail=Origen E-Mail
 Notify_TICKET_SENTBYMAIL=Enviar mensaje de ticket por e-mail
 
 # Status
-NotRead=No lleído
 Read=Leido
 Assigned=Asignado
 InProgress=En progreso
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=La interfaz pública permite a cualquier visi
 TicketsAutoAssignTicket=Asignar automáticamente al usuario que creó el ticket
 TicketsAutoAssignTicketHelp=Al crear un ticket, el usuario puede asignarse automáticamente al ticket.
 TicketNumberingModules=Módulo de numeración de tickets
+TicketsModelModule=Plantillas de documentos para tickets
 TicketNotifyTiersAtCreation=Notificar a los terceros en la creación
 TicketsDisableCustomerEmail=Desactivar siempre los e-mails al crear tickets desde la interfaz pública
 TicketsPublicNotificationNewMessage=Enviar e-mail(s) cuando se añade un nuevo mensaje
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Estado cambiado: %s a %s
 TicketNotNotifyTiersAtCreate=No notificar a la compañía al crear
 Unread=No leído
 TicketNotCreatedFromPublicInterface=No disponible. El ticket no se creó desde la interfaz pública.
-PublicInterfaceNotEnabled=La interfaz pública no estaba habilitada
 ErrorTicketRefRequired=La referencia del ticket es obligatoria
 
 #
diff --git a/htdocs/langs/es_ES/trips.lang b/htdocs/langs/es_ES/trips.lang
index 9a5520922fe..af2e038dd94 100644
--- a/htdocs/langs/es_ES/trips.lang
+++ b/htdocs/langs/es_ES/trips.lang
@@ -110,7 +110,7 @@ ExpenseReportPayment=Informe de pagos de gastos
 ExpenseReportsToApprove=Informe de gastos a aprobar
 ExpenseReportsToPay=Informe de gastos a pagar
 ConfirmCloneExpenseReport=¿Está seguro de querer eliminar este informe de gastos?
-ExpenseReportsIk=Índice de kilometraje de informes de gastos
+ExpenseReportsIk=Configuración de cargos por kilometraje
 ExpenseReportsRules=Reglas del informe de gastos
 ExpenseReportIkDesc=Se puede modificar el cálculo de los kilómetros de gasto por categoría y por rango que se definen previamente. <b>d</b> es la distancia en kilómetros
 ExpenseReportRulesDesc=Puede crear o actualizar cualquier regla de cálculo. Esta parte se utilizará cuando el usuario cree un nuevo informe de gastos
@@ -145,7 +145,7 @@ nolimitbyEX_DAY=por día (sin limitación)
 nolimitbyEX_MON=por mes (sin limitación)
 nolimitbyEX_YEA=por año (sin limitación)
 nolimitbyEX_EXP=por línea (sin limitación)
-CarCategory=Categoría del coche
+CarCategory=Categoría de vehículo
 ExpenseRangeOffset=Importe compensado: %s
 RangeIk=Rango de kilometraje
 AttachTheNewLineToTheDocument=Adjuntar la línea a un documento subido
diff --git a/htdocs/langs/es_ES/users.lang b/htdocs/langs/es_ES/users.lang
index 900c65e6201..bfc709a9e2f 100644
--- a/htdocs/langs/es_ES/users.lang
+++ b/htdocs/langs/es_ES/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Eliminar del grupo
 PasswordChangedAndSentTo=Contraseña cambiada y enviada a <b>%s</b>.
 PasswordChangeRequest=Solicitud para cambiar la contraseña de <b>%s</b>
 PasswordChangeRequestSent=Petición de cambio de contraseña para <b>%s</b> enviada a <b>%s</b>.
+IfLoginExistPasswordRequestSent=Si este inicio de sesión es una cuenta válida, se ha enviado un e-mail para restablecer la contraseña.
+IfEmailExistPasswordRequestSent=Si este correo electrónico es una cuenta válida, se ha enviado un correo electrónico para restablecer la contraseña.
 ConfirmPasswordReset=Confirmar restablecimiento de contraseña
 MenuUsersAndGroups=Usuarios y grupos
 LastGroupsCreated=Últimos %s grupos creados
@@ -73,6 +75,7 @@ CreateInternalUserDesc=Este formulario le permite crear un usuario interno para
 InternalExternalDesc=Un usuario <b> interno </b> es un usuario que forma parte de su empresa/organización. <br> Un usuario <b> externo </b> es un cliente, proveedor u otro (La creación de un usuario externo para un tercero se puede hacer desde el registro de contacto del tercero). <br> <br> En ambos casos, los permisos definen los derechos en Dolibarr, también el usuario externo puede tener un administrador de menú diferente al usuario interno (Ver Inicio - Configuración - Entorno)
 PermissionInheritedFromAGroup=El permiso se concede ya que lo hereda de un grupo al cual pertenece el usuario.
 Inherited=Heredado
+UserWillBe=El usuario creado será
 UserWillBeInternalUser=El usuario creado será un usuario interno (ya que no está ligado a un tercero en particular)
 UserWillBeExternalUser=El usuario creado será un usuario externo (ya que está ligado a un tercero en particular)
 IdPhoneCaller=ID llamante (teléfono)
@@ -108,13 +111,15 @@ DisabledInMonoUserMode=Desactivado en modo mantenimiento
 UserAccountancyCode=Código contable usuario
 UserLogoff=Usuario desconectado
 UserLogged=Usuario conectado
-DateOfEmployment=Employment date
-DateEmployment=Fecha de inicio de empleo
+DateOfEmployment=Fecha empleo
+DateEmployment=Empleo
+DateEmploymentstart=Fecha de inicio de empleo
 DateEmploymentEnd=Fecha de finalización de empleo
+RangeOfLoginValidity=Rango de fechas de validez de inicio de sesión
 CantDisableYourself=No puede deshabilitar su propio registro de usuario
 ForceUserExpenseValidator=Forzar validador de informes de gastos
 ForceUserHolidayValidator=Forzar validador de solicitud de días libres
 ValidatorIsSupervisorByDefault=Por defecto, el validador es el supervisor del usuario. Mantener vacío para mantener este comportamiento.
 UserPersonalEmail=Email personal
 UserPersonalMobile=Teléfono móvil personal
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+WarningNotLangOfInterface=Atención, este es el idioma principal que habla el usuario, no el idioma del entorno que eligió ver. Para cambiar el idioma del entorno visible por este usuario, vaya a la pestaña %s
diff --git a/htdocs/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang
index 56cb631183f..7ea28bc2c96 100644
--- a/htdocs/langs/es_ES/website.lang
+++ b/htdocs/langs/es_ES/website.lang
@@ -30,7 +30,6 @@ EditInLine=Editar en línea
 AddWebsite=Añadir sitio web
 Webpage=Página web/Contenedor
 AddPage=Añadir página/contenedor
-HomePage=Página de inicio
 PageContainer=Página
 PreviewOfSiteNotYetAvailable=La vista previa de su sitio web <strong>%s</strong> aún no está disponible. Primero debe '<strong>Importar una plantilla de sitio web completa</strong>' o simplemente '<strong>Agregar una página/contenedor</strong>'.
 RequestedPageHasNoContentYet=La página pedida con id %s todavía no tiene contenido, o cache file.tpl.php ha sido eliminado. Editar el contenido de la página para resolverlo.
@@ -101,7 +100,7 @@ EmptyPage=Página vacía
 ExternalURLMustStartWithHttp=La URL externa debe comenzar con http:// o https://
 ZipOfWebsitePackageToImport=Cargue el archivo Zip del paquete de plantilla del sitio web
 ZipOfWebsitePackageToLoad=o Elija un paquete de plantilla de sitio web incorporado disponible
-ShowSubcontainers=Incluir contenido dinámico
+ShowSubcontainers=Mostrar contenido dinámico
 InternalURLOfPage=URL interna de la página
 ThisPageIsTranslationOf=Esta página/contenedor es traducción de
 ThisPageHasTranslationPages=Esta página/contenedor tiene traducción
@@ -136,4 +135,5 @@ RSSFeed=Hilos RSS
 RSSFeedDesc=Puede obtener una fuente RSS de los últimos artículos con el tipo 'blogpost' usando esta URL
 PagesRegenerated=%s página(s)/contenedor(s) regenerados
 RegenerateWebsiteContent=Regenerar archivos de caché del sitio web
-AllowedInFrames=Allowed in Frames
+AllowedInFrames=Permitido en marcos
+DefineListOfAltLanguagesInWebsiteProperties=Defina la lista de todos los idiomas disponibles en las propiedades del sitio web.
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index b2e4eeb7439..e6f1c0de0f9 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Payments by Direct debit orders
-SuppliersStandingOrdersArea=Payments by Credit transfer
+CustomersStandingOrdersArea=Pagos por domiciliación bancaria
+SuppliersStandingOrdersArea=Pagos por transferencia bancaria
 StandingOrdersPayment=Domiciliaciones
 StandingOrderPayment=Domiciliación
 NewStandingOrder=Nueva domiciliación
@@ -11,37 +11,38 @@ PaymentByBankTransferLines=Líneas de orden de transferencia bancaria
 WithdrawalsReceipts=Domiciliaciones
 WithdrawalReceipt=Domiciliación
 BankTransferReceipts=Órdenes de transferencia bancaria
-BankTransferReceipt=Credit transfer order
+BankTransferReceipt=Orden de transferencia bancaria
 LatestBankTransferReceipts=Últimas %s órdenes de transferencia bancaria 
 LastWithdrawalReceipts=Últimas %s domiciliaciones
-WithdrawalsLine=Direct debit order line
-CreditTransferLine=Credit transfer line
+WithdrawalsLine=Línea de  domiciliación bancaria
+CreditTransferLine=Línea de transferencia bancaria
 WithdrawalsLines=Lineas de domiciliación
-CreditTransferLines=Credit transfer lines
-RequestStandingOrderToTreat=Requests for direct debit payment order to process
-RequestStandingOrderTreated=Requests for direct debit payment order processed
-RequestPaymentsByBankTransferToTreat=Requests for credit transfer to process
-RequestPaymentsByBankTransferTreated=Requests for credit transfer processed
+CreditTransferLines=Líneas de transferencia bancaria
+RequestStandingOrderToTreat=Órdenes de domiciliaciones a procesar
+RequestStandingOrderTreated=Órdenes de domiciliaciones procesadas
+RequestPaymentsByBankTransferToTreat=Órdenes de transferencias bancarias a procesar
+RequestPaymentsByBankTransferTreated=Órdenes de transferencias bancarias procesadas
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Todavía no es posible. El estado de la domiciliación debe ser 'abonada' antes de poder realizar devoluciones a sus líneas
 NbOfInvoiceToWithdraw=Nº de facturas pendientes de domiciliación
 NbOfInvoiceToWithdrawWithInfo=Número de facturas en espera de domiciliación para clientes que tienen su número de cuenta definida
 NbOfInvoiceToPayByBankTransfer=Nº de facturas de proveedores pendientes de transferencia bancaria
 SupplierInvoiceWaitingWithdraw=Factura de proveedor pendiente de transferencia bancaria
 InvoiceWaitingWithdraw=Facturas en espera de domiciliación
-InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
+InvoiceWaitingPaymentByBankTransfer=Factura en espera de transferencia bancaria
 AmountToWithdraw=Cantidad a domiciliar
-NoInvoiceToWithdraw=No invoice open for '%s' is waiting. Go on tab '%s' on invoice card to make a request.
+NoInvoiceToWithdraw=No hay niguna factura abierta esperando para '%s' . Vaya a la pestaña '%s'  de la factura para realizar una solicitud.
 NoSupplierInvoiceToWithdraw=No hay ninguna factura de proveedor con 'Solicitudes de crédito directas' pendientes. Vaya a la pestaña '%s' en la pestaña de factura para hacer una solicitud.
 ResponsibleUser=Usuario responsable de las domiciliaciones
 WithdrawalsSetup=Configuración de las domiciliaciones
-CreditTransferSetup=Credit transfer setup
+CreditTransferSetup=Configuración de transferencias bancarias
 WithdrawStatistics=Estadísticas de domiciliaciones
-CreditTransferStatistics=Credit transfer statistics
+CreditTransferStatistics=Estadísticas de transferencias bancarias
 Rejects=Devoluciones
 LastWithdrawalReceipt=Las %s últimas domiciliaciones
 MakeWithdrawRequest=Realizar una petición de domiciliación
-MakeBankTransferOrder=Make a credit transfer request
+MakeBankTransferOrder=Realizar una solicitud de transferencia bancaria
 WithdrawRequestsDone=%s domiciliaciones registradas
+BankTransferRequestsDone=%s solicitudes de transferencia de crédito registradas
 ThirdPartyBankCode=Código banco del tercero
 NoInvoiceCouldBeWithdrawed=No se ha podido realizar la petición de domiciliación de ninguna factura. Compruebe que los terceros de las facturas relacionadas tienen una cuenta  IBAN válida y dicho IBAN tiene un RUM con modo <strong>%s</strong>.
 ClassCredited=Clasificar como "Abonada"
@@ -53,7 +54,7 @@ Lines=Líneas
 StandingOrderReject=Emitir una devolución
 WithdrawsRefused=Domiciliaciones devueltas
 WithdrawalRefused=Devolución de domiciliación
-CreditTransfersRefused=Credit transfers refused
+CreditTransfersRefused=Transferencias bancarias rechazadas
 WithdrawalRefusedConfirm=¿Está seguro de querer crear una devolución de domiciliación para la empresa
 RefusedData=Fecha de devolución
 RefusedReason=Motivo de devolución
@@ -63,7 +64,7 @@ InvoiceRefused=Factura rechazada (Cargar los gastos al cliente)
 StatusDebitCredit=Estado de débito/crédito
 StatusWaiting=En espera
 StatusTrans=Enviada
-StatusDebited=Debited
+StatusDebited=Abonada
 StatusCredited=Abonada
 StatusPaid=Tratada
 StatusRefused=Devuelta
@@ -79,13 +80,13 @@ StatusMotif8=Otro motivo
 CreateForSepaFRST=Domiciliar (SEPA FRST)
 CreateForSepaRCUR=Domiciliar (SEPA RCUR)
 CreateAll=Domiciliar todas
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
-CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
+CreateFileForPaymentByBankTransfer=Crear archivo para transferencia bancaria
+CreateSepaFileForPaymentByBankTransfer=Crear archivo de transferencia bancaria (SEPA)
 CreateGuichet=Sólo oficina
 CreateBanque=Sólo banco
 OrderWaiting=En espera de proceso
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
+NotifyTransmision=Registro de envio del archivo de la orden
+NotifyCredit=Registro de abono de la orden
 NumeroNationalEmetter=Número Nacional del Emisor
 WithBankUsingRIB=Para las cuentas bancarias que utilizan CCC
 WithBankUsingBANBIC=Para las cuentas bancarias que utilizan el código BAN/BIC/SWIFT
@@ -95,12 +96,12 @@ CreditDate=Abonada el
 WithdrawalFileNotCapable=No es posible generar el fichero bancario de domiciliación para el país %s (El país no está soportado)
 ShowWithdraw=Mostrar domiciliación
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene pendiente algún pago por domiciliación no procesado, no será marcada como pagada para permitir la gestión de la domiciliación.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->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
+DoStandingOrdersBeforePayments=Esta pestaña le permite realizar una petición de domiciliación. Una vez realizadas las peticiones, vaya al menú Bancos->Pagos para gestionar la domiciliación. Al cerrar una domiciliación, los pagos de las facturas se registrarán automáticamente, y las facturas completamente pagadas serán cerradas.
+DoCreditTransferBeforePayments=Esta pestaña le permite realizar una petición de transferencia bancaria. Una vez realizadas las peticiones, vaya al menú Bancos->Pagos para gestionar la petición. Al cerrar una petición, los pagos de las facturas se registrarán automáticamente, y las facturas completamente pagadas serán cerradas.
+WithdrawalFile=Archivo de domiciliación
+CreditTransferFile=Archivo de transferencia bancaria
 SetToStatusSent=Clasificar como "Archivo enviado"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
+ThisWillAlsoAddPaymentOnInvoice=Se crearán los pagos de las facturas y las clasificarán como pagadas si el resto a pagar es 0
 StatisticsByLineStatus=Estadísticas por estados de líneas
 RUM=RUM
 DateRUM=Fecha de firma del mandato
@@ -108,7 +109,7 @@ RUMLong=Referencia Única de Mandato
 RUMWillBeGenerated=Si está vacío,se generará un número RUM (Referencia Unica de Mandato) una vez que se guarde la información de la cuenta bancaria
 WithdrawMode=Modo domiciliación (FRST o RECUR)
 WithdrawRequestAmount=Importe de la domiciliación
-BankTransferAmount=Amount of Credit Transfer request:
+BankTransferAmount=Importe de transferencia bancaria:
 WithdrawRequestErrorNilAmount=No es posible crear una domiciliación sin importe
 SepaMandate=Mandato SEPA
 SepaMandateShort=Mandato SEPA
@@ -124,18 +125,19 @@ SEPAFrstOrRecur=Tipo de pago
 ModeRECUR=Pago recurrente
 ModeFRST=Pago único
 PleaseCheckOne=Escoja solamente uno
-CreditTransferOrderCreated=Credit transfer order %s created
+CreditTransferOrderCreated=Orden de transferencia bancaria %s creada
 DirectDebitOrderCreated=Domiciliación %s creada
 AmountRequested=Importe solicitado
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Fecha de ejecución
 CreateForSepa=Crear archivo SEPA
-ICS=Identificador de acreedor CI
+ICS=Identificador de acreedor CI para domiciliación bancaria
+ICSTransfer=Identificador de acreedor CI para transferencia bancaria
 END_TO_END=Etiqueta XML SEPA "EndToEndId" - ID única asignada por transacción
 USTRD=Etiqueta SEPA XML "Unstructured"
 ADDDAYS=Añadir días a la fecha de ejecución
-NoDefaultIBANFound=No default IBAN found for this third party
+NoDefaultIBANFound=No se encontró ningún IBAN predeterminado para este tercero
 ### Notifications
 InfoCreditSubject=Abono de domiciliación %s por el banco
 InfoCreditMessage=La orden de domiciliación %s ha sido abonada por el banco<br>Fecha de abono: %s
@@ -145,4 +147,6 @@ InfoTransData=Importe: %s<br>Método: %s<br>Fecha: %s
 InfoRejectSubject=Domiciliación devuelta
 InfoRejectMessage=Buenos días:<br><br>la domiciliación de la factura %s por cuenta de la empresa %s, con un importe de %s ha sido devuelta por el banco.<br><br>--<br>%s
 ModeWarning=No se ha establecido la opción de modo real, nos detendremos después de esta simulación
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+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
diff --git a/htdocs/langs/es_ES/workflow.lang b/htdocs/langs/es_ES/workflow.lang
index b5f9ba0ffd8..3a3f6b2fa6d 100644
--- a/htdocs/langs/es_ES/workflow.lang
+++ b/htdocs/langs/es_ES/workflow.lang
@@ -16,8 +16,10 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasificar automáticamente el pedi
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasificar automáticamente el presupuestos de proveedor como facturado cuando la factura se valide (y si el importe de la factura sea la misma que el total del presupuesto)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasificar automáticamente el pedido a proveedor como facturado cuando la factura se valide (y si el importe de la factura sea la misma que el total del pedido enlazado)
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+descWORKFLOW_BILL_ON_RECEPTION=Clasificar las recepciones como "facturadas" cuando se valida un pedido de proveedor vinculado
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Cerrar todas las intervenciones vinculadas al ticket cuando se cierra un ticket
 AutomaticCreation=Creación automática
 AutomaticClassification=Clasificación automática
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Clasificar el envío vinculado como cerrado cuando se valida la factura del cliente
diff --git a/htdocs/langs/es_ES/zapier.lang b/htdocs/langs/es_ES/zapier.lang
index 0a2286c8401..cc63194a91e 100644
--- a/htdocs/langs/es_ES/zapier.lang
+++ b/htdocs/langs/es_ES/zapier.lang
@@ -26,4 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier para el módulo Dolibarr
 # Admin page
 #
 ZapierForDolibarrSetup = Configuración de Zapier para Dolibarr
-ZapierDescription=Interface with Zapier
+ZapierDescription=Interfaz con Zapier
diff --git a/htdocs/langs/es_GT/accountancy.lang b/htdocs/langs/es_GT/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/es_GT/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_GT/admin.lang b/htdocs/langs/es_GT/admin.lang
index c1d306ec390..b68a0680537 100644
--- a/htdocs/langs/es_GT/admin.lang
+++ b/htdocs/langs/es_GT/admin.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
+Module59000Desc=Module to follow margins
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_GT/compta.lang b/htdocs/langs/es_GT/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/es_GT/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_GT/mrp.lang b/htdocs/langs/es_GT/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/es_GT/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_GT/products.lang b/htdocs/langs/es_GT/products.lang
index 6e900475275..2a38b9b0181 100644
--- a/htdocs/langs/es_GT/products.lang
+++ b/htdocs/langs/es_GT/products.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
+AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/es_GT/withdrawals.lang b/htdocs/langs/es_GT/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/es_GT/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_HN/accountancy.lang b/htdocs/langs/es_HN/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/es_HN/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_HN/admin.lang b/htdocs/langs/es_HN/admin.lang
index c1d306ec390..b68a0680537 100644
--- a/htdocs/langs/es_HN/admin.lang
+++ b/htdocs/langs/es_HN/admin.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
+Module59000Desc=Module to follow margins
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_HN/compta.lang b/htdocs/langs/es_HN/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/es_HN/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_HN/mrp.lang b/htdocs/langs/es_HN/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/es_HN/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_HN/products.lang b/htdocs/langs/es_HN/products.lang
index 6e900475275..2a38b9b0181 100644
--- a/htdocs/langs/es_HN/products.lang
+++ b/htdocs/langs/es_HN/products.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
+AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/es_HN/withdrawals.lang b/htdocs/langs/es_HN/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/es_HN/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang
index 073d5f060b7..d6c90c3b1ce 100644
--- a/htdocs/langs/es_MX/accountancy.lang
+++ b/htdocs/langs/es_MX/accountancy.lang
@@ -79,7 +79,7 @@ VentilatedinAccount=Agregado exitosamente a la cuenta contable
 NotVentilatedinAccount=No añadido a la cuenta contable
 XLineSuccessfullyBinded=%s productos / servicios vinculados con éxito a una cuenta contable
 XLineFailedToBeBinded=%s productos / servicios no estaban vinculados a ninguna cuenta contable
-ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a unir mostrados por página (máximo recomendado: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comience la ordenación de la página "Enlazar para hacer" por los elementos más recientes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comience la ordenación de la página "Enlace realizado" por los elementos más recientes
 BANK_DISABLE_DIRECT_INPUT=Deshabilitar el registro directo de la transacción en la cuenta bancaria
@@ -95,13 +95,14 @@ TransitionalAccount=Cuenta de transferencia bancaria transitoria
 ACCOUNTING_ACCOUNT_SUSPENSE=Cuenta contable de espera
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Cuenta contable para registrar suscripciones
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta contable por defecto para los productos comprados (se usa si no se define en la hoja de productos)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Cuenta contable por defecto para los productos comprados en EEC (se usa si no se define en la hoja de productos)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Cuenta contable por defecto para los productos comprados e importados fuera de la EEC (usado si no está definido en la hoja de productos)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cuenta contable por defecto para los productos vendidos (si no ha sido definida en la hoja  \nproducto)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Cuenta contable por defecto para los productos vendidos en la EEC (utilizada si no se define en la hoja de producto)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Cuenta contable por defecto para los productos vendidos y exportados fuera de la EEC (usado si no está definido en la hoja de producto)
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Cuenta contable por defecto para los servicios comprados (si no ha sido definida en la hoja \nservicio)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cuenta contable por defecto para los servicios vendidos (si no ha sido definida en la hoja servicio)
 LabelAccount=Descripción de la cuenta
-Sens=Significado
 DelYear=Año a borrar
 DelJournal=Diario a borrar
 DescFinanceJournal=Diario financiero incluyendo todos los tipos de pagos por cuenta bancaria
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index 522f487bfb6..2f40f90a92a 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - admin
 VersionProgram=Versión del programa
 VersionLastInstall=Instalar la versión inicial
-VersionLastUpgrade=Actualizar a la Versión mâs reciente
+VersionLastUpgrade=Actualizar a la versión más reciente
 FileCheck=Comprobación de integridad del conjunto de archivos
 FileCheckDesc=Esta herramienta te permite comprobar la integridad de los archivos y la configuración de tu aplicación, comparando cada archivo con el archivo oficial. El valor de algunas constantes de la configuración también podria ser comprobado. Tu puedes usar esta herramienta para determinar si cualquiera de los archivos a sido modificado (ejem. por un hacker).
 FileIntegrityIsStrictlyConformedWithReference=La integridad de los archivos está estrictamente conformada con la referencia.
@@ -20,11 +20,11 @@ SessionSavePath=Ubicación para guardar la sesión
 PurgeSessions=Depuración de sesiones
 ConfirmPurgeSessions=¿Realmente desea depurar todas las sesiónes? Esto desconectara a todos los usuarios (excepto usted).
 NoSessionListWithThisHandler=El gestor para guardar la sesión configurado en tu PHP no permite enumerar todas las sesiones que se estan ejecutando.
-ConfirmLockNewSessions=¿Estas seguro de querer restringir cualquier nueva conexión Dolibarr? Unicamente el usuario <b>%s</b> podra conectarse posteriormente.
+ConfirmLockNewSessions=¿Estás seguro de querer restringir cualquier nueva conexión a Dolibarr? Únicamente el usuario <b>%s</b> podrá conectarse posteriormente.
 UnlockNewSessions=Remover bloqueo de conexión
 YourSession=Tu sesión
 WebUserGroup=Usuario/Grupo del servidor web
-NoSessionFound=La configuración de tu PHP parece no permitir listar las sesiones activas. El directorio usado para guardar las sesiones (<b>%s</b>) podria estar protegido (Por ejemplo, por permisos del SO o por la directiva PHP open_basedir).
+NoSessionFound=Tu configuración PHP no parece permitir listar sesiones activas. El directorio usado para guardar sesiones (<b>%s</b>) podría estar protegido (Por ejemplo, por permisos del SO o por la directiva PHP open_basedir).
 DBStoringCharset=Charset de la base de datos para almacenar información
 DBSortingCharset=Charset de la base de datos para clasificar información
 ClientCharset=Conjunto de caracteres del cliente
@@ -56,7 +56,6 @@ AllowToSelectProjectFromOtherCompany=En documento de un tercero, puede seleccion
 JavascriptDisabled=JavaScript desactivado
 UsePreviewTabs=Utilizar pestañas de vista previa
 ShowPreview=Mostrar previsualización
-CurrentTimeZone=Zona horaria PHP (servidor)
 TZHasNoEffect=Las fechas son guardadas y retornadas por el servidor de base de datos como si fueran guardadas como cadenas sometidas. La zona horaria tiene efecto solo cuando usamos la función UNIX_TIMESTAMP (que no debe ser usada por Dolibarr, ya que TZ no debe tener efecto, incluso si cambió despues de que datos fueron ingresados).
 Space=Espacio
 NextValue=Valor siguiente
@@ -107,7 +106,6 @@ SystemToolsArea=Área de herramientas del sistema
 SystemToolsAreaDesc=Esta área provee funciones administrativas. Usar el menú  para seleccionar la característica requerida.
 PurgeAreaDesc=Esta página te permite eliminar todos los archivos generados o guardados por Dolibarr (archivos temporales o todos los archivos en <b>%s</b> el directorio). Usar esta característica no es normalmente necesario. Esta es proporcionada como una solución alternativa para usuarios cuyo Dolibarr es hospedado por un proveedor que no ofrece permisos de borrado de archivos generados por el servidor web.
 PurgeDeleteLogFile=Eliminar archivos log, incluyendo <b>%s</b> definido por módulo Syslog (sin riesgo de perdida de datos)
-PurgeDeleteTemporaryFiles=Eliminar todos los archivos temporales (sin riesgo de perdida de datos). Nota: La eliminación es hecha solo si el directorio temporal fue creado 24 horas antes.
 PurgeDeleteAllFilesInDocumentsDir=Eliminar todos los archivos en el directorio: <b>%s</b>.<br>Esto borrara todos los documentos generados relacionados a elementos (terceras partes, facturas etc...), archivos subidos a el  módulo ECM, volcados de respaldo de base de datos y archivos temporales.
 PurgeRunNow=Purgar ahora
 PurgeNothingToDelete=Ningún directorio o archivos que desee eliminar.
@@ -226,10 +224,12 @@ Module20Name=Propuestas
 Module25Name=Ordenes de venta
 Module30Name=Facturas
 Module40Name=Vendedores
+Module59000Desc=Module to follow margins
 DictionaryAccountancyJournal=Diarios de contabilidad
 DictionarySocialNetworks=Redes Sociales
 Upgrade=Actualizar
 LDAPFieldFirstName=Nombre(s)
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto vinculado en la vista de agenda
 ConfFileMustContainCustom=Instalar o construir un módulo externo desde la aplicación necesita guardar los archivos del módulo en el directorio <strong> %s </strong>. Para que este directorio sea procesado por Dolibarr, debe configurar su <strong> conf/conf.php </strong> para agregar las 2 líneas de directiva: <strong> $dolibarr_main_url_root_alt='/custom'; </strong> <br> <strong> $dolibarr_main_document_root_alt='%s/custom'; </strong>
 MailToSendProposal=Propuestas de clientes
diff --git a/htdocs/langs/es_MX/bills.lang b/htdocs/langs/es_MX/bills.lang
index 2eca7855931..4ea66beab2f 100644
--- a/htdocs/langs/es_MX/bills.lang
+++ b/htdocs/langs/es_MX/bills.lang
@@ -42,6 +42,8 @@ CustomerBillsUnpaid=Facturas de clientes no pagadas
 Billed=Facturada
 CreditNote=Nota de crédito
 ReasonDiscount=Razón
+PaymentConditionShortPT_ORDER=Pedido
 PaymentTypeCB=Tarjeta de crédito
 PaymentTypeShortCB=Tarjeta de crédito
+PayedByThisPayment=Liquidado en este pago
 situationInvoiceShortcode_S=D
diff --git a/htdocs/langs/es_MX/companies.lang b/htdocs/langs/es_MX/companies.lang
index 94d7e8f6bd4..811526bc5ac 100644
--- a/htdocs/langs/es_MX/companies.lang
+++ b/htdocs/langs/es_MX/companies.lang
@@ -167,7 +167,6 @@ VATIntraCheckableOnEUSite=Verificar el numero de control de IVA intracomunitario
 VATIntraManualCheck=También puedes verificar manualmente desde el sitio web de la comision europea <a href="%s" target="_blank">%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
-JuridicalStatus=Tipo de entidad legal
 OthersNotLinkedToThirdParty=Otros, no vinculado a un tercero
 ProspectStatus=Estatus del cliente potencial
 TE_MEDIUM=Mediana empresa
diff --git a/htdocs/langs/es_MX/compta.lang b/htdocs/langs/es_MX/compta.lang
index 9c1cd218356..b8c48cab211 100644
--- a/htdocs/langs/es_MX/compta.lang
+++ b/htdocs/langs/es_MX/compta.lang
@@ -1,4 +1,9 @@
 # Dolibarr language file - Source file is en_US - compta
+MenuFinancial=Facturación | Pago
+TaxModuleSetupToModifyRules=Vaya a la configuración del módulo de impuestos <a href="%s"> </a> para modificar las reglas de cálculo
+TaxModuleSetupToModifyRulesLT=Vaya a <a href="%s"> Configuración de la empresa </a> para modificar las reglas de cálculo
+OptionMode=Opción de contabilidad
+OptionModeVirtual=Opción Reclamaciones-Deudas
 Param=Configuración
 PaymentSocialContribution=Pago de impuesto social/fiscal
 ByThirdParties=Por terceros
diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang
index d2d2407adfe..b2b9ca9f0e5 100644
--- a/htdocs/langs/es_MX/main.lang
+++ b/htdocs/langs/es_MX/main.lang
@@ -20,6 +20,7 @@ FormatDateHourSecShort=%I:%M:%S %p %d/%m/%Y
 FormatDateHourTextShort=%I:%M %p, %d %b %Y
 FormatDateHourText=%I:%M %p, %d %B %Y
 AvailableVariables=Variables de sustitución disponibles
+CurrentTimeZone=Zona horaria PHP (servidor)
 NoRecordFound=Ningún registro fue encontrado
 NoError=No hay error
 ErrorFieldFormat=El campo '%s' contiene un valor incorrecto
@@ -40,6 +41,7 @@ SetDate=Ajustar fecha
 SeeHere=Mira aquí
 BackgroundColorByDefault=Color de fondo por defecto
 FileWasNotUploaded=Un archivo fue seleccionado para adjuntar, sin embargo, no ha sido cargado aún. De clic en "Adjuntar archivo" para éllo.
+HomePage=Página Principal
 LevelOfFeature=Nivel de características
 NotDefined=No definido
 ConnectedOnMultiCompany=Conectado a la entidad
diff --git a/htdocs/langs/es_MX/mrp.lang b/htdocs/langs/es_MX/mrp.lang
index 300d0969e7e..afe7a7f1d75 100644
--- a/htdocs/langs/es_MX/mrp.lang
+++ b/htdocs/langs/es_MX/mrp.lang
@@ -1,2 +1,7 @@
 # Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
 BOMsSetup=configuración del módulo BOM
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_MX/products.lang b/htdocs/langs/es_MX/products.lang
index 8bd908672b5..af9eb0e2ac2 100644
--- a/htdocs/langs/es_MX/products.lang
+++ b/htdocs/langs/es_MX/products.lang
@@ -5,12 +5,12 @@ ErrorProductBadRefOrLabel=Valor incorrecto para referencia o etiqueta.
 ProductsAndServicesArea=Área de productos y servicios
 ProductsArea=Área de producto
 SetDefaultBarcodeType=Establecer el tipo de código de barras
+AssociatedProductsAbility=Enable Kits (set of several products)
 KeywordFilter=Filtro de palabras clave
 NoMatchFound=No se encontraron coincidencias
 DeleteProduct=Eliminar un producto / servicio
 ExportDataset_produit_1=Productos
 ImportDataset_produit_1=productos
-CustomCode=Customs / Commodity / HS code
 BarCodePrintsheet=Imprimir código de barras
 GlobalVariableUpdaterType0=Datos JSON
 GlobalVariableUpdaterHelp0=Analiza los datos JSON de la URL especificada, VALUE especifica la ubicación del valor relevante,
diff --git a/htdocs/langs/es_MX/receptions.lang b/htdocs/langs/es_MX/receptions.lang
index 0356d61254c..55b566fd826 100644
--- a/htdocs/langs/es_MX/receptions.lang
+++ b/htdocs/langs/es_MX/receptions.lang
@@ -1,2 +1,5 @@
 # Dolibarr language file - Source file is en_US - receptions
 StatusReceptionCanceled=Cancelado
+StatusReceptionProcessed=Procesada
+StatusReceptionProcessedShort=Procesada
+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 96689e2c322..96ffc6ab5ff 100644
--- a/htdocs/langs/es_MX/sendings.lang
+++ b/htdocs/langs/es_MX/sendings.lang
@@ -1,2 +1,5 @@
 # Dolibarr language file - Source file is en_US - sendings
 StatusSendingCanceled=Cancelado
+StatusSendingCanceledShort=Cancelado
+StatusSendingProcessed=Procesada
+StatusSendingProcessedShort=Procesada
diff --git a/htdocs/langs/es_MX/withdrawals.lang b/htdocs/langs/es_MX/withdrawals.lang
index 52a15f0786e..2f810c0c725 100644
--- a/htdocs/langs/es_MX/withdrawals.lang
+++ b/htdocs/langs/es_MX/withdrawals.lang
@@ -1,5 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
+StandingOrderToProcess=Procesar
 WithdrawalReceipt=Orden de domiciliación bancaria
 Rejects=Rechazos
 StatusPaid=Pagado
 StatusRefused=Rechazado
+StatusMotif4=Órdenes de venta
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_PA/accountancy.lang b/htdocs/langs/es_PA/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/es_PA/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_PA/admin.lang b/htdocs/langs/es_PA/admin.lang
index f0c05a924c9..eb11d0d5c6f 100644
--- a/htdocs/langs/es_PA/admin.lang
+++ b/htdocs/langs/es_PA/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
 VersionUnknown=Desconocido
+Module59000Desc=Module to follow margins
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_PA/compta.lang b/htdocs/langs/es_PA/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/es_PA/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_PA/mrp.lang b/htdocs/langs/es_PA/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/es_PA/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_PA/products.lang b/htdocs/langs/es_PA/products.lang
index 6e900475275..2a38b9b0181 100644
--- a/htdocs/langs/es_PA/products.lang
+++ b/htdocs/langs/es_PA/products.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
+AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/es_PA/withdrawals.lang b/htdocs/langs/es_PA/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/es_PA/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_PE/accountancy.lang b/htdocs/langs/es_PE/accountancy.lang
index 3fa654ee77c..94dd1838fd8 100644
--- a/htdocs/langs/es_PE/accountancy.lang
+++ b/htdocs/langs/es_PE/accountancy.lang
@@ -27,6 +27,7 @@ EndProcessing=Proceso finalizado.
 Lineofinvoice=Línea de factura
 VentilatedinAccount=Vinculado con éxito a la cuenta contable
 NotVentilatedinAccount=No vinculado a la cuenta contable
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comienza la clasificación de la página "Vinculación a hacer" por los elementos más recientes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comienza la clasificación de la página "Encuadernación realizada" por los elementos más recientes
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar la descripción de los productos y servicios en los listados después de los caracteres x (mejor = 50)
@@ -38,7 +39,6 @@ ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario diverso
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Informe de Gastos Diario
 ACCOUNTING_SOCIAL_JOURNAL=Diario Social
 ACCOUNTING_ACCOUNT_SUSPENSE=Cuenta contable de espera
-Sens=Significado
 Codejournal=Periódico
 FinanceJournal=Periodo Financiero
 TotalMarge=Margen total de ventas
diff --git a/htdocs/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
index 6c8dc0a38a9..2e7678563b1 100644
--- a/htdocs/langs/es_PE/admin.lang
+++ b/htdocs/langs/es_PE/admin.lang
@@ -1,13 +1,14 @@
 # Dolibarr language file - Source file is en_US - admin
 VersionProgram=Versión del programa
 VersionLastInstall=Instalar versión inicial
-ExampleOfDirectoriesForModelGen=Ejemplo de sintaxis:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 Module30Name=Facturas
+Module59000Desc=Module to follow margins
 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
 UnitPriceOfProduct=Precio unitario sin IGV de un producto
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 OptionVatMode=IGV adeudado
 MailToSendInvoice=Facturas de Clientes
 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.
diff --git a/htdocs/langs/es_PE/cron.lang b/htdocs/langs/es_PE/cron.lang
index 96e3d29ed2c..bde4921afff 100644
--- a/htdocs/langs/es_PE/cron.lang
+++ b/htdocs/langs/es_PE/cron.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - cron
-CronStatusActiveBtn=Activado
 CronStatusInactiveBtn=Inhabilitar
diff --git a/htdocs/langs/es_PE/products.lang b/htdocs/langs/es_PE/products.lang
index 2e576f6187d..59238285ddf 100644
--- a/htdocs/langs/es_PE/products.lang
+++ b/htdocs/langs/es_PE/products.lang
@@ -3,5 +3,5 @@ ProductRef=Ref. de producto
 ProductLabel=Etiqueta del producto
 ProductServiceCard=Ficha Productos/Servicios
 ProductOrService=Producto o Servicio
+AssociatedProductsAbility=Enable Kits (set of several products)
 ExportDataset_produit_1=Productos
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/es_PE/ticket.lang b/htdocs/langs/es_PE/ticket.lang
index 363410255e5..9b8429210d8 100644
--- a/htdocs/langs/es_PE/ticket.lang
+++ b/htdocs/langs/es_PE/ticket.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ticket
-NotRead=Sin leer
 Read=Leer
 Type=Tipo
 TicketNewEmailBodyInfosTrackUrl=Puedes ver la progresión del ticket haciendo click sobre el seguimiento del ticket.
diff --git a/htdocs/langs/es_PE/withdrawals.lang b/htdocs/langs/es_PE/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/es_PE/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_PY/accountancy.lang b/htdocs/langs/es_PY/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/es_PY/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_PY/admin.lang b/htdocs/langs/es_PY/admin.lang
index c1d306ec390..b68a0680537 100644
--- a/htdocs/langs/es_PY/admin.lang
+++ b/htdocs/langs/es_PY/admin.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
+Module59000Desc=Module to follow margins
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_PY/compta.lang b/htdocs/langs/es_PY/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/es_PY/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_PY/mrp.lang b/htdocs/langs/es_PY/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/es_PY/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_PY/products.lang b/htdocs/langs/es_PY/products.lang
index 6e900475275..2a38b9b0181 100644
--- a/htdocs/langs/es_PY/products.lang
+++ b/htdocs/langs/es_PY/products.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
+AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/es_PY/withdrawals.lang b/htdocs/langs/es_PY/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/es_PY/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_US/accountancy.lang b/htdocs/langs/es_US/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/es_US/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_US/admin.lang b/htdocs/langs/es_US/admin.lang
index c1d306ec390..b68a0680537 100644
--- a/htdocs/langs/es_US/admin.lang
+++ b/htdocs/langs/es_US/admin.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
+Module59000Desc=Module to follow margins
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_US/compta.lang b/htdocs/langs/es_US/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/es_US/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_US/mrp.lang b/htdocs/langs/es_US/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/es_US/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_US/products.lang b/htdocs/langs/es_US/products.lang
index 6e900475275..2a38b9b0181 100644
--- a/htdocs/langs/es_US/products.lang
+++ b/htdocs/langs/es_US/products.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
+AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/es_US/withdrawals.lang b/htdocs/langs/es_US/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/es_US/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_UY/accountancy.lang b/htdocs/langs/es_UY/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/es_UY/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_UY/admin.lang b/htdocs/langs/es_UY/admin.lang
index c1d306ec390..b68a0680537 100644
--- a/htdocs/langs/es_UY/admin.lang
+++ b/htdocs/langs/es_UY/admin.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
+Module59000Desc=Module to follow margins
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_UY/compta.lang b/htdocs/langs/es_UY/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/es_UY/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/es_UY/mrp.lang b/htdocs/langs/es_UY/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/es_UY/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_UY/products.lang b/htdocs/langs/es_UY/products.lang
index 6e900475275..2a38b9b0181 100644
--- a/htdocs/langs/es_UY/products.lang
+++ b/htdocs/langs/es_UY/products.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
+AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/es_UY/withdrawals.lang b/htdocs/langs/es_UY/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/es_UY/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/es_VE/accountancy.lang b/htdocs/langs/es_VE/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/es_VE/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index 74b465f966a..d395e4cecd0 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -4,6 +4,7 @@ VersionLastUpgrade=Última actualización de la versión
 ConfirmPurgeSessions=¿De verdad quieres purgar todas las sesiones? Esto desconectará a todos los usuarios (excepto a usted).
 SetupArea=Parametrizaje
 NotConfigured=Módulo / Aplicación no configurada
+Module59000Desc=Module to follow margins
 Permission254=Modificar la contraseña de otros usuarios
 Permission255=Eliminar o desactivar otros usuarios
 Permission256=Consultar sus permisos
@@ -29,5 +30,6 @@ WatermarkOnDraftSupplierProposal=Marca de agua en solicitudes de precios a prove
 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)
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/es_VE/mrp.lang b/htdocs/langs/es_VE/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/es_VE/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/es_VE/products.lang b/htdocs/langs/es_VE/products.lang
index 7347e866031..53eae0774e3 100644
--- a/htdocs/langs/es_VE/products.lang
+++ b/htdocs/langs/es_VE/products.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - products
 TMenuProducts=Productos y servicios
 ProductStatusNotOnBuyShort=Fuera compra
-CustomCode=Customs / Commodity / HS code
+AssociatedProductsAbility=Enable Kits (set of several products)
 PriceExpressionEditorHelp2=Puede acceder a los atributos adicionales con variables como <b>#extrafield_myextrafieldkey#</b> y variables globales con <b>#global_mycode#</b>
diff --git a/htdocs/langs/es_VE/withdrawals.lang b/htdocs/langs/es_VE/withdrawals.lang
index fb9616a1788..0512b713a32 100644
--- a/htdocs/langs/es_VE/withdrawals.lang
+++ b/htdocs/langs/es_VE/withdrawals.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 StatusPaid=Pagada
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index 682433c526e..170d73a6bac 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Kuupäev
 Docref=Viide
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 268ecfbe48e..abc17b9297f 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Kuva
 SetupArea=Seadistamine
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Failide üleslaadimise teistimiseks kasutatav vorm (vastavalt seadistustele)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Märkus: jah töötab vaid siis, kui moodul <b>%s</b> on sisse lülitatud.
 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.
@@ -85,7 +87,6 @@ ShowPreview=Kuva eelvaade
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Eelvaade pole saadaval
 ThemeCurrentlyActive=Hetkel kasutatav teema
-CurrentTimeZone=PHP ajavöönd (serveri ajavöönd)
 MySQLTimeZone=MySQLi (andmebaasi) ajavöönd
 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=Ruum
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Tühjenda
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Kustuta ajutised failid
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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=Tühjenda nüüd
 PurgeNothingToDelete=Pole ühtki faili ega kausta, mida kustutada.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Eelistatud partnerid
 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>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Praeguse konfiguratsiooniga näited
 ListOfDirectories=OpenDocument mallide kaustad
 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=Nendes kataloogides leiduvate ODT / ODS-malli failide arv
-ExampleOfDirectoriesForModelGen=Süntaksi näited:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Enne dokumendimallide loomist loe wikis olevat dokumentatsiooni:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Nimi/perekonnanimi ametikoht
@@ -406,7 +408,7 @@ UrlGenerationParameters=URLide turvamise parameetrid
 SecurityTokenIsUnique=Kasuta iga URLi jaoks unikaalset turvalise võtme parameetrit
 EnterRefToBuildUrl=Sisesta viide objektile %s
 GetSecuredUrl=Saada arvutatud URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Vana käibemaksumäär
 NewVATRates=Uus käibemaksumäär
 PriceBaseTypeToChange=Muuda hindadel, mille baasväärtus on defineeritud kui
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Marginaalid
-Module59000Desc=Marginaalide haldamise moodu
+Module59000Desc=Module to follow margins
 Module60000Name=Komisjonitasu
 Module60000Desc=Komisjonitasude haldamise moodu
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Otsingu optimeerimine
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ ServiceSetup=Teenuste mooduli seadistamine
 ProductServiceSetup=Toodete ja teenuste mooduli seadistamine
 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
+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 the language of the third party
+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=Vaikimisi vöötkoodi tüüp toodetel
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Uus menüü
 MenuHandler=Menüü töötleja
 MenuModule=Lähtekoodi moodul
-HideUnauthorizedMenu= Peida volitamata menüüd (hall)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=ID menüü
 DetailMenuHandler=Menüü töötleja uue menüü asukoha jaoks
 DetailMenuModule=Mooduli nimi, kui menüükanne tuleb moodulist
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Postiindeks
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang
index 60e4f3457b4..2838587c4c8 100644
--- a/htdocs/langs/et_EE/banks.lang
+++ b/htdocs/langs/et_EE/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/et_EE/blockedlog.lang b/htdocs/langs/et_EE/blockedlog.lang
index ac567943c5c..7b3480de3b1 100644
--- a/htdocs/langs/et_EE/blockedlog.lang
+++ b/htdocs/langs/et_EE/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/et_EE/boxes.lang b/htdocs/langs/et_EE/boxes.lang
index 7c9fca21f40..3212c908291 100644
--- a/htdocs/langs/et_EE/boxes.lang
+++ b/htdocs/langs/et_EE/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Üldine tegevus (arved, pakkumised, tellimused)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Plaanitud käivitused
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=Järjehoidjaid pole määratletud.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Raamatupidamine
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/et_EE/cashdesk.lang b/htdocs/langs/et_EE/cashdesk.lang
index ce7e0354ab2..0f87e95779e 100644
--- a/htdocs/langs/et_EE/cashdesk.lang
+++ b/htdocs/langs/et_EE/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Arveid
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/et_EE/categories.lang b/htdocs/langs/et_EE/categories.lang
index ac9524d0f0d..f288163f0d9 100644
--- a/htdocs/langs/et_EE/categories.lang
+++ b/htdocs/langs/et_EE/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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
diff --git a/htdocs/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang
index 7689d22553b..6bafeb504b3 100644
--- a/htdocs/langs/et_EE/companies.lang
+++ b/htdocs/langs/et_EE/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Kontrollida pole võimalik. Kontrolli, et liikmesriik (%s) võimaldab teenust kasutada.
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Töötajad
 ProspectLevelShort=Potentsiaalne
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index 5be099381a7..35f06da633f 100644
--- a/htdocs/langs/et_EE/compta.lang
+++ b/htdocs/langs/et_EE/compta.lang
@@ -111,7 +111,7 @@ Refund=Tagasimakse
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Näita käibemaksu makset
 TotalToPay=Kokku maksta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Režiim <b>%stekkepõhise raamatupidamise KM%s</b>.
 CalcModeVATEngagement=Režiim <b>%stulude-kulude KM%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Tulude ja kulude saldo, aasta kokkuvõte
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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=- 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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Kolmandate isikute IRPFi aruanne
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/et_EE/cron.lang b/htdocs/langs/et_EE/cron.lang
index edf8cd714cf..f727eb118fc 100644
--- a/htdocs/langs/et_EE/cron.lang
+++ b/htdocs/langs/et_EE/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Create/update Scheduled job
 Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
-CronSetup= Plaanitavata programmide haldamise seadistamine
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Või mõne kindla programmi kontrollimiseks ja käivitamiseks
+CronSetup=Plaanitavata programmide haldamise seadistamine
+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=Croni käivitatavate programmide URLile ligipääsu turvavõti
 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 environement you can use Scheduled task tools 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
@@ -42,10 +43,11 @@ CronModule=Moodul
 CronNoJobs=Pole ühtki registreeritud programm
 CronPriority=Prioriteet
 CronLabel=Nimi
-CronNbRun=Käivituste arv
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Iga
 JobFinished=Tegevus käivitatud ja lõpetatud
+Scheduled=Scheduled
 #Page card
 CronAdd= Lisa programme
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Kommentaar
 CronFieldMandatory=Välja %s täitmine on nõutud
 CronErrEndDateStartDt=Lõppkuupäev ei saa olla alguskuupäevast varasem
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Lülita sisse
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Lülita välja
 CronTaskInactive=See tegevus on välja lülitatud
 CronId=ID
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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=Käivitatav süsteemi käsk.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Kellelt
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Käsurea käsk
 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+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/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index 11b82753a43..4d3ae37fabc 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Ühtegi viga ei ole, teostame
 # Errors
 ErrorButCommitIsDone=Esines vigu, kuid kinnitame sellest hoolimata
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=URL %s on vale
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Kasutajanimi %s on juba olemas.
 ErrorGroupAlreadyExists=Grupp %s on juba olemas.
 ErrorRecordNotFound=Kirjet ei leitud.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Mõned nõutud väljad on täitmata.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Kausta loomine ebaõnnestus. Kontrolli, et veebiserveri kasutajal on piisavalt õigusi Dolibarri dokumentide kausta kirjutamiseks. Kui PHP <b>safe_mode</b> parameeter on sisse lülitatud, siis kontrolli, et veebiserveri kasutaja (või grupp) on Dolibarri PHP failide omanik.
 ErrorNoMailDefinedForThisUser=Antud kasutaja e-posti aadressi pole määratletud
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=See funktsioon vajab töötamiseks JavaScripti sisse lülitamist. Muuda seadeid Seadistamine->Kuva menüüs.
 ErrorTopMenuMustHaveAParentWithId0='Ülemine' tüüpi menüül ei saa olla emamenüüd. Sisesta emamenüü lahtrisse 0 või vali menüütüübiks 'Vasakul'.
 ErrorLeftMenuMustHaveAParentId='Vasak' tüüpi menüül peab olema ema ID.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP sobitamine ei ole täielik.
 ErrorLDAPMakeManualTest=Kausta %s on loodud .ldif fail. Vigade kohta lisainfo saamiseks proovi selle käsitsi käsurealt laadimist.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Loomiseks kasutatav viide on juba olemas.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/et_EE/exports.lang b/htdocs/langs/et_EE/exports.lang
index 516ee5c69c2..ed1048c18f3 100644
--- a/htdocs/langs/et_EE/exports.lang
+++ b/htdocs/langs/et_EE/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Välja nimi
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Teek
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Samm
 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.
@@ -131,3 +133,4 @@ 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/et_EE/mails.lang b/htdocs/langs/et_EE/mails.lang
index bd62e283b06..45d64d5f642 100644
--- a/htdocs/langs/et_EE/mails.lang
+++ b/htdocs/langs/et_EE/mails.lang
@@ -92,6 +92,7 @@ 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=Rida %s failis
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Teated
-NoNotificationsWillBeSent=Selle tegevuse ja ettevõttega ei ole plaanis saata ühtki e-kirja teadet
-ANotificationsWillBeSent=E-posti teel saadetakse 1 teade
-SomeNotificationsWillBeSent=E-posti teel saadetakse %s teadet
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=Loetle kõik saadetud e-posti teated
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informatsioon
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index 813ad00b669..c8174781715 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=Tõlge puudub
 Translation=Tõlge
+CurrentTimeZone=PHP ajavöönd (serveri ajavöönd)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Kirjet ei leitud
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Pole piisavalt andmeid
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Kirje salvestatud
 RecordDeleted=Kirje kustutatud
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Väärtus
 PersonalValue=Isiklik väärtus
 NewObject=Uus %s
 NewValue=Uus väärtus
+OldValue=Old value %s
 CurrentValue=Praegune väärtus
 Code=Kood
 Type=Liik
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Valik
+Filters=Filters
 List=Nimekiri
 FullList=Täielik nimekiri
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ SupplierPreview=Vendor preview
 ShowCustomerPreview=Näita kliendi eelvaadet
 ShowSupplierPreview=Show vendor preview
 RefCustomer=Kliendi viide
+InternalRef=Internal ref.
 Currency=Valuuta
 InfoAdmin=Administraatoritele vajalik informatsioon
 Undo=Tühista
@@ -671,7 +678,7 @@ SendMail=Saada e-kiri
 Email=E-post
 NoEMail=E-posti aadress puudub
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=Mobiiltelefon puudub
 Owner=Omanik
 FollowingConstantsWillBeSubstituted=Järgnevad konstandid asendatakse vastavate väärtustega.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/et_EE/modulebuilder.lang b/htdocs/langs/et_EE/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/et_EE/modulebuilder.lang
+++ b/htdocs/langs/et_EE/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/et_EE/mrp.lang b/htdocs/langs/et_EE/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/et_EE/mrp.lang
+++ b/htdocs/langs/et_EE/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang
index a1aa2f9a67b..3183083b1aa 100644
--- a/htdocs/langs/et_EE/other.lang
+++ b/htdocs/langs/et_EE/other.lang
@@ -5,8 +5,6 @@ Tools=Tööriistad
 TMenuTools=Tööriistad
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Sünnipäev
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=sünnipäeva hoiatus aktiivne
 BirthdayAlertOff=sünnipäeva hoiatus mitteaktiivne
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Manusena lisatud faile/dokumente
 TotalSizeOfAttachedFiles=Manusena lisatud failide/dokumentide kogusuurus
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Parem
 CalculatedWeight=Arvutuslik kaal
 CalculatedVolume=Arvutuslik ruumala
 Weight=Kaal
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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=Andmekogu import
 DolibarrNotification=Automaatne teavitamine
 ResizeDesc=Sisesta uus laius <b>VÕI</b> uus kõrgus. Suuruse muutmise käigus säilitatakse kõrguse ja laiuse suhe...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Ekspordi ala
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index 9cd6afef593..8554d961291 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Hindasid
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Päritolumaa
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Kasuta fikseeritud hinda
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Koguse ulatus
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index d9f635dd8a5..c739c5c289f 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -76,15 +76,16 @@ MyActivities=Minu ülesanded/aktiivsused
 MyProjects=Minu projektid
 MyProjectsArea=My projects Area
 DurationEffective=Efektiivne kestus
-ProgressDeclared=Deklareeritud progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Arvutatud progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Aeg
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/et_EE/recruitment.lang b/htdocs/langs/et_EE/recruitment.lang
index 8f3197e0311..1f6dab3f416 100644
--- a/htdocs/langs/et_EE/recruitment.lang
+++ b/htdocs/langs/et_EE/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/et_EE/sendings.lang b/htdocs/langs/et_EE/sendings.lang
index ec6b68fa3ea..92c76b98f03 100644
--- a/htdocs/langs/et_EE/sendings.lang
+++ b/htdocs/langs/et_EE/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Tellimusega seotud teised saadetised
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Kinnitamast vajavad saadetised
 StatusSendingCanceled=Tühistatud
+StatusSendingCanceledShort=Tühistatud
 StatusSendingDraft=Mustand
 StatusSendingValidated=Kinnitatud (väljastamisele minevad või juba väljastatud kaubad)
 StatusSendingProcessed=Töödeldud
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Täiuslikum saatelehtede dokumendi mudel (logo jne)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstant EXPEDITION_ADDON_NUMBER on määratlemata
 SumOfProductVolumes=Toodete ruumala summa
 SumOfProductWeights=Toodete kaalude summa
diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang
index 51bb0035e42..760b0f0dbbc 100644
--- a/htdocs/langs/et_EE/stocks.lang
+++ b/htdocs/langs/et_EE/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Ladude väärtus
 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/et_EE/ticket.lang b/htdocs/langs/et_EE/ticket.lang
index 6ebd80a96c2..fd7ed8ea019 100644
--- a/htdocs/langs/et_EE/ticket.lang
+++ b/htdocs/langs/et_EE/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Muu
 TicketSeverityShortLOW=Madal
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Kõrge
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Loe
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/et_EE/website.lang b/htdocs/langs/et_EE/website.lang
index b1d332fe020..780b74ae7da 100644
--- a/htdocs/langs/et_EE/website.lang
+++ b/htdocs/langs/et_EE/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Lehekülg
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/et_EE/withdrawals.lang b/htdocs/langs/et_EE/withdrawals.lang
index f1edf12b9b0..fc31c53b37e 100644
--- a/htdocs/langs/et_EE/withdrawals.lang
+++ b/htdocs/langs/et_EE/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Määra krediteerituks
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Tootmisrežiim ei olnud seadistatud, pärast seda peatatakse simulatsioon
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/et_EE/workflow.lang b/htdocs/langs/et_EE/workflow.lang
index 03c55985b03..46396afb83e 100644
--- a/htdocs/langs/et_EE/workflow.lang
+++ b/htdocs/langs/et_EE/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index 3211a0b62df..9e084932477 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 4e1e3f4f917..5f99e070cd3 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Itxura
 SetupArea=Konfigurazioa
 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.
@@ -85,7 +87,6 @@ ShowPreview=Aurreikuspena aurkeztu
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Aurreikuspena ez dago eskuragarri
 ThemeCurrentlyActive=Aktibatuta dagoen gaia
-CurrentTimeZone=TimeZone PHP (zerbitzaria)
 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
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Garbitu
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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=Orain garbitu
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ 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.
@@ -375,7 +377,7 @@ 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:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+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=Izena/Abizena-ren kokapena
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=%s objektuen erreferentzia sartu
 GetSecuredUrl=Kalkulatutako URL-a hartu
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Marjinak
-Module59000Desc=Marjinak kudeatzeko modulua
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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
+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 the language of the third party
+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
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+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
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/eu_ES/banks.lang b/htdocs/langs/eu_ES/banks.lang
index cd868f74239..bac80483712 100644
--- a/htdocs/langs/eu_ES/banks.lang
+++ b/htdocs/langs/eu_ES/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/eu_ES/blockedlog.lang b/htdocs/langs/eu_ES/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/eu_ES/blockedlog.lang
+++ b/htdocs/langs/eu_ES/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/eu_ES/boxes.lang b/htdocs/langs/eu_ES/boxes.lang
index ebe7ba3d683..42d5a977df9 100644
--- a/htdocs/langs/eu_ES/boxes.lang
+++ b/htdocs/langs/eu_ES/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+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.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/eu_ES/cashdesk.lang b/htdocs/langs/eu_ES/cashdesk.lang
index c671c19b97e..e108028d9cb 100644
--- a/htdocs/langs/eu_ES/cashdesk.lang
+++ b/htdocs/langs/eu_ES/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+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
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/eu_ES/categories.lang b/htdocs/langs/eu_ES/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/eu_ES/categories.lang
+++ b/htdocs/langs/eu_ES/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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
diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang
index 50a8223fe7c..4318ea805b7 100644
--- a/htdocs/langs/eu_ES/companies.lang
+++ b/htdocs/langs/eu_ES/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang
index 9aca33839a6..af1267b60ab 100644
--- a/htdocs/langs/eu_ES/compta.lang
+++ b/htdocs/langs/eu_ES/compta.lang
@@ -111,7 +111,7 @@ 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 ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/eu_ES/cron.lang b/htdocs/langs/eu_ES/cron.lang
index d2da7ded67e..2ebdda1e685 100644
--- a/htdocs/langs/eu_ES/cron.lang
+++ b/htdocs/langs/eu_ES/cron.lang
@@ -6,14 +6,15 @@ 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
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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 environement you can use Scheduled task tools 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
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+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
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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
@@ -76,8 +78,14 @@ 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+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/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 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.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/eu_ES/exports.lang b/htdocs/langs/eu_ES/exports.lang
index 45b56224b30..bcb14df4934 100644
--- a/htdocs/langs/eu_ES/exports.lang
+++ b/htdocs/langs/eu_ES/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Liburutegia
+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.
@@ -131,3 +133,4 @@ 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/eu_ES/mails.lang b/htdocs/langs/eu_ES/mails.lang
index 1f26534ddc7..b124f83e85d 100644
--- a/htdocs/langs/eu_ES/mails.lang
+++ b/htdocs/langs/eu_ES/mails.lang
@@ -92,6 +92,7 @@ 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
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Jakinarazpenak
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informazioa
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index ce139e4fb15..b048eaf318c 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (zerbitzaria)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Balioa
 PersonalValue=Personal value
 NewObject=New %s
 NewValue=Balio berria
+OldValue=Old value %s
 CurrentValue=Current value
 Code=Kodea
 Type=Mota
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ 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
@@ -671,7 +678,7 @@ SendMail=e-posta bidali
 Email=E-posta
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/eu_ES/modulebuilder.lang b/htdocs/langs/eu_ES/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/eu_ES/modulebuilder.lang
+++ b/htdocs/langs/eu_ES/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/eu_ES/mrp.lang b/htdocs/langs/eu_ES/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/eu_ES/mrp.lang
+++ b/htdocs/langs/eu_ES/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang
index f855300b038..8b1593d5f6c 100644
--- a/htdocs/langs/eu_ES/other.lang
+++ b/htdocs/langs/eu_ES/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index 63ff9381818..0827f43bd6d 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -108,7 +108,8 @@ 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=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index 4ec830cce10..71a1ed5245a 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -76,15 +76,16 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/eu_ES/recruitment.lang b/htdocs/langs/eu_ES/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/eu_ES/recruitment.lang
+++ b/htdocs/langs/eu_ES/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/eu_ES/sendings.lang b/htdocs/langs/eu_ES/sendings.lang
index 52467f47a81..079b2533513 100644
--- a/htdocs/langs/eu_ES/sendings.lang
+++ b/htdocs/langs/eu_ES/sendings.lang
@@ -30,6 +30,7 @@ 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
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang
index d709920da07..fa21c48cb73 100644
--- a/htdocs/langs/eu_ES/stocks.lang
+++ b/htdocs/langs/eu_ES/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/eu_ES/ticket.lang b/htdocs/langs/eu_ES/ticket.lang
index d03e28f558d..086d398b0a1 100644
--- a/htdocs/langs/eu_ES/ticket.lang
+++ b/htdocs/langs/eu_ES/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Besteak
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/eu_ES/website.lang b/htdocs/langs/eu_ES/website.lang
index f00254a6c66..921f6edf20f 100644
--- a/htdocs/langs/eu_ES/website.lang
+++ b/htdocs/langs/eu_ES/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/eu_ES/withdrawals.lang b/htdocs/langs/eu_ES/withdrawals.lang
index 114a8d9dd6c..059b3451c11 100644
--- a/htdocs/langs/eu_ES/withdrawals.lang
+++ b/htdocs/langs/eu_ES/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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/eu_ES/workflow.lang b/htdocs/langs/eu_ES/workflow.lang
index 299be277e1d..494a0424a75 100644
--- a/htdocs/langs/eu_ES/workflow.lang
+++ b/htdocs/langs/eu_ES/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index be45e5ff3ed..794149d01cf 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=این خدمت
 ThisProduct=این محصول
 DefaultForService=پیش‌فرض برای خدمات
 DefaultForProduct=پیش‌فرض برای محصول
+ProductForThisThirdparty=Product for this thirdparty
+ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=امکان پیش‌نهاد نیست
 AccountancySetupDoneFromAccountancyMenu=اکثر برپاسازی حساب‌داری برای فهرست %s انجام شده است
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -48,6 +50,7 @@ CountriesExceptMe=همۀ کشورها باستثناء %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=در برپاسازی برای مشتریان حساب حساب‌داری اصلی تعریف نشده است
 MainAccountForSuppliersNotDefined=در برپاسازی برای تامین کنندگان حساب حساب‌داری اصلی تعریف نشده است
@@ -144,7 +147,7 @@ NotVentilatedinAccount=به حساب حسابداری بند نشد
 XLineSuccessfullyBinded=محصول/خدمت %s‌ با موفقیت به حساب حساب‌داری بند شد
 XLineFailedToBeBinded=محصول/خدمت %s به حساب حساب‌داری بند نشد
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=تعداد عناصری که باید بند بشوند و در صفحه نمایش داده شوند (حداکثر پیشنهادی: 50 مورد)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=آغاز مرتب‌کردن صفحۀ "بندکردن برای انجام" بواسطۀ عناصر اخیر
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=آغاز مرتب‌کردن صفحۀ "بندکردن انجام شد" بواسطۀ عناصر اخیر
 
@@ -198,7 +201,8 @@ Docdate=تاریخ
 Docref=مرجع
 LabelAccount=برچسب حساب
 LabelOperation=عملیات برچسب
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=کد حروف‌بندی
 Lettering=حروف‌بندی
 Codejournal=دفتر
@@ -206,7 +210,8 @@ JournalLabel=برچسب دفتر
 NumPiece=شمارۀ بخش
 TransactionNumShort=تعداد تراکنش‌ها
 AccountingCategory=گروه‌های دل‌خواه
-GroupByAccountAccounting=گروه‌بندی با حساب حساب‌داری
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=در این قسمت می‌توانید گروه‌های متشکل از حساب‌حساب‌داری بسازید. این گروه‌ها برای گزارش‌های دل‌خواه حساب‌داری استفاده می‌شود.
 ByAccounts=به واسطۀ حساب‌ها
 ByPredefinedAccountGroups=به واسطۀ  گروه‌های از پیش‌تعریف شده
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=پرداخت به هیچ محصول/خدمتی وصل
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=گروه حساب
 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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=در این قسمت فهرستی از سطور گزار
 DescVentilExpenseReportMore=در صورتی‌که شما حساب‌حساب‌داری را از نوع سطور گزارش هزینه تنظیم می‌کنید، برنامه قادر خواهد بود همۀ بندهای لازم را بین سطور گزارش هزینه‌های شما و حساب حساب‌داری شما در ساختار حساب‌های‌تان را ایجاد نماید، فقط با یک کلیک بر روی کلید <strong>"%s"</strong>. در صورتی‌که حساب بر روی واژه‌نامۀ پرداخت‌ها ثبت نشده باشد یا هنوز سطوری داشته باشید که به هیچ حسابی متصل نباشد، باید بندها را به شکل دستی از فهرست "<strong>%s</strong>: ایجاد نمائید.
 DescVentilDoneExpenseReport=در این قسمت فهرستی از سطور گزارشات هزینه و حساب‌حساب‌داری پرداخت آن‌ها را داشته باشید
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=بندکردن خودکار
 AutomaticBindingDone=بندکردن خودکار انجام شد
@@ -293,6 +300,7 @@ Accounted=در دفترکل حساب‌شده است
 NotYetAccounted=هنوز در دفترکل حساب نشده‌است
 ShowTutorial=Show Tutorial
 NotReconciled=وفق داده نشده
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +345,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=صادرکردن برای OpenConcerto  (آزمایشی)
 Modelcsv_configurable= صدور قابل پیکربندی CSV 
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=صادرکردن برای Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 047c4802f96..44b56b29436 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -56,6 +56,8 @@ GUISetup=نمایش
 SetupArea=برپاسازی
 UploadNewTemplate=بارگذاری قالب‌(های) جدید
 FormToTestFileUploadForm=برگه آزمایش بارگذاری فایل (با توجه به برپاسازی)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=توجه: «بله» تنها در صورتی مؤثر است که واحد <b>%s</b> فعال باشد
 RemoveLock=فایل <b>%s</b> را در صورت موجود بودن تغییر دهید تا امکان استفاده از ابزار نصب/روزآمدسازی وجود داشته باشد.
 RestoreLock=فایل <b>%s</b> را با مجوز فقط خواندنی بازیابی کنید تا امکان استفاده از ابزار نصب/روزآمدسازی را غیرفعال کنید.
@@ -85,7 +87,6 @@ ShowPreview=نمایش پیش‌نمایش
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=پیش‌نمایش در دسترس نیست
 ThemeCurrentlyActive=محیطی که اکنون فعال است
-CurrentTimeZone=منطقه زمانی PHP (سرور)
 MySQLTimeZone=منطقه زمانی MySql (پایگاه داده)
 TZHasNoEffect=در صورتی که تاریخ‌ها به‌عنوان رشتۀ ارسال شده حفظ شوند، توسط سرویس‌دهندۀ بانک‌داده ذخیره شده و ارائه می‌شود. ناحیه‌های زمانی تنها در صورتی مؤثرند که از تابع UNIX_TIMESTAMP استفاده شده باشد ( در Dolibarr نباید استفاده شود، بنابراین ناحیۀ زمانی بانک داده نباید تاثیر داشته باشد، حتی اگر بعد از درج داده تغییر داده شود).
 Space=فضا
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=این واحد دربردارندۀ عوامل مربوط 
 Purge=پاک‌کردن
 PurgeAreaDesc=این صفحه به شما امکان حذف همۀ فایل‌های تولید شده و ذخیره شده با Dolibarr  را می‌دهد (فایل‌های موقت یا همۀ فایلهای داخل پوشۀ <b>%s</b>). استفاده از این قابلیت در شرایط عادی ضرورتی ندارد. این قابلیت برای کاربرانی ایجاد شده است که میزبانی وبگاه آن‌ها امکان حذف فایل‌هائی که توسط سرویس‌دهندۀ وب ایجاد شده‌اند را نداده است. 
 PurgeDeleteLogFile=حذف فایل‌های گزارش‌کار، شامل تعریف <b>%s</b> برای واحد گزارش‌کار سامانه Syslog (خطری برای از دست دادن داده‌ها نیست)
-PurgeDeleteTemporaryFiles=حذف همۀ فایل‌های موقت (خطری برای از دست دادن داده نیست). توجه: حذف تها در صورتی انجام خواهد شد که پوشۀ موقتی حداقل 24 ساعت قبل ساخته شده باشد.
-PurgeDeleteTemporaryFilesShort=حذف فایل‌های موقتی
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 PurgeDeleteAllFilesInDocumentsDir=حذف همۀ فایل‌های موجود در پوشۀ: <b>%s</b>. <br> این باعث حذف همۀ مستنداتی که به عناصر مربوطند ( اشخاص سوم، صورت‌حساب و غیره ...)، فایل‌هائی که به واحد ECM ارسال شده‌اند، نسخه‌برداری‌های پشتیبان بانک‌داده و فایل‌های موقت خواهد شد.
 PurgeRunNow=شروع پاک‌سازی
 PurgeNothingToDelete=هیچ فایل یا پوشه‌ای برای حذف وجود ندارد.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=هم‌کاران پیش‌نهادی
 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>
 HelpCenterDesc1=در این‌جا منابعی برای دریافت کمک و پشتیبانی در خصوص Dolibarr می‌یابید:
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=مثال‌هائی با پیکربندی کنونی
 ListOfDirectories=فهرست پوشه‌های قالب‌های OpenDocument
 ListOfDirectoriesForModelGenODT=فهرست پوشه‌هائی که دربردارندۀ قالب‌های به شکل OpenDocument هستند. <br><br>مسیر کامل پوشه‌ها را قرار دهید.<br>بین هر پوشه یک ارجاع به اول سطر قرار دهید.<br>برای افزودن پوشۀ واحد GED، اینجا قرار دهید <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>فایل‌های موجود در آن پوشه باشید با <b>.odt</b> یا <b>.ods</b> خاتمه یابند.
 NumberOfModelFilesFound=تعداد فایل‌های قالب ODT/ODS پیدا شده در این پوشه‌ها
-ExampleOfDirectoriesForModelGen=نمونه‌های روش نوشتاری:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> برای اطلاع از طرز ساخت مستندات قالب ODT دلخواه، قبل از این‌که آن‌ها را در این پوشه‌ها ذخیره کنید، مستندات راهنمای ویکی را بخوانید:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=مکان نام/نام‌خانوادگی
@@ -406,7 +408,7 @@ UrlGenerationParameters=مقادیر امن‌سازی نشانی‌های ای
 SecurityTokenIsUnique=استفاده از یک مقدار securekey منحصربه‌فرد برای هر نشانی اینترنتی
 EnterRefToBuildUrl=مرجع را برای شیء %s وارد کنید
 GetSecuredUrl=نشانی اینترنتی محاسبه شده را دریافت کنید
-ButtonHideUnauthorized=پنهان کردن کلیدهای مربوط به فعالیت‌های غیرمجاز برای کاربران غیرمدیر به جای نمایش کلیدهای خاکستری غیرفعال
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=نرخ قدیمی مالیات‌بر‌ارزش‌افزوده
 NewVATRates=نرخ جدید قدیمی مالیات‌بر‌ارزش‌افزوده
 PriceBaseTypeToChange=تغییر قیمت‌ها بر پایۀ مقدار مرجع تعریف شده در
@@ -668,7 +670,7 @@ Module54000Desc=چاپ مستقیم (بدون باز کردن مستندات) ب
 Module55000Name=رای‌گیری و نظرسنجی
 Module55000Desc=ساخت نظرسنجی و رای‌گیری برخط (همانند Doodle، Studs, RDVz و غیره).
 Module59000Name=حاشیه‌ها
-Module59000Desc=واحد مدیریت حاشیه‌ها
+Module59000Desc=Module to follow margins
 Module60000Name=کمیسیون
 Module60000Desc=واحد مدیریت کمیسیون‌ها
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ YouUseBestDriver=شما از راه‌انداز %s استفاده می‌کنی
 YouDoNotUseBestDriver=شما از راه‌انداز %s استفاده می‌کنید اما پیشنهاد ما استفادهاز %s است.
 NbOfObjectIsLowerThanNoPb=شما در پایگاه داده فقط %s%s دارید. این الزاما نیازمند بهینه سازی نیست.
 SearchOptim=بهینه‌سازی جستجو
-YouHaveXObjectUseSearchOptim=شما در پایگاه‌داده %s%s دارید. شما باید مقدار ثابت %s را به 1 در خانه-برپاسازی-سایر اضافه کنید. جستجو را محدود به ابتدا نمائید تا به پایگاه‌داده امکان دهید از شاخص‌ها استفاده کند تا بتوانید واکنش فوری داشته باشید.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=شما در پایگاه داده %s دارید و مقدار ثابت %s %sدر خانه-برپاسازی-سایر به 1 تنظیم شده است.
 BrowserIsOK=شما از مرورگر وب %s استفاده می‌نمائید. این مرورگر برای کارائی و امنیت مناسب است.
 BrowserIsKO=شما از مرورگر وب %s استفاده می‌نمائید. این مرورگر به‌عنوان یک انتخاب بد به نسبت امنیت، کارائی و اعتمادپذیری شناخته شده است. ما به شما پیشنهاد می‌کنیم از Firefox، Chrome، Opera و Safari استفاده نمائید.
@@ -1596,8 +1598,13 @@ ServiceSetup=برپاسازی واحد خدمات
 ProductServiceSetup=برپاسازی واحد محصولات و خدمات
 NumberOfProductShowInSelect=حداکثر تعداد قابل نمایش در فهرست ترکیبی انتخاب‌گر (0=بدون محدودیت)
 ViewProductDescInFormAbility=نمایش توضیحات محصول در برگه‌ها (در غیر این‌صورت طی یک‌نکتۀ در کادر کوچک توضیح نمایش داده خواهد شد)
+DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
+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 به سند پیشنهاد در صورتی‌که محصول/خدمات در پیشنهاد وجود داشته باشد
-ViewProductDescInThirdpartyLanguageAbility=نمایش توضیحات محصولات با زبان شخص‌سوم
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 UseSearchToSelectProductTooltip=در صورتی که شما تعداد بسیار زیادی محصول داشته باشید (>100000)، شما می‌توانید با استنفاده از تنظیم مقدار ثابت PRODUCT_DONOTSEARCH_ANYWHERE  به مقدار 1 در برپاسازی->سایر سرعت را افزایش دهید. جستجو در این حالت از شروع عبارت انجام خواهد شد.
 UseSearchToSelectProduct=قبل از این‌که شما کلیدی بفشارید محتوای محصول در فهرست ترکیبی بارگذاری نخواهد شد (در صورتی که شما تعداد زیادی محصول داشته باشید، این باعث افزایش کارآمدی خواهد شد، اما از راحتی کم‌تری برخوردار است)
 SetDefaultBarcodeTypeProducts=نوع بارکد پیش‌فرض برای استفادۀ محصولات
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=فهرست‌های شخصی که به یکی از ق
 NewMenu=فهرست جدید
 MenuHandler=اداره‌کنندۀ فهرست
 MenuModule=واحد منبع
-HideUnauthorizedMenu= پنهان کردن فهرست‌های غیرمجاز (خاکستری)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=فهرست شناسه
 DetailMenuHandler=اداره کنندۀ فهرست برای تعیین مکان نمایش فهرست جدید
 DetailMenuModule=نام واحد در صورتی که یک قسمت از فهرست از یک واحد می‌آید
@@ -1983,11 +1990,12 @@ EMailHost=میزبان سرور IMAP رایانامه
 MailboxSourceDirectory=پوشۀ منبع صندوق‌پستی
 MailboxTargetDirectory=پوشۀ مقصد صندوق‌پستی
 EmailcollectorOperations=عملیات قابل انجام جمع‌کننده
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=حداکثر تعداد رایانامه‌های جمع‌آوری شده در یک جمع‌آوری
 CollectNow=الآن جمع‌آوری شود
 ConfirmCloneEmailCollector=آیا مطمئن هستید می‌خواهد جمع‌آورندۀ رایانامۀ %s را نسخه‌برداری کنید؟
-DateLastCollectResult=آخرین تاریخ تلاش برای جمع‌‌آوری
-DateLastcollectResultOk=آخرین تلاش جمع‌آوری موفق
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=آخرین نتیجه
 EmailCollectorConfirmCollectTitle=تائید جمع‌آوری رایانامه
 EmailCollectorConfirmCollect=آیا می‌خواهید عملیات جمع‌آوری این جمع‌آورنده را حالا اجرا کنید؟
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=کدپستی
 MainMenuCode=کد ورودی فهرست (فهرست اصلی)
 ECMAutoTree=نمایش ساختاردرختی خودکار ECM
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/fa_IR/banks.lang b/htdocs/langs/fa_IR/banks.lang
index b2492377312..74e84caae12 100644
--- a/htdocs/langs/fa_IR/banks.lang
+++ b/htdocs/langs/fa_IR/banks.lang
@@ -173,10 +173,11 @@ SEPAMandate=تعهدنامۀ SEPA
 YourSEPAMandate=تعهدنامۀ SEPAی شما
 FindYourSEPAMandate=این تعهدنامۀ SEPAی شماست تا شرکت ما را مجاز کند سفارش پرداخت مستقیم از بانک داشته باشد. آن را امضا شده بازگردانید (نسخۀ اسکن‌شدۀ برگۀ امضا شده) یا آن را توسط رایانامه ارسال کنید:
 AutoReportLastAccountStatement=پرکردن خودکار بخش "شمارۀ شرح کار بانک" با آخرین شمارۀ شرح کار در هنگام وفق دادن
-CashControl=محدودۀ مبلغ‌نقدی صندوق-نقطۀ فروش-
-NewCashFence=محدودۀ جدید مبلغ‌نقدی
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/fa_IR/blockedlog.lang b/htdocs/langs/fa_IR/blockedlog.lang
index 116a6acbb42..f5999b78250 100644
--- a/htdocs/langs/fa_IR/blockedlog.lang
+++ b/htdocs/langs/fa_IR/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=حذف منطقی کمک‌مالی
 logMEMBER_SUBSCRIPTION_CREATE=عضویت برای عضو ساخت شده
 logMEMBER_SUBSCRIPTION_MODIFY=عضویت برای عضو ویرایش شد
 logMEMBER_SUBSCRIPTION_DELETE=حذف منطقی عضویت برای عضیو
-logCASHCONTROL_VALIDATE=ثبت محدودۀ پول‌نقد
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=دریافت صورت‌حساب مشتری
 BlockedLogBillPreview=پیش‌نمایش صورت‌حساب مشتری
 BlockedlogInfoDialog=جزئیات گزارش‌کار
diff --git a/htdocs/langs/fa_IR/boxes.lang b/htdocs/langs/fa_IR/boxes.lang
index 3ee603aee83..644922a4949 100644
--- a/htdocs/langs/fa_IR/boxes.lang
+++ b/htdocs/langs/fa_IR/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=آخرین %s کمکِ تغییریافته
 BoxTitleLastModifiedExpenses=آخرین %s گزارش هزینۀ تغییریافته
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=فعالیت‌های سراسری (صورت‌حساب‌ها،  پیشنهادها، سفارشات)
 BoxGoodCustomers=مشتریان خوب
 BoxTitleGoodCustomers=%s مشتری خوب
+BoxScheduledJobs=وظایف برنامه‌ریزی‌شده
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=باسازی واکشی RSS ناموفق بود، آخرین تاریخ باسازی موفق: %s
 LastRefreshDate=آخرین تاریخ نوسازی
 NoRecordedBookmarks=هیچ نشانه‌ای تعریف نشده است
@@ -92,8 +95,8 @@ LastXMonthRolling=طومار آخرین %s ماه
 ChooseBoxToAdd=اضافه کردن وسیله به پیشخوان شم
 BoxAdded=این وسیله به پیشخوان شما اضافه شد
 BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=حسابداری
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/fa_IR/cashdesk.lang b/htdocs/langs/fa_IR/cashdesk.lang
index 40313762c8d..2c4889740bb 100644
--- a/htdocs/langs/fa_IR/cashdesk.lang
+++ b/htdocs/langs/fa_IR/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=پاورقی
 AmountAtEndOfPeriod=مبلغ در انتهای دوره (روز، ماه یا سال)
 TheoricalAmount=مبلغ نظری
 RealAmount=مقدار واقعی
-CashFence=Cash fence
-CashFenceDone=حصار نقدی برای دوره تعیین شده
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb و از فاکتورها
 Paymentnumpad=نوع بخش‌کناری
 Numberspad=بخش‌کناری عددی
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/fa_IR/categories.lang b/htdocs/langs/fa_IR/categories.lang
index adc3e73cfdb..5c7ca6a0f2e 100644
--- a/htdocs/langs/fa_IR/categories.lang
+++ b/htdocs/langs/fa_IR/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌ها
 UsersCategoriesArea=بخش کلیدواژه‌ها/دسته‌بندی‌های کاربران
 SubCats=زیردسته‌ها
 CatList=فهرست کلیدواژه‌ها/دسته‌بندی‌ها
+CatListAll=List of tags/categories (all types)
 NewCategory=کلیدواژه/دسته‌بندی جدید
 ModifCat=ویرایش کلیدواژه/دسته‌بندی 
 CatCreated=کلیدواژه/دسته‌بندی  ساخته شد
@@ -65,16 +66,22 @@ UsersCategoriesShort=کلیدواژه/دسته‌بندی‌های کاربرا
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=شناسۀ کلیدواژه/دسته‌بندی 
-CatSupList=فهرست کلیدواژه/دسته‌بندی‌های فروشندگان
-CatCusList=فهرست کلیدواژه/دسته‌بندی‌های مشتریان/احتمالی‌ها
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=فهرست گروه‌بندی‌ها/برچسب‌های محصولات
 CatMemberList=فهرست کلیدواژه/دسته‌بندی‌های اعضا
-CatContactList=فهرست کلیدواژه/دسته‌بندی‌های طرف‌های تماس
-CatSupLinks=پیوندهای میان تامین‌کنندگان و کلیدواژه/دسته‌بندی‌ها
+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=پیوندهای میان مشتریان/احتمالی‌ها و کلیدواژه/دسته‌بندی‌ها
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=پیوندهای میان محصولات/خدمات و کلیدواژه/دسته‌بندی‌ها
-CatProJectLinks=پیوندهای میان طرح‌ها و کلیدواژه/دسته‌بندی‌ها
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=پیوندهای میان طرح‌ها و کلیدواژه/دسته‌بندی‌ها
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=حذف از کلیدواژه/دسته‌بندی
 ExtraFieldsCategories=ویژگی های مکمل
 CategoriesSetup=برپاسازی کلیدواژه/دسته‌بندی‌
diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
index 9a4bc483b57..ab78f11dd02 100644
--- a/htdocs/langs/fa_IR/companies.lang
+++ b/htdocs/langs/fa_IR/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=بررسی شناسۀ م.ب.ا.ا. داخل جامعه
 VATIntraManualCheck=همچنین می‌توانید به‌طور دستی روی وبگاه کمیسیون اروپا بررسی کنید <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=بررسی مقدور نبود. خدمات بررسی برای کشور عضو (%s) ارائه نمی‌شود.
 NorProspectNorCustomer=مشتری‌احتمالی نیست/مشتری نیست
-JuridicalStatus=نوع موجودیت قانونی
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=کارمندان
 ProspectLevelShort=توان‌بالقوه-پتانسیل
diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang
index cdf21783347..5e300643567 100644
--- a/htdocs/langs/fa_IR/compta.lang
+++ b/htdocs/langs/fa_IR/compta.lang
@@ -111,7 +111,7 @@ Refund=بازپس‌گیری
 SocialContributionsPayments=پرداخت‌های مالیات اجتماعی/ساختاری
 ShowVatPayment=نمایش پرداخت م.ب.ا.ا
 TotalToPay=مجموع قابل پرداخت
-BalanceVisibilityDependsOnSortAndFilters=موجودی در این فهرست تنها در صورتی قابل مشاهده خواهد بود که جدول به صورت صعودی برای %s انجام شده باشد و صافی برای 1 حساب بانکی تنظیم شده باشد
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=کد حسابداری مشتری
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=کد حساب‌داری مشتری
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=آیا مطمئن هستید می‌خواهید
 ExportDataset_tax_1=مالیات‌های اجتماعی و ساختاری و پرداخت‌ها
 CalcModeVATDebt=حالت <b>%sحساب‌داری مالیات‌بر‌ارزش افزوده تعهدی%s</b>.
 CalcModeVATEngagement=حالت <b>%sمالیات بر ارزش افزوده در ازای درآمد-هزینه%s</b>.
-CalcModeDebt=تحلیل صورت‌حساب‌های معلوم و ثبت شده حتی در صورتی که هنوز در دفترکل حساب نشده باشند.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=تحلیل پرداخت‌های معلوم و ثبت شده حتی در صورتی که هنوز در دفترکل حساب نشده باشند.
 CalcModeBookkeeping=تحلیل داده‌های ثبت شده در دفتر روزنامه در جدول دفترداری دفترکل
 CalcModeLT1= حالت <b>%sRE بر حسب صورت‌حساب مشتری - صورت‌حساب تامین کننده%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=ماندۀ درآمدها و هزینه‌ها، ج
 AnnualByCompanies=ماندۀ درآمدها و هزینه‌ها، بر حسب حساب‌های از گروه‌بندی شده
 AnnualByCompaniesDueDebtMode=ماندۀ درآمدها و هزینه‌ها، جزئیات بر حسب گروه‌های از قبل تعیین شده، حالت <b>%s طلب‌ها-بدهی‌ها%s</b> یا <b>حساب‌داری تعهدی</b>
 AnnualByCompaniesInputOutputMode=ماندۀ درآمدها و هزینه‌ها، جزئیات بر حسب گروه‌های از قبل تعیین شده، حالت <b>%sدرآمدها-هزینه‌ها%s</b> یا <b>حساب‌داری نقدی</b>.
-SeeReportInInputOutputMode=برای محاسبۀ پرداخت‌های حقیقی که حتی هنوز در دفترکل حساب نشده‌اند به %sتحلیل پرداخت‌ها%s نگاه کنید.
-SeeReportInDueDebtMode=برای محاسبۀ صورت‌حساب‌های ثبت شده که حتی هنوز در دفترکل حساب نشده‌اند به %sتحلیل صورت‌حساب‌ها %s نگاه کنید.
-SeeReportInBookkeepingMode=برای محاسبه‌ای بر روی <b>جدول حساب‌داری دفترکل</b> به <b>%sگزارش حساب‌داری%s</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=- تمام مالیات‌ها در مقادیر نمایش داده شده، گنجانده شده‌اند
 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>- بر حسب تاریخ پرداخت صورت‌حساب‌ها، هزینه‌ها، مالیات بر ارزش افزوده و حقوق‌ها می‌باشد. تاریخ کمک‌مالی برای کمک‌های مالی
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=نمایش دهندۀ ردیف دفترکل 
 SeePageForSetup=برای برپاسازی فهرست <a href="%s">%s</a> را ببینید
 DepositsAreNotIncluded=- صورت‌حساب‌های پیش‌پرداخت شامل نشده‌اند
 DepositsAreIncluded=- صورت‌حساب‌های پیش‌پرداخت شامل شده‌اند
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=گزارش مالیات 2 توسط شخص سوم
 LT2ReportByCustomers=گزارش مالیات 3 توسط شخص سوم
 LT1ReportByCustomersES=گزارش توسط شخص سوم RE
 LT2ReportByCustomersES=گزارش توسط شخص سوم IRPF
 VATReport=گزارش مالیات‌برفروش
 VATReportByPeriods=گزارش مالیات‌برفروش بر حسب دورۀ زمانی
+VATReportByMonth=Sale tax report by month
 VATReportByRates=گزارش مالیات‌برفروش بر حسب نرخ‌ها
 VATReportByThirdParties=گزارش مالیات‌برفروش بر حسب شخص‌سوم‌ها
 VATReportByCustomers=گزارش مالیات‌برفروش بر حسب مشتری
diff --git a/htdocs/langs/fa_IR/cron.lang b/htdocs/langs/fa_IR/cron.lang
index 0302013fc26..b88af91c016 100644
--- a/htdocs/langs/fa_IR/cron.lang
+++ b/htdocs/langs/fa_IR/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = حذف  وظایف زمان‌بندی‌شده
 Permission23104 = اجرای  وظایف زمان‌بندی‌شده
 # Admin
 CronSetup=برپاسازی مدیریت وظایف زمان‌بندی‌شده
-URLToLaunchCronJobs=نشانی برای بررسی و اجرای وظایف‌زمان‌بندی‌شدۀ واجدشرایط 
-OrToLaunchASpecificJob=یا برای بررسی و اجرای یک وظیفۀ خاص
+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=کلیدامنیتی نشانی برای اجرای وظایف‌زمان‌بندی‌شده
 FileToLaunchCronJobs=خطفرمان برای بررسی و اجرای وظایف‌زمانی واجد شرایط
 CronExplainHowToRunUnix=در فضای لینوکس شما باید ورودی crontab زیر را استفاده کنید تا در هر 5 دقیقه فرمان اجرا شود
 CronExplainHowToRunWin=در فضای مایکروسافت ویندوز شما می‌توانید از ابزارهای وظایف زمان‌بندی شده استفاده کنید تا در هر 5 دقیقه دستور را اجرا کنید
 CronMethodDoesNotExists=کلاس %s دربردارندۀ هیچ متد %s نیست
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=نمایه‌های وظایف زمانی‌بندی شده در فایل توضیح واحد مربوطه تعریف می‌شوند. در هنگامی که این واحد فعال شد، این فایل‌ها بارگذاری شده و در دسترس خواهند بود و در نتیجه شما می‌توانید واظیف را از فهرست ابزارهای مدیر %s مدیریت کنید.
 CronJobProfiles=نمایه‌های از پیش تعیین شدۀ وظایف‌زمان‌بندی‌شده
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=تعداد اجراها
 CronMaxRun=حداکثر تعداد اجراها
 CronEach=هر
 JobFinished=وظیفه اجرا شده و به سرانجام رسید
+Scheduled=Scheduled
 #Page card
 CronAdd= اضافه‌کردن وظیفه
 CronEvery=اجرای وظیفه در هر
@@ -56,7 +58,7 @@ CronNote=توضیح
 CronFieldMandatory=بخش %s الزامی است
 CronErrEndDateStartDt=تاریخ پایان نمی‌تواند قبل از تاریخ شروع باشد
 StatusAtInstall=وضعیت نصب واحد
-CronStatusActiveBtn=فعال‌کردن
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=غیرفعال‌کردن
 CronTaskInactive=این وظیفه غیرفعال است
 CronId=شناسه
@@ -76,8 +78,14 @@ CronType_method=روش-متد فراخوان یک کلاس PHP
 CronType_command=فرمان شل
 CronCannotLoadClass=امکان بارگذاری فایل کلاس %s (برای بارگذاری کلاس %s)
 CronCannotLoadObject=فایل کلاس %s بارگذاری شد، اما شیء %s درون آن پیدا نشد
-UseMenuModuleToolsToAddCronJobs=به فهرست "خانه-ابزارهای مدیر-وظایف زمان‌بندی شده" رفته تا این وظایف را مشاهده کرده یا ویرایش کنید.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=وظیفه غیرفعال است
 MakeLocalDatabaseDumpShort=پشتیبان‌گیری از پایگاه داده محلی
 MakeLocalDatabaseDump=نسخه‌برداری-dump از پایگاه دادۀ محلی. مؤلفه‌های مربوطه از قرار: فشرده‌سازی ('gz'  یا 'bz' یا 'none')، نوع پشتیبان‌گیری  ('mysql', 'pgsql', 'auto'), 1, 'auto' یا نام فایلی که ساخته می‌شود, تعداد فایل‌هائی که نگه‌داری می‌شود است
 WarningCronDelayed=توجه، برای مقاصد بهینه‌سازی، زمان اجرای بعدی وظایف فعال، وظایف شما ممکن است حداکثر %s ساعت قبل از اجرا تاخیر داشته  باشد.
+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/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index 3547d8ea6cb..43ad72288b6 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=خطائی نیست، حرکت می‌کنیم
 # Errors
 ErrorButCommitIsDone=علیرغم وجود خطا، تائید می‌شود
 ErrorBadEMail=رایانامۀ %s غلط است
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=نشانی‌اینترنتی %s اشتباه است
 ErrorBadValueForParamNotAString=برای مؤلفۀ موردنظر مقدار خطائی وارد شده است. عموما در هنگام فقدان ترجمه، الحاق می‌شود.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=نام‌کاربری %s قبلا وجود داشته است.
 ErrorGroupAlreadyExists=گروه %s قبلا وجود داشته است.
 ErrorRecordNotFound=ردیف موجود نیست.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=برخی از بخش‌های الزامی، پر نشده
 ErrorSubjectIsRequired=موضوع رایانامه الزامی است.
 ErrorFailedToCreateDir=ایجاد یک پوشه با شکست مواجه شد. بررسی کنید، کاربر سرور وب، دارای مجوزهای نوشتاری بر روی پوشۀ documents مربوط به Dolibarr باشد در صورتی که مؤلفۀ <b>safe_mode</b> روی این نسخه از PHP فعال باشد، بررسی کنید فایل‌های PHP مربوط به Dolibarr متعلق به کاربر سرور وب (یا گروه مربوطه) باشد.
 ErrorNoMailDefinedForThisUser=نشانی رایانامه برای این کاربر تعریف نشده است
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=این قابلیت برای کار کردن نیاز به فعال بودن جاوااسکریپت دارد. این گزینه را در بخش برپاسازی-نمایش فعال کنید.
 ErrorTopMenuMustHaveAParentWithId0=فهرست‌هائی از نوع "بالا" می‌توانند دارای فهرست مادر باشند. برای این‌که فهرست "کنار" داشته باشید، عدد 0 را وارد کنید.
 ErrorLeftMenuMustHaveAParentId=فهرست‌های "کنار" باید یک شناسۀ مادر داشته باشند
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=این نام نمایه برای این مجموعۀ
 ErrorLDAPSetupNotComplete=تطبیق Dolibarr-LDAP کامل نیست.
 ErrorLDAPMakeManualTest=یک فایل .ldif در پوشۀ  %s تولید شد. تلاش کنید آن را از خط فرمان به شکل دستی اجرا کنید تا اطلاعات بیشتری در مورد خطاها داشته باشید.
 ErrorCantSaveADoneUserWithZeroPercentage=در صورتی که بخش "انجام شده توسط" هم پر شده باشد، امکان ذخیرۀ یک کنش با "وضعیت شروع نشده" نیست.
-ErrorRefAlreadyExists=ارجاعی که برای مورد ساخته شده استفاده شده قبلا وجود داشته است.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=لطفا نام اطلاعیۀ بانک را در خصوص چگونگی گزارش ورودی وارد کنید (حالت YYYYMM  یا YYYYMMDD)
 ErrorRecordHasChildren=هنگامی که یک ردیف دارای زیرمجموعه است، امکان حذف آن وجود ندارد.
 ErrorRecordHasAtLeastOneChildOfType=این شیء حداقل یک فرزند از نوع %s دارد
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=شما باید تعیین کنی
 ErrorDiscountLargerThanRemainToPaySplitItBefore=تخفیفی که می‌دهید بزرگتر از مقدار قابل پرداخت است. قبل از این کار تخفیف را به 2 تخفیف کوچکتر تقسیم کنید.
 ErrorFileNotFoundWithSharedLink=فایل پیدا نشد. ممکن است کلید به‌اشتراک‌گذاری ویرایش شده یا فایل حذف شده باشد
 ErrorProductBarCodeAlreadyExists=بارکد محصول %s در یک ارجاع محصول دیگر قبلا وجود داشته است
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=همچنین توجه داشته باشید در هنگامی که حداقل یک زیرمحصول (یا زیرمحصولی از زیرمحصول) به یک شمارۀ سری‌ساخت/شماره سریال احتیاج داشته باشد، استفاده از محصول مجازی برای افزایش/کاهش خودکار زیرمحصولات ممکن نیست.
+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=برای سطوری که محصول مجانی دارند، توضیحات الزامی است
 ErrorAPageWithThisNameOrAliasAlreadyExists=صفحه/دربردارندۀ <strong>%s</strong> نام مشابه یا نام‌مستعار جایگزین مشابه ورودی مورد استفادۀ شما دارد
 ErrorDuringChartLoad=خطا در هنگام بارگذاری نمودار حساب‌ها. در صورتی برخی حساب‌ها بارگذاری نشوند، همچنان می‌توانید به طور دستی آن‌ها را وارد کنید
@@ -243,6 +246,16 @@ 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
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=یک گذرواژه برای این عضو تنظیم شده است. با این‌حال هیچ حساب کاربری‌ای ساخته نشده است. بنابراین این گذرواژه برای ورود به Dolibarr قابل استفاده نیست. ممکن است برای یک رابط/واحد بیرونی قابل استفاده باشد، اما اگر شما نخواهید هیچ نام کاربری ورود و گذرواژه‌ای برای یک عضو استفاده کنید، شما می‌توانید گزینۀ "ایجاد یک نام‌ورد برای هر عضو" را از برپاسازی واحد اعضاء غیرفعال کنید. در صورتی که نیاز دارید که نام‌ورود داشته باشید اما گذرواژه نداشته باشید، می‌توانید این بخش را خالی گذاشته تا از این هشدار بر حذر باشید. نکته: همچنین نشانی رایانامه می‌تواند در صورتی که عضو به یک‌کاربر متصل باشد، می‌‌تواند مورد استفاده قرار گیرد
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=نام‌ورود شما تغییر پی
 WarningAnEntryAlreadyExistForTransKey=یک ورودی برای این کلید ترجمه برای این زبان قبلا وجود داشته است
 WarningNumberOfRecipientIsRestrictedInMassAction=هشدار، در هنگام انجام عملیات انبوده روی فهرست‌ها، تعداد دریافت‌کنندگان مختلف به <b>%s</b> محدود است.
 WarningDateOfLineMustBeInExpenseReportRange=هشدار، تاریخ مربوط به سطر در بازۀ گزارش هزینه‌ها نیست
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=طرح بسته است. ابتدا باید آن را باز کنید
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/fa_IR/exports.lang b/htdocs/langs/fa_IR/exports.lang
index 87e543c7259..c514c0638f1 100644
--- a/htdocs/langs/fa_IR/exports.lang
+++ b/htdocs/langs/fa_IR/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=عنوان بخش
 NowClickToGenerateToBuildExportFile=حالا نوع فایل را در کادرترکیبی وارد کرده و کلید "تولید" را برای ساخت فایل صادرات کلیک کنید..
 AvailableFormats=انواع‌فایل ممکن
 LibraryShort=کتابخانه
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=گام
 FormatedImport=دستیار واردات
 FormatedImportDesc1=این واحد به شما امکان می‌دهد با استفاده از فایل و بدون دانش فنی، با استفاده از یک دستیار داده‌های موجود را روزآمد کرده یا اشیاء جدید به پایگاه‌داده اضافه کنید.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=کلید (ستون) برای استفاده در <b>به‌
 NbInsert=تعدا سطور درج شده: %s
 NbUpdate=تعداد سطور روزآمد شده: %s
 MultipleRecordFoundWithTheseFilters=ردیف‌های متعددی با این صافی پیدا شد: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang
index 75df4395c03..159d2a5d314 100644
--- a/htdocs/langs/fa_IR/mails.lang
+++ b/htdocs/langs/fa_IR/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=ورودی رایانامه کاربر
 MailingModuleDescDolibarrUsers=کاربران دارای رایانامه
 MailingModuleDescThirdPartiesByCategories=شخص‌سوم‌ها (بر حسب دسته‌بندی)
 SendingFromWebInterfaceIsNotAllowed=ارسال از رابط وب مجاز نیست.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=خط٪ در فایل
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=اطلاعیه ها
-NoNotificationsWillBeSent=بدون اطلاعیه ها ایمیل ها برای این رویداد و شرکت برنامه ریزی
-ANotificationsWillBeSent=1 اطلاع رسانی خواهد شد از طریق ایمیل ارسال می شود
-SomeNotificationsWillBeSent=اطلاعیه٪ خواهد شد از طریق ایمیل ارسال می شود
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=لیست همه اطلاعیه ها ایمیل فرستاده شده
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=اطلاعات
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=پاسخ داده شده
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index c53d9860524..e24969fbdf7 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=برای این نوع رایانامه قالبی وجود ن
 AvailableVariables=متغیرهای موجود برای جایگزینی 
 NoTranslation=بدون ترجمه
 Translation=ترجمه
+CurrentTimeZone=منطقه زمانی PHP (سرور)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=هیچ ردیفی پیدا نشد
 NoRecordDeleted=هیچ ردیفی حذف نشد
 NotEnoughDataYet=دادۀ کافی وجود ندارد
@@ -85,6 +87,8 @@ FileWasNotUploaded=یک فایل برای پیوست کردن انتخاب شد
 NbOfEntries=تعداد ورودی‌ه
 GoToWikiHelpPage=مطالعۀ راهنمای برخط (دسترسی به اینترنت نیاز است)
 GoToHelpPage=مطالعۀ راهنما
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=ردیف، ذخیره شد
 RecordDeleted=ردیف، حذف شد
 RecordGenerated=ردیف، تولید شد
@@ -220,6 +224,7 @@ Value=مقدار
 PersonalValue=مقدار شخصی
 NewObject=%s جدید
 NewValue=مقدار جدید
+OldValue=Old value %s
 CurrentValue=مقدار کنونی
 Code=کد
 Type=نوع
@@ -433,6 +438,7 @@ RemainToPay=در انتظار پرداخت
 Module=واحد/برنامه
 Modules=واحد/برنامه
 Option=گزینه
+Filters=Filters
 List=فهرست
 FullList=فهرست کامل
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ SupplierPreview=پیش‌نمایش فروشنده
 ShowCustomerPreview=نمایش پیش‌نمایش مشتری
 ShowSupplierPreview=نمایش پیش‌نمایش فروشنده
 RefCustomer=ارجاع مشتری
+InternalRef=Internal ref.
 Currency=واحدپولی
 InfoAdmin=اطلاعات مربوط به مدیران
 Undo=واگرادنی
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/fa_IR/modulebuilder.lang b/htdocs/langs/fa_IR/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/fa_IR/modulebuilder.lang
+++ b/htdocs/langs/fa_IR/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/fa_IR/mrp.lang b/htdocs/langs/fa_IR/mrp.lang
index 5edbad940c2..33de4aff092 100644
--- a/htdocs/langs/fa_IR/mrp.lang
+++ b/htdocs/langs/fa_IR/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
index 8bd88a5db5d..a52e9a0dee7 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -5,8 +5,6 @@ Tools=ابزار
 TMenuTools=ابزارها
 ToolsDesc=همۀ ابزارهائی که در سایر فهرست‌ها نیامده‌اند این‌جا گروه‌بندی شده‌اند. <br> همۀ ابزارها از فهرست سمت راست در دسترس هستند
 Birthday=تولد
-BirthdayDate=تاریخ تولد
-DateToBirth=Birth date
 BirthdayAlertOn=اعلان تولد فعال است
 BirthdayAlertOff=اعلان تولد غیرفعال است
 TransKey=ترجمۀ کلیدواژۀ TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=تعداد فایل های پیوست / اسناد
 TotalSizeOfAttachedFiles=اندازه کل فایل های پیوست / اسناد
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=راست
 CalculatedWeight=وزن محاسبه شده
 CalculatedVolume=حجم محاسبه شده
 Weight=وزن
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=کیلوگرم
 WeightUnitg=گرم
 WeightUnitmg=میلی گرم
@@ -214,6 +216,7 @@ 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=واردات مجموعه داده
 DolibarrNotification=اطلاع رسانی به صورت خودکار
 ResizeDesc=عرض جدید <b>OR</b> ارتفاع جدید را وارد کنید. نسبت در طول تغییر اندازه نگه داشته ...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=منطقه صادرات
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index 2a07d19a11f..ff7edf92df5 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=چند قسمت قیمتی در هر محصول/خدمات (هر مشتری در یک قسمت قیمتی است)
 MultiPricesNumPrices=تعداد قیمت‌ها
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+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=تعداد محصولات بسته‌بندی مادر
@@ -167,8 +168,10 @@ BuyingPrices=قیمت‌های خرید
 CustomerPrices=قیمت‌های مشتری
 SuppliersPrices=قیمت‌های فروشنده
 SuppliersPricesOfProductsOrServices=قیمت‌های فروشنده (مربوط به محصولات و خدمات)
-CustomCode=گمرک / کالا / کدبندی هماهنگ کالا
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=کشور مبدا
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=استفاده از قیمت ثابت
 PriceByQuantity=استفاده از قیمت‌ بر حسب تعداد
 DisablePriceByQty=غیرفعال کردن استفاده از قیمت برحسب تعداد
 PriceByQuantityRange=بازۀ تعدا
-MultipriceRules=مقررات قسمت‌بندی قیمت
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=استفاده از مقررات قسمت‌بندی قیمت (که در برپاسازی واحد محصولات آمده است) برای محاسبۀ خودکار قیمت سایر قسمت‌ها بر حسب اولین قسمت
 PercentVariationOver=%% انواع بر حسب%s
 PercentDiscountOver=%% تخفیف بر حسب%s
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index 4f56d44dcf4..ab3c12c4568 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -76,15 +76,16 @@ MyActivities=وظایف/فعالیت‌های من
 MyProjects=طرح‌های من
 MyProjectsArea=بخش طرح‌های مربوط به من
 DurationEffective=مدت‌زمان مفید
-ProgressDeclared=پیشرفت اظهار شده
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=پیشرفت محاسبه شده
+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=زمان
+TimeConsumed=Consumed
 ListOfTasks=فهرست وظایف
 GoToListOfTimeConsumed=رجوع به فهرست زمان صرف شده
 GanttView=نمای گانت
diff --git a/htdocs/langs/fa_IR/recruitment.lang b/htdocs/langs/fa_IR/recruitment.lang
index 082b58f6499..3647b8204d5 100644
--- a/htdocs/langs/fa_IR/recruitment.lang
+++ b/htdocs/langs/fa_IR/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/fa_IR/sendings.lang b/htdocs/langs/fa_IR/sendings.lang
index 4365e45f340..a042ba09638 100644
--- a/htdocs/langs/fa_IR/sendings.lang
+++ b/htdocs/langs/fa_IR/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=دیگر محموله برای این منظور
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=حمل و نقل به اعتبار
 StatusSendingCanceled=لغو شد
+StatusSendingCanceledShort=لغو ظده
 StatusSendingDraft=پیش نویس
 StatusSendingValidated=اعتبار (محصولات به کشتی و یا در حال حمل می شود)
 StatusSendingProcessed=پردازش
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=مدل سند کامل بیشتر برای رسید تحویل (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER ثابت تعریف نشده
 SumOfProductVolumes=مجموع حجم محصول
 SumOfProductWeights=مجموع وزن محصول
diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang
index 2ebf520b14e..c41e21fe88c 100644
--- a/htdocs/langs/fa_IR/stocks.lang
+++ b/htdocs/langs/fa_IR/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=ارزش انبار
 UserWarehouseAutoCreate=ساخت خودکار انبار کاربر در هنگام ساخت کاربر
 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=انبار پیش‌فرض
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/fa_IR/ticket.lang b/htdocs/langs/fa_IR/ticket.lang
index a1ad4eacc4e..8f525262ab5 100644
--- a/htdocs/langs/fa_IR/ticket.lang
+++ b/htdocs/langs/fa_IR/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=برگه‌ها - انواع
 TicketDictCategory=برگه‌ها - دسته‌بندی‌ها
 TicketDictSeverity=برگه‌ها - سطح اهمیت
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=اشکال نرم‌افزاری
-TicketTypeShortBUGHARD=اشکال نرم‌افزاری
-TicketTypeShortCOM=سوال تجاری
 
+TicketTypeShortCOM=سوال تجاری
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=سایر
 TicketSeverityShortLOW=کم
 TicketSeverityShortNORMAL=عادی
 TicketSeverityShortHIGH=زیاد
-TicketSeverityShortBLOCKING=انتقادی/مسدودی
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=بخش '%s' نادرست است
 MenuTicketMyAssign=برگه‌ها من
@@ -60,7 +58,6 @@ OriginEmail=منبع رایانامه
 Notify_TICKET_SENTBYMAIL=ارسال پیام برگه با رایانامه
 
 # Status
-NotRead=خوانده نشده
 Read=خوانده‌شده
 Assigned=نسبت‌داده شده
 InProgress=در حال انجام
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=رابط عمومی به کاربران ام
 TicketsAutoAssignTicket=نسبت دادن خودکار کاربری که برگۀ‌پشتیبانی را ساخته است
 TicketsAutoAssignTicketHelp=در هنگام ساخت برگۀ‌پشتیبانی، کاربر می‌تواند به شکل خودکار به برگه نسبت داده شود
 TicketNumberingModules=واحد شماره‌دهی برگه‌های پشتیبانی
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=اطلاع‌رسانی به شخص‌سوم در هنگام ساخت
 TicketsDisableCustomerEmail=همواره در هنگامی که یک برگۀ‌پشتیبانی از طریق رابط عمومی ساخته می‌شود، قابلیت رایانامه غیرفعال شود
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=وضعیت تغییر پیدا کرد: %s به %s
 TicketNotNotifyTiersAtCreate=عدم اطلاع‌رسانی به شرکت در هنگام ساخت
 Unread=خوانده نشده
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/fa_IR/website.lang b/htdocs/langs/fa_IR/website.lang
index 3c1ada31ac4..5c5a464d39c 100644
--- a/htdocs/langs/fa_IR/website.lang
+++ b/htdocs/langs/fa_IR/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=صفحه
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/fa_IR/withdrawals.lang b/htdocs/langs/fa_IR/withdrawals.lang
index 5c0b517c19a..ec6d23c2c6b 100644
--- a/htdocs/langs/fa_IR/withdrawals.lang
+++ b/htdocs/langs/fa_IR/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=طبقه بندی اعتبار
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=انتخاب برای حالت واقعی تنظیم نشده بود، ما بعد از این شبیه سازی را متوقف کند
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/fa_IR/workflow.lang b/htdocs/langs/fa_IR/workflow.lang
index d3fc0934cf1..83ce4b446e4 100644
--- a/htdocs/langs/fa_IR/workflow.lang
+++ b/htdocs/langs/fa_IR/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index 2e529b15833..9b30fe43792 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=Tämä palvelu
 ThisProduct=Tämä tuote
 DefaultForService=Oletusarvo palvelulle
 DefaultForProduct=Oletusarvo tuotteelle
+ProductForThisThirdparty=Product for this thirdparty
+ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Ei ehdotuksia
 AccountancySetupDoneFromAccountancyMenu=Kirjanpidon asetukset tehdään pääasiassa valikosta %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -48,6 +50,7 @@ CountriesExceptMe=Kaikki maat, poislukien %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ NotVentilatedinAccount=Ei sidottu kirjanpitotilille
 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Päiväys
 Docref=Viite
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Päiväkirja
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Kirjattu pääkirjanpitoon
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Täsmäyttämätön
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -309,7 +317,7 @@ AccountingJournalType2=Myynti
 AccountingJournalType3=Ostot
 AccountingJournalType4=Pankki
 AccountingJournalType5=Expenses report
-AccountingJournalType8=Inventory
+AccountingJournalType8=Varasto
 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>
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 59cee45e755..1eda1356201 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -16,15 +16,15 @@ FileIntegrityIsOkButFilesWereAdded=Tiedostot ovat yhteneväisiä alkuperäisten
 FileIntegritySomeFilesWereRemovedOrModified=Asennus poikkeaa tavallisesta asennuksesta. Tiedostoja on muutettu/poistettu/lisätty.
 GlobalChecksum=Tarkistussumma
 MakeIntegrityAnalysisFrom=Tee eheysanalyysi sovellustiedostoista
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
+LocalSignature=Upotettu paikallinen allekirjoitus (vähemmän luotettava)
+RemoteSignature=Etäkauko-allekirjoitus (luotettavampi)
 FilesMissing=Puuttuvat Tiedostot
 FilesUpdated=Päivitetyt Tiedostot
 FilesModified=Muokatut Tiedostot
 FilesAdded=Lisätyt Tiedostot
 FileCheckDolibarr=Tarkasta sovellustiedostojen eheys
-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
+AvailableOnlyOnPackagedVersions=Paikallinen tiedosto eheystarkastusta varten on käytettävissä vain, kun sovellus on asennettu virallisesta paketista
+XmlNotFound=Xml eheystiedostoa sovellukselle ei löydy
 SessionId=Istunnon tunniste
 SessionSaveHandler=Istunnot tallentava käsittelijä
 SessionSavePath=Istuntojen tallennuskohde
@@ -37,12 +37,12 @@ UnlockNewSessions=Poista yhteyksien esto
 YourSession=Istuntosi
 Sessions=Käyttäjien istunnot
 WebUserGroup=Web-palvelimen käyttäjä / ryhmä
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
+PermissionsOnFilesInWebRoot=Verkon juurihakemiston tiedostojen käyttöoikeudet
+PermissionsOnFile=Tiedoston %s käyttöoikeudet
 NoSessionFound=PHP:n asetukset estävät aktiivisten istuntojen listaamisen. Istuntojen tallennushakemisto (<b>%s</b>) voi olla suojattu (Käyttöjärjestelmäoikeudet tai PHP: n open_basedir).
 DBStoringCharset=Tietokannan merkistö tietojen tallennukseen
 DBSortingCharset=Tietokannan merkistö tietojen lajitteluun
-HostCharset=Host charset
+HostCharset=Isännän merkistö
 ClientCharset=Clientin merkistö
 ClientSortingCharset=Clientin ulkoasu
 WarningModuleNotActive=<b>Moduuli %s</b> on oltava käytössä
@@ -56,6 +56,8 @@ GUISetup=Näyttö
 SetupArea=Asetukset
 UploadNewTemplate=Päivitä uusi pohja(t)
 FormToTestFileUploadForm=Lomake tiedostonlähetyksen testaamiseen (asetusten mukainen)
+ModuleMustBeEnabled=Moduulin / sovelluksen <b> %s </b> on oltava käytössä
+ModuleIsEnabled=Moduuli / sovellus <b> %s </b> on otettu käyttöön
 IfModuleEnabled=Huomaa: kyllä on tehokas vain, jos <b>moduuli %s</b> on käytössä
 RemoveLock=Mahdollistaaksesi Päivitys-/Asennustyökalun käytön, poista/nimeä uudelleen tarvittaessa tiedosto <b>%s</b>
 RestoreLock=Palauta tiedosto <b>%s</b> vain lukuoikeuksin. Tämä estää myöhemmän Päivitys-/Asennustyökalun käytön
@@ -69,23 +71,22 @@ Dictionary=Sanakirjat
 ErrorReservedTypeSystemSystemAuto=Arvot 'system' ja 'systemauto' ovat varattuja. Voit käyttää 'user' arvona lisääksesi sinun omaa recordia
 ErrorCodeCantContainZero=Koodi ei voi sisältää arvoa 0
 DisableJavascript=Poista JavaScript-ja Ajax toiminnot
-DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
+DisableJavascriptNote=Huomaa: Testaamista tai virheenkorjausta varten. Sokeiden tai tekstiselaimien optimoimiseksi saatat haluta käyttää käyttäjän profiilin asetuksia
+UseSearchToSelectCompanyTooltip=Myös jos sinulla on paljon kolmansia osapuolia (> 100 000), voit lisätä nopeutta asettamalla vakion COMPANY_DONOTSEARCH_ANYWHERE arvoksi 1 kohdassa Asetukset->Muut. Haku rajoitetaan sitten merkkijonon alkuun.
+UseSearchToSelectContactTooltip=Myös jos sinulla on paljon kolmansia osapuolia (> 100 000), voit lisätä nopeutta asettamalla vakion CONTACT_DONOTSEARCH_ANYWHERE arvoksi 1 kohdassa Asetukset-> Muut. Haku rajoitetaan sitten merkkijonon alkuun.
+DelaiedFullListToSelectCompany=Odota, kunnes näppäintä painetaan, ennen kuin lataat kolmansien osapuolten yhdistelmäluettelon sisällön. <br> Tämä voi parantaa suorituskykyä, jos sinulla on paljon kolmansia osapuolia, mutta se ei ole yhtä kätevää.
+DelaiedFullListToSelectContact=Odota, kunnes näppäintä painetaan, ennen kuin lataat yhteystietojen yhdistelmäluettelon sisältöä. <br> Tämä voi parantaa suorituskykyä, jos sinulla on paljon yhteystietoja, mutta se on vähemmän kätevää.
 NumberOfKeyToSearch=Haun aloittamiseksi tarvittavien merkkien määrä: %s
 NumberOfBytes=Tavujen lukumäärä
 SearchString=Haettava merkkijono
 NotAvailableWhenAjaxDisabled=Ei käytössä, kun Ajax poistettu käytöstä
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
+AllowToSelectProjectFromOtherCompany=Kolmannen osapuolen asiakirjalla voi valita toiseen kolmanteen osapuoleen linkitetyn projektin
 JavascriptDisabled=JavaScript ei käytössä
 UsePreviewTabs=Käytä esikatselu - välilehtiä
 ShowPreview=Näytä esikatselu
-ShowHideDetails=Show-Hide details
+ShowHideDetails=Näytä-piilota yksityiskohdat
 PreviewNotAvailable=Esikatselu ei ole käytettävissä
 ThemeCurrentlyActive=Aktiivinen teema
-CurrentTimeZone=Aikavyöhyke PHP (palvelin)
 MySQLTimeZone=Aikavyöhyke MySql (tietokanta)
 TZHasNoEffect=Päivämäärät talletetaan ja palautetaan siinä muodossa kuin ne on syötetty. Aikavyöhykkeellä on merkitystä ainoastaan käytettäessä UNIX_TIMESTAMP - funktiota. (Dolibarr ei käytä tätä, joten tietokannan aikavyöhykeellä ei ole vaikutusta vaikka se muuttuisi tietojen tallentamisen jälkeen)
 Space=Space
@@ -97,15 +98,15 @@ NextValue=Seuraava arvo
 NextValueForInvoices=Seuraava arvo (laskut)
 NextValueForCreditNotes=Seuraava arvo (hyvityslaskut)
 NextValueForDeposit=Seuraava arvo (osamaksu)
-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
+NextValueForReplacements=Seuraava arvo (korvaavat)
+MustBeLowerThanPHPLimit=Huomaa: PHP-kokoonpanosi rajoittaa tällä hetkellä lähetettävien tiedostojen enimmäiskokoa <b> %s </b> %s tämän parametrin arvosta riippumatta.
 NoMaxSizeByPHPLimit=Huom: Rajaa ei ole asetettu PHP-asetuksissa
 MaxSizeForUploadedFiles=Lähetettävien tiedostojen enimmäiskoko (0 estää lähetykset)
 UseCaptchaCode=Käytä graafista koodia (CAPTCHA) kirjautumissivulla
 AntiVirusCommand=Virustorjuntaohjelman polku
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusCommandExample=Esimerkki ClamAv-daemonille (vaatii clamav-daemonin): /usr/bin/clamdscan <br> Esimerkki ClamWinille (erittäin hidas): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Lisää parametreja komentorivillä
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Esimerkki ClamAv-daemonille: --fdpass <br> Esimerkki ClamWinille: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Kirjanpitomoduulin asetukset
 UserSetup=Käyttäjien hallinta-asetukset
 MultiCurrencySetup=Multi-valuutta asetukset
@@ -123,7 +124,7 @@ CurrentValueSeparatorDecimal=Desimaalierotin
 CurrentValueSeparatorThousand=Tuhatluvun erotin
 Destination=Kohde
 IdModule=Moduulin ID
-IdPermissions=Permissions ID
+IdPermissions=Käyttöoikeustunnus
 LanguageBrowserParameter=Parametri %s
 LocalisationDolibarrParameters=Lokalisaation parametrit
 ClientTZ=Asiakasohjelman aikavyöhyke (käyttäjä)
@@ -133,16 +134,16 @@ PHPTZ=PHP-palvelimen aikavyöhyke
 DaylingSavingTime=Kesäaika (käyttäjä)
 CurrentHour=PHP aika (palvelin)
 CurrentSessionTimeOut=Nykyisen istunnon aikakatkaisu
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a .htaccess file with a line like this "SetEnv TZ Europe/Paris"
-HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but of the timezone of the server.
+YouCanEditPHPTZ=Voit asettaa toisen PHP-aikavyöhykkeen (ei vaadita) lisäämällä .htaccess-tiedostoon rivi esim. "SetEnv TZ Europe / Paris"
+HoursOnThisPageAreOnServerTZ=Varoitus, toisin kuin muilla näytöillä lukee, tämän sivun aukioloajat eivät ole paikallista aikavyöhykettäsi, vaan palvelimen aikavyöhykettä.
 Box=Widget
 Boxes=Widgetit
 MaxNbOfLinesForBoxes=Maksimi rivimäärä Widgeteille
 AllWidgetsWereEnabled=Kaikki saatavilla olevat Widgetit on aktivoitu
 PositionByDefault=Oletusjärjestys
 Position=Sijainti
-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.
+MenusDesc=Valikkohallinnasta asetetaan kahden valikkorivin (vaaka- ja pystysuora) sisältö.
+MenusEditorDesc=Valikkomuokkaimen avulla voit määrittää mukautetut valikkomerkinnät. Käytä sitä varoen, jotta vältät epävakauden ja pysyvästi tavoittamattomissa olevat valikkomerkinnät. <br> Jotkut moduulit lisäävät valikkomerkinnät (valikossa <b> Kaikki </b> enimmäkseen). Jos poistat osan näistä merkinnöistä vahingossa, voit palauttaa ne poistamalla moduulin käytöstä ja ottamalla sen uudelleen käyttöön.
 MenuForUsers=Valikko käyttäjille
 LangFile=.lang - tiedosto
 Language_en_US_es_MX_etc=Kieliasetukset (en_US, fi_FI,...)
@@ -151,15 +152,15 @@ SystemInfo=Järjestelmän tiedot
 SystemToolsArea=Järjestelmätyökalut
 SystemToolsAreaDesc=Pääkäyttäjien toiminnot. Valitse valikosta haluttu ominaisuus
 Purge=Poista
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Poista väliaikaiset tiedostot
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
+PurgeAreaDesc=Tällä sivulla voit poistaa kaikki Dolibarrin luomat tai tallentamat tiedostot (väliaikaiset tiedostot tai kaikki tiedostot hakemistossa <b> %s </b>). Tämän ominaisuuden käyttäminen ei yleensä ole tarpeen. Se on kiertotapa käyttäjille, joiden Dolibarria isännöi palveluntarjoaja, joka ei tarjoa oikeuksia poistaa verkkopalvelimen luomia tiedostoja.
+PurgeDeleteLogFile=Poista lokitiedostot, mukaan lukien <b> %s </b>, joka on määritetty Syslog-moduulille (ei vaaraa menettää tietoja)
+PurgeDeleteTemporaryFiles=Poista kaikki loki- ja väliaikaiset tiedostot (ei vaaraa menettää tietoja). Huomaa: Väliaikaiset tiedostot poistetaan vain, jos temp-hakemisto luotiin yli 24 tuntia sitten.
+PurgeDeleteTemporaryFilesShort=Poista loki ja väliaikaiset tiedostot
+PurgeDeleteAllFilesInDocumentsDir=Poista kaikki tiedostot hakemistosta: <b> %s </b>. <br> Tämä poistaa kaikki luodut asiakirjat, jotka liittyvät elementteihin (kolmannet osapuolet, laskut jne.), ECM-moduuliin ladatut tiedostot, tietokannan varmuuskopiot ja väliaikaiset tiedostot.
 PurgeRunNow=Siivoa nyt
 PurgeNothingToDelete=Ei poistettavia hakemistoja tai tiedostoja.
 PurgeNDirectoriesDeleted=<b> %s</b> tiedostoa tai hakemistoa poistettu.
-PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
+PurgeNDirectoriesFailed=<b> %s </b> -tiedostojen tai hakemistojen poistaminen epäonnistui.
 PurgeAuditEvents=Poista kaikki tietoturvatapahtumat
 ConfirmPurgeAuditEvents=Haluatko varmasti poistaa kaikki tietoturvatapahtumat? Kaikki tietoturvalokit tyhjennetään, muuta dataa ei poisteta.
 GenerateBackup=Luo varmuuskopio
@@ -173,20 +174,20 @@ NoBackupFileAvailable=Varmuuskopioita ei saatavilla
 ExportMethod=Viennin menetelmä
 ImportMethod=Tuonnin menetelmä
 ToBuildBackupFileClickHere=Varmuuskopion luonti, paina <a href="%s">tästä</a>
-ImportMySqlDesc=To import a MySQL backup file, you may use phpMyAdmin via your hosting or use the mysql command from the Command line.<br>For example:
+ImportMySqlDesc=Jos haluat tuoda MySQL-varmuuskopiotiedoston, voit käyttää phpMyAdminia isännän kautta tai käyttää mysql-komentoa komentoriviltä. <br> Esimerkiksi:
 ImportPostgreSqlDesc=Tuodaksesi varmuuskopio-tiedoston, sinun täytyy käyttää pg_restore komentoa komentoriviltä:
 ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
 FileNameToGenerate=Varmuuskopion tiedostonimi:
 Compression=Pakkaus
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
+CommandsToDisableForeignKeysForImport=Komento, jolla estetään vieraiden avainten tuonti
+CommandsToDisableForeignKeysForImportWarning=Pakollinen, jos haluat pystyä palauttamaan sql-dumpin myöhemmin
 ExportCompatibility=Luodun vientitiedoston yhteensopivuus
-ExportUseMySQLQuickParameter=Use the --quick parameter
-ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
+ExportUseMySQLQuickParameter=Käytä parametria --quick
+ExportUseMySQLQuickParameterHelp=Parametri '--quick' auttaa rajoittamaan RAM-muistin kulutusta suurissa tauluissa.
 MySqlExportParameters=MySQL-viennin parametrit
 PostgreSqlExportParameters= PostgreSQL-viennin parametrit
-UseTransactionnalMode=Use transactional mode
+UseTransactionnalMode=Käytä transaktiotilaa
 FullPathToMysqldumpCommand=mysqldump-komennon polku
 FullPathToPostgreSQLdumpCommand=pg_dump-komennon polku
 AddDropDatabase=Lisää 'DROP DATABASE' - komento
@@ -194,39 +195,39 @@ AddDropTable=Lisää 'DROP TABLE' - komento
 ExportStructure=Rakenne
 NameColumn=Nimisarakkeet
 ExtendedInsert=Laajennettu INSERT
-NoLockBeforeInsert=No lock commands around INSERT
+NoLockBeforeInsert=INSERT-alueella ei ole lukituskomentoja
 DelayedInsert=Viivästetty lisäys
 EncodeBinariesInHexa=Koodaa binääridata heksadesimaaleina
 IgnoreDuplicateRecords=Ohita duplikaattitietuevirheet (INSERT IGNORE)
 AutoDetectLang=Automaattitunnistus (selaimen kieli)
 FeatureDisabledInDemo=Ominaisuus on poistettu käytöstä demossa
 FeatureAvailableOnlyOnStable=Ominaisuus käytettävissä vain virallisissa vakaissa versioissa
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
+BoxesDesc=Widgetit ovat komponentteja, jotka näyttävät joitain tietoja, jotka voit lisätä joidenkin sivujen mukauttamiseksi. Voit valita, näytetäänkö widget vai ei, valitsemalla kohdesivun ja napsauttamalla Aktivoi tai napsauttamalla roskakoria poistaaksesi sen käytöstä.
+OnlyActiveElementsAreShown=Vain <a href="%s">-yhteensopivien moduulien </a> elementit näytetään.
+ModulesDesc=Moduulit / sovellukset määrittävät ohjelmistossa käytettävissä olevat ominaisuudet. Jotkut moduulit edellyttävät oikeuksien myöntämistä käyttäjille moduulin aktivoinnin jälkeen. Napsauta kunkin moduulin virtapainiketta <span class="small valignmiddle"> %s </span>, jos haluat ottaa moduulin / sovelluksen käyttöön tai poistaa sen käytöstä.
+ModulesMarketPlaceDesc=Löydät lisää moduuleja ladattavaksi ulkoisilta verkkosivustoilta Internetistä ...
+ModulesDeployDesc=Jos tiedostojärjestelmän käyttöoikeudet sen sallivat, voit käyttää tätä työkalua ulkoisen moduulin asentamiseen. Moduuli on tämän jälkeen näkyvissä välilehdellä <strong> %s </strong>.
 ModulesMarketPlaces=Etsi ulkoisia sovelluksia/moduuleja
 ModulesDevelopYourModule=Luo oma sovellus/moduuli
-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
+ModulesDevelopDesc=Voit myös kehittää oman moduulin tai etsiä kumppanin kehittämään sinulle.
+DOLISTOREdescriptionLong=Sen sijaan, että ottaisit ulkoisen moduulin käyttöön, <a href="https://www.dolistore.com"> www.dolistore.com </a> -sivustosta, voit käyttää tätä sulautettua työkalua, joka suorittaa haun ulkoisella kauppapaikalla (saattaa olla hidasta, tarvitsee Internet-yhteyden) ...
+NewModule=Uusi moduuli
 FreeModule=Ilmainen
 CompatibleUpTo=Yhteensopiva version %s kanssa
 NotCompatible=Moduuli ei ole yhteensopiva Dolibarr - version %s kanssa. (Min %s -  Max %s)
 CompatibleAfterUpdate=Moduuli vaatii Dolibarr - version %s päivittämisen. (Min %s - Max %s)
-SeeInMarkerPlace=See in Market place
-SeeSetupOfModule=See setup of module %s
+SeeInMarkerPlace=Katso kauppapaikalla
+SeeSetupOfModule=Katso moduulin %s asetukset
 Updated=Päivitetty
-Nouveauté=Novelty
+Nouveauté=Uutuus
 AchatTelechargement=Osta / Lataa
-GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
+GoModuleSetupArea=Voit ottaa uuden moduulin käyttöön tai asentaa sen siirtymällä moduulin asennusalueelle: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore, virallinen markkinapaikka Dolibarr ERP / CRM lisäosille
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
-WebSiteDesc=External websites for more add-on (non-core) modules...
-DevelopYourModuleDesc=Some solutions to develop your own module...
+DoliPartnersDesc=Luettelo yrityksistä, jotka tarjoavat räätälöityjä moduuleja tai ominaisuuksia. <br> Huomaa: Koska Dolibarr on avoimen lähdekoodin sovellus, <i> kenen tahansa </i>: lla, jolla on kokemusta PHP-ohjelmoinnista, pitäisi pystyä kehittämään moduuli.
+WebSiteDesc=Ulkoiset verkkosivustot, joista löytyy lisää moduuleja (ei ydin) ...
+DevelopYourModuleDesc=Joitakin ratkaisuja oman moduulin kehittämiseen ...
 URL=Osoite
-RelativeURL=Relative URL
+RelativeURL=Suhteellinen URL
 BoxesAvailable=Widgetit saatavilla
 BoxesActivated=Widget aktivoitu
 ActivateOn=Aktivoi
@@ -237,65 +238,66 @@ Required=Vaadittu
 UsedOnlyWithTypeOption=Käytössä vain jossain Kalenterin asetuksissa
 Security=Turvallisuus
 Passwords=Salasanat
-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.
+DoNotStoreClearPassword=Salaa tietokantaan tallennetut salasanat (EI pelkkänä tekstinä). On erittäin suositeltavaa aktivoida tämä vaihtoehto.
+MainDbPasswordFileConfEncrypted=Salaa conf.php-tiedostoon tallennettu tietokannan salasana. On erittäin suositeltavaa aktivoida tämä vaihtoehto.
+InstrucToEncodePass=Jos haluat salasanan koodatuksi <b> conf.php </b> -tiedostoon, korvaa rivi <br> <b> $ dolibarr_main_db_pass = "..."; </b> <br> seuraavalla: <br> <b> $ dolibarr_main_db_pass = "crypted: %s"; </b>
+InstrucToClearPass=Jos haluat salasanan purettuna (selkeäkielisenä) <b> conf.php </b> -tiedostoon, korvaa rivi <br> <b> $ dolibarr_main_db_pass = "crypted: ..."; </b> <br> seuraavalla: <br> <b> $ dolibarr_main_db_pass = "%s"; </b>
+ProtectAndEncryptPdfFiles=Suojaa luotuja PDF-tiedostoja. Tätä EI suositella, koska se rikkoo PDF-tiedostojen joukkotuotannon.
+ProtectAndEncryptPdfFilesDesc=PDF-asiakirjan suojaus pitää sen saatavilla lukemista ja tulostusta varten millä tahansa PDF-selaimella. Muokkaus ja kopiointi ei kuitenkaan ole enää mahdollista. Huomaa, että tämän ominaisuuden käyttäminen ei tue globaalien yhdistettyjen PDF-tiedostojen luomista.
 Feature=Ominaisuus
 DolibarrLicense=Lisenssi
 Developpers=Kehittäjät/vapaaehtoiset
 OfficialWebSite=Dolibarr: in virallinen www-sivu
-OfficialWebSiteLocal=Local web site (%s)
+OfficialWebSiteLocal=Paikallinen verkkosivusto (%s)
 OfficialWiki=Dolibarr:in dokumentit / Wiki
 OfficialDemo=Dolibarr online-demo
 OfficialMarketPlace=Ulkoisten moduulien/lisäosien kauppa
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
+OfficialWebHostingService=Viitatut verkkopalvelut (pilvipalvelut)
+ReferencedPreferredPartners=Ensisijaiset kumppanit
 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>
-HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
-HelpCenterDesc2=Some of these resources are only available in <b>english</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
 MeasuringUnit=Mittayksikkö
 LeftMargin=Vasen marginaali
 TopMargin=Ylämarginaali
 PaperSize=Paperin koko
 Orientation=Orientaatio
-SpaceX=Space X
-SpaceY=Space Y
+SpaceX=Tila X
+SpaceY=Tila Y
 FontSize=Fontin koko
 Content=Sisällys
-NoticePeriod=Notice period
-NewByMonth=New by month
+NoticePeriod=Huomautusaika
+NewByMonth=Uusi kuukausittain
 Emails=Sähköpostit
 EMailsSetup=Sähköpostien asetukset
-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>)
+EMailsDesc=Tällä sivulla voit asettaa parametreja tai vaihtoehtoja sähköpostin lähettämiselle.
+EmailSenderProfiles=Sähköpostin lähettäjien profiilit
+EMailsSenderProfileDesc=Voit pitää tämän osan tyhjänä. Jos kirjoitat joitain sähköposteja tähän, ne lisätään mahdollisten lähettäjien luetteloon yhdistelmäruutuun, kun kirjoitat uutta sähköpostia.
+MAIN_MAIL_SMTP_PORT=SMTP / SMTPS-portti (oletusarvo php.ini-tiedostossa: <b> %s </b>)
+MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS-isäntä (oletusarvo php.ini-tiedostossa: <b> %s </b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Portti (Ei määritelty PHP:hen Unix-tyyppisissä järjestelmissä)
-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_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS-isäntä (ei määritelty PHP:ssa Unix-tyyppisissä järjestelmissä)
+MAIN_MAIL_EMAIL_FROM=Lähettäjän sähköposti automaattisia sähköposteja varten (oletusarvo php.ini: <b> %s </b>)
+MAIN_MAIL_ERRORS_TO=Sähköpostiosoite, jota käytetään virheellisten sähköpostien palautusosoitteena (kentät Errors-To lähetetyissä sähköposteissa)
+MAIN_MAIL_AUTOCOPY_TO= Kopioi (piilokopio) kaikki lähetetyt sähköpostit osoitteeseen
+MAIN_DISABLE_ALL_MAILS=Poista kaikki sähköpostin lähettäminen käytöstä (testitarkoituksia tai esittelyjä varten)
+MAIN_MAIL_FORCE_SENDTO=Lähetä kaikki sähköpostit (todellisten vastaanottajien sijasta testitarkoituksiin)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Ehdota työntekijöiden sähköposteja (jos määritelty) ennalta määritettyjen vastaanottajien luetteloon uutta sähköpostia kirjoittaessasi
 MAIN_MAIL_SENDMODE=Sähköpostin lähetystapa
-MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
-MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
+MAIN_MAIL_SMTPS_ID=SMTP-tunnus (jos lähettävä palvelin vaatii todennuksen)
+MAIN_MAIL_SMTPS_PW=SMTP-salasana (jos lähettävä palvelin vaatii todennuksen)
 MAIN_MAIL_EMAIL_TLS=TLS (SSL) - salaus
 MAIN_MAIL_EMAIL_STARTTLS=TLS (STARTTLS) - salaus
 MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Käytä DKIM:iä sähköpostin allekirjoituksen luontiin
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=DKIM:in kanssa käytetty sähköpostidomain
-MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Dkim-valitsimen nimi
 MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Henkilökohtainen avain DKIM-allekirjoitukseen
 MAIN_DISABLE_ALL_SMS=Poista SMS-viestit käytöstä (testitarkoituksessa tai demossa)
 MAIN_SMS_SENDMODE=SMS-viestien lähetystapa
@@ -304,9 +306,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Oletussähköpostiosoite käsin lähetettäessä (Kä
 UserEmail=Käyttäjän sähköposti
 CompanyEmail=Yrityksen sähköposti
 FeatureNotAvailableOnLinux=Ominaisuus ei ole Unix-koneissa. Testaa sendmail ohjelmaa paikallisesti.
-FixOnTransifex=Fix the translation on the online translation platform of project
-SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
+FixOnTransifex=Korjaa käännös projektin online-käännösalustalla
+SubmitTranslation=Jos tämän kielen käännös ei ole täydellinen tai löydät virheitä, voit korjata tämän muokkaamalla tiedostoja hakemistossa <b> langs / %s </b> ja lähettämällä muutoksesi osoitteeseen www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=Jos tämän kielen käännös ei ole täydellinen tai löydät virheitä, voit korjata tämän muokkaamalla tiedostoja hakemistoon <b> langs / %s </b> ja lähettämällä muokatut tiedostot osoitteeseen dolibarr.org/forum tai, jos olet kehittäjä, PR:llä osoitteessa github.com/Dolibarr/dolibarr
 ModuleSetup=Moduuli asetukset
 ModulesSetup=Moduulit/Applikaatio asetukset
 ModuleFamilyBase=Järjestelmä
@@ -326,22 +328,22 @@ MenuHandlers=Valikko käsitteleville
 MenuAdmin=Valikkoeditori
 DoNotUseInProduction=Älä käytä tuotannossa
 ThisIsProcessToFollow=Päivitysmenetelmä:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+ThisIsAlternativeProcessToFollow=Tämä on vaihtoehtoinen asetus manuaaliseen käsittelyyn:
 StepNb=Vaihe %s
-FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
-DownloadPackageFromWebSite=Download package (for example from the official web site %s).
-UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
-SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
-NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
-InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=You can upload the .zip file of module package from here:
+FindPackageFromWebSite=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>
+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>
+InfDirExample= <br> Sitten määrittele se tiedostossa <strong> conf.php </strong> <br> $dolibarr_main_url_root_alt='/custom' <br> $dolibarr_main_document_root_alt='/asennuspolun/sijainti/Dolibarr/htdocs/custom' <br> Jos nämä rivit on kommentoitu "#"-merkillä, ottaaksesi nämä käyttöön, poista kommentti poistamalla "#"-merkki rivin alusta.
+YouCanSubmitFile=Voit ladata moduulipaketin .zip-tiedoston täältä:
 CurrentVersion=Dolibarr nykyinen versio
-CallUpdatePage=Browse to the page that updates the database structure and data: %s.
+CallUpdatePage=Siirry sivulle, joka päivittää tietokannan rakenteen ja tiedot: %s.
 LastStableVersion=Viimeisin vakaa versio
-LastActivationDate=Latest activation date
-LastActivationAuthor=Latest activation author
+LastActivationDate=Viimeisin aktivointipäivä
+LastActivationAuthor=Viimeisin taho, joka on suorittanut aktivoinnin
 LastActivationIP=Viimeinen aktiivinen IP
 UpdateServerOffline=Palvelimen offline-päivitys
 WithCounter=Laskurin hallinta
@@ -358,7 +360,7 @@ ServerNotAvailableOnIPOrPort=Palvelin ei ole käytettävissä <b>osoitteessa %s
 DoTestServerAvailability=Testaa palvelinyhteys
 DoTestSend=Testaa lähetys
 DoTestSendHTML=Testaa HTML:n lähettäminen
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
+ErrorCantUseRazIfNoYearInMask=Virhe, ei voi käyttää vaihtoehtoa @ laskurin nollaamiseen vuosittain, jos jaksoa {yy} tai {yyyy} ei ole maskissa.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Virhe ei voi käyttäjä vaihtoehto @ jos SEQUENCE (yy) (mm) tai (vvvv) (mm) ei mask.
 UMask=UMask parametri uusia tiedostoja Unix / Linux / BSD-tiedostojärjestelmää.
 UMaskExplanation=Tämän parametrin avulla voit määrittää käyttöoikeudet asettaa oletuksena tiedostoja luotu Dolibarr palvelimelle (aikana ladata esimerkiksi). <br> Se on oktaali-arvo (esim. 0666 tarkoittaa, lukea ja kirjoittaa kaikki). <br> Ce paramtre ne Sert pas sous un serveur Windows.
@@ -366,56 +368,56 @@ SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and th
 UseACacheDelay= Viive cashing vienti vastehuippu sekuntia (0 tai tyhjä ei välimuisti)
 DisableLinkToHelpCenter=Piilota linkki <b>"Tarvitsetko apua tai tukea"</b> on kirjautumissivulla
 DisableLinkToHelp=Piilota linkki online apuun "<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...).
+AddCRIfTooLong=Automaattista tekstin rivitystä ei ole, liian pitkä teksti ei näy asiakirjoissa. Lisää tarvittaessa teksti-alueelle rivinvaihto.
+ConfirmPurge=Haluatko varmasti suorittaa tämän puhdistuksen? <br> Tämä poistaa kaikki datatiedostosi pysyvästi, eikä niitä voi palauttaa (ECM-tiedostot, liitetyt tiedostot ...).
 MinLength=Vähimmäispituus
 LanguageFilesCachedIntoShmopSharedMemory=.lang - tiedostot ladattu muistiin
 LanguageFile=Kielitiedosto
-ExamplesWithCurrentSetup=Examples with current configuration
+ExamplesWithCurrentSetup=Esimerkkejä nykyisestä kokoonpanosta
 ListOfDirectories=Luettelo OpenDocument malleja hakemistoja
-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=Esimerkkejä syntaksin: <br> c: \\ mydir <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ListOfDirectoriesForModelGenODT=Luettelo hakemistoista, jotka sisältävät mallitiedostoja OpenDocument-muodossa. <br> <br> Laita tähän hakemistojen täydellinen polku. <br> Lisää rivinvaihto eah-hakemiston välillä. <br> Jos haluat lisätä GED-moduulin hakemiston, lisää tähän <b> DOL_DATA_ROOT/ecm/sinunhakemistonnimi </b>. <br> <br> Näissä hakemistoissa olevien tiedostojen on lopputtava <b> .odt </b> tai <b> .ods </b>.
+NumberOfModelFilesFound=Näistä hakemistoista löydettyjen ODT / ODS-mallitiedostojen määrä
+ExampleOfDirectoriesForModelGen=Esimerkkejä syntaksista: <br> c:\\myapp\\mydocumentdir\\mysubdir <br> /home/myapp/mydocumentdir/mysubdir <br> DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Jos haluat tietää, miten voit luoda odt asiakirjamalleja, ennen kuin laitat ne näistä hakemistoista, lue wiki dokumentaatio:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Etunimi/Sukunimi - sijainti
 DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values:
 KeyForWebServicesAccess=Avain käyttää Web Services (parametri &quot;dolibarrkey&quot; in WebServices)
 TestSubmitForm=Tulo testi lomake
-ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever the user choice. Also this menu manager specialized for smartphones does not work on all smartphone. Use another menu manager if you experience problems with yours.
+ThisForceAlsoTheme=Tämän valikkohallinnan käyttäminen käyttää myös omaa teemaansa käyttäjän valinnasta riippumatta. Tämä älypuhelimille tarkoitettu valikkohallinta ei välttämättä toimi kaikissa älypuhelimissa. Käytä toista valikonhallintaohjelmaa, jos sinulla on ongelmia omasi kanssa.
 ThemeDir=Skins hakemisto
 ConnectionTimeout=Yhteyden aikakatkaisu
 ResponseTimeout=Vastauksen aikakatkaisu
 SmsTestMessage=Test viesti __ PHONEFROM__ ja __ PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
+ModuleMustBeEnabledFirst=Moduuli <b> %s </b> on ensin otettava käyttöön, jos tarvitset tätä ominaisuutta.
 SecurityToken=Avain turvallinen URL
-NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
+NoSmsEngine=Ei tekstiviestien lähettäjien hallintaa. Tekstiviestien lähettäjien hallintaa ei ole asennettu oletusjakelun kanssa, koska ne riippuvat ulkoisesta toimittajasta, mutta joitain löydät osoitteesta %s
 PDF=PDF
-PDFDesc=Global options for PDF generation
-PDFAddressForging=Rules for address section
+PDFDesc=Globaalit vaihtoehdot PDF-tiedostojen luomista varten
+PDFAddressForging=Osoiteosuuden säännöt
 HideAnyVATInformationOnPDF=Piilota kaikki myyntiveroihin/ALViin liittyvä tieto
-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
+PDFRulesForSalesTax=Myyntiveron / alv:n säännöt
+PDFLocaltax=Säännöt %s: lle
+HideLocalTaxOnPDF=Piilota %s-taksa sarakkeessa Myyntivero / ALV
+HideDescOnPDF=Piilota tuotekuvaus
+HideRefOnPDF=Piilota tuotteiden viite
+HideDetailsOnPDF=Piilota tuoterivien tiedot
+PlaceCustomerAddressToIsoLocation=Käytä ranskan vakioasemaa (La Poste) asiakasosoitteen sijaintiin
 Library=Kirjasto
 UrlGenerationParameters=Parametrit turvata URL
 SecurityTokenIsUnique=Käytä ainutlaatuinen securekey parametri jokaiselle URL
 EnterRefToBuildUrl=Kirjoita viittaus objektin %s
 GetSecuredUrl=Hanki lasketaan URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Piilota luvattomat toimintopainikkeet myös sisäisille käyttäjille (muuten harmaat)
 OldVATRates=Vanha ALV-prosentti
 NewVATRates=Uusi ALV-prosentti
-PriceBaseTypeToChange=Modify on prices with base reference value defined on
+PriceBaseTypeToChange=Muuta hintoja, joiden perusviitearvo on määritelty
 MassConvert=Käynnistä massamuutos
-PriceFormatInCurrentLanguage=Price Format In Current Language
+PriceFormatInCurrentLanguage=Hintamuoto nykyisellä kielellä
 String=Merkkijono
-String1Line=String (1 line)
+String1Line=Merkkijono (1 rivi)
 TextLong=Pitkä teksti
-TextLongNLines=Long text (n lines)
+TextLongNLines=Pitkä teksti (n riviä)
 HtmlText=Html teksti
 Int=Kokonaisluku
 Float=Liukuluku
@@ -430,18 +432,18 @@ ExtrafieldSelect = Valitse lista
 ExtrafieldSelectList = Valitse taulusta
 ExtrafieldSeparator=Erotin (ei kenttä)
 ExtrafieldPassword=Salasana
-ExtrafieldRadio=Radio buttons (one choice only)
+ExtrafieldRadio=Radiopainikkeet (vain yksi valinta)
 ExtrafieldCheckBox=Valintaruudut
-ExtrafieldCheckBoxFromList=Checkboxes from table
-ExtrafieldLink=Link to an object
-ComputedFormula=Computed field
+ExtrafieldCheckBoxFromList=Valintaruudut taulusta
+ExtrafieldLink=Linkki objektiin
+ComputedFormula=Laskettu kenttä
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
-Computedpersistent=Store computed field
-ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
-ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
+Computedpersistent=Tallenna laskettu kenttä
+ComputedpersistentDesc=Lasketut ylimääräiset kentät tallennetaan tietokantaan, mutta arvo lasketaan uudelleen vasta, kun tämän kentän kohdetta muutetaan. Jos laskettu kenttä riippuu muista kohteista tai globaaleista tiedoista, tämä arvo saattaa olla väärä!!
+ExtrafieldParamHelpPassword=Jos jätät tämän kentän tyhjäksi, tämä arvo tallennetaan ilman salausta (kenttä on piilotettava vain tähdellä näytöllä). <br> Aseta 'auto' käyttämään oletussalaussääntöä salasanan tallentamiseksi tietokantaan (silloin luettu arvo on vain hash, ei mitään tapaa hakea alkuperäistä arvoa)
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpcheckbox=Arvoluettelon on oltava rivejä, joissa on muoto: avain,arvo (missä avain ei voi olla 0) <br> <br> esimerkiksi: <br> 1,arvo1 <br> 2,arvo2 <br> 3,arvo3 <br> ...
+ExtrafieldParamHelpradio=Arvoluettelon on oltava rivejä, joissa on muoto: avain,arvo (missä avain ei voi olla 0) <br> <br> esimerkiksi: <br> 1,arvo1 <br> 2,arvo2 <br> 3,arvo3 <br> ...
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
@@ -449,34 +451,34 @@ ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1
 LibraryToBuildPDF=Käytettävä kirjasto PDF:n luomiseen
 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=Tekstiviesti
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
+LinkToTestClickToDial=Anna puhelinnumero, johon haluat soittaa, jotta saat linkin testata käyttäjän ClickToDial-URL-osoitetta <strong> %s </strong>
 RefreshPhoneLink=Päivitä linkki
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
+LinkToTest=Napsautettava linkki luotu käyttäjälle <strong> %s </strong> (testaa napsauttamalla puhelinnumeroa)
 KeepEmptyToUseDefault=Pidä tyhjänä käyttääksesi oletusarvoa
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
+KeepThisEmptyInMostCases=Useimmissa tapauksissa voit pitää tämän kentän tyhjänä.
 DefaultLink=Oletuslinkki
 SetAsDefault=Aseta oletukseksi
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module
-InstalledInto=Installed into directory %s
+ValueOverwrittenByUserSetup=Varoitus, käyttäjäkohtainen asennus voi korvata tämän arvon (jokainen käyttäjä voi asettaa oman clicktodial-URL-osoitteen)
+ExternalModule=Ulkoinen moduuli
+InstalledInto=Asennettu hakemistoon %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=Poista kaikki nykyiset viivakoodi arvot
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
+ConfirmEraseAllCurrentBarCode=Haluatko varmasti poistaa kaikki nykyiset viivakoodiarvot?
 AllBarcodeReset=Kaikki viivakoodi arvot on poistettu
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
+NoBarcodeNumberingTemplateDefined=Viivakoodimallin numerointia ei ole otettu käyttöön viivakoodimoduulin asetuksissa.
 EnableFileCache=Enable file cache
-ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
-NoDetails=No additional details in footer
+ShowDetailsInPDFPageFoot=Lisää alatunnisteeseen lisätietoja, kuten yrityksen osoite tai esimiehen nimi (ammattitunnusten, yrityksen pääoman ja ALV-numeron lisäksi).
+NoDetails=Alatunnisteessa ei ole lisätietoja
 DisplayCompanyInfo=Näytä yrityksen osoitetiedot
-DisplayCompanyManagers=Display manager names
+DisplayCompanyManagers=Näytä managerien nimet
 DisplayCompanyInfoAndManagers=Näytä yrityksen osoite ja päälliköiden nimet
 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.
+ModuleCompanyCodePanicum=Palauta tyhjä kirjanpitokoodi.
 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.
@@ -491,26 +493,26 @@ WarningPHPMail2=If your email SMTP provider need to restrict email client to som
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Klikkaa näyttääksesi kuvaus
 DependsOn=Tämä moduuli tarvitsee moduulit
-RequiredBy=This module is required by module(s)
+RequiredBy=Moduuli (t) vaativat tämän moduulin
 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
+EnableDefaultValues=Ota käyttöön oletusarvojen mukauttaminen
+EnableOverwriteTranslation=Salli ylikirjoitettujen käännösten käyttäminen
 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=Kenttä
-ProductDocumentTemplates=Document templates to generate product document
-FreeLegalTextOnExpenseReports=Free legal text on expense reports
-WatermarkOnDraftExpenseReports=Watermark on draft expense reports
-AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
+ProductDocumentTemplates=Asiakirjamallit tuotedokumentin luomiseksi
+FreeLegalTextOnExpenseReports=Ilmainen lakiteksti kuluraporteissa
+WatermarkOnDraftExpenseReports=Vesileima kuluraporttiluonnoksissa
+AttachMainDocByDefault=Määritä tämä arvoksi 1, jos haluat liittää pääasiakirjan oletuksena sähköpostiin (jos käytettävissä)
 FilesAttachedToEmail=Liitä tiedosto
 SendEmailsReminders=Lähetä asialista muistutus sähköpostilla
 davDescription=WebDAV-palvelimen asetukset
 DAVSetup=DAV-moduulin asetukset
-DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
+DAV_ALLOW_PRIVATE_DIR=Ota käyttöön yleinen yksityinen hakemisto (WebDAV: n oma hakemisto nimeltä "yksityinen" - vaaditaan sisäänkirjautuminen)
 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).
@@ -519,26 +521,26 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade
 # Modules
 Module0Name=Käyttäjät & ryhmät
 Module0Desc=Käyttäjien / Työntekijöiden ja ryhmien hallinta
-Module1Name=Third Parties
-Module1Desc=Companies and contacts management (customers, prospects...)
+Module1Name=Kolmannet osapuolet
+Module1Desc=Yritysten ja kontaktien hallinta (asiakkaat, potentiaaliset asiakkaat ...)
 Module2Name=Kaupalliset
 Module2Desc=Kaupallinen hallinnointi
 Module10Name=Kirjanpito (yksinkertainen)
-Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
+Module10Desc=Yksinkertaiset kirjanpitoraportit (päiväkirjat, liikevaihto) tietokannan sisällön perusteella. Ei käytä mitään kirjanpitotaulukkoa.
 Module20Name=Ehdotukset
 Module20Desc=Kaupalliset ehdotuksia hallinto -
-Module22Name=Mass Emailings
+Module22Name=Joukkoviestit
 Module22Desc=Manage bulk emailing
 Module23Name=Energia
 Module23Desc=Energiakulutuksen seuranta
 Module25Name=Myyntitilaukset
 Module25Desc=Asiakastilausten hallinnointi
 Module30Name=Laskut
-Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
+Module30Desc=Asiakkaiden laskujen ja hyvityslaskujen hallinta. Tavarantoimittajien laskujen ja hyvityslaskujen hallinta
 Module40Name=Toimittajat
-Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
+Module40Desc=Toimittajien ja ostojen hallinta (ostotilaukset ja toimittajien laskutus)
 Module42Name=Debug Logit
-Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
+Module42Desc=Kirjaustoiminnot (tiedosto, syslog, ...). Tällaiset lokit ovat teknisiä/virheenkorjaustarkoituksia varten.
 Module49Name=Toimitus
 Module49Desc=Editors' hallinta
 Module50Name=Tuotteet
@@ -550,27 +552,27 @@ Module52Desc=Varastonhallinta
 Module53Name=Palvelut
 Module53Desc=Palvelunhallinta
 Module54Name=Sopimukset/Tilaukset
-Module54Desc=Management of contracts (services or recurring subscriptions)
+Module54Desc=Sopimusten hallinta (palvelut tai toistuvat tilaukset)
 Module55Name=Viivakoodit
 Module55Desc=Viivakoodien hallinta
-Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Payments by Direct Debit
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
+Module56Name=Maksu tilisiirrolla
+Module56Desc=Toimittajien maksujen hallinta tilisiirtotilauksilla. Se sisältää SEPA-tiedoston luomisen Euroopan maille.
+Module57Name=Maksut suoraveloituksella
+Module57Desc=Suoraveloitusmääräysten hallinta. Se sisältää SEPA-tiedoston luomisen Euroopan maille.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial yhdentyminen
-Module60Name=Stickers
-Module60Desc=Management of stickers
+Module60Name=Tarrat
+Module60Desc=Tarrojen hallinta
 Module70Name=Interventions
 Module70Desc=Interventions hallinto
 Module75Name=Kulut ja matka muistiinpanot
 Module75Desc=Kulut ja matkat muistiinpanojen hallinnointi
 Module80Name=Lähetykset
-Module80Desc=Shipments and delivery note management
+Module80Desc=Lähetykset ja lähetysluetteloiden hallinta
 Module85Name=Pankkitilit ja käteisvarat
 Module85Desc=Pankkitilien ja käteistilien hallinnointi
 Module100Name=Ulkoinen sivusto
-Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module100Desc=Lisää linkki ulkoiseen verkkosivustoon päävalikkokuvakkeena. Verkkosivusto näkyy kehyksessä ylävalikossa.
 Module105Name=Mailman ja SIP
 Module105Desc=Mailman tai spip liitäntä jäsen moduuli
 Module200Name=LDAP
@@ -578,20 +580,20 @@ Module200Desc=LDAP-hakemiston synkronointi
 Module210Name=PostNuke
 Module210Desc=PostNuke yhdentyminen
 Module240Name=Tietojen vienti
-Module240Desc=Tool to export Dolibarr data (with assistance)
+Module240Desc=Työkalu Dolibarr-tietojen viemiseen (avustuksella)
 Module250Name=Tietojen tuonti
-Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module250Desc=Työkalu tietojen tuomiseen Dolibarriin (avustuksella)
 Module310Name=Jäsenet
 Module310Desc=Säätiön jäsenten hallintaan
 Module320Name=RSS-syöte
-Module320Desc=Add a RSS feed to Dolibarr pages
-Module330Name=Bookmarks & Shortcuts
-Module330Desc=Create shortcuts, always accessible, to the internal or external pages to which you frequently access
-Module400Name=Projects or Leads
+Module320Desc=Lisää RSS-syöte Dolibarr-sivuille
+Module330Name=Kirjanmerkit ja pikavalinnat
+Module330Desc=Luo aina käytettävissä olevia pikakuvakkeita sisäisille tai ulkoisille sivuille, joilla käyt usein
+Module400Name=Projektit tai liidit
 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 yhdentyminen
-Module500Name=Taxes & Special Expenses
+Module500Name=Verot ja erityiskustannukset
 Module500Desc=Management of other expenses (sale taxes, social or fiscal taxes, dividends, ...)
 Module510Name=Palkat
 Module510Desc=Record and track employee payments
@@ -600,14 +602,14 @@ Module520Desc=Lainojen hallinnointi
 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
+Module610Name=Tuotevaihtoehdot
 Module610Desc=Creation of product variants (color, size etc.)
 Module700Name=Lahjoitukset
 Module700Desc=Lahjoituksien hallinnointi
-Module770Name=Expense Reports
+Module770Name=Kuluraportit
 Module770Desc=Manage expense reports claims (transportation, meal, ...)
-Module1120Name=Vendor Commercial Proposals
-Module1120Desc=Request vendor commercial proposal and prices
+Module1120Name=Toimittajan kaupalliset ehdotukset
+Module1120Desc=Pyydä myyjän kaupallista ehdotusta ja hintoja
 Module1200Name=Mantis
 Module1200Desc=Mantis yhdentyminen
 Module1520Name=Dokumentin luonti
@@ -615,7 +617,7 @@ Module1520Desc=Mass email document generation
 Module1780Name=Merkit/Kategoriat
 Module1780Desc=Luo merkki/kategoria (tuotteet, asiakkaat, toimittajat, kontaktit tai jäsenet)
 Module2000Name=FCKeditor
-Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
+Module2000Desc=Salli tekstikenttien muokkaaminen / alustaminen CKEditorilla (html)
 Module2200Name=Dynaamiset Hinnat
 Module2200Desc=Use maths expressions for auto-generation of prices
 Module2300Name=Ajastetut työt
@@ -624,11 +626,11 @@ 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)
+Module2600Name=API / verkkopalvelut (SOAP-palvelin)
+Module2600Desc=Ota käyttöön Dolibarr SOAP -palvelin, joka tarjoaa API-palveluita
+Module2610Name=API / verkkopalvelut (REST-palvelin)
+Module2610Desc=Ota käyttöön API-palveluita tarjoava Dolibarr REST -palvelin
+Module2660Name=Kutsu verkkopalveluita (SOAP-asiakas)
 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
@@ -645,8 +647,8 @@ Module6000Name=Työtehtävät
 Module6000Desc=Workflow management (automatic creation of object and/or automatic status change)
 Module10000Name=Nettisivut
 Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
-Module20000Name=Leave Request Management
-Module20000Desc=Define and track employee leave requests
+Module20000Name=Poissaolopyyntöjen hallinta
+Module20000Desc=Määrittele ja seuraa työntekijöiden poissaolopyyntöjä
 Module39000Name=Product Lots
 Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products
 Module40000Name=Multicurrency
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Vaalit, Kysely vai Äänestys
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Katteet
-Module59000Desc=Moduuli katteiden hallintaan
+Module59000Desc=Module to follow margins
 Module60000Name=Komissiot
 Module60000Desc=Moduuli komissioiden hallintaan
 Module62000Name=Incoterm-ehdot
@@ -747,17 +749,17 @@ Permission142=Create/modify all projects and tasks (also private projects for wh
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Lue tarjoajien
 Permission147=Lue stats
-Permission151=Read direct debit payment orders
-Permission152=Create/modify a direct debit payment orders
-Permission153=Send/Transmit direct debit payment orders
+Permission151=Lue suoraveloitusmaksumääräykset
+Permission152=Luo / muokkaa suoraveloituksen maksumääräyksiä
+Permission153=Lähetä / välitä suoraveloitusmaksumääräyksiä
 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
+Permission161=Lue sopimukset / tilaukset
+Permission162=Luo / muokkaa sopimuksia / tilauksia
+Permission163=Aktivoi palvelu / tilaus sopimukselle
+Permission164=Poista palvelu / tilaus sopimukselta käytöstä
+Permission165=Poista sopimuksia / tilauksia
 Permission167=Vie Sopimukset
-Permission171=Read trips and expenses (yours and your subordinates)
+Permission171=Lue matkat ja kulut (omat ja alaisten)
 Permission172=Luo/muuta matkat ja kulut
 Permission173=Poista matkat ja kulut
 Permission174=Lue kaikki Matkat ja kulut
@@ -765,12 +767,12 @@ Permission178=Vie matkat ja kulut
 Permission180=Lue toimittajat
 Permission181=Lue ostotilaukset
 Permission182=Luo/Muokkaa ostotilauksia
-Permission183=Validate purchase orders
+Permission183=Vahvista ostotilaukset
 Permission184=Hyväksy ostotilaukset
-Permission185=Order or cancel purchase orders
-Permission186=Receive purchase orders
-Permission187=Close purchase orders
-Permission188=Cancel purchase orders
+Permission185=Tilaa tai peruuta ostotilaukset
+Permission186=Vastaanota ostotilauksia
+Permission187=Sulje ostotilaukset
+Permission188=Peruuta ostotilaukset
 Permission192=Luo rivit
 Permission193=Peruuta rivit
 Permission194=Read the bandwidth lines
@@ -788,7 +790,7 @@ Permission221=Lue emailings
 Permission222=Luoda / muuttaa emailings (aihe, vastaanottajat ...)
 Permission223=Validate emailings (avulla lähetys)
 Permission229=Poista emailings
-Permission237=View recipients and info
+Permission237=Näytä vastaanottajat ja tiedot
 Permission238=Manuaalinen viestien lähetys
 Permission239=Delete mailings after validation or sent
 Permission241=Lue tuoteryhmät
@@ -818,7 +820,7 @@ Permission300=Lue viivakoodit
 Permission301=Luo/Muokkaa viivakoodeja
 Permission302=Poista viivakoodeja
 Permission311=Lue palvelut
-Permission312=Assign service/subscription to contract
+Permission312=Määritä palvelu / tilaus sopimukseen
 Permission331=Lue kirjanmerkit
 Permission332=Luoda / muuttaa kirjanmerkkejä
 Permission333=Poista kirjanmerkkien
@@ -835,11 +837,11 @@ Permission401=Lue alennukset
 Permission402=Luoda / muuttaa alennukset
 Permission403=Validate alennukset
 Permission404=Poista alennukset
-Permission430=Use Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
+Permission430=Käytä virheenkorjauspalkkia
+Permission511=Lue palkkamaksut (omat ja alaisten)
 Permission512=Luo/Muokkaa palkanmaksuja
 Permission514=Poista palkanmaksuja
-Permission517=Read payments of salaries of everybody
+Permission517=Lue kaikkien palkkamaksut
 Permission519=Vie palkat
 Permission520=Lue Lainat
 Permission522=Luo/muokkaa Lainat
@@ -861,9 +863,9 @@ Permission609=Delete stickers
 Permission650=Lue materiaaliluettelo
 Permission651=Luo/päivitä materiaaliluettelo
 Permission652=Poista materiaaliluettelo
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission660=Lue valmistustilaus (MO)
+Permission661=Luo / päivitä valmistustilaus (MO)
+Permission662=Poista valmistustilaus (MO)
 Permission701=Lue lahjoitukset
 Permission702=Luoda / muuttaa lahjoitusten
 Permission703=Poista lahjoitukset
@@ -873,40 +875,40 @@ Permission773=Poista kuluraportit
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Hyväksy kuluraportit
 Permission776=Maksa kuluraportit
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=Lue kaikkien kuluraportit
+Permission778=Luo / muokkaa kaikkien kuluraportteja
 Permission779=Kuluraporttien vienti
 Permission1001=Lue varastot
 Permission1002=Luo/muuta varastoja
 Permission1003=Poista varastoja
 Permission1004=Lue varastossa liikkeitä
 Permission1005=Luoda / muuttaa varastossa liikkeitä
-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
+Permission1101=Lue toimituskuitit
+Permission1102=Luo / muokkaa toimituskuitteja
+Permission1104=Vahvista toimituskuitit
+Permission1109=Poista toimituskuitit
+Permission1121=Lue toimittajan ehdotukset
+Permission1122=Luo / muokkaa toimittajan ehdotuksia
+Permission1123=Vahvista toimittajan ehdotukset
+Permission1124=Lähetä toimittajan ehdotuksia
+Permission1125=Poista toimittajan ehdotukset
+Permission1126=Sulje toimittajan hintapyynnöt
 Permission1181=Lue toimittajat
 Permission1182=Lue ostotilaukset
 Permission1183=Luo/Muokkaa ostotilauksia
-Permission1184=Validate purchase orders
+Permission1184=Vahvista ostotilaukset
 Permission1185=Hyväksy ostotilaukset
 Permission1186=Lähetä ostotilaukset
 Permission1187=Tilausvahvistus
 Permission1188=Poista ostotilaus
-Permission1189=Check/Uncheck a purchase order reception
+Permission1189=Valitse / poista valinta ostotilauksen vastaanotolta
 Permission1190=Hyväksy (toinen vaihe) ostotilaukset
-Permission1191=Export supplier orders and their attributes
+Permission1191=Vie toimittajan tilaukset ja niiden määritteet
 Permission1201=Hanki seurauksena vienti
 Permission1202=Luo / Muuta vienti
 Permission1231=Lue toimittajien laskut
 Permission1232=Luo/Muokkaa toimittajien laskuja
-Permission1233=Validate vendor invoices
+Permission1233=Vahvista myyjän laskut
 Permission1234=Poista toimittajien laskuja
 Permission1235=Lähetä toimittajien laskut sähköpostilla
 Permission1236=Export vendor invoices, attributes and payments
@@ -915,8 +917,8 @@ Permission1251=Suorita massa tuonnin ulkoisten tiedot tietokantaan (tiedot kuorm
 Permission1321=Vienti asiakkaan laskut, ominaisuudet ja maksut
 Permission1322=Avaa uudelleen maksettu lasku
 Permission1421=Export sales orders and attributes
-Permission1521=Read documents
-Permission1522=Delete documents
+Permission1521=Lue asiakirjat
+Permission1522=Poista asiakirjat
 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)
@@ -931,41 +933,41 @@ Permission2515=Asiakirjojen hakemistoasetukset
 Permission2801=Käytä FTP ohjelmaa lukutilassa (vain selain ja lataukset)
 Permission2802=Käytä FTP ohjelmaa kirjoitustilassa (poista tai päivitä tiedostot)
 Permission3200=Read archived events and fingerprints
-Permission3301=Generate new modules
+Permission3301=Luo uusia moduuleja
 Permission4001=Selaa työntekijöitä
 Permission4002=Luo työntekijä
 Permission4003=Poista työntekijöitä
 Permission4004=Työntekijän tietojen vienti
-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)
+Permission10001=Lue verkkosivuston sisältö
+Permission10002=Luo / muokkaa verkkosivuston sisältöä (HTML- ja Javascript-sisältö)
+Permission10003=Luo / muokkaa verkkosivuston sisältöä (dynaaminen php-koodi). Vaarallinen, on varattava rajoitetuille kehittäjille.
+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=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=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)
 Permission20007=Hyväksy poissaolopyynnöt
 Permission23001=Selaa ajastetut työt
 Permission23002=Luo/päivitä Ajastettu työ
 Permission23003=Poista Ajastettu työ
 Permission23004=Suorita Ajastettu työ
-Permission50101=Use Point of Sale (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
+Permission50101=Käytä myyntipistettä (SimplePOS)
+Permission50151=Käytä myyntipistettä (TakePOS)
 Permission50201=Lue liiketoimet
 Permission50202=Tuo liiketoimet
-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
+Permission50330=Lue Zapier-kohteet
+Permission50331=Luo / päivitä Zapier-kohteita
+Permission50332=Poista Zapier-kohteita
+Permission50401=Liitä tuotteet ja laskut kirjanpitotileihin
+Permission50411=Lue toiminnot tilikirjasta
+Permission50412=Kirjoitus- / muokkaustoiminnot tilikirjaan
+Permission50414=Poista toiminnot tilikirjasta
+Permission50415=Poista kaikki toiminnot vuoden ja päiväkirjan mukaan tilikirjasta
 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.
+Permission50430=Määritä tilikaudet. Vahvista liiketoimet ja sulje tilikaudet.
 Permission50440=Manage chart of accounts, setup of accountancy
 Permission51001=Read assets
 Permission51002=Create/Update assets
@@ -977,21 +979,21 @@ Permission55002=Luo/muokkaa äänestys
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
-Permission63001=Read resources
-Permission63002=Create/modify resources
-Permission63003=Delete resources
+Permission63001=Lue resursseja
+Permission63002=Luo / muokkaa resursseja
+Permission63003=Poista resurssit
 Permission63004=Link resources to agenda events
-Permission64001=Allow direct printing
-Permission67000=Allow printing of receipts
+Permission64001=Salli suora tulostus
+Permission67000=Salli kuittien tulostus
 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
+Permission941601=Lue kuitit
+Permission941602=Luo ja muokkaa kuitteja
+Permission941603=Vahvista kuitit
+Permission941604=Lähetä kuitit sähköpostitse
+Permission941605=Vie kuitit
+Permission941606=Poista kuitit
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
@@ -1225,17 +1227,17 @@ SeeLocalSendMailSetup=Katso paikallisen 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.
+BackupDescX=Arkistoitu hakemisto tulisi tallentaa turvalliseen paikkaan.
 BackupDescY=Luotu dump tiedosto on säilytettävä turvallisessa paikassa.
-BackupPHPWarning=Backup cannot be guaranteed with this method. Previous one recommended.
-RestoreDesc=To restore a Dolibarr backup, two steps are required.
+BackupPHPWarning=Varmuuskopiointia ei voida taata tällä menetelmällä. Edellinen suositeltava.
+RestoreDesc=Dolibarr-varmuuskopion palauttaminen edellyttää kahta vaihetta.
 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 vienti
 ForcedToByAModule=Tämä sääntö on <b>pakko %s</b> on aktivoitu moduuli
-ValueIsForcedBySystem=This value is forced by the system. You can't change it.
+ValueIsForcedBySystem=Järjestelmä pakottaa tämän arvon. Et voi muuttaa sitä.
 PreviousDumpFiles=Olemassa olevat varmuuskopiot
-PreviousArchiveFiles=Existing archive files
+PreviousArchiveFiles=Olemassa olevat arkistotiedostot
 WeekStartOnDay=Ensimmäinen viikonpäivä
 RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Sinun on suoritettava tämä komento komentoriviltä jälkeen kirjautua kuori käyttäjän <b>%s.</b>
@@ -1253,8 +1255,8 @@ MeteoPercentageModEnabled=Prosenttitila käytössä
 MeteoUseMod=Klikkaa käyttääksesi %s
 TestLoginToAPI=Testikirjautuminen
 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)
+ExternalAccess=Ulkoinen / sisäinen pääsy
+MAIN_PROXY_USE=Käytä välityspalvelinta (muuten yhteys on suoraan Internetiin)
 MAIN_PROXY_HOST=Proxy-palvelin: Nimi/Osoite
 MAIN_PROXY_PORT=Proxy-palvelin: Portti
 MAIN_PROXY_USER=Proxy-palvelin: Käyttäjätunnus
@@ -1294,11 +1296,11 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Aktivoidut moduulit
+TotalNumberOfActivatedModules=Aktivoidut moduulit: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Sinulla pitää olla ainakin 1 moduuli käytössä
-ClassNotFoundIntoPathWarning=Class %s not found in PHP path
-YesInSummer=Yes in summer
+ClassNotFoundIntoPathWarning=Luokkaa %s ei löydy PHP-polusta
+YesInSummer=Kyllä kesällä
 OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
@@ -1306,12 +1308,12 @@ 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.
 SearchOptim=Hakuoptimointi
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
-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.
+BrowserIsOK=Käytät verkkoselainta %s. Tämä selain on turvallisuuden ja suorituskyvyn kannalta ok.
+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=Preloaded OPCode is used
+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".
 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".
@@ -1319,21 +1321,21 @@ AskForPreferredShippingMethod=Ask for preferred shipping method for Third Partie
 FieldEdition=Alalla painos %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
 GetBarCode=Hanki viivakoodi
-NumberingModules=Numbering models
-DocumentModules=Document models
+NumberingModules=Numerointimallit
+DocumentModules=Asiakirjamallit
 ##### 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
+PasswordGenerationNone=Älä ehdota luotua salasanaa. Salasana on kirjoitettava manuaalisesti.
+PasswordGenerationPerso=Palauta salasana henkilökohtaisesti määrittämäsi kokoonpanon mukaan.
+SetupPerso=Kokoonpanosi mukaan
 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=Käyttäjät moduuli 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
+UserMailRequired=Uuden käyttäjän luomiseen tarvitaan sähköposti
+UserHideInactive=Piilota passiiviset käyttäjät kaikista yhdistelmäluetteloista (ei suositella: tämä voi tarkoittaa, että et voi suodattaa tai etsiä vanhoja käyttäjiä joillakin sivuilla)
+UsersDocModules=Asiakirjamallit käyttäjän tietueesta luotuihin asiakirjoihin
 GroupsDocModules=Document templates for documents generated from a group record
 ##### HRM setup #####
 HRMSetup=Henkilöstöhallinta moduulin asetukset
@@ -1342,13 +1344,13 @@ CompanySetup=Yritykset moduulin asetukset
 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 this setup page.
-ModelModules=Document Templates
-DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
+NotificationsDescUser=* käyttäjää kohden, yksi käyttäjä kerrallaan.
+NotificationsDescContact=* kolmansien osapuolten yhteystietoja (asiakkaita tai toimittajia) kohti, yksi yhteyshenkilö kerrallaan.
+NotificationsDescGlobal=* tai asettamalla yleiset sähköpostiosoitteet tälle asetussivulle.
+ModelModules=Asiakirjamallit
+DocumentModelOdt=Luo asiakirjoja OpenDocument-malleista (.ODT / .ODS-tiedostot LibreOffice, OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Vesileima asiakirjaluonnos
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
+JSOnPaimentBill=Aktivoi ominaisuus maksurivien automaattiseen täyttämiseen maksulomakkeella
 CompanyIdProfChecker=Rules for Professional IDs
 MustBeUnique=Täytyy olla uniikki?
 MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
@@ -1389,7 +1391,7 @@ 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
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Pyydä lähdevarasto tilaukselle
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
@@ -1500,23 +1502,23 @@ LDAPSetupForVersion2=LDAP-palvelin määritetty versio 2
 LDAPDolibarrMapping=Dolibarr Mapping
 LDAPLdapMapping=LDAP Mapping
 LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example: uid
+LDAPFieldLoginExample=Esimerkki: uid
 LDAPFilterConnection=Hakusuodatin
-LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPFilterConnectionExample=Esimerkki: &(objectClass=inetOrgPerson)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFieldLoginSambaExample=Esimerkki: samaccountname
 LDAPFieldFullname=Koko nimi
-LDAPFieldFullnameExample=Example: cn
+LDAPFieldFullnameExample=Esimerkki: cn
 LDAPFieldPasswordNotCrypted=Salaamaton salasana
 LDAPFieldPasswordCrypted=Salattu salasana
-LDAPFieldPasswordExample=Example: userPassword
-LDAPFieldCommonNameExample=Example: cn
+LDAPFieldPasswordExample=Esimerkki: userPassword
+LDAPFieldCommonNameExample=Esimerkki: cn
 LDAPFieldName=Nimi
-LDAPFieldNameExample=Example: sn
+LDAPFieldNameExample=Esimerkki: sn
 LDAPFieldFirstName=Etunimi
-LDAPFieldFirstNameExample=Example: givenName
+LDAPFieldFirstNameExample=Esimerkki: givenName
 LDAPFieldMail=Sähköpostiosoite
-LDAPFieldMailExample=Example: mail
+LDAPFieldMailExample=Esimerkki: mail
 LDAPFieldPhone=Työpuhelin
 LDAPFieldPhoneExample=Example: telephonenumber
 LDAPFieldHomePhone=Henkilökohtainen puhelin
@@ -1585,26 +1587,31 @@ 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)
+DefaultCreateForm=Oletusarvot (käytettäväksi lomakkeissa)
 DefaultSearchFilters=Oletus hakusuodattimet
 DefaultSortOrder=Default sort orders
 DefaultFocus=Default focus fields
-DefaultMandatory=Mandatory form fields
+DefaultMandatory=Pakolliset lomakekentät
 ##### Products #####
 ProductSetup=Tuotteet Moduuli setup
 ServiceSetup=Services-moduuli asennus
 ProductServiceSetup=Tuotteet ja palvelut moduulien asennus
-NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
+NumberOfProductShowInSelect=Yhdistelmäluetteloissa näytettävien tuotteiden enimmäismäärä (0 = ei rajoitusta)
 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
+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 the language of the third party
+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=Tuotteissa käytetty viivakoodin tyyppi
 SetDefaultBarcodeTypeThirdParties=Kolmansien osapuolien käyttämä viivakoodityyppi (oletus)
 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
+ProductOtherConf= Tuotteen / palvelun kokoonpano
 IsNotADir=ei ole hakemisto!
 ##### Syslog #####
 SyslogSetup=Syslog-moduulin asetukset
@@ -1682,14 +1689,14 @@ StockSetup='Varasto' - moduulin asetukset
 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=Valikko poistettu
-Menu=Menu
+Menu=Valikko
 Menus=Valikot
 TreeMenuPersonalized=Henkikökohtaiset valikot
 NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Uusi valikko
 MenuHandler=Valikko huolitsijan
 MenuModule=Lähde moduuli
-HideUnauthorizedMenu= Piilota luvaton valikot (harmaa)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id-valikosta
 DetailMenuHandler=Valikko huolitsijan missä osoittavat uuden valikon
 DetailMenuModule=Moduulin nimi, jos Valikosta kotoisin moduuli
@@ -1780,8 +1787,8 @@ ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscel
 ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
 ApiExporerIs=Voit selata ja testata APIs URL-osoitteesta
 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.
+ApiKey=API-avain
+WarningAPIExplorerDisabled=API-selain on poistettu käytöstä. API-selainta ei tarvita API-palvelujen käyttämiseksi. Se on kehittäjän työkalu etsiä / testata REST API-rajapintaa. Jos tarvitset tätä työkalua, siirry moduulin API REST -asetuksiin aktivoidaksesi sen.
 ##### Bank #####
 BankSetupModule=Pankki-moduulin asetukset
 FreeLegalTextOnChequeReceipts=Free text on check receipts
@@ -1901,7 +1908,7 @@ MailToSendShipment=Lähetykset
 MailToSendIntervention=Interventions
 MailToSendSupplierRequestForQuotation=Tarjouspyyntö
 MailToSendSupplierOrder=Ostotilaukset
-MailToSendSupplierInvoice=Vendor invoices
+MailToSendSupplierInvoice=Toimittajan laskut
 MailToSendContract=Sopimukset
 MailToSendReception=Receptions
 MailToThirdparty=Sidosryhmät
@@ -1981,44 +1988,45 @@ EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly
 NewEmailCollector=Uusi postinkerääjä
 EMailHost=IMAP-palvelin
 MailboxSourceDirectory=Sähköpostin lähdehakemisto
-MailboxTargetDirectory=Mailbox target directory
-EmailcollectorOperations=Operations to do by collector
+MailboxTargetDirectory=Postilaatikon kohdehakemisto
+EmailcollectorOperations=Keräilijän tehtävät toiminnot
+EmailcollectorOperationsDesc=Toiminnot suoritetaan ylhäältä alas järjestyksessä
 MaxEmailCollectPerCollect=Max number of emails collected per collect
-CollectNow=Collect now
+CollectNow=Kerää nyt
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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
+NoNewEmailToProcess=Ei uutta käsiteltävää sähköpostia (vastaavat suodattimet)
+NothingProcessed=Mitään ei tehty
 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 candidature
+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)
+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
+WithoutDolTrackingIDInMsgId=Viestiä EI lähetetty Dolibarrista
+CreateCandidature=Luo työhakemus
 FormatZip=Postinumero
-MainMenuCode=Menu entry code (mainmenu)
-ECMAutoTree=Show automatic ECM tree
+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.
 OpeningHours=Aukioloajat
 OpeningHoursDesc=Yrityksen tavalliset aukioloajat
-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
+ResourceSetup=Resurssimoduulin määritys
+UseSearchToSelectResource=Käytä hakulomaketta resurssin valitsemiseksi (pikavalikon sijaan).
+DisabledResourceLinkUser=Poista ominaisuus käytöstä linkittääksesi resurssin käyttäjiin
+DisabledResourceLinkContact=Poista ominaisuus käytöstä linkittääksesi resurssin kontakteihin
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
-ConfirmUnactivation=Confirm module reset
-OnMobileOnly=On small screen (smartphone) only
+ConfirmUnactivation=Vahvista moduulin nollaus
+OnMobileOnly=Vain pienellä näytöllä (älypuhelin)
 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.
@@ -2032,17 +2040,17 @@ 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
+DebugBar=Virheenkorjauspalkki
 DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
-DebugBarSetup=DebugBar Setup
-GeneralOptions=General Options
+DebugBarSetup=Virheenkorjauspalkin asetukset
+GeneralOptions=Yleiset asetukset
 LogsLinesNumber=Number of lines to show on logs tab
-UseDebugBar=Use the debug bar
+UseDebugBar=Käytä virheenkorjauspalkkia
 DEBUGBAR_LOGS_LINES_NUMBER=Konsolissa pidettävien lokirivien määrä
 WarningValueHigherSlowsDramaticalyOutput=Varoitus, suuremmat arvot hidastavat merkittävästi ohjelmaa
 ModuleActivated=Moduuli %son aktiivinen ja hidastaa ohjelmaa
-IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
-AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+IfYouAreOnAProductionSetThis=Jos olet tuotantoympäristössä, määritä tämän ominaisuuden arvoksi %s.
+AntivirusEnabledOnUpload=Virustorjunta käytössä ladatuissa tiedostoissa
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Vienti-moduulin asetukset
 ImportSetup=Setup of module Import
@@ -2070,16 +2078,20 @@ PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
 FeatureNotAvailableWithReceptionModule=Ominaisuus ei käytettävissä kun moduuli Vastaanotto on aktiivinen
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Jump to Setup -> Widgets
+JumpToBoxes=Siirry kohtaan Asetukset -> Widgetit
 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
+TemplateAdded=Malli lisätty
+TemplateUpdated=Malli päivitetty
+TemplateDeleted=Malli poistettu
 MailToSendEventPush=Event reminder email
-SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+SwitchThisForABetterSecurity=Tämän arvon vaihtamista arvoon %s suositellaan turvallisuuden lisäämiseksi
 DictionaryProductNature= Nature of product
-CountryIfSpecificToOneCountry=Country (if specific to a given country)
-YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
-ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+CountryIfSpecificToOneCountry=Maa (jos määritelty annetulle maalle)
+YouMayFindSecurityAdviceHere=Löydät tietoturva-neuvoja täältä
+ModuleActivatedMayExposeInformation=Tämä moduuli saattaa paljastaa arkaluontoisia tietoja. Jos et tarvitse sitä, poista se käytöstä.
+ModuleActivatedDoNotUseInProduction=Kehitykseen suunniteltu moduuli on otettu käyttöön. Älä ota sitä käyttöön tuotantoympäristössä.
+CombinationsSeparator=Tuoteyhdistelmien erotinmerkki
+SeeLinkToOnlineDocumentation=Katso esimerkkejä linkistä online-dokumentaatioon ylävalikossa
+SHOW_SUBPRODUCT_REF_IN_PDF=Jos käytetään moduulin <b> %s </b> ominaisuutta "%s", näytä yksityiskohdat paketin alituotteista PDF-muodossa.
+AskThisIDToYourBank=Ota yhteyttä pankkiisi saadaksesi tämän tunnuksen
diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang
index ef24faa1c72..7d3b78bdd23 100644
--- a/htdocs/langs/fi_FI/banks.lang
+++ b/htdocs/langs/fi_FI/banks.lang
@@ -39,7 +39,7 @@ StandingOrders=Direct debit orders
 StandingOrder=Suoraveloitus tilaus
 PaymentByDirectDebit=Payment by direct debit
 PaymentByBankTransfers=Payments by credit transfer
-PaymentByBankTransfer=Payment by credit transfer
+PaymentByBankTransfer=Maksu tilisiirrolla
 AccountStatement=Tiliote
 AccountStatementShort=Laskelma
 AccountStatements=Tiliotteet
@@ -173,10 +173,11 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=SEPA-toimeksiantonne
 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index 398c7d7aae4..765ef285f83 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -3,7 +3,7 @@ Bill=Lasku
 Bills=Laskut
 BillsCustomers=Asiakkaiden laskut
 BillsCustomer=Asiakas lasku
-BillsSuppliers=Vendor invoices
+BillsSuppliers=Toimittajan laskut
 BillsCustomersUnpaid=Asiakkaiden maksamattomat laskut
 BillsCustomersUnpaidForCompany=Asiakkaiden maksamattomat laskut %s
 BillsSuppliersUnpaid=Maksamattomat toimittajien laskut
@@ -469,7 +469,7 @@ LawApplicationPart2=tavaroiden omistusoikeus säilyy
 LawApplicationPart3=the seller until full payment of
 LawApplicationPart4=niiden hinta.
 LimitedLiabilityCompanyCapital=SARL, pääoma
-UseLine=Apply
+UseLine=Käytä
 UseDiscount=Käytä edullisista
 UseCredit=Käytä luotto
 UseCreditNoteInInvoicePayment=Vähentää maksua tämän menoilmoitus
@@ -531,6 +531,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 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)
@@ -575,3 +576,7 @@ 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 %%
diff --git a/htdocs/langs/fi_FI/blockedlog.lang b/htdocs/langs/fi_FI/blockedlog.lang
index f9a07298706..6e6393f5cd1 100644
--- a/htdocs/langs/fi_FI/blockedlog.lang
+++ b/htdocs/langs/fi_FI/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/fi_FI/boxes.lang b/htdocs/langs/fi_FI/boxes.lang
index a63ed303fb5..896e6895a4f 100644
--- a/htdocs/langs/fi_FI/boxes.lang
+++ b/htdocs/langs/fi_FI/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Viimeisimmät %s muokatut matka- ja kuluraportit
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Yleisaktiviteetit (laskut, ehdotukset, tilaukset)
 BoxGoodCustomers=Hyvät asiakkaat
 BoxTitleGoodCustomers=%s Hyvät asiakkaat
+BoxScheduledJobs=Ajastetut työt
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=Kirjanmerkkejä ei ole määritelty.
@@ -92,8 +95,8 @@ LastXMonthRolling=The latest %s month rolling
 ChooseBoxToAdd=Lisää dashboardiin
 BoxAdded=Lisätty dashboardiin
 BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Viimeisimmät asiakastoimitukset
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Kirjanpito
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/fi_FI/cashdesk.lang b/htdocs/langs/fi_FI/cashdesk.lang
index 3cb4a43d36f..a00a6ea22e5 100644
--- a/htdocs/langs/fi_FI/cashdesk.lang
+++ b/htdocs/langs/fi_FI/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb laskuista
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -108,7 +109,7 @@ MainTemplateToUse=Main template to use
 OrderTemplateToUse=Order template to use
 BarRestaurant=Bar Restaurant
 AutoOrder=Order by the customer himself
-RestaurantMenu=Menu
+RestaurantMenu=Valikko
 CustomerMenu=Customer menu
 ScanToMenu=Scan QR code to see the menu
 ScanToOrder=Scan QR code to order
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/fi_FI/categories.lang b/htdocs/langs/fi_FI/categories.lang
index 371a1c6cbb7..8738530c575 100644
--- a/htdocs/langs/fi_FI/categories.lang
+++ b/htdocs/langs/fi_FI/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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=Täydentävät ominaisuudet
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
index a542eed8fcc..9501c740d2c 100644
--- a/htdocs/langs/fi_FI/companies.lang
+++ b/htdocs/langs/fi_FI/companies.lang
@@ -358,7 +358,7 @@ 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>
 ErrorVATCheckMS_UNAVAILABLE=Tarkistaminen ei mahdollista. Jäsenvaltio ei toimita tarkastuspalvelua ( %s).
 NorProspectNorCustomer=Ei mahdollinen asiakas eikä asiakas
-JuridicalStatus=Yritysmuoto
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Työntekijät
 ProspectLevelShort=Potenttiaali
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index a4dbebfc263..d75596e0a5b 100644
--- a/htdocs/langs/fi_FI/compta.lang
+++ b/htdocs/langs/fi_FI/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Näytä arvonlisäveron maksaminen
 TotalToPay=Yhteensä maksaa
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Raportti kolmannen osapuolen IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/fi_FI/cron.lang b/htdocs/langs/fi_FI/cron.lang
index beaef6c9fe0..289befd89cd 100644
--- a/htdocs/langs/fi_FI/cron.lang
+++ b/htdocs/langs/fi_FI/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Create/update Scheduled job
 Permission23103 = Poista Ajastettu työ
 Permission23104 = Suorita Ajastettu työ
 # Admin
-CronSetup= Ajastettujen tehtävien asetusten hallinta
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Tai tietyn tehtävän tarkistamiseen ja ajamiseen
+CronSetup=Ajastettujen tehtävien asetusten hallinta
+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=Turva avain ajastettujen  tehtävien ajamiseen URL-sta
 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 environement you can use Scheduled task tools 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
@@ -42,10 +43,11 @@ CronModule=Moduuli
 CronNoJobs=No jobs registered
 CronPriority=Prioriteetti
 CronLabel=Etiketti
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+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
@@ -56,16 +58,16 @@ CronNote=Kommentti
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Poistaa käytöstä
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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=Mistä
@@ -76,8 +78,14 @@ 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+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/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 90dc974eeeb..df9826daae0 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s on väärä
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Kirjaudu %s on jo olemassa.
 ErrorGroupAlreadyExists=Ryhmän %s on jo olemassa.
 ErrorRecordNotFound=Levykauppa ei löytynyt.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Jotkin vaaditut kentät eivät ole täytetty.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Luominen epäonnistui hakemiston. Tarkista, että Web-palvelin käyttäjällä on oikeudet kirjoittaa Dolibarr asiakirjat hakemistoon. Jos parametri <b>safe_mode</b> on käytössä tämän PHP, tarkista, että Dolibarr php tiedostot omistaa web-palvelimen käyttäjä (tai ryhmä).
 ErrorNoMailDefinedForThisUser=Ei postia määritelty tälle käyttäjälle
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Tätä ominaisuutta tarvitaan JavaScript on aktivoitu työstä. Muuta tämän setup - näyttö.
 ErrorTopMenuMustHaveAParentWithId0=A-valikosta tyyppi "Alkuun" ei voi olla emo-valikosta. Laita 0 vanhemman valikosta tai valita valikosta tyyppi "vasemmisto".
 ErrorLeftMenuMustHaveAParentId=A-valikosta tyyppi "vasemmisto" on oltava vanhemman id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP yhteensovitus ei ole täydellinen.
 ErrorLDAPMakeManualTest=A. LDIF tiedosto on luotu hakemistoon %s. Yritä ladata se manuaalisesti komentoriviltä on enemmän tietoa virheitä.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref käytetään luomista jo olemassa.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/fi_FI/exports.lang b/htdocs/langs/fi_FI/exports.lang
index 038bf61ce23..446bb468010 100644
--- a/htdocs/langs/fi_FI/exports.lang
+++ b/htdocs/langs/fi_FI/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Kentän nimi
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Kirjasto
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Vaihe
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -120,7 +122,7 @@ SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for
 UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
 NoUpdateAttempt=No update attempt was performed, only insert
 ImportDataset_user_1=Users (employees or not) and properties
-ComputedField=Computed field
+ComputedField=Laskettu kenttä
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilteredFields=Filtered fields
@@ -131,3 +133,4 @@ 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/fi_FI/holiday.lang b/htdocs/langs/fi_FI/holiday.lang
index 4aaf4300284..960f0f94b94 100644
--- a/htdocs/langs/fi_FI/holiday.lang
+++ b/htdocs/langs/fi_FI/holiday.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=Henkilöstöhallinta
-Holidays=Leave
-CPTitreMenu=Leave
+Holidays=Poissaolot
+CPTitreMenu=Poissaolot
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leave to view this page.
@@ -110,7 +110,7 @@ UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
 ErrorMailNotSend=An error occurred while sending email:
-NoticePeriod=Notice period
+NoticePeriod=Huomautusaika
 #Messages
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
diff --git a/htdocs/langs/fi_FI/mails.lang b/htdocs/langs/fi_FI/mails.lang
index c327a9bc3c9..d0a460d3df8 100644
--- a/htdocs/langs/fi_FI/mails.lang
+++ b/htdocs/langs/fi_FI/mails.lang
@@ -92,6 +92,7 @@ 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=Rivi %s tiedosto
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Ilmoitukset
-NoNotificationsWillBeSent=Ei sähköposti-ilmoituksia on suunniteltu tähän tapahtumaan ja yritys
-ANotificationsWillBeSent=1 ilmoituksesta lähetetään sähköpostitse
-SomeNotificationsWillBeSent=%s ilmoitukset lähetetään sähköpostitse
-AddNewNotification=Aktivoi uusi sähköposti ilmoitus tavoittelle/tapahtumalle
-ListOfActiveNotifications=Luettelo kaikista aktiivisista kohteista / tapahtumista sähköpostin ilmoittamiselle
-ListOfNotificationsDone=Listaa kaikki sähköposti-ilmoitukset lähetetään
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Sähköpostin lähettämisen määritys on asetettu "%s": ksi. Tätä tilaa ei voi käyttää massapostitusten lähettämiseen.
 MailSendSetupIs2=Sinun on ensin siirryttävä admin-tilillä valikkoon %sHome - Setup - EMails%s parametrin <strong> '%s' </strong> muuttamiseksi käytettäväksi tilassa "%s". Tässä tilassa voit syöttää Internet-palveluntarjoajan antaman SMTP-palvelimen vaatimat asetukset ja käyttää Massa-sähköpostitoimintoa.
 MailSendSetupIs3=Jos sinulla on kysyttävää SMTP-palvelimen määrittämisestä, voit kysyä osoitteesta %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
-Information=Information
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
+Information=Tiedot
 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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index a9649731ddb..edbfc59d018 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -25,10 +25,12 @@ FormatDateHourTextShort=%d. %b %Y %H.%M
 FormatDateHourText=%d. %B %Y %H.%M
 DatabaseConnection=Tietokantayhteys
 NoTemplateDefined=Tämän tyyliselle sähköpostille ei ole pohjaa saatavilla
-AvailableVariables=Available substitution variables
+AvailableVariables=Käytettävissä olevat korvaavat muuttujat
 NoTranslation=Ei käännöstä
 Translation=Käännös
+CurrentTimeZone=Aikavyöhyke PHP (palvelin)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Tietueita ei löytynyt
 NoRecordDeleted=Tallennuksia ei poistettu
 NotEnoughDataYet=Ei tarpeeksi tietoja
@@ -52,7 +54,7 @@ ErrorFileNotUploaded=Tiedosto ei ole ladattu. Tarkista, että koko ei ylitä suu
 ErrorInternalErrorDetected=Virhe havaittu
 ErrorWrongHostParameter=Väärä vastaanottavan parametri
 ErrorYourCountryIsNotDefined=Maata ei ole määritetty. Mene Koti-Asetukset-Muokkaa - valikkoon ja lähetä lomake uudestaan
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child record.
+ErrorRecordIsUsedByChild=Tämän tietueen poistaminen epäonnistui. Tätä tietuetta käyttää ainakin yksi lapsitietue.
 ErrorWrongValue=Väärä arvo
 ErrorWrongValueForParameterX=Väärä arvo parametri %s
 ErrorNoRequestInError=N: o pyynnöstä virhe
@@ -65,7 +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
-MaxNbOfRecordPerPage=Max. number of records per page
+MaxNbOfRecordPerPage=Maks. tietueiden määrä sivua kohden
 NotAuthorized=Oikeutesi ei riitä tähän toimintoon
 SetDate=Aseta päivä
 SelectDate=Valitse päivä
@@ -73,32 +75,34 @@ SeeAlso=Katso myös %s
 SeeHere=Katso täältä
 ClickHere=Klikkaa tästä
 Here=Here
-Apply=Apply
+Apply=Käytä
 BackgroundColorByDefault=Default taustaväri
 FileRenamed=Tiedosto on uudelleen nimetty onnistuneesti
 FileGenerated=Tiedosto luotiin onnistuneesti
 FileSaved=Tiedosto tallennettiin onnistuneesti
 FileUploaded=Tiedosto on siirretty onnistuneesti
-FileTransferComplete=File(s) uploaded successfully
+FileTransferComplete=Tiedosto (t) lähetetty onnistuneesti
 FilesDeleted=Tiedosto(t) poistettiin onnistuneesti
 FileWasNotUploaded=Tiedosto on valittu liite mutta ei ollut vielä ladattu. Klikkaa "Liitä tiedosto" tätä.
-NbOfEntries=No. of entries
+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
+HomePage=Kotisivu
 RecordSaved=Record tallennettu
 RecordDeleted=Tallennus poistettu
-RecordGenerated=Record generated
+RecordGenerated=Tietue luotu
 LevelOfFeature=Taso ominaisuuksia
 NotDefined=Ei määritelty
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarrin todennusmoodi on <b> %s </b> konfigurointitiedostossa <b> conf.php </b>. <br> Tämä tarkoittaa, että salasanatietokanta on Dolibarrin ulkopuolinen, joten tämän kentän muuttaminen ei välttämättä vaikuta.
 Administrator=Administrator
 Undefined=Määrittelemätön
 PasswordForgotten=Unohditko salasanasi?
-NoAccount=No account?
+NoAccount=Ei tiliä?
 SeeAbove=Katso edellä
 HomeArea=Koti
-LastConnexion=Last login
-PreviousConnexion=Previous login
+LastConnexion=Viimeisin kirjautuminen
+PreviousConnexion=Edellinen kirjautuminen
 PreviousValue=Edellinen arvo
 ConnectedOnMultiCompany=Connected on kokonaisuus
 ConnectedSince=Sidossuhteessa koska
@@ -109,7 +113,7 @@ RequestLastAccessInError=Virhe viimeisimmästä tietokannan pääsypyynnöstä
 ReturnCodeLastAccessInError=Viimeisin tietokannan käyttöoikeuspyyntövirheen palautekoodi
 InformationLastAccessInError=Tiedot viimeisimmän tietokannan käyttöoikeuspyynnön virheestä
 DolibarrHasDetectedError=Dolibarr on havaittu tekninen virhe
-YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
+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)
 MoreInformation=Lisätietoa
 TechnicalInformation=Tekniset tiedot
@@ -121,7 +125,7 @@ PrecisionUnitIsLimitedToXDecimals=Dolibarr oli asetettu raja tarkkuus <b>yksikk
 DoTest=Testi
 ToFilter=Suodata
 NoFilter=Ei suodatinta
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time.
+WarningYouHaveAtLeastOneTaskLate=Varoitus, sinulla on ainakin yksi elementti, joka on ylittänyt toleranssin ajan.
 yes=kyllä
 Yes=Kyllä
 no=ei
@@ -131,7 +135,7 @@ Home=Koti
 Help=Apu
 OnlineHelp=Online-ohje
 PageWiki=Wiki-sivulla
-MediaBrowser=Media browser
+MediaBrowser=Mediaselain
 Always=Aina
 Never=Ei koskaan
 Under=alle
@@ -143,16 +147,16 @@ Activate=Aktivoi
 Activated=Aktiivihiili
 Closed=Suljettu
 Closed2=Suljettu
-NotClosed=Not closed
+NotClosed=Ei suljettu
 Enabled=Enabled
-Enable=Enable
+Enable=Ota käyttöön
 Deprecated=Käytöstä poistettu
 Disable=Poistaa käytöstä
 Disabled=Disabled
 Add=Lisää
 AddLink=Lisää linkki
 RemoveLink=Poista linkki
-AddToDraft=Add to draft
+AddToDraft=Lisää luonnokseen
 Update=Päivittää
 Close=Sulje
 CloseAs=Aseta tilaksi
@@ -161,22 +165,22 @@ Confirm=Vahvista
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
 Delete=Poistaa
 Remove=Poista
-Resiliate=Terminate
+Resiliate=Lopeta
 Cancel=Peruuta
 Modify=Muokkaa
 Edit=Muokkaa
 Validate=Vahvista
 ValidateAndApprove=Vahvista ja hyväksy
 ToValidate=Validoida
-NotValidated=Not validated
+NotValidated=Ei vahvistettu
 Save=Tallenna
 SaveAs=Tallenna nimellä
-SaveAndStay=Save and stay
-SaveAndNew=Save and new
+SaveAndStay=Tallenna ja pysy sivulla
+SaveAndNew=Tallenna ja luo uusi
 TestConnection=Testaa yhteys
 ToClone=Klooni
-ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose data you want to clone:
+ConfirmCloneAsk=Haluatko varmasti kloonata objektin <b> %s </b>?
+ConfirmClone=Valitse kloonattavat tiedot:
 NoCloneOptionsSpecified=Ei tietoja kloonata määritelty.
 Of=ja
 Go=Mene
@@ -194,13 +198,13 @@ Valid=Voimassa
 Approve=Hyväksy
 Disapprove=Poista hyväksyntä
 ReOpen=Avaa uudelleen
-Upload=Upload
+Upload=Lähetä
 ToLink=Linkki
 Select=Valitse
-SelectAll=Select all
+SelectAll=Valitse kaikki
 Choose=Valitse
 Resize=Muuta kokoa
-ResizeOrCrop=Resize or Crop
+ResizeOrCrop=Muuta kokoa tai rajaa
 Recenter=Keskitä
 Author=Laatija
 User=Käyttäjä
@@ -212,7 +216,7 @@ Password=Salasana
 PasswordRetype=Kirjoitta salasana uudelleen
 NoteSomeFeaturesAreDisabled=Huomaa, että monet piirteet / modules on poistettu käytöstä tämän esittelyn.
 Name=Nimi
-NameSlashCompany=Name / Company
+NameSlashCompany=Nimi / yritys
 Person=Henkilö
 Parameter=Parametri
 Parameters=Parametrit
@@ -220,6 +224,7 @@ Value=Arvo
 PersonalValue=Henkilökohtainen arvo
 NewObject=Uusi %s
 NewValue=Uusi arvo
+OldValue=Vanha arvo %s
 CurrentValue=Nykyinen arvo
 Code=Koodi
 Type=Tyyppi
@@ -258,7 +263,7 @@ Cards=Kortit
 Card=Kortti
 Now=Nyt
 HourStart=Aloitus tunti
-Deadline=Deadline
+Deadline=Takaraja
 Date=Päivä
 DateAndHour=Päivämäärä ja tunti
 DateToday=Päivämäärä tänään
@@ -267,11 +272,11 @@ DateStart=Aloituspäivämäärä
 DateEnd=Lopetuspäivä
 DateCreation=Luotu
 DateCreationShort=Luonti päivämäärä
-IPCreation=Creation IP
+IPCreation=Luoneen IP
 DateModification=Muokattu
 DateModificationShort=Muokattu
-IPModification=Modification IP
-DateLastModification=Latest modification date
+IPModification=Muokkaajan IP
+DateLastModification=Viimeisimmän muokkauksen päivämäärä
 DateValidation=Vahvistettu
 DateClosing=Suljettu
 DateDue=Eräpäivä
@@ -287,9 +292,9 @@ DatePayment=Maksupäivä
 DateApprove=Hyväksytään päivämäärä
 DateApprove2=Hyväksytään päivämäärä (toinen hyväksyntä)
 RegistrationDate=Rekisteröinti päivämäärä
-UserCreation=Creation user
-UserModification=Modification user
-UserValidation=Validation user
+UserCreation=Luonut käyttäjä
+UserModification=Muokannut käyttäjä
+UserValidation=Vahvistanut käyttäjä
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
 UserValidationShort=Valid. user
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Moduuli/Applikaatio
 Modules=Moduulit/Applikaatiot
 Option=Vaihtoehto
+Filters=Filters
 List=Luettelo
 FullList=Täydellinen luettelo
 FullConversation=Full conversation
@@ -519,8 +525,8 @@ StatusInterInvoiced=Laskutettu
 Validated=Vahvistetut
 ValidatedToProduce=Validated (To produce)
 Opened=Avoinna
-OpenAll=Open (All)
-ClosedAll=Closed (All)
+OpenAll=Avoimet (kaikki)
+ClosedAll=Suljetut (kaikki)
 New=Uusi
 Discount=Alennus
 Unknown=Tuntematon
@@ -650,6 +656,7 @@ SupplierPreview=Vendor preview
 ShowCustomerPreview=Näytä asiakkaan esikatselu
 ShowSupplierPreview=Show vendor preview
 RefCustomer=Asiakasviite
+InternalRef=Internal ref.
 Currency=Valuutta
 InfoAdmin=Tietoja järjestelmänvalvojille
 Undo=Kumoa
@@ -671,13 +678,13 @@ SendMail=Lähetä sähköpostia
 Email=Sähköposti
 NoEMail=Ei sähköpostia
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Lukematon
 NoMobilePhone=Ei matkapuhelinta
 Owner=Omistaja
 FollowingConstantsWillBeSubstituted=Seuraavat vakiot voidaan korvata ja vastaava arvo.
 Refresh=Päivitä
 BackToList=Palaa luetteloon
-BackToTree=Back to tree
+BackToTree=Takaisin puuhun
 GoBack=Mene takaisin
 CanBeModifiedIfOk=Voidaan muuttaa, jos voimassa
 CanBeModifiedIfKo=Voidaan muuttaa, jos ei kelpaa
@@ -685,9 +692,9 @@ ValueIsValid=Arvo on voimassa
 ValueIsNotValid=Arvo ei kelpaa
 RecordCreatedSuccessfully=Tallennus luotiin onnistuneesti
 RecordModifiedSuccessfully=Tietue muunnettu onnistuneesti
-RecordsModified=%s record(s) modified
-RecordsDeleted=%s record(s) deleted
-RecordsGenerated=%s record(s) generated
+RecordsModified=%s-tietuetta muokattu
+RecordsDeleted=%s tietuetta poistettu
+RecordsGenerated=%s tietuetta luotu
 AutomaticCode=Automaattinen koodi
 FeatureDisabled=Ominaisuus pois päältä
 MoveBox=Siirrä widget
@@ -698,7 +705,7 @@ Method=Menetelmä
 Receive=Vastaanota
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Odotettu Arvo
-ExpectedQty=Expected Qty
+ExpectedQty=Odotettu määrä
 PartialWoman=Osittainen
 TotalWoman=Yhteensä
 NeverReceived=Ei ole saapunut
@@ -722,7 +729,7 @@ CurrentUserLanguage=Nykyinen kieli
 CurrentTheme=Nykyinen teema
 CurrentMenuManager=Nykyinen valikkohallinta
 Browser=Selain
-Layout=Layout
+Layout=Asettelu
 Screen=Näyttö
 DisabledModules=Ei käytössä olevat moduulit
 For=Saat
@@ -733,7 +740,7 @@ HidePassword=Näytä komento salasana piilotettuna
 UnHidePassword=Näytä todellinen komento salasana näkyen
 Root=Juuri
 RootOfMedias=Root of public medias (/medias)
-Informations=Information
+Informations=Tiedot
 Page=Sivu
 Notes=Huomiot
 AddNewLine=Lisää uusi rivi
@@ -752,7 +759,7 @@ CoreErrorTitle=Järjestelmävirhe
 CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
 CreditCard=Luottokortti
 ValidatePayment=Vahvista maksu
-CreditOrDebitCard=Credit or debit card
+CreditOrDebitCard=Luotto- tai maksukortti
 FieldsWithAreMandatory=Tähdellä <b>%s</b> ovat pakollisia
 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)
@@ -761,7 +768,7 @@ NotSupported=Ei tuettu
 RequiredField=Pakollinen kenttä
 Result=Tulos
 ToTest=Testi
-ValidateBefore=Item must be validated before using this feature
+ValidateBefore=Kohde on vahvistettava ennen tämän ominaisuuden käyttöä
 Visibility=Näkyvyys
 Totalizable=Totalizable
 TotalizableDesc=This field is totalizable in list
@@ -783,20 +790,20 @@ LinkTo=Linkki
 LinkToProposal=Linkki Tarjoukseen
 LinkToOrder=Linkki Tilauksiin
 LinkToInvoice=Linkki Laskuihin
-LinkToTemplateInvoice=Link to template invoice
-LinkToSupplierOrder=Link to purchase order
-LinkToSupplierProposal=Link to vendor proposal
-LinkToSupplierInvoice=Link to vendor invoice
+LinkToTemplateInvoice=Linkki mallilaskuun
+LinkToSupplierOrder=Linkki ostotilaukseen
+LinkToSupplierProposal=Linkki toimittajan ehdotukseen
+LinkToSupplierInvoice=Linkki toimittajan laskuun
 LinkToContract=Linkki Sopimuksiin
 LinkToIntervention=Link to intervention
-LinkToTicket=Link to ticket
+LinkToTicket=Linkki tikettiin
 CreateDraft=Luo luonnos
 SetToDraft=Palaa luonnokseen
 ClickToEdit=Klikkaa muokataksesi
-ClickToRefresh=Click to refresh
-EditWithEditor=Edit with CKEditor
-EditWithTextEditor=Edit with Text editor
-EditHTMLSource=Edit HTML Source
+ClickToRefresh=Napsauta päivittääksesi
+EditWithEditor=Muokkaa CKEditorilla
+EditWithTextEditor=Muokkaa tekstieditorilla
+EditHTMLSource=Muokkaa HTML-lähdekoodia
 ObjectDeleted=Kohde %s poistettu
 ByCountry=Maittain
 ByTown=Postitoimipaikoittain
@@ -808,7 +815,7 @@ ByDay=Päivän mukaan
 BySalesRepresentative=Myyntiedustajittain
 LinkedToSpecificUsers=Linkitetty käyttäjätietoon
 NoResults=Ei tuloksia
-AdminTools=Admin Tools
+AdminTools=Järjestelmänvalvojan työkalut
 SystemTools=Kehitysresurssit
 ModulesSystemTools=Moduuli työkalut
 Test=Testi
@@ -958,42 +965,42 @@ ShortThursday=TO
 ShortFriday=PE
 ShortSaturday=LA
 ShortSunday=SU
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
-sixteen=sixteen
-seventeen=seventeen
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
-million=million
-billion=billion
-trillion=trillion
-quadrillion=quadrillion
+one=yksi
+two=kaksi
+three=kolme
+four=neljä
+five=viisi
+six=kuusi
+seven=seitsemän
+eight=kahdeksan
+nine=yhdeksän
+ten=kymmenen
+eleven=yksitoista
+twelve=kaksitoista
+thirteen=kolmetoista
+fourteen=neljätoista
+fifteen=viisitoista
+sixteen=kuusitoista
+seventeen=seitsemäntoista
+eighteen=kahdeksantoista
+nineteen=yhdeksäntoista
+twenty=kaksikymmentä
+thirty=kolmekymmentä
+forty=neljäkymmentä
+fifty=viisikymmentä
+sixty=kuusikymmentä
+seventy=seitsemänkymmentä
+eighty=kahdeksankymmentä
+ninety=yhdeksänkymmentä
+hundred=sata
+thousand=tuhat
+million=miljoona
+billion=miljardi
+trillion=biljoona
+quadrillion=kvadriljoona
 SelectMailModel=Valitse sähköpostipohja
 SetRef=Aseta viite
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
+Select2ResultFoundUseArrows=Joitakin tuloksia löytyi. Käytä nuolia valitaksesi.
 Select2NotFound=Tuloksia ei löytynyt
 Select2Enter=Syötä
 Select2MoreCharacter=tai useampi merkki
@@ -1007,103 +1014,109 @@ SearchIntoMembers=Jäsenet
 SearchIntoUsers=Käyttäjät
 SearchIntoProductsOrServices=Tuotteet tai palvelut
 SearchIntoProjects=Projektit
-SearchIntoMO=Manufacturing Orders
+SearchIntoMO=Valmistustilaukset
 SearchIntoTasks=Tehtävät
 SearchIntoCustomerInvoices=Asiakkaiden laskut
-SearchIntoSupplierInvoices=Vendor invoices
+SearchIntoSupplierInvoices=Toimittajan laskut
 SearchIntoCustomerOrders=Asiakkaan tilaukset
 SearchIntoSupplierOrders=Ostotilaukset
 SearchIntoCustomerProposals=Tarjoukset
-SearchIntoSupplierProposals=Vendor proposals
+SearchIntoSupplierProposals=Toimittajan ehdotukset
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Sopimukset
 SearchIntoCustomerShipments=Asiakas lähetykset
 SearchIntoExpenseReports=Kuluraportit
-SearchIntoLeaves=Leave
+SearchIntoLeaves=Poissaolot
 SearchIntoTickets=Tiketit
-SearchIntoCustomerPayments=Customer payments
+SearchIntoCustomerPayments=Asiakasmaksut
 SearchIntoVendorPayments=Toimittajien maksut
 SearchIntoMiscPayments=Muut maksut
 CommentLink=Kommentit
 NbComments=Kommenttien määrä
-CommentPage=Comments space
+CommentPage=Kommenttitila
 CommentAdded=Kommentti lisätty
 CommentDeleted=Kommentti poistettu
 Everybody=Yhteiset hanke
 PayedBy=Maksettu toimesta
-PayedTo=Paid to
-Monthly=Monthly
-Quarterly=Quarterly
-Annual=Annual
-Local=Local
-Remote=Remote
-LocalAndRemote=Local and Remote
-KeyboardShortcut=Keyboard shortcut
+PayedTo=Maksettu
+Monthly=Kuukausittain
+Quarterly=Neljännesvuosittain
+Annual=Vuosittain
+Local=Paikallinen
+Remote=Etä
+LocalAndRemote=Paikallinen ja etä
+KeyboardShortcut=Pikanäppäin
 AssignedTo=Vaikuttaa
-Deletedraft=Delete draft
-ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared via a link
-SelectAThirdPartyFirst=Select a third party first...
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
-Inventory=Inventory
-AnalyticCode=Analytic code
+Deletedraft=Poista luonnos
+ConfirmMassDraftDeletion=Luonnosten massapoistamisen vahvistus
+FileSharedViaALink=Tiedosto jaettu linkin kautta
+SelectAThirdPartyFirst=Valitse ensin kolmas osapuoli ...
+YouAreCurrentlyInSandboxMode=Olet tällä hetkellä %s "sandbox" -tilassa
+Inventory=Varasto
+AnalyticCode=Analyyttinen koodi
 TMenuMRP=MRP
-ShowMoreInfos=Show More Infos
-NoFilesUploadedYet=Please upload a document first
-SeePrivateNote=See private note
-PaymentInformation=Payment information
-ValidFrom=Valid from
-ValidUntil=Valid until
-NoRecordedUsers=No users
-ToClose=To close
+ShowMoreInfos=Näytä lisää tietoja
+NoFilesUploadedYet=Lataa ensin asiakirja
+SeePrivateNote=Katso yksityinen huomautus
+PaymentInformation=Maksutiedot
+ValidFrom=Voimassa alkaen
+ValidUntil=Voimassa asti
+NoRecordedUsers=Ei käyttäjiä
+ToClose=Sulkeaksesi
 ToProcess=Jotta prosessi
-ToApprove=To approve
-GlobalOpenedElemView=Global view
-NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
-NoArticlesFoundForTheCategory=No article found for the category
-ToAcceptRefuse=To accept | refuse
+ToApprove=Hyväksyäksesi
+GlobalOpenedElemView=Globaali näkymä
+NoArticlesFoundForTheKeyword=Avainsanalle '<strong> %s </strong>' ei löytynyt artikkelia
+NoArticlesFoundForTheCategory=Luokalle ei löytynyt artikkelia
+ToAcceptRefuse=Hyväksyä | kieltäytyä
 ContactDefault_agenda=Tapahtuma
 ContactDefault_commande=Tilaus
 ContactDefault_contrat=Sopimus
 ContactDefault_facture=Lasku
 ContactDefault_fichinter=Väliintulo
-ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Purchase Order
+ContactDefault_invoice_supplier=Toimittajalasku
+ContactDefault_order_supplier=Ostotilaus
 ContactDefault_project=Hanke
 ContactDefault_project_task=Tehtävä
 ContactDefault_propal=Tarjous
-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
+ContactDefault_supplier_proposal=Toimittajan ehdotus
+ContactDefault_ticket=Tiketti
+ContactAddedAutomatically=Yhteys lisätty yhteyshenkilön kolmannen osapuolen rooleista
+More=Lisää
+ShowDetails=Näytä yksityiskohdat
+CustomReports=Mukautetut raportit
+StatisticsOn=Tilastot aiheesta
+SelectYourGraphOptionsFirst=Valitse kaavion asetukset, jotta voit luoda kaavion
 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
+XAxis=X-akseli
+YAxis=Y-akseli
+StatusOfRefMustBe= %s tilan on oltava %s
+DeleteFileHeader=Vahvista tiedoston poisto
+DeleteFileText=Haluatko todella poistaa tämän tiedoston?
+ShowOtherLanguages=Näytä muut kielet
+SwitchInEditModeToAddTranslation=Vaihda muokkaustilaan lisätäksesi käännöksiä tälle kielelle
+NotUsedForThisCustomer=Ei käytössä tälle asiakkaalle
+AmountMustBePositive=Summan on oltava positiivinen
+ByStatus=Tilan mukaan
+InformationMessage=Tiedot
+Used=Käytetty
+ASAP=Niin pian kuin mahdollista
+CREATEInDolibarr=Tietue %s luotu
+MODIFYInDolibarr=Tietuetta %s muokattu
+DELETEInDolibarr=Tietue %s poistettu
+VALIDATEInDolibarr=Tietue %s on vahvistettu
+APPROVEDInDolibarr=Tietue %s hyväksytty
+DefaultMailModel=Oletuspostimalli
+PublicVendorName=Myyjän julkinen nimi
 DateOfBirth=Päiväys syntyvyyden
-SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
-UpToDate=Up-to-date
-OutOfDate=Out-of-date
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Suojaustunnus on vanhentunut, joten toiminto on peruutettu. Yritä uudelleen.
+UpToDate=Ajantasalla
+OutOfDate=Vanhentunut
 EventReminder=Event Reminder
-UpdateForAllLines=Update for all lines
+UpdateForAllLines=Päivitys kaikille riveille
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/fi_FI/modulebuilder.lang b/htdocs/langs/fi_FI/modulebuilder.lang
index 460aef8103b..0e6dd72354d 100644
--- a/htdocs/langs/fi_FI/modulebuilder.lang
+++ b/htdocs/langs/fi_FI/modulebuilder.lang
@@ -5,7 +5,7 @@ EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use upp
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
 ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
 ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
-NewModule=New module
+NewModule=Uusi moduuli
 NewObjectInModulebuilder=New object
 ModuleKey=Module key
 ObjectKey=Object key
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/fi_FI/mrp.lang b/htdocs/langs/fi_FI/mrp.lang
index f018be890cc..c6e8061c790 100644
--- a/htdocs/langs/fi_FI/mrp.lang
+++ b/htdocs/langs/fi_FI/mrp.lang
@@ -1,4 +1,4 @@
-Mrp=Manufacturing Orders
+Mrp=Valmistustilaukset
 MOs=Manufacturing orders
 ManufacturingOrder=Manufacturing Order
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
@@ -32,7 +32,7 @@ DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
 ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
 ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
-MenuMRP=Manufacturing Orders
+MenuMRP=Valmistustilaukset
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
 DateStartPlannedMo=Date start planned
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index 4a6a9b8c6c6..d3b6219e6db 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -5,8 +5,6 @@ Tools=Työkalut
 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=Syntymäpäivä
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=syntymäpäivä hälytys aktiivinen
 BirthdayAlertOff=syntymäpäivä varoituskynnysten inaktiivinen
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,7 +78,8 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
-SeeModuleSetup=See setup of module %s
+Notify_ACTION_CREATE=Added action to Agenda
+SeeModuleSetup=Katso moduulin %s asetukset
 NbOfAttachedFiles=Numero liitettyjen tiedostojen / asiakirjat
 TotalSizeOfAttachedFiles=Kokonaiskoosta liitettyjen tiedostojen / asiakirjat
 MaxSize=Enimmäiskoko
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Oikeus
 CalculatedWeight=Laskettu paino
 CalculatedVolume=Laskettu määrä
 Weight=Paino
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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=Tuonti tietokokonaisuutta
 DolibarrNotification=Automaattinen ilmoitus
 ResizeDesc=Kirjoita uusi leveys <b>tai</b> uusien korkeus. Suhde pidetään ajan kokoa ...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Vienti alueen
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index fb19101c1ee..ba1a344683f 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Hintojen lukumäärä
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Ostohinnat
 CustomerPrices=Asiakas hinnat
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Alkuperämaa
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Poista käytöstä hinnat kappalemäärän mukaan
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index 36d5e4a6d8b..3f9f197f844 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -76,15 +76,16 @@ MyActivities=Omat tehtävät / toiminnot
 MyProjects=Omat projektit
 MyProjectsArea=Omat projektit - alue
 DurationEffective=Todellisen kesto
-ProgressDeclared=Julkaistu eteneminen
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Tehtien eteneminen
 CurentlyOpenedTasks=Avoimet tehtävät
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Lasketut projektit
+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=Aika
+TimeConsumed=Consumed
 ListOfTasks=Tehtävälista
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=GANTT näkymä
diff --git a/htdocs/langs/fi_FI/recruitment.lang b/htdocs/langs/fi_FI/recruitment.lang
index eb65908493a..9702bc62631 100644
--- a/htdocs/langs/fi_FI/recruitment.lang
+++ b/htdocs/langs/fi_FI/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/fi_FI/sendings.lang b/htdocs/langs/fi_FI/sendings.lang
index f45dd858ab4..7c6e6c9e98e 100644
--- a/htdocs/langs/fi_FI/sendings.lang
+++ b/htdocs/langs/fi_FI/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Tämän tilauksen muut toimitukset
 SendingsAndReceivingForSameOrder=Tämän tilauksen toimitukset ja kuittaukset
 SendingsToValidate=Toimitu
 StatusSendingCanceled=Peruttu
+StatusSendingCanceledShort=Peruttu
 StatusSendingDraft=Vedos
 StatusSendingValidated=Validoidut (lähetettävät tai lähetetyt tuotteet)
 StatusSendingProcessed=Jalostettu
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Täydellisempi mallin toimitusten kuitit (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Jatkuva EXPEDITION_ADDON_NUMBER ei määritelty
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
index 3bd141f559b..d244c5578d0 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Varastot arvo
 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -182,7 +183,7 @@ inventoryCreatePermission=Create new inventory
 inventoryReadPermission=View inventories
 inventoryWritePermission=Update inventories
 inventoryValidatePermission=Validate inventory
-inventoryTitle=Inventory
+inventoryTitle=Varasto
 inventoryListTitle=Inventories
 inventoryListEmpty=No inventory in progress
 inventoryCreateDelete=Create/Delete inventory
@@ -198,7 +199,7 @@ inventoryMvtStock=By inventory
 inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Luokka suodatin
 SelectFournisseur=Vendor filter
-inventoryOnDate=Inventory
+inventoryOnDate=Varasto
 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
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/fi_FI/supplier_proposal.lang b/htdocs/langs/fi_FI/supplier_proposal.lang
index 5777af85414..1612b16d93b 100644
--- a/htdocs/langs/fi_FI/supplier_proposal.lang
+++ b/htdocs/langs/fi_FI/supplier_proposal.lang
@@ -11,8 +11,9 @@ LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Vendor proposals area
 SupplierProposalShort=Vendor proposal
-SupplierProposals=Vendor proposals
-SupplierProposalsShort=Vendor proposals
+SupplierProposals=Toimittajan ehdotukset
+SupplierProposalsShort=Toimittajan ehdotukset
+AskPrice=Price request
 NewAskPrice=New price request
 ShowSupplierProposal=Show price request
 AddSupplierProposal=Create a price request
@@ -32,7 +33,7 @@ SupplierProposalStatusValidatedShort=Vahvistetut
 SupplierProposalStatusClosedShort=Suljettu
 SupplierProposalStatusSignedShort=Accepted
 SupplierProposalStatusNotSignedShort=Refused
-CopyAskFrom=Create price request by copying existing a request
+CopyAskFrom=Create a price request by copying an existing request
 CreateEmptyAsk=Create blank request
 ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b>?
 ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b>?
diff --git a/htdocs/langs/fi_FI/ticket.lang b/htdocs/langs/fi_FI/ticket.lang
index d25c38981fc..ff13c391829 100644
--- a/htdocs/langs/fi_FI/ticket.lang
+++ b/htdocs/langs/fi_FI/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Kaupallinen kysymys
 
+TicketTypeShortCOM=Kaupallinen kysymys
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Muu
 TicketSeverityShortLOW=Matala
 TicketSeverityShortNORMAL=Normaali
 TicketSeverityShortHIGH=Korkea
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Kohta '%s' on väärin
 MenuTicketMyAssign=Minun tiketit
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Luettu
 Assigned=Assigned
 InProgress=Käsittelyssä
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -151,7 +149,7 @@ MessageListViewType=Show as table list
 #
 # Ticket card
 #
-Ticket=Ticket
+Ticket=Tiketti
 TicketCard=Ticket card
 CreateTicket=Create ticket
 EditTicket=Muokkaa tikettiä
@@ -231,9 +229,8 @@ TicketChangeStatus=Vaihda tila
 TicketConfirmChangeStatus=Confirm the status change: %s ?
 TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
-Unread=Unread
+Unread=Lukematon
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/fi_FI/website.lang b/htdocs/langs/fi_FI/website.lang
index 5ecbd8e3ca4..218d9313551 100644
--- a/htdocs/langs/fi_FI/website.lang
+++ b/htdocs/langs/fi_FI/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Lisää sivusto
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Kotisivu
 PageContainer=Sivu
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ EmptyPage=Tyhjä sivu
 ExternalURLMustStartWithHttp=Ulkoisen osoitteen on oltava muotoa http:// tai https://
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Sisällytä dynaaminen sisältö
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/fi_FI/withdrawals.lang b/htdocs/langs/fi_FI/withdrawals.lang
index aba0cc2a0cc..66f62048c71 100644
--- a/htdocs/langs/fi_FI/withdrawals.lang
+++ b/htdocs/langs/fi_FI/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Luokittele hyvitetyksi
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Vaihtoehto todellista tilaa ei ole asetettu, pysähdymme jälkeen simulointi
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/fi_FI/workflow.lang b/htdocs/langs/fi_FI/workflow.lang
index 6fe6bba4b8b..5f7718dc168 100644
--- a/htdocs/langs/fi_FI/workflow.lang
+++ b/htdocs/langs/fi_FI/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automaattinen luonti
 AutomaticClassification=Automaattinen luokitus
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/fr_BE/accountancy.lang b/htdocs/langs/fr_BE/accountancy.lang
index 11b91eb3db3..5f291cc8cb7 100644
--- a/htdocs/langs/fr_BE/accountancy.lang
+++ b/htdocs/langs/fr_BE/accountancy.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - accountancy
 Processing=Exécution
 Lineofinvoice=Lignes de facture
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 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
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index 5d24a311ccd..a497b785c93 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -16,6 +16,8 @@ FormToTestFileUploadForm=Formulaire pour tester l'upload de fichiers (selon la c
 IfModuleEnabled=Note: oui ne fonctionne que si le module <b>%s</b> est activé
 Module20Name=Propales
 Module30Name=Factures
+Module59000Desc=Module to follow margins
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 Target=Objectif
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_BE/mrp.lang b/htdocs/langs/fr_BE/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/fr_BE/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/fr_BE/products.lang b/htdocs/langs/fr_BE/products.lang
index 6e900475275..2a38b9b0181 100644
--- a/htdocs/langs/fr_BE/products.lang
+++ b/htdocs/langs/fr_BE/products.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
+AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/fr_BE/withdrawals.lang b/htdocs/langs/fr_BE/withdrawals.lang
index eb336cadcc0..76b150a8eb2 100644
--- a/htdocs/langs/fr_BE/withdrawals.lang
+++ b/htdocs/langs/fr_BE/withdrawals.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 StatusTrans=Envoyé
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang
index c34f7d4c7ad..62afd3dc49d 100644
--- a/htdocs/langs/fr_CA/accountancy.lang
+++ b/htdocs/langs/fr_CA/accountancy.lang
@@ -87,6 +87,7 @@ LineOfExpenseReport=Ligne de rapport de dépenses
 NoAccountSelected=Aucun compte comptable sélectionné
 VentilatedinAccount=Lié avec succès au compte comptable
 XLineFailedToBeBinded=%s produits / services n'étaient liés à aucun compte comptable
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Commencez le tri de la page "Reliure à faire" par les éléments les plus récents
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Commencez le tri de la page "Reliure faite" par les éléments les plus récents
 ACCOUNTING_LENGTH_DESCRIPTION=Tronquer la description des produits et services dans les listes après les caractères X (Best = 50)
@@ -97,7 +98,6 @@ ACCOUNTING_EXPENSEREPORT_JOURNAL=Note de frais
 DONATION_ACCOUNTINGACCOUNT=Compte comptable pour enregistrer des dons
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Compte comptable par défaut pour les services achetés (utilisé si non défini dans la fiche de service)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Compte comptable par défaut pour les services vendus (utilisé si non défini dans la fiche de service)
-GroupByAccountAccounting=Groupe par compte comptable
 NotMatch=Pas encore défini
 FinanceJournal=Journal des finances
 ExpenseReportsJournal=Journal des rapports de dépenses
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index a0f940824b8..ab2f51e65eb 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -25,7 +25,6 @@ AllWidgetsWereEnabled=Tous les widgets disponibles sont activés
 MenusDesc=Les gestionnaires de menu définissent le contenu des deux barres de menus (horizontales et verticales).
 MenusEditorDesc=L'éditeur de menu vous permet de définir des entrées de menu personnalisées. Utilisez-le soigneusement pour éviter l'instabilité et les entrées de menu inaccessibles en permanence. <br>Certains modules ajoutent des entrées de menu (dans le menu<b> principal </b>principalement). Si vous supprimez certaines de ces entrées par erreur, vous pouvez les restaurer en désactivant et en réactivant le module.
 PurgeDeleteLogFile=Supprimer les fichiers journaux, y compris ceux<b>%s</b> définis pour le module Syslog (pas de risque de perte de données)
-PurgeDeleteTemporaryFilesShort=Supprimer les fichiers temporaires
 PurgeNothingToDelete=Pas de répertoire ou de fichiers à supprimer.
 PurgeNDirectoriesFailed=Impossible de supprimer <b>%s</b> fichiers ou les répertoires.
 ConfirmPurgeAuditEvents=Êtes-vous sûr de vouloir purger tous les événements de sécurité? Tous les journaux de sécurité seront supprimés, aucune autre donnée ne sera supprimée.
@@ -98,6 +97,7 @@ Module2660Name=WebServices appel ( client SOAP )
 Module4000Name=Gestion des ressources humaines
 Module10000Name=Sites Internet
 Module55000Name=Sondage, enquête ou vote
+Module59000Desc=Module to follow margins
 Permission45=Exportation de projets
 Permission76=Exporter des données
 Permission91=Consulter les charges et la TPS/TVH
@@ -164,6 +164,7 @@ LDAPFieldTitle=Poste
 DefaultSortOrder=Ordres de tri par défaut
 DefaultFocus=Champs de mise au point par défaut
 MergePropalProductCard=Activez dans le produit/service, l'option onglet de fichiers attachés pour fusionner le produit PDF le document à la proposition PDF azur si le produit/service est dans la proposition
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 UseUnits=Définir une unité de mesure pour la quantité lors de la commande, l'édition de la proposition ou les lignes de facture
 IsNotADir=n'est pas un répertoire
 BarcodeDescDATAMATRIX=Codebarre de type Datamatrix
diff --git a/htdocs/langs/fr_CA/categories.lang b/htdocs/langs/fr_CA/categories.lang
index 71116b8842c..ce7287abbe9 100644
--- a/htdocs/langs/fr_CA/categories.lang
+++ b/htdocs/langs/fr_CA/categories.lang
@@ -22,4 +22,4 @@ ProductsCategoriesShort=Tags/catégories de produits
 MembersCategoriesShort=Tags/catégories de membres
 AccountsCategoriesShort=Étiquettes / catégories de comptes
 ProjectsCategoriesShort=Projets Tags / catégories
-CatProJectLinks=Liens entre projets et tags / catégories
+CatMembersLinks=Liens entre membres et libellés/catégories
diff --git a/htdocs/langs/fr_CA/compta.lang b/htdocs/langs/fr_CA/compta.lang
index 9426cca9d08..67522c477f0 100644
--- a/htdocs/langs/fr_CA/compta.lang
+++ b/htdocs/langs/fr_CA/compta.lang
@@ -32,7 +32,6 @@ VATPayments=Paiements d'impôt sur les ventes
 VATRefund=Remboursement de la taxe de vente
 SocialContributionsPayments=Règlements charges sociales
 ShowVatPayment=Affiche paiement TPS/TVH
-BalanceVisibilityDependsOnSortAndFilters=La balance est visible dans cette liste uniquement si la table est triée en ascendant sur %s et filtrée pour 1 compte bancaire
 CustomerAccountancyCodeShort=Cust. Compte. code
 SupplierAccountancyCodeShort=Souper. Compte. code
 ByExpenseIncome=Par dépenses et revenus
diff --git a/htdocs/langs/fr_CA/cron.lang b/htdocs/langs/fr_CA/cron.lang
index d4a1f4689f9..c0ac78610c3 100644
--- a/htdocs/langs/fr_CA/cron.lang
+++ b/htdocs/langs/fr_CA/cron.lang
@@ -4,11 +4,8 @@ Permission23102 =Créer/Modifier des travaux planifiées
 Permission23103 =Effacer travail planifié
 Permission23104 =Exécuté Travail planifié
 CronSetup=Configuration programmée de la gestion des tâches
-URLToLaunchCronJobs=URL pour vérifier et lancer des emplois qualifiés cron
-OrToLaunchASpecificJob=Ou pour vérifier et lancer un travail spécifique
 KeyForCronAccess=Clé de sécurité pour URL pour lancer des travaux de cron
 CronExplainHowToRunUnix=Sur l'environnement Unix, vous devez utiliser l'entrée crontab suivante pour exécuter la ligne de commande toutes les 5 minutes
-CronExplainHowToRunWin=Sur Microsoft (tm) environnement Windows, vous pouvez utiliser les outils de tâches planifiés pour exécuter la ligne de commande toutes les 5 minutes
 EnabledAndDisabled=Activé et désactivé
 CronLastOutput=Dernier résultat d'exécution
 CronLastResult=Le dernier code de résultat
@@ -24,7 +21,6 @@ CronNone=Aucune
 CronDtLastLaunch=Date de début de la dernière exécution
 CronDtLastResult=Date de fin de la dernière exécution
 CronNoJobs=Aucun emploi enregistré
-CronNbRun=Nb. lancement
 CronEach=Chaque
 CronAdd=Ajouter des emplois
 CronEvery=Exécuter le travail chaque
@@ -39,6 +35,5 @@ CronCreateJob=Créer un nouvel emploi planifié
 CronFrom=De
 CronType=Type d'emploi
 CronType_command=Commande Shell
-UseMenuModuleToolsToAddCronJobs=Accédez au menu «Accueil - Outils d'administration - Emplois programmés» pour voir et modifier les tâches planifiées.
 MakeLocalDatabaseDumpShort=Sauvegarde de la base de données locale
 WarningCronDelayed=Attention, à des fins de performance, quelle que soit la prochaine date d'exécution des travaux activés, vos travaux peuvent être retardés jusqu'à un maximum de %s heures avant d'être exécutés.
diff --git a/htdocs/langs/fr_CA/errors.lang b/htdocs/langs/fr_CA/errors.lang
index 967bf583d1c..be3f8df0eb9 100644
--- a/htdocs/langs/fr_CA/errors.lang
+++ b/htdocs/langs/fr_CA/errors.lang
@@ -51,7 +51,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.
-ErrorRefAlreadyExists=La référence utilisée pour la création existe déjà.
 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/mails.lang b/htdocs/langs/fr_CA/mails.lang
index 9661c2d4ed1..cd12fe65172 100644
--- a/htdocs/langs/fr_CA/mails.lang
+++ b/htdocs/langs/fr_CA/mails.lang
@@ -76,12 +76,6 @@ YouCanUseCommaSeparatorForSeveralRecipients=Vous pouvez utiliser le séparateur
 TagCheckMail=Suivre l'ouverture du courrier
 TagUnsubscribe=Désinscription lien
 NoEmailSentBadSenderOrRecipientEmail=Aucun courriel envoyé. Mauvais expéditeur ou courrier électronique du destinataire. Vérifiez le profil de l'utilisateur.
-NoNotificationsWillBeSent=Aucune notification par courrier électronique n'est prévue pour cet événement et cette entreprise
-ANotificationsWillBeSent=1 notification sera envoyée par courrier électronique
-SomeNotificationsWillBeSent=%s les notifications seront envoyées par courrier électronique
-AddNewNotification=Activer un nouvel objectif / événement de notification par courrier électronique
-ListOfActiveNotifications=Liste tous les cibles / événements actifs pour la notification par courrier électronique
-ListOfNotificationsDone=Liste toutes les notifications par courrier électronique envoyées
 MailSendSetupIs=La configuration de l'envoi de courrier électronique a été configurée sur '%s'. Ce mode ne peut pas être utilisé pour envoyer des messages électroniques de masse.
 MailSendSetupIs2=Vous devez d'abord aller, avec un compte admin, dans le menu %sHome - Configuration - EMails%s pour modifier le paramètre <strong> '%s' </strong>pour utiliser le mode '%s'. Avec ce mode, vous pouvez entrer dans la configuration du serveur SMTP fourni par votre fournisseur de services Internet et utiliser la fonctionnalité de messagerie en masse.
 MailSendSetupIs3=Si vous avez des questions sur la configuration de votre serveur SMTP, vous pouvez demander à %s.
@@ -104,5 +98,3 @@ AdvTgtDeleteFilter=Supprimer le filtre
 AdvTgtCreateFilter=Créer un filtre
 NoContactWithCategoryFound=Aucun contact / adresse avec une catégorie trouvée
 NoContactLinkedToThirdpartieWithCategoryFound=Aucun contact / adresse avec une catégorie trouvée
-OutGoingEmailSetup=Configuration de messagerie sortante
-InGoingEmailSetup=Configuration de messagerie entrante
diff --git a/htdocs/langs/fr_CA/mrp.lang b/htdocs/langs/fr_CA/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/fr_CA/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/fr_CA/other.lang b/htdocs/langs/fr_CA/other.lang
index 23fbaaa759a..f9ca31c6f78 100644
--- a/htdocs/langs/fr_CA/other.lang
+++ b/htdocs/langs/fr_CA/other.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - other
+SecurityCode=Code de sécurité
 NumberingShort=N °
 BirthdayAlertOn=Alerte d'anniversaire active
 BirthdayAlertOff=Alerte d'anniversaire inactive
diff --git a/htdocs/langs/fr_CA/products.lang b/htdocs/langs/fr_CA/products.lang
index 313aab6abb2..c438e57c302 100644
--- a/htdocs/langs/fr_CA/products.lang
+++ b/htdocs/langs/fr_CA/products.lang
@@ -53,6 +53,7 @@ SetDefaultBarcodeType=Définir le type de code à barres
 BarcodeValue=Valeur du code à barres
 NoteNotVisibleOnBill=Note (non visible sur les factures, propositions ...)
 ServiceLimitedDuration=Si le produit est un service à durée limitée:
+AssociatedProductsAbility=Enable Kits (set of several products)
 ParentProductsNumber=Nombre de produits d'emballage pour les parents
 ParentProducts=Produits parentaux
 KeywordFilter=Filtre à mots clés
@@ -80,7 +81,6 @@ NewRefForClone=Réf. De nouveau produit / service
 SellingPrices=Prix ​​de vente
 BuyingPrices=Prix ​​d'achat
 CustomerPrices=Prix ​​client
-CustomCode=Customs / Commodity / HS code
 ShortLabel=Étiquette courte
 p=U.
 s=S
@@ -100,7 +100,6 @@ AlwaysUseNewPrice=Toujours utiliser le prix actuel du produit / service
 AlwaysUseFixedPrice=Utilisez le prix fixe
 PriceByQuantity=Différents prix par quantité
 PriceByQuantityRange=Gamme de quantité
-MultipriceRules=Règles du segment des prix
 PercentVariationOver=%% variation par rapport à %s
 PercentDiscountOver=%% discount sur %s
 KeepEmptyForAutoCalculation=Restez vide pour que ceci soit calculé automatiquement à partir du poids ou du volume de produits
diff --git a/htdocs/langs/fr_CA/projects.lang b/htdocs/langs/fr_CA/projects.lang
index d1497e026ec..edb3ebdf924 100644
--- a/htdocs/langs/fr_CA/projects.lang
+++ b/htdocs/langs/fr_CA/projects.lang
@@ -39,7 +39,6 @@ AddHereTimeSpentForDay=Ajouter ici le temps passé pour cette journée / tâche
 Activities=Tâches / activités
 MyActivities=Mes tâches / activités
 MyProjectsArea=Zone de mes projets
-ProgressDeclared=Progrès déclaré
 ListOfTasks=Liste des tâches
 ListTaskTimeUserProject=Liste des temps consacrés aux tâches du projet
 ActivityOnProjectToday=Activité sur le projet aujourd'hui
diff --git a/htdocs/langs/fr_CA/sendings.lang b/htdocs/langs/fr_CA/sendings.lang
index 1886150f850..9cf4c3906c4 100644
--- a/htdocs/langs/fr_CA/sendings.lang
+++ b/htdocs/langs/fr_CA/sendings.lang
@@ -19,6 +19,7 @@ OtherSendingsForSameOrder=Autres envois pour cette commande
 SendingsAndReceivingForSameOrder=Livraisons et recettes pour cet ordre
 SendingsToValidate=Livraisons à valider
 StatusSendingCanceled=Annulé
+StatusSendingCanceledShort=Annulé
 StatusSendingValidated=Validé (produits à expédier ou déjà expédiés)
 StatusSendingProcessed=Traité
 StatusSendingProcessedShort=Traité
diff --git a/htdocs/langs/fr_CA/withdrawals.lang b/htdocs/langs/fr_CA/withdrawals.lang
index d1c2577c8d4..75020c6fcaf 100644
--- a/htdocs/langs/fr_CA/withdrawals.lang
+++ b/htdocs/langs/fr_CA/withdrawals.lang
@@ -56,6 +56,7 @@ SEPAFormYourBAN=Votre nom de compte bancaire (IBAN)
 SEPAFormYourBIC=Votre code d'identification de banque (BIC)
 ModeFRST=Paiement unique
 PleaseCheckOne=Veuillez cocher un seul
+ICS=Creditor Identifier CI for direct debit
 InfoCreditSubject=Paiement de l'ordre de paiement de débit direct %s par la banque
 InfoCreditMessage=La ligne de paiement de débit direct %s a été payée par la banque <br> Données de paiement: %s
 InfoTransSubject=Transmission de l'ordre de paiement de débit direct %s à la banque
diff --git a/htdocs/langs/fr_CH/accountancy.lang b/htdocs/langs/fr_CH/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/fr_CH/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/fr_CH/admin.lang b/htdocs/langs/fr_CH/admin.lang
index c1d306ec390..b68a0680537 100644
--- a/htdocs/langs/fr_CH/admin.lang
+++ b/htdocs/langs/fr_CH/admin.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
+Module59000Desc=Module to follow margins
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_CH/compta.lang b/htdocs/langs/fr_CH/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/fr_CH/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/fr_CH/mrp.lang b/htdocs/langs/fr_CH/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/fr_CH/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/fr_CH/products.lang b/htdocs/langs/fr_CH/products.lang
index 6e900475275..2a38b9b0181 100644
--- a/htdocs/langs/fr_CH/products.lang
+++ b/htdocs/langs/fr_CH/products.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
+AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/fr_CH/withdrawals.lang b/htdocs/langs/fr_CH/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/fr_CH/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/fr_CI/accountancy.lang b/htdocs/langs/fr_CI/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/fr_CI/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/fr_CI/admin.lang b/htdocs/langs/fr_CI/admin.lang
index c1d306ec390..b68a0680537 100644
--- a/htdocs/langs/fr_CI/admin.lang
+++ b/htdocs/langs/fr_CI/admin.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
+Module59000Desc=Module to follow margins
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_CI/compta.lang b/htdocs/langs/fr_CI/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/fr_CI/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/fr_CI/mrp.lang b/htdocs/langs/fr_CI/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/fr_CI/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/fr_CI/products.lang b/htdocs/langs/fr_CI/products.lang
index 6e900475275..2a38b9b0181 100644
--- a/htdocs/langs/fr_CI/products.lang
+++ b/htdocs/langs/fr_CI/products.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
+AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/fr_CI/withdrawals.lang b/htdocs/langs/fr_CI/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/fr_CI/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/fr_CM/accountancy.lang b/htdocs/langs/fr_CM/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/fr_CM/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/fr_CM/admin.lang b/htdocs/langs/fr_CM/admin.lang
index c1d306ec390..b68a0680537 100644
--- a/htdocs/langs/fr_CM/admin.lang
+++ b/htdocs/langs/fr_CM/admin.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
+Module59000Desc=Module to follow margins
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_CM/compta.lang b/htdocs/langs/fr_CM/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/fr_CM/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/fr_CM/mrp.lang b/htdocs/langs/fr_CM/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/fr_CM/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/fr_CM/products.lang b/htdocs/langs/fr_CM/products.lang
index 6e900475275..2a38b9b0181 100644
--- a/htdocs/langs/fr_CM/products.lang
+++ b/htdocs/langs/fr_CM/products.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
+AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/fr_CM/withdrawals.lang b/htdocs/langs/fr_CM/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/fr_CM/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 59ac095a763..4441dd4e1f9 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=Ce service
 ThisProduct=Ce produit
 DefaultForService=Défaut pour les services
 DefaultForProduct=Défaut pour les produits
+ProductForThisThirdparty=Produit pour ce tiers
+ServiceForThisThirdparty=Service pour ce tiers
 CantSuggest=Suggestion no possible
 AccountancySetupDoneFromAccountancyMenu=La partie principale de la configuration de la comptabilité se fait depuis le menu %s
 ConfigAccountingExpert=Configuration du module de comptabilité (partie double)
@@ -48,6 +50,7 @@ CountriesExceptMe=Tous les pays sauf %s
 AccountantFiles=Exporter les documents sources
 ExportAccountingSourceDocHelp=Avec cet outil, vous pouvez exporter les événements sources (liste et PDF) qui ont été utilisés pour générer votre comptabilité. Pour exporter vos journaux, utilisez l'entrée de menu %s - %s.
 VueByAccountAccounting=Vue par comptes comptables
+VueBySubAccountAccounting=Affichage par compte auxiliaire
 
 MainAccountForCustomersNotDefined=Compte comptable général pour les clients non défini dans la configuration
 MainAccountForSuppliersNotDefined=Compte comptable général pour les fournisseurs non défini dans la configuration
@@ -62,16 +65,16 @@ AccountancyAreaDescActionOnceBis=Les prochaines étapes doivent être faites pou
 AccountancyAreaDescActionFreq=Les actions suivantes sont habituellement exécutées chaque mois, semaine, ou jour pour les très grandes entreprises ...
 
 AccountancyAreaDescJournalSetup=Étape %s : Créer ou vérifier le contenu de la liste des journaux depuis le menu %s
-AccountancyAreaDescChartModel=ÉTAPE %s: Vérifiez qu'il existe un modèle de plan comptable ou créez-en un à partir du menu %s
-AccountancyAreaDescChart=ÉTAPE %s: Sélectionnez et | ou complétez votre plan de compte dans le menu %s
+AccountancyAreaDescChartModel=Étape %s : Vérifiez qu'il existe un modèle de plan comptable ou créez-en un à partir du menu %s
+AccountancyAreaDescChart=Étape %s : Sélectionnez et | ou complétez votre plan de compte dans le menu %s
 
 AccountancyAreaDescVat=Étape %s : Définissez les comptes comptables de chaque taux de TVA utilisé. Pour cela, suivez le menu suivant %s.
-AccountancyAreaDescDefault=Étape %s: Définir les comptes de comptabilité par défaut. Pour cela, utilisez l'entrée de menu %s.
+AccountancyAreaDescDefault=Étape %s : Définir les comptes de comptabilité par défaut. Pour cela, utilisez l'entrée de menu %s.
 AccountancyAreaDescExpenseReport=Étape %s : Définissez les comptes comptables par défaut des dépenses des notes de frais. Pour cela, suivez le menu suivant %s.
 AccountancyAreaDescSal=Étape %s : Définissez les comptes comptables de paiements de salaires. Pour cela, suivez le menu suivant %s.
 AccountancyAreaDescContrib=Étape %s : Définissez les comptes comptables des dépenses spéciales (taxes diverses). Pour cela, suivez le menu suivant %s.
 AccountancyAreaDescDonation=Étape %s : Définissez le compte comptable par défaut des dons. Pour cela, suivez le menu suivant %s.
-AccountancyAreaDescSubscription=ÉTAPE %s: définissez les comptes de comptabilité par défaut pour les abonnements des membres. Pour cela, utilisez l’entrée de menu %s.
+AccountancyAreaDescSubscription=Étape %s : définissez les comptes de comptabilité par défaut pour les abonnements des membres. Pour cela, utilisez l’entrée de menu %s.
 AccountancyAreaDescMisc=Étape %s : Définissez le compte par défaut obligatoire et les comptes comptables par défaut pour les transactions diverses. Pour cela, utilisez l'entrée du menu suivant %s.
 AccountancyAreaDescLoan=Étape %s : Définissez les comptes comptables par défaut des emprunts. Pour cela, suivez le menu suivant %s.
 AccountancyAreaDescBank=Étape %s : Définissez les comptes comptables et les codes des journaux de chaque compte bancaire et financier. Vous pouvez commencer à partir de la page %s.
@@ -144,7 +147,7 @@ NotVentilatedinAccount=Non lié au compte comptable
 XLineSuccessfullyBinded=%s produits/service correctement liés à un compte comptable
 XLineFailedToBeBinded=%s produits/services n'ont pu être liés à un compte comptable
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre de ligne des listes et d'éléments à lier représentés par page (maximum recommandé: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre maximum de lignes pour les listes et les pages de liaison comptable (recommandé : 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Commencez le tri de la page "Lien à réaliser" par les éléments les plus récents
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Commencez le tri de la page "Liens réalisés" par les éléments les plus récents
 
@@ -199,6 +202,7 @@ Docref=Référence
 LabelAccount=Libellé du compte
 LabelOperation=Libellé opération
 Sens=Sens
+AccountingDirectionHelp=Pour le compte comptable d'un client, utilisez Crédit pour enregistrer un règlement reçu.<br>Pour le compte comptable d'un fournisseur, utilisez Débit pour enregistrer un règlement reçu.
 LetteringCode=Code de lettrage
 Lettering=Lettrage
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Libellé journal
 NumPiece=Numéro de pièce
 TransactionNumShort=Num. transaction
 AccountingCategory=Groupes personnalisés
-GroupByAccountAccounting=Grouper par compte comptable
+GroupByAccountAccounting=Affichage par compte comptable
+GroupBySubAccountAccounting=Affichage par compte auxiliaire
 AccountingAccountGroupsDesc=Vous pouvez définir ici des groupes de comptes comptable. Il seront utilisés pour les reporting comptables personnalisés
 ByAccounts=Par compte comptable
 ByPredefinedAccountGroups=Par groupes prédéfinis
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Paiement non lié à un produit / service
 OpeningBalance=Solde d'ouverture
 ShowOpeningBalance=Afficher balance d'ouverture
 HideOpeningBalance=Cacher balance d'ouverture
-ShowSubtotalByGroup=Afficher le sous-total par groupe
+ShowSubtotalByGroup=Afficher le sous-total par niveau
 
 Pcgtype=Groupe de comptes comptables
 PcgtypeDesc=Les groupes de comptes sont utilisés comme critères de filtre et de regroupement prédéfinis pour certains rapports de comptabilité. Par exemple, «INCOME» ou «EXPENSE» sont utilisés en tant que groupes pour la comptabilité afin de générer le rapport dépenses / revenus.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consultez ici la liste des lignes de notes de frais lié
 DescVentilExpenseReportMore=Si vous avez défini des comptes comptables au niveau des types de lignes notes de frais, l'application sera capable de faire l'association automatiquement entre les lignes de notes de frais et le compte comptable de votre plan comptable, en un simple clic sur le bouton <strong>"%s"</strong>. Si aucun compte n'a été défini au niveau du dictionnaire de types de lignes de notes de frais ou si vous avez toujours des lignes de notes de frais non liables automatiquement à un compte comptable, vous devez faire l'association manuellement depuis le menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consultez ici la liste des lignes des notes de frais et leur compte comptable
 
+Closure=Clôture annuelle
 DescClosure=Consultez ici le nombre de mouvements par mois non validés et les périodes fiscales déjà ouvertes
 OverviewOfMovementsNotValidated=Etape 1/ Aperçu des mouvements non validés. (Nécessaire pour clôturer un exercice comptable)
+AllMovementsWereRecordedAsValidated=Tous les mouvements ont été enregistrés et validés
+NotAllMovementsCouldBeRecordedAsValidated=Tous les mouvements n'ont pas pu être enregistrés et validés
 ValidateMovements=Valider les mouvements
 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
-SelectMonthAndValidate=Sélectionnez le mois et validez les mouvements
 
 ValidateHistory=Lier automatiquement
 AutomaticBindingDone=Liaison automatique faite
@@ -293,6 +300,7 @@ Accounted=En comptabilité
 NotYetAccounted=Pas encore en comptabilité
 ShowTutorial=Afficher le tutoriel
 NotReconciled=Non rapproché
+WarningRecordWithoutSubledgerAreExcluded=Attention : toutes les opérations sans compte auxiliaire défini sont filtrées et exclues de cet écran
 
 ## Admin
 BindingOptions=Options de liaisons avec les codes comptables
@@ -337,6 +345,7 @@ Modelcsv_LDCompta10=Export pour LD Compta (v10 et supérieure)
 Modelcsv_openconcerto=Export pour OpenConcerto (Test)
 Modelcsv_configurable=Export configurable
 Modelcsv_FEC=Export FEC
+Modelcsv_FEC2=Export FEC (avec dates enregistrement et document inversées)
 Modelcsv_Sage50_Swiss=Export pour Sage 50 Suisse
 Modelcsv_winfic=Export pour Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export vers Gestinum (v3)
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 601ed14f0c1..2cff05c65db 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Affichage
 SetupArea=Configuration
 UploadNewTemplate=Téléverser un / des nouveau(x) modèle(s)
 FormToTestFileUploadForm=Formulaire de test d'envoi de fichier (selon options choisies)
+ModuleMustBeEnabled=Le module <b>%s</b>doit être activé
+ModuleIsEnabled=Le module <b>%s</b>à été désactivé
 IfModuleEnabled=Rem: oui est effectif uniquement si le module <b>%s</b> est activé
 RemoveLock=Effacer le fichier <b>%s</b> s'il existe afin d'autoriser l'outil de mise à jour.
 RestoreLock=Replacer un fichier <b>%s</b>, en ne donnant que les droits de lecture sur ce fichier, afin d'interdire à nouveau les mises à jour.
@@ -85,7 +87,6 @@ ShowPreview=Afficher aperçu
 ShowHideDetails=Afficher/masquer les détails
 PreviewNotAvailable=Aperçu non disponible
 ThemeCurrentlyActive=Thème actif actuellement
-CurrentTimeZone=Fuseau horaire PHP (serveur)
 MySQLTimeZone=Fuseau horaire MySQL (serveur)
 TZHasNoEffect=Les dates sont stockées et retournées par le serveur de base de données comme si elles étaient conservées sous forme de chaîne. Le fuseau horaire n'a d'effet que lorsque vous utilisez la fonction UNIX_TIMESTAMP (qui ne devrait pas être utilisé par Dolibarr, aussi le TZ de la base de données ne devrait avoir aucun effet, même si changé après que les données aient été saisies).
 Space=Espace
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Cet espace offre des fonctions d'administration diverses. Ut
 Purge=Purger
 PurgeAreaDesc=Cette page vous permet d'effacer tous les fichiers construits ou stockés par Dolibarr (fichiers temporaires ou tous les fichiers du répertoire <b>%s</b>). L'utilisation de cette fonction n'est pas nécessaire. Elle est fournie pour les utilisateurs qui hébergent Dolibarr chez un hébergeur qui n'offre pas les permissions de supprimer les fichiers sauvegardés par le serveur Web.
 PurgeDeleteLogFile=Effacer les fichiers de traces de debug, incluant <b>%s</b> défini dans le module 'Journaux et traces' (pas de risque de perte de données)
-PurgeDeleteTemporaryFiles=Effacer tous les fichiers temporaires (pas de risque de perte de données). Note: L'effacement n'est réalisé que si le répertoire temp a été créé depuis plus de 24h.
-PurgeDeleteTemporaryFilesShort=Effacer les fichiers temporaires
+PurgeDeleteTemporaryFiles=Effacer tous les fichiers de log et fichiers temporaires (pas de risque de perte de données). Note : La suppression s'applique aux fichiers supprimés depuis plus de 24 heures.
+PurgeDeleteTemporaryFilesShort=Effacer les fichiers de log et fichiers temporaires
 PurgeDeleteAllFilesInDocumentsDir=Effacer tous les fichiers du répertoire <b>%s</b>. <br>Les fichiers temporaires mais aussi les fichiers «dumps» de sauvegarde de base de données, les fichiers joints aux éléments (tiers, factures, ...) ou fichiers stockés dans le module GED seront irrémédiablement effacés.
 PurgeRunNow=Lancer la purge maintenant
 PurgeNothingToDelete=Aucun dossier ou fichier à supprimer.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 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>
 HelpCenterDesc1=Voici quelques ressources pour obtenir de l’aide et du support avec Dolibarr.
@@ -347,7 +349,7 @@ 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>
 GenericMaskCodes2=<b>{cccc}</b> : code client sur n caractères<br><b>{cccc000}</b> : code client sur n caractères suivi d'un compteur propre au client. Ce compteur propre au client est remis à zéro en même temps que le compteur général.<br><b>{tttt}</b> code du type de tiers sur n caractères (Voir menu Accueil > Configuration > Dictionnaires > Types de tiers). Si vous ajoutez cet élément au masque de numérotation, le compteur sera différent pour chaque type de tiers.<br>
-GenericMaskCodes3=Tout autre caractère dans le masque sera laissé inchangé.<br>Les espaces ne sont pas permis.<br>
+GenericMaskCodes3=Tout autre caractère dans le masque sera laissé inchangé (sauf * ou ? en 13ème position en EAN13).<br>Les espaces ne sont pas permis.<br>En EAN13 le dernier caractère après la dernière } se plaçant en 13ème position<br>devra être * ou ? il sera remplacé par la clé calculée.<br>
 GenericMaskCodes4a=<u>Exemple sur la 99eme %s du tiers LaCompanie faite le 31/01/2007:</u><br>
 GenericMaskCodes4b=<u>Exemple sur un tiers créé le 31/03/2007 :</u><br>
 GenericMaskCodes4c=<u>Exemple sur un produit/service créé le 31/03/2007 :</u><br>
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Exemples avec la configuration actuelle
 ListOfDirectories=Liste des répertoires des modèles OpenDocument
 ListOfDirectoriesForModelGenODT=Liste des répertoires contenant des documents modèles au format OpenDocument.<br><br>Indiquer ici les chemins complets de répertoire.<br>Ajouter un retour à la ligne entre chaque répertoire.<br>Pour indiquer un répertoire du module GED, mettre ici <b>DOL_DATA_ROOT/ecm/nomdurepertoireged</b><br><br>Les fichiers modèles dans ces répertoires doivent se terminer par <b>.odt</b> ou <b>.ods</b>.
 NumberOfModelFilesFound=Nombre de fichiers modèles ODT/ODS trouvés dans ce(s) répertoire(s)
-ExampleOfDirectoriesForModelGen=Exemple de syntaxe :<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Exemples de syntaxe : <br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Pour savoir comment rédiger des modèles de document odt avant de les placer dans un de ces répertoires, consulter la documentation du wiki :
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Créer_un_modèle_de_document_ODT
 FirstnameNamePosition=Ordre d'affichage prénom/nom
@@ -406,7 +408,7 @@ UrlGenerationParameters=Sécurisation des URLs
 SecurityTokenIsUnique=Utiliser un paramètre securekey unique pour chaque URL ?
 EnterRefToBuildUrl=Entrer la référence pour l'objet %s
 GetSecuredUrl=Obtenir l'URL calculée
-ButtonHideUnauthorized=Cacher les boutons non autorisés, pour les utilisateurs non admin, au lieu de les voir grisés
+ButtonHideUnauthorized=Cacher les boutons non autorisés pour les utilisateurs internes également (sinon, il seront seulement grisés)
 OldVATRates=Ancien taux de TVA
 NewVATRates=Nouveau taux de TVA
 PriceBaseTypeToChange=Modifier sur les prix dont la référence de base est le
@@ -1306,7 +1308,7 @@ YouUseBestDriver=Vous utilisez le driver %s qui est le driver recommandé actuel
 YouDoNotUseBestDriver=Vous utilisez le pilote %s mais le pilote %s est recommandé.
 NbOfObjectIsLowerThanNoPb=Vous avez seulement %s %s dans la base de données. Cela ne nécessite aucune optimisation particulière.
 SearchOptim=Optimisation des recherches
-YouHaveXObjectUseSearchOptim=Vous avez %s %s dans la base de données. Vous devez ajouter la constante %s à 1 dans Accueil-Configuration-Autre. Ceci limite la recherche au début des chaînes, ce qui permet à la base de données d'utiliser des index et vous devriez obtenir une réponse immédiate.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=Vous avez %s %s dans la base de données et la constante %s est définie sur 1 dans Accueil-Configuration-Autre.
 BrowserIsOK=Vous utilisez le navigateur Web %s. Ce navigateur est correct pour la sécurité et la performance.
 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.
@@ -1596,8 +1598,13 @@ ServiceSetup=Configuration du module Services
 ProductServiceSetup=Configuration des modules Produits et Services
 NumberOfProductShowInSelect=Nombre maximum de produits dans les listes déroulantes (0=aucune limite)
 ViewProductDescInFormAbility=Afficher les descriptions de produits dans les formulaires (sinon, comme info-bulle contextuelle)
+DoNotAddProductDescAtAddLines=Ne pas ajouter la description du produit (saisie sur sa fiche) à l'ajout d'un produit
+OnProductSelectAddProductDesc=Comment utiliser la description des produits à leur ajout dans un ligne de document
+AutoFillFormFieldBeforeSubmit=Remplir automatiquement le champ description avec la description du produit
+DoNotAutofillButAutoConcat=Ne pas remplir automatiquement le champ description avec la description du produit. La description sera concaténée à la description du produit.
+DoNotUseDescriptionOfProdut=La description du produit ne sera jamais ajoutée dans la description des lignes
 MergePropalProductCard=Ajoute dans l'onglet Fichiers joints des produits/services, une option pour fusionner le document PDF du produit au PDF des propositions Azur si le produit/services est inclut dans la proposition.
-ViewProductDescInThirdpartyLanguageAbility=Visualisation des descriptions de produits dans la langue du tiers
+ViewProductDescInThirdpartyLanguageAbility=Afficher la description des produits sur les formulaires dans la langue du tiers (sinon dans la langue de l'utilisateur)
 UseSearchToSelectProductTooltip=Si vous avez un nombre important de produits (>100 000), vous pourrez améliorer les performances en positionnant la constante PRODUCT_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limité au début des chaines.
 UseSearchToSelectProduct=Attendre que vous ayez appuyé sur une touche avant de charger le contenu de la liste déroulante des produits (Cela peut augmenter les performances si vous avez un grand nombre de produits, mais cela est moins convivial)
 SetDefaultBarcodeTypeProducts=Type de code-barre utilisé par défaut pour les produits
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Menus personalisés non liés à un menu haut
 NewMenu=Nouveau menu
 MenuHandler=Gestionnaire de menu
 MenuModule=Module source
-HideUnauthorizedMenu= Masquer les menus non autorisés aussi pour les utilisateurs internes (sinon juste grisés)
+HideUnauthorizedMenu=Cacher les menus non autorisés aussi pour les utilisateurs internes également (sinon, il seront seulement grisés)
 DetailId=Identifiant du menu
 DetailMenuHandler=Nom du gestionnaire menu dans lequel faire apparaitre le nouveau menu
 DetailMenuModule=Nom du module si l'entrée menu est issue d'un module
@@ -1983,11 +1990,12 @@ EMailHost=Hôte du serveur de messagerie IMAP
 MailboxSourceDirectory=Répertoire source de la boîte aux lettres
 MailboxTargetDirectory=Répertoire cible de la boîte aux lettres
 EmailcollectorOperations=Opérations à effectuer par le collecteur
+EmailcollectorOperationsDesc=Les opérations sont exécutées de haut en bas
 MaxEmailCollectPerCollect=Nombre maximum d'emails collectés par collecte
 CollectNow=Collecter maintenant
 ConfirmCloneEmailCollector=Êtes-vous sûr de vouloir cloner ce collecteur de courrier électronique %s?
-DateLastCollectResult=Date de dernière collecte essayée
-DateLastcollectResultOk=Date de dernière collecte réussie
+DateLastCollectResult=Date de la dernière tentative de collecte
+DateLastcollectResultOk=Date de la dernière collecte réussie
 LastResult=Dernier résultat
 EmailCollectorConfirmCollectTitle=Confirmation de la collecte Email
 EmailCollectorConfirmCollect=Voulez-vous exécuter la collecte pour ce collecteur maintenant ?
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Pays (si spécifique à un pays donné)
 YouMayFindSecurityAdviceHere=Trouvez ici des conseils de sécurité.
 ModuleActivatedMayExposeInformation=Ce module peut exposer des données sensibles. Si il n'est pas nécessaire, désactivez-le.
 ModuleActivatedDoNotUseInProduction=Un module conçu pour le développement a été activé. Ne l'activez pas sur un environnement de production
+CombinationsSeparator=Séparateur de caractères pour les combinaisons de produits
+SeeLinkToOnlineDocumentation=Suivez le lien vers la documentation en ligne depuis le menu du haut pour des exemples
+SHOW_SUBPRODUCT_REF_IN_PDF=Afficher les détails des sous-produits d'un kit dans les PDF si la fonctionnalité "%s" du module <b>%s</b> est activée.
+AskThisIDToYourBank=Contacter votre établissement bancaire pour obtenir ce code
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index 3b7a9f0e8c0..072fd057dbf 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Nombre d'événements
 ListOfActions=Liste des événements
 EventReports=Rapport des évènements
 Location=Lieu
-ToUserOfGroup=Assigné à tout utilisateur du groupe
+ToUserOfGroup=Événement assigné à tout utilisateur du groupe
 EventOnFullDay=Événement sur la(les) journée(s)
 MenuToDoActions=Événements incomplets
 MenuDoneActions=Événements terminés
@@ -152,6 +152,7 @@ ActionType=Type événement
 DateActionBegin=Date début événément
 ConfirmCloneEvent=Êtes-vous sûr de vouloir cloner cet événement <b>%s</b> ?
 RepeatEvent=Evénement répétitif
+OnceOnly=Une seule fois
 EveryWeek=Chaque semaine
 EveryMonth=Chaque mois
 DayOfMonth=Jour du mois
@@ -160,10 +161,9 @@ DateStartPlusOne=Date de début + 1 heure
 SetAllEventsToTodo=Réglez tous les événements à "A faire"
 SetAllEventsToInProgress=Définir tous les événements à "En cours"
 SetAllEventsToFinished=Définir tous les événements sur "Terminés"
-ReminderTime=Délai de rappel avant l'événement
+ReminderTime=Période de rappel avant l'événement
 TimeType=Type de durée
 ReminderType=Type de rappel
-AddReminder=Créer une notification de rappel automatique pour cet évènement
-ErrorReminderActionCommCreation=Erreur lors de la création de la notification de rappel de cet événement
-BrowserPush=Notification navigateur
-EventReminder=Rappel événement
+AddReminder=Créer une notification de rappel automatique pour cet événement
+ErrorReminderActionCommCreation=Erreur lors de la création de la notification de rappel pour cet événement
+BrowserPush=Notification par Popup navigateur
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index 17a6d56823f..b6ccc999c82 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -173,10 +173,11 @@ SEPAMandate=Mandat SEPA
 YourSEPAMandate=Votre mandat SEPA
 FindYourSEPAMandate=Voici votre mandat SEPA pour autoriser notre société à réaliser les prélèvements depuis votre compte bancaire. Merci de retourner ce mandat signé (scan du document signé) ou en l'envoyant par courrier à 
 AutoReportLastAccountStatement=Remplissez automatiquement le champ 'numéro de relevé bancaire' avec le dernier numéro lors du rapprochement
-CashControl=Clôture de caisse
+CashControl=Contrôle de caisse POS
 NewCashFence=Nouvelle clôture de caisse
 BankColorizeMovement=Coloriser les mouvements
 BankColorizeMovementDesc=Si cette fonction est activée, vous pouvez choisir une couleur de fond spécifique pour les mouvements de débit ou de crédit.
 BankColorizeMovementName1=Couleur de fond pour les mouvements de débit
 BankColorizeMovementName2=Couleur de fond pour le mouvement de crédit
 IfYouDontReconcileDisableProperty=Si vous ne réalisez pas le rapprochement bancaire sur certains comptes bancaires, désactivez la fonctionnalité "%s" pour ne plus afficher cette alerte.
+NoBankAccountDefined=Aucun compte bancaire défini
diff --git a/htdocs/langs/fr_FR/blockedlog.lang b/htdocs/langs/fr_FR/blockedlog.lang
index c0619d33371..be1cefc6ef7 100644
--- a/htdocs/langs/fr_FR/blockedlog.lang
+++ b/htdocs/langs/fr_FR/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Logs inaltérables
 ShowAllFingerPrintsMightBeTooLong=Afficher tous les journaux archivés (peut être long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Afficher tous les journaux d'archives non valides (peut être long)
 DownloadBlockChain=Télécharger les empreintes
-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=Le journal archivé n'est pas valide. Cela signifie que quelqu'un (un pirate informatique ?) a modifié certaines données de ce journal archivé après son enregistrement ou a effacé l'enregistrement archivé précédent (vérifiez que la ligne avec le numéro précédent existe).
 OkCheckFingerprintValidity=Le journal archivé est valide. Les données de cette ligne n'ont pas été modifiées et l'enregistrement suit le précédent.
 OkCheckFingerprintValidityButChainIsKo=Le journal archivé semble valide par rapport au précédent mais la chaîne était corrompue auparavant.
 AddedByAuthority=Stocké dans une autorité distante
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index e2964afd6a3..7fd402af050 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Les %s derniers dons modifiés
 BoxTitleLastModifiedExpenses=Les %s dernières notes de frais modifiées
 BoxTitleLatestModifiedBoms=Les %s dernières nomenclatures modifiées
 BoxTitleLatestModifiedMos=Les %s dernières Ordres de Fabrication modifiées
+BoxTitleLastOutstandingBillReached=Clients dont l'en-cours autorisé est dépassé
 BoxGlobalActivity=Activité globale (factures, propositions, commandes)
 BoxGoodCustomers=Bons clients
 BoxTitleGoodCustomers=%s bons clients
+BoxScheduledJobs=Travaux planifiés
+BoxTitleFunnelOfProspection=Tunnel de prospection
 FailedToRefreshDataInfoNotUpToDate=Échec du rafraichissement du flux RSS. Date du dernier rafraichissement : %s
 LastRefreshDate=Date dernier rafraichissement
 NoRecordedBookmarks=Pas de marques-pages personnels.
@@ -92,8 +95,8 @@ LastXMonthRolling=Les %s derniers mois tournant
 ChooseBoxToAdd=Ajouter le widget au tableau de bord
 BoxAdded=Le widget a été ajouté dans votre tableau de bord
 BoxTitleUserBirthdaysOfMonth=Anniversaires de ce mois (utilisateurs)
-BoxLastManualEntries=Dernières entrées manuelles en comptabilité
-BoxTitleLastManualEntries=%s dernières entrées manuelles
+BoxLastManualEntries=Latest record in accountancy entered manually or without source document
+BoxTitleLastManualEntries=%s latest record entered manually or without source document
 NoRecordedManualEntries=Pas d'entrées manuelles en comptabilité
 BoxSuspenseAccount=Comptage des opérations de comptabilité avec compte d'attente
 BoxTitleSuspenseAccount=Nombre de lignes non allouées
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Le compte d'attente n'est pas défini
 BoxLastCustomerShipments=Dernières expéditions clients
 BoxTitleLastCustomerShipments=Les %s dernières expéditions clients 
 NoRecordedShipments=Aucune expédition client
+BoxCustomersOutstandingBillReached=Clients dont l'en-cours de facturation est dépassé
 # Pages
 AccountancyHome=Comptabilité
+ValidatedProjects=Projets validés
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index 525062f1f32..5e292b0b637 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Bas de page
 AmountAtEndOfPeriod=Montant en fin de période (jour, mois ou année)
 TheoricalAmount=Montant théorique
 RealAmount=Montant réel
-CashFence=Clôture de caisse
-CashFenceDone=Clôture de caisse faite pour la période
+CashFence=Fermeture de caisse
+CashFenceDone=Clôture de caisse effectuée pour la période
 NbOfInvoices=Nb de factures
 Paymentnumpad=Type de pavé pour entrer le paiement
 Numberspad=Pavé numérique
@@ -99,7 +99,8 @@ CashDeskRefNumberingModules=Module de numérotation pour le POS
 CashDeskGenericMaskCodes6 = <br>La balise <b> {TN} </b> est utilisée pour ajouter le numéro de terminal
 TakeposGroupSameProduct=Regrouper les mêmes lignes de produits
 StartAParallelSale=Lancer une nouvelle vente en parallèle
-ControlCashOpening=Fenêtre de contrôle de caisse à l'ouverture du PDV
+SaleStartedAt=Ventes démarrées le %s
+ControlCashOpening=Pop-up de contrôle de caisse à l'ouverture du POS
 CloseCashFence=Clôturer la caisse
 CashReport=Rapport de caisse
 MainPrinterToUse=Imprimante principale à utiliser
@@ -121,4 +122,5 @@ GiftReceiptButton=Ajouter un bouton "Reçu cadeau"
 GiftReceipt=Reçu cadeau
 ModuleReceiptPrinterMustBeEnabled=Le module Imprimante de reçus doit d'abord avoir été activée
 AllowDelayedPayment=Autoriser le paiement différé
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+PrintPaymentMethodOnReceipts=Imprimer le mode de paiement sur les tickets | reçus
+WeighingScale=échelle de poids
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index f69d8573827..a28bf476eeb 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Zone des tags/catégories des projets
 UsersCategoriesArea=Espace tags/catégories des utlisateurs
 SubCats=Sous-catégories
 CatList=Liste des tags/catégories
+CatListAll=Liste de toutes les catégories (de tous types)
 NewCategory=Nouveau tag/catégorie
 ModifCat=Modifier tag/catégorie
 CatCreated=Tags/catégorie créé(e)
@@ -65,22 +66,22 @@ UsersCategoriesShort=Tags utlisateurs
 StockCategoriesShort=Tags/catégories d’entrepôt
 ThisCategoryHasNoItems=Cette catégorie ne contient aucun élément.
 CategId=ID du(de la) tag/catégorie
-ParentCategory=Tag/catégorie parent
-ParentCategoryLabel=Libellé du/de la tag/catégorie parent
-CatSupList=Liste des tags/catégories de fournisseurs
-CatCusList=Liste des tags/catégories de clients/prospects
+ParentCategory=Catégorie parente
+ParentCategoryLabel=Libellé du tag/catégorie parent
+CatSupList=Liste des tags/catégories des fournisseurs
+CatCusList=Liste des tags/catégories des clients/prospects
 CatProdList=Liste des tags/catégories de produits/services
 CatMemberList=Liste des tags/catégories de membres
-CatContactList=Liste des tags/catégories de contacts
-CatProjectsList=Liste des tags/catégories de projets
-CatUsersList=Liste des tags/catégories d'utilisateurs
+CatContactList=Liste des tags/catégories des contacts
+CatProjectsList=Liste des tags/catégories des projets
+CatUsersList=Liste des tags/catégories des utilisateurs
 CatSupLinks=Liens entre fournisseurs et tags/catégories
 CatCusLinks=Liens entre clients/prospects et tags/catégories
 CatContactsLinks=Liens entre contacts/adresses et tags/catégories
 CatProdLinks=Liens entre produits/services et tags/catégories
 CatMembersLinks=Liens entre membres et tags/catégories
 CatProjectsLinks=Liens entre projets et tags/catégories
-CatUsersLinks=Liens entre utilisateurs et tags/catégories
+CatUsersLinks=Liaisons entre les utilisateurs et les tags/catégories
 DeleteFromCat=Enlever des tags/catégories
 ExtraFieldsCategories=Attributs supplémentaires
 CategoriesSetup=Configuration des tags/catégories
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index 1fc19440a1c..c07b5c4611f 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -213,7 +213,7 @@ 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=Identifiant Commun de l’Entreprise (ICE)
+ProfId5MA=Identifiant Commun d’Entreprise (ICE)
 ProfId6MA=-
 ProfId1MX=Id. prof. 1 (R.F.C).
 ProfId2MX=ID. prof. 2 (R..P. IMSS)
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index bc79d32d709..648d8541d28 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -111,7 +111,7 @@ Refund=Rembourser
 SocialContributionsPayments=Paiements de charges fiscales/sociales
 ShowVatPayment=Affiche paiement TVA
 TotalToPay=Total à payer
-BalanceVisibilityDependsOnSortAndFilters=Le solde est visible dans cette liste que si la table est triée en ordre croissant sur %s et filtré pour 1 compte bancaire
+BalanceVisibilityDependsOnSortAndFilters=Le solde est visible dans cette liste que si la table est triée sur %s et filtré sur 1 compte bancaire (sans autres filtres)
 CustomerAccountancyCode=Code comptable client
 SupplierAccountancyCode=Code comptable fournisseur
 CustomerAccountancyCodeShort=Compte comptable client
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Bilan des recettes et dépenses, résumé annuel
 AnnualByCompanies=Balance revenus et dépenses, par groupes prédéfinis de comptes
 AnnualByCompaniesDueDebtMode=Bilan des recettes et dépenses, détaillé par regroupements prédéfinis, mode <b>%sCréances-Dettes%s</b> dit <b>comptabilité d'engagement</b>.
 AnnualByCompaniesInputOutputMode=Bilan des recettes et dépenses, détaillé par regroupements prédéfinis, mode <b>%sRecettes-Dépenses%s</b> dit <b>comptabilité de caisse</b>.
-SeeReportInInputOutputMode=Voir %sanalyse des paiements%s pour un calcul sur les paiements réels effectués même s'ils ne sont pas encore comptabilisés dans le Grand Livre.
-SeeReportInDueDebtMode=Voir %sanalyse des factures%s pour un calcul basé sur les factures enregistrées connues même si elles ne sont pas encore comptabilisées dans le Grand Livre.
-SeeReportInBookkeepingMode=Voir le <b> %sRapport sur le Grand Livre%s </b> pour un calcul sur les <b> tables du Grand Livre</b>
+SeeReportInInputOutputMode=Voir <b>%sanalyse des paiements%s</b> pour un calcul sur les <b>paiements réels effectués</b> même s'ils ne sont pas encore comptabilisés dans le grand livre.
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Cela inclut les enregistrements dans votre Gr
 SeePageForSetup=Voir le menu <a href="%s"> %s </a> pour la configuration
 DepositsAreNotIncluded=- Les factures d'acomptes ne sont pas incluses
 DepositsAreIncluded=- Les factures d'acomptes sont incluses
+LT1ReportByMonth=Rapport de taxe 2 par mois
+LT2ReportByMonth=Rapport de taxe 3 par mois
 LT1ReportByCustomers=Rapport Tax 2 par Tiers
 LT2ReportByCustomers=Rapport Tax 3 par Tiers
 LT1ReportByCustomersES=Rapport par tiers des RE
 LT2ReportByCustomersES=Rapport par client des IRPF
 VATReport=Rapport TVA
 VATReportByPeriods=Rapport de TVA par période
+VATReportByMonth=Rapport de TVA par mois
 VATReportByRates=Rapport TVA par taux
 VATReportByThirdParties=Rapport TVA par Tiers
 VATReportByCustomers=Rapport par client
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index b154c5de72c..5d7b0fc7462 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -84,4 +84,8 @@ MakeLocalDatabaseDumpShort=Sauvegarde locale de base
 MakeLocalDatabaseDump=Créez un fichier dump de base local. Les paramètres sont: compression ('gz' ou 'bz' ou 'none'), type de sauvegarde ('mysql', 'pgsql', 'auto'), 1, 'auto' ou nom du fichier à générer, nombre de fichiers de sauvegarde à garder
 WarningCronDelayed=Attention, à des fins de performance, quelle que soit la prochaine date d'exécution des travaux activés, vos travaux peuvent être retardés jusqu'à %s heures avant d'être exécutés.
 DATAPOLICYJob=Nettoyeur de données et anonymiseur
-JobXMustBeEnabled=Le poste %s doit être activé
+JobXMustBeEnabled=La tâche planifiée %s doit être activée
+# Cron Boxes
+LastExecutedScheduledJob=Dernier travail planifié exécuté
+NextScheduledJobExecute=Prochaine travail planifié à exécuter
+NumberScheduledJobError=Nombre de travaux planifiées en erreur
diff --git a/htdocs/langs/fr_FR/deliveries.lang b/htdocs/langs/fr_FR/deliveries.lang
index 29cbd5736cf..bd13cce814c 100644
--- a/htdocs/langs/fr_FR/deliveries.lang
+++ b/htdocs/langs/fr_FR/deliveries.lang
@@ -27,6 +27,6 @@ Recipient=Destinataire
 ErrorStockIsNotEnough=Le stock est insuffisant
 Shippable=Expédiable
 NonShippable=Non expédiable
-ShowShippableCommand=Afficher statut expédiabilité
+ShowShippableStatus=Afficher le statut Expédiable
 ShowReceiving=Afficher le bon de réception
 NonExistentOrder=Commande inexistante
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index abd1c6ec9f9..f2e046506f7 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -5,9 +5,10 @@ NoErrorCommitIsDone=Pas d'erreur, on valide
 # Errors
 ErrorButCommitIsDone=Erreurs trouvées mais on valide malgré tout
 ErrorBadEMail=email %s invalide
+ErrorBadMXDomain=L'adresse e-mail %s ne semble pas correcte (le domaine n'a pas d'enregistrement MX valide)
 ErrorBadUrl=Url %s invalide
 ErrorBadValueForParamNotAString=Mauvaise valeur de paramètre. Ceci arrive lors d'une tentative de traduction d'une clé non renseignée.
-ErrorRefAlreadyExists=La référence %s 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à.
 ErrorRecordNotFound=Enregistrement non trouvé.
@@ -49,6 +50,7 @@ ErrorFieldsRequired=Des champs obligatoires n'ont pas été renseignés
 ErrorSubjectIsRequired=Le sujet du mail est obligatoire
 ErrorFailedToCreateDir=Echec à la création d'un répertoire. Vérifiez que le user du serveur Web ait bien les droits d'écriture dans les répertoires documents de Dolibarr. Si le paramètre <b>safe_mode</b> a été activé sur ce PHP, vérifiez que les fichiers php dolibarr appartiennent à l'utilisateur du serveur Web.
 ErrorNoMailDefinedForThisUser=Email non défini pour cet utilisateur
+ErrorSetupOfEmailsNotComplete=La configuration de l'envoi des e-mails n'est pas terminée
 ErrorFeatureNeedJavascript=Cette fonctionnalité a besoin de javascript activé pour fonctionner. Modifiez dans configuration - affichage.
 ErrorTopMenuMustHaveAParentWithId0=Un menu de type 'Top' ne peut avoir de menu père. Mettre 0 dans l'id père ou choisir un menu de type 'Left'.
 ErrorLeftMenuMustHaveAParentId=Un menu de type 'Left' doit avoir un id de père.
@@ -76,7 +78,7 @@ ErrorExportDuplicateProfil=Ce nom de profil existe déjà pour ce lot d'export.
 ErrorLDAPSetupNotComplete=Le matching Dolibarr-LDAP est incomplet.
 ErrorLDAPMakeManualTest=Un fichier .ldif a été généré dans le répertoire %s. Essayez de charger ce fichier manuellement depuis la ligne de commande pour plus de détail sur l'erreur.
 ErrorCantSaveADoneUserWithZeroPercentage=Impossible de sauver une action à l'état "non commencé" si le champ "réalisé par" est aussi défini.
-ErrorRefAlreadyExists=La référence utilisée pour la création existe déjà
+ErrorRefAlreadyExists=Le référence <b>%s</b> existe déjà.
 ErrorPleaseTypeBankTransactionReportName=Choisissez le nom du relevé bancaire sur lequel la ligne est rapportées (Format AAAAMM ou AAAAMMJJ)
 ErrorRecordHasChildren=Impossible de supprimer l'enregistrement car il possède des enregistrements fils.
 ErrorRecordHasAtLeastOneChildOfType=L'objet a au moins un enfant de type %s
@@ -217,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Vous devez choisir si l'article e
 ErrorDiscountLargerThanRemainToPaySplitItBefore=La réduction que vous essayez d'appliquer est supérieure au montant du paiement. Auparavant, divisez le rabais en 2 rabais plus petits.
 ErrorFileNotFoundWithSharedLink=Fichier non trouvé. Peut être que la clé de partage a été modifiée ou le fichier a été récemment supprimé.
 ErrorProductBarCodeAlreadyExists=Le code-barre du produit %s existe déjà sur une autre référence de produit
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Notez également que l'utilisation d'un produit virtuel pour augmenter ou réduire automatiquement les sous-produits n'est pas possible lorsqu'au moins un sous-produit (ou sous-produit de sous-produits) a besoin d'un numéro de série/lot.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Notez également que l'utilisation d'un kit pour augmenter ou réduire automatiquement les sous-produits n'est pas possible lorsqu'au moins un sous-produit (ou sous-produit de sous-produits) a besoin d'un numéro de série/lot.
 ErrorDescRequiredForFreeProductLines=La description est obligatoire pour les lignes avec un produit non prédéfini
 ErrorAPageWithThisNameOrAliasAlreadyExists=La page / container <strong> %s </strong> a le même nom ou un autre alias que celui que vous tentez d'utiliser.
 ErrorDuringChartLoad=Erreur lors du chargement du tableau de compte. Si certains comptes n'ont pas été chargés, vous pouvez toujours les entrer manuellement.
@@ -244,6 +246,16 @@ ErrorReplaceStringEmpty=Erreur, la chaîne à remplacer est vide
 ErrorProductNeedBatchNumber=Erreur, le produit '<b> %s </b>' a besoin d'un numéro de lot/série
 ErrorProductDoesNotNeedBatchNumber=Erreur, le produit '<b> %s </b>' n'accepte pas un numéro de lot/série
 ErrorFailedToReadObject=Erreur, échec de la lecture de l'objet de type <b> %s </b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Erreur, le paramètre <b> %s </b> doit être activé dans <b> conf/conf.php <b> pour permettre l'utilisation de l'interface de ligne de commande par le planificateur de travaux interne
+ErrorLoginDateValidity=Erreur, cet identifiant est hors de la plage de date de validité
+ErrorValueLength=La longueur du champ <b>%s</b> doit être supérieure à <b>%s</b>
+ErrorReservedKeyword=Le terme '<b>%s</b>' est un mot clé réservé
+ErrorNotAvailableWithThisDistribution=Non disponible dans cette distribution
+ErrorPublicInterfaceNotEnabled=L’interface publique n’a pas été activée
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=La langue d'une nouvelle page, si elle est la traduction d'une autre page, doit être définie
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=La langue d'une nouvelle page, si elle est définie comme traduction d'une autre page, ne peut pas être la langue principale.
+ErrorAParameterIsRequiredForThisOperation=Un paramètre est obligatoire pour cette opération
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Votre paramètre PHP upload_max_filesize (%s) est supérieur au paramètre PHP post_max_size (%s). Ceci n'est pas une configuration cohérente.
 WarningPasswordSetWithNoAccount=Un mot de passe a été fixé pour cet adhérent. Cependant, aucun compte d'utilisateur n'a été créé. Donc, ce mot de passe est stocké, mais ne peut être utilisé pour accéder à Dolibarr. Il peut être utilisé par un module/interface externe, mais si vous n'avez pas besoin de définir ni login ni mot de passe pour un adhérent, vous pouvez désactiver l'option «Gérer un login pour chaque adhérent" depuis la configuration du module Adhérents. Si vous avez besoin de gérer un login, mais pas de mot de passe, vous pouvez laisser ce champ vide pour éviter cet avertissement. Remarque: L'email peut également être utilisé comme login si l'adhérent est lié à un utilisateur.
@@ -268,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Votre identifiant a été modifié. Par s
 WarningAnEntryAlreadyExistForTransKey=Une donnée identique existe déjà pour la traduction du code dans cette langue
 WarningNumberOfRecipientIsRestrictedInMassAction=Attention, le nombre de destinataires différents est limité à <b>%s</b> lorsque vous utilisez les actions en masse sur les listes
 WarningDateOfLineMustBeInExpenseReportRange=Attention, la date de la ligne n'est pas dans la plage de la note de frais
+WarningProjectDraft=Le projet est au statut brouillon. Validez-le pour utiliser les tâches
 WarningProjectClosed=Le projet est fermé. Vous devez d'abord le rouvrir.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Certaines transactions bancaires ont été supprimées après que le relevé les incluant ait été généré. Aussi, le nombre de chèques et le total des encaissements peuvent différer du nombre et du total dans la liste.
 WarningFailedToAddFileIntoDatabaseIndex=Avertissement, échec de l’ajout d’une entrée de fichier dans le tableau d’index de la base de données GED
+WarningTheHiddenOptionIsOn=Attention, l'option cachée <b>%s</b> est activée
+WarningCreateSubAccounts=Attention, vous ne pouvez pas créer directement un compte auxiliaire, vous devez créer un tiers ou un utilisateur et leur attribuer un code comptable pour les retrouver dans cette liste
+WarningAvailableOnlyForHTTPSServers=Disponible uniquement si une connexion sécurisée HTTPS est utilisée
diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang
index 3de20e83d20..c3c426daf4e 100644
--- a/htdocs/langs/fr_FR/exports.lang
+++ b/htdocs/langs/fr_FR/exports.lang
@@ -133,4 +133,4 @@ KeysToUseForUpdates=Clé à utiliser pour mettre à jour les données
 NbInsert=Nombre de lignes insérées: %s
 NbUpdate=Nombre de lignes mises à jour: %s
 MultipleRecordFoundWithTheseFilters=Plusieurs enregistrements ont été trouvés avec ces filtres: %s
-StocksWithBatch=Stocks et emplacements (entrepôts) des produits avec numéros de lots/séries
\ No newline at end of file
+StocksWithBatch=Stocks et entrepôts des produits avec numéro de lot/série
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index 29d8c39b8b3..f696c06c241 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -133,7 +133,7 @@ MigrationCustomerOrderShipping=Mise à jour stockage des expéditions des comman
 MigrationShippingDelivery=Mise à jour stockage des expéditions
 MigrationShippingDelivery2=Mise à jour stockage des expéditions 2
 MigrationFinished=Migration terminée
-LastStepDesc=<strong> Dernière étape </strong>: définissez ici le nom d'utilisateur et le mot de passe que vous souhaitez utiliser pour vous connecter à Dolibarr. <b> Ne perdez pas cette information, car il s’agit du compte principal pour administrer tous les comptes d’utilisateurs supplémentaires / supplémentaires. </b>
+LastStepDesc=<strong> Dernière étape </strong>: définissez ici le nom d'utilisateur et le mot de passe que vous souhaitez utiliser pour vous connecter à Dolibarr. <b> Ne perdez pas cette information, car il s’agit du compte principal pour administrer tous les comptes d’utilisateurs autres / supplémentaires. </b>
 ActivateModule=Activation du module %s
 ShowEditTechnicalParameters=Cliquer ici pour afficher/éditer les paramètres techniques (mode expert)
 WarningUpgrade=Attention:\nAvez-vous d'abord effectué une sauvegarde de base de données?\nCeci est hautement recommandé. Une perte de données (due par exemple à des bogues dans mysql version 5.5.40/41/42/43) peut être possible au cours de ce processus. Il est donc essentiel de réaliser un vidage complet de votre base de données avant de commencer toute migration.\n\nCliquez sur OK pour démarrer le processus de migration ...
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 66bc8728cd4..3788acb53c4 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=E-mails entrés par l'utilisateur
 MailingModuleDescDolibarrUsers=Utilisateurs avec e-mail
 MailingModuleDescThirdPartiesByCategories=Tiers (par catégories/tags)
 SendingFromWebInterfaceIsNotAllowed=L'envoyer depuis l'interface Web n'est pas autorisé.
+EmailCollectorFilterDesc=Tous les filtres doivent correspondre pour qu'un e-mail soit collecté
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Ligne %s du fichier
@@ -125,12 +126,13 @@ TagMailtoEmail=Email destinataire (incluant le lien "mailto:" html)
 NoEmailSentBadSenderOrRecipientEmail=Aucune email envoyé. Mauvais email expéditeur ou le destinataire. Vérifiez le profil de l'utilisateur.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=Aucune notification par email n'est prévue pour cet événement et société
-ANotificationsWillBeSent=1 notification va être envoyée par email
-SomeNotificationsWillBeSent=%s notifications vont être envoyées par email
-AddNewNotification=Activer un nouveau couple cible/évènement pour notification email
-ListOfActiveNotifications=Liste des cibles/évènements actifs pour notification par emails
-ListOfNotificationsDone=Liste des notifications emails envoyées
+NotificationsAuto=Notifications automatiques
+NoNotificationsWillBeSent=Aucune notification automatique prévue pour ce type d'événement et de tiers.
+ANotificationsWillBeSent=1 notification automatique sera envoyée par e-mail
+SomeNotificationsWillBeSent=%s notification(s) automatique(s) sera enviyée par e-mail
+AddNewNotification=Souscrire à une nouvelle notification automatique (cible/évènement)
+ListOfActiveNotifications=Liste de toutes les souscriptions (cibles/évènements) pour des notifications emails automatiques
+ListOfNotificationsDone=Liste des toutes les notifications automatiques envoyées par e-mail
 MailSendSetupIs=La configuration d'envoi d'emails a été définir sur '%s'. Ce mode ne peut pas être utilisé pour envoyer des e-mailing en masse.
 MailSendSetupIs2=Vous devez d'abord aller, avec un compte d'administrateur, dans le menu %sAccueil - Configuration - EMails%s pour changer le paramètre <strong>'%s'</strong> pour utiliser le mode '%s'. Avec ce mode, vous pouvez entrer le paramétrage du serveur SMTP fourni par votre fournisseur de services Internet et utiliser la fonction d'envoi d'email en masse.
 MailSendSetupIs3=Si vous avez des questions sur la façon de configurer votre serveur SMTP, vous pouvez demander à %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Le fichier d'import doit être au format <strong>emai
 UseFormatInputEmailToTarget=Saisissez une chaîne de caractères au format <strong>email;nom;prénom;autre</strong>
 MailAdvTargetRecipients=Destinataires (sélection avancée)
 AdvTgtTitle=Remplissez les champs de saisie pour pré-sélectionner les tiers ou contacts/adresses cibles
-AdvTgtSearchTextHelp=Utilisez %% comme caractères génériques. Par exemple, pour rechercher tous les éléments tels que <b> jean, joe, jim </b>, vous pouvez saisir <b>j%%</b>, vous pouvez également utiliser ; comme séparateur de valeur et utiliser ! pour exclure cette valeur. Par exemple, <b> jean; joe; jim%%;! jimo;!jima%</b> ciblera tous les jean, joe, commence par jim mais pas jimo et pas tout ce qui commence par jima.
+AdvTgtSearchTextHelp=Utilisez %% comme caractères génériques. Par exemple, pour rechercher tous les éléments tels que <b> jean, joe, jim </b>, vous pouvez saisir <b>j%%</b>, vous pouvez également utiliser ; comme séparateur de valeur et utiliser ! pour exclure cette valeur. Par exemple, <b> jean; joe; jim%%;! jimo;!jima%%</b> ciblera tous les jean, joe, ce qui commence par jim mais pas jimo et pas tout ce qui commence par jima.
 AdvTgtSearchIntHelp=Utiliser un intervalle pour sélectionner un entier ou décimal
 AdvTgtMinVal=Valeur minimum
 AdvTgtMaxVal=Valeur maximum
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Créer filtre
 AdvTgtOrCreateNewFilter=Nom du nouveau filtre
 NoContactWithCategoryFound=Pas de contact/adresses avec cette catégorie
 NoContactLinkedToThirdpartieWithCategoryFound=Pas de contact/adresses associés à un ters avec cette catégorie
-OutGoingEmailSetup=Configuration email sortant
-InGoingEmailSetup=Configuration email entrant
-OutGoingEmailSetupForEmailing=Configuration des e-mails sortants (pour le module %s)
-DefaultOutgoingEmailSetup=Configuration des emails sortant
+OutGoingEmailSetup=E-mails sortants
+InGoingEmailSetup=E-mails entrants
+OutGoingEmailSetupForEmailing=E-mails sortants (module %s)
+DefaultOutgoingEmailSetup=Même configuration que la configuration globale des e-mails sortants
 Information=Information
 ContactsWithThirdpartyFilter=Contacts ayant pour tiers
 Unanswered=Sans réponse
 Answered=Répondu
 IsNotAnAnswer=N'est pas une réponse (e-mail initial)
 IsAnAnswer=Est une réponse à un e-mail initial
+RecordCreatedByEmailCollector=Enregistrement créé par le Collecteur d'e-mails%s depuis l'email %s
+DefaultBlacklistMailingStatus=Statut par défaut des contacts qui refusent les emailing
+DefaultStatusEmptyMandatory=Vide mais obligatoire
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 3f1076eb335..a862a1ecb9d 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Pas de modèle défini pour ce type d'email
 AvailableVariables=Variables de substitution disponibles
 NoTranslation=Pas de traduction
 Translation=Traduction
+CurrentTimeZone=Fuseau horaire PHP (serveur)
 EmptySearchString=Entrez des critères de recherche non vides
+EnterADateCriteria=Saisissez une date
 NoRecordFound=Aucun enregistrement trouvé
 NoRecordDeleted=Aucun enregistrement supprimé
 NotEnoughDataYet=Pas assez de données
@@ -85,6 +87,8 @@ 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
+HomePage=Page d'accueil
 RecordSaved=Enregistrement sauvegardé
 RecordDeleted=Enregistrement supprimé
 RecordGenerated=Enregistrement généré
@@ -220,6 +224,7 @@ Value=Valeur
 PersonalValue=Valeur personnelle
 NewObject=Nouveau %s
 NewValue=Nouvelle valeur
+OldValue=Ancienne valeur %s
 CurrentValue=Valeur courante
 Code=Code
 Type=Type
@@ -433,6 +438,7 @@ RemainToPay=Reste à payer
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filtres
 List=Liste
 FullList=Liste complète
 FullConversation=Conversation complète
@@ -650,6 +656,7 @@ SupplierPreview=Aperçu fournisseur
 ShowCustomerPreview=Afficher aperçu client
 ShowSupplierPreview=Afficher aperçu fournisseur
 RefCustomer=Réf. client
+InternalRef=Réf. interne
 Currency=Devise
 InfoAdmin=Information pour les administrateurs
 Undo=Annuler
@@ -672,7 +679,6 @@ Email=Email
 NoEMail=Pas d'email
 AlreadyRead=Déjà lu
 NotRead=Non lu
-Unread=Non lu
 NoMobilePhone=Pas de téléphone portable
 Owner=Propriétaire
 FollowingConstantsWillBeSubstituted=Les constantes suivantes seront substituées par leur valeur correspondante.
@@ -1108,3 +1114,9 @@ UpToDate=Adhésion à jour
 OutOfDate=Adhésion expirée
 EventReminder=Rappel d'événement
 UpdateForAllLines=Mise à jour de toutes les lignes
+OnHold=En attente
+Civility=Civilité
+AffectTag=Affecter une catégorie
+ConfirmAffectTag=Affectation de catégories en masse
+ConfirmAffectTagQuestion=Êtes-vous sur de vouloir affecter ces catégories aux %s lignes sélectionnées ?
+CategTypeNotFound=Aucune catégorie trouvée
diff --git a/htdocs/langs/fr_FR/modulebuilder.lang b/htdocs/langs/fr_FR/modulebuilder.lang
index 9dea25a8b29..15d87656f4b 100644
--- a/htdocs/langs/fr_FR/modulebuilder.lang
+++ b/htdocs/langs/fr_FR/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=Page PHP pour créer/modifier/afficher un enregistrement
 PageForAgendaTab=Page PHP pour l'onglet événement
 PageForDocumentTab=Page PHP pour l'onglet document
 PageForNoteTab=Page PHP pour l'onglet note
+PageForContactTab=Page PHP pour l'onglet contact
 PathToModulePackage=Chemin du zip du package du module/application
 PathToModuleDocumentation=Chemin d'accès au fichier de documentation du module (%s)
 SpaceOrSpecialCharAreNotAllowed=Les espaces et les caractères spéciaux ne sont pas autorisés.
@@ -77,7 +78,7 @@ IsAMeasure=Est une mesure
 DirScanned=Répertoire scanné
 NoTrigger=Pas de trigger
 NoWidget=Aucun widget
-GoToApiExplorer=Se rendre sur l'explorateur d'API
+GoToApiExplorer=Explorateur d'API
 ListOfMenusEntries=Liste des entrées du menu
 ListOfDictionariesEntries=Liste des entrées de dictionnaires
 ListOfPermissionsDefined=Liste des permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Si vous connaissez SQL et PHP, vous pouvez utiliser l'a
 SeeTopRightMenu=Voir <span class="fa fa-bug"></span> à droite de votre barre de menu principal
 AddLanguageFile=Ajouter le fichier de langue
 YouCanUseTranslationKey=Vous pouvez utiliser ici une clé qui est la clé de traduction trouvée dans le fichier de langue (voir l'onglet "Langues")
-DropTableIfEmpty=(Supprimer la table si vide)
+DropTableIfEmpty=(Supprimer la table si elle est vide)
 TableDoesNotExists=La table %s n'existe pas
 TableDropped=La table %s a été supprimée
 InitStructureFromExistingTable=Construire la chaîne du tableau de structure d'une table existante
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Utiliser une URL d'éditeur spécifique
 UseSpecificFamily = Utiliser une famille spécifique
 UseSpecificAuthor = Utiliser un auteur spécifique
 UseSpecificVersion = Utiliser une version initiale spécifique
-ModuleMustBeEnabled=Le module / application doit être activé d'abord
 IncludeRefGeneration=La référence de l'objet doit être générée automatiquement
 IncludeRefGenerationHelp=Cochez cette option si vous souhaitez inclure du code pour gérer la génération automatique de la référence
 IncludeDocGeneration=Je veux générer des documents à partir de l'objet
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type de champs: <br> varchar (99), double (24,8), réel, texte,
 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é à l'utilisateur courant
diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang
index f1eaeffdfed..51807552945 100644
--- a/htdocs/langs/fr_FR/mrp.lang
+++ b/htdocs/langs/fr_FR/mrp.lang
@@ -77,4 +77,28 @@ UnitCost=Coût unitaire
 TotalCost=Coût total
 BOMTotalCost=Le coût de production de cette nomenclature basé sur chaque quantité et produit à consommer (utilise le prix de revient si défini, sinon le PMP si défini, sinon le meilleur prix d'achat)
 GoOnTabProductionToProduceFirst=Vous devez avoir la production pour clôturer un Ordre de Fabrication (voir onglet '%s'). Mais vous pouvez l'annuler.
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=Un kit ne peut pas être utilisé dans une nomenclature ou un ordre de fabrication.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Un kit ne peut pas être utilisé dans une Nomenclature ou un Ordre de fabrication.
+Workstation=Poste de travail
+Workstations=Postes de travail
+WorkstationsDescription=Gestion des postes de travail
+WorkstationSetup = Workstations setup
+WorkstationSetupPage = Configuration du module Poste de travail 
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about page
+WorkstationList=Liste des postes de travail
+WorkstationCreate=Ajouter un nouveau poste de travail
+ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
+EnableAWorkstation=Activer le module Poste de travail
+ConfirmDisableWorkstation=Êtes-vous sûr de vouloir désactiver le module Poste de travail <b>%s</b> ?
+DisableAWorkstation=Désactiver un poste de travail
+DeleteWorkstation=Supprimer
+NbOperatorsRequired=Nombre d'opérateurs requis
+THMOperatorEstimated=THM estimé de l'opérateur
+THMMachineEstimated=THM machine estimé
+WorkstationType=Type de poste de travail
+Human=umain
+Machine=Machine
+HumanMachine=Humain/machine
+WorkstationArea=Espace Poste de travail
+Machines=Machines
+THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 0a5abbfbf3a..3023cd7216e 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -1,12 +1,10 @@
 # Dolibarr language file - Source file is en_US - other
-SecurityCode=Code de sécurité
+SecurityCode=Code sécurité
 NumberingShort=N°
 Tools=Outils
 TMenuTools=Outils
 ToolsDesc=Cet espace regroupe divers outils non accessibles par les autres entrées du menu. <br>Tous ces outils sont accessibles depuis le menu sur le côté.. 
 Birthday=Anniversaire
-BirthdayDate=Date anniversaire
-DateToBirth=Date de naissance
 BirthdayAlertOn=alerte anniversaire active
 BirthdayAlertOff=alerte anniversaire inactive
 TransKey=Traduction de la clé TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Mois précédent (numéro 1-12) la date de facturation
 TextPreviousMonthOfInvoice=Mois précédent (texte) de la date de facturation
 NextMonthOfInvoice=Le mois suivant (numéro 1-12) la date de facturation
 TextNextMonthOfInvoice=Le mois suivant (texte) la date de facturation
+PreviousMonth=Mois précédent
+CurrentMonth=Mois en cours
 ZipFileGeneratedInto=Fichier zip généré dans <b>%s</b>
 DocFileGeneratedInto=Fichier doc généré dans <b>%s</b>.
 JumpToLogin=Déconnecté. Aller à la page de connexion ...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Note de frais validée (approbation requise)
 Notify_EXPENSE_REPORT_APPROVE=Note de frais approuvé
 Notify_HOLIDAY_VALIDATE=Demande de congé validée (approbation requise)
 Notify_HOLIDAY_APPROVE=Demande de congé approuvée
+Notify_ACTION_CREATE=Evénement ajouté à l'agenda
 SeeModuleSetup=Voir la configuration du module %s
 NbOfAttachedFiles=Nombre de fichiers/documents liés
 TotalSizeOfAttachedFiles=Taille totale fichiers/documents liés
@@ -97,12 +98,9 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nVeuillez trouver, ci-joint
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nVeuillez trouver, ci-joint, la facture __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nVeuillez trouver, ci-joint, le bon d'expédition __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nVeuillez trouver, ci-joint, la fiche intervention __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Vous pouvez cliquer sur le lien ci-dessous pour effectuer votre paiement si ce n'est déjà fait.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendActionComm=Rappel événement "__EVENT_LABEL__" le __EVENT_DATE__ à __EVENT_TIME__<br><br>Ceci est un message automatique, merci de ne pas répondre.
+PredefinedMailContentSendActionComm=Rappel de l'événement "__EVENT_LABEL__" le __EVENT_DATE__ à __EVENT_TIME__<br> <br>Ceci est un message automatique. Veuillez ne pas y répondre.
 DemoDesc=Dolibarr est un logiciel de gestion proposant plusieurs modules métiers. Une démonstration qui inclut tous ces modules n'a pas de sens car ce cas n'existe jamais (plusieurs centaines de modules disponibles). Aussi, quelques profils type de démo sont disponibles.
 ChooseYourDemoProfil=Veuillez choisir le profil de démonstration qui correspond le mieux à votre activité…
 ChooseYourDemoProfilMore=...ou construisez votre propre profil<br>(sélection manuelle des modules)
@@ -141,7 +139,7 @@ Right=Droite
 CalculatedWeight=Poids calculé
 CalculatedVolume=Volume calculé
 Weight=Poids
-WeightUnitton=tonnes
+WeightUnitton=tonne
 WeightUnitkg=Kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -218,6 +216,7 @@ EMailTextExpenseReportValidated=La note de frais %s a été validée.
 EMailTextExpenseReportApproved=La note de frais %s a été approuvée.
 EMailTextHolidayValidated=La demande de congé %s a été validée.
 EMailTextHolidayApproved=La demande de congé %s a été approuvée.
+EMailTextActionAdded=L'événement %s a été ajouté à l'agenda
 ImportedWithSet=Lot d'importation (Import key)
 DolibarrNotification=Notification automatique
 ResizeDesc=Entrer la nouvelle largeur <b>OU</b> la nouvelle hauteur. Le ratio d'aspect est conservé lors du redimensionnement…
@@ -262,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/adresse créé par le collecteur de courr
 ProjectCreatedByEmailCollector=Projet créé par le collecteur de courrier électronique à partir du courrier électronique MSGID %s
 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
+PrefixSession=Préfixe pour l'ID de la session
 
 ##### Export #####
 ExportsArea=Espace exports
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index c380edd77f3..5610a674018 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Remplissez avec la date de la dernière ligne de servic
 MultiPricesAbility=Plusieurs niveaux de prix par produit/service (chaque client est dans un et un seul niveau)
 MultiPricesNumPrices=Nombre de prix
 DefaultPriceType=Base des prix par défaut (avec ou hors taxes) lors de l’ajout de nouveaux prix de vente
-AssociatedProductsAbility=Activer les kits (produits virtuels)
+AssociatedProductsAbility=Activer les kits (ensemble de plusieurs produits)
+VariantsAbility=Activer les variantes (variantes de produits, par exemple couleur, taille,...)
 AssociatedProducts=Kits
 AssociatedProductsNumber=Nombre de sous-produits constituant ce kit
 ParentProductsNumber=Nbre de produits virtuels/packages parent
@@ -167,8 +168,10 @@ BuyingPrices=Prix d'achat
 CustomerPrices=Prix clients
 SuppliersPrices=Prix fournisseurs
 SuppliersPricesOfProductsOrServices=Prix fournisseurs (des produits ou services)
-CustomCode=Nomenclature douanière / Code SH
+CustomCode=Nomenclature douanière ou Code SH
 CountryOrigin=Pays d'origine
+RegionStateOrigin=Région d'origine
+StateOrigin=Département d'origine
 Nature=Nature du produit (matière première / produit fini)
 NatureOfProductShort=Nature de produit
 NatureOfProductDesc=Matière première ou produit fini
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Utiliser le prix fixé
 PriceByQuantity=Prix différents par quantité
 DisablePriceByQty=Désactiver les prix par quantité
 PriceByQuantityRange=Grille de quantités
-MultipriceRules=Règles du niveau de prix
+MultipriceRules=Prix automatiques pour le niveau
 UseMultipriceRules=Utilisation des règles de niveau de prix (définies dans la configuration du module de produit) pour calculer automatiquement le prix de tous les autres niveaux en fonction de premier niveau
 PercentVariationOver=%% de variation sur %s
 PercentDiscountOver=%% de remis sur %s
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 3ffd43a0fbe..1affdad0889 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -76,15 +76,16 @@ MyActivities=Mes tâches/activités
 MyProjects=Mes projets
 MyProjectsArea=Espace Mes projets
 DurationEffective=Durée effective
-ProgressDeclared=Progression déclarée
+ProgressDeclared=Avancement réel déclaré
 TaskProgressSummary=Progression de tâche
 CurentlyOpenedTasks=Tâches actuellement ouvertes
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=La progression déclarée est inférieure à %s à la progression calculée.
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=La progression déclarée est plus %s que la progression calculée
-ProgressCalculated=Progression calculée
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=L'avancement réel déclaré est %s moins important que l'avancement de la consommation
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=L'avancement réel déclaré est %splus important que l'avancement de la consommation
+ProgressCalculated=Avancement sur consommation
 WhichIamLinkedTo=dont je suis contact
 WhichIamLinkedToProject=dont je suis contact de projet
 Time=Temps
+TimeConsumed=Consommé
 ListOfTasks=Liste de tâches
 GoToListOfTimeConsumed=Aller à la liste des temps consommés
 GanttView=Vue Gantt
@@ -256,7 +257,7 @@ ServiceToUseOnLines=Service à utiliser sur les lignes
 InvoiceGeneratedFromTimeSpent=La facture %s a été générée à partir du temps passé sur le projet
 ProjectBillTimeDescription=Cochez si vous saisissez du temps sur les tâches du projet ET prévoyez de générer des factures à partir des temps pour facturer le client du projet (ne cochez pas si vous comptez créer une facture qui n'est pas basée sur la saisie des temps). Note: Pour générer une facture, aller sur l'onglet 'Temps consommé' du project et sélectionnez les lignes à inclure.
 ProjectFollowOpportunity=Suivre une opportunité 
-ProjectFollowTasks=Suivez des tâches ou du temps passé
+ProjectFollowTasks=Suivre des tâches ou du temps passé
 Usage=Usage
 UsageOpportunity=Utilisation: Opportunité
 UsageTasks=Utilisation: Tâches
diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang
index 64199c5248d..aaff4579427 100644
--- a/htdocs/langs/fr_FR/propal.lang
+++ b/htdocs/langs/fr_FR/propal.lang
@@ -90,12 +90,17 @@ PassedInOpenStatus = passé au statut "ouvert"
 CantBeSign = ne peut pas être signée
 Sign = Signer
 Signed = signé
+NoSign = Non signer
+NoSigned = Non signé
 CantBeSign = ne peut pas être signé
+CantBeSign = ne peut pas être non signé
 CantBeValidated = Ne peut pas être validé
 ConfirmMassValidation = Confirmer la validation ?
 ConfirmMassSignature = Confirmer la signature ?
+ConfirmMassNoSignature = Confirmer la non signature ?
 ConfirmMassValidationQuestion = Voulez-vous confirmer la validation des devis brouillons selectionnés ?
 ConfirmMassSignatureQuestion = Voulez-vous confirmer la signature des devis ouvert selectionnés ?
+ConfirmMassNoSignatureQuestion = Voulez-vous confirmer la non signature des devis ouvert selectionnés ?
 PropNoProductOrService = devis ne contient pas de produits ni de services
 PropsNoProductOrService = devis ne contiennent pas de produits ni de services
 IdProposal=ID de proposition
diff --git a/htdocs/langs/fr_FR/recruitment.lang b/htdocs/langs/fr_FR/recruitment.lang
index bea2b2fa539..c3fcd8fece3 100644
--- a/htdocs/langs/fr_FR/recruitment.lang
+++ b/htdocs/langs/fr_FR/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=Le poste n'est plus ouvert. Le poste a été pourvu.
 JobClosedTextCanceled=Le poste n'est plus ouvert.
 ExtrafieldsJobPosition=Attributs complémentaires (postes)
 ExtrafieldsCandidatures=Attributs complémentaires (candidature)
+MakeOffer=Faire un offre
diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang
index 49586113bd9..d2b56dfe677 100644
--- a/htdocs/langs/fr_FR/sendings.lang
+++ b/htdocs/langs/fr_FR/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Autres expéditions pour cette commande
 SendingsAndReceivingForSameOrder=Expéditions et réceptions pour cette commande
 SendingsToValidate=Expéditions à valider
 StatusSendingCanceled=Annulée
+StatusSendingCanceledShort=Annulée
 StatusSendingDraft=Brouillon
 StatusSendingValidated=Validée (produits à envoyer ou envoyés)
 StatusSendingProcessed=Traitée
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Vous devez d'abord valider la commande pour pou
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Modèle de bon de réception/livraison complet (logo…)
+DocumentModelStorm=Modèle de document plus complet des fiches expéditions et compatibilité avec les attributs complémentaires (logo,...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constante EXPEDITION_ADDON_NUMBER non définie
 SumOfProductVolumes=Somme des volumes des produits
 SumOfProductWeights=Somme des poids des produits
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index f5c3c9453e3..c29c3b26d82 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Valorisation des stocks
 UserWarehouseAutoCreate=Créer automatiquement un stock/entrepôt propre à l'utilisateur lors de sa création
 AllowAddLimitStockByWarehouse=Gérez également les valeurs des stocks minimums et souhaités par paire (produit-entrepôt) en plus des valeurs de minimums et souhaités par produit
 RuleForWarehouse=Règle pour les entrepôts
+WarehouseAskWarehouseDuringPropal=Définir un entrepôt sur les propositions
 WarehouseAskWarehouseDuringOrder=Définir un entrepôt sur les commandes
 UserDefaultWarehouse=Définir un entrepôt sur les utilisateurs
 MainDefaultWarehouse=Entrepôt par défaut
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Définissez la valeur sur 0 pour réinitialiser la quantit
 UpdateByScaning=Mise à jour par scan
 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 tout mouvement de stock de ce kit
diff --git a/htdocs/langs/fr_FR/ticket.lang b/htdocs/langs/fr_FR/ticket.lang
index 926ca24d3da..d2dbef92452 100644
--- a/htdocs/langs/fr_FR/ticket.lang
+++ b/htdocs/langs/fr_FR/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Sévérités
 TicketDictResolution=Ticket - Résolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Question commerciale
 
+TicketTypeShortCOM=Question commerciale
 TicketTypeShortHELP=Demande d'aide fonctionnelle
 TicketTypeShortISSUE=Problème ou bogue
 TicketTypeShortREQUEST=Demande de changement ou d'amélioration
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Autre
 TicketSeverityShortLOW=Faible
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Élevé
-TicketSeverityShortBLOCKING=Critique/Bloquant
+TicketSeverityShortBLOCKING=Critique, bloquant
 
 ErrorBadEmailAddress=Champ '%s' incorrect
 MenuTicketMyAssign=Mes tickets
@@ -125,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=L'interface publique permet à tous les visit
 TicketsAutoAssignTicket=Affecter automatiquement l'utilisateur qui a créé le ticket
 TicketsAutoAssignTicketHelp=Lors de la création d'un ticket, l'utilisateur peut être automatiquement affecté au ticket.
 TicketNumberingModules=Module de numérotation des tickets
+TicketsModelModule=Modèles de documents pour les tickets
 TicketNotifyTiersAtCreation=Notifier le tiers à la création
 TicketsDisableCustomerEmail=Toujours désactiver les courriels lorsqu'un ticket est créé depuis l'interface publique
 TicketsPublicNotificationNewMessage=Envoyer un (des) courriel (s) lorsqu’un nouveau message est ajouté
@@ -230,8 +229,8 @@ TicketChangeStatus=Changer l'état
 TicketConfirmChangeStatus=Confirmez le changement d'état: %s?
 TicketLogStatusChanged=Statut modifié: %s à %s
 TicketNotNotifyTiersAtCreate=Ne pas notifier l'entreprise à la création
+Unread=Non lu
 TicketNotCreatedFromPublicInterface=Non disponible. Le ticket n’a pas été créé à partir de l'interface publique.
-PublicInterfaceNotEnabled=L’interface publique n’a pas été activée
 ErrorTicketRefRequired=La référence du ticket est requise
 
 #
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index 0db2af94537..ce277cc5f52 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -30,7 +30,6 @@ EditInLine=Editer en ligne
 AddWebsite=Ajouter site web
 Webpage=Page/container Web
 AddPage=Ajouter une page/container
-HomePage=Page d'accueil
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=La prévisualisation de votre site web <strong>%s</strong> n'est pas disponible actuellement. Vous devez d'abord '<strong>Importer un modèle de site web complet</strong>' ou juste '<strong>Ajouter une page/container</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.
@@ -136,4 +135,5 @@ RSSFeed=Flux RSS
 RSSFeedDesc=Vous pouvez obtenir un flux RSS des derniers articles de type 'blogpost' en utilisant cette URL
 PagesRegenerated=%s page(s)/conteneur(s) régénéré(s)
 RegenerateWebsiteContent=Régénérer les fichiers de cache du site Web
-AllowedInFrames=Autorisé dans les cadres
+AllowedInFrames=Autorisé dans les Frames
+DefineListOfAltLanguagesInWebsiteProperties=Définir la liste des langues disponibles dans les propriétés du site web.
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index 1649b7271de..771fcfbcc83 100644
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -42,8 +42,10 @@ LastWithdrawalReceipt=Les %s derniers bons de prélèvements
 MakeWithdrawRequest=Faire une demande de prélèvement
 MakeBankTransferOrder=Faire une demande de virement
 WithdrawRequestsDone=%s demandes de prélèvements enregistrées
+BankTransferRequestsDone=%s demande de prélèvement enregistrée
 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=Ce bon de prélèvement est déjà classé crédité ; cette opération ne peut pas être réalisée deux fois, car cela pourrait engendrer des doublons dans les paiements et les écritures bancaires.
 ClassCredited=Classer crédité
 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
@@ -131,7 +133,8 @@ SEPARCUR=SEPA RCUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Date d'éxecution
 CreateForSepa=Créer fichier de prélèvement automatique
-ICS=Identifiant du créancier CI
+ICS=Identifiant du créditeur (CI) du prélèvement
+ICSTransfer=Identifiant créditeur (CI) du virement bancaire
 END_TO_END=Balise XML SEPA "EndToEndId" - Identifiant unique attribué par transaction
 USTRD=Balise XML SEPA "Non structurée"
 ADDDAYS=Ajouter des jours à la date d'exécution
@@ -146,3 +149,5 @@ InfoRejectSubject=Ordre de prélèvement rejeté
 InfoRejectMessage=Bonjour, <br><br> l'ordre de prélèvement de la facture %s liée à la société %s, avec un montant de %s a été refusé par la banque.<br><br>--<br>%s
 ModeWarning=Option mode réel non établi, nous allons arrêter après cette simulation
 ErrorCompanyHasDuplicateDefaultBAN=La société avec l'identifiant %s a plus d'un compte bancaire par défaut. Aucun moyen de savoir lequel utiliser.
+ErrorICSmissing=ICS manquant pour le compte bancaire %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/fr_FR/workflow.lang b/htdocs/langs/fr_FR/workflow.lang
index 0c753a2529e..2af480afa83 100644
--- a/htdocs/langs/fr_FR/workflow.lang
+++ b/htdocs/langs/fr_FR/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classer les réceptions en "facturées" lorsqu'un
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Fermer toutes les interventions liées au ticket lorsqu'un ticket est fermé
 AutomaticCreation=Création automatique
 AutomaticClassification=Classification automatique
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/fr_GA/accountancy.lang b/htdocs/langs/fr_GA/accountancy.lang
new file mode 100644
index 00000000000..552865118f1
--- /dev/null
+++ b/htdocs/langs/fr_GA/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
diff --git a/htdocs/langs/fr_GA/admin.lang b/htdocs/langs/fr_GA/admin.lang
index 8c6135dc874..ca2cbd16ab0 100644
--- a/htdocs/langs/fr_GA/admin.lang
+++ b/htdocs/langs/fr_GA/admin.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - admin
 Module20Name=Devis
 Module30Name=Factures
+Module59000Desc=Module to follow margins
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
diff --git a/htdocs/langs/fr_GA/compta.lang b/htdocs/langs/fr_GA/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/fr_GA/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/fr_GA/mrp.lang b/htdocs/langs/fr_GA/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/fr_GA/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/fr_GA/products.lang b/htdocs/langs/fr_GA/products.lang
index 6e900475275..2a38b9b0181 100644
--- a/htdocs/langs/fr_GA/products.lang
+++ b/htdocs/langs/fr_GA/products.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
+AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/fr_GA/withdrawals.lang b/htdocs/langs/fr_GA/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/fr_GA/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/gl_ES/accountancy.lang b/htdocs/langs/gl_ES/accountancy.lang
index 1aa15550b74..de9a83b813d 100644
--- a/htdocs/langs/gl_ES/accountancy.lang
+++ b/htdocs/langs/gl_ES/accountancy.lang
@@ -16,16 +16,18 @@ ThisService=Este servizo
 ThisProduct=Este produto
 DefaultForService=Predeterminado para o servizo
 DefaultForProduct=Predeterminado para o produto
+ProductForThisThirdparty=Produto para este terceiro
+ServiceForThisThirdparty=Servizo para este terceiro
 CantSuggest=Non pode suxerirse
 AccountancySetupDoneFromAccountancyMenu=A maior parte da configuración da contabilidade realizase dende o menú %s
-ConfigAccountingExpert=Configuration of the module accounting (double entry)
+ConfigAccountingExpert=Configuración do módulo contabilidade (entrada doble)
 Journalization=Procesar diarios
 Journals=Diarios
 JournalFinancial=Diarios financieiros
 BackToChartofaccounts=Voltar ao plan contable
 Chartofaccounts=Plan contable
-ChartOfSubaccounts=Chart of individual accounts
-ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
+ChartOfSubaccounts=Gráficos de contas individuais
+ChartOfIndividualAccountsOfSubsidiaryLedger=Graficos de contas indivudais dependendets do libro maior
 CurrentDedicatedAccountingAccount=Conta contable adicada
 AssignDedicatedAccountingAccount=Nova conta a asignar
 InvoiceLabel=Etiqueta factura
@@ -35,8 +37,8 @@ OtherInfo=Outra información
 DeleteCptCategory=Eliminar a conta contable do grupo
 ConfirmDeleteCptCategory=¿Está certo de querer eliminar esta conta contable do grupo de contas contables?
 JournalizationInLedgerStatus=Estado de diario
-AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
+AlreadyInGeneralLedger=Xa rexistrado en contas contables e no Libro Maior
+NotYetInGeneralLedger=Non foi rexistrado aínda en contas contables nin no Libro Maior
 GroupIsEmptyCheckSetup=O grupo está baleiro, comprobe a configuración da personalización de grupos contables
 DetailByAccount=Amosar detalles por conta
 AccountWithNonZeroValues=Contas con valores non cero
@@ -45,9 +47,10 @@ CountriesInEEC=Países na CEE
 CountriesNotInEEC=Países non CEE
 CountriesInEECExceptMe=Todos os paises incluidos na CEE excepto %s
 CountriesExceptMe=Todos os países excepto %s
-AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
-VueByAccountAccounting=View by accounting account
+AccountantFiles=Exportar documentos contables
+ExportAccountingSourceDocHelp=Con esta utilidade, pode exportar os eventos de orixe (lista e PDFs) que foron empregados para xerar a súa contabilidade. Para exportar os seus diarios, use a entrada de menú% s -% s.
+VueByAccountAccounting=Ver por conta contable
+VueBySubAccountAccounting=Ver pos subconta contable
 
 MainAccountForCustomersNotDefined=Conta contable principal para clientes non definida na configuración
 MainAccountForSuppliersNotDefined=Conta contable principal para provedores non definida na configuración
@@ -83,7 +86,7 @@ AccountancyAreaDescAnalyze=PASO %s: Engadir ou editar transaccións existentes,
 
 AccountancyAreaDescClosePeriod=PASO %s: Pechar periodo, polo que non poderá facer modificacións nun futuro.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Non foi completado un paso obrigatorio na configuración (conta contable non definida en todas as contas bancarias)
 Selectchartofaccounts=Seleccione un plan contable activo
 ChangeAndLoad=Cambiar e cargar
 Addanaccount=Engadir unha conta contable
@@ -93,8 +96,8 @@ SubledgerAccount=Subconta contable
 SubledgerAccountLabel=Etiqueta subconta contable
 ShowAccountingAccount=Amosar contabilidade
 ShowAccountingJournal=Amosar diario contable
-ShowAccountingAccountInLedger=Show accounting account in ledger
-ShowAccountingAccountInJournals=Show accounting account in journals
+ShowAccountingAccountInLedger=Amosar a conta contable no libro maior
+ShowAccountingAccountInJournals=Amosar a conta contable nos diarios
 AccountAccountingSuggest=Conta contable suxerida
 MenuDefaultAccounts=Contas contables por defecto
 MenuBankAccounts=Contas Bancarias
@@ -116,9 +119,9 @@ ExpenseReportsVentilation=Contabilizar informes de gastos
 CreateMvts=Crear nova transacción
 UpdateMvts=Modificación dunha transacción
 ValidTransaction=Transacción validada
-WriteBookKeeping=Register transactions in accounting
+WriteBookKeeping=Rexistrar movementos en contabilidade
 Bookkeeping=Libro Maior
-BookkeepingSubAccount=Subledger
+BookkeepingSubAccount=Librp maior auxiliar
 AccountBalance=Saldo da conta
 ObjectsRef=Referencia de obxecto orixe
 CAHTF=Total compras a provedor antes de impostos
@@ -128,7 +131,7 @@ InvoiceLinesDone=Liñas de facturas contabilizadas
 ExpenseReportLines=Liñas de informes de gastos a contabilizar
 ExpenseReportLinesDone=Liñas de informes de gastos contabilizadas
 IntoAccount=Contabilizar liña coa conta contable
-TotalForAccount=Total para a conta contable
+TotalForAccount=Total for accounting account
 
 
 Ventilate=Contabilizar
@@ -144,20 +147,20 @@ NotVentilatedinAccount=Conta sen contabilización na contabilidad
 XLineSuccessfullyBinded=%s produtos/servizos relacionados correctamente nunha conta contable
 XLineFailedToBeBinded=%s produtos/servizos sen conta contable
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a contabilizar que amósanse por páxina (máximo recomendado: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Número máximo de liñas na listaxe e na páxina de ligazón (recomendado: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ordear as páxinas de contabilización "A contabilizar" polos elementos mais recentes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ordear as páxinas de contabilización "Contabilizadas" polos elementos mais recentes
 
-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.
+ACCOUNTING_LENGTH_DESCRIPTION=Acortar a descrición de produtoe e servizos nas listaxes despois de x caracteres (Mellor = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Acortar no formulario de descrición da conta de produtos e servizos nas listaxes despois de x caracteres (Mellor = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Lonxitude das contas contables en xeral (Se define o valor 6 aquí, a conta "706" aparecerá como "706000" na pantalla)
+ACCOUNTING_LENGTH_AACCOUNT=Lonxitude das contas contables de terceiros (Se define o valor 6 aquí, a conta "401" aparecerá como "401000" na pantalla)
+ACCOUNTING_MANAGE_ZERO=Permitir xestionar un número diferente de ceros ao final dunha conta contable. Preciso por algúns países (como Suíza). Se está desactivado (predeterminado), pode configurar os seguintes dous parámetros  para solicitar á aplicación que engada ceros virtuais.
 BANK_DISABLE_DIRECT_INPUT=Desactivar transaccións directas en conta bancaria
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilitar exportación de borradores al diario
-ACCOUNTANCY_COMBO_FOR_AUX=Habilita a listaxe combinada para a conta subsidiaria (pode ser lento se ten moitos terceiros)
-ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
+ACCOUNTANCY_COMBO_FOR_AUX=Habilita a listaxe combinada para a conta contable subsidiaria (pode ser lento se ten moitos terceiros)
+ACCOUNTING_DATE_START_BINDING=Define unha data para comezar a ligar e transferir na contabilidade. Por debaixo desta data, as transaccións non se transferirán á contabilidade.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Na transferencia de contabilidade, selecciona amosar o período por defecto
 
 ACCOUNTING_SELL_JOURNAL=Diario de vendas
 ACCOUNTING_PURCHASE_JOURNAL=Diario de compras
@@ -177,18 +180,18 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Conta contable de operacións pendentes de asignar
 DONATION_ACCOUNTINGACCOUNT=Conta contable de rexistro de doacións/subvencións
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Conta contable de rexistro subscricións
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Conta contable por defecto para rexistrar os ingresos do cliente
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conta contable predeterminada para produtos comprados (usada se non están definidos na folla de produtos)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conta contable predeterminada para os produtos comprados (usada se non están definidos na folla de produtos)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Conta contable predeterminada para os produtos comprados na CEE (usados se non están definidos na folla de produto)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Conta contable predeterminada para os produtos comprados e importados fóra da CEE (usada se non está definido na folla de produto)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Conta contable predeterminada para os produtos vendidos (usada se non están definidos na folla de produtos)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Conta contable predeterminada para os produtos vendidos na CEE (usados se non están definidos na folla de produto)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Conta contable predeterminada para os produtos vendidos e exportados fóra da CEE (usados se non están definidos na folla de produto)
 
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Conta contable predeterminada para os servizos comprados (usada se non están definidos na folla de servizos)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Conta contable predeterminada para os servizos comprados na CEE (usada se non está definido na folla de servizos)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Conta contable predeterminada para os servizos comprados e importados fóra da CEE (úsase se non está definido na folla de servizos)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Conta contable predeterminada para os servizos vendidos (usada se non están definidos na folla de servizos)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Conta contable predeterminada para os servizos vendidos en EU (usada se non están definidos na folla de servizos)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=AConta contable predeterminada para os servizos vendidos e exportados fora da EU  (usada se non están definidos na folla de servizos)
@@ -199,6 +202,7 @@ Docref=Referencia
 LabelAccount=Etiqueta conta
 LabelOperation=Etiqueta operación
 Sens=Sentido
+AccountingDirectionHelp=Para unha conta contable dun cliente, use o crédito para rexistrar o pago recibido. <br>. Para unha conta contable dun provedor, use Débito para rexistrar o pago realizado
 LetteringCode=Codigo de letras
 Lettering=Letras
 Codejournal=Diario
@@ -207,22 +211,23 @@ NumPiece=Apunte
 TransactionNumShort=Núm. transacción
 AccountingCategory=Grupos persoalizados
 GroupByAccountAccounting=Agrupar por conta contable
+GroupBySubAccountAccounting=Agrupar por subconta contable
 AccountingAccountGroupsDesc=Pode definir aquí algúns grupos de contas contables. Serán usadas para informes de contabilidade personalizados.
 ByAccounts=Por contas
 ByPredefinedAccountGroups=Por grupos predefinidos
 ByPersonalizedAccountGroups=Por grupos persoalizados
 ByYear=Por ano
 NotMatch=Non establecido
-DeleteMvt=Delete some operation lines from accounting
+DeleteMvt=Eliminar liñas do Libro Maior
 DelMonth=Mes a eliminar
 DelYear=Ano a eliminar
 DelJournal=Diario a eliminar
-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=Isto eliminará todas as liñas da contabilidade do ano/mes e/ou dun diario específico. (Precísase alo menos un criterio). Terá que reutilizar a función '% s' para que o rexistro eliminado volte ao libro maior.
+ConfirmDeleteMvtPartial=Isto eliminará a transacción d da contabilidade (eliminaranse todas as liñas relacionadas coa mesma transacción)
 FinanceJournal=Diario financiero
 ExpenseReportsJournal=Diario informe de gastos
 DescFinanceJournal=O diario financiero inclúe todos os tipos de pagos por conta bancaria
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
+DescJournalOnlyBindedVisible=Ista é una vista do rexistro ligada a unha conta contable e que pode ser rexistrada nos diarios e Libro Maior.
 VATAccountNotDefined=Conta contable para IVE non definida
 ThirdpartyAccountNotDefined=Conta contable para terceiro non definida
 ProductAccountNotDefined=Conta contable para produto non definida
@@ -241,19 +246,19 @@ 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 de terceiro non definida ou terceiro descoñecido. Usaremos a %s
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Terceiro descoñecido e conta vinculada non definidos no pago. Manteremos o valor da conta ligada baleiro.
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Conta do terceiro descoñecida ou terceiro descoñecido. Erro de bloqueo
-UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Conta do terceiros descoñecida e conta de espera non definida. Erro de bloqueo
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Conta de terceiros descoñecida e conta de espera non definida. Erro de bloqueo
 PaymentsNotLinkedToProduct=Pagos non ligados a un produto/servizo
 OpeningBalance=Saldo de apertura
 ShowOpeningBalance=Amosar saldo de apertura
 HideOpeningBalance=Ocultar saldo de apertura
-ShowSubtotalByGroup=Amosar subtotal por grupo
+ShowSubtotalByGroup=Amosar subtotal por nivel
 
 Pcgtype=Grupo de conta
 PcgtypeDesc=Grupo e subgrupo de conta utilízanse como criterios predefinidos de "filtro" e "agrupación" para algúns informes de contabilidade. Por exemplo, "INGRESOS" ou "GASTOS" usanse como grupos para contas contables de produtos para construir o informe de gastos/ingresos.
 
-Reconcilable=Reconcilable
+Reconcilable=Reconciliable
 
 TotalVente=Total facturación antes de impostos
 TotalMarge=Total marxe vendas
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consulte aquí a listaxe de liñas de informes de gastos
 DescVentilExpenseReportMore=Se configura as contas contables dos tipos de informes de gastos, a aplicación será capaz de facer a ligazón entre as súas liñas de informes de gastos e as contas contables, simplemente cun clic no botón <strong>"%s"</strong> , Se non estableceu a conta contable no diccionario ou se aínda ten algunhas liñas non contabilizadas a alguna conta, terá que facer unha contabilización manual dende o menú "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consulte aquí as liñas de informes de gastos e as súas contas contables
 
+Closure=Peche anual
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=Todos os movementos foron rexistrados e validados
+NotAllMovementsCouldBeRecordedAsValidated=Non todos os movementos puideron ser rexistrados e validados
 ValidateMovements=Validar os movementos
-DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Selecciona mes e valida 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
@@ -293,9 +300,10 @@ Accounted=Contabilizada no Libro Maior
 NotYetAccounted=Aínda non contabilizada no Libro Maior
 ShowTutorial=Amosar Tutorial
 NotReconciled=Non reconciliado
+WarningRecordWithoutSubledgerAreExcluded=Aviso: todas as operacións sen subcontas contables defininidas están filtradas e excluídas desta vista
 
 ## Admin
-BindingOptions=Binding options
+BindingOptions=Opcións de ligazón
 ApplyMassCategories=Aplicar categorías en masa
 AddAccountFromBookKeepingWithNoCategories=Conta dispoñible sen grupo persoalizado
 CategoryDeleted=A categoría para a conta contable foi eliminada
@@ -315,9 +323,9 @@ ErrorAccountingJournalIsAlreadyUse=Este diario xa está a ser utilizado
 AccountingAccountForSalesTaxAreDefinedInto=Nota: A conta contable do IVE nas vendas defínese no menú <b> %s</b> - <b> %s</b>
 NumberOfAccountancyEntries=Número de entradas
 NumberOfAccountancyMovements=Número de movementos
-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=Desactivar a ligazón e transferencia na contabilidade das vendas (as facturas do cliente non se terán en conta na contabilidade)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Desactivar a ligazón e transferencia na contabilidade das compras (as facturas do provedor non se terán en conta na contabilidade)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Desactivar a ligazón e transferencia na contabilidade dos informes de gastos (os informes de gastos non se terán en conta na contabilidade)
 
 ## Export
 ExportDraftJournal=Exportar libro borrador
@@ -335,12 +343,13 @@ Modelcsv_agiris=Exportar a Agiris
 Modelcsv_LDCompta=Exportar a LD Compta (v9 & maior) (En Probas)
 Modelcsv_LDCompta10=Exportar a LD Compta (v10 & maior)
 Modelcsv_openconcerto=Exportar a OpenConcerto (En probas)
-Modelcsv_configurable=Exportar a CSV Configurable
-Modelcsv_FEC=Exportar FEC (Art. L47 A)
-Modelcsv_Sage50_Swiss=Exportar a Sage 50 Suiza
+Modelcsv_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 a Winfic - eWinfic - WinSis Conta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5Export for Gestinum (v5)
+Modelcsv_Gestinumv3=Exportar a Gestinum (v3)
+Modelcsv_Gestinumv5Export para Gestinum (v5)
 ChartofaccountsId=Id do plan contable
 
 ## Tools - Init accounting account on product / service
@@ -353,16 +362,16 @@ OptionModeProductSell=Modo vendas
 OptionModeProductSellIntra=Modo Vendas exportación CEE
 OptionModeProductSellExport=Modo vendas exportación outros paises
 OptionModeProductBuy=Modo compras
-OptionModeProductBuyIntra=Mode purchases imported in EEC
-OptionModeProductBuyExport=Mode purchased imported from other countries
+OptionModeProductBuyIntra=Modo compras importadas importadas de EEC
+OptionModeProductBuyExport=Modo compras importadas doutros paises
 OptionModeProductSellDesc=Amosar todos os produtos con conta contable de vendas
 OptionModeProductSellIntraDesc=Amosar todos os produtos con conta contable para vendas na CEE.
 OptionModeProductSellExportDesc=Amosar todos os produtos con conta contable para outras vendas ao exterior.
 OptionModeProductBuyDesc=Amosar todos os produtos con conta contable de compras
-OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
-OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
+OptionModeProductBuyIntraDesc=Amosar todos os produtos con conta contable para compras en CEE
+OptionModeProductBuyExportDesc=Amosar todos os produtos con conta contable para outras compras no extranxeiro.
 CleanFixHistory=Eliminar código contable das liñas que no existen no plan contable
-CleanHistory=Resetear todos os vínculos do ano seleccionado
+CleanHistory=Resetear todas as ligazóns do ano seleccionado
 PredefinedGroups=Grupos persoalizados
 WithoutValidAccount=Sen conta adicada válida
 WithValidAccount=Con conta adicada válida
@@ -371,8 +380,8 @@ AccountRemovedFromGroup=Conta eliminada do grupo
 SaleLocal=Venda local
 SaleExport=Venda de exportación
 SaleEEC=Venda na CEE
-SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
+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.
 
 ## Dictionary
 Range=Rango de conta contable
@@ -380,7 +389,7 @@ Calculated=Calculado
 Formula=Fórmula
 
 ## Error
-SomeMandatoryStepsOfSetupWereNotDone=Algúns pasos precisoss da configuración non foron realizados, prégase completalos.
+SomeMandatoryStepsOfSetupWereNotDone=Algúns pasos precisos da configuración non foron realizados, prégase completalos.
 ErrorNoAccountingCategoryForThisCountry=Non hai grupos contables dispoñibles para %s (Vexa Inicio - Configuración - Diccionarios)
 ErrorInvoiceContainsLinesNotYetBounded=Tenta facer un diario de algunhas liñas da factura <strong>%s</strong>, pero algunhas outras liñas aínda non están ligadas a contas contables. Rexeitase a contabilización de todas as liñas de factura desta factura.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Algunhas liñas da factura non están ligadas a contas contables.
diff --git a/htdocs/langs/gl_ES/admin.lang b/htdocs/langs/gl_ES/admin.lang
index dc2f2aa0a84..4d03682d5ef 100644
--- a/htdocs/langs/gl_ES/admin.lang
+++ b/htdocs/langs/gl_ES/admin.lang
@@ -18,10 +18,10 @@ GlobalChecksum=Suma de comprobación global
 MakeIntegrityAnalysisFrom=Realizar o análise da integridade dos ficheiros da aplicación dende
 LocalSignature=Sinatura local incrustada (menos segura)
 RemoteSignature=Sinatura remota (mais segura)
-FilesMissing=Arquivos non atopados
-FilesUpdated=Arquivos actualizados
-FilesModified=Arquivos modificados
-FilesAdded=Arquivos engadidos
+FilesMissing=Ficheiros non atopados
+FilesUpdated=Ficheiros actualizados
+FilesModified=Ficheiros modificados
+FilesAdded=Ficheiros engadidos
 FileCheckDolibarr=Comprobar a integradade dos ficheiros da aplicación
 AvailableOnlyOnPackagedVersions=O ficheiro local para a comprobación da integridade só está dispoñible cando a aplicación instálase dende un paquete oficial
 XmlNotFound=Non atópase o ficheiro xml de Integridade
@@ -37,9 +37,9 @@ UnlockNewSessions=Eliminar bloqueo de conexións
 YourSession=A súa sesión
 Sessions=Sesións de usuarios
 WebUserGroup=Usuario/grupo do servidor web
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
-NoSessionFound=Parece que o seu PHP non pode listar as sesións activas. El directorio de salvaguardado de sesións (<b>%s</b>) puede estar protegido (por ejemplo, por los permisos del sistema operativo o por la directiva open_basedir de su PHP).
+PermissionsOnFilesInWebRoot=Permisos de ficheiros no directorio web raiz
+PermissionsOnFile=Permisos de ficheiro %s
+NoSessionFound=Parece que o seu PHP non pode listar as sesións activas. O directorio de gardado automático de sesións (<b>%s</b>) pode estar protexido (por exemplo, polos permisos do sistema operativo ou pola directiva open_basedir do seu PHP).
 DBStoringCharset=Codificación da base de datos para o almacenamento de datos
 DBSortingCharset=Codificación da base de datos para clasificar os datos
 HostCharset=Codificación do host
@@ -56,6 +56,8 @@ GUISetup=Entorno
 SetupArea=Configuración
 UploadNewTemplate=Nova(s) prantilla(s) actualizada(s)
 FormToTestFileUploadForm=Formulario de proba de subida de ficheiro (según opcións escollidas)
+ModuleMustBeEnabled=O módulo/aplicación <b>%s</b> debe estar activado
+ModuleIsEnabled=The O módulo/aplicación <b>%s</b> has foi activado
 IfModuleEnabled=Nota: só é eficaz se o módulo <b>%s</b> está activado
 RemoveLock=Elimine o ficheiro <b>%s</b>, se existe, para permitir a utilidade de actualización.
 RestoreLock=Substituir un ficheiro <b>%s</b>, dándolle só dereitos de lectura a este ficheiro con el fin de prohibir nuevas actualizaciones.
@@ -68,12 +70,12 @@ DictionarySetup=Configuración do diccionario
 Dictionary=Diccionario
 ErrorReservedTypeSystemSystemAuto=O valor 'system' e 'systemauto' para o tipo está reservado. Vostede pode empregar 'user' como valor para engadir o seu propio rexistro
 ErrorCodeCantContainZero=O código non pode conter o valor 0
-DisableJavascript=Deshabilitar Javascript e funcións Ajax (Recomendado para personas ciegas ou navegadores de texto)
-DisableJavascriptNote=Nota: Para propósitos de proba ou depuración. Para a optimización para persoas ciegas ou navegadores de texto, é posible que prefira utilizar a configuración no perfil do usuario.
-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=Agardar a que presione unha tecla antes de cargar o contido da listaxe combinada de terceiros <br>Isto pode incrementar o rendemento se ten un grande número de terceiros, pero é menos convinte.
-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.
+DisableJavascript=Deshabilitar Javascript e funcións Ajax
+DisableJavascriptNote=Nota: Para propósitos de proba ou depuración. Para a optimización para persoas cegas ou navegadores de texto, é posible que prefira utilizar a configuración no perfil do usuario.
+UseSearchToSelectCompanyTooltip=Tamén se ten un grande número de terceiros (> 100 000), pode aumentar a velocidade mediante a constante COMPANY_DONOTSEARCH_ANYWHERE establecendo a 1 en Configuración-> Outros. A procura será limitada á creación de cadea.
+UseSearchToSelectContactTooltip=Tamén se ten un grande número de terceiros (> 100 000), pode aumentar a velocidade mediante a constante CONTACT_DONOTSEARCH_ANYWHERE establecendo a 1 en Configuración-> Outros. A procura será limitada á creación de cadea.
+DelaiedFullListToSelectCompany=Agardar a que presione unha tecla antes de cargar o contido da lista combinada de terceiros <br>Isto pode incrementar o rendemento se ten un grande número de terceiros, pero é menos convinte.
+DelaiedFullListToSelectContact=Agardar a que presione unha tecla antes de cargar o contido da lista combinada de contactos. <br> Isto pode incrementar o rendemento se ten un grande número de contactos, pero é menos convinte.
 NumberOfKeyToSearch=Nº de caracteres para desencadenar a busca: %s
 NumberOfBytes=Número de Bytes
 SearchString=Buscar cadea
@@ -82,12 +84,11 @@ AllowToSelectProjectFromOtherCompany=Nun documento dun terceiro, pode escoller u
 JavascriptDisabled=Javascript desactivado
 UsePreviewTabs=Ver lapelas vista previa
 ShowPreview=Ver vista previa
-ShowHideDetails=Show-Hide details
+ShowHideDetails=Show-Ocultar detalles
 PreviewNotAvailable=Vista previa non dispoñible
 ThemeCurrentlyActive=Tema actualmente activo
-CurrentTimeZone=Zona horaria PHP (Servidor)
 MySQLTimeZone=Zona horaria MySql (base de datos)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
+TZHasNoEffect=As datas son almacenadas e servidas polo servidor da base de datos coma se foran enviadas coma unha cadea. A zona horaria só ten efecto se é usada a función UNIX_TIMESTAMP (que no debera ser usada pol Dolibarr, polo que a zona horaria da base de datos non debe tener efecto, qínda que fora cambiada despois de introducir os datos).
 Space=Área
 Table=Taboa
 Fields=Campos
@@ -98,14 +99,14 @@ NextValueForInvoices=Próximo valor (facturas)
 NextValueForCreditNotes=Próximo valor (abonos)
 NextValueForDeposit=Próximo valor (anticipos)
 NextValueForReplacements=Próximo valor (rectificativas)
-MustBeLowerThanPHPLimit=Nota: A configuración actual do PHP limita o tamaño máximo de subida a <b>%s</b> %s, cualquera que sexa o valor deste parámetro
+MustBeLowerThanPHPLimit=Nota: A configuración actual do PHP limita o tamaño máximo de subida a <b>%s</b> %s, calquera que sexa o valor deste parámetro
 NoMaxSizeByPHPLimit=Ningunha limitación interna configurada no seu servidor PHP
 MaxSizeForUploadedFiles=Tamaño máximo dos ficheiros a subir (0 para desactivar a subida)
 UseCaptchaCode=Utilización de código gráfico (CAPTCHA) na página de inicio de sesión
 AntiVirusCommand=Ruta completa ao comando do antivirus
-AntiVirusCommandExample=Exemplo para ClamWin: c:\\Program Files (x86)\\ClamWin\\bin\\clamscan.exe<br>Exemplo para ClamAv: /usr/bin/clamscan
+AntiVirusCommandExample=Exemplo para ClamAv (require clamav-daemon):/usr/bin/clamdscan<br> Exemplo para ClamWin (moi moi lento): c::\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Mais parámetors na liña de comandos
-AntiVirusParamExample=Exemplo para o demo ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Exemplo para o ClamAv: --fdpass <br> Exemplo para ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Configuración do módulo Contabilidade
 UserSetup=Configuración na xestión de usuarios
 MultiCurrencySetup=Configuración do módulo multimoeda
@@ -133,7 +134,7 @@ PHPTZ=Zona Horaria Servidor PHP
 DaylingSavingTime=Horario de verán (usuario)
 CurrentHour=Hora PHP (servidor)
 CurrentSessionTimeOut=Timeout sesión actual
-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"
+YouCanEditPHPTZ=Para definir unha zona horaria PHP diferente (non é preciso), probe a engadir un ficheiro .htacces cunha liña coma esta "SetEnvTZ Europe/Madrid"
 HoursOnThisPageAreOnServerTZ=Atención, ao contrario doutras pantallas, o horario nesta páxina non atópase na súa zona horaria local, atópase na zona horaria do servidor.
 Box=Panel
 Boxes=Paneis
@@ -141,8 +142,8 @@ MaxNbOfLinesForBoxes=Número máximo de liñas para paneis
 AllWidgetsWereEnabled=Todos os widgets dispoñibles están activados
 PositionByDefault=Posición por defecto
 Position=Posición
-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.
+MenusDesc=Os xestores de menús definen o contido das dúas barras de menú (horizontal e vertical)
+MenusEditorDesc=O editor de menús permite definir entradas de menú persoalizadas. Useo con coidado para evitar inestabilidade e entradas de menús erróneos. <br> Algúns módulos engaden entradas do menú (no menú <b>Todo</b> maioritariamente). Se elimina algunhas destas entradas por erro, pode restauralas desactivando e reactivando o módulo.
 MenuForUsers=Menú para os usuarios
 LangFile=ficheiro .lang
 Language_en_US_es_MX_etc=Lingua (en_US, es_MX, ...)
@@ -153,9 +154,9 @@ SystemToolsAreaDesc=Esta área ofrece distintas funcións de administración. Ut
 Purge=Purga
 PurgeAreaDesc=Esta páxina permitelle borrar todos os ficheiros xerados ou almacenados por Dolibarr (ficheiros temporais ou todos os ficheiros do directorio <b>%s</b>). O uso desta función non é precisa. Se proporciona como solución para os usuarios cuxos Dolibarr atópanse nun provedor que non ofrece permisos para eliminar os ficheiros xerados polo servidor web.
 PurgeDeleteLogFile=Eliminar ficheiros de rexistro, incluidos <b> %s</b> definidos polo módulo Syslog (sen risco de perda de datos)
-PurgeDeleteTemporaryFiles=Eliminar todos os ficheros temporais (sen risco de perda de datos)
-PurgeDeleteTemporaryFilesShort=Eliminar ficheiros temporais purgados
-PurgeDeleteAllFilesInDocumentsDir=Eliminar todos os ficheiros do directorio <b>%s</b>. Ficheiros temporais e ficheiros relacionados con elementos (terceiros, facturas, etc.) serán eliminados.
+PurgeDeleteTemporaryFiles=Eliminar todos os logs e ficheros temporais (sen risco de perda de datos). Nota: A eliminación dos ficheiros temporais é realizada só de o directorio temporal foi creado hai mas de 24h.
+PurgeDeleteTemporaryFilesShort=Eliminar logs e ficheiros temporais.
+PurgeDeleteAllFilesInDocumentsDir=Eliminar todos os ficheiros do directorio <b>%s</b>. <br> Isto eliminará todos os documentos xerados relacionados con elementos (terceiros, facturas, etc...), ficheiros actualizados no módulo ECM, copias de seguridade de bases de datos e ficheiros temporais.
 PurgeRunNow=Purgar agora
 PurgeNothingToDelete=Sen directorios ou ficheiros a eliminar.
 PurgeNDirectoriesDeleted=<b>%s</b> ficheiros ou directorios eliminados
@@ -173,14 +174,14 @@ NoBackupFileAvailable=Ningunha copia dispoñible
 ExportMethod=Método de exportación
 ImportMethod=Método de importación
 ToBuildBackupFileClickHere=Para crear unha copia, faga click <a href="%s">aquí</a>.
-ImportMySqlDesc=Para importar unha copia, hai que utilizar o comando mysql na liña seguinte:
+ImportMySqlDesc=Para importar un ficheiro de copia de seguridade de MYQL, pode usar phpMyAdmin a través do se aloxamento web ou usar o comando mysql desde a liña de comandos <br> Por exemplo:
 ImportPostgreSqlDesc=Para importar unha copia de seguridade, debe usar o comando pg_restore dende a línea de comandos:
 ImportMySqlCommand=%s %s < meuficheirobackup.sql
 ImportPostgreSqlCommand=%s %s meuficheirobackup.sql
 FileNameToGenerate=Nome do ficheiro a xerar
 Compression=Compresión
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
+CommandsToDisableForeignKeysForImport=Comando para desactivar as claves externas á importación
+CommandsToDisableForeignKeysForImportWarning=Obrigatorio se quiere poder restaurar mais tarde o seu volcado SQL
 ExportCompatibility=Compatibilidade do ficheiro de exportación xerado
 ExportUseMySQLQuickParameter=Use a opción --quick
 ExportUseMySQLQuickParameterHelp=A opción'--quick' parameter axuda a limitar o consumo de RAM en táboas longas.
@@ -201,30 +202,30 @@ IgnoreDuplicateRecords=Ignorar os erros por rexistro duplicado (INSERT IGNORE)
 AutoDetectLang=Autodetección (navegador)
 FeatureDisabledInDemo=Opción deshabilitada no demo
 FeatureAvailableOnlyOnStable=Funcionaliade dispoñible exclusivamente en versións oficiais estables
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external app/modules
-ModulesDevelopYourModule=Develop your own app/modules
-ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you.
-DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will perform the search on the external market place for you (may be slow, need an internet access)...
-NewModule=New module
-FreeModule=Free
+BoxesDesc=Os paneis son compoñentes que amosan algunha información que pode engadires para persoalizar algunhas páxinas. Pode escoller entre amosar ou non o panel seleccionando a páxina de destino e facendo clic en 'Activar', ou facendo clic na papeleira para desactivalo.
+OnlyActiveElementsAreShown=Só os elementos de <a href="%s">módulos activados</a> son amosados.
+ModulesDesc=Os módulos/aplicacións determinan qué funcionalidade está habilitada no software. Algúns módulos requiren permisos que teñen que ser concedidos aos usuarios logo de activar o módulo. Faga clic no botón<span class="small valignmiddle"> %s </span>de acendido/apagado de cada módulo para habilitar ou desactivar un módulo/aplicación.
+ModulesMarketPlaceDesc=Pode atopar mais módulos para descargar en sitios web externos da Internet ...
+ModulesDeployDesc=Se os permisos no seu sistema de ficheiros llo permiten, pode utilizar esta ferramenta para instalar un módulo externo. O módulo estará entón visible na lapela <strong>%s</strong>.
+ModulesMarketPlaces=Procurar módulos externos...
+ModulesDevelopYourModule=Desenvolva as súas propias aplicacións/módulos
+ModulesDevelopDesc=Vostede pode desenvolver o seu propio módulo ou atopar un socio para que desenvolva un para vostede.
+DOLISTOREdescriptionLong=En vez de conectar o sitio web <a href="https://www.dolistore.com">www.dolistore.com</a> para atopar un módulo externo, pode usar esta ferramenta incorporada que lle realizará a busca no tenda dolistore (pode ser lento, precisa acceso a Internet) ...
+NewModule=Novo
+FreeModule=Gratis
 CompatibleUpTo=Compatible coa versión %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
+NotCompatible=Este módulo non parece compatible co seu Dolibarr %s (Min %s - Max %s).
+CompatibleAfterUpdate=Este módulo require unha actualización do seu Dolibarr %s (Min %s - Max %s).
+SeeInMarkerPlace=Ver na tenda
+SeeSetupOfModule=Ver a configuración do módulo %s
 Updated=Actualizado
 Nouveauté=Novidade
 AchatTelechargement=Compra/Descarga
-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...
+GoModuleSetupArea=Para aplicar/instalar un novo módulo, ir ao área de configuración de módulos <a href="%s">%s</a>.
+DoliStoreDesc=DoliStore, o sitio oficial de módulos externos e para Dolibarr ERP/CRM
+DoliPartnersDesc=Listaxe de empresas que ofrecen módulos-desenvolvementos a medida.<br> Nota: dende que Dolibarr é una aplicación de código aberto, <i>calquera persoa</i> con experiencia en programación PHP pode desenvolver un módulo.
+WebSiteDesc=Sitios web de referencia para atopar mais módulos (non core)...
+DevelopYourModuleDesc=Algunhas solucións para desenvolver o seu propio módulo ...
 URL=Ligazón
 RelativeURL=Ligazón relativa
 BoxesAvailable=Paneis dispoñibles
@@ -232,17 +233,17 @@ BoxesActivated=Paneis activos
 ActivateOn=Activar en
 ActiveOn=Activo en
 SourceFile=Ficheiro orixe
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Dispoñible só se Javascript e Ajax non están desactivados
 Required=Requirido
 UsedOnlyWithTypeOption=Usado só por algunha opción da axenda
 Security=Seguridade
 Passwords=Contrasinais
-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.
+DoNotStoreClearPassword=Non almacenar o contrasinal sen cifrar na base de datos (NON en texto plano). É moi recomendable activar esta opción.
+MainDbPasswordFileConfEncrypted=Cifrar o contrasinal da base de datos no ficheiro conf.php. É moi recomendable activar esta opción.
+InstrucToEncodePass=Para ter o contrasinal codificado en <b>conf.php</b>, mude a liña <br><b>$dolibarr_main_db_pass = "...";</b><br>por<br> <b>$dolibarr_main_db_pass = "crypted:%s";</b>
+InstrucToClearPass=Para ter o contrasinal decodificado (visible) en <b>conf.php</b>, mude a liña <br><b>$dolibarr_main_db_pass = "crypted:...";</b><br>por<br><b>$dolibarr_main_db_pass = "%s";</b>
+ProtectAndEncryptPdfFiles=Protección dos ficheros PDF xerados. Isto NON está recomendado, pode fallar a xeración de PDF en masa
+ProtectAndEncryptPdfFilesDesc=A protección dun documento PDF o garda dispoñible para ler e imprimir con calquera navegador PDF. Porén, a edición e a copia non son posibles. Teña conta de que o uso desta característica fai que a creación global dun conxunto de PDFs non funcione.
 Feature=Función
 DolibarrLicense=Licenza
 Developpers=Desenvolvedores/contribuidores
@@ -256,11 +257,12 @@ ReferencedPreferredPartners=Partners preferidos
 OtherResources=Outros recursos
 ExternalResources=Recursos externos
 SocialNetworks=Redes sociais
-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
+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>
+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
 MeasuringUnit=Unidade de medida
 LeftMargin=Marxe esquerdo
 TopMargin=Marxe superior
@@ -274,41 +276,41 @@ NoticePeriod=Prazo de aviso
 NewByMonth=Novo por mes
 Emails=E-Mails
 EMailsSetup=Configuración e-mails
-EMailsDesc=This page allows you to set parameters or options for email sending.
+EMailsDesc=Esta páxina permite configurar parámetros ou opcións para envíos de correos electrónicos.
 EmailSenderProfiles=Perfís de remitentes de e-mails
 EMailsSenderProfileDesc=Pode gardar esta sección baleira. Se vostede introduce algúns enderezos de correo aquí, estes serán engadidos a listaxe de posibles emisores dentro da caixa cando escribe un novo enderezo.
-MAIN_MAIL_SMTP_PORT=Porto do servidor SMTP (Por defecto en 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=Configuración do Módulo
-ModulesSetup=Configuración dos Módulos/Aplicacións
+MAIN_MAIL_SMTP_PORT=Porto do servidor SMTP (Valor por defecto en php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=Host SMTP/SMTPS (Valor por defecto en php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Porto SMTP/SMTPS (Non definido en PHP en sistemas de tipo Unix)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nome/ip servidor SMTP/SMTPS (Non definido en PHP en sistemas  tipo Unix)
+MAIN_MAIL_EMAIL_FROM=Correo electrónico do remitente para correos electrónicos automáticos (valor predeterminado en php.ini: <b>%s </b>)
+MAIN_MAIL_ERRORS_TO=Correo electrónico utilizado enviar os correos electrónicos con erros (campos "Errors-To" nos correos electrónicos enviados)
+MAIN_MAIL_AUTOCOPY_TO= Enviar a copia oculta (Bcc) de todos os correos electrónicos enviados a
+MAIN_DISABLE_ALL_MAILS=Deshabilitar todo o envío de correo electrónico (para fins de proba ou demostracións)
+MAIN_MAIL_FORCE_SENDTO=Enviar todos os correos electrónicos a (en lugar de destinatarios reais, para fins de proba)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Engadir correos electrónicos dos empregados (se se define) na lista de destinatarios predefinidos ao escribir un novo correo electrónico
+MAIN_MAIL_SENDMODE=Método de envío de correos electrónico
+MAIN_MAIL_SMTPS_ID=ID de autentificación SMTP  (se o servidor de envío require autenticación)
+MAIN_MAIL_SMTPS_PW=Contrasinal SMTP (se o servidor de envío require autenticación)
+MAIN_MAIL_EMAIL_TLS=Usar cifrado TLS (SSL)
+MAIN_MAIL_EMAIL_STARTTLS=Usar cifrado TLS (STARTTLS)
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autorizar os certificados autosinados
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM para xerar sinatura de correo electrónico
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Dominio de correo electrónico para usar con DKIM
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Nome do selector DKIM
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Chave privada para a sinatura de DKIM
+MAIN_DISABLE_ALL_SMS=Desactivar todo o envío de SMS (para fins de proba ou demostracións)
+MAIN_SMS_SENDMODE=Método de envío de SMS
+MAIN_MAIL_SMS_FROM=Número de teléfono por defecto do remitente para os envíos SMS
+MAIN_MAIL_DEFAULT_FROMTYPE=Correo electrónico predeterminado do remitente para o envío manual (correo electrónico do usuario ou correo electrónico da Empresa)
+UserEmail=Correo electrónico de usuario
+CompanyEmail=Correo electrónico da empresa
+FeatureNotAvailableOnLinux=Funcionalidade non dispoñible en sistemas similares a Unix. Probe localmente o seu programa sendmail..
+FixOnTransifex=Corrixa a tradución na plataforma de tradución en liña do proxecto Transifex
+SubmitTranslation=Se a tradución deste idioma non está completa ou atopa erros, pode corrixilo editando ficheiros no directorio <b>langs/%s</b> e envía o teu cambio a www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=Se a tradución deste idioma non está completa ou atopa erros, pode corrixilo editando ficheiros no directorio <b>langs/%s</b> e enviar os ficheiros modificados a dolibarr.org/forum ou, se son desenvolvedores, cun PR a github.com/Dolibarr/dolibarr.
+ModuleSetup=Configuración do módulo
+ModulesSetup=Configuración dos módulos
 ModuleFamilyBase=Sistema
 ModuleFamilyCrm=Xestión de Relacións cos Clientes (CRM)
 ModuleFamilySrm=Xestión de Relacións cos Provedores (VRM)
@@ -335,7 +337,7 @@ UnpackPackageInModulesRoot=Para instalar un módulo externo, descomprima o fiche
 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 prantillas persoalizadas.<br>Só en que crear un directorio na raíz de Dolibarr (por exemplo: custom).<br>
-InfDirExample=<br>Despois indíqueo no ficheiro <strong>conf.php</strong><br> $ dolibarr_main_url_root_alt = 'http://miservidor /custom'<br>$ dolibarr_main_document_root_alt = '/ruta/de/dolibarr/htdocs/custom '<br>Se estas liñas atópanse comentadas con "#", para habilitalas, chega con descomentar eliminando o carácter "#".
+InfDirExample=<br>Despois indíqueo no ficheiro <strong>conf.php</strong><br> $dolibarr_main_url_root_alt ='/custom'<br>$dolibarr_main_document_root_alt= '/path/of/dolibarr/htdocs/custom '<br>Se estas liñas atópanse comentadas con "#", para habilitalas, chega con descomentar eliminando o carácter "#".
 YouCanSubmitFile=Alternativamente, pode subir o módulo .zip comprimido:
 CurrentVersion=Versión actual de Dolibarr
 CallUpdatePage=Ir á páxina de actualización da estrutura da base de datos e os seus datos: %s.
@@ -348,7 +350,7 @@ WithCounter=Con contador
 GenericMaskCodes=Pode introducir calquera máscara numérica. Nsta máscara, pode utilizar as seguintes etiquetas:<br><b>{000000} </b> corresponde a un número que incrementase en cada un de %s. Introduza tantos ceros como lonxitude desexa amosar. O contador complétase a partir de ceros pola esquerda coa finalidade de ter tantos ceros como a máscara. <br> <b> {000000+000}</ b> Igual que o anterior, cunha compensación correspondente ao número á dereita do sinal + aplícase a partires do primeiro %s. <br> <b> {000000@x}</b> igual que o anterior, pero o contador restablecese a cero cando chega a x meses (x entre 1 e 12). Se esta opción é utilizada e x é de 2 ou superior, entón a secuencia {yy}{mm} o {yyyy}{mm} tamén é precisa. <br> <b> {dd} </b> días (01 a 31). <br><b> {mm}</b> mes (01 a 12). <br><b>{yy}</b>, <b>{yyyy}</b> ou <b>{y}</b> ano en 2, 4 ou 1 cifra.<br>
 GenericMaskCodes2=<b>{cccc}</b> código de cliente con n caracteres<br><b>{cccc000}</b> código de cliente con n caracteres é seguido por un contador adicado a clientes. Este contador adicado a clientes será reseteado ao mismo tempo que o contador global.<br><b>{tttt}</b> O código do tipo de empresa con n caracteres (vexa diccionarios->tipos de empresa).<br>
 GenericMaskCodes3=Calquera outro caracter na máscara quedará sen cambios. <br>Non son permitidos espazos <br>
-GenericMaskCodes4a=<u>Exemplo na 99ª %s do terceiro. A empresa realizada o 31/03/2007: </u><br>
+GenericMaskCodes4a=<u>Exemplo no 99th %s do terceiro a Empresa con data do 31/01/2007: </u><br>
 GenericMaskCodes4b=<u>Exemplo sobre un terceiro creado o 31/03/2007:</u><br>
 GenericMaskCodes4c=<u>Exemplo nun produto/servizo creado o 31/03/2007:</u><br>
 GenericMaskCodes5=<b>ABC {yy} {mm} - {000000} </b> dará <b> ABC0701-000099 </b><br><b> {0000+100@1}-ZZZ/{dd}/XXX</b> dará <b>0199-ZZZ/31/ XXX</b> <br><b>IN{yy}{mm}-{0000}-{t}</b> dará <b>IN0701-0099-A</b> se o tipo de empresa é 'Responsable Inscrito' con código para o tipo 'A_RI'
@@ -364,7 +366,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=Ocultar a ligazón "¿Precisa soporte ou axuda?" na páxina de login
+DisableLinkToHelpCenter=Ocultar a ligazón "<b>¿Precisa soporte ou axuda?</b>" na páxina de login
 DisableLinkToHelp=Ocultar a ligazón á 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...).
@@ -373,11 +375,11 @@ LanguageFilesCachedIntoShmopSharedMemory=ficheiros .lang en memoria compartida
 LanguageFile=Ficheiro de idioma
 ExamplesWithCurrentSetup=Exemplos coa configuración actual
 ListOfDirectories=Listaxe de directorios de prantillas OpenDocument
-ListOfDirectoriesForModelGenODT=Listaxe de directorios que conteñen as prantillas de ficheiros co formato OpenDocument.<br>Poña aquí a ruta completa de directorios.<br>Engada un retorno de carro entre cada directorio<br> Para engadir un directorio de módulo GED, engada aquí <b>DOL_DATA_ROOT/ecm/seunomededirectorio.</b><br><br>Os ficheiros deses directorios deben terminar co <b>.odt</b> o <b>.ods</b>.
+ListOfDirectoriesForModelGenODT=Listaxe de directorios que conteñen as prantillas de ficheiros co formato OpenDocument.<br><br> Poña aquí a ruta completa de directorios.<br>Engada un retorno de carro entre cada directorio<br> Para engadir un directorio de módulo GED, engada aquí <b>DOL_DATA_ROOT/ecm/seunomededirectorio.</b><br><br>Os ficheiros deses directorios deben terminar co <b>.odt</b> o <b>.ods</b>.
 NumberOfModelFilesFound=Número de ficheiros de prantillas ODT/ODS atopados nestes directorios
 ExampleOfDirectoriesForModelGen=Exemplos de sintaxe:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-FollowingSubstitutionKeysCanBeUsed=Colocando as seguintes etiquetas na prantilla, obterá uhna substitución co valor persoalizado ao xerar o documento:
-FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Crear_un_modelo_de_documento_ODT
+FollowingSubstitutionKeysCanBeUsed=<br>Colocando as seguintes etiquetas na prantilla, obterá uhna substitución co valor persoalizado ao xerar o documento:
+FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Orde visualización nome/apelidos
 DescWeather=Os seguintes gráficos serán amosados no panel se o número de elementos chega a estes valores:
 KeyForWebServicesAccess=Clave para usar os Web Services (parámetro "dolibarrkey" en webservices)
@@ -391,12 +393,12 @@ ModuleMustBeEnabledFirst=O módulo <b>%s</b> debe ser activado antes se precisa
 SecurityToken=Chave para cifrar urls
 NoSmsEngine=Non hai dispoñible ningún xestor de envío de SMS. Os xestores de envío de SMS no son instalados por defecto xa que dependen de cada provedor, porén pode atopalos na plataforma %s
 PDF=PDF
-PDFDesc=Global options for PDF generation
-PDFAddressForging=Rules for address section
+PDFDesc=Opcións globais para xerar os PDF
+PDFAddressForging=Regras de visualización de enderezos
 HideAnyVATInformationOnPDF=Ocultar toda a información relacionada co IVE ao xerar os PDF
 PDFRulesForSalesTax=Regras de IVE
 PDFLocaltax=Regras para %s
-HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
+HideLocalTaxOnPDF=Ocultar a taxa %s na columna de impostos do pdf
 HideDescOnPDF=Ocultar descrición dos produtos ao xerar os PDF
 HideRefOnPDF=Ocultar referencia dos produtos ao xerar os PDF
 HideDetailsOnPDF=Ocultar detalles das liñas ao xerar os PDF
@@ -406,16 +408,16 @@ UrlGenerationParameters=Seguridade das URLs
 SecurityTokenIsUnique=¿Usar un parámetro securekey único para cada URL?
 EnterRefToBuildUrl=Introduza a referencia do obxecto %s
 GetSecuredUrl=Obter a URL calculada
-ButtonHideUnauthorized=Ocultar botóns de accións non permitidas aos usuarios non administradores en vez de amosalos atenuados
+ButtonHideUnauthorized=Ocultar botóns de accións non permitidas tamén aos usuarios internos (en gris doutro xeito)
 OldVATRates=Taxa de IVE antiga
 NewVATRates=Taxa de IVE nova
 PriceBaseTypeToChange=Cambiar o prezo cuxa referencia de base é
 MassConvert=Convertir masivamente
 PriceFormatInCurrentLanguage=Formato de prezo na lingua utilizada
 String=Cadea de texto
-String1Line=String (1 line)
+String1Line=Cadea (1 liña)
 TextLong=Texto longo
-TextLongNLines=Long text (n lines)
+TextLongNLines=Texto longo (n liñas)
 HtmlText=Texto html
 Int=Numérico enteiro
 Float=Decimal
@@ -435,31 +437,31 @@ ExtrafieldCheckBox=Caixa de verificación
 ExtrafieldCheckBoxFromList=Caixa de verificación da táboa
 ExtrafieldLink=Vínculo a un obxecto
 ComputedFormula=Campo combinado
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
-Computedpersistent=Store computed field
-ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
-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::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
-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)
+ComputedFormulaDesc=Pode introducir aquí unha fórmula utilizando outras propiedades de obxecto o calquera código PHP para obter un valor calculado dinámico. Pode utilizar calquera fórmula compatible con PHP, incluído o operador de condición "?" e os obxectos globais seguintes: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>ATENCIÓN</strong>: Só algunhas propiedades de $object poden estar dispoñibles. Se precisa propiedades non cargadas, só procure o obxecto na súa fórmula como no segundo exemplo. <br>Usar un campo computado significa que non pode ingresar ningún valor dende a interfaz. Tamén, se hai un error de sintaxe, e posible que a fórmula non devolva nada. <br><br>Exemplo de fórmula: <br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br> Exemplo de recarga de obxecto<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>Outro exemplo de fórmula para forzar a carga do obxecto e o seu obxecto principal:  <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
+Computedpersistent=Almacenar campo combinado
+ComputedpersistentDesc=Os campos adicionais calculados gardaranse na base de datos, con todo, o valor só se recalculará cando se cambie o obxecto deste campo. Se o campo calculado depende doutros obxectos ou datos globais, este valor pode ser incorrecto.
+ExtrafieldParamHelpPassword=Deixar este campo en branco significa que este valor gardarase sen cifrado (o campo estará oculto coa estrelas na pantalla). <br> Estableza aquí o valor "auto" para usar a regra de cifrado predeterminada para gardar o contrasinal na base de datos (entón o valor lido será só o hash, non hai forma de recuperar o valor orixinal)
+ExtrafieldParamHelpselect=A listaxe de parámetros ten que ser key,valor<br><br> por exemplo: <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>Para ter unha lista en funcion de campos adicionais de lista:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>Para ter unha lista en función doutra:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=A listaxe de parámetros debe ser ser liñas con formato key,value (onde key non pode ser '0')<br><br> por exemplo: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpradio=A listaxe de parámetros tiene que ser key,valor (onde key non pode ser 0)<br><br> por exemplo: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpsellist=A listaxe de parámetros provén dunha táboa <br> Syntax: table_name:label_field:id_field::filter <br> Exemplo: c_typent: libelle:id::filter <br> <br> - id_field é necesariamente unha chave int primaria <br> -filter pode ser unha proba sinxela (por exemplo, activa = 1) Para amosar só o valor activo <br> Tamén pode utilizar $ID$ no filtro o cal é o  id do obxecto actual <br> Para facer un SELECT no filtro de uso $SEL$ <br> se desexa filtrar en campos adicionais pode utilizar a sintaxe extra.fieldcode=... (onde código de campo é o código de campo adicional) <br> <br> Para que a lista dependa doutra lista de campos adicionais list: <br> c_typent:libelle:id: options_ <i> parent_list_code </i> |parent_column:filter <br> <br> Para que a lista dependa doutra lista: <br> c_typent:libelle:id: <i> parent_list_code </i> |parent_column:filter
+ExtrafieldParamHelpchkbxlst=A listaxe de parámetros provén dunha táboa <br> Sintaxe: table_name:label_field:id_field::filter<br> Exemplo: c_typent: libelle: id:: filter <br> <br> o filtro pode ser unha proba sinxela (por exemplo, activa = 1) Para amosar só o valor activo <br> Tamén pode utilizar $ID$ no filtro no que é o id  do obxecto actual <br> Para facer un SELECT no filtro  use $SEL$ <br> se desexa filtrar en campos adicionais pode utilizar a sintaxe extra.fieldcode = ... (onde o código de campo é o código de campo adicional) <br> <br> Para que a lista dependa doutra lista de campos adicionais: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> |parent_column: filter <br> <br> Para que a lista dependa doutra lista: <br> c_typent: libelle:id: <i> parent_list_code </i> |parent_column:filter
+ExtrafieldParamHelplink=Os parámetros deben ser ObjectName:Classpath<br>Sintaxe: ObjectName:Classpath
+ExtrafieldParamHelpSeparator=Manter baleiro para un separador simple. <br> Estableza isto en 1 para un separador colapsado (aberto por defecto para a nova sesión, entón o estado manterase para cada sesión de usuario) <br> Estableza isto a 2 para un separador colapsado (contraído por defecto para a nova sesión, o estado mantense antes de cada sesión de usuario)
+LibraryToBuildPDF=Libreria usada na xeración dos PDF
+LocalTaxDesc=Algúns países poden aplicar dous ou tres impostos en cada liña de factura. Se é o caso, escolla o tipo da segunda e terceira taxa e o seu valor. Os tipos posibles son: <br> 1: aplícase o imposto local sobre produtos e servizos sen IVE (a taxa local calcúlase sobre a base impoñible) <br> 2: aplícase o imposto local sobre produtos e servizos incluíndo o IVE (a taxa local calcúlase sobre a base impoñible + imposto principal ) <br> 3: aplicar o imposto local sobre produtos sen IVE (a taxa local calcúlase sobre a base impoñible) <br> 4: aplicar o imposto local sobre produtos incluíndo a IVE (a taxa local calcúlase sobre a base impoñible + ive principal) <br> 5: local imposto aplicable a servizos sen IVE (a taxa local calcúlase sobre a base impoñible) <br> 6: aplícase o imposto local a servizos incluíndo a IVE (a taxa local calcúlase sobre a base impoñible + imposto)
 SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
+LinkToTestClickToDial=Insira un número de teléfono ao que chamar para amosar unha ligazón e probar a URL ClickToDial para o usuario <strong>%s </strong>
 RefreshPhoneLink=Refrescar ligazón
-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.
+LinkToTest=Ligazón seleccionable xarada para o usuario  <strong>%s</strong> (faga clic no número de teléfono para probar)
+KeepEmptyToUseDefault=Deixe baleiro este campo para usar o valor por defecto
+KeepThisEmptyInMostCases=En moitos casos, pode deixar este campo baleiro.
 DefaultLink=Ligazón por defecto
 SetAsDefault=Establecer por defecto
 ValueOverwrittenByUserSetup=Atención: Este valor pode ser sobreescrito por un valor específico da configuración do usuario (cada usuario pode ter a súa propia url clicktodial)
-ExternalModule=Módulo externo - Instalado no directorio %s
+ExternalModule=Módulo externo
 InstalledInto=Instalado no directory %s
-BarcodeInitForThirdparties=Mass barcode init for third-parties
+BarcodeInitForThirdparties=Inicio de código de barras masivo para terceiros
 BarcodeInitForProductsOrServices=Inicio masivo de código de barras para produtos ou servizos
 CurrentlyNWithoutBarCode=Actualmente ten <strong>%s</strong> rexistros de <strong>%s</strong> %s sen código de barras definido.
 InitEmptyBarCode=Iniciar valor para os %s rexistros baleiros.
@@ -478,44 +480,44 @@ ModuleCompanyCodeCustomerAquarium=%s seguido por un código de cliente para cód
 ModuleCompanyCodeSupplierAquarium=%s seguido por un código de provedor  para código de contabilidade de provedor
 ModuleCompanyCodePanicum=Volta un código contable baleiro.
 ModuleCompanyCodeDigitaria=O código contable depende do código do terceiro. O código está formado polo caracter ' C ' na primeira posición seguido dos 5 primeiros caracteres do código terceiro.
-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.
+ModuleCompanyCodeCustomerDigitaria=%s seguido do nome de cliente acortado polo número de caracteres:%s para o código de contabilidade do cliente.
+ModuleCompanyCodeSupplierDigitaria=%s seguido do nome do provedor acortado polo número de caracteres:%s para o código de contabilidade do provedor.
 Use3StepsApproval=De forma predeterminada, os pedimentos a provedor teñen que ser creados e aprobados por 2 usuarios diferentes (un paso/usuario para crear e un paso/usuario para aprobar. Teña conta de que se o usuario ten tanto o permiso para crear e aprobar, un paso/usuario será suficiente. Pode pedir con esta opción introducir unha terceira etapa de aprobación/usuario, se a cantidade é superior a un valor específico (polo que serán precisos 3 pasos: 1 validación, 2=primeira aprobación e 3=segunda aprobación se a cantidade é suficiente).<br>Deixe baleiro se unha aprobación (2 pasos) é suficiente, se establece un valor moi baixo (0,1) requírese unha segunda aprobación sempre (3 pasos).
 UseDoubleApproval=Usar 3 pasos de aprobación se o importe (sen IVE) é maior que...
-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=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
-WarningPHPMail2=Se o seu provedor SMTP de correo electrónico precisa restrinxir o cliente de correo electrónico a algunhos enderezos IP (moi raro), este é o seu enderezo IP da súa aplicación ERP CRM: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMail=AVISO: a configuración para enviar correos electrónicos desde a aplicación está a usar a configuración xenérica predeterminada. Moitas veces é mellor configurar os correos electrónicos saíntes para usar o servidor de correo electrónico do seu fornecedor de servizos de correo electrónico en lugar da configuración predeterminada por varios motivos:
+WarningPHPMailA=- Usar o servidor do fornecedor de servizos de correo electrónico aumenta a confiabilidade do seu correo electrónico, polo que aumenta a entrega sen ser marcado como SPAM
+WarningPHPMailB=- Algúns provedores de servizos de correo electrónico (como Yahoo) non permiten enviar un correo electrónico desde outro servidor que o seu propio. A súa configuración actual usa o servidor da aplicación para enviar correo electrónico e non o servidor do seu fornecedor de correo electrónico, polo que algúns destinatarios (o compatible co protocolo DMARC restritivo) preguntarán ao seu fornecedor de correo electrónico se poden aceptar o seu correo electrónico e algúns provedores de correo electrónico. (como Yahoo) pode responder "non" porque o servidor non é seu, polo que poucos dos seus correos electrónicos enviados poden non ser aceptados para a súa entrega (teña coidado tamén coa cota de envío do seu fornecedor de correo electrónico).
+WarningPHPMailC=- Tamén é interesante usar o servidor SMTP do seu propio fornecedor de servizos de correo electrónico para enviar correos electrónicos, polo que todos os correos electrónicos enviados desde a aplicación tamén se gardarán no directorio "Enviado" da súa caixa de correo.
+WarningPHPMailD=Se o método 'PHP Mail' é realmente o método que desexa usar, pode eliminar este aviso engadindo a constante MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP a 1 en Inicio-Configuración-Outro. MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home-Setup-Other.
+WarningPHPMail2=Se o seu fornecedorr SMTP de correo electrónico precisa restrinxir o cliente de correo electrónico a algúns enderezos IP (moi raro), este é o seu enderezo IP do seu axente de usuario de correo (MUA) da súa aplicación ERP CRM: <strong>%s</strong>.
+WarningPHPMailSPF=Se o nome de dominio do seu enderezo de correo electrónico do remitente está protexido por un rexistro SPF (pregúntelle ao seu rexistro de nome de dominio), debe engadir as seguintes IPs no rexistro SPF do DNS do seu dominio: <strong>%s</strong>.
 ClickToShowDescription=Clic para ver a descrición
 DependsOn=Este módulo precisa o módulo(s)
-RequiredBy=Este módulo é requirido polos módulos
+RequiredBy=Este módulo é requirido polo(s) módulo(s)
 TheKeyIsTheNameOfHtmlField=Este é o nome do campo HTML. Son precisos coñecementos técnicos para ler o contido da páxina HTML para obter o nome clave dun campo.
 PageUrlForDefaultValues=Debe introducir aquí a URL relativa da páxina. Se inclúe parámetros na URL, os valores predeterminados serán efectivos se todos os parámetros están configurados co mesmo valor.
 PageUrlForDefaultValuesCreate=<br> Exemplo: <br> Para o formulario para crear un novo terceiro, é <strong> %s </strong>. <br> Para a URL dos módulos externos instalados no directorio custom, non inclúa "custom/", use a ruta como <strong> mymodule/mypage.php </strong> e non custom/mymodule/mypage.php. <br> Se desexa un valor predeterminado só se a url ten algún parámetro, pode usar <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.
+PageUrlForDefaultValuesList=<br> Exemplo: <br> Para a páxina que lista terceiros, é <strong>%s</strong>. <br> Para o URL de módulos externos instalados no directorio custom, non inclúa o "custom/" use un camiño como <strong> mymodule/mypagelist.php</strong> e non custom/mymodule/mypagelist.php. <br> Se quere un valor predeterminado só se a URL ten algún parámetro, pode usar <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Teña conta tamén que sobreescribir os valores predeterminados para a creación de formularios só funciona para páxinas que foron deseñadas correctamente (polo tanto, co parámetro action = create ou presend ...)
+EnableDefaultValues=Activar a personalización dos valores predeterminados
+EnableOverwriteTranslation=Activar o uso de traducións sobreescritas
+GoIntoTranslationMenuToChangeThis=Atopouse unha tradución para a clave con este código. Para cambiar este valor, debe editalo desde Inicio-Configuración-Tradución.
+WarningSettingSortOrder=Aviso, establecer unha orde de clasificación predeterminada pode producir un erro técnico ao entrar na páxina da listaxe se o campo é un campo descoñecido. Se experimentas tal erro, volte a esta páxina para eliminar a orde de clasificación predeterminada e restaurar o comportamento predeterminado.Field=Campo
 Field=Campo
 ProductDocumentTemplates=Prantillas de documentos para xerar documento de produto
 FreeLegalTextOnExpenseReports=Texto libre legal nos informes de gastos
 WatermarkOnDraftExpenseReports=Marca de auga nos informes de gastos
-AttachMainDocByDefault=Establezca esto en 1 se desexa axuntar o documento principal ao e-mail de forma predeterminada (se corresponde)
+AttachMainDocByDefault=Establezca isto en 1 se desexa axuntar o documento principal ao e-mail de forma predeterminada (se corresponde)
 FilesAttachedToEmail=Axuntar ficheiro
 SendEmailsReminders=Enviar recordatorios da axenda por correo electrónico
 davDescription=Configuración do servidor DAV
 DAVSetup=Configuración do módulo 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.
+DAV_ALLOW_PRIVATE_DIR=Active o directorio privado xenérico (o directorio adicado de WebDAV chamado "privado" é preciso iniciar sesión)
+DAV_ALLOW_PRIVATE_DIRTooltip=O directorio privado xenérico é un directorio WebDAV ao que calquera pode acceder co seu inicio de sesión/contrasinal de aplicación.
+DAV_ALLOW_PUBLIC_DIR=Active o directorio público xenérico (o directorio adicado de WebDAV chamado "público" - non é preciso iniciar sesión)
+DAV_ALLOW_PUBLIC_DIRTooltip=O directorio público xenérico é un directorio WebDAV ao que calquera pode acceder (en modo de lectura e escritura), sen autorización necesaria (conta de inicio de sesión/contrasinal).
+DAV_ALLOW_ECM_DIR=Active o directorio privado DMS/ECM (directorio raíz do módulo DMS/ECM - é preciso iniciar sesión)
+DAV_ALLOW_ECM_DIRTooltip=O directorio raíz onde son cargados todos os ficheiros manualmente cando se usa o módulo DMS/ECM. Do mesmo xeito que o acceso desde a interface web, precisará un inicio de sesión/contrasinal válido con permisos adecuados para acceder a ela.
 # Modules
 Module0Name=Usuarios e grupos
 Module0Desc=Xestión de Usuarios / Empregados e grupos
@@ -546,17 +548,17 @@ Module50Desc=Xestión de produtos
 Module51Name=Mailings masivos
 Module51Desc=Administraciónde correo de papel en masa
 Module52Name=Stocks
-Module52Desc=Xestión de stocks (só produtos)
+Module52Desc=Xestión de stock
 Module53Name=Servizos
 Module53Desc=Xestión de servizos
 Module54Name=Contratos/Suscricións
 Module54Desc=Xestión de contratos (servizos ou suscripcións recurrentes)
 Module55Name=Códigos de barras
 Module55Desc=Xestión dos códigos de barras
-Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Payments by Direct Debit
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
+Module56Name=Pagamento por transferencia bancaria
+Module56Desc=Xestión do pagamento de provedores mediante pedimentos de transferencia. Inclúe a xeración de ficheiros SEPA para países europeos.
+Module57Name=Domiciliacións bancarias
+Module57Desc=Xestión de domiciliacións. Tamén inclue xeración de ficheiro SEPA para países Europeos.
 Module58Name=ClickToDial
 Module58Desc=Integración con sistema ClickToDial (Asterisk, ...)
 Module60Name=Pegatinas
@@ -615,14 +617,14 @@ Module1520Desc=Xeración de documentos de correo masivo
 Module1780Name=Etiquetas/Categorías
 Module1780Desc=Crear etiquetas/categoría (produtos, clientes, provedores, contactos ou membros)
 Module2000Name=Editor WYSIWYG
-Module2000Desc=Permite a edición dn área de texto usando CKEditor
+Module2000Desc=Permite edictar/formatar campos de texto usando CKEditor (html)
 Module2200Name=Precios dinámicos
-Module2200Desc=Activar o uso de expresións matemáticas para auto xerarprezos
+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)
 Module2400Name=Eventos/Axenda
-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
+Module2400Desc=Siga os eventos ou citas. Deixe que Dolibarr rexistre eventos automáticos co fin de realizar seguemento ou rexistre eventos manuais ou xuntanzas. Este é o módulo principal para unha bona xestión de relacións cos clientes ou provedores.
+Module2500Name=GED / SGD
 Module2500Desc=Sistema de Xestión de Documentos / Xestión Electrónica de Contidos. Organización automática dos seus documentos xerados o almacenados. Compárta cando o precise.
 Module2600Name=API/Servizos web (servidor SOAP)
 Module2600Desc=Habilitar os servizos Dolibarr SOAP proporcionando servizos API
@@ -644,7 +646,7 @@ Module5000Desc=Permite xestionar varias empresas
 Module6000Name=Fluxo de traballo
 Module6000Desc=Xestión de fluxos de traballo (creación automática dun obxecto e/ou cambio de estado automático)
 Module10000Name=Sitios web
-Module10000Desc=Cree sitios web públicos cun editor WYSIWYG. Configure o servidor web (Apache, Nginx,...) para que apunte ao directorio adicado para telo en líña en Internet.
+Module10000Desc=Crea sitios web (públicos) cun editor WYSIWYG. Trátase dun CMS orientado a administradores web ou desenvolvedores (é mellor coñecer linguaxe HTML e CSS). Só ten que configurar o seu servidor web (Apache, Nginx, ...) para que apunte ao directorio Dolibarr adicado para que estexa en liña en internet co seu propio nome de dominio.
 Module20000Name=Xestión de días libres retribuidos
 Module20000Desc=Xestión dos días libres dos empregados
 Module39000Name=Lotes de produtos
@@ -658,26 +660,26 @@ Module50100Desc=Módulo punto de venda (TPV)
 Module50150Name=Terminales Punto de Venda
 Module50150Desc=Módulo punto de venda (Pantalla táctil TPV)
 Module50200Name=Paypal
-Module50200Desc=Ofrece aos clientes pagamentos online  vía PayPal (cuenta PayPal o tarjetas de crédito/débito). Esto puede ser usado para permitir a sus clientes realizar pagamentos libres o pagamentos en un objeto de Dolibarr en particular (factura, pedimento...)
+Module50200Desc=Ofrece aos clientes pagamentos online  vía PayPal (cuenta PayPal o tarxetas de crédito/débito). Esto pode ser usado para permitir aos seus clientes realizar pagamentos libres ou pagamentos nun obxecto de Dolibarr en particular (factura, pedimento...)
 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...)
+Module50300Desc=Ofrece aos clientes unha páxina de pago en liña Stripe (tarxetas de crédito/débito). Isto pódese usar para permitir aos seus clientes realizar pagamentos ad hoc ou pagos relacionados cun obxecto específico de Dolibarr (factura, pedimento etc ...)
 Module50400Name=Contabilidade (avanzada)
-Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Xestión contable (dobre partida, libros xerais e auxiliares). Exporte a varios formatos de software de contabilidade.
 Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
+Module54000Desc=A impresión directa (sen abrir os documentos) usa o interfaz Cups IPP (A impresora ten que ser visible dende o servidor e CUPS debe estar instalado no servidor)
 Module55000Name=Enquisa ou Voto
 Module55000Desc=Módulo para facer enquisas en líña ou votos (como Doodle, Studs, Rdvz, ...)
 Module59000Name=Marxes
-Module59000Desc=Módulo para xestionar os marxes de beneficio
+Module59000Desc=Modulo para controlar marxes
 Module60000Name=Comisións
 Module60000Desc=Módulo para xestionar aas comisións de venda
 Module62000Name=Incoterms
 Module62000Desc=Engade funcións para xestionar Incoterms
 Module63000Name=Recursos
-Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
+Module63000Desc=Xestionar recursos (impresoras, automóbiles, salas, ...) pode asignalos a eventos
 Permission11=Consultar facturas de cliente
 Permission12=Crear/Modificar facturas de cliente
-Permission13=Invalidate customer invoices
+Permission13=Invalidar facturas de cliente
 Permission14=Validar facturas de cliente
 Permission15=Enviar facturas de cliente por correo
 Permission16=Emitir pagamentos de facturas de cliente
@@ -694,7 +696,7 @@ Permission32=Crear/modificar produtos
 Permission34=Eliminar produtos
 Permission36=Ver/xestionar produtos ocultos
 Permission38=Exportar produtos
-Permission39=Ignore minimum price
+Permission39=Ignore prezo mínimo
 Permission41=Consultar proxectos e tarefas (proxectos compartidos e proxectos dos que son contacto). Tamén pode introducir tempos consumidos, para mín ou os meus subordinados, en tarefas asignadas (Follas de tempo).
 Permission42=Crear/modificar proxectos (proxectos compartidos e proxectos dos que son contacto). Tamén pode crear tarefas e asignar usuarios a proxectos e tarefas
 Permission44=Eliminar proxectos (compartidos ou son contacto)
@@ -703,9 +705,9 @@ Permission61=Consultar intervencións
 Permission62=Crear/modificar intervencións
 Permission64=Eliminar intervencións
 Permission67=Exportar intervencións
-Permission68=Send interventions by email
-Permission69=Validate interventions
-Permission70=Invalidate interventions
+Permission68=Enviar intervención por correo
+Permission69=Validar intervención
+Permission70=Invalidar intervencións
 Permission71=Consultar membros
 Permission72=Crear/modificar membros
 Permission74=Eliminar membros
@@ -728,7 +730,7 @@ Permission95=Consultar balances e resultados
 Permission101=Consultar expedicións
 Permission102=Crear/modificar expedicións
 Permission104=Validar expedicións
-Permission105=Send sendings by email
+Permission105=Enviar envíos por correo
 Permission106=Exportar expedicións
 Permission109=Eliminar expedicións
 Permission111=Consultar contas financieras
@@ -836,10 +838,10 @@ Permission402=Crear/modificar haberes
 Permission403=Validar haberes
 Permission404=Eliminar haberes
 Permission430=Usa barra de debug
-Permission511=Read payments of salaries (yours and subordinates)
+Permission511=Consultar pagamentos de salarios (teus e dos subordinados)
 Permission512=Crear/modificar pagamentos de salarios
 Permission514=Eliminar pagamentos de salarios
-Permission517=Read payments of salaries of everybody
+Permission517=Ler pagos de salarios de todos
 Permission519=Exportar salarios
 Permission520=Consultar Créditos
 Permission522=Crear/modificar Créditos
@@ -851,19 +853,19 @@ Permission532=Crear/modificar servizos
 Permission534=Eliminar servizos
 Permission536=Ver/xestionar os servizos ocultos
 Permission538=Exportar servizos
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
-Permission601=Read stickers
-Permission602=Create/modify stickers
-Permission609=Delete stickers
+Permission561=Ler ordes de pagamento mediante transferencia
+Permission562=Crear/modificar orde de pagamento mediante transferencia
+Permission563=Enviar/Transmitir orde de pagamento mediante transferencia
+Permission564=Rexistrar débitos/rexeitamentos da transferencia
+Permission601=Ler etiquetas
+Permission602=Crear/modificar eqtiquetas
+Permission609=Borrar etiquetas
 Permission650=Consultar lista de materiais
 Permission651=Crear/Actualizar lista de material
 Permission652=Eliminar lista de material
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission660=Ler a orde de fabricación (MO)
+Permission661=Crear / Actualizar orde de fabricación (MO)
+Permission662=Eliminar orde de fabricación (MO)
 Permission701=Consultar doacións/subvencións
 Permission702=Crear/modificar doacións/subvencións
 Permission703=Eliminar doacións/subvencións
@@ -873,8 +875,8 @@ Permission773=Eliminar informe de gastos
 Permission774=Consultar todos os informes de gastos (incluidos os non subordinados)
 Permission775=Aprobar informe de gastos
 Permission776=Pagar informe de gastos
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=Ler informes de gastos de todos
+Permission778=Crear/modificar informes de gastos de todos
 Permission779=Exportar informe de gastos
 Permission1001=Consultar stocks
 Permission1002=Crear/modificar almacéns
@@ -899,9 +901,9 @@ Permission1185=Aprobar pedimentos a provedores
 Permission1186=Enviar pedimentos a provedores
 Permission1187=Recibir pedimentos de provedores
 Permission1188=Pechar pedimentos a provedores
-Permission1189=Check/Uncheck a purchase order reception
+Permission1189=Marcar/Desmarcar a recepción dunha orde de compra
 Permission1190=Aprobar (segunda aprobación) pedimentos a provedores
-Permission1191=Export supplier orders and their attributes
+Permission1191=Exportar pedimentos de provedores e os seus atributos
 Permission1201=Obter resultado dunha exportación
 Permission1202=Crear/codificar exportacións
 Permission1231=Consultar facturas de provedores
@@ -915,8 +917,8 @@ Permission1251=Lanzar as importacións en masa á base de datos (carga de datos)
 Permission1321=Exportar facturas a clientes, campos adicionais e cobros
 Permission1322=Reabrir unha factura pagada
 Permission1421=Exportar pedimentos de clientes e campos adicionais
-Permission1521=Read documents
-Permission1522=Delete documents
+Permission1521=Ler documentos
+Permission1522=Eliminar documentos
 Permission2401=Consultar accións (eventos ou tarefas) ligadas a súa conta
 Permission2402=Crear/modificar accións (eventos ou tarefas) ligadas a súa conta
 Permission2403=Eliminar accións (eventos ou tarefas) ligadas a súa conta
@@ -931,7 +933,7 @@ Permission2515=Configuración directorios de documentos
 Permission2801=Utilizar o cliente FTP en modo leitura (só explorar e descargar)
 Permission2802=Utilizar o cliente FTP en modo escritura (borrar ou subir ficheiros)
 Permission3200=Consultar eventos arquivados e huellas dixitais
-Permission3301=Generate new modules
+Permission3301=Xerar novos módulos
 Permission4001=Ver empregados
 Permission4002=Crear empregados
 Permission4003=Eliminar empregados
@@ -951,13 +953,13 @@ Permission23001=Consultar. Traballo programado
 Permission23002=Crear/actualizar. Traballo programado
 Permission23003=Borrar. Traballo Programado
 Permission23004=Executar. Traballo programado
-Permission50101=Use Point of Sale (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
+Permission50101=Usar TPV
+Permission50151=Usar TPV (TakeTPV)
 Permission50201=Consultar as transaccións
 Permission50202=Importar as transaccións
-Permission50330=Read objects of Zapier
-Permission50331=Create/Update objects of Zapier
-Permission50332=Delete objects of Zapier
+Permission50330=Ler obxectos de Zapier
+Permission50331=Crear/Actualizar obxectos de Zapier
+Permission50332=Eliminar obxectos de Zapier
 Permission50401=Contabilizar produtos e facturas con contas contables
 Permission50411=Consultar operacións do Libro Maior
 Permission50412=Rexistrar/Editar operacións no Libro Maior
@@ -981,21 +983,21 @@ Permission63001=Consultar recursos
 Permission63002=Crear/modificar recursos
 Permission63003=Eliminar recursos
 Permission63004=Ligar recursos a eventos da axenda
-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=Permitir impresión directa
+Permission67000=Permitir impresión de recibos
+Permission68001=Ler o informe intracom
+Permission68002=Crear/modificar informe intracom
+Permission68004=Eliminar informe intracom
+Permission941601=Ler recibos
+Permission941602=Crear e modificar recibos
+Permission941603=Validar recibos
+Permission941604=Enviar recibos por correo electrónico
+Permission941605=Exportar recibos
+Permission941606=Eliminar recibos
 DictionaryCompanyType=Tipos de terceiros
 DictionaryCompanyJuridicalType=Formas xurídicas de terceiros
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
+DictionaryProspectLevel=Nivel potencial de perspectivas para as empresas
+DictionaryProspectContactLevel=Nivel potencial de perspectivas para clientes
 DictionaryCanton=Provincias
 DictionaryRegion=Rexións
 DictionaryCountry=Países
@@ -1003,7 +1005,7 @@ DictionaryCurrency=Moedas
 DictionaryCivility=Títulos honoríficos
 DictionaryActions=Tipos de eventos da axenda
 DictionarySocialContributions=Tipos de impostos sociais ou fiscais
-DictionaryVAT=Tasa de IVE (Imposto sobre vendas en EEUU)
+DictionaryVAT=Tipos de IVE ou Tipos de impostos sobre Vendas
 DictionaryRevenueStamp=Importes de selos fiscais
 DictionaryPaymentConditions=Condicións de pagamento
 DictionaryPaymentModes=Modos de pagamento
@@ -1025,14 +1027,14 @@ DictionaryEMailTemplates=Prantillas E-Mails
 DictionaryUnits=Unidades
 DictionaryMeasuringUnits=Unidades de Medida
 DictionarySocialNetworks=Redes sociais
-DictionaryProspectStatus=Prospect status for companies
-DictionaryProspectContactStatus=Prospect status for contacts
+DictionaryProspectStatus=Estado cliente potencial
+DictionaryProspectContactStatus=Estado da prospección dos contactos
 DictionaryHolidayTypes=Tipos de vacacións
 DictionaryOpportunityStatus=Estado de oportunidade para o proxecto/oportunidade
 DictionaryExpenseTaxCat=Informe de gastos - Categorías de transporte
 DictionaryExpenseTaxRange=Informe de gastos - Rango por categoría de transporte
-DictionaryTransportMode=Intracomm report - Transport mode
-TypeOfUnit=Type of unit
+DictionaryTransportMode=Informe intracom - Modo de transporte
+TypeOfUnit=Tipo de unidade
 SetupSaved=Configuración gardada
 SetupNotSaved=Configuración non gardada
 BackToModuleList=Voltar á lista de módulos
@@ -1062,15 +1064,15 @@ LocalTax1ManagementES=Xestión RE
 LocalTax1IsUsedDescES=O tipo de RE proposto por defecto nas emisións de orzamentos, facturas, pedimentos, etc. Responde á seguinte regra:<br>Se o comprador non está suxeito a RE, RE por defecto=0. Fin da regra.<br>Se o comprador está suxeito a RE entón aplícase o valor de RE por defecto. Fin da regra.<br>
 LocalTax1IsNotUsedDescES=O tipo de RE proposto por defecto é 0. Fin da regra.
 LocalTax1IsUsedExampleES=En España, trátase de persoas físicas: autónomos suxeitos a unhos epígrafes concretos do IAE.
-LocalTax1IsNotUsedExampleES=En España, trátase de entidades xurídicas: Sociedades limitadas, anónimas, etc. e persoas físicas (autónomos) suxeitos a certos epígrafes do IAE.
+LocalTax1IsNotUsedExampleES=En España, trátase de entidades xurídicas:  e persoas físicas autónomos suxeitos a certos epígrafes do IAE.
 LocalTax2ManagementES=Xestión IRPF
 LocalTax2IsUsedDescES=O tipo de IRPF proposto por defecto nas emisións de orzamentos, facturas, pedimentos, etc. Responde á seguinte regra:<br>Se o vendedor non está suxeito a IRPF, IRPF por defecto=0. Fin da regra.<br>Se o vendedor está suxeito a IRPF entón aplícase o valor de IRPF por defecto. Fin da regra.<br>
 LocalTax2IsNotUsedDescES=O tipo de IRPF proposto por defecto é 0. Fin da regra.
 LocalTax2IsUsedExampleES=En España, trátase de persoas físicas: autónomos e profesionais independentes que prestan servizos, e empresas que escolleron o réxime fiscal de módulos.
 LocalTax2IsNotUsedExampleES=En España, trátase de empresas non suxeitas ao réxime fiscal de módulos.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
-UseRevenueStamp=Use a tax stamp
-UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+RevenueStampDesc=O "selo fiscal" ou "selo de ingresos" é un imposto fixo por factura (non depende do importe da factura). Tamén pode ser un % de impostos, pero usar o segundo ou terceiro tipo de impostos é mellor para a porcentaxe de impostos, xa que os selos de impostos non proporcionan ningún informe. Só algúns países utilizan este tipo de impostos.
+UseRevenueStamp=Use un selo fiscal
+UseRevenueStampExample=valor do selo fiscal defínese por defecto na configuración dos dicionarios (%s-%s-%s)
 CalcLocaltax=Informes de impostos locais
 CalcLocaltax1=Vendas - Compras
 CalcLocaltax1Desc=Os informes calcúlanse coa diferencia entre as vendas e as compras
@@ -1078,12 +1080,12 @@ CalcLocaltax2=Compras
 CalcLocaltax2Desc=Os informes se basan no total das compras
 CalcLocaltax3=Vendas
 CalcLocaltax3Desc=Os informes se basan no total das vendas
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+NoLocalTaxXForThisCountry=Segundo a configuración dos impostos (ver% s -% s -% s), o seu país non precisa aplicar ese tipo de impostos
 LabelUsedByDefault=Etiqueta que se utilizará se non se atopa tradución para este código
 LabelOnDocuments=Etiqueta sobre documentos
 LabelOrTranslationKey=Clave de tradución ou cadea
 ValueOfConstantKey=Valor da constante
-ConstantIsOn=Option %s is on
+ConstantIsOn=Opción %s está activada
 NbOfDays=Nº de días
 AtEndOfMonth=A fin de mes
 CurrentNext=Actual/Seguinte
@@ -1128,7 +1130,7 @@ LoginPage=Páxina de login
 BackgroundImageLogin=Imaxe de fondo
 PermanentLeftSearchForm=Zona de procura permanente do menú esquerdo
 DefaultLanguage=Idioma por defecto
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
+EnableMultilangInterface=Activar interfaz multi-idioma para relacións con clientes ou provedores
 EnableShowLogo=Amosar o logotipo no menú da esquerda
 CompanyInfo=Empresa/Organización
 CompanyIds=Identificación da empresa/organización
@@ -1152,26 +1154,26 @@ ShowBugTrackLink=Amosar ligazón "<strong>%s</strong>"
 Alerts=Alertas
 DelaysOfToleranceBeforeWarning=Atraso antes da amosar unha alerta
 DelaysOfToleranceDesc=Esta pantalla permite configurar os prazos de tolerancia antes da alerta co icono %s, sobre cada elemento en atraso.
-Delays_MAIN_DELAY_ACTIONS_TODO=Atraso (en días) sobre eventos planificados (eventos da axenda) aínda non completados
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Atraso antes da alerta (en días) sobre proxectos non pechados a tempo
-Delays_MAIN_DELAY_TASKS_TODO=Atraso (en días) sobre tarefas planificadas (tarefas de proxectos) aínda non completadas
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Atraso antes da alerta (en días) sobre pedimentos non procesados
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Atraso antes da alerta (en días) sobre pedimentos a provedores non procesados
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Atraso antes da alerta (en días) sobre orzamentos non pechados
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Atraso antes da alerta (en días) sobre orzamentos non facturados
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Atraso antes da alerta (en días) sobre servizos a activar
-Delays_MAIN_DELAY_RUNNING_SERVICES=Atraso antes da alerta (en días) sobre servizos expirados
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Atraso antes da alerta (en días) sobre facturas de provedor impagadas
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Atraso antes da alerta (en días) sobre facturas a cliente impagadas
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Atraso antes da alerta (en días) sobre conciliacións bancarias pendentes
-Delays_MAIN_DELAY_MEMBERS=Atraso antes da alerta (en días) sobre cotizacións de membros en atraso
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Atraso antes da alerta  (en días) sobre talóns a ingresar
-Delays_MAIN_DELAY_EXPENSEREPORTS=Atraso antes da alerta  (en días) sobre informes de gastos a aprobar
-Delays_MAIN_DELAY_HOLIDAYS=Atraso antes da alerta  (en días) sobre días libres a aprobar.
+Delays_MAIN_DELAY_ACTIONS_TODO=Os eventos planificados (eventos da axenda) non se completaron
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Proxecto non pechado a tempo
+Delays_MAIN_DELAY_TASKS_TODO=A tarefa planificada (tarefas do proxecto) non se completou
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Pedimento non procesado
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Pedimento non procesado
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Orzamento non pechado
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Orzamento non facturado
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Servizos a activar
+Delays_MAIN_DELAY_RUNNING_SERVICES=Servizos expirados
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Facturas de provedor non pagas
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Facturas a cliente non pagas
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Conciliacións bancarias pendentes
+Delays_MAIN_DELAY_MEMBERS=Cotizacións de membros en atraso
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Talóns a ingresar non realizados
+Delays_MAIN_DELAY_EXPENSEREPORTS=Informe de gastos a aprobar
+Delays_MAIN_DELAY_HOLIDAYS=Días libres a aprobar.
 SetupDescription1=Antes de comezar a usar Dolibarr, algúns parámetros iniciais teñen que ser definidos e activar/configurar os módulos.
 SetupDescription2=As seguintes dúas seccións son obrigatorias (as dúas primeiras entradas no menu de configuración):
-SetupDescription3=<a href="%s">%s->%s</a> <br>Parámetros básicos usados para persoalizar o comportamento por defecto de Dolibarr (ex. características relacionadas co país)
-SetupDescription4=<a href="%s">%s -> %s</a> <br>Este software é unha colección de moitos módulos/aplicacións, todos eles mais ou menos independentes. Os módulos relevantes que precisas deben ser activados e configurados. Novos elementos/opcións serán engadidos aos menús coa activación do módulo.
+SetupDescription3=<a href="%s">%s->%s</a> <br><br> Parámetros básicos usados para persoalizar o comportamento por defecto de Dolibarr (ex. características relacionadas co país)
+SetupDescription4=<a href="%s">%s -> %s</a> <br><br> Este software é unha colección de moitos módulos/aplicacións, todos eles mais ou menos independentes. Os módulos relevantes que precisas deben ser activados e configurados. Novos elementos/opcións serán engadidos aos menús coa activación do módulo.
 SetupDescription5=Outras entradas do menú de configuración xestionan parámetros opcionais.
 LogEvents=Auditoría da seguridade de eventos
 Audit=Auditoría
@@ -1182,24 +1184,24 @@ InfoWebServer=Sobre o Servidor Web
 InfoDatabase=Sobre a base de datos
 InfoPHP=Sobre o PHP
 InfoPerf=Sobre o rendimento
-InfoSecurity=About Security
+InfoSecurity=Acerca da seguridade
 BrowserName=Nome do navegador
 BrowserOS=S.O. do navegador
 ListOfSecurityEvents=Listaxe de eventos de seguridade Dolibarr
 SecurityEventsPurged=Eventos de seguridade purgados
-LogEventDesc=Pode habilitar o rexistro de eventos de seguridade aquí. Os administradores poden ver o contido do rexistro ao través do menú <b>%s-%s</b>.Atención, esta característica puede xerar unha gran cantidade de datos na base de datos.
+LogEventDesc=Pode habilitar o rexistro de eventos de seguridade aquí. Os administradores poden ver o contido do rexistro ao través do menú <b>%s-%s</b>.Atención, esta característica pode xerar unha gran cantidade de datos na base de datos.
 AreaForAdminOnly=Os parámetros de configuración poden ser tratados por <b>usuarios administradores</b> exclusivamente.
 SystemInfoDesc=A información do sistema é información técnica accesible en modo lectura para administradores exclusivamente.
 SystemAreaForAdminOnly=Esta área é accesible aos usuarios administradores exclusivamente. Os permisos dos usuarios de Dolibarr non permiten cambiar esta restricción.
-CompanyFundationDesc=Edite a información da empresa/entidade. Faga clic nos botóns "%s" ou "%s" a pé de páxina.
+CompanyFundationDesc=Edite a información da súa empresa/entidade. Faga clic no botón "%s" a pé de páxina cando remate
 AccountantDesc=Se ten un contable/auditor externo, pode editar aquí a súa información.
 AccountantFileNumber=Número de ficheiro
 DisplayDesc=Pode modificar aquí todos os parámetros relacionados coa apariencia do Dolibarr
 AvailableModules=Módulos dispoñibles
 ToActivateModule=Para activar os módulos, ir ao área de Configuración (Inicio->Configuración->Módulos).
 SessionTimeOut=Timeout de sesións
-SessionExplanation=Este número garantiza que a sesión nunca caducará antes deste atraso, si el limpiador de sesión se realiza mediante un limpiador de sesión interno de PHP (e nada más). El limpiador interno de sesións de PHP no garantiza que la sesión caduque después de este retraso. Expirará, después de este retraso, e cuando se ejecute o limpiador de sesións, por lo que cada acceso <b> %s/%s </b>, pero solo durante o acceso realizado por otras sesións (si el valor es 0, significa que la limpieza de sesións 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 sesións se pueden destruir después de un período definido por una configuración externa, sin importar el valor introducido aquí
-SessionsPurgedByExternalSystem=Sessions on this server seems to be cleaned by an external mechanism (cron under debian, ubuntu ...), probably every <b>%s</b> seconds (= value of parameter <b>session.gc_maxlifetime</b>), so changing the value here has no effect. You must ask the server administrator to change session delay.
+SessionExplanation=Este número garante que a sesión nunca caducará antes deste atraso, se o limpador de sesión o realiza o limpador de sesión interno PHP (e nada máis). O limpador de sesión PHP interno non garante que a sesión caducará despois deste atraso. Caducará, despois deste atraso, e cando se execute o limpador de sesión, polo que cada acceso <b> %s/%s </b>, pero só durante o acceso feito por outras sesións (se o valor é 0, significa que a limpeza da sesión só se fai por un proceso externo) .<br> Nota: nalgúns servidores cun mecanismo de limpeza de sesión externo (cron baixo debian, ubuntu ...), as sesións pódense destruír despois dun período definido por unha configuración externa, independentemente do valor que se introduza aquí.
+SessionsPurgedByExternalSystem=As sesións neste servidor parecen estar limpas por un mecanismo externo (cron baixo debian, ubuntu ...), probablemente cada <b>%s</b> segundos (= valor do parámetro <b>session.gc_maxlifetime</b>), polo que cambiar o valor aquí non ten efecto. Debe solicitar ao administrador do servidor que cambie o atraso da sesión.
 TriggersAvailable=Triggers dispoñibles
 TriggersDesc=Os triggers son ficheiros que, unha vez copiados no directorio <b>htdocs/core/triggers</b>, modifican o comportamento do fluxo de traballo de Dolibarr. Realizan accións suplementarias, desencadenadas polos eventos Dolibarr (creación de empresa, validación factura...).
 TriggerDisabledByName=Triggers deste ficheiro desactivados polo sufixo <b>-NORUN</b> no nome do ficheiro.
@@ -1208,37 +1210,37 @@ TriggerAlwaysActive=Triggers deste ficheiro sempre activos, posto que os módulo
 TriggerActiveAsModuleActive=Triggers deste ficheiro activos posto que o módulo <b>%s</b> está activado
 GeneratedPasswordDesc=Indique aquí que norma quere utilizar para xerar as contrasinais cando precise xerar un novo contrasinal
 DictionaryDesc=Inserte aquí os datos de referencia. Pode engadir os seus datos aos predefinidos.
-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.
+ConstDesc=Esta páxina permítelle editar (substituír) parámetros non dispoñibles noutras páxinas. Estes son principalmente parámetros reservados só para desenvolvedores ou solución avanzadas de problemas.
+MiscellaneousDesc=Todos os outros parámetros relacionados coa seguridad definense aquí.
 LimitsSetup=Configuración de límites e precisións
 LimitsDesc=Pode definir aquí os límites e precisións utilizados por Dolibarr
 MAIN_MAX_DECIMALS_UNIT=Decimais máximos para os prezos unitarios
 MAIN_MAX_DECIMALS_TOT=Decimais máximos para os prezos totais
-MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
+MAIN_MAX_DECIMALS_SHOWN=Decimais máximos nos prezos <b>amosados na pantalla</b>. Engade unha elipse <b> ... </b> despois deste parámetro (por exemplo, "2 ...") se queres ver o sufixo "<b> ... </b>" ao prezo acurtado.
+MAIN_ROUNDING_RULE_TOT=Salto do intervalo de redondeo (para os países onde o redondeo se fai noutra cousa que non sexa a base 10. Por exemplo, pon 0,05 se o redondeo se fai 0,05 pasos)
 UnitPriceOfProduct=Prezo unitario sen IVE dun produto
-TotalPriceAfterRounding=Prezo total despois do redondeo
+TotalPriceAfterRounding=Prezo total (sen IVE/ incluído taxas) despois do redondeo
 ParameterActiveForNextInputOnly=Parámetro efectivo só a partires das próximas sesións
 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=Para realizar unha copia de seguridade completa de Dolibarr, vostede debe:
-BackupDesc2=Garde o contido do directorio de documentos (<b>%s</b>), contén todos os ficheiros subidos e xerados  (Polo que inclúe todos os ficheiros de copias xeradas no primeiro paso).
+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.
 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.
 BackupPHPWarning=A copia de seguridade non pode ser garantida con este método. É preferible utilizar o anterior
 RestoreDesc=Para restaurar unha copia de seguridade de Dolibarr, vostede debe:
-RestoreDesc2=Tomar o ficheiro (ficheiro zip, por exemplo) do directorio dos documentos e descomprimilo no directorio dos documentos dunha nova instalación de Dolibarr ou na carpeta dos documentos desta instalación (<b>%s</b>).
-RestoreDesc3=Restaurar o ficheiro de volcado gardado na base de datos da nova instalación de Dolibarr ou desta instalación (<b>%s</b>). Atención, unha vez realizada a restauración, deberá utilizar un login/contrasinal de administrador existente no momento da copia de seguridade para conectarse. Para restaurar a base de datos na instalación actual, pode utilizar o asistente a continuación.
+RestoreDesc2=Seleccionar o ficheiro (ficheiro zip, por exemplo) do directorio dos documentos e descomprimilo no directorio dos documentos dunha nova instalación de Dolibarr ou na carpeta dos documentos desta instalación (<b>%s</b>).
+RestoreDesc3=Restaurar o ficheiro de volcado gardado na base de datos da nova instalación de Dolibarr ou desta instalación (<b>%s</b>). Atención, unha vez realizada a restauración, deberá utilizar un login/contrasinal de administrador existente no momento da copia de seguridade para conectarse.<br> Para restaurar a base de datos na instalación actual, pode utilizar o asistente a continuación.
 RestoreMySQL=Importación MySQL
-ForcedToByAModule=Esta regra está forzada a <b>%s</b> por un dos módulos activados
-ValueIsForcedBySystem=This value is forced by the system. You can't change it.
+ForcedToByAModule=Esta regra é obrigada a <b>%s</b> por un dos módulos activados
+ValueIsForcedBySystem=Este valor é obrigado polo sistema. Non pode cambialo.
 PreviousDumpFiles=Copias de seguridade da base de datos realizadas anteriormente
 PreviousArchiveFiles=Copias de seguridade do directorio documentos realizadas anteriormente
 WeekStartOnDay=Primeiro día da semana
 RunningUpdateProcessMayBeRequired=Parece preciso realizar o proceso de actualización (a versión do programa %s difiere da versión da base de datos %s)
-YouMustRunCommandFromCommandLineAfterLoginToUser=Debe executar o comando dende unha shell despois de ter iniciado sesión coa conta <b>%s</b>.
+YouMustRunCommandFromCommandLineAfterLoginToUser=Debe executar esta orde dende unha shell despois de ter iniciado sesión co usuario <b>%s</b> ou debe engadir a opción -W ao final da liña para proporcionar un contrasinal de <b> %s </b>
 YourPHPDoesNotHaveSSLSupport=Funcións SSL non dispoñibles no seu PHP
 DownloadMoreSkins=Mais temas para descargar
 SimpleNumRefModelDesc=Volta un número baixo o formato %syymm-nnnn donde y é o ano, mm o mes e nnnn un contador secuencial sen ruptura e sen regresar a 0
@@ -1275,46 +1277,46 @@ ExtraFieldsSupplierOrders=Campos adicionais (pedimentos a provedores)
 ExtraFieldsSupplierInvoices=Campos adicionais (facturas)
 ExtraFieldsProject=Campos adicionais (proxectos)
 ExtraFieldsProjectTask=Campos adicionais (tarefas)
-ExtraFieldsSalaries=Campos dicionais (salarios)
+ExtraFieldsSalaries=Campos adicionais (salarios)
 ExtraFieldHasWrongValue=O campo %s contén un valor non válido
 AlphaNumOnlyLowerCharsAndNoSpace=só alfanuméricos e minúsculas sen espazo
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
+SendmailOptionNotComplete=Aviso, nalgúns sistemas Linux, para enviar correos electrónicos desde o seu correo electrónico, a configuración de execución de sendmail debe conter a opción -ba (o parámetro mail.force_extra_parameters no seu ficheiro php.ini). Se algúns dos seus destinatarios nunca reciben correos electrónicos, tente editar este parámetro PHP con mail.force_extra_parameters=-ba).
 PathToDocuments=Ruta de acceso a documentos
 PathDirectory=Directorio
-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=Sí en verano
-OnlyFollowingModulesAreOpenedToExternalUsers=Atención: únicamente os módulos seguintes están dispoñibles a usuarios externos (sexa cal fora o permiso de ditos usuarios) e só outorganse permisos:
+SendmailOptionMayHurtBuggedMTA=A función para enviar correos usando o método "PHP mail direct" xerará unha mensaxe de correo que algúns servidores de correo receptores poden non analizar correctamente. O resultado é que algúns correos non poden ser lidos por persoas aloxadas nesas plataformas. É o caso dalgúns fornecedores de Internet (por exemplo: Orange en Franza). Isto non é un problema con Dolibarr ou PHP senón co servidor de correo receptor. Porén, pode engadir unha opción MAIN_FIX_FOR_BUGGED_MTA a 1 en Configuración-Outro para modificar Dolibarr para evitar o erro. Porén, pode ter problemas con outros servidores que usan estritamente o estándar SMTP. A outra solución (recomendada) é empregar o método "SMTP socket library" que non ten desvantaxes.
+TranslationSetup=Configuración de tradución
+TranslationKeySearch=Buscar unha chave ou cadea de tradución
+TranslationOverwriteKey=Sobreescribir una cadena traducida
+TranslationDesc=Como configurar o idioma de visualización:<br>* Por defecto Sistema: menu <strong>Inicio - Configuración - Entorno</strong><br>* Por usuario: faga clic no nome de usuario na parte superior da pantalla e modifique a pestana <strong> Configuración da visualización do usuario </strong> na tarxeta de usuario.
+TranslationOverwriteDesc=Tamén pode reemplazar cadeas enchendo a seguinte táboa. Escolla o seu idioma no menú despregable "%s", insira a cadea de clave de tradución en "%s" e a súa nova tradución en "%s"
+TranslationOverwriteDesc2=Podes usar a outra pestana para axudarche a saber que clave de tradución usar
+TranslationString=Cadea traducida
+CurrentTranslationString=Cadna traducida actual
+WarningAtLeastKeyOrTranslationRequired=Requírese un criterio de busca polo menos para a clave ou a cadea de tradución
+NewTranslationStringToShow=Nova cadea traducida a amosar
+OriginalValueWas=A tradución orixinal sobrescríbese. O valor orixinal era:<br><br>%s
+TransKeyWithoutOriginalValue=Forzou unha nova tradución para a clave de tradución '<strong>%s</strong>' que non existe en ningún ficheiro de idioma
+TitleNumberOfActivatedModules=Módulos activados
+TotalNumberOfActivatedModules=Número total de módulos activados: <b>%s</b> / <b>%s</b>
+YouMustEnableOneModule=Debe activar polo menos 1 módulo.
+ClassNotFoundIntoPathWarning=Clase 1%s non foi atopada na ruta PHP
+YesInSummer=Sí en verán
+OnlyFollowingModulesAreOpenedToExternalUsers=Atención: Teña conta que os módulos seguintes están dispoñibles a usuarios externos (sexa cal fora o permiso destes usuarios) e só se os permisos son concedidos:<br>
 SuhosinSessionEncrypt=Almacenamento de sesións cifradas por Suhosin
 ConditionIsCurrently=Actualmente a condición é %s
 YouUseBestDriver=Está usando o driver %s, actualmente é o mellor driver dispoñible.
 YouDoNotUseBestDriver=Usa o driver %s aínda que é recomendable usar o driver %s.
-NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=So ten %s %s na base de datos. Isto non require ningunha optimización particular
 SearchOptim=Buscar optimización
-YouHaveXObjectUseSearchOptim=Ten %s %s produtos na base de datos. Debería engadir a constante %s a 1 e Inicio-Configuración-Outra Configuración. Limita a busca ao comezo da cadea o que fai posible que a base de datos use o indice e acade unha resposta inmediata.
+YouHaveXObjectUseSearchOptim=Ten %s %s na base de datos. Pode engadir a constante %s a 1 en Configuración de Inicio-Configuración-Outro. Limita a busca ao comezo das cadeas o que fai posible que a base de datos use índices e debería obter unha resposta inmediata.
 YouHaveXObjectAndSearchOptimOn=Ten %s %s na base de datos e a constante %s está configurada en 1 in Inicio-Configuración-Outra Configuración.
 BrowserIsOK=Usa o navegador web %s. Este navegador está optimizado para a seguridade e o rendemento.
 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=PHP component %s is loaded
+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".
 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".
-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".
+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
 FillThisOnlyIfRequired=Exemplo: +2 (Complete só se rexistra unha desviación do tempo na exportación)
@@ -1322,7 +1324,7 @@ GetBarCode=Obter código de barras
 NumberingModules=Modelos de numeración
 DocumentModules=Modelos de documento
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Volta un contrasinal xerado segundo o algoritmo interno de Dolibarr:%s caracteres, que conteñen números e caracteres en minúsculas mesturados.
 PasswordGenerationNone=Non suxerir ningún contrasinal xerada. O contrasinal debe ser escrito manualmente.
 PasswordGenerationPerso=Volta un contrasinal segundo a configuración definida.
 SetupPerso=Segundo a túa configuración
@@ -1332,19 +1334,19 @@ RuleForGeneratedPasswords=Norma para a xeración das contrasinais propostas
 DisableForgetPasswordLinkOnLogonPage=Non amosar a ligazón "Contrasinal esquecida" na páxina de login
 UsersSetup=Configuración do módulo usuarios
 UserMailRequired=E-Mail preciso para crear un novo usuario
-UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
-UsersDocModules=Document templates for documents generated from user record
-GroupsDocModules=Document templates for documents generated from a group record
+UserHideInactive=Ocultar usuarios inactivos de todas as listas combinadas de usuarios (Non recomendado: isto pode significar que non poderá filtrar nin buscar usuarios antigos nalgunhas páxinas)
+UsersDocModules=Modelos de documentos para documentos xerados desde o rexistro do usuario
+GroupsDocModules=Modelos de documentos para documentos xerados desde un rexistro de grupo
 ##### HRM setup #####
-HRMSetup=HRM module setup
+HRMSetup=Setup do módulo RRHH
 ##### Company setup #####
 CompanySetup=Configuración do módulo Terceiros
 CompanyCodeChecker=Opcións para a xeración automática de códigos de clientes / provedores.
 AccountCodeManager=Opcións para a xeración automática de contas contables de clientes / provedores.
-NotificationsDesc=As notificacións por e-mail permitenlle enviar silenciosamente e-mails  automáticos, para algúns eventos Dolibarr. Pódense definir os destinatarios:
+NotificationsDesc=As notificacións por e-mail permitenlle enviar silenciosamente e-mails  automáticos, para algúns eventos Dolibarr.<br> Pódense definir os destinatarios:
 NotificationsDescUser=* por usuarios, un usuario á vez.
 NotificationsDescContact=* por contactos de terceiros (clientes ou provedores), un contacto á vez.
-NotificationsDescGlobal=* o configurando destinatarios globlalmente na configuración do módulo.
+NotificationsDescGlobal=* ou configurando destinatarios globlalmente na configuración do módulo.
 ModelModules=Prantillas de documentos
 DocumentModelOdt=Xeración dos documentos OpenDocument (Ficheiro .ODT / .ODS de LibreOffice, OpenOffice, KOffice, TextEdit...)
 WatermarkOnDraft=Marca de auga nos documentos borrador
@@ -1355,10 +1357,10 @@ MustBeMandatory=¿Obrigatorio para crear terceiros (se o CIF ou tipo de compañ
 MustBeInvoiceMandatory=¿Obrigatorio para validar facturas?
 TechnicalServicesProvided=Servizos técnicos prestados
 #####DAV #####
-WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
+WebDAVSetupDesc=Estas son as ligazóns para acceder ao directorio WebDAV. Conten un directorio "público" aberto para calquera usuario que coñeza a URL (se permite o acceso público ao directorio) e un directorio "privado" que precisa unha conta de inicio de sesión / contrasinal para acceder.
 WebDavServer=URL raíz do servidor %s: %s
 ##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
+WebCalUrlForVCalExport=Hai unha ligazón de exportación ao formato <b>%s</b> dispoñible na seguinte ligazón:: %s
 ##### Invoices #####
 BillsSetup=Configuración do módulo Facturas
 BillsNumberingModule=Módulo de numeración de facturas e abonos
@@ -1391,16 +1393,16 @@ WatermarkOnDraftSupplierProposal=Marca de auga en orzamentos de provedor (no cas
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Preguntar por conta bancaria a usar no orzamento
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Almacén a utilizar para o pedimento
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Preguntar por conta bancaria a usar no pedimento a provedor
 ##### Orders #####
 SuggestedPaymentModesIfNotDefinedInOrder=Modo suxerido de pago en pedimentos de cliente por defecto se non está definido no pedimento
-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
+OrdersSetup=Configuración da xestión de pedimentos de cliente
+OrdersNumberingModules=Modelos de numeración de pedimentos
+OrdersModelModule=Modelos de documentos de pedimentos
+FreeLegalTextOnOrders=Texto libre en pedimentos
+WatermarkOnDraftOrders=Marca de auga en borradores de pedimentos (ningunha se está baleira)
+ShippableOrderIconInList=Engade unha icona na lista de pedimentos que indique se se pode enviar o pedimento
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Solicitar o destino da orde bancaria
 ##### Interventions #####
 InterventionsSetup=Configuración do módulo intervencións
 FreeLegalTextOnInterventions=Texto adicional nas fichas de intervención
@@ -1421,7 +1423,7 @@ AdherentMailRequired=E-Mail obrigatorio para crear un membro novo
 MemberSendInformationByMailByDefault=Caixa de verificación para enviar o correo de confirmación (validación ou nova cotización) aos membros é por defecto "sí"
 VisitorCanChooseItsPaymentMode=O visitante pode escoller entre os modos de pagamento dispoñibles
 MEMBER_REMINDER_EMAIL=Habilitar recordatorio de eventos <b>por e-mail</b> de suscripcións expiradas. Nota: O módulo <strong>%s</strong> debe estar habilitado e configurado correctamente para que o recordatorio sexa enviado.
-MembersDocModules=Document templates for documents generated from member record
+MembersDocModules=Modelos de documentos para documentos xerados a partir do rexistro de membros
 ##### LDAP setup #####
 LDAPSetup=Configuración do módulo LDAP
 LDAPGlobalParameters=Parámetros globais
@@ -1490,27 +1492,27 @@ LDAPTestSynchroMemberType=Probar a sincronización de tipo de membro
 LDAPTestSearch= Probar unha busca LDAP
 LDAPSynchroOK=Proba de sincronización realizada correctamente
 LDAPSynchroKO=Proba de sincronización erronea
-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)
+LDAPSynchroKOMayBePermissions=Fallou a proba de sincronización. Comprobe se a conexión co servidor está configurada correctamente e permite actualizacións LDAP
+LDAPTCPConnectOK=Conexión TCP ao servidor LDAP realizada (Servidor=%s, Porto=%s)
+LDAPTCPConnectKO=Fallo de conexión TCP ao servidor LDAP (Servidor=%s, Porto=%s)
+LDAPBindOK=Conexión/Autenticación realizada ao servidor LDAP (Servidor=%s, Puerto=%s, Admin=%s, Password=%s)
+LDAPBindKO=Fallo de conexión/autenticación ao servidor LDAP (Servidor=%s, Puerto=%s, Admin=%s, Password=%s)
+LDAPSetupForVersion3=Servidor LDAP configurado para versión 3
+LDAPSetupForVersion2=Servidor LDAP configurado para versión 2
+LDAPDolibarrMapping=Mapping Dolibarr
+LDAPLdapMapping=Mapping LDAP
+LDAPFieldLoginUnix=Inicio de sesión (unix)
 LDAPFieldLoginExample=Exemplo : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
+LDAPFilterConnection=Filtro de búsqueda
+LDAPFilterConnectionExample=Exemplo : &(objectClass=inetOrgPerson)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFieldLoginSambaExample=Exemplo : samaccountname
 LDAPFieldFullname=Nome completo
-LDAPFieldFullnameExample=Example: cn
-LDAPFieldPasswordNotCrypted=Password not encrypted
-LDAPFieldPasswordCrypted=Password encrypted
-LDAPFieldPasswordExample=Example: userPassword
-LDAPFieldCommonNameExample=Example: cn
+LDAPFieldFullnameExample=Exemplo : cn
+LDAPFieldPasswordNotCrypted=Contrasinal non cifrada
+LDAPFieldPasswordCrypted=Contrasinal cifrada
+LDAPFieldPasswordExample=Exemplo : userPassword
+LDAPFieldCommonNameExample=Exemplo : cn
 LDAPFieldName=Nome
 LDAPFieldNameExample=Exemplo : sn
 LDAPFieldFirstName=Nome
@@ -1545,67 +1547,72 @@ LDAPFieldSid=SID
 LDAPFieldSidExample=Exemplo : objectsid
 LDAPFieldEndLastSubscription=Data finalización como membro
 LDAPFieldTitle=Posto de traballo
-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
+LDAPFieldTitleExample=Exemplo:título
+LDAPFieldGroupid=Id Grupo
+LDAPFieldGroupidExample=Exemplo : número gid
+LDAPFieldUserid=Id usuario
+LDAPFieldUseridExample=Exemplo : número uid
+LDAPFieldHomedirectory=Directorio Inicio
+LDAPFieldHomedirectoryExample=Exemplo : directorioinicio
+LDAPFieldHomedirectoryprefix=Prefixo do directorio inicio
+LDAPSetupNotComplete=Configuración LDAP incompleta (a completar nas outras pestanas)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Administrador ou contrasinal non proporcionados. O acceso LDAP será anónimo e en modo só lectura.
+LDAPDescContact=Esta páxina permítelle definir o nome dos atributos LDAP na árbore LDAP para cada dato atopado nos contactos Dolibarr.
+LDAPDescUsers=Esta páxina permítelle definir o nome dos atributos LDAP na árbore LDAP para cada dato atopado nos usuarios de Dolibarr..
+LDAPDescGroups=Esta páxina permítelle definir o nome dos atributos LDAP na árbore LDAP para cada dato atopado nos grupos Dolibarr.
+LDAPDescMembers=Esta páxina permítelle definir o nome dos atributos LDAP na árbore LDAP para cada dato atopado no módulo de membros de Dolibarr..
+LDAPDescMembersTypes=Esta páxina permítelle definir o nome dos atributos LDAP na árbore LDAP para cada dato atopado nos tipos de membros de Dolibarr.
+LDAPDescValues=Os valores de exemplo están deseñados para <b> OpenLDAP </b> cos seguintes esquemas cargados: <b> core.schema, cosine.schema, inetorgperson.schema </b>). Se usa estes valores e OpenLDAP, modifique o ficheiro de configuración LDAP <b> slapd.conf </b> para ter todos os esquemas cargados.
+ForANonAnonymousAccess=Para un acceso autenticado (por exemplo para un accesos de escritura)
+PerfDolibarr=Informe da configuración/optimización do rendemento
 YouMayFindPerfAdviceHere=Nesta páxina atopará varias probas e consellos relacionados co rendemento.
-NotInstalled=Not installed.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
+NotInstalled=Non instalado.
+NotSlowedDownByThis=Non ralentizado por isto.
+NotRiskOfLeakWithThis=Non hai risco de fuga con isto
 ApplicativeCache=Aplicación caché
-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
+MemcachedNotAvailable=Non se atopou aplicación caché. Pode mellorar o rendemento instalando un servidor caché. Memcached é un módulo capaz de usar este servidor caché. <br>Mais 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>Teña conta que moitos provedores de hospedaxe web non fornecen ese servidor caché.
+MemcachedModuleAvailableButNotSetup=Atopouse o módulo memcached para a aplicación caché pero a configuración do módulo non está completa.
+MemcachedAvailableAndSetup=O módulo memcached adicado a usar o servidor memcached está habilitado.
+OPCodeCache=Caché OPCode
+NoOPCodeCacheFound=Non se atopou caché OPCode. Cicais estexa a usar unha caché OPCode distinta de XCache ou eAccelerator (bo) ou cicais non teña caché OPCode (moi mal).
+HTTPCacheStaticResources=Caché HTTP para estatísticas de recursos (css, img, javascript)
+FilesOfTypeCached=Os ficheiros de tipo %s son almacenados en caché polo servidor HTTP
+FilesOfTypeNotCached=Os ficheiros de tipo %s non son almacenados en caché polo servidor HTTP
+FilesOfTypeCompressed=Os ficheiros de tipo %s son comprimidos polo servidor HTTP
+FilesOfTypeNotCompressed=Os ficheiros de tipo %s non son comprimidos polo servidor HTTP
+CacheByServer=Caché por servidor
+CacheByServerDesc=Por exemplo, usando a directiva  Apache "ExpiresByType image/gif A2592000"
+CacheByClient=Caché por navegador
+CompressionOfResources=Compresión das respostas HTTP
+CompressionOfResourcesDesc=Por exemplo, usando a directiva Apache  "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=Esta detección automática non é posible cos navegadores actuais
+DefaultValuesDesc=Aquí pode definir o valor predeterminado que desexa usar ao crear un novo rexistro e / ou filtros predeterminados ou a orde de clasificación ao listar rexistros.
+DefaultCreateForm=Valores predeterminados (para usar nos formularios)
+DefaultSearchFilters=Filtros de busca predeterminados
+DefaultSortOrder=Ordes de clasificación predeterminados
+DefaultFocus=Campos de enfoque predeterminados
+DefaultMandatory=Campos de formulario obrigatorios
 ##### Products #####
 ProductSetup=Configuración do módulo Produtos
 ServiceSetup=Configuración do módulo Servizos
 ProductServiceSetup=Configuración dos módulos Produtos e Servizos
 NumberOfProductShowInSelect=Nº de produtos máx. nas listas (0=sen límite)
 ViewProductDescInFormAbility=Visualización das descripcións dos produtos nos formularios (no caso contrario como tooltip)
+DoNotAddProductDescAtAddLines=Non engadir a descrición do produto (da tarxeta do produto) ao enviar engadir liñas nos formularios
+OnProductSelectAddProductDesc=Como usar a descrición dos produtos cando se engade un produto como liña dun documento
+AutoFillFormFieldBeforeSubmit=Completar automaticamente o campo de entrada da descrición coa descrición do produto
+DoNotAutofillButAutoConcat=Non completa automaticamente o campo de entrada coa descrición do produto. A descrición do produto concatenarase coa descrición introducida automaticamente.
+DoNotUseDescriptionOfProdut=A descrición do produto nunca se incluirá na descrición das liñas de documentosMergePropalProductCard=Activar no produto/servizo a pestana Documentos unha opción para fusionar documentos PDF de produtos ao orzamento PDF azur se o produto/servizo atópase no orzamento
 MergePropalProductCard=Activar no produto/servizo a pestana Documentos unha opción para fusionar documentos PDF de produtos ao orzamento PDF azur se o produto/servizo atópase no orzamento
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in the language of the third party
-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!
+ViewProductDescInThirdpartyLanguageAbility=Amosar as descricións dos produtos no idioma do terceiro
+UseSearchToSelectProductTooltip=Tamén, se ten un gran número de produtos (> 100 000), pode aumentar a velocidade configurando PRODUCT_DONOTSEARCH_ANYWHERE constante en 1 en Configuración-> Outro. A busca limitarase entón ao comezo da cadea.
+UseSearchToSelectProduct=Agard a que prema unha tecla antes de cargar o contido da listaxe combinada de produtos (Isto pode aumentar o rendemento se ten un gran número de produtos, pero é menos conveniente)
+SetDefaultBarcodeTypeProducts=Tipo de código de barras predeterminado para usar en produtos
+SetDefaultBarcodeTypeThirdParties=Tipo de código de barras predeterminado para usar con terceiros
+UseUnits=Defina unha unidade de medida para Cantidade durante a edición de liñas de orzamento, pedimento ou factura
+ProductCodeChecker= Módulo para a xeración e comprobación de código de produto (produto ou servizo)
+ProductOtherConf= Configuración de Produto/Servizo
+IsNotADir=non é un directorio!
 ##### Syslog #####
 SyslogSetup=Configuración do módulo Syslog
 SyslogOutput=Saída do log
@@ -1614,9 +1621,9 @@ SyslogLevel=Nivel
 SyslogFilename=Nome e ruta do ficheiro
 YouCanUseDOL_DATA_ROOT=Pode utilizar DOL_DATA_ROOT/dolibarr.log para un rexistro no directorio "documentos" de Dolibarr. Porén, pode establecer un directorio diferente para gardar este ficheiro.
 ErrorUnknownSyslogConstant=A constante %s non é unha constante syslog coñecida
-OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
+OnlyWindowsLOG_USER=Windows só soporta LOG_USER
 CompressSyslogs=Compresión e copia de seguridade dos ficheiros de rexistro de depuración (xerados polo módulo Log para a depuración)
-SyslogFileNumberOfSaves=Number of backup logs to keep
+SyslogFileNumberOfSaves=Copias de seguridade de log a gardar
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configurar tareas programados de limpeza para establecer a frecuencia de copia de seguridade do log
 ##### Donations #####
 DonationsSetup=Configuración do módulo doacións/subvencións
@@ -1640,46 +1647,46 @@ GenbarcodeLocation=Ferramenta de xeración de códigos de barras na liña de com
 BarcodeInternalEngine=Motor interno
 BarCodeNumberManager=Xestor para auto definir números de código de barras
 ##### Prelevements #####
-WithdrawalsSetup=Configuración d0 módulo domiciliacións
+WithdrawalsSetup=Configuración do módulo domiciliacións
 ##### ExternalRSS #####
 ExternalRSSSetup=Configuración das importaciones do fluxo RSS
 NewRSS=Sindicación dun novo fluxo RSS
 RSSUrl=URL del RSS
 RSSUrlExample=Un fluxo RSS interesante
 ##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender email (From) for emails sent by emailing module
-MailingEMailError=Return Email (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
+MailingSetup=Configuración do módulo E-Mailing
+MailingEMailFrom=E-Mail emisor (From) dos correos enviados por E-Mailing
+MailingEMailError=E-Mail de resposta (Errors-to) para as respostas acerca de envíos por e-mailing con erros.
+MailingDelay=Segundos que agarda despois de enviar a mensaxe seguinte
 ##### Notification #####
-NotificationSetup=Email Notification module setup
-NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
-FixedEmailTarget=Destinatario
+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
 ##### Sendings #####
-SendingsSetup=Shipping module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
+SendingsSetup=Configuración do módulo Expedicións
+SendingsReceiptModel=Modelo de notas de entrega
+SendingsNumberingModules=Módulos de numeración de notas de entrega
+SendingsAbility=Soporte de follas de envío para entregas a clientes
+NoNeedForDeliveryReceipts=Na maioría dos casos, as notas de entrega (listaxe de produtos enviados) tamén actúan como notas de recepción e son asinadas polo cliente. A xestión das notas de recepción é polo tanto redundante e rara vez será activada.
+FreeLegalTextOnShippings=Texto libre en envíos
 ##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
+DeliveryOrderNumberingModules=Módulos de numeración das notas de recepción
+DeliveryOrderModel=Modelo de notas de recepción
+DeliveriesOrderAbility=Uso de notas de recepción
+FreeLegalTextOnDeliveryReceipts=Texto libre nas notas de recepción
 ##### FCKeditor #####
 AdvancedEditor=Editor avanzado
 ActivateFCKeditor=Activar editor avanzado para :
 FCKeditorForCompany=Creación/edición WYSIWIG da descrición e notas dos terceiros
 FCKeditorForProduct=Creación/edición WYSIWIG da descrición e notas dos produtos/servizos
-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>
+FCKeditorForProductDetails=Creación/edición WYSIWIG das liñas de detalle dos produtos (pedimentos, orzamentos, facturas, etc.). <font class="warning">Atención: O uso desta opción non é recomendable xa que pode crear problemas cos caracteres especiais e o formateo de páxina ao xerar ficheiros PDF.</font>
 FCKeditorForMailing= Creación/edición WYSIWIG dos E-Mails (Utilidades->E-Mailings)
 FCKeditorForUserSignature=Creación/edición WYSIWIG da sinatura de usuarios
 FCKeditorForMail=Creación/edición WYSIWIG de todos os e-mails ( excepto Utilidades->E-Mailings)
 FCKeditorForTicket=Creación/edición WYSIWIG para tickets
 ##### Stock #####
 StockSetup=Configuración do módulo Almacéns
-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.
+IfYouUsePointOfSaleCheckModule=Se utiliza un módulo de Punto de Venda (módulo TPV por defecto ou otro módulo externo), esta configuración pode ser ignorada polo seu módulo de Punto de Venda. A maioría de módulos TPV están deseñados para crear inmediatamente unha factura e decrementar stocks calquera que sexan estas opcións. Por tanto, se vosteda precisa ou non decrementar stocks no rexistro dunha venda do seu punto de venda, controle tamén a configuración do seu módulo TPV.
 ##### Menu #####
 MenuDeleted=Menú eliminado
 Menu=Menu
@@ -1689,17 +1696,17 @@ NotTopTreeMenuPersonalized=Menús personalizados non ligados a un menú superior
 NewMenu=Novo menú
 MenuHandler=Xestor de menús
 MenuModule=Módulo orixe
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+HideUnauthorizedMenu=Ocultar menús non autorizados tamén para usuarios internos (en gris, doutro xeito)
 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
+DetailMenuHandler=Controlador de menús onde amosar o novo menú
+DetailMenuModule=Nome do módulo se a entrada do menú provén dun módulo
+DetailType=Tipo de menú (arriba ou á esquerda)
+DetailTitre=Etiqueta de menú ou código de etiqueta para a tradución
+DetailUrl=URL onde o menú o envía (ligazón URL absoluta ou ligazón externa con http: //)
+DetailEnabled=Condición para amosar ou non a entrada
+DetailRight=Condición para amosar menús grises non autorizados
+DetailLangs=Nome do ficheiro Lang para a tradución de código de etiqueta
+DetailUser=Intern / Extern / Todo
 Target=Destinatario
 DetailTarget=Comportamento da ligazón (_blank para abrir unha nova ventana)
 DetailLevel=Nivel (-1:menú superior, 0:principal, >0 menú e submenú)
@@ -1708,105 +1715,105 @@ DeleteMenu=Eliminar entrada de menú
 ConfirmDeleteMenu=¿Está certo de querer eliminar a entrada de menú <b>%s</b>?
 FailedToInitializeMenu=Erro ao inicialiar o menú
 ##### 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:
+TaxSetup=Configuración do módulo de impostos, impostos sociais ou fiscais e dividendos
+OptionVatMode=IVE vencido
+OptionVATDefault=Base estándar
+OptionVATDebitOption=Base de devengo
+OptionVatDefaultDesc=Vence o IVE: <br> - na entrega de mercadorías (en función da data da factura) <br> - nos pagos por servizos
+OptionVatDebitOptionDesc=Vence o IVE: <br> - na entrega de mercadorías (en función da data da factura) <br> - na factura (débito) para servizos
+OptionPaymentForProductAndServices=Base de efectivo para produtos e servizos
+OptionPaymentForProductAndServicesDesc=Vence o IVE: <br> - no pago de mercadorías <br> - no pago de servizos
+SummaryOfVatExigibilityUsedByDefault=Tempo de elección do IVE por defecto segundo a opción escollida:
 OnDelivery=Pagamento á entrega
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
+OnPayment=No pagamento
+OnInvoice=Na factura
+SupposedToBePaymentDate=Data de pago empregada
+SupposedToBeInvoiceDate=Data de utilización da factura
+Buy=Mercar
 Sell=Vendas
-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
+InvoiceDateUsed=Data de utilización da factura
+YourCompanyDoesNotUseVAT=A súa empresa está cofigurada para que non use o IVE (Inicio - Configuración - Empresa / Organización), polo que non hai opcións de IVE para configurar.
+AccountancyCode=Código de contabilidade
+AccountancyCodeSell=Conta de venda. código
+AccountancyCodeBuy=Conta de compras código
 ##### Agenda #####
-AgendaSetup=Events and agenda module setup
-PasswordTogetVCalExport=Key to authorize export link
-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 task %s must be enough to be sure that the remind are sent at the correct moment.
-AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
+AgendaSetup=Configuración do módulo de eventos e axenda
+PasswordTogetVCalExport=Chave para autorizar a ligazón de exportación
+PastDelayVCalExport=Non exportar eventos anteriores a
+AGENDA_USE_EVENT_TYPE=Usar tipos de eventos (xestionados no menú Configuración -> Dicionarios -> Tipo de eventos da axenda)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Definir automaticamente este valor predeterminado para o tipo de evento no formulario de creación de eventos
+AGENDA_DEFAULT_FILTER_TYPE=Establecer automaticamente este tipo de eventos no filtro de busca da vista de axenda
+AGENDA_DEFAULT_FILTER_STATUS=Establecer automaticamente este estado para eventos no filtro de busca da vista de axenda
+AGENDA_DEFAULT_VIEW=Cal vista desexa abrir de xeito predeterminado ao seleccionar o menú Axenda
+AGENDA_REMINDER_BROWSER=Activar a lembranza de eventos <b> no navegador do usuario </b> (Cando se alcanza a data de lembranza, o navegador amosa unha ventá emerxente. Cada usuario pode desactivar estas notificacións desde a configuración de notificacións do navegador).
+AGENDA_REMINDER_BROWSER_SOUND=Activar a notificación de son
+AGENDA_REMINDER_EMAIL=Activar a lembranza de eventos <b> por correo electrónico </b> (a opción de lembranza/atraso pódese definir en cada evento).
+AGENDA_REMINDER_EMAIL_NOTE=Nota: A frecuencia da tarefa %s debe ser suficiente para asegurarse de que as lembranzas se envían no momento correcto.
+AGENDA_SHOW_LINKED_OBJECT=Amosar o obxecto ligado á vista de axenda
 ##### 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 in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
+ClickToDialSetup=Faga clic para marcar a configuración do módulo
+ClickToDialUrlDesc=Url chamada cando se fai un clic na imaxe do teléfono. En URL, pode usar etiquetas <br> <b> __PHONETO__ </b> que se substituirán polo número de teléfono da persoa á que chamar <br> <b> __PHONEFROM__ </b> que se substituirá polo número de teléfono persoa (túa) <br> <b> __LOGIN__ </b> que se substituirá por inicio de sesión clicktodial (definido na tarxeta de usuario) <br> <b> __PASS__ </b> que se substituirá por contrasinal clicktodial (definido na tarxeta de usuario).
+ClickToDialDesc=Este módulo cambia os números de teléfono cando se usa un ordenador de escritorio por ligazóns onde se pode facer clic. Un clic chamará ao número. Isto pódese empregar para iniciar a chamada cando se usa un teléfono por software no seu escritorio ou cando se usa un sistema CTI baseado no protocolo SIP por exemplo. Nota: Cando se usa un teléfono intelixente, sempre se pode facer clic nos números de teléfono.
+ClickToDialUseTelLink=Use só unha ligazón "tel:" nos números de teléfono
+ClickToDialUseTelLinkDesc=Utilice este método se os seus usuarios teñen instalado no mesmo ordenador  que o do navegador un software de teléfono ou unha interface telefónica, chamando cando fan clic nunha ligazón do seu navegador que comeza con "tel:". Se precisa unha solución de servidor completa (sen necesidade de instalación de software local), debe establecer isto en "Non" e encher o seguinte campo.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Terminales Punto de Venda
-CashDeskSetup=Point of Sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sales
-CashDeskBankAccountForSell=Default account to use to receive cash payments
-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)
+CashDeskSetup=Configuración do módulo Punto de venda
+CashDeskThirdPartyForSell=Un terceiro xenérico predeterminado para usar nas vendas
+CashDeskBankAccountForSell=Conta predeterminada a usar para recibir pagos en efectivo
+CashDeskBankAccountForCheque=Conta predeterminada a usar para recibir pagos mediante cheque
+CashDeskBankAccountForCB=Conta predeterminada a usar para recibir pagos con tarxetas de crédito
+CashDeskBankAccountForSumup=Conta bancaria predeterminada a usar para recibir pagos por SumUp
+CashDeskDoNotDecreaseStock=Desactivar a diminución de stock cando se realiza unha venda desde o punto de venda (se "non", a diminución destock faise por cada venda realizada desde TPV, independentemente da opción establecida no módulo Stock).
+CashDeskIdWareHouse=Forzar e restrinxir o almacén para que diminúa o stock
+StockDecreaseForPointOfSaleDisabled=Desactivado diminución de stock desde o punto de venda
+StockDecreaseForPointOfSaleDisabledbyBatch=A diminución de stock no TPV non é compatible coa xestión de módulos serie/lote (actualmente activa) polo que a diminución de stock está desactivada.
+CashDeskYouDidNotDisableStockDecease=Non desactivou a diminución de stock ao facer unha venda desde o punto de venda. Por iso é preciso un almacén.
+CashDeskForceDecreaseStockLabel=Forzouse a diminución do stock de produtos por lotes
+CashDeskForceDecreaseStockDesc=Diminuír primeiro polas datas máis antigas para comer por e vender por.
+CashDeskReaderKeyCodeForEnter=Código clave para "Enter" definido no lector de códigos de barras. (Exemplo:13)
 ##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
+BookmarkSetup=Configuración do módulo de marcador
+BookmarkDesc=Este módulo permítelle xestionar marcadores. Tamén pode engadir atallos a calquera páxina de Dolibarr ou sitios web externos no menú esquerdo.
+NbOfBoomarkToShow=Número máximo de marcadores para amosar no menú esquerdo
 ##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+WebServicesSetup=Configuración do módulo de servizos web
+WebServicesDesc=Ao habilitar este módulo, Dolibarr convértese nun servidor de servizos web para proporcionar servizos web diversos.
+WSDLCanBeDownloadedHere=Os ficheiros descritores WSDL dos servizos proporcionados pódense descargar aquí
+EndPointIs=Os clientes SOAP deben enviar as súas solicitudes ao punto final Dolibarr dispoñible no URL
 ##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore and test the APIs at URL
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+ApiSetup=Configuración do módulo API
+ApiDesc=Ao habilitar este módulo, Dolibarr convértese nun servidor REST para proporcionar servizos web diversos.
+ApiProductionMode=Activa o modo de produción (isto activarase uso de caché para a xestión de servizos)
+ApiExporerIs=Pode explorar e probar as API na URL
+OnlyActiveElementsAreExposed=Só están expostos os elementos dos módulos habilitados
+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=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on check receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
+BankSetupModule=Configuración do módulo Banco
+FreeLegalTextOnChequeReceipts=Texto gratuíto nos recibos do talón
+BankOrderShow=Amosar a orde das contas bancarias dos países que usan "número bancario detallado"
 BankOrderGlobal=Xeral
-BankOrderGlobalDesc=General display order
+BankOrderGlobalDesc=Orde xeral de visualización
 BankOrderES=Español
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+BankOrderESDesc=Orde de exhibición
+ChequeReceiptsNumberingModule=Comprobar o módulo de numeración de recibos
 ##### Multicompany #####
 MultiCompanySetup=Configuración do módulo Multi-empresa
 ##### Suppliers #####
 SuppliersSetup=Configuración do módulo Provedores
-SuppliersCommandModel=Modelo de pedimentos a provedores completo (logo...)
-SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
-SuppliersInvoiceModel=Modelo de facturas de provedores completo (logo...)
+SuppliersCommandModel=Modelo completo de pedimento a provedor
+SuppliersCommandModelMuscadet=Modelo completo da orde de compra (implementación antiga do modelo cornas)
+SuppliersInvoiceModel=Modelo completo de facturas de provedor
 SuppliersInvoiceNumberingModel=Modelos de numeración de facturas de provedor
 IfSetToYesDontForgetPermission=Se está seleccionado, non esqueza modificar os permisos nos grupos ou usuarios para permitir a segunda aprobación
 ##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
+GeoIPMaxmindSetup=Configuración do módulo GeoIP Maxmind
+PathToGeoIPMaxmindCountryDataFile=Ruta ao ficheiro que contén IP Maxmind á tradución do país. <br> Exemplos: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoLite2-Country.mmdb
+NoteOnPathLocation=Teña conta que o ficheiro de datos de IP a país debe estar dentro dun directorio que poida ler PHP (Comprobe a configuración de PHP open_basedir e os permisos do sistema de ficheiros).
+YouCanDownloadFreeDatFileTo=Pode descargar unha <b> versión de demostración gratuíta </b> do ficheiro de país Maxmind GeoIP en %s.
+YouCanDownloadAdvancedDatFileTo=Tamén pode descargar unha <b> versión máis completa, con actualizacións </b> do ficheiro de país Maxmind GeoIP en %s.
+TestGeoIPResult=Proba dunha conversión IP -> País
 ##### Projects #####
 ProjectsNumberingModules=Módulo de numeración para as referencias dos proxectos
 ProjectsSetup=Configuración do módulo Proxectos
@@ -1825,12 +1832,12 @@ DeleteFiscalYear=Eliminar ano fiscal
 ConfirmDeleteFiscalYear=¿Está certo de querer eliminar este ano fiscal?
 ShowFiscalYear=Ver período contable
 AlwaysEditable=Pode editarse sempre
-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
+MAIN_APPLICATION_TITLE=Forzar visibilidade do nome da aplicación (aviso: configurar aquí o seu propio nome pode rachar a función de inicio de sesión de autocompletado cando se usa a aplicación móbil DoliDroid)
+NbMajMin=Número mínimo de caracteres en maiúscula
+NbNumMin=Número mínimo de caracteres numéricos
+NbSpeMin=Número mínimo de caracteres especiais
+NbIteConsecutive=Número máximo dos mesmos caracteres que se repiten
+NoAmbiCaracAutoGeneration=Non use caracteres ambiguos ("1","l","i","|","0","O") para a xeración automática
 SalariesSetup=Configuración do módulo salarios
 SortOrder=Ordenación
 Format=Formatear
@@ -1840,49 +1847,49 @@ ExpenseReportsSetup=Configuración do módulo Informe de Gastos
 TemplatePDFExpenseReports=Modelos de documento para xerar informes de gastos
 ExpenseReportsRulesSetup=Configuración do módulo Informes de gastos - Regras
 ExpenseReportNumberingModules=Módulo de numeración de informes de gastos
-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
+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".
+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
+GoOntoUserCardToAddMore=Vaia á pestana "Notificacións" dun usuario para engadir ou eliminar notificacións para os usuarios
+GoOntoContactCardToAddMore=Vaia á pestana "Notificacións" dun terceiro para engadir ou eliminar notificacións de contactos/enderezos
+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=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
+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.
+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)
+TextTitleColor=Cor do texto do título da páxina
+LinkColor=Cor das ligazóns
+PressF5AfterChangingThis=Prema CTRL+F5 no teclado ou limpe a caché do navegador despois de cambiar este valor para que sexa efectivo
+NotSupportedByAllThemes=Traballará con temas core, pode que non sexan compatibles con temas externos
 BackgroundColor=Cor de fondo
 TopMenuBackgroundColor=Cor de fondo para o Menú superior
 TopMenuDisableImages=Ocultar imaxes no Menú superior
 LeftMenuBackgroundColor=Cor de fondo para o Menú esquerdo
 BackgroundTableTitleColor=Cor de fondo para a Taboa título líña
 BackgroundTableTitleTextColor=Cor do texto para a liña de título da taboa
-BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableTitleTextlinkColor=Cor do texto para a liña de ligazón do título da táboa
 BackgroundTableLineOddColor=Cor de fondo para liñas de tabla odd
 BackgroundTableLineEvenColor=Cor de fondo para todas as liñas de taboa
 MinimumNoticePeriod=Período mínimo de notificación (A súa solicitude de licenza debe facerse antes deste período)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify 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=Sale tax rate
-RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
-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 template record is dedicated to which element
+NbAddedAutomatically=Número de días engadidos aos contadores de usuarios (automaticamente) cada mes
+EnterAnyCode=Este campo contén unha referencia para identificar a liña. Introduza calquera valor da súa escolla, pero sen caracteres especiais.
+Enter0or1=Engada 0 ou 1
+UnicodeCurrency=Introduza aquí entre chaves, listaxe do número de bytes que representan o símbolo de moeda. Por exemplo: por $, introduza [36] - para Brasil real R$ [82,36] - para €, introduza [8364]
+ColorFormat=A cor RGB está en formato HEX, por exemplo: FF0000
+PictoHelp=Nome da icona en formato dolibarr ('image.png' se está no directorio do tema actual, 'image.png@nom_du_module' se está no directorio /img/ dun módulo)
+PositionIntoComboList=Posición da liña nas listas combinadas
+SellTaxRate=Tipo de imposto sobre a venda
+RecuperableOnly=Sí para o IVE "Non percibido pero recuperable" dedicado a algún estado de Franza. Manteña o valor en "Non" no resto dos casos.
+UrlTrackingDesc=Se o provedor ou servizo de transporte ofrece unha páxina ou sitio web para comprobar o estado dos seus envíos, pode introducilo aquí. Podes usar a clave {TRACKID} nos parámetros de URL para que o sistema a substitúa polo número de seguimento que o usuario introduciu na tarxeta de envío.
+OpportunityPercent=Cando cree un cliente potencial, definirá unha cantidade estimada de proxecto/cliente potencial. Segundo o estado do cliente potencial, este importe pode multiplicarse por esta taxa para avaliar unha cantidade total que todos os clientes potenciais poden xerar. O valor é unha porcentaxe (entre 0 e 100).
+TemplateForElement=Este rexistro de modelo está adicado a cal elemento
 TypeOfTemplate=Tipo de prantilla
 TemplateIsVisibleByOwnerOnly=A prantilla é visible só polo propietario
 VisibleEverywhere=Visible en todas partes
@@ -1891,147 +1898,148 @@ FixTZ=Corrección de zona horaria
 FillFixTZOnlyIfRequired=Exemplo: +2 (complete só se ten algún problema)
 ExpectedChecksum=Agardando a suma de comprobación
 CurrentChecksum=Suma de comprobación actual
-ExpectedSize=Expected size
-CurrentSize=Current size
-ForcedConstants=Required constant values
+ExpectedSize=Tamaño agardado
+CurrentSize=Tamaño actual
+ForcedConstants=Valores constantes requiridos
 MailToSendProposal=Orzamentos a clientes
 MailToSendOrder=Pedimentos de clientes
 MailToSendInvoice=Facturas a clientes
 MailToSendShipment=Envíos
 MailToSendIntervention=Intervencións
-MailToSendSupplierRequestForQuotation=Para enviar solicitude de orzamento a provedor
+MailToSendSupplierRequestForQuotation=Para enviar solicitude de orzamento ao provedor
 MailToSendSupplierOrder=Pedimentos a provedor
 MailToSendSupplierInvoice=Facturas provedor
 MailToSendContract=Contratos
-MailToSendReception=Receptions
+MailToSendReception=Recepcións
 MailToThirdparty=Terceiros
 MailToMember=Membros
 MailToUser=Usuarios
 MailToProject=Proxectos
 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
+ByDefaultInList=Amosar por defecto en modo lista
+YouUseLastStableVersion=Emprega a última versión estable
+TitleExampleForMajorRelease=Exemplo de mensaxe que pode usar para anunciar a versión maior (non dubide en usalo nos seus sitios web)
+TitleExampleForMaintenanceRelease=Exemplo de mensaxe que pode usar para anunciar esta versión de mantemento (non dubide en usala nos seus sitios web)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP e CRM %s están dispoñibles. A versión %s é unha versión importante con moitas novas funcións tanto para usuarios como para desenvolvedores. Podes descargalo desde a área de descarga do portal https://www.dolibarr.org (versións estables do subdirectorio). Podes ler <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> para ver a lista completa de cambios.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP e CRM %s están dispoñibles. A versión %s é unha versión de mantemento, polo que só contén correccións de erros. Recomendamos a todos os usuarios que actualicen a esta versión. Unha versión de mantemento non introduce novas funcións nin cambios na base de datos. Podes descargalo desde a área de descarga do portal https://www.dolibarr.org (versións estables do subdirectorio). Pode ler o <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> para ver a lista completa de cambios.
+MultiPriceRuleDesc=Cando a opción "Varios niveis de prezos por produto/servizo" está activada, pode definir diferentes prezos (un por nivel de prezo) para cada produto. Para aforrar tempo, aquí pode introducir unha regra para calcular automaticamente un prezo para cada nivel en función do prezo do primeiro nivel, polo que só terá que introducir un prezo para o primeiro nivel para cada produto. Esta páxina está deseñada para aforrar tempo pero só é útil se os prezos de cada nivel son relativos ao primeiro nivel. Pode ignorar esta páxina na maioría dos casos.
+ModelModulesProduct=Modelos para documentos do produto
+WarehouseModelModules=Modelos para documentos de almacéns
+ToGenerateCodeDefineAutomaticRuleFirst=Para poder xerar códigos automaticamente, primeiro ten que definir un manager para auto-axustar o número de código de barras.
+SeeSubstitutionVars=Ver a nota * para a lista de posibles variables de substitución
+SeeChangeLog=Ver o ficheiro ChangeLog (só en inglés)
+AllPublishers=Todos os editores
+UnknownPublishers=Editores descoñecidos
+AddRemoveTabs=Engadir ou eliminar pestanas
+AddDataTables=Engadir táboas de obxectos
+AddDictionaries=Engadir táboas de dicionarios
+AddData=Engade datos ou obxectos a dicionarios
+AddBoxes=Engadir widgets
+AddSheduledJobs=Engadir tarefas programadas
+AddHooks=Engadir Hooks
+AddTriggers=Engadir Triggers
 AddMenus=Engade menús
-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.
+AddPermissions=Engadir permisos
+AddExportProfiles=Engadir perfís de exportación
+AddImportProfiles=Engadir perfís de importación
+AddOtherPagesOrServices=Engadir outras páxinas ou servizos
+AddModels=Engadir modelos de documento ou numeración
+AddSubstitutions=Engadir substitucións de claves
+DetectionNotPossible=Non é posible a detección
+UrlToGetKeyToUseAPIs=Url para obter o token para usar coa API (unha vez recibido o token gárdase na táboa de usuarios da base de datos e debe fornecerse en cada chamada da API)
+ListOfAvailableAPIs=Listaxe de API dispoñibles
+activateModuleDependNotSatisfied=O módulo "%s" depende do módulo "%s" que falta, polo que o módulo "%1$s" pode non funcionar correctamente. Instale o módulo "%2$s" ou desactive o módulo "%1$s" se quere estar a salvo de calquera sorpresa
+CommandIsNotInsideAllowedCommands=O comando que tenta executar non está na listaxe de comandos permitidos definidos no parámetro <strong> $dolibarr_main_restrict_os_commands</strong> no ficheiro <strong>conf.php</strong>.
+LandingPage=Páxina de destino
+SamePriceAlsoForSharedCompanies=Se usa un módulo multi-empresa, coa opción "Prezo único", o prezo tamén será o mesmo para todas as empresas se os produtos se comparten entre elas
+ModuleEnabledAdminMustCheckRights=O módulo está activado. Os permisos para os módulos activados déronse só a usuarios administradores. É posible que teña que conceder permisos a outros usuarios ou grupos manualmente se é preciso.
+UserHasNoPermissions=Este usuario non ten permisos definidos
+TypeCdr=Use "Ningún" se a data do prazo de pagamento é a data da factura máis un delta en días (delta é o campo "%s")<br>Use "Ao final do mes", se, despois do delta, a data debe aumentará ata chegar ao final do mes (+ un opcional "%s" en días)<br>Use "Actual/Seguinte" para que a data do prazo de pago sexa a primeira Nth do mes despois do delta (o delta é o campo "%s" , N almacénase no campo "%s")
+BaseCurrency=Moeda de referencia da empresa (entre na configuración da empresa para cambiar isto)
+WarningNoteModuleInvoiceForFrenchLaw=Este módulo %s cumpre coas leis francesas (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=Este módulo %s cumpre coas leis francesas (Loi Finance 2016) porque o módulo Rexistros non reversibles está activado automaticamente.
+WarningInstallationMayBecomeNotCompliantWithLaw=Está intentando instalar o módulo %s que é un módulo externo. Activar un módulo externo significa que confía no editor dese módulo e que está seguro de que este módulo non afecta negativamente o comportamento da súa aplicación e cumpre coas leis do seu país (%s). Se o módulo introduce unha función ilegal, vostede será responsable do uso de software ilegal.
 MAIN_PDF_MARGIN_LEFT=Marxe esquerdo en PDF
 MAIN_PDF_MARGIN_RIGHT=Marxe dereito en PDF
 MAIN_PDF_MARGIN_TOP=Marxe superior en PDF
 MAIN_PDF_MARGIN_BOTTOM=Marxe inferior en PDF
-MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
-NothingToSetup=There is no specific setup required for this module.
-SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
-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 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
-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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
-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 candidature
+MAIN_DOCUMENTS_LOGO_HEIGHT=Altura para logotipo en PDF
+NothingToSetup=Non é precisa ningunha configuración específica para este módulo.
+SetToYesIfGroupIsComputationOfOtherGroups=Configure isto en sí, se este grupo é un cálculo doutros grupos
+EnterCalculationRuleIfPreviousFieldIsYes=Introduza a regra de cálculo se o campo anterior estaba configurado en Si (por exemplo 'CODEGRP1+CODEGRP2')
+SeveralLangugeVariatFound=Atopáronse varias variantes de idioma
+RemoveSpecialChars=Eliminar caracteres especiais
+COMPANY_AQUARIUM_CLEAN_REGEX=Filtro de rexistro para limpar o valor (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_DIGITARIA_CLEAN_REGEX=Filtro de rexistro para limpar o valor (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Non se permite duplicado
+GDPRContact=Responsable de protección de datos (DPO, privacidade de datos ou contacto GDPR)
+GDPRContactDesc=Se garda datos sobre empresas/cidadáns europeos, pode nomear o contacto responsable do Regulamento xeral de protección de datos aquí
+HelpOnTooltip=Texto de axuda para amosar na información de ferramentas
+HelpOnTooltipDesc=​​= Poner aquí o texto ou unha chave de tradución para que o texto apareza nunha tip sobre ferramentas cando este campo aparece nun formulario
+YouCanDeleteFileOnServerWith=Pode eliminar este ficheiro no servidor coa liña de comandos: <br>%s
+ChartLoaded=Cargado o gráfico da conta
+SocialNetworkSetup=Configuración do módulo Redes sociais
+EnableFeatureFor=Activar funcións para <strong>%s</strong>
+VATIsUsedIsOff=Nota: A opción para usar Vendas IVE ou IVE configurouse como <strong> Desactivado </strong> no menú %s -%s, polo que Vendas IVE ou IVE empregados serán sempre 0 para as vendas.
+SwapSenderAndRecipientOnPDF=Cambiar a posición do remitente e do destinatario en documentos PDF
+FeatureSupportedOnTextFieldsOnly=Aviso, característica admitida só nos campos de texto. Tamén debe definirse un parámetro URL action=create ou action=edit Ou o nome da páxina debe rematar con 'new.php' para activar esta función.
+EmailCollector=Receptor de correo electrónico
+EmailCollectorDescription=Engade unha tarefa programada e unha páxina de configuración para escanear regularmente caixas de correo electrónico (usando o protocolo IMAP) e gardarr os correos electrónicos recibidos na súa aplicación no lugar axeitado e/ou crear algúns rexistros automaticamente (como clientes potenciais).
+NewEmailCollector=Novo receptor de correo electrónico
+EMailHost=Anfitrión do servidor IMAP de correo electrónico
+MailboxSourceDirectory=Directorio fonte da caixa de correo
+MailboxTargetDirectory=Directorio de destino da caixa de correo
+EmailcollectorOperations=Operacións que debe facer o receptor
+EmailcollectorOperationsDesc=As operacións execútanse de arriba a abaixo
+MaxEmailCollectPerCollect=Número máximo de correos electrónicos recollidos por recepción
+CollectNow=Recibir agora
+ConfirmCloneEmailCollector=¿Está certo de que quere clonar o receptor de correo electrónico %s?
+DateLastCollectResult=Data do último intento de recepción
+DateLastcollectResultOk=Data da última recepción con éxito
+LastResult=Último resultado
+EmailCollectorConfirmCollectTitle=Confirmación de recepción por correo electrónico
+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)
+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)
+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
+WithoutDolTrackingIDInMsgId=Mensaxe NON enviado desde Dolibarr
+CreateCandidature=Crear solicitude de traballo
 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.
-OpeningHours=Opening hours
-OpeningHoursDesc=Enter here the regular opening hours of your company.
-ResourceSetup=Configuration of Resource module
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disable feature to link a resource to users
-DisabledResourceLinkContact=Disable feature to link a resource to contacts
-EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
-ConfirmUnactivation=Confirm module reset
-OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
-MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
-MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
-MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
-MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
+MainMenuCode=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.
+OpeningHours=Horario de apertura
+OpeningHoursDesc=Introduza aquí o horario habitual da súa empresa.
+ResourceSetup=Configuración do módulo Recursos
+UseSearchToSelectResource=Use un formulario de busca para escoller un recurso (en lugar dunha lista despregable).
+DisabledResourceLinkUser=Desactivar a función para ligar un recurso aos usuarios
+DisabledResourceLinkContact=Desactivar a función para ligar un recurso aos contactos
+EnableResourceUsedInEventCheck=Activar a función para comprobar se un recurso está en uso nun evento
+ConfirmUnactivation=Confirmar o restablecemento do módulo
+OnMobileOnly=Só na pantalla pequena (smartphone)
+DisableProspectCustomerType=Desactiva o tipo de terceiro "Cliente Potencial+Cliente" (polo que o terceiro debe ser "Cliente Potencial" ou "Cliente", pero non pode ser ambos)
+MAIN_OPTIMIZEFORTEXTBROWSER=Simplificar a interface para persoas cegas
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Active esta opción se é unha persoa cega ou se usa a aplicación desde un explorador de texto como Lynx ou Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Cambiar a cor da interface para daltónicos
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Active esta opción se é unha persoa daltónica, nalgún caso a interface cambiará a configuración da cor para aumentar o contraste.
 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
+Deuteranopes=Deuteranopsia
+Tritanopes=Tritanopia
+ThisValueCanOverwrittenOnUserLevel=Este valor pode ser substituído por cada usuario desde a súa páxina de usuario-pestana '%s'
+DefaultCustomerType=Tipo predeterminado de terceiros para o formulario de creación "Novo cliente"
+ABankAccountMustBeDefinedOnPaymentModeSetup=Nota: a conta bancaria debe estar definida no módulo de cada modo de pago (Paypal, Stripe, ...) para que esta función funcione.
+RootCategoryForProductsToSell=Categoría raíz de produtos a vender
+RootCategoryForProductsToSellDesc=Se se define, só os produtos desta categoría ou subcategoría estarán dispoñibles no Punto de Venda
 DebugBar=Barra de depuración
 DebugBarDesc=Barra de ferramentas que ven con moitas ferramentas para simplificar a depuración.
 DebugBarSetup=Configuración DebugBar
@@ -2039,47 +2047,51 @@ GeneralOptions=Opcións xerais
 LogsLinesNumber=Número de liñas a amosar na pestana de rexistros
 UseDebugBar=Use a barra de debug
 DEBUGBAR_LOGS_LINES_NUMBER=Número de últimas liñas de rexistro para manter na consola.
-WarningValueHigherSlowsDramaticalyOutput=Advertencia, os valores altos ralentizan dramáticamente a saída.
-ModuleActivated=Module %s is activated and slows the interface
-IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
-AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
-EXPORTS_SHARE_MODELS=Export models are share with everybody
+WarningValueHigherSlowsDramaticalyOutput=Advertencia, os valores altos ralentizan enormemente a saída.
+ModuleActivated=O módulo %s está activado e ralentiza a interface
+IfYouAreOnAProductionSetThis=Se está nun entorno de produción, debe establecer esta propiedade en %s..
+AntivirusEnabledOnUpload=Antivirus activado nos ficheiros actualizados
+EXPORTS_SHARE_MODELS=Os modelos de exportación son compartidos con todos.
 ExportSetup=Configuración do módulo de exportación.
-ImportSetup=Setup of module Import
+ImportSetup=Configuración do módulo Importación
 InstanceUniqueID=ID única da instancia
 SmallerThan=Menor que
 LargerThan=Maior que
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
-WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it. In the parameter field you can use for example 'EXTRACT:BODY:Name:\\s([^\\s]*)' if you want to extract the name of the thirdparty from a string 'Name: name to find' found into the body.
-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.
+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 para usar o contido do correo electrónico para atopar e cargar un terceiro existente na súa base de datos. O terceiro atopado (ou creada) usarase para seguir as accións que o precisen. No campo do parámetro pode usar por exemplo "EXTRACT:BODY:Name:\\s([^\\s]*)" se desexa extraer o nome do terceiro dunha cadea  "Nome: nome a atopar" atopada no corpo.
+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?
+RecipientEmailsWillBeReplacedWithThisValue=Os correos electrónicos dos destinatarios sempre se substituirán por este valor
+AtLeastOneDefaultBankAccountMandatory=Debe definirse polo menos unha conta bancaria predeterminada
+RESTRICT_ON_IP=Permitir acceso a APIS dispoñibles a algunha host IP  só (comodín non permitido, use espazo entre valores). Baleiro significa que todos os hosts poden acceder.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
-BaseOnSabeDavVersion=Based on the library SabreDAV version
-NotAPublicIp=Not a public IP
-MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
-EmailTemplate=Template for email
-EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
-FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Jump to Setup -> Widgets
-MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
-MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
-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 module may expose sensitive data. If you don't need it, disable it.
-ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+BaseOnSabeDavVersion=Baseado na versión SabreDAV da biblioteca
+NotAPublicIp=Non é unha IP pública
+MakeAnonymousPing=Fai un Ping anónimo '+1' ao servidor da fundación Dolibarr (só se fai unha vez despois da instalación) para permitir á fundación contar o número de instalacións de Dolibarr.
+FeatureNotAvailableWithReceptionModule=Función non dispoñible cando a recepción do módulo está activada
+EmailTemplate=Modelo para correo electrónico
+EMailsWillHaveMessageID=Os correos electrónicos terán unha etiqueta "Referencias" que coincide con esta sintaxe
+PDF_USE_ALSO_LANGUAGE_CODE=Se desexa ter algúns textos no seu PDF duplicados en 2 idiomas diferentes no mesmo PDF xerado, debe configurar aquí este segundo idioma para que o PDF xerado conteña 2 idiomas diferentes na mesma páxina, o elixido ao xerar PDF e este (só algúns modelos PDF soportan isto). Mantéñase baleiro por un idioma por PDF.
+FafaIconSocialNetworksDesc=Introduza aquí o código dunha icona FontAwesome. Se non sabe o que é FontAwesome, pode usar o valor xenérico fa-address-book.
+FeatureNotAvailableWithReceptionModule=Función non dispoñible cando a recepción do módulo está activada
+RssNote=Nota: Cada definición de fonte RSS proporciona un widget que debes habilitar para que estexa dispoñible no panel
+JumpToBoxes=Ir a Configuración -> Widgets
+MeasuringUnitTypeDesc=Use aquí un valor como "tamaño", "superficie", "volume", "peso", "hora"
+MeasuringScaleDesc=A escala é o número de lugares que ten que mover a parte decimal para que coincida coa unidade de referencia predeterminada. Para o tipo de unidade "hora", é o número de segundos. Os valores entre 80 e 99 son valores reservados.
+TemplateAdded=Modelo engadido
+TemplateUpdated=Modelo actualizado
+TemplateDeleted=Modelo eliminado
+MailToSendEventPush=Correo electronico lembranbdo o evento
+SwitchThisForABetterSecurity=Modificar este valor a %s é recomendable para maior seguridade
+DictionaryProductNature= Natureza do produto
+CountryIfSpecificToOneCountry=País (se é específico dun determinado país)
+YouMayFindSecurityAdviceHere=Pode atopar avisos de seguridade aquí
+ModuleActivatedMayExposeInformation=Este módulo pode expor datos sensible. Se non o precisa, desactive.
+ModuleActivatedDoNotUseInProduction=Un módulo deseñado para desenvolvemento foi activado. Non o active nun entorno de produción.
+CombinationsSeparator=Caracter separador para combinación de produtos
+SeeLinkToOnlineDocumentation=Ver ligazón á documentación en liña no menú superior con exemplos
+SHOW_SUBPRODUCT_REF_IN_PDF=Se se usa a función "%s" do módulo <b>%s</b>, amosa os detalles dos subprodutos dun kit en PDF.
+AskThisIDToYourBank=Póñase en contacto co seu banco para obter esta identificación
diff --git a/htdocs/langs/gl_ES/agenda.lang b/htdocs/langs/gl_ES/agenda.lang
index b76942ad53e..b0328266609 100644
--- a/htdocs/langs/gl_ES/agenda.lang
+++ b/htdocs/langs/gl_ES/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Número de eventos
 ListOfActions=Listaxe de eventos
 EventReports=Informes de evento
 Location=Localización
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Enento asignado a calquera usuario do grupo
 EventOnFullDay=Evento para todo o(s) día(s)
 MenuToDoActions=Todos os eventos incompletos
 MenuDoneActions=Todos os eventos rematados
@@ -38,7 +38,7 @@ ActionsEvents=Eventos para que Dolibarr cre unha acción na axenda automáticame
 EventRemindersByEmailNotEnabled=Lembranzas de eventos por correo non foron activados na configuración do módulo %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Terceiro %s creado
-COMPANY_DELETEInDolibarr=Third party %s deleted
+COMPANY_DELETEInDolibarr=Terceiro %s eliminado
 ContractValidatedInDolibarr=Contrato %s validado
 CONTRACT_DELETEInDolibarr=Contrato %s eliminado
 PropalClosedSignedInDolibarr=Orzamento %s asinado
@@ -60,42 +60,42 @@ MemberSubscriptionModifiedInDolibarr=Suscrición %s do membro %s modificada
 MemberSubscriptionDeletedInDolibarr=Suscrición %s do membro %s eliminada
 ShipmentValidatedInDolibarr=Expedición %s validada
 ShipmentClassifyClosedInDolibarr=Expedición %s clasificada como pagada
-ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
+ShipmentUnClassifyCloseddInDolibarr=Expedición %s clasificada como aberta de novo
 ShipmentBackToDraftInDolibarr=Expedición %s de volta ao estatus de borrador
 ShipmentDeletedInDolibarr=Expedición %s eliminada
-ReceptionValidatedInDolibarr=Reception %s validated
-OrderCreatedInDolibarr=Pedido %s creado
-OrderValidatedInDolibarr=Pedido %s validado
-OrderDeliveredInDolibarr=Pedido %s clasificado como enviado
-OrderCanceledInDolibarr=Pedido %s anulado
-OrderBilledInDolibarr=Pedido %s clasificado como facturado
-OrderApprovedInDolibarr=Pedido %s aprobado
-OrderRefusedInDolibarr=Pedido %s rexeitado
-OrderBackToDraftInDolibarr=Pedido %s de volta ao estaus borrador
+ReceptionValidatedInDolibarr=Recepción %s validada
+OrderCreatedInDolibarr=Pedimento %s creado
+OrderValidatedInDolibarr=Pedimento %s validado
+OrderDeliveredInDolibarr=Pedimento %s clasificado como enviado
+OrderCanceledInDolibarr=Pedimento %s anulado
+OrderBilledInDolibarr=Pedimento %s clasificado como facturado
+OrderApprovedInDolibarr=Pedimento %s aprobado
+OrderRefusedInDolibarr=Pedimento %s rexeitado
+OrderBackToDraftInDolibarr=Pedimento %s de volta ao modo borrador
 ProposalSentByEMail=Orzamento %s enviado por e-mail
 ContractSentByEMail=Contrato %s enviado por e-Mail
-OrderSentByEMail=Pedido de cliente %s enviado por e-mail
+OrderSentByEMail=Pedimento de cliente %s enviado por correo electrónico
 InvoiceSentByEMail=Factura a cliente %s enviada por e-mail
-SupplierOrderSentByEMail=Pedido a proveedor %s enviado por e-mail
-ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
+SupplierOrderSentByEMail=Pedimento a proveedor %s enviado por correo electrónico
+ORDER_SUPPLIER_DELETEInDolibarr=Pedimento a provedor %s eliminado
 SupplierInvoiceSentByEMail=Factura de proveedor %s enviada por e-mail
 ShippingSentByEMail=Expedición %s enviada por email
 ShippingValidated= Expedición %s validada
 InterventionSentByEMail=Intervención %s enviada por e-mail
 ProposalDeleted=Orzamento eliminado
-OrderDeleted=Pedido eliminado
+OrderDeleted=Pedimento eliminado
 InvoiceDeleted=Factura eliminada
-DraftInvoiceDeleted=Draft invoice deleted
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_DELETEInDolibarr=Contact %s deleted
+DraftInvoiceDeleted=Borrador de factura eliminado
+CONTACT_CREATEInDolibarr=Creouse o contacto %s
+CONTACT_DELETEInDolibarr=Contacto %s eliminado
 PRODUCT_CREATEInDolibarr=Produto %s creado
 PRODUCT_MODIFYInDolibarr=Produto %s modificado
 PRODUCT_DELETEInDolibarr=Produto %s eliminado
-HOLIDAY_CREATEInDolibarr=Request for leave %s created
-HOLIDAY_MODIFYInDolibarr=Request for leave %s modified
-HOLIDAY_APPROVEInDolibarr=Request for leave %s approved
-HOLIDAY_VALIDATEInDolibarr=Request for leave %s validated
-HOLIDAY_DELETEInDolibarr=Request for leave %s deleted
+HOLIDAY_CREATEInDolibarr=Creouse a solicitude de días libres %s
+HOLIDAY_MODIFYInDolibarr=Modificada solicitude de días libres %s
+HOLIDAY_APPROVEInDolibarr=Aprobada solicitude de días libres %s
+HOLIDAY_VALIDATEInDolibarr=Solicitude de días libres %s validada
+HOLIDAY_DELETEInDolibarr=Eliminada solicitude de días libres %s
 EXPENSE_REPORT_CREATEInDolibarr=Informe de gastos %s creado
 EXPENSE_REPORT_VALIDATEInDolibarr=Informe de gastos %s validado
 EXPENSE_REPORT_APPROVEInDolibarr=Informe de gastos %s aprobado
@@ -106,30 +106,30 @@ PROJECT_MODIFYInDolibarr=Proxecto %s modificado
 PROJECT_DELETEInDolibarr=Proxecto %s eliminado
 TICKET_CREATEInDolibarr=Ticket %s creado
 TICKET_MODIFYInDolibarr=Ticket %s modificado
-TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
-TICKET_CLOSEInDolibarr=Ticket %s closed
+TICKET_ASSIGNEDInDolibarr=Ticket %s asignado
+TICKET_CLOSEInDolibarr=Ticket %s pechado
 TICKET_DELETEInDolibarr=Ticket %s eliminado
-BOM_VALIDATEInDolibarr=BOM validated
-BOM_UNVALIDATEInDolibarr=BOM unvalidated
-BOM_CLOSEInDolibarr=BOM disabled
-BOM_REOPENInDolibarr=BOM reopen
-BOM_DELETEInDolibarr=BOM deleted
-MRP_MO_VALIDATEInDolibarr=MO validated
-MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
-MRP_MO_PRODUCEDInDolibarr=MO produced
-MRP_MO_DELETEInDolibarr=MO deleted
-MRP_MO_CANCELInDolibarr=MO canceled
+BOM_VALIDATEInDolibarr=Lista de materiais validada
+BOM_UNVALIDATEInDolibarr=Lista de materiais non validada
+BOM_CLOSEInDolibarr=Lista de materiais desactivada
+BOM_REOPENInDolibarr=Lista de materiais aberta de novo
+BOM_DELETEInDolibarr=Lista de materiais non eliminada
+MRP_MO_VALIDATEInDolibarr=OF validada
+MRP_MO_UNVALIDATEInDolibarr=OF establecida a borrador
+MRP_MO_PRODUCEDInDolibarr=OF producida
+MRP_MO_DELETEInDolibarr=OF eliminada
+MRP_MO_CANCELInDolibarr=OF cancelada
 ##### End agenda events #####
 AgendaModelModule=Prantillas de documentos para eventos
 DateActionStart=Data de inicio
-DateActionEnd=Data de fin
+DateActionEnd=Data finalización
 AgendaUrlOptions1=Pode tamén engadir os seguintes parámetros ao filtro de saida:
 AgendaUrlOptions3=<b>logina=%s</b> para restrinxir saída as accións pertencentes ao usuario <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b> logina =!%s</b> para restrinxir saída as accións que non pertencen ao usuario <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b>para restrinxir saída as accións asignadas ao usuario <b>%s</b>(propietario e outros).
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> para restrinxir saída de accións asociadas ao proxecto <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype = systemauto</b> para excluir o evento automáticamente.
-AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
+AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> a incluir eventos de vacacións.
 AgendaShowBirthdayEvents=Amosar cumpreanos dos contactos
 AgendaHideBirthdayEvents=Ocultar cumpreanos dos contactos
 Busy=Ocupado
@@ -152,17 +152,18 @@ ActionType=Tipo de evento
 DateActionBegin=Data de comezo do evento
 ConfirmCloneEvent=¿Esta certo de querer clonar o evento <b>%s</b>?
 RepeatEvent=Repetir evento
+OnceOnly=Só unha vez
 EveryWeek=Cada semana
 EveryMonth=Cada mes
 DayOfMonth=Día do mes
 DayOfWeek=Día da semana
 DateStartPlusOne=Data inicio +1 hora
-SetAllEventsToTodo=Set all events to todo
-SetAllEventsToInProgress=Set all events to in progress
-SetAllEventsToFinished=Set all events to finished
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+SetAllEventsToTodo=Configura todos os eventos a todo
+SetAllEventsToInProgress=Configura todos os eventos a en progreso
+SetAllEventsToFinished=Configura todos os eventos a finalizados
+ReminderTime=Período de lembranza antes do evento
+TimeType=Tipo de duración
+ReminderType=Tipo de devolución da chamada
+AddReminder=Crear unha notificación de lembranza automática para este evento
+ErrorReminderActionCommCreation=Erro ao crear a notificación de lembranza para este evento
+BrowserPush=Notiticaciñon emerxente no navegador
diff --git a/htdocs/langs/gl_ES/assets.lang b/htdocs/langs/gl_ES/assets.lang
index a8ede67427d..a94a7f9643c 100644
--- a/htdocs/langs/gl_ES/assets.lang
+++ b/htdocs/langs/gl_ES/assets.lang
@@ -21,7 +21,7 @@ NewAsset = Novo activo
 AccountancyCodeAsset = Código contable (activo)
 AccountancyCodeDepreciationAsset = Código contable (conta depreciación activo)
 AccountancyCodeDepreciationExpense = Código contable (conta depreciación gastos)
-NewAssetType=Nuevo tipo de activo
+NewAssetType=Novo tipo de activo
 AssetsTypeSetup=Configuración tipos de activos
 AssetTypeModified=Tipo de activo modificado
 AssetType=Tipo de activo
@@ -34,7 +34,7 @@ ShowTypeCard=Ver tipo '%s'
 # Module label 'ModuleAssetsName'
 ModuleAssetsName = Activos
 # Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc = Descrición ben
+ModuleAssetsDesc = Descrición de activos
 
 #
 # Admin page
@@ -61,5 +61,5 @@ MenuListTypeAssets = Listaxe
 #
 # Module
 #
-NewAssetType=Nuevo tipo de activo
+NewAssetType=Novo tipo de activo
 NewAsset=Novo activo
diff --git a/htdocs/langs/gl_ES/banks.lang b/htdocs/langs/gl_ES/banks.lang
index bb0b955c32c..bbcfd6fd8f9 100644
--- a/htdocs/langs/gl_ES/banks.lang
+++ b/htdocs/langs/gl_ES/banks.lang
@@ -37,9 +37,9 @@ IbanValid=IBAN válido
 IbanNotValid=IBAN non válido
 StandingOrders=Domiciliacións
 StandingOrder=Domiciliación
-PaymentByDirectDebit=Payment by direct debit
-PaymentByBankTransfers=Payments by credit transfer
-PaymentByBankTransfer=Payment by credit transfer
+PaymentByDirectDebit=Pagamento por domiciliación bancaria
+PaymentByBankTransfers=Pagamentos por transferencia
+PaymentByBankTransfer=Pagamento por transferencia
 AccountStatement=Extracto da conta
 AccountStatementShort=Extracto
 AccountStatements=Extractos da conta
@@ -166,17 +166,18 @@ VariousPayment=Pagamento varios
 VariousPayments=Pagamentos varios
 ShowVariousPayment=Amosar pagamentos varios
 AddVariousPayment=Engadir pagamentos varios
-VariousPaymentId=Miscellaneous payment ID
-VariousPaymentLabel=Miscellaneous payment label
-ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
+VariousPaymentId=ID de pagamentos varios
+VariousPaymentLabel=Etiqueta de pagamentos varios
+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
-CashControl=POS cash fence
-NewCashFence=New cash fence
-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.
+CashControl=Control de caixa TPV
+NewCashFence=Pehe de nova caixa
+BankColorizeMovement=Colorear os movementos
+BankColorizeMovementDesc=Se esta función está activada, pode escoller unha cor específica do fondo dos movementos de crédito ou de débito
+BankColorizeMovementName1=Cor de fondo para movementos de débito
+BankColorizeMovementName2=Cor de fondo para os movementos de crédito
+IfYouDontReconcileDisableProperty=Se non aplica as reconciliacións bancarias nalgunhas contas bancarias, desactivar as propiedades "%s" nelas apara eliminar este aviso.
+NoBankAccountDefined=Non está definida a conta bancaria
diff --git a/htdocs/langs/gl_ES/bills.lang b/htdocs/langs/gl_ES/bills.lang
index a11d0d3fecd..a5ca9f3aeff 100644
--- a/htdocs/langs/gl_ES/bills.lang
+++ b/htdocs/langs/gl_ES/bills.lang
@@ -19,7 +19,7 @@ InvoiceStandardAsk=Factura estándar
 InvoiceStandardDesc=Este tipo de factura é a factura tradicional.
 InvoiceDeposit=Factura de anticipo
 InvoiceDepositAsk=Factura de anticipo
-InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
+InvoiceDepositDesc=Este tipo de factura crease cando se recibiu un anticipo.
 InvoiceProForma=Factura proforma
 InvoiceProFormaAsk=Factura proforma
 InvoiceProFormaDesc=A <b>factura proforma</b> é a imaxe dunha factura definitiva, pero que non ten ningún valor contable.
@@ -66,10 +66,10 @@ paymentInInvoiceCurrency=na moeda das facturas
 PaidBack=Reembolsado
 DeletePayment=Eliminar o pagamento
 ConfirmDeletePayment=¿Está certo de querer eliminar este pagamento?
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
-ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
-ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=¿Quere converter este %s nun crédito dispoñible?
+ConfirmConvertToReduc2=A cantidade gardarase entre todos os descontos e podería usarse como desconto dunha factura actual ou futura para este cliente.
+ConfirmConvertToReducSupplier=¿Quere converter este %s nun crédito dispoñible?
+ConfirmConvertToReducSupplier2=A cantidade gardarase entre todos os descontos e podería usarse como desconto para unha factura actual ou futura deste provedor.
 SupplierPayments=Pagamentos a provedores
 ReceivedPayments=Pagamentos recibidos
 ReceivedCustomersPayments=Pagamentos recibidos de cliente
@@ -92,8 +92,8 @@ PaymentConditions=Condicións de pagamento
 PaymentConditionsShort=Condicións de pagamento
 PaymentAmount=Importe pagamento
 PaymentHigherThanReminderToPay=Pagamento superior ao resto a pagar
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
+HelpPaymentHigherThanReminderToPay=Atención, o importe do pagamento dunha ou máis facturas é superior ao importe pendente a pagar. <br> Edite a súa entrada, se non, confirme e considere a posibilidade de crear unha nota de crédito polo exceso recibido por cada factura pagada de máis.
+HelpPaymentHigherThanReminderToPaySupplier=Atención, o importe do pagamento dunha ou máis facturas é superior ao importe pendente a pagar. <br> Edite a súa entrada, se non, confirme e considere a posibilidade de crear unha nota de crédito para o exceso pagado por cada factura pagada de máis.
 ClassifyPaid=Clasificar 'Pagado'
 ClassifyUnPaid=Clasificar 'Non pagado'
 ClassifyPaidPartially=Clasificar 'Pagado parcialmente'
@@ -135,37 +135,37 @@ BillShortStatusDraft=Borrador
 BillShortStatusPaid=Pagada
 BillShortStatusPaidBackOrConverted=Reembolsada ou convertida
 Refunded=Reembolsada
-BillShortStatusConverted=Pago
+BillShortStatusConverted=Paga
 BillShortStatusCanceled=Abandonada
 BillShortStatusValidated=Validada
 BillShortStatusStarted=Pagamento parcial
 BillShortStatusNotPaid=Pte. pagamento
 BillShortStatusNotRefunded=Non reembolsada
-BillShortStatusClosedUnpaid=Pechada (pte. pagamento)
+BillShortStatusClosedUnpaid=Pechada
 BillShortStatusClosedPaidPartially=Pechada (pagamento parcial)
 PaymentStatusToValidShort=A validar
 ErrorVATIntraNotConfigured=Número de CIF intracomunitario aínda non configurado
-ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
-ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
-ErrorBillNotFound=Invoice %s does not exist
-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=De
-BillTo=A
-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
+ErrorNoPaiementModeConfigured=Non se definiu ningún tipo de pago por defecto. Vaia á configuración do módulo de facturas para solucionalo.
+ErrorCreateBankAccount=Crear unha conta bancaria e logo ir ao panel de configuración do módulo de factura para definir os tipos de pago
+ErrorBillNotFound=A factura %s non existe
+ErrorInvoiceAlreadyReplaced=Erro, intentou validar unha factura para substituír a factura %s. Pero esta xa foi substituída pola factura %s.
+ErrorDiscountAlreadyUsed=Erro, desconto xa utilizado
+ErrorInvoiceAvoirMustBeNegative=Erro, a factura correcta debe ter un importe negativo
+ErrorInvoiceOfThisTypeMustBePositive=Erro, este tipo de factura debe ter un importe sen impostos positivos (ou nulos)
+ErrorCantCancelIfReplacementInvoiceNotValidated=Erro, non se pode cancelar unha factura que foi substituída por outra que aínda está en estado de borrador
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Esta parte ou outra xa está empregada polo que a serie de descontos non se pode eliminar.
+BillFrom=Emisor
+BillTo=Enviar a:
+ActionsOnBill=Accións sobre a factura
+RecurringInvoiceTemplate=Modelo / Factura recorrente
+NoQualifiedRecurringInvoiceTemplateFound=Non hai ningunha factura de modelo recorrente cualificada para a xeración.
+FoundXQualifiedRecurringInvoiceTemplate=Atopáronse %s factura(s) de modelo recorrentes cualificadas para a xeración.
+NotARecurringInvoiceTemplate=Non é unha factura de modelo recorrente
 NewBill=Nova factura
-LastBills=Latest %s invoices
-LatestTemplateInvoices=Latest %s template invoices
-LatestCustomerTemplateInvoices=Latest %s customer template invoices
-LatestSupplierTemplateInvoices=Latest %s vendor template invoices
+LastBills=Últimas %s facturas
+LatestTemplateInvoices=As últimas %s prantillas de  facturas
+LatestCustomerTemplateInvoices=As últimas %s prantillas de facturas a cliente
+LatestSupplierTemplateInvoices=As últimas %s prantillas de facturas de provedor
 LastCustomersBills=Últimas %s facturas a clientes
 LastSuppliersBills=Últimas %s facturas de provedores
 AllBills=Todas as facturas
@@ -185,20 +185,20 @@ ConfirmCancelBillQuestion=¿Por qué quere clasificar esta factura como 'abandoa
 ConfirmClassifyPaidPartially=¿Está certo de querer cambiar o estado da factura <b>%s</b> a pagado?
 ConfirmClassifyPaidPartiallyQuestion=Esta factura non foi pagada completamente. ¿Cal é a razón para pechar esta factura?
 ConfirmClassifyPaidPartiallyReasonAvoir=O resto a pagar <b>(%s %s)</b> é un desconto outorgado por pronto pagamento. Regularizaré o IVE cun abono.
-ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
-ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
-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
-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.
+ConfirmClassifyPaidPartiallyReasonDiscount=Restar sen pagar <b>(%s %s)</b> é un desconto concedido porque o pago foi adiantado ao prazo.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restar sen pagar <b>(%s %s)</b> é un desconto concedido porque o pago foi adiantado ao prazo. Acepto perder o IVE por este desconto.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Restar sen pagar <b>(%s %s)</b> é un desconto concedido porque o pago foi adiantado ao prazo. Recupero o IVE deste desconto sen unha nota de crédito.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Mal cliente
+ConfirmClassifyPaidPartiallyReasonProductReturned=Produtos parcialmente devoltos
+ConfirmClassifyPaidPartiallyReasonOther=Cantidade abandonada por outro motivo
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Esta opción é posible se a súa factura recibiu os comentarios axeitados. (Exemplo «Só o imposto correspondente ao prezo efectivamente pagado dá dereito a dedución»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Nalgúns países, esta elección só pode ser posible se a súa factura contén notas correctas.
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use esta opción se o resto non se adapta
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Un <b> mal cliente </b> é un cliente que rexeita pagar a súa débeda.
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Esta opción úsase cando o pago non se completa porque algúns dos produtos foron devoltos
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use esta opción se todas as demais non son axeitadas, por exemplo na seguinte situación:<br>- o pago non se completou porque algúns produtos foron devoltos <br>- cantidade reclamada demasiado importante porque se esqueceu un desconto <br> En todos os casos, o importe excedido debe corrixirse no sistema de contabilidade creando unha nota de crédito.
 ConfirmClassifyAbandonReasonOther=Outro
-ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
+ConfirmClassifyAbandonReasonOtherDesc=Esta opción usarase no resto dos casos. Por exemplo, porque ten pensado crear unha factura de rectificativa.
 ConfirmCustomerPayment=¿Confirma o proceso  deste pagamento de <b>%s</b> %s?
 ConfirmSupplierPayment=¿Confirma o proceso  deste pagamento de <b>%s</b> %s?
 ConfirmValidatePayment=¿Está certo de querer validar este pagamento? Non permitense cambios despois de validar o pagamento.
@@ -209,23 +209,23 @@ NumberOfBillsByMonth=Nº de facturas por mes
 AmountOfBills=Importe das facturas
 AmountOfBillsHT=Importe das facturas (Sen IVE)
 AmountOfBillsByMonthHT=Importe das facturas por mes (Sen IVE)
-UseSituationInvoices=Allow situation invoice
-UseSituationInvoicesCreditNote=Allow situation invoice credit note
-Retainedwarranty=Retained warranty
-AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
-RetainedwarrantyDefaultPercent=Retained warranty default percent
-RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
-RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
-ToPayOn=To pay on %s
-toPayOn=to pay on %s
-RetainedWarranty=Retained Warranty
-PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
-DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
-setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
-setretainedwarranty=Set retained warranty
-setretainedwarrantyDateLimit=Set retained warranty date limit
-RetainedWarrantyDateLimit=Retained warranty date limit
-RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
+UseSituationInvoices=Permitir factura de situación
+UseSituationInvoicesCreditNote=Permitir nota de crédito na factura da situación
+Retainedwarranty=Garantía retida
+AllowedInvoiceForRetainedWarranty=Garantía retida utilizable nos seguintes tipos de facturas
+RetainedwarrantyDefaultPercent=Porcentaxe por defecto da garantía retida
+RetainedwarrantyOnlyForSituation=Pon a "garantía retida" dispoñible só para facturas de situación
+RetainedwarrantyOnlyForSituationFinal=Nas facturas de situación, a dedución global de "garantía retida" aplícase só na situación final
+ToPayOn=Para pagar en %s
+toPayOn=pagar en %s
+RetainedWarranty=Garantía retida
+PaymentConditionsShortRetainedWarranty=Condicións de pago da garantía retida
+DefaultPaymentConditionsRetainedWarranty=Condicións de pago por garantía por defecto retidas
+setPaymentConditionsShortRetainedWarranty=Establecer os termos de pago da garantía retida
+setretainedwarranty=Establecer a garantía retida
+setretainedwarrantyDateLimit=Establecer o límite de data da garantía retida
+RetainedWarrantyDateLimit=Data límite de garantía retida
+RetainedWarrantyNeed100Percent=A factura de situación ten que estar ao 100%% de progreso para mostrarse en PDF
 AlreadyPaid=Xa pago
 AlreadyPaidBack=Xa reembolsado
 AlreadyPaidNoCreditNotesNoDeposits=Xa pago (excluidos os abonos e anticipos)
@@ -315,9 +315,9 @@ DiscountAlreadyCounted=Descontos xa consumidos
 CustomerDiscounts=Descontos a clientes
 SupplierDiscounts=Descontos de provedores
 BillAddress=Enderezo de facturación
-HelpEscompte=This discount is a discount granted to customer because payment was made before term.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
+HelpEscompte=Este desconto é un desconto concedido ao cliente porque o pago foi realizado antes de prazo.
+HelpAbandonBadCustomer=Esta cantidade foi abandonada (o cliente dixo que era un cliente malo) e considérase unha perda excepcional.
+HelpAbandonOther=Esta cantidade foi abandonada xa que foi un erro (cliente incorrecto ou factura substituída por outra por exemplo)
 IdSocialContribution=Id pagamento tasa social/fiscal
 PaymentId=ID pagamento
 PaymentRef=Ref. pagamento
@@ -358,32 +358,32 @@ ListOfPreviousSituationInvoices=Listaxe de facturas de situación previas
 ListOfNextSituationInvoices=Listaxe das próximas facturas de situación
 ListOfSituationInvoices=Listaxe de facturas de situación
 CurrentSituationTotal=Total situación actual
-DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
-RemoveSituationFromCycle=Remove this invoice from cycle
-ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
-ConfirmOuting=Confirm outing
+DisabledBecauseNotEnouthCreditNote=Para eliminar unha factura de situación do ciclo, o total da nota de crédito desta factura debe cubrir este total de factura
+RemoveSituationFromCycle=Eliminar esta factura do ciclo
+ConfirmRemoveSituationFromCycle=Eliminar esta factura %s do ciclo?
+ConfirmOuting=Confirmar a saída
 FrequencyPer_d=Cada %s días
 FrequencyPer_m=Cada %s meses
 FrequencyPer_y=Cada %s anos
 FrequencyUnit=Frecuencia
-toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
-NextDateToExecution=Date for next invoice generation
-NextDateToExecutionShort=Date next gen.
-DateLastGeneration=Date of latest generation
-DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max. number of invoice generation
-NbOfGenerationDone=Number of invoice 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
+toolTipFrequency=Exemplos:<br><b>Indicar 7, Día</b>: creará unha nova factura cada 7 días<br><b>Indicar 3, Mes</b>: creará unha nova factura cada 3 meses
+NextDateToExecution=Data para a xeración da próxima factura
+NextDateToExecutionShort=Data próxima xeración
+DateLastGeneration=Data da última xeración
+DateLastGenerationShort=Data última xeración
+MaxPeriodNumber=Nº máximo de facturas a xerar
+NbOfGenerationDone=Número de facturas xa xeradas
+NbOfGenerationDoneShort=Número de xeracións feitas
+MaxGenerationReached=Máximo número de xeracións alcanzado
+InvoiceAutoValidate=Validar facturas automáticamente
+GeneratedFromRecurringInvoice=Xerado dende a prantilla de facturas recorrentes %s
+DateIsNotEnough=Ainda non foi alcanzada a data
+InvoiceGeneratedFromTemplate=Factura %s xerada dende a prantilla de factura recorrente %s
+GeneratedFromTemplate=Xerado dende a prantilla de facturas concorrentes %s
+WarningInvoiceDateInFuture=Atención: a data da factura é maior que a data actual
+WarningInvoiceDateTooFarInFuture=Atención: a data da factura é moi lonxana á data actual
+ViewAvailableGlobalDiscounts=Ver os descontos dispoñibles
+GroupPaymentsByModOnReports=Pagos agrupados por modo nos informes
 # PaymentConditions
 Statut=Estado
 PaymentConditionShortRECEP=Acuse de recibo
@@ -410,10 +410,10 @@ PaymentConditionShort14D=14 días
 PaymentCondition14D=Pagamento aos 14 días
 PaymentConditionShort14DENDMONTH=14 días fin de mes
 PaymentCondition14DENDMONTH=14 días a fin de més
-FixAmount=Importe fixo
+FixAmount=Importe fixo -1 liña coa etiqueta %s
 VarAmount=Importe variable (%% total)
 VarAmountOneLine=Cantidade variable (%% tot.) - 1 liña coa etiqueta '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Cantidade variable (%% tot.) - as mesmas liñas
 # PaymentType
 PaymentTypeVIR=Transferencia bancaria
 PaymentTypeShortVIR=Transferencia bancaria
@@ -421,10 +421,10 @@ PaymentTypePRE=Domiciliación
 PaymentTypeShortPRE=Domiciliación
 PaymentTypeLIQ=Efectivo
 PaymentTypeShortLIQ=Efectivo
-PaymentTypeCB=Tarxeta de crédito
-PaymentTypeShortCB=Tarxeta de crédito
-PaymentTypeCHQ=Verificar
-PaymentTypeShortCHQ=Verificar
+PaymentTypeCB=Tarxeta
+PaymentTypeShortCB=Tarxeta
+PaymentTypeCHQ=Talón
+PaymentTypeShortCHQ=Talón
 PaymentTypeTIP=TIP (Titulo interbancario de pagamento)
 PaymentTypeShortTIP=Pagamento TIP
 PaymentTypeVAD=Pagamento en liña
@@ -459,8 +459,8 @@ FullPhoneNumber=Teléfono
 TeleFax=Fax
 PrettyLittleSentence=Acepto o pagamento mediante talóns ao meu nome das sumas debidas, na miña calidade de membro dunha empresa autorizada pola Administración Fiscal.
 IntracommunityVATNumber=Número de IVE intracomunitario
-PaymentByChequeOrderedTo=Pagamento mediante talón nominativo a %s enviado a
-PaymentByChequeOrderedToShort=Pagamento mediante talón nominativo a
+PaymentByChequeOrderedTo=Pagamento mediante talón nominativo (taxas incluídas) a %s enviado a
+PaymentByChequeOrderedToShort=Pagamento mediante talón nominativo (taxas incluídas) a
 SendTo=enviado a
 PaymentByTransferOnThisBankAccount=Pagamento mediante transferencia á conta bancaria seguinte
 VATIsNotUsedForInvoice=* IVE non aplicable  art-293B del CGI
@@ -507,17 +507,17 @@ ListOfYourUnpaidInvoices=Listaxe de facturas impagadas
 NoteListOfYourUnpaidInvoices=Nota: Este listaxe só inclue os terceiros ds que vostede é comercial.
 RevenueStamp=Timbre fiscal
 YouMustCreateInvoiceFromThird=Esta opción só está dispoñible ao crear unha factura dende a lapela 'cliente' en terceiros
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
-YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
-PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with 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 sequence 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 with 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 sequence with no break and no return to 0
-EarlyClosingReason=Early closing reason
-EarlyClosingComment=Early closing note
+YouMustCreateInvoiceFromSupplierThird=Esta opción só está dispoñible ao crear unha factura desde a pestana "Provedor" de terceiros
+YouMustCreateStandardInvoiceFirstDesc=Primeiro ten que crear unha factura estándar e convertela a "modelo" para crear unha nova factura modelo
+PDFCrabeDescription=Modelo PDF de factura Crabe. Un modelo de factura completo (implementación antiga do modelo Sponge)
+PDFSpongeDescription=Modelo PDF de factura Sponge. Un modelo de factura completo
+PDFCrevetteDescription=Modelo PDF de factura Crevette. Un modelo de factura completo para as facturas de situación
+TerreNumRefModelDesc1=Número de devolución co formato %syymm-nnnn para as facturas estándar e %syymm-nnnn para as notas de crédito onde aa é ano, mm é mes e nnnn é unha secuencia sen interrupción e sen retorno a 0
+MarsNumRefModelDesc1=Número de devolución co formato %syymm-nnnn para as facturas estándar, %syymm-nnnn para as facturas de reposición, %syymm-nnnn para as facturas de pago inicial e %syymm-nnnn para as notas de crédito onde aa é ano, mm é mes e nnnn é unha secuencia sen interrupción e sen retorno a 0
+TerreNumRefModelError=Xa existe unha factura que comeza con $syymm e non é compatible con este modelo de secuencia. Elimina ou renoméao para activar este módulo.
+CactusNumRefModelDesc1=Número de devolución co formato %syymm-nnnn para as facturas estándar, %syymm-nnnn para as notas de crédito e %syymm-nnnn para as facturas de pago inicial onde aa é ano, mm é mes e nnnn é unha secuencia sen interrupción e sen devolución a 0
+EarlyClosingReason=Motivo de peche anticipado
+EarlyClosingComment=Nota de peche anticipado
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Responsable seguimiento factura a cliente
 TypeContact_facture_external_BILLING=Contacto cliente facturación
@@ -528,50 +528,55 @@ TypeContact_invoice_supplier_external_BILLING=Contacto provedor facturación
 TypeContact_invoice_supplier_external_SHIPPING=Contacto provedor entregas
 TypeContact_invoice_supplier_external_SERVICE=Contacto provedor servizos
 # Situation invoices
-InvoiceFirstSituationAsk=First situation invoice
-InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
-InvoiceSituation=Situation invoice
-InvoiceSituationAsk=Invoice following the situation
-InvoiceSituationDesc=Create a new situation following an already existing one
-SituationAmount=Situation invoice amount(net)
-SituationDeduction=Situation subtraction
-ModifyAllLines=Modify all lines
-CreateNextSituationInvoice=Create next situation
-ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
-ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
-ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
-NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
-DisabledBecauseNotLastInCycle=The next situation already exists.
-DisabledBecauseFinal=This situation is final.
+InvoiceFirstSituationAsk=Factura de primeira situación
+InvoiceFirstSituationDesc=As <b>facturas de situación</b> están ligadas a situacións relacionadas cunha progresión, por exemplo, a progresión dunha construcción. Cada situación está ligada a unha factura.
+InvoiceSituation=Factura de situación
+PDFInvoiceSituation=Factura de situación
+InvoiceSituationAsk=Factura seguindo a situación
+InvoiceSituationDesc=Crear unha nova situación despois dunha xa existente
+SituationAmount=Importe da factura de situación (neto)
+SituationDeduction=Dedución da situación
+ModifyAllLines=Modificar todas as liñas
+CreateNextSituationInvoice=Crear a seguinte situación
+ErrorFindNextSituationInvoice=Erro ao non atopar a seguinte referencia do ciclo de situación
+ErrorOutingSituationInvoiceOnUpdate=Non se pode emitir a factura desta situación.
+ErrorOutingSituationInvoiceCreditNote=Non se pode emitir a nota de crédito ligada.
+NotLastInCycle=Esta factura non é a última do ciclo e non se debe modificar.
+DisabledBecauseNotLastInCycle=A seguinte situación xa existe.
+DisabledBecauseFinal=Esta situación é definitiva.
 situationInvoiceShortcode_AS=AS
 situationInvoiceShortcode_S=D
-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 order)
-BillCreated=%s bill(s) created
-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
+CantBeLessThanMinPercent=O progreso non pode ser menor que o seu valor na situación anterior.
+NoSituations=Non hai situacións abertas
+InvoiceSituationLast=Factura final e xeral
+PDFCrevetteSituationNumber=Situación Nº%s
+PDFCrevetteSituationInvoiceLineDecompte=Factura de situación - COUNT
+PDFCrevetteSituationInvoiceTitle=Factura de situación
+PDFCrevetteSituationInvoiceLine=Situación nº%s: Fact. Nº%s en %s
+TotalSituationInvoice=Situación total
+invoiceLineProgressError=O progreso da liña de factura non pode ser maior nin igual á seguinte liña de factura
+updatePriceNextInvoiceErrorUpdateline=Erro: actualización do prezo na liña de factura:%s
+ToCreateARecurringInvoice=Para crear unha factura recorrente para este contrato, primeiro cree este borrador de factura, logo convértao nun modelo de factura e defina a frecuencia para a xeración de facturas futuras.
+ToCreateARecurringInvoiceGene=Para xerar futuras facturas regularmente e manualmente, só tes que ir ao menú <strong>%s-%s-%s </strong>.
+ToCreateARecurringInvoiceGeneAuto=Se precisa xerar estas facturas automaticamente, pídelle ao administrador que active e configure o módulo <strong>%s </strong>. Teña conta que os dous métodos (manual e automático) pódense empregar xuntos sen risco de duplicación.
+DeleteRepeatableInvoice=Eliminar factura modelo
+ConfirmDeleteRepeatableInvoice=¿Está certo de que quere eliminar a factura modelo?
+CreateOneBillByThird=Crear unha factura por terceiro (se non, unha factura por pedimento)
+BillCreated=Creáronse %s factura(s)
+StatusOfGeneratedDocuments=Estado da xeración de documentos
+DoNotGenerateDoc=Non xerar ficheiro de documento
+AutogenerateDoc=Xerar automaticamente un ficheiro de documento
+AutoFillDateFrom=Establecer a data de inicio da liña de servizo coa data da factura
+AutoFillDateFromShort=Establecer a data de inicio
+AutoFillDateTo=Establecer a data de finalización da liña de servizo coa próxima data de factura
+AutoFillDateToShort=Establecer a data de finalización
+MaxNumberOfGenerationReached=Número máximo de xen. alcanzado
 BILL_DELETEInDolibarr=Factura eliminada
-BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
-UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
-CustomersInvoicesArea=Customer billing area
-SupplierInvoicesArea=Supplier billing area
+BILL_SUPPLIER_DELETEInDolibarr=Eliminouse a factura do provedor
+UnitPriceXQtyLessDiscount=Prezo unitario x Cantidade - Desconto
+CustomersInvoicesArea=Área de facturación do cliente
+SupplierInvoicesArea=Área de facturación de provedor
+FacParentLine=Liña principal de factura
+SituationTotalRayToRest=Lembranza de pagar sen impostos
+PDFSituationTitle=Situación n° %d
+SituationTotalProgress=Progreso total %d %%
diff --git a/htdocs/langs/gl_ES/blockedlog.lang b/htdocs/langs/gl_ES/blockedlog.lang
index 3a8b9adac84..99de9dd3d73 100644
--- a/htdocs/langs/gl_ES/blockedlog.lang
+++ b/htdocs/langs/gl_ES/blockedlog.lang
@@ -1,54 +1,54 @@
-BlockedLog=Unalterable Logs
+BlockedLog=Rexistros inalterables
 Field=Campo
-BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF525).
-Fingerprints=Archived events and fingerprints
-FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed).
-CompanyInitialKey=Company initial key (hash of genesis block)
-BrowseBlockedLog=Unalterable logs
-ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
-ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
-DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
-OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
-OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
-AddedByAuthority=Stored into remote authority
-NotAddedByAuthorityYet=Not yet stored into remote authority
-ShowDetails=Show stored details
-logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
-logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
-logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
-logPAYMENT_ADD_TO_BANK=Payment added to bank
-logPAYMENT_CUSTOMER_CREATE=Customer payment created
-logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
-logDONATION_PAYMENT_CREATE=Donation payment created
-logDONATION_PAYMENT_DELETE=Donation payment logical deletion
-logBILL_PAYED=Customer invoice paid
-logBILL_UNPAYED=Customer invoice set unpaid
-logBILL_VALIDATE=Customer invoice validated
-logBILL_SENTBYMAIL=Customer invoice send by mail
-logBILL_DELETE=Customer invoice logically deleted
-logMODULE_RESET=Module BlockedLog was disabled
-logMODULE_SET=Module BlockedLog was enabled
-logDON_VALIDATE=Donation validated
-logDON_MODIFY=Donation modified
-logDON_DELETE=Donation logical deletion
-logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
-logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
-logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash fence 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
+BlockedLogDesc=Este módulo rastrexa algúns eventos nun rexistro inalterable (que non pode ser modificado unha vez rexistrado) nunha cadea de bloques, en tempo real. Este módulo proporciona compatibilidade cos requisitos das lexislacións dalgúns países (como Franza coa lei Finanzas 2016 - Norma NF525).
+Fingerprints=Eventos arquivados e huellas dixitais.
+FingerprintsDesc=Esta é a ferramenta para navegar ou extraer os rexistros inalterables. Os rexistros inalterables son xerados e arquivados localmente nunha taboa adicada, en tempo real cando é rexistrado un evento de negocios. Pode utilizar esta ferramenta para exportar este ficheiro e gardarlo nun soporte externo (algúns países, como Franza, pidenlle que o faga todos os anos). Teña conta que non hai ningunha función para limpar este rexistro e que todos os cambios que tentara facer hacer directamente neste rexistro (por exemplo, un pirata informático) informanse cunha huella dixital non válida. Se realmente precisa purgar esta taboa porque fixo uso da sua aplicación para unha mostra / propósito de proba e desexa limpar os seus datos para comezar coa súa produción, pode solicitar ao seu revendedor ou integrador que reinicie a súa base de datos (serán eliminados todos os seus datos).
+CompanyInitialKey=Clave inicial da empresa (hash do bloque de xénesis)
+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).
+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
+NotAddedByAuthorityYet=Aínda non almacenado na autoridade remota
+ShowDetails=Amosar detalles almacenados
+logPAYMENT_VARIOUS_CREATE=Creouse o pagamento (non asignado á factura)
+logPAYMENT_VARIOUS_MODIFY=Modificouse o pagamento (non asignado á factura)
+logPAYMENT_VARIOUS_DELETE=Eliminación lóxico do pagamento (non asignado a factura).
+logPAYMENT_ADD_TO_BANK=Pagamento engadido ao banco
+logPAYMENT_CUSTOMER_CREATE=Pagamento do cliente creado
+logPAYMENT_CUSTOMER_DELETE=Eliminación lóxica do pagamento do cliente
+logDONATION_PAYMENT_CREATE=Creado pagamento de doación/subvención
+logDONATION_PAYMENT_DELETE=Eliminación lóxica do pagamento da doación/subvención.
+logBILL_PAYED=Factura do cliente pagada
+logBILL_UNPAYED=Factura do cliente marcada como pendente de cobro
+logBILL_VALIDATE=Validada factura a cliente
+logBILL_SENTBYMAIL=Enviar factura a cliente por correo electrónico
+logBILL_DELETE=Factura do cliente borrada lóxicamente
+logMODULE_RESET=O módulo BlockedLog foi deshabilitado
+logMODULE_SET=O módulo BlockedLog foi habilitado
+logDON_VALIDATE=Doación/Subvención validada
+logDON_MODIFY=Doación/subvención modificada
+logDON_DELETE=Eliminación lóxica da doación/subvención.
+logMEMBER_SUBSCRIPTION_CREATE=Creada subscrición de membro
+logMEMBER_SUBSCRIPTION_MODIFY=Modificada Subscrición de membro
+logMEMBER_SUBSCRIPTION_DELETE=Eliminación lóxica de subscrición de membro
+logCASHCONTROL_VALIDATE=Rexistro de peche de caixa
+BlockedLogBillDownload=Descarga da factura de cliente
+BlockedLogBillPreview=Vista previa da factura do cliente
+BlockedlogInfoDialog=Detalles do rexistro
+ListOfTrackedEvents=Listaxe de eventos seguidos
+Fingerprint=Pegada dactilar
+DownloadLogCSV=Exportar rexistros arquivados (CSV)
+logDOC_PREVIEW=Vista previa dun documento validado para imprimir ou descargar
+logDOC_DOWNLOAD=Descarga dun documento validado para imprimir ou enviar.
+DataOfArchivedEvent=Datos completos do evento arquivado.
+ImpossibleToReloadObject=O obxecto orixinal (tipo %s, id %s) non ligado (ver a columna "Datos completos" para obter datos gardados inalterables)
+BlockedLogAreRequiredByYourCountryLegislation=A lexislación do seu país pode requirir o módulo de rexistros inalterables. A desactivación deste módulo pode facer que calquera transacción futura sexa inválida con respecto á lei e ao uso de software legal xa que non poden ser validadas por unha auditoría fiscal.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=O módulo de Rexistros inalterables activouse por mor da lexislación do seu país. A desactivación deste módulo pode facer que as transaccións futuras sexan inválidas con respecto á lei e ao uso de software legal, xa que non poden ser validadas por unha auditoría fiscal.
+BlockedLogDisableNotAllowedForCountry=Listaxe de países onde o uso deste módulo é obrigatorio (só para evitar desactivar o módulo por erro, se o seu país está nesta lista, a desactivación do módulo non é posible sen editar esta lista antes. Teña conta tamén que habilitar/desactivar este módulo manterá unha pista no rexistro inalterable).
+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
diff --git a/htdocs/langs/gl_ES/boxes.lang b/htdocs/langs/gl_ES/boxes.lang
index 1ae5652b2a9..9012a5b62ac 100644
--- a/htdocs/langs/gl_ES/boxes.lang
+++ b/htdocs/langs/gl_ES/boxes.lang
@@ -37,18 +37,21 @@ BoxTitleOldestUnpaidSupplierBills=Facturas Provedores: últimas %s pendentes de
 BoxTitleCurrentAccounts=Contas abertas: balance
 BoxTitleSupplierOrdersAwaitingReception=Pedimentos de provedores agardando recepción
 BoxTitleLastModifiedContacts=Contactos/Enderezos: Últimos %s modificados
-BoxMyLastBookmarks=Bookmarks: latest %s
+BoxMyLastBookmarks=Últimos %s marcadores
 BoxOldestExpiredServices=Servizos antigos expirados
 BoxLastExpiredServices=Últimos %s contratos mais antigos con servizos expirados
 BoxTitleLastActionsToDo=Últimas %s accións a realizar
 BoxTitleLastContracts=Últimos %s contratos modificados
 BoxTitleLastModifiedDonations=Últimas %s doacións/subvencións modificadas
 BoxTitleLastModifiedExpenses=Últimos %s informes de gastos modificados
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLatestModifiedBoms=Últimos %s MRP modificados
+BoxTitleLatestModifiedMos=Últimos %s ordes de fabricación modificadas
+BoxTitleLastOutstandingBillReached=Superouse o máximo de clientes  con pendente
 BoxGlobalActivity=Actividade global (facturas, orzamentos, ordes)
 BoxGoodCustomers=Bos clientes
 BoxTitleGoodCustomers=%s Bos clientes
+BoxScheduledJobs=Tarefas programadas
+BoxTitleFunnelOfProspection=Embudo de clientes
 FailedToRefreshDataInfoNotUpToDate=Erro ao actualizar o RSS. Último refresco correcto na data: %s
 LastRefreshDate=Última data de refresco
 NoRecordedBookmarks=Non hai marcadores definidos
@@ -83,8 +86,8 @@ 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=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Últimos %s traballos modificados
+BoxTitleLatestModifiedCandidatures=Últimas %s candidaturas modificadas
 ForCustomersInvoices=Facturas a clientes
 ForCustomersOrders=Pedimentos de clientes
 ForProposals=Orzamentos
@@ -92,8 +95,8 @@ LastXMonthRolling=Os últimos %s meses consecutivos
 ChooseBoxToAdd=Engadir panel ao seu taboleiro
 BoxAdded=O panel foi agregado ao seu taboleiro
 BoxTitleUserBirthdaysOfMonth=Cumpreanos deste mes (Usuarios)
-BoxLastManualEntries=Últimas entradas manuais en contabilidade
-BoxTitleLastManualEntries=%s últimas entradas manuais
+BoxLastManualEntries=Último rexistro en contabilidade introducido manualmente ou sen documento  orixe
+BoxTitleLastManualEntries=Ultimo rexistro de %s introducido manualmente ou sen documento orixe
 NoRecordedManualEntries=Sen entradas manuais gravadas en contabilidade
 BoxSuspenseAccount=Operaciónen conta contable con conta en suspenso
 BoxTitleSuspenseAccount=Número de liñas non asignadas
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Conta en suspenso non está definida
 BoxLastCustomerShipments=Últimos envios a clientes
 BoxTitleLastCustomerShipments=Últimos %s envíos a clientes
 NoRecordedShipments=Ningún envío a cliente rexistrado
+BoxCustomersOutstandingBillReached=Alcanzáronse os clientes cun límite pendente
 # Pages
 AccountancyHome=Contabilidade
+ValidatedProjects=Proxectos validados
diff --git a/htdocs/langs/gl_ES/cashdesk.lang b/htdocs/langs/gl_ES/cashdesk.lang
index 0926360b26f..318445e1d3d 100644
--- a/htdocs/langs/gl_ES/cashdesk.lang
+++ b/htdocs/langs/gl_ES/cashdesk.lang
@@ -50,7 +50,7 @@ AmountAtEndOfPeriod=Importe ao final do período (día, mes ou ano)
 TheoricalAmount=Importe teórico
 RealAmount=Importe real
 CashFence=Peche de caixa
-CashFenceDone=Peche de caixa realizado para o período.
+CashFenceDone=Peche de caixa realizado para o período
 NbOfInvoices=Nº de facturas
 Paymentnumpad=Tipo de Pad para introducir o pago.
 Numberspad=Teclado numérico
@@ -62,7 +62,7 @@ CashDeskBankAccountFor=Conta por defecto a usar para cobros en
 NoPaimementModesDefined=Non existe modo de pago definido na configuración de TakePOS
 TicketVatGrouped=Agrupar por tipo de IVE nos tickets
 AutoPrintTickets=Imprimir tickets automáticamente
-PrintCustomerOnReceipts=Print customer on tickets|receipts
+PrintCustomerOnReceipts=Imprimir a cliente tickets/recibos
 EnableBarOrRestaurantFeatures=Habilitar características para Bar ou Restaurante
 ConfirmDeletionOfThisPOSSale=¿Está certo de querer eliminar a venda actual?
 ConfirmDiscardOfThisPOSSale=¿Queres descartar a venda actual??
@@ -77,48 +77,50 @@ POSModule=POS Modulo
 BasicPhoneLayout=Utilizar deseño básico para teléfonos.
 SetupOfTerminalNotComplete=Configuración da terminal %s non está finalizada
 DirectPayment=Pago directo
-DirectPaymentButton=Add a "Direct cash payment" button
+DirectPaymentButton=Engadir un botón "Pago en efectivo"
 InvoiceIsAlreadyValidated=A factura xa foi validada
 NoLinesToBill=Sen liñas a facturar
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
 ProductSupplements=Product Supplements
 SupplementCategory=Supplement category
-ColorTheme=Color theme
-Colorful=Colorful
-HeadBar=Head Bar
-SortProductField=Field for sorting products
+ColorTheme=Cor do tema
+Colorful=Colorido
+HeadBar=Barra na cabeceira
+SortProductField=Campo de clasificación de produtos
 Browser=Navegador
-BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
-TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
-PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
-ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
-CashDeskRefNumberingModules=Numbering module for POS sales
-CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
-TakeposGroupSameProduct=Group same products lines
-StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
-CashReport=Cash report
-MainPrinterToUse=Main printer to use
-OrderPrinterToUse=Order printer to use
-MainTemplateToUse=Main template to use
-OrderTemplateToUse=Order template to use
-BarRestaurant=Bar Restaurant
-AutoOrder=Order by the customer himself
+BrowserMethodDescription=Impresión de recibos sinxela e doada. Só algúns parámetros para configurar o recibo. Imprimir mediante navegador.
+TakeposConnectorMethodDescription=Módulo externo con funcións adicionais. Posibilidade de imprimir desde a nube.
+PrintMethod=Método de impresión
+ReceiptPrinterMethodDescription=Método potente con moitos parámetros. Completamente personalizable con modelos. Non se pode imprimir desde a nube.
+ByTerminal=Por terminal
+TakeposNumpadUsePaymentIcon=Usar a icona no canto do texto, nos botóns de pago do teclado numérico
+CashDeskRefNumberingModules=Módulo de numeración para vendas de TPV
+CashDeskGenericMaskCodes6 = A etiqueta <br><b>(TN)</b> é usada para engadir o número de terminal
+TakeposGroupSameProduct=Agrupa as mesmas liñas de produtos
+StartAParallelSale=Comeza unha nova venda en paralelo
+SaleStartedAt=A venda comezou en %s
+ControlCashOpening=Aviso emerxente do efectivo ao abris o TPV
+CloseCashFence=Controlar peche de caixa
+CashReport=Informe de caixa
+MainPrinterToUse=Impresora principal a usar
+OrderPrinterToUse=Solicitar que impresora usar
+MainTemplateToUse=Modelo principal a usar
+OrderTemplateToUse=Modelo de pedido a usar
+BarRestaurant=Bar Restaurante
+AutoOrder=Pedido do propio cliente
 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
+CustomerMenu=Menú do cliente
+ScanToMenu=Escanear o código QR para ver o menú
+ScanToOrder=Escanear o código QR para pedir
+Appearance=Apariencia
+HideCategoryImages=Ocultar imaxes de categoría
+HideProductImages=Ocultar imaxes do produto
+NumberOfLinesToShow=Número de liñas de imaxes a amosar
+DefineTablePlan=Definir o plan de mesas
+GiftReceiptButton=Engadir un botón "Recibo agasallo"
+GiftReceipt=Recibo agasallo
+ModuleReceiptPrinterMustBeEnabled=A impresora de recibos do módulo debe estar habilitada primeiro
+AllowDelayedPayment=Permitir o pago en débeda
+PrintPaymentMethodOnReceipts=Imprimir método de pago en tickets/recibos
+WeighingScale=Pesaxe
diff --git a/htdocs/langs/gl_ES/categories.lang b/htdocs/langs/gl_ES/categories.lang
index 2aa1b892b01..13f95f1a8dc 100644
--- a/htdocs/langs/gl_ES/categories.lang
+++ b/htdocs/langs/gl_ES/categories.lang
@@ -1,92 +1,99 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag/Category
+Rubrique=Etiqueta/Categoría
 Rubriques=Etiquetas/Categorías
-RubriquesTransactions=Tags/Categories of transactions
-categories=tags/categories
-NoCategoryYet=No tag/category of this type created
-In=In
-AddIn=Add in
-modify=modify
-Classify=Classify
-CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Vendors tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
-ProjectsCategoriesArea=Projects tags/categories area
-UsersCategoriesArea=Users tags/categories area
-SubCats=Sub-categories
-CatList=List of tags/categories
-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
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
-CatProdList=List of products tags/categories
-CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers 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
-CatProJectLinks=Links between projects and tags/categories
-DeleteFromCat=Remove from tags/category
+RubriquesTransactions=Etiquetas/Categorías de transaccións
+categories=etiquetas/categorias
+NoCategoryYet=Ningunha etiqueta/categoría deste tipo creada
+In=En
+AddIn=Engadir en
+modify=modificar
+Classify=Clasificar
+CategoriesArea=Área Etiquetas/Categorías
+ProductsCategoriesArea=Área etiquetas/categorías Produtos/Servizos
+SuppliersCategoriesArea=Área etiquetas/categorías Provedores
+CustomersCategoriesArea=Área etiquetas/categorías Clientes
+MembersCategoriesArea=Área etiquetas/categorías Membros
+ContactsCategoriesArea=Área etiquetas/categorías de Contactos
+AccountsCategoriesArea=Área etiquetas/categorías Contables
+ProjectsCategoriesArea=Área etiquetas/categorías Proxectos
+UsersCategoriesArea=Área etiquetas/categorías Usuarios
+SubCats=Subcategorías
+CatList=Listaxe de etiquetas/categorías
+CatListAll=Listaxe de etiquetas/categorías (todos os tipos)
+NewCategory=Nova etiqueta/categoría
+ModifCat=Modificar etiqueta/categoría
+CatCreated=Etiqueta/categoría creada
+CreateCat=Crear etiqueta/categoría
+CreateThisCat=Crear esta etiqueta/categoría
+NoSubCat=Esta categoría non contén ningunha subcategoría.
+SubCatOf=Subcategoría
+FoundCats=Atopadas etiquetas/categorías
+ImpossibleAddCat=Imposible engadir á etiqueta/categoría %s
+WasAddedSuccessfully=<b>%s</b> foi engadida con éxito
+ObjectAlreadyLinkedToCategory=O elemento xa está ligado a esta etiqueta/categoría
+ProductIsInCategories=Produto/Servizo está ligado as seguintes etiquetas/categorías
+CompanyIsInCustomersCategories=Este terceiro está ligado nas seguintes etiquetas/categorías de clientes/clientes potenciais
+CompanyIsInSuppliersCategories=Este terceiro está ligado ás seguintes etiquetas/categorías de provedores
+MemberIsInCategories=Este membro está ligado ás seguintes etiquetas/categorías
+ContactIsInCategories=Este contacto está ligado ás seguintes etiquetas/categorías de contactos
+ProductHasNoCategory=Este produto/servizo non atópase en ningunha etiqueta/categoría
+CompanyHasNoCategory=Este terceiro non atópase en ningunha etiqueta/categoría
+MemberHasNoCategory=Este membro non atópase en ningunha etiqueta/categoría
+ContactHasNoCategory=Este contacto non atópase en ningunha etiqueta/categoría
+ProjectHasNoCategory=Este proxecto non atópase en ningunha etiqueta/categoría
+ClassifyInCategory=Engadir a unha etiqueta/categoría
+NotCategorized=Sen etiqueta/categoría
+CategoryExistsAtSameLevel=Esta categoría xa existe para esta referencia
+ContentsVisibleByAllShort=Contido visible por todos
+ContentsNotVisibleByAllShort=Contido non visible por todos
+DeleteCategory=Eliminar etiqueta/categoría
+ConfirmDeleteCategory=¿Está certo de querer eliminar esta etiqueta/categoría?
+NoCategoriesDefined=Ningunha etiqueta/categoría definida
+SuppliersCategoryShort=Etiqueta/categoría Provedores
+CustomersCategoryShort=Etiqueta/categoría Clientes
+ProductsCategoryShort=Etiqueta/categoría Produtos
+MembersCategoryShort=Etiqueta/categoría Membros
+SuppliersCategoriesShort=Etiquetas/categorías Provedores
+CustomersCategoriesShort=Etiquetas/categorías Clientes
+ProspectsCategoriesShort=Etiquetas/categorías Clientes Potenciais
+CustomersProspectsCategoriesShort=Etiquetas/categorías Clientes/Clientes Potenciais
+ProductsCategoriesShort=Etiquetas/categorías Produtos
+MembersCategoriesShort=Etiquetas/categorías Membros
+ContactCategoriesShort=Etiquetas/categorías Contactos
+AccountsCategoriesShort=Etiquetas/categorías Contabilidade
+ProjectsCategoriesShort=Etiquetas/categorías Proxectos
+UsersCategoriesShort=Etiquetas/categorías Usuarios
+StockCategoriesShort=Etiquetas/categorías Almacéns
+ThisCategoryHasNoItems=Esta categoría non contén ningún elemento
+CategId=Id de etiqueta/categoría
+ParentCategory=Etiqueta/categoría pai
+ParentCategoryLabel=Selo de pai /etiqueta/categoría
+CatSupList=Listaxe de etiquetas/categorías de provedores
+CatCusList=Listaxe de etiquetas/categorías de clientes/clientes potenciais
+CatProdList=Listaxe de etiquetas/categorías de produtos
+CatMemberList=Listaxe de etiquetas/categorías de membros
+CatContactList=Listaxe de etiquetas/categorías de contactos
+CatProjectsList=Listaxe de etiquetas/categorías de proxectos
+CatUsersList=Listaxe de etiquetas/categorías de usuarios
+CatSupLinks=Ligazóns entre provedores e etiquetas/categorías
+CatCusLinks=Ligazóns entre clientes/clientes potenciais e etiquetas/categorías
+CatContactsLinks=Ligazóns entre contactos/enderezos e etiquetas/categorías
+CatProdLinks=Ligazóns entre produtos/servizos e etiquetas/categorías
+CatMembersLinks=Ligazóns entre membros e etiquetas/categorías
+CatProjectsLinks=Ligazóns entre proxectos e etiquetas/categorías
+CatUsersLinks=Ligazóns entre usuarios e etiquetas/categorías
+DeleteFromCat=Eliminar de etiquetas/categorías
 ExtraFieldsCategories=Campos adicionais
-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=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
-WebsitePagesCategoriesArea=Page-Container Categories
-UseOrOperatorForCategories=Use or operator for categories
+CategoriesSetup=Configuración de etiquetas/categorías
+CategorieRecursiv=Ligar co pai etiqueta/categoría automáticamente
+CategorieRecursivHelp=Se está activado, cando engade un produto nunha subcategoría o produto será ligado á categoría pai.
+AddProductServiceIntoCategory=Engadir o seguinte produto/servizo
+AddCustomerIntoCategory=Asignar categoría ao cliente
+AddSupplierIntoCategory=Asignar categoría ao provedor
+ShowCategory=Amosar etiqueta/categoría
+ByDefaultInList=Por defecto na listaxe
+ChooseCategory=Escoller categoría
+StocksCategoriesArea=Categorías de almacéns
+ActionCommCategoriesArea=Categorías de eventos
+WebsitePagesCategoriesArea=Categorías de contedores de páxina
+UseOrOperatorForCategories=Uso ou operador para categorías
diff --git a/htdocs/langs/gl_ES/companies.lang b/htdocs/langs/gl_ES/companies.lang
index fa0e5afee91..bb98f3309db 100644
--- a/htdocs/langs/gl_ES/companies.lang
+++ b/htdocs/langs/gl_ES/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Id Prof 1 (USt.-IdNr)
 ProfId2AT=Id Prof 2 (USt.-Nr)
 ProfId3AT=Id Prof 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=Número EORI number
 ProfId6AT=-
 ProfId1AU=Id Prof 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Id Prof 1 (Número de colexiado)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=Número EORI
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscrición Estadual)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Inscrición Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=UID-Nummer
+ProfId1CH=UID-Número
 ProfId2CH=-
 ProfId3CH=Id Prof 1 (Número federal)
 ProfId4CH=Id Prof 2 (Número de rexistro comercial)
-ProfId5CH=EORI number
+ProfId5CH=EORI número
 ProfId6CH=-
 ProfId1CL=Id Prof 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Id prof. 1 (USt.-IdNr)
 ProfId2DE=Id prof. 2 (USt.-Nr)
 ProfId3DE=Id prof. 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=Número EORI
 ProfId6DE=-
-ProfId1ES=CIF/NIF
-ProfId2ES=Número Seguridade Social
-ProfId3ES=CNAE
-ProfId4ES=Número de colexiado
-ProfId5ES=EORI number
+ProfId1ES=Id Prof. 1  (CIF/NIF)
+ProfId2ES=Id Prof. 2 (Número Seguridade Social)
+ProfId3ES=Id Prof 3 (CNAE)
+ProfId4ES=Id Prof 4 (Número de colexiado)
+ProfId5ES=Número EORI
 ProfId6ES=-
 ProfId1FR=Id Prof 1 (SIREN)
 ProfId2FR=Id Prof 2 (SIRET)
 ProfId3FR=Id Prof 3 (NAF, antigo APE)
 ProfId4FR=Id Prof 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=Número EORI
 ProfId6FR=-
 ProfId1GB=Número rexistro
 ProfId2GB=-
@@ -202,12 +202,12 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=Número EORI
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Negocios permitidos)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=Número EORI
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
@@ -225,13 +225,13 @@ ProfId1NL=Número KVK
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=EORI number
+ProfId5NL=Número EORI
 ProfId6NL=-
-ProfId1PT=NIPC
-ProfId2PT=Número segurança social
-ProfId3PT=Número rexistro comercial
-ProfId4PT=Conservatorio
-ProfId5PT=EORI number
+ProfId1PT=Id Prof 1 (NIPC)
+ProfId2PT=Id Prof. 2 (Número segurança social)
+ProfId3PT=Id Prof. 3 (Número rexistro comercial)
+ProfId4PT=Id Prof 4 (Conservatorio)
+ProfId5PT=Número EORI
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +255,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=Número EORI
 ProfId6RO=-
 ProfId1RU=Id prof. 1 (OGRN)
 ProfId2RU=Id prof. 2 (INN)
@@ -302,7 +302,7 @@ AddContact=Crear contacto
 AddContactAddress=Crear contacto/enderezo
 EditContact=Editar contacto
 EditContactAddress=Editar contacto/enderezo
-Contact=Contacto
+Contact=Contacto/Enderezo
 Contacts=Contactos/Enderezos
 ContactId=Id contacto
 ContactsAddresses=Contactos/Enderezos
@@ -359,7 +359,7 @@ VATIntraManualCheck=Pode tamén verificar manualmente na web da Comisión Europe
 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
-Workforce=Workforce
+Workforce=TRaballadores
 Staff=Empregados
 ProspectLevelShort=Potencial
 ProspectLevel=Cliente potencial
@@ -412,8 +412,8 @@ DeliveryAddress=Enderezo de envío
 AddAddress=Engadir enderezo
 SupplierCategory=Categoría de provedor
 JuridicalStatus200=Independente
-DeleteFile=Eliminación dun arquivo
-ConfirmDeleteFile=¿Está certo de querer eliminar este arquivo?
+DeleteFile=Eliminación dun ficheiro
+ConfirmDeleteFile=¿Está certo de querer eliminar este ficheiro?
 AllocateCommercial=Asignado a comercial
 Organization=Organización
 FiscalYearInformation=Ano fiscal
@@ -426,7 +426,7 @@ SocialNetworksInstagramURL=Instagram URL
 SocialNetworksYoutubeURL=Youtube URL
 SocialNetworksGithubURL=Github URL
 YouMustAssignUserMailFirst=Primeiro tes que asignar un e-mail para este usuario para poder engadilo en notificaciónss de e-mail.
-YouMustCreateContactFirst=Para poder engadir notificaciones por e-mail, primeiro tes que definir contactos con e-mails válidos para terceiros
+YouMustCreateContactFirst=Para poder engadir notificacións por e-mail, primeiro hai que definir contactos con e-mails válidos para terceiros
 ListSuppliersShort=Listaxe de provedores
 ListProspectsShort=Listaxe de clientes potenciais
 ListCustomersShort=Listaxe de clientes
@@ -462,8 +462,8 @@ PaymentTermsSupplier=Termos de pagamento - Provedor
 PaymentTypeBoth=Tipo de pagamento - Cliente e Provedor
 MulticurrencyUsed=Usa MultiMoeda
 MulticurrencyCurrency=Moeda
-InEEC=Europe (EEC)
-RestOfEurope=Rest of Europe (EEC)
-OutOfEurope=Out of Europe (EEC)
-CurrentOutstandingBillLate=Current outstanding bill late
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
+InEEC=Europa (EEC)
+RestOfEurope=Resto de Europa (EEC)
+OutOfEurope=Fora de Europa (EEC)
+CurrentOutstandingBillLate=Factura actual pendente atrasada
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Ter coidado, dependendo da configuración do prezo do produto, debería mudarse o terceiro antes de engadir o produto ao TPV.
diff --git a/htdocs/langs/gl_ES/compta.lang b/htdocs/langs/gl_ES/compta.lang
index 872ffd25c6e..92a135523c0 100644
--- a/htdocs/langs/gl_ES/compta.lang
+++ b/htdocs/langs/gl_ES/compta.lang
@@ -1,20 +1,20 @@
 # 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=Config.
-RemainingAmountPayment=Amount payment remaining:
+MenuFinancial=Financieira
+TaxModuleSetupToModifyRules=Ir á <a href="%s">configuración do módulo de impostos</a> para modificar as regras de cálculo
+TaxModuleSetupToModifyRulesLT=Ir á <a href="%s">configuración da Empresa</a> para modificar as regras de cálculo
+OptionMode=Opción de contabilidade
+OptionModeTrue=Opción Ingresos-Gastos
+OptionModeVirtual=Opción Créditos-Débedas
+OptionModeTrueDesc=Neste contexto, o volume de negocio calcúlase sobre pagamentos (data dos pagamentos). A validez das cifras só se asegura se se analiza a contabilidade a través da entrada/saída das contas mediante facturas.
+OptionModeVirtualDesc=Neste contexto, o volume de negocio calcúlase sobre facturas (data de validación). Cando se paguen estas facturas, xa sexan pagadas ou non, aparecen na saída do volume de negocio.
+FeatureIsSupportedInInOutModeOnly=Función só dispoñible no modo de contabilidade DEBEDAS DE CRÉDITOS (Ver configuración do módulo de contabilidade)
+VATReportBuildWithOptionDefinedInModule=As cantidades que se amosan aquí calcúlanse empregando regras definidas pola configuración do módulo Tributario.
+LTReportBuildWithOptionDefinedInModule=As cantidades que se amosan aquí calcúlanse empregando regras definidas pola configuración da empresa.
+Param=Configuración.
+RemainingAmountPayment=Pagamento da cantidade restante:
 Account=Conta
-Accountparent=Conta pai
-Accountsparent=Contas pai
+Accountparent=Conta principal
+Accountsparent=Contas principais
 Income=Ingresos
 Outcome=Gastos
 MenuReportInOut=Ingresos / Gastos
@@ -30,34 +30,34 @@ Balance=Saldo
 Debit=Debe
 Credit=Haber
 Piece=Doc. contabilidade
-AmountHTVATRealReceived=Total repercutido
-AmountHTVATRealPaid=Total xa pago
+AmountHTVATRealReceived=Neto repercutido
+AmountHTVATRealPaid=Neto xa pago
 VATToPay=Vendas IVE
 VATReceived=IVE repercutido
 VATToCollect=IVE compras
 VATSummary=Balance de IVE mensual
 VATBalance=Balance de IVE
-VATPaid=Pagamento de IVE
-LT1Summary=Resumo RE
-LT2Summary=Resumo de IRPF
+VATPaid=IVE pagado
+LT1Summary=Resumo do imposto 2 RE
+LT2Summary=Resumo do imposto 3 IRPF
 LT1SummaryES=Balance de RE
 LT2SummaryES=Balance de IRPF
 LT1SummaryIN=Balance CGST
 LT2SummaryIN=Balance SGST
-LT1Paid=Pagamentos de IRPF
-LT2Paid=Pagamentos de IRPF
+LT1Paid=Imposto 2 xa pago RE
+LT2Paid=Imposto 3 xa pago IRPF
 LT1PaidES=RE xa pago
 LT2PaidES=IRPF xa pago
 LT1PaidIN=xa pago CGST
 LT2PaidIN=xa pago SGST
-LT1Customer=Vendas RE
-LT1Supplier=Compras RE
+LT1Customer=Imposto 2 vendas RE
+LT1Supplier=Imposto 2 compras RE
 LT1CustomerES=Vendas RE
 LT1SupplierES=Compras RE
 LT1CustomerIN=Vendas CGST
 LT1SupplierIN=Compras CGST
-LT2Customer=Vendas IRPF
-LT2Supplier=Compras IRPF
+LT2Customer=Imposto 3 vendas IRPF
+LT2Supplier=Imposto 3 compras IRPF
 LT2CustomerES=IRPF vendas
 LT2SupplierES=IRPF compras
 LT2CustomerIN=Vendas SGST
@@ -69,7 +69,7 @@ SocialContribution=Impostos sociais ou fiscais
 SocialContributions=Impostos sociais ou fiscais
 SocialContributionsDeductibles=Impostos sociais ou fiscais deducibles
 SocialContributionsNondeductibles=Impostos sociais ou fiscais non deducibles
-DateOfSocialContribution=Date of social or fiscal tax
+DateOfSocialContribution=Data do imposto social ou fiscal
 LabelContrib=Etiqueta de contribución
 TypeContrib=Tipo de contribución
 MenuSpecialExpenses=Pagamentos especiais
@@ -90,12 +90,12 @@ ListOfCustomerPayments=Listaxe de pagamentos de clientes
 ListOfSupplierPayments=Listaxe de pagamentos a provedores
 DateStartPeriod=Data inicio período
 DateEndPeriod=Data final período
-newLT1Payment=Novo pagamento de RE
-newLT2Payment=Novo pagamento de IRPF
-LT1Payment=Pagamento de RE
-LT1Payments=Pagamentos RE
-LT2Payment=Pagamento de IRPF
-LT2Payments=Pagamentos IRPF
+newLT1Payment=Novo pagamento taxa 2 RE
+newLT2Payment=Novo pagamento taxa 3 IRPF
+LT1Payment=Pagamento taxa 2 RE
+LT1Payments=Pagamentos taxa 2 RE
+LT2Payment=Pagamento taxa 3 IRPF
+LT2Payments=Pagamentos taxa 3 IRPF
 newLT1PaymentES=Novo pagamento de RE
 newLT2PaymentES=Novo pagamento de IRPF
 LT1PaymentES=Pagamento de RE
@@ -111,7 +111,7 @@ Refund=Reembolso
 SocialContributionsPayments=Pagamentos de taxas sociais/fiscais
 ShowVatPayment=Consultar pagamentos de IVE
 TotalToPay=Total a pagar
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+BalanceVisibilityDependsOnSortAndFilters=O saldo é visible nesta lista só se a táboa está ordenada en %s e filtrada nunha 1 conta bancaria (sen outros filtros)
 CustomerAccountancyCode=Código contable cliente
 SupplierAccountancyCode=Código contable provedor
 CustomerAccountancyCodeShort=Cód. conta cliente
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=¿Está certo de querer eliminar este pagamento
 ExportDataset_tax_1=taxas sociais e fiscais e pagamentos
 CalcModeVATDebt=Modo <b>%sIVE sobre facturas emitidas%s</b>.
 CalcModeVATEngagement=Modo <b>%sIVE sobre facturas cobradas%s</b>.
-CalcModeDebt=Análise de facturas rexistradas incluidas as aínda non contabilizadas no Libro Maior.
+CalcModeDebt=Análise de documentos rexistrados coñecidos aínda que polo de agora non se contabilicen no Libro Maior.
 CalcModeEngagement=Análise dos pagamentos rexistrados, incluidos os aínda non contabilizados no Libro Maior.
 CalcModeBookkeeping=Análise dos datos rexistrados no Libro Maior
 CalcModeLT1= Modo <b>%sRE facturas a clientes - facturas de provedores%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Resumo anual do balance de ingresos e gastos
 AnnualByCompanies=Balance de ingresos e gastos, por grupos de conta predefinidos
 AnnualByCompaniesDueDebtMode=Balance de ingresos e gastos, desglosado por terceiros, en modo<b>%sCréditos-Débedas%s</b> coñecida como <b>contabilidade de compromiso</b>.
 AnnualByCompaniesInputOutputMode=Balance de ingresos e gastos, desglosado por terceiros, en modo <b>%sIngresos-Gastos%s</b> coñecido como <b>contabilidad de caixa</b>.
-SeeReportInInputOutputMode=Consulte %sanálise de pagamentos%s para obter un cálculo dos pagamentos efectuados, incluso se non foron contabilizados no Libro Maior.
-SeeReportInDueDebtMode=Consulte %sanálise de facturas %s para un cálculo baseado en facturas rexistradas coñecidas, incluso se aínda non foron contabilizadas no Libro Maior.
-SeeReportInBookkeepingMode=Consulte el <b>%sInforme de facturación%s</b> para realizar un cálculo na <b>Taboa Libro maior</b>
+SeeReportInInputOutputMode=Vexa  <b> %s  análise do dos pagos %s</b> para un cálculo baseado en <b> pagos rexistrados</b> realizados aínda que non se contabilicen no Libro Maior
+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
@@ -169,37 +169,40 @@ RulesResultBookkeepingPersonalized=Amosa un rexistro no Libro Maior con contas c
 SeePageForSetup=Vexa o menú <a href="%s">%s</a> para configuralo
 DepositsAreNotIncluded=- As facturas de anticipo non están incluidas
 DepositsAreIncluded=- As facturas de anticipo están incluidas
-LT1ReportByCustomers=Informe por terceiro do RE
-LT2ReportByCustomers=Informe por terceiro do IRPF
+LT1ReportByMonth=Taxa 2 informe por mes
+LT2ReportByMonth=Taxa 3 informe por mes
+LT1ReportByCustomers=Informe do imposto 2 RE por terceiro
+LT2ReportByCustomers=Informe do imposto 3 IRPF por terceiro
 LT1ReportByCustomersES=Informe de RE por terceiro
 LT2ReportByCustomersES=Informe de IRPF por terceiro
 VATReport=Informe IVE
 VATReportByPeriods=Informe de IVE por período
+VATReportByMonth=Informe do imposto sobre a venda por mes
 VATReportByRates=Informe de impostos por taxa
 VATReportByThirdParties=Informe de impostos por terceiros
 VATReportByCustomers=Informe IVE por cliente
 VATReportByCustomersInInputOutputMode=Informe por cliente do IVE repercutido e soportado
 VATReportByQuartersInInputOutputMode=Informe por taxa do IVE repercutido e soportado
-LT1ReportByQuarters=Informe de IRPF por taxa
-LT2ReportByQuarters=Informe de IRPF por taxa
+LT1ReportByQuarters=Informe do imposto 2 IRPF por taxa
+LT2ReportByQuarters=Informe do imposto 3 IRPF por taxa
 LT1ReportByQuartersES=Informe de RE por taxa
 LT2ReportByQuartersES=Informe de IRPF por taxa
 SeeVATReportInInputOutputMode=Ver o informe <b>%sIVA pagado%s</b> para un modo de cálculo estandard
 SeeVATReportInDueDebtMode=Ver o informe <b>%sIVA debido%s</b> para un modo de cálculo coa opción sobre o debido
-RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
-RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
-OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
+RulesVATInServices=- Para os servizos, o informe inclúe a normativa do IVE realmente recibida ou emitida en función da data do pagamento.
+RulesVATInProducts=- Para os activos materiais, o informe inclúe o IVE recibido ou emitido en función da data do pagamento.
+RulesVATDueServices=- Para os servizos, o informe inclúe facturas de IVE vencidas, pagadas ou non, en función da data da factura.
+RulesVATDueProducts=- Para os activos materiais, o informe inclúe as facturas do IVE, en función da data da factura.
+OptionVatInfoModuleComptabilite=Nota: para os activos materiais, debe usar a data de entrega para estar máis axustado
 ThisIsAnEstimatedValue=Esta é unha vista previa, basaeda en eventos de negocios e non na taboa de contabilidade final, polo que os resultados finais poden diferir destos valores de vista previa
 PercentOfInvoice=%%/factura
 NotUsedForGoods=Non utilizado para os bens
 ProposalStats=Estatísticas de orzamentos
-OrderStats=Estatísticas de pedidos
+OrderStats=Estatísticas de pedimentos
 InvoiceStats=Estatísticas de facturas
-Dispatch=Desglose
-Dispatched=Contabilizadas
-ToDispatch=A contabilizar
+Dispatch=Enviando
+Dispatched=Enviado
+ToDispatch=A enviar
 ThirdPartyMustBeEditAsCustomer=O terceiro debe estar definido como cliente
 SellsJournal=Diario de vendas
 PurchasesJournal=Diario de compras
@@ -214,35 +217,35 @@ Pcg_subtype=Subtipo de conta
 InvoiceLinesToDispatch=Líñas de facturas a contabilizar
 ByProductsAndServices=Por produtos e servizos
 RefExt=Ref. externa
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
-LinkedOrder=Vincular a pedido
-Mode1=Method 1
-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.
+ToCreateAPredefinedInvoice=Para crear unha factura modelo, cree unha factura estándar e, sen validala, prema nos botóns "%s".
+LinkedOrder=Ligar a pedimento
+Mode1=Método 1
+Mode2=Método 2
+CalculationRuleDesc=Para calcular o IVE total, hai dous métodos: <br> O método 1 é redondear o IVE en cada liña e logo sumalos.<br>  O método 2 suma todos os IVE en cada liña e despois redondea o resultado.<br> O modo predeterminado é o modo <b>%s</b>
+CalculationRuleDescSupplier=Segundo o provedor, escolla o método axeitado para aplicar a mesma regra de cálculo e obter o mesmo resultado esperado polo seu provedor.
+TurnoverPerProductInCommitmentAccountingNotRelevant=O informe do volume de negocio recollido por produto non está dispoñible. Este informe só está dispoñible para o volume de negocio facturado.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=O informe do volume de negocio recadado por tipo de imposto sobre a venda non está dispoñible. Este informe só está dispoñible para o volume de negocio facturado.
 CalculationMode=Modo de cálculo
 AccountancyJournal=Código contable diario
 ACCOUNTING_VAT_SOLD_ACCOUNT=Conta contable por defecto para o IVE de vendas (usado se non é definido no diccionario de IVE)
 ACCOUNTING_VAT_BUY_ACCOUNT=Cuenta contable por defecto para o IVE de compras (usado se non é definido no diccionario de IVE)
 ACCOUNTING_VAT_PAY_ACCOUNT=Código contable por defecto para o pagamento de IVE
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
-ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
-ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
-ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
+ACCOUNTING_ACCOUNT_CUSTOMER=Código contable empregado para terceiros clientes
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=O código contable adicado definido na tarxeta de terceiros usarase só para a contabilidade ddo Sub Libro Maior. Este usarase para o Libro Maior e como valor predeterminado da contabilidade de Sub Libro Maior se non se define unha conta contable de cliente adicada a terceiros.
+ACCOUNTING_ACCOUNT_SUPPLIER=Código contable empregado por terceiros provedores
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=A conta de contabilidade adicada definida na tarxeta de terceiros usarase só para a contabilidade d a conta maior. Esta usarase para o libro maior e como valor predeterminado da contabilidade de maior se non se define unha conta de contas de provedores adicada a terceiros.
 ConfirmCloneTax=Confirmar a clonación dunha taxa social/fiscal
 CloneTaxForNextMonth=Clonarla para o próximo mes
-SimpleReport=informe simple
+SimpleReport=Informe simple
 AddExtraReport=Informes adicionais (engade informe de clientes extranxeiros e locais)
 OtherCountriesCustomersReport=Informe de clientes extranxeiros
-BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
-SameCountryCustomersWithVAT=National customers report
-BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Baseado en que as dúas primeiras letras do número de IVE son diferentes do código de país da súa propia empresa
+SameCountryCustomersWithVAT=Informe de clientes estatais
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Baseado en que as dúas primeiras letras do número de IVE son as mesmas que o código de país da súa propia empresa
 LinkedFichinter=Ligar a unha intervención
 ImportDataset_tax_contrib=Impostos sociais/fiscais
 ImportDataset_tax_vat=Pagamentos IVE
-ErrorBankAccountNotFound=Error: Conta bancaria non atopada
+ErrorBankAccountNotFound=Erro: Conta bancaria non atopada
 FiscalPeriod=Período contable
 ListSocialContributionAssociatedProject=Listaxe de contribucións sociais asociadas ao proxecto
 DeleteFromCat=Eliminar do grupo de contabilidade
@@ -256,12 +259,12 @@ TurnoverbyVatrate=Volume de vendas emitidas por tipo de imposto
 TurnoverCollectedbyVatrate=Volume de vendas cobradas por tipo de imposto
 PurchasebyVatrate=Compra por taxa de impostos
 LabelToShow=Etiqueta curta
-PurchaseTurnover=Purchase turnover
-PurchaseTurnoverCollected=Purchase turnover collected
-RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
-RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
-RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
-ReportPurchaseTurnover=Purchase turnover invoiced
-ReportPurchaseTurnoverCollected=Purchase turnover collected
-IncludeVarpaysInResults = Include various payments in reports
-IncludeLoansInResults = Include loans in reports
+PurchaseTurnover=Volume de compras
+PurchaseTurnoverCollected=Volume de compras recollido
+RulesPurchaseTurnoverDue=- Inclúe as facturas vencidas do provedor se se pagan ou non. <br>- Baséase na data da factura destas facturas<br>
+RulesPurchaseTurnoverIn=- Inclúe todos os pagamentos efectivos das facturas feitos aos provedores<br>- Baséase na data de pagamento destas facturas<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=Inclúe todas as liñas de débito do diario de compras.
+ReportPurchaseTurnover=Volume compras facturadas
+ReportPurchaseTurnoverCollected=Volume de compras abonadas
+IncludeVarpaysInResults = Inclúe varios pagos en informes
+IncludeLoansInResults = Inclúe prestamos en informes
diff --git a/htdocs/langs/gl_ES/contracts.lang b/htdocs/langs/gl_ES/contracts.lang
index 698aa2ad63f..e222030e8ab 100644
--- a/htdocs/langs/gl_ES/contracts.lang
+++ b/htdocs/langs/gl_ES/contracts.lang
@@ -16,7 +16,7 @@ ServiceStatusLateShort=Expirado
 ServiceStatusClosed=Pechado
 ShowContractOfService=Amosar contrato de servizos
 Contracts=Contratos
-ContractsSubscriptions=Contratos/Suscricións
+ContractsSubscriptions=Contratos/Subscricións
 ContractsAndLine=Contratos e liñas de contratos
 Contract=Contrato
 ContractLine=Liña de contrato
@@ -28,7 +28,7 @@ MenuRunningServices=Servizos activos
 MenuExpiredServices=Servizos expirados
 MenuClosedServices=Servizos pechados
 NewContract=Novo contrato
-NewContractSubscription=New contract or subscription
+NewContractSubscription=Novo contrato/subscrición
 AddContract=Crear contrato
 DeleteAContract=Eliminar un contrato
 ActivateAllOnContract=Activar todos os servizos
@@ -49,13 +49,13 @@ ListOfInactiveServices=Listaxe dos servizos inactivos
 ListOfExpiredServices=Listaxe dos servizos activos expirados
 ListOfClosedServices=Listaxe dos servizos pechados
 ListOfRunningServices=Listaxe de servizos activos
-NotActivatedServices=Inactive services (among validated contracts)
+NotActivatedServices=Servizos inactivos (entre contratos validados)
 BoardNotActivatedServices=Servizos a activar entre os contratos validados
 BoardNotActivatedServicesShort=Servizos a activar
 LastContracts=Últimos %s contratos
 LastModifiedServices=Últimos %s servizos modificados
-ContractStartDate=Data de inicio
-ContractEndDate=Data de fin
+ContractStartDate=Data inicio
+ContractEndDate=Data finalización
 DateStartPlanned=Data prevista posta en servizo
 DateStartPlannedShort=Data inicio prevista
 DateEndPlanned=Data prevista fin do servizo
@@ -71,14 +71,14 @@ BoardExpiredServices=Servicios expirados
 BoardExpiredServicesShort=Servizos expirados
 ServiceStatus=Estado do servizo
 DraftContracts=Contratos borrador
-CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
+CloseRefusedBecauseOneServiceActive=O contrato non pode ser pechado, hai polo menos un servizo aberto.
 ActivateAllContracts=Activar todas as liñas do contrato
 CloseAllContracts=Pechar todos as liñas do contrato
 DeleteContractLine=Eliminar liña de contrato
 ConfirmDeleteContractLine=¿Está certo de querer eliminar esta líña do contrato de servizo?
-MoveToAnotherContract=Mover o servizo a outro contrato deste tercero.
-ConfirmMoveToAnotherContract=He elegido el contrato y confirmo el cambio de servizo en el presente contrato.
-ConfirmMoveToAnotherContractQuestion=Elija cualquier otro contrato del mismo tercero, ¿desea mover este servizo?
+MoveToAnotherContract=Mover o servizo a outro contrato deste terceiro.
+ConfirmMoveToAnotherContract=Escollin o contrato e confirmo o cambio de servizo no presente contrato.
+ConfirmMoveToAnotherContractQuestion=Escolla calquera outro contrato do mesmo terceiro, ¿desexa mover este servizo?
 PaymentRenewContractId=Renovación servizo (número %s)
 ExpiredSince=Expirado dende o
 NoExpiredServices=Sen servizos activos expirados
@@ -88,7 +88,7 @@ ListOfServicesToExpire=Listaxe de servizos activos a expirar
 NoteListOfYourExpiredServices=Esta listaxe só contén os servizos de contratos de terceiros dos que vostede é comercial
 StandardContractsTemplate=Modelo de contrato estandar
 ContactNameAndSignature=Para %s, nome e sinatura:
-OnlyLinesWithTypeServiceAreUsed=Solo serán clonadas as liñas dotipo "Servizo"
+OnlyLinesWithTypeServiceAreUsed=Só serán clonadas as liñas do tipo "Servizo"
 ConfirmCloneContract=¿Está certo de querer copiar o contrato <b>%s</b>?
 LowerDateEndPlannedShort=A data de finalización planificada é anterior aos servizos activos
 SendContractRef=Información do contrato __REF__
diff --git a/htdocs/langs/gl_ES/cron.lang b/htdocs/langs/gl_ES/cron.lang
index 1a8a69c0585..b7dafdc697f 100644
--- a/htdocs/langs/gl_ES/cron.lang
+++ b/htdocs/langs/gl_ES/cron.lang
@@ -1,84 +1,91 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Consultar. Traballo programado
-Permission23102 = Crear/actualizar. Traballo programado
-Permission23103 = Borrar. Traballo Programado
-Permission23104 = Executar. Traballo programado
+Permission23101 = Consultar. tarefa programada
+Permission23102 = Crear/actualizar. tarefa programada
+Permission23103 = Borrar tarefa programada
+Permission23104 = Executar tarefa programada
 # Admin
-CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
-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
-CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
-CronJobProfiles=List of predefined cron job profiles
+CronSetup=Configuración da xestión de tarefas programadas
+URLToLaunchCronJobs=URL para comprobar e iniciar tarefas programadas de cron desde un navegador
+OrToLaunchASpecificJob=Ou para comprobar e iniciar unha tarefa específica desde un navegador
+KeyForCronAccess=Chave para a URL para lanzar traballos cron
+FileToLaunchCronJobs=Liña de comandos para comprobar e iniciar tarefas cron 
+CronExplainHowToRunUnix=En entornos Unix debería empregar a seguinte entrada crontab para executar a liña de comandos cada 5 minutos
+CronExplainHowToRunWin=En entorno de Microsoft (tm) Windows pode usar as ferramentas de tarefas programadas para executar a liña de comandos cada 5 minutos
+CronMethodDoesNotExists=A clase %s non contén ningún método %s
+CronMethodNotAllowed=O método %s da clase %s está na listaxe negra de métodos prohibidos
+CronJobDefDesc=Os perfís de tarefas cron defínense no ficheiro descritor do módulo. Cando o módulo está activado, carganse e están dispoñibles para que poida administrar os traballos dende o menú de ferramentas de administración %s.
+CronJobProfiles=Listaxe de perfís de tarefas cron predefinidas
 # Menu
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=Activado e desactivado
 # Page list
-CronLastOutput=Latest run output
-CronLastResult=Latest result code
-CronCommand=Command
+CronLastOutput=Última saída executada
+CronLastResult=Código de resultado máis recente
+CronCommand=Comando
 CronList=Tarefas programadas
-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
+CronDelete=Eliminar tarefas programadas
+CronConfirmDelete=Está certo de querer eliminar esta tarefa programada?
+CronExecute=Iniciar tarefa programada
+CronConfirmExecute=Está certo de querer executar estas tarefas programadas agora?
+CronInfo=O módulo de tarefas programadas permite programar tarefas para executalas automaticamente. As tarefas tamén se poden iniciar manualmente.
+CronTask=Tarefa
 CronNone=Ningún
-CronDtStart=Not before
-CronDtEnd=Not after
-CronDtNextLaunch=Next execution
-CronDtLastLaunch=Start date of latest execution
-CronDtLastResult=End date of latest execution
+CronDtStart=Non antes
+CronDtEnd=Non despois
+CronDtNextLaunch=Próxima execución
+CronDtLastLaunch=Data de inicio da última execución
+CronDtLastResult=Data de finalización da última execución
 CronFrequency=Frecuencia
-CronClass=Class
+CronClass=Clase
 CronMethod=Método
-CronModule=Module
-CronNoJobs=No jobs registered
+CronModule=Módulo
+CronNoJobs=Non hai tarefa rexistrada
 CronPriority=Prioridade
 CronLabel=Etiqueta
-CronNbRun=Number of launches
-CronMaxRun=Maximum number of launches
-CronEach=Every
-JobFinished=Job launched and finished
+CronNbRun=Número de lanzamentos
+CronMaxRun=Número máximo de lanzamentos
+CronEach=Todo
+JobFinished=Tarefa iniciada e finalizada
+Scheduled=Programada
 #Page card
-CronAdd= Add jobs
-CronEvery=Execute job each
-CronObject=Instance/Object to create
+CronAdd= Axuntar tarefas
+CronEvery=Executar cada tarefa
+CronObject=Instancia/obxecto a crear
 CronArgs=Parámetros
-CronSaveSucess=Save successfully
+CronSaveSucess=Gardar correctamente
 CronNote=Comentario
-CronFieldMandatory=Fields %s is mandatory
-CronErrEndDateStartDt=End date cannot be before start date
-StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Activo
+CronFieldMandatory=Os campos %s son obrigados
+CronErrEndDateStartDt=A data de finalización non pode ser anterior á data de inicio
+StatusAtInstall=Estado da instalación do módulo
+CronStatusActiveBtn=Horario 
 CronStatusInactiveBtn=Desactivar
-CronTaskInactive=This job is disabled
-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
+CronTaskInactive=A tarefa está desactivada
+CronId=Id 
+CronClassFile=Nome do ficheiro coa clase
+CronModuleHelp=Nome do directorio do módulo Dolibarr (tamén funciona con módulo Dolibarr externo). <BR> Por exemplo, para chamar ao método fetch do obxecto Dolibarr Product /htdocs/<u>product</u>/class/product.class.php, o valor do módulo é <br><i>product</i>
+CronClassFileHelp=A ruta relativa e o nome do ficheiro a cargar (a ruta é relativa ao directorio raíz do servidor web). <BR> Por exemplo, para chamar ao método de recuperación do obxecto Dolibarr Product htdocs/product/class/<u>product.class.php</u>, o valor do nome do ficheiro de clase é <br><i>product/class/product.class.php</i>
+CronObjectHelp=O nome do obxecto a cargar. <BR>Por exemplo, para chamar ao método de recuperación do obxecto do produto Dolibarr /htdocs/product/class/product.class.php, o valor do nome do ficheiro de clase é <br><i> Product</i>
+CronMethodHelp=O nome do obxecto a lanzar. <BR>Por exemplo, para chamar ao método de recuperación do obxecto do produto Dolibarr /htdocs/product/class/product.class.php, o valor para o método é <br><i>fetch</i>
+CronArgsHelp=Os argumentos do método. <BR> Por exemplo, para chamar ao método de obtención do obxecto do produto Dolibarr /htdocs/product/class/product.class.php, o valor dos parámetros pode ser <br><i>0, ProductRef</i>
+CronCommandHelp=A liña de comandos do sistema para executar
+CronCreateJob=Crear unha nova Tarefa Programada
 CronFrom=De
 # 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
+CronType=Tipo de tarefa
+CronType_method=Método de chamada dunha clase PHP
+CronType_command=Comando Shell
+CronCannotLoadClass=Non se pode cargar o ficheiro de clase %s (para usar a clase %s)
+CronCannotLoadObject=Cargouse o ficheiro de clase %s, pero o obxecto %s non se atopou nel
+UseMenuModuleToolsToAddCronJobs=Vaia ao menú "<a href="%s">Home - Ferramentas de administración - Traballos programados</a>" para ver e editar os traballos programados.
+JobDisabled=Tarefa deshabilitada
+MakeLocalDatabaseDumpShort=Copia local da base de datos
+MakeLocalDatabaseDump=Cree un volcado da base de datos local. Os parámetros son: compresión ('gz' ou 'bz' ou 'none'), tipo de copia de seguridade ('mysql', 'pgsql', 'auto'), 1, 'auto' ou nome de ficheiro para construír, número de ficheiros de copia de seguridade que gardar
+WarningCronDelayed=Atención, para fins de rendemento, calquera que sexa a próxima data de execución das tarefas habilitadas, é posible que as súas tarefas se retrasen ata un máximo de %s horas antes de executalos.
+DATAPOLICYJob=Limpar datos e anonimizar
+JobXMustBeEnabled=Tarefa %s debe ser activada
+# Cron Boxes
+LastExecutedScheduledJob=Última tarefa programad executada
+NextScheduledJobExecute=Próxima tarefa programada para executar
+NumberScheduledJobError=Número de tarefas programadas por erro
diff --git a/htdocs/langs/gl_ES/deliveries.lang b/htdocs/langs/gl_ES/deliveries.lang
index b7e846dd4c6..49996ef672a 100644
--- a/htdocs/langs/gl_ES/deliveries.lang
+++ b/htdocs/langs/gl_ES/deliveries.lang
@@ -27,5 +27,6 @@ Recipient=Destinatario
 ErrorStockIsNotEnough=Non hai suficiente stock
 Shippable=Enviable
 NonShippable=Non enviable
+ShowShippableStatus=Amosar estado de envío
 ShowReceiving=Mostrar nota de recepción
-NonExistentOrder=Pedido inexistente
+NonExistentOrder=Pedimento inexistente
diff --git a/htdocs/langs/gl_ES/donations.lang b/htdocs/langs/gl_ES/donations.lang
index c6aedceba3e..fd3cc0dbfdd 100644
--- a/htdocs/langs/gl_ES/donations.lang
+++ b/htdocs/langs/gl_ES/donations.lang
@@ -9,8 +9,8 @@ DeleteADonation=Eliminar unha doación/subvención
 ConfirmDeleteADonation=¿Esta certo de querer eliminar esta doación/subvención?
 PublicDonation=Doación/Subvención Pública
 DonationsArea=Área de doacións/subvencións
-DonationStatusPromiseNotValidated=Promesa non validada
-DonationStatusPromiseValidated=Promesa validada
+DonationStatusPromiseNotValidated=Doación/Subvención non validada
+DonationStatusPromiseValidated=Doación/Subvención validada
 DonationStatusPaid=Doación/Subvención pagada
 DonationStatusPromiseNotValidatedShort=Non validada
 DonationStatusPromiseValidatedShort=Validada
@@ -18,7 +18,7 @@ DonationStatusPaidShort=Pagada
 DonationTitle=Recibo de doación/subvención
 DonationDate=Data de doación/subvención
 DonationDatePayment=Data de pago
-ValidPromess=Validar promesa
+ValidPromess=Validar doación/subvención
 DonationReceipt=Recibo de doación/subvención
 DonationsModels=Modelo de documento de recepción de doación/subvención
 LastModifiedDonations=Últimas %s doacións modificadas
diff --git a/htdocs/langs/gl_ES/ecm.lang b/htdocs/langs/gl_ES/ecm.lang
index ac1f38369d5..eb6c9efa259 100644
--- a/htdocs/langs/gl_ES/ecm.lang
+++ b/htdocs/langs/gl_ES/ecm.lang
@@ -15,7 +15,7 @@ ECMNbOfSubDir=Número de sub-directories
 ECMNbOfFilesInSubDir=Número de ficheiros en sub-directories
 ECMCreationUser=Creador
 ECMArea=Área MS/ECM
-ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMAreaDesc=O área DMS / ECM (Document Management System / Electronic Content Management) permítelle gardar, compartir e buscar rapidamente todo tipo de documentos en Dolibarr.
 ECMAreaDesc2=Pode crear directorios manuais e axuntar os documentos<br>Os directorios automáticos son cobertos automáticamente ao engadir un documento nunha ficha.
 ECMSectionWasRemoved=O directorio <b>%s</b> foi eliminado
 ECMSectionWasCreated=O directorio <b> %s </b> foi creado.
@@ -23,7 +23,7 @@ ECMSearchByKeywords=Buscar por palabras clave
 ECMSearchByEntity=Buscar por obxecto
 ECMSectionOfDocuments=Directorios de documentos
 ECMTypeAuto=Automático
-ECMDocsBy=Documents linked to %s
+ECMDocsBy=Documentos ligados a %s
 ECMNoDirectoryYet=Non foi creado o directorio
 ShowECMSection=Amosar directorio
 DeleteSection=Eliminación directorio
@@ -38,6 +38,6 @@ ReSyncListOfDir=Resincronizar a listaxe de directorios
 HashOfFileContent=Hash do contido do ficheiro
 NoDirectoriesFound=Non foron atopados directorios
 FileNotYetIndexedInDatabase=Ficheiro aínda non indexado na base de datos (tente voltar cargalo)
-ExtraFieldsEcmFiles=Extrafields Ecm Files
-ExtraFieldsEcmDirectories=Extrafields Ecm Directories
-ECMSetup=ECM Setup
+ExtraFieldsEcmFiles=Extrafields en ficheiros ECM
+ExtraFieldsEcmDirectories=Extrafields en directorios ECM
+ECMSetup=Configuración ECM
diff --git a/htdocs/langs/gl_ES/errors.lang b/htdocs/langs/gl_ES/errors.lang
index 893f4a35b65..4e0a15fee05 100644
--- a/htdocs/langs/gl_ES/errors.lang
+++ b/htdocs/langs/gl_ES/errors.lang
@@ -1,272 +1,289 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=No error, we commit
+NoErrorCommitIsDone=Sen erro,  é válido
 # Errors
-ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is wrong
-ErrorBadUrl=Url %s is wrong
-ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
-ErrorLoginAlreadyExists=Login %s already exists.
-ErrorGroupAlreadyExists=Group %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 were not filled.
-ErrorSubjectIsRequired=The email topic 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
-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.
-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=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
-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. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
-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 virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
-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.
-ErrorURLMustStartWithHttp=URL %s must 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>
+ErrorButCommitIsDone=Atopáronse erros pero validamos a pesar diso
+ErrorBadEMail=Correo electrónico %s incorrecto
+ErrorBadMXDomain=Correo electrónico %s parece incorrecto (o dominio non ten un rexistro MX válido)
+ErrorBadUrl=Url %s incorrecta
+ErrorBadValueForParamNotAString=Valor incorrecto para o seu parámetro. Xeralmente aparece cando falta a tradución
+ErrorRefAlreadyExists=A referencia <b>%s</b> xa existe
+ErrorLoginAlreadyExists=O login %s xa existe.
+ErrorGroupAlreadyExists=O grupo %s xa existe.
+ErrorRecordNotFound=Rexistro non atopado
+ErrorFailToCopyFile=Erro ao copiar o ficheiro '<b>%s</b>' en '<b>%s</b>'.
+ErrorFailToCopyDir=Erro ao copiar o directorio '<b>%s</b>' en '<b>%s</b>'.
+ErrorFailToRenameFile=Erro ao renomear o ficheiro '<b>%s</b>' a '<b>%s</b>'.
+ErrorFailToDeleteFile=Erro ao eliminar o ficheiro '<b>%s</b>'.
+ErrorFailToCreateFile=Erro ao crear o ficheiro '<b>%s</b>'
+ErrorFailToRenameDir=Erro ao renomear o directorio '<b>%s</b>' a '<b>%s</b>'.
+ErrorFailToCreateDir=Erro ao crear o directorio '<b>%s</b>'
+ErrorFailToDeleteDir=Erro a eliminar o directorio '<b>%s</b>'.
+ErrorFailToMakeReplacementInto=Erro ao facer a substitución no ficheiro '<b>%s</b>'.
+ErrorFailToGenerateFile=Erro ao xerar o ficheiro '<b>%s</b>'.
+ErrorThisContactIsAlreadyDefinedAsThisType=Este contacto xa está definido como contacto para este tipo.
+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
+ErrorProdIdIsMandatory=O %s é obrigado
+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
+ErrorBarCodeRequired=Código de barras obrigado
+ErrorCustomerCodeAlreadyUsed=Código de cliente xa utilizado
+ErrorBarCodeAlreadyUsed=Código de barras xa utilizado
+ErrorPrefixRequired=Prefixo obrigado
+ErrorBadSupplierCodeSyntax=A sintaxe do código proveedor é incorrecta
+ErrorSupplierCodeRequired=Código proveedor obrigado
+ErrorSupplierCodeAlreadyUsed=Código de proveedor xa utilizado
+ErrorBadParameters=Parámetros incorrectos
+ErrorWrongParameters=Parámetros incorrectos
+ErrorBadValueForParameter=valor '%s' incorrecto para o parámetro '%s'
+ErrorBadImageFormat=O ficheiro de imaxe non ten un formato compatible (o seu PHP non admite funcións para converter imaxes deste formato)
+ErrorBadDateFormat=O valor '%s' ten un formato de data erroneo
+ErrorWrongDate=A data non correcta!
+ErrorFailedToWriteInDir=Erro ao escribir no directorio %s
+ErrorFoundBadEmailInFile=Atopouse unha sintaxe de correo electrónico incorrecta para % s liñas no ficheiro (exemplo liña %s con correo electrónico=%s)
+ErrorUserCannotBeDelete=Non pode eliminarse o usuario. É posible que esté asociado a entidades do Dolibarr
+ErrorFieldsRequired=Non se completaron algúns campos obrigatorios
+ErrorSubjectIsRequired=O asunto do correo electrónico é  obligatorio
+ErrorFailedToCreateDir=Fallou a creación dun directorio. Comprobe que o usuario do servidor web ten permisos para escribir no directorio de documentos Dolibarr. Se o parámetro <b>safe_mode</b> está activado neste PHP, comprobe que os ficheiros php Dolibarr son propiedade do usuario (ou grupo) do servidor web.
+ErrorNoMailDefinedForThisUser=Non existe enderezo de correo electrónico asignado a este usuario
+ErrorSetupOfEmailsNotComplete=A configuración do correo electrónico non está rematada
+ErrorFeatureNeedJavascript=Esta característica precisa que javascript estexa activado para funcionar. Cambie isto na configuración-visualización.
+ErrorTopMenuMustHaveAParentWithId0=Un menú do tipo "Arriba" non pode ter un menú principal. Poña 0 no menú principal ou escolla un menú do tipo "Esquerda".
+ErrorLeftMenuMustHaveAParentId=Un menú de tipo "esquerda" debe ter un identificador principal.
+ErrorFileNotFound=Non se atopou o ficheiro <b>%s</b> (ruta incorrecta, permisos incorrectos ou acceso denegado polo PHP openbasedir ou parámetro safe_mode)
+ErrorDirNotFound=Non se atopou o directorio <b>%s</b> (camiño incorrecto, permisos incorrectos ou acceso denegado polo PHP openbasedir ou parámetro safe_mode)
+ErrorFunctionNotAvailableInPHP=A función <b>%s</b> é precisa para esta característica pero non está dispoñible nesta versión/configuración de PHP.
+ErrorDirAlreadyExists=Xa existe un directorio con este nome.
+ErrorFileAlreadyExists=Xa existe un ficheiro con este nome.
+ErrorPartialFile=Ficheiro non recibido completamente polo servidor.
+ErrorNoTmpDir=Non existe o directorio temporal %s.
+ErrorUploadBlockedByAddon=Subida bloqueada por un plugin PHP/Apache.
+ErrorFileSizeTooLarge=O tamaño do ficheiro é grande de mais.
+ErrorFieldTooLong=Campo %s e longo de mais.
+ErrorSizeTooLongForIntType=Tamaño demasiado longo para o tipo int (máximo %s caracteres)
+ErrorSizeTooLongForVarcharType=Tamaño demasiado longo para o tipo de cadea (máximo %s caracteres)
+ErrorNoValueForSelectType=Pregase complete o valor da listaxe de selección
+ErrorNoValueForCheckBoxType=Pregase complete o valor da listaxe de caixa de verificación
+ErrorNoValueForRadioType=Pregase complete o valor da listaxe de radios
+ErrorBadFormatValueList=O valor da listaxe non pode ter máis dunha coma: <u>%s</u>, pero precisa polo menos unha: chave, valor
+ErrorFieldCanNotContainSpecialCharacters=O campo <b>%s</b> non debe conter caracteres especiais.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=O campo <b>%s</b> non debe conter caracteres especiais nin caracteres en maiúsculas e non pode conter só números.
+ErrorFieldMustHaveXChar=O campo <b>%s</b> debe ter polo menos %s caracteres.
+ErrorNoAccountancyModuleLoaded=Non hai ningún módulo de contabilidade activado
+ErrorExportDuplicateProfil=Este nome de perfil xa existe para este conxunto de exportacións.
+ErrorLDAPSetupNotComplete=A concordancia Dolibarr-LDAP non está completada.
+ErrorLDAPMakeManualTest=Xerouse un ficheiro .ldif no directorio %s. Tente cargalo manualmente desde a liña de comandos para ter máis información sobre erros.
+ErrorCantSaveADoneUserWithZeroPercentage=Non se pode gardar unha acción con "estado non iniciado" se o campo "feito por" tamén está cuberto.
+ErrorRefAlreadyExists=A referencia <b>%s</b> xa existe
+ErrorPleaseTypeBankTransactionReportName=Introduza o nome do extracto bancario onde se debe informar da entrada (Formato AAAAMM ou AAAAMMDD)
+ErrorRecordHasChildren=Erro ao eliminar o rexistro xa que ten algúns rexistros fillos.
+ErrorRecordHasAtLeastOneChildOfType=O obxecto ten polo menos un fillo do tipo %s
+ErrorRecordIsUsedCantDelete=Non se pode eliminar o rexistro. Xa se usa ou está incluído noutro obxecto.
+ErrorModuleRequireJavascript=Non se debe desactivar Javascript para que esta función sexa operativa. Para activar/desactivar Javascript, vaia ao menú Inicio->Configuración->Amosar.
+ErrorPasswordsMustMatch=Os dous contrasinais escritos deben coincidir entre si
+ErrorContactEMail=Produciuse un erro técnico. Póñase en contacto co administrador no seguinte correo electrónico <b>%s</b> e proporcione o código de erro <b>%s</b> na súa mensaxe ou engada unha copia desta páxina.
+ErrorWrongValueForField=O campo <b>%s</b>:'<b>%s</b>' non coincide coa regra  <b>%s</b>
+ErrorFieldValueNotIn=Campo <b>%s</b>:'<b>%s</b>' non é un valor atopado no campo <b>%s</b> de <b>%s</ b >
+ErrorFieldRefNotIn=Campo <b>%s</b>:'<b>%s</b>' non é unha referencia <b>%s</b> existente
+ErrorsOnXLines=Atopáronse %s erros
+ErrorFileIsInfectedWithAVirus=O programa antivirus non puido validar o ficheiro (o ficheiro pode estar infectado por un virus)
+ErrorSpecialCharNotAllowedForField=Non se permiten caracteres especiais para o campo %s
+ErrorNumRefModel=Existe unha referencia na base de datos (%s) e non é compatible con esta regra de numeración. Elimine o rexistro ou renomee a referencia para activar este módulo.
+ErrorQtyTooLowForThisSupplier=Cantidad insuficiente para este proveedor o no hay precio definido en este producto para este proveedor
+ErrorOrdersNotCreatedQtyTooLow=Algunos pedidos no se han creado debido a una cantidad demasiado baja
+ErrorModuleSetupNotComplete=La configuración del módulo parece incompleta. Vaya a Inicio - Configuración - Módulos para completarla.
+ErrorBadMask=Erro na máscara
+ErrorBadMaskFailedToLocatePosOfSequence=Erro, máscara sen número de secuencia
+ErrorBadMaskBadRazMonth=Erro, valor de restablecemento incorrecto
+ErrorMaxNumberReachForThisMask=Número máximo alcanzado para esta máscara
+ErrorCounterMustHaveMoreThan3Digits=O contador debe ter mais de 3 díxitos
+ErrorSelectAtLeastOne=Erro. seleccione polo menos unha entrada.
+ErrorDeleteNotPossibleLineIsConsolidated=Non é posible eliminar porque o rexistro está ligado a unha transacción bancaria conciliada
+ErrorProdIdAlreadyExist=%s está asignado a outro terceiro
+ErrorFailedToSendPassword=Erro ao enviar o contrasinal
+ErrorFailedToLoadRSSFile=Non alcanza a fonte RSS. Tente engadir a constante MAIN_SIMPLEXMLLOAD_DEBUG se as mensaxes de erro non proporcionan información suficiente.
+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 ...).
+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
+ErrorCantReadFile=Erro de lectura do ficheiro '%s'
+ErrorCantReadDir=Error de lectura do directorio '%s'
+ErrorBadLoginPassword=Valor incorrecto para o inicio de sesión ou o contrasinals
+ErrorLoginDisabled=A súa conta foi descativada
+ErrorFailedToRunExternalCommand=Non se puido executar o comando externo. Comprobe que está dispoñible e executable polo seu servidor PHP. Se PHP <b> Modo seguro</b>1 está habilitado, comprobe que o comando está dentro dun directorio definido polo parámetro <b>safe_mode_exec_dir</b>.
+ErrorFailedToChangePassword=Erro ao cambiar o contrasinal
+ErrorLoginDoesNotExists=Non foi posible atopar o usuario con inicio de sesión <b>%s</b>.
+ErrorLoginHasNoEmail=Este usuario non ten enderezo de correo electrónico. Proceso abortado.
+ErrorBadValueForCode=Valor incorrecto para o código de seguridade. Tenteo novamente cun novo valor ...
+ErrorBothFieldCantBeNegative=Os campos %s e %s non poen ser negativos
+ErrorFieldCantBeNegativeOnInvoice=O campo <strong>%s</strong> non pode ser negativo neste tipo de factura. Se precisa engadir unha liña de desconto, primeiro cree o desconto (a partir do campo '%s' na tarxeta de terceiros) e aplíqueo á factura.
+ErrorLinesCantBeNegativeForOneVATRate=O total de liñas (neto de impostos) non pode ser negativo para unha determinada taxa de IVE non nula (Atopouse un total negativo para o tipo de IVE <b>%s</b>%%)
+ErrorLinesCantBeNegativeOnDeposits=As liñas non poden ser negativas nun depósito. Terá problemas cando precise consumir o depósito na factura final se o fai.
+ErrorQtyForCustomerInvoiceCantBeNegative=A cantidade da liña para as facturas do cliente non pode ser negativa
+ErrorWebServerUserHasNotPermission=A conta de usuario <b>%s </b>usada para executar o servidor web non ten permiso para iso
+ErrorNoActivatedBarcode=Non hai ningún tipo de código de barras activado
+ErrUnzipFails=Fallou ao descomprimir% s con ZipArchive
+ErrNoZipEngine=Non hai motor neste PHP para comprimir/descomprimir o ficheiro %s
+ErrorFileMustBeADolibarrPackage=O ficheiro %s debe ser un paquete zip Dolibarr
+ErrorModuleFileRequired=Debe seleccionar un ficheiro de paquete do módulo Dolibarr
+ErrorPhpCurlNotInstalled=O PHP CURL non está instalado, isto é esencial para comunicarse con Paypal
+ErrorFailedToAddToMailmanList=Erro ao engadir o rexistro %s á listaxe de Mailman %s ou á base de SPIP
+ErrorFailedToRemoveToMailmanList=Erro ao eliminar o rexistro %s da listaxe de Mailman %s ou a base de SPIP
+ErrorNewValueCantMatchOldValue=O novo valor non pode ser igual ao anterior
+ErrorFailedToValidatePasswordReset=Non se puido resetear o contrasinal. Pode que o reseteo xa este feito (esta ligazón só se pode usar unha vez). Se non, tente reiniciar o proceso de reseteo.
+ErrorToConnectToMysqlCheckInstance=Falla a conexión á base de datos. Comprobe que o servidor de base de datos está en execución (por exemplo, con mysql/mariadb, pode lanzalo desde a liña de comandos con 'sudo service mysql start').
+ErrorFailedToAddContact=Erro ao engadir o contacto
+ErrorDateMustBeBeforeToday=A data debe ser inferior á de hoxe
+ErrorDateMustBeInFuture=A data debe ser maior que a de hoxe
+ErrorPaymentModeDefinedToWithoutSetup=Estableceuse un modo de pago para escribir %s pero a configuración da factura do módulo non se completou para definir a información que se amosará para este modo de pago.
+ErrorPHPNeedModule=Erro, o seu PHP debe ter instalado o módulo <b>%s</b> para usar esta funcionalidade.
+ErrorOpenIDSetupNotComplete=Estableceu a configuración do ficheiro Dolibarr para permitir a autenticación OpenID, pero a URL do servizo OpenID non está definida na constante %s
+ErrorWarehouseMustDiffers=O almacén de orixe e destino deben de ser diferentes
+ErrorBadFormat=O formato contén erros!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Erro, este membro aínda non está ligado a ningún terceiro. Ligue o membro a un terceiro existente ou cree un novo terceiro antes de crear a subscrición con factura.
+ErrorThereIsSomeDeliveries=Erro, hai algunhas entregas ligadas a este envío. Rexeitouse a eliminación.
+ErrorCantDeletePaymentReconciliated=Non se pode eliminar un pago que xerou unha entrada bancaria conciliada
+ErrorCantDeletePaymentSharedWithPayedInvoice=Non se pode eliminar un pago compartido polo menos por unha factura co estado Pagado
+ErrorPriceExpression1=Non se pode asignar á constante '%s'
+ErrorPriceExpression2=Non se pode redefinir a función incorporada '%s'
+ErrorPriceExpression3=Variable "%s" sen definir na definición da función
+ErrorPriceExpression4=Carácter ilegal '%s'
+ErrorPriceExpression5='%s' inesperado
+ErrorPriceExpression6=Número incorrecto de argumentos (indicáronse %s, agardábase %s)
+ErrorPriceExpression8=Operador inesperado '%s'
+ErrorPriceExpression9=Ocorreu un erro inesperado
+ErrorPriceExpression10=O operador '%s' carece de operando
+ErrorPriceExpression11=Agardando '%s'
+ErrorPriceExpression14=División por cero
+ErrorPriceExpression17=Variable '%s' sen definir
+ErrorPriceExpression19=Non se atopou a expresión
+ErrorPriceExpression20=Expresión baleira
+ErrorPriceExpression21=Resultado baleiro '%s'
+ErrorPriceExpression22=Resultado negativo '%s'
+ErrorPriceExpression23=Variable descoñecida ou non definida '%s' en %s
+ErrorPriceExpression24=A variable '%s' existe pero non ten valor
+ErrorPriceExpressionInternal=Erro interno '%s'
+ErrorPriceExpressionUnknown=Erro descoñecido '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=Os almacéns de orixe e destino deben ser diferentes
+ErrorTryToMakeMoveOnProductRequiringBatchData=Erro ao tentar facer un movemento de stock sen información de lote/serie, no produto '%s' que requiría información de lote/serie
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Todas as recepcións rexistradas deben ser verificadas (aprobadas ou denegadas) antes de que se lle permita facer esta acción
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Todas as recepcións rexistradas deben verificarse (aprobarse) antes de que se lle permita facer esta acción
+ErrorGlobalVariableUpdater0=Petición HTTP request falla co erro '%s'
+ErrorGlobalVariableUpdater1=Formato JSON '%s' non válido
+ErrorGlobalVariableUpdater2=Falta o parámetro '%s'
+ErrorGlobalVariableUpdater3=Non se atoparon os datos solicitados no resultado
+ErrorGlobalVariableUpdater4=Fallou o cliente SOAP co erro '%s'
+ErrorGlobalVariableUpdater5=Non se seleccionou ningunha variable global
+ErrorFieldMustBeANumeric=O campo <b>%s</b> debe ser un valor numérico
+ErrorMandatoryParametersNotProvided=Non se proporcionan parámetro(s) obrigatorios
+ErrorOppStatusRequiredIfAmount=Establecerá unha cantidade estimada para este cliente potencial. Entón tamén debe introducir o seu estado.
+ErrorFailedToLoadModuleDescriptorForXXX=Erro ao cargar a clase do descritor do módulo para %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Mala definición do Menu Array na descrición do módulo (valor incorrecto para a chave fk_menu)
+ErrorSavingChanges=Produciuse un erro ao gardar os cambios
+ErrorWarehouseRequiredIntoShipmentLine=Requírese un almacén na liña para enviar
+ErrorFileMustHaveFormat=O ficheiro debe ter o formato %s
+ErrorFilenameCantStartWithDot=O nome do ficheiro non pode comezar cun "."
+ErrorSupplierCountryIsNotDefined=O país deste provedor non está definido, corrixao na súa
+ErrorsThirdpartyMerge=Non se puideron combinar os dous rexistros. Solicitude cancelada.
+ErrorStockIsNotEnoughToAddProductOnOrder=Non hai suficiente stock de produto %s para engadilo a un novo pedido.
+ErrorStockIsNotEnoughToAddProductOnInvoice=Non hai suficiente stock de produto %s para engadilo a unha nova factura.
+ErrorStockIsNotEnoughToAddProductOnShipment=Non hai suficiente stock de produto %s para engadilo a un novo envío.
+ErrorStockIsNotEnoughToAddProductOnProposal=Non hai suficiente stock de produto %s para engadilo a unha nova cotización.
+ErrorFailedToLoadLoginFileForMode=Erro ao obter a clave de acceso para o modo '%s'.
+ErrorModuleNotFound=Non se atopou o ficheiro do módulo.
+ErrorFieldAccountNotDefinedForBankLine=Valor da conta maior non indicado para a liña de orixe% s (% s)
+ErrorFieldAccountNotDefinedForInvoiceLine=O valor da conta do libro maior non indicado para o identificador de factura% s (% s)
+ErrorFieldAccountNotDefinedForLine=Valor para a conta do libro maior non indicado para a liña (% s)
+ErrorBankStatementNameMustFollowRegex=Erro, o nome do estado da conta bancaria debe seguir a seguinte regra de sintaxe% s
+ErrorPhpMailDelivery=Comprobe que non usa un número elevado de destinatarios e que o seu contido de correo electrónico non é similar ao spam. Pídelle tamén ao seu administrador que comprobe os ficheiros do firewall e os rexistros do servidor para obter información máis completa.
+ErrorUserNotAssignedToTask=O usuario debe ser asignado á tarefa para poder ingresar o tempo consumido.
+ErrorTaskAlreadyAssigned=Tarefa xa asignada ao usuario
+ErrorModuleFileSeemsToHaveAWrongFormat=O paquete do módulo parece ter un formato incorrecto.
+ErrorModuleFileSeemsToHaveAWrongFormat2=Debe existir polo menos un directorio obrigatorio no zip do módulo: <strong>%s</strong> ou <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=O nome do paquete do módulo (<strong>%s</strong>) non coincide coa sintaxe do nome agardada: <strong>%s</strong>
+ErrorDuplicateTrigger=Erro, nome de triggerr duplicado %s. Xa se cargou desde% s.
+ErrorNoWarehouseDefined=Erro, sen almacéns definidos.
+ErrorBadLinkSourceSetButBadValueForRef=A ligazón que usa non é válida. Defínese unha "fonte" para o pago, pero o valor para "ref" non é válido.
+ErrorTooManyErrorsProcessStopped=Demasiados erros. O proceso detívose.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=A validación masiva non é posible cando se establece a opción de aumentar/diminuír o stock nesta acción (debe validalo un por un para que poida definir o almacén para aumentar/diminuír)
+ErrorObjectMustHaveStatusDraftToBeValidated=O obxecto %s debe ter o estado 'Borrador' para ser validado.
+ErrorObjectMustHaveLinesToBeValidated=O obxecto %s debe ter liñas para ser validado.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Só se poden enviar facturas validadas mediante a acción masiva "Enviar por correo electrónico".
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=Debe escoller se o artigo é un produto predefinido ou non
+ErrorDiscountLargerThanRemainToPaySplitItBefore=O desconto que intenta aplicar é maior do que queda para pagar. Dividir o desconto en 2 descontos menores antes.
+ErrorFileNotFoundWithSharedLink=Non se atopou o ficheiro. Pode ser que se modificara a chave para compartir ou que se eliminou o ficheiro recentemente.
+ErrorProductBarCodeAlreadyExists=O código de barras do produto %s xa existe noutra referencia de produto.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Teña conta tamén que o uso de kits para aumentar / diminuír automaticamente os subprodutos non é posible cando polo menos un subproduto (ou subproduto de subprodutos) precisa un número de serie / lote.
+ErrorDescRequiredForFreeProductLines=A descrición é obrigada para as liñas con produto gratuíto
+ErrorAPageWithThisNameOrAliasAlreadyExists=A páxina/contedor <strong>%s</strong> ten o mesmo nome ou alias alternativo que o que intenta empregar
+ErrorDuringChartLoad=Erro ao cargar o plan de contabilidade. Se non se cargaron algunhas contas, aínda pode introducilas manualmente.
+ErrorBadSyntaxForParamKeyForContent=Sintaxe incorrecta para o parémetro keyforcontent. Debe ter un valor que comece por %s ou %s
+ErrorVariableKeyForContentMustBeSet=Erro, debe establecerse a constante co nome %s (con contido de texto para amosar) ou %s (con URL externo para amosar).
+ErrorURLMustStartWithHttp=O URL %s debe comezar con http:// ou https://
+ErrorNewRefIsAlreadyUsed=Erro, a nova referencia xa está empregada
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Erro, non é posible eliminar o pago ligado a unha factura pechada.
+ErrorSearchCriteriaTooSmall=Os criterios de busca son demasiado pequenos.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Os obxectos deben ter o estado "Activo" para ser desactivados
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Os obxectos deben ter o estado "Borrador" ou "Desactivado" para ser habilitados
+ErrorNoFieldWithAttributeShowoncombobox=Ningún campo ten a propiedade 'showoncombobox' na definición do obxecto '%s'. Non hai forma de amosar a listaxe combo.
+ErrorFieldRequiredForProduct=O campo '%s' é obrigado para o produto %s
+ProblemIsInSetupOfTerminal=O problema está na configuración do terminal %s.
+ErrorAddAtLeastOneLineFirst=Engada polo menos unha liña primeiro
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Erro, o rexistro xa se transferiu á contabilidade, non se pode eliminar.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Erro, o idioma é obrigatorio se configura a páxina como tradución doutra.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Erro, o idioma da páxina traducida é o mesmo que este.
+ErrorBatchNoFoundForProductInWarehouse=Non se atopou ningún lote/serie para o produto "%s" no almacén "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Non hai cantidade suficiente para este lote/serie do produto "%s" no almacén "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=Só é posible un campo para "Agrupar por" (descártanse outros)
+ErrorTooManyDifferentValueForSelectedGroupBy=Atopouse demasiado valor diferente (máis de <b>%s </b>) para o campo "<b>%s</b>", polo que non podemos usalo como "Agrupar por" para gráficos. Eliminouse o campo "Agrupar por". ¿Quería usalo como eixo X?
+ErrorReplaceStringEmpty=Erro, a cadea para substituír está baleira
+ErrorProductNeedBatchNumber=Erro, o produto '<b>%s</b>' precisa un número de lote/serie
+ErrorProductDoesNotNeedBatchNumber=Erro, o produto '<b>%s</b>' non acepta número de lote/serie
+ErrorFailedToReadObject=Erro, falla o ler o tipo de obxecto <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Erro, o parámetro <b>%s</b>1debe estar habilitado en <b>conf/conf.php<b> para permitir o uso da interface de liña de comandos polo programador de traballo interno.
+ErrorLoginDateValidity=Erro, este inicio de sesión está fóra do intervalo de datas validas
+ErrorValueLength=A lonxitude do campo "<b>%s</b>" debe ser superior a "<b>%s</b>"
+ErrorReservedKeyword=A palabra '<b>%s</b>' é unha palabra chave reservada
+ErrorNotAvailableWithThisDistribution=Non dispoñible con esta distribución
+ErrorPublicInterfaceNotEnabled=Inf¡terfaz público non activada
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=O idioma da nova páxina debe definirse se se define como tradución doutra páxina
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=O idioma da nova páxina non debe ser o idioma de orixe se se define como tradución doutra páxina
+ErrorAParameterIsRequiredForThisOperation=É obrigado un parámetro para esta operación
+
 # 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
-WarningProjectClosed=Project is closed. You must re-open it first.
-WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=O seu parámetro PHP upload_max_filesize (%s) é superior ao parámetro PHP post_max_size (%s). Esta non é unha configuración consistente.
+WarningPasswordSetWithNoAccount=Estableceuse un contrasinal para este membro. En calquera caso, non se creou ningunha conta de usuario. Polo tanto, este contrasinal está almacenado pero non se pode usar para iniciar sesión en Dolibarr. Pode ser usado por un módulo/interface externo, pero se non precisa definir ningún login ou contrasinal para un membro, pode desactivar a opción "Xestionar un inicio de sesión para cada membro" desde a configuración do módulo Membros. Se precisa xestionar un inicio de sesión pero non precisa ningún contrasinal, pode manter este campo baleiro para evitar este aviso. Nota: o correo electrónico tamén pode ser usado como inicio de sesión se o membro está ligado a un usuario.
+WarningMandatorySetupNotComplete=Faga clic aquí para configurar os parámetros obrigatorios
+WarningEnableYourModulesApplications=Faga clic aquí para habilitar os seus módulos e aplicacións
+WarningSafeModeOnCheckExecDir=Aviso, a opción PHP <b>safe_mode</b> está activada polo que o comando debe almacenarse dentro dun directorio declarado polo parámetro php <b>safe_mode_exec_dir</b>.
+WarningBookmarkAlreadyExists=Xa existe un marcador con este título ou este destino (URL).
+WarningPassIsEmpty=Aviso, o contrasinal da base de datos está baleiro. Este é un burato de seguridade. Debería engadir un contrasinal á súa base de datos e cambiar o ficheiro conf.php para reflectilo.
+WarningConfFileMustBeReadOnly=Aviso, o seu ficheiro de configuración (<b>htdocs/conf/conf.php</b>) pode ser sobrescrito polo servidor web. Este é un grave burato de seguridade. Modifique os permisos do ficheiro para que estexan en modo de só lectura para o usuario do sistema operativo usado polo servidor web. Se usa o formato Windows e FAT para o seu disco, debe saber que este sistema de ficheiros non permite engadir permisos no ficheiro, polo que non pode ser completamente seguro.
+WarningsOnXLines=Avisos nos rexistro(s) fonte <b>%s</b>
+WarningNoDocumentModelActivated=Non se activou ningún modelo para a xeración de documentos. Escollerase un modelo por defecto ata que comprobe a configuración do seu módulo.
+WarningLockFileDoesNotExists=Aviso, unha vez rematada a configuración, debe desactivar as ferramentas de instalación/migración engadindo un ficheiro <b>install.lock</b> ao directorio <b>%s</b>2. Omitir a creación deste ficheiro é un grave risco de seguridade.
+WarningUntilDirRemoved=Todos os avisos de seguridade (visibles só polos administradores) permanecerán activos mentres a vulnerabilidade estexa presente (ou se engada esa constante MAIN_REMOVE_INSTALL_WARNING en Configuración-> Outra configuración).
+WarningCloseAlways=Aviso, o peche faise aínda que a cantidade difire entre os elementos de orixe e de destino. Active esta función con precaución.
+WarningUsingThisBoxSlowDown=Aviso, usando este panel ralentiza seriamente todas as páxinas que amosan o panel.
+WarningClickToDialUserSetupNotComplete=A configuración da información ClickToDial para o seu usuario non está completa (consulte a lapela ClickToDial na súa tarxeta de usuario).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Función desactivada cando a configuración da pantalla está optimizada para navegadores de texto ou persoas cegas.
+WarningPaymentDateLowerThanInvoiceDate=A data de pagamento (%s) é anterior á data da factura (%s) para a factura %s.
+WarningTooManyDataPleaseUseMoreFilters=Datos de mais (máis de %s liñas). Utilice máis filtros ou estableza a constante %s nun límite máis alto.
+WarningSomeLinesWithNullHourlyRate=Algunhas veces algúns usuarios rexistráronse mentres a súa tarifa por hora non estaba definida. Utilizouse un valor do 0 %s por hora, pero isto pode resultar nunha avaliación incorrecta do tempo empregado.
+WarningYourLoginWasModifiedPleaseLogin=Modificouse o seu inicio de sesión. Por motivos de seguridade, terá que iniciar sesión co novo inicio de sesión antes da seguinte acción.
+WarningAnEntryAlreadyExistForTransKey=Xa existe unha entrada para a clave de tradución para este idioma
+WarningNumberOfRecipientIsRestrictedInMassAction=Aviso, o número de destinatarios diferentes está limitado a <b>%s</b> cando se usan as accións masivas nas listaxes
+WarningDateOfLineMustBeInExpenseReportRange=Aviso, a data da liña non está no rango do informe de gastos
+WarningProjectDraft=O proxecto aínda está en modo borrador. Non esqueza validalo se ten pensado usar tarefas.
+WarningProjectClosed=O proxecto está pechado. Primeiro debe abrilo de novo.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Algunhas transaccións bancarias elimináronse despois de que se xerou o recibo que as incluíu. Polo tanto, o número de cheques e o total da recepción poden diferir do número e o total na listaxe.
+WarningFailedToAddFileIntoDatabaseIndex=Aviso, non se puido engadir a entrada do ficheiro á táboa de índice da base de datos ECM
+WarningTheHiddenOptionIsOn=Aviso, a opción oculta <b>%s</b> está activa.
+WarningCreateSubAccounts=Aviso, non pode crear directamente unha subconta, debe crear un terceiro ou un usuario e asignarlles un código contable para atopalos nesta listaxe
+WarningAvailableOnlyForHTTPSServers=Dispoñible só se usa conexión segura HTTPS.
diff --git a/htdocs/langs/gl_ES/exports.lang b/htdocs/langs/gl_ES/exports.lang
index 52343e63453..92d24c84a79 100644
--- a/htdocs/langs/gl_ES/exports.lang
+++ b/htdocs/langs/gl_ES/exports.lang
@@ -26,8 +26,8 @@ FieldTitle=Título campo
 NowClickToGenerateToBuildExportFile=Agora, seleccione o formato de exportación da lista despregable e faga clic en "Xerar" para xerar o ficheiro de exportación...
 AvailableFormats=Formatos dispoñibles
 LibraryShort=Librería
-ExportCsvSeparator=Csv caracter separator
-ImportCsvSeparator=Csv caracter separator
+ExportCsvSeparator=Separador de caracteres en CSV
+ImportCsvSeparator=Separador de caracteres en CSV
 Step=Paso
 FormatedImport=Asistente de importación
 FormatedImportDesc1=Esta área permitelle realizar importacións persoalizadas de datos mediante un axudante que evita ter coñecementos técnicos de Dolibarr.
@@ -92,11 +92,11 @@ NbOfLinesOK=Número de liñas sen erros nin warnings: <b>%s</b>.
 NbOfLinesImported=Número de liñas correctamente importadas: <b>%s</b>.
 DataComeFromNoWhere=O valor a insertar non corresponde a ningún campo do ficheiro orixe.
 DataComeFromFileFieldNb=O valor a insertar correspondese ao campo número <b>%s</b> do ficheiro orixe.
-DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
-DataIsInsertedInto=Data coming from source file will be inserted into the following field:
-DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field:
-DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field:
+DataComeFromIdFoundFromRef=O valor que provén do campo número <b>%s</b> do ficheiro fonte usarase para atopar o id do obxecto principal que se vai usar (polo que o obxecto <b>%s</b> que ten a ref. a partir do ficheiro fonte debe existir na base de datos).
+DataComeFromIdFoundFromCodeId=O código que provén do campo número <b>%s</b> do ficheiro fonte usarase para atopar o id do obxecto principal que se vai usar (polo que o código do ficheiro fonte debe existir no dicionario <b>%s</b>). Teña conta que se coñece o id, tamén pode usalo no ficheiro fonte no canto do código. A importación debería funcionar nos dous casos.
+DataIsInsertedInto=Os datos procedentes do ficheiro fonte engádense no seguinte campo:
+DataIDSourceIsInsertedInto=A identificación do obxecto principal atopouse empregando os datos do ficheiro orixe e engádense no seguinte campo:
+DataCodeIDSourceIsInsertedInto=A identificación da liña principal atopada no códigoengádese no seguinte campo:
 SourceRequired=Datos de orixe obligatorios
 SourceExample=Ejemplo de datos de orixe posibles
 ExampleAnyRefFoundIntoElement=Todas as referencias atopadas para os elementos <b>%s</b>
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Clave a usar para actualizar datos
 NbInsert=Número de liñas engadidas: %s
 NbUpdate=Número de liñas actualizadas: %s
 MultipleRecordFoundWithTheseFilters=Atopáronse varios rexistros con estes filtros: %s
+StocksWithBatch=Existencias e localización (almacén) de produtos con número de lote/serie
diff --git a/htdocs/langs/gl_ES/ftp.lang b/htdocs/langs/gl_ES/ftp.lang
index a31e113a6bb..ec3838e9007 100644
--- a/htdocs/langs/gl_ES/ftp.lang
+++ b/htdocs/langs/gl_ES/ftp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Configuración do módulo cliente FTP
-NewFTPClient=Nova configuracións cliente FTP
-FTPArea=Área FTP
-FTPAreaDesc=Esta pantalla amosa unha vista de servidor FTP
-SetupOfFTPClientModuleNotComplete=A configuración do módulo de cliente FTP parece incompleta
-FTPFeatureNotSupportedByYourPHP=O seu PHP no soporta as funcións FTP
-FailedToConnectToFTPServer=Non foi posible conectar co servidor FTP  (servidor: %s, porto %s)
-FailedToConnectToFTPServerWithCredentials=Non foi posible entrar co usuario/contrasinal FTP configurados
+FTPClientSetup=Configuración do módulo cliente FTP ou SFTP
+NewFTPClient=Nova configuración de conexión FTP/SFTP 
+FTPArea=Área FTP/SFTP
+FTPAreaDesc=Esta pantalla  amosa unha vista dun servidor FTP/SFTP
+SetupOfFTPClientModuleNotComplete=A configuración do módulo cliente FTP ou SFTP parece estar imcompleta
+FTPFeatureNotSupportedByYourPHP=O seu PHP non soporta funcións FTP/SFTP'
+FailedToConnectToFTPServer=Fallo ao conectar ao servidor (servidor %s, porto %s)
+FailedToConnectToFTPServerWithCredentials=Fallo ao iniciar sesión no servidor co inicio de sesión/contrasinal
 FTPFailedToRemoveFile=Non foi posible eliminar o ficheiro <b>%s</b>.
 FTPFailedToRemoveDir=Non foi posible eliminar o directorio <b>%s</b> (Comprobe os permisos e que o directorio está baleiro).
 FTPPassiveMode=Modo pasivo
-ChooseAFTPEntryIntoMenu=Escolla un sitio FTP no menú ...
+ChooseAFTPEntryIntoMenu=Escolla un sitio FTP/SFTM no menú ...
 FailedToGetFile=Non foi posible acadar os ficheiros %s
diff --git a/htdocs/langs/gl_ES/holiday.lang b/htdocs/langs/gl_ES/holiday.lang
index 6c59ada6a35..60a0e5c8331 100644
--- a/htdocs/langs/gl_ES/holiday.lang
+++ b/htdocs/langs/gl_ES/holiday.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - holiday
-HRM=HRM
-Holidays=Día libre
+HRM=RRHH
+Holidays=Vacacións
 CPTitreMenu=Día libre
 MenuReportMonth=Estado mensual
 MenuAddCP=Nova petición de vacacións
@@ -15,10 +15,10 @@ CancelCP=Anulada
 RefuseCP=Rexeitada
 ValidatorCP=Validador
 ListeCP=Listaxe de días libres
-Leave=Pedido de días libres
+Leave=Pedimento de días libres
 LeaveId=ID Vacacións
 ReviewedByCP=Será revisada por
-UserID=User ID
+UserID=ID do Usuario
 UserForApprovalID=ID de usuario de aprobación
 UserForApprovalFirstname=Nome do usuario de aprobación
 UserForApprovalLastname=Apelido do usuario de aprobación
@@ -35,15 +35,15 @@ ReturnCP=Voltar á páxina anterior
 ErrorUserViewCP=Non está autorizado a ler esta petición de días libres.
 InfosWorkflowCP=Información do workflow
 RequestByCP=Pedido por
-TitreRequestCP=Pedido de días libres
+TitreRequestCP=Pedimento de días libres
 TypeOfLeaveId=ID tipo de días libres
 TypeOfLeaveCode=Código tipo de días libres
 TypeOfLeaveLabel=Tipo de etiqueta de días libres
-NbUseDaysCP=Número de vacacións consumidos
-NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
+NbUseDaysCP=Número de días de vacacións consumidas
+NbUseDaysCPHelp=O cálculo toma dentro da conta os días non laborais e as vacacións definidas no diccionario.
 NbUseDaysCPShort=Días consumidos
 NbUseDaysCPShortInMonth=Días consumidos en mes
-DayIsANonWorkingDay=%s is a non working day
+DayIsANonWorkingDay=%s é un día non laboral
 DateStartInMonth=Data de inicio en mes
 DateEndInMonth=Data de fin en mes
 EditCP=Editar
@@ -130,5 +130,5 @@ HolidaysNumberingModules=Modelos de numeración de petición de días libres
 TemplatePDFHolidays=Prantilla PDF para petición de días libres
 FreeLegalTextOnHolidays=Texto libre no PDF
 WatermarkOnDraftHolidayCards=Marca de auga no borrador de petición de días libres
-HolidaysToApprove=Holidays to approve
-NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
+HolidaysToApprove=Vacacións para aprobar
+NobodyHasPermissionToValidateHolidays=Ninguén ten permisos para validar vacacións
diff --git a/htdocs/langs/gl_ES/hrm.lang b/htdocs/langs/gl_ES/hrm.lang
index bd222ac2e5e..d5a29275c06 100644
--- a/htdocs/langs/gl_ES/hrm.lang
+++ b/htdocs/langs/gl_ES/hrm.lang
@@ -1,19 +1,19 @@
 # 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
+HRM_EMAIL_EXTERNAL_SERVICE=Cooreo electrónico do SPA
+Establishments=Establecementos
+Establishment=Establecemento
+NewEstablishment=Novo establecemento
+DeleteEstablishment=Eliminar establecemento
+ConfirmDeleteEstablishment=Está certo de querer eliminar este establecemento?
+OpenEtablishment=Abrir establecemento
+CloseEtablishment=Pechar establecemento
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
-DictionaryDepartment=HRM - Department list
-DictionaryFunction=HRM - Job positions
+DictionaryPublicHolidays=RRHH - Festivos
+DictionaryDepartment=RRHH - Listaxe Departamentos
+DictionaryFunction=RRHH - Postos de traballo
 # Module
 Employees=Empregados
 Employee=Empregado
-NewEmployee=New employee
-ListOfEmployees=List of employees
+NewEmployee=Novo empregado
+ListOfEmployees=Listaxe de empregados
diff --git a/htdocs/langs/gl_ES/install.lang b/htdocs/langs/gl_ES/install.lang
index 65fd314784a..6c5340991c7 100644
--- a/htdocs/langs/gl_ES/install.lang
+++ b/htdocs/langs/gl_ES/install.lang
@@ -1,217 +1,217 @@
 # 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=Tipo de driver
+InstallEasy=Só ten que seguir as instrucións paso a paso.
+MiscellaneousChecks=Comprobación dos requisitos previos
+ConfFileExists=Existe o ficheiro de configuración <b>%s </b>.
+ConfFileDoesNotExistsAndCouldNotBeCreated=O ficheiro de configuración <b>%s</b> non existe e non puido ser creado!
+ConfFileCouldBeCreated=Pódese crear o ficheiro de configuración <b>%s</b>.
+ConfFileIsNotWritable=O ficheiro de configuración <b>%s</b> non se pode escribir. Comprobe os permisos. Para a primeira instalación, o servidor web debe poder escribir neste ficheiro durante o proceso de configuración ("chmod 666" por exemplo nun sistema operativo como Unix).
+ConfFileIsWritable=O ficheiro de configuración <b>%s</b> é escribíbel.
+ConfFileMustBeAFileNotADir=O ficheiro de configuración <b>%s</b> debe ser un ficheiro, non un directorio.
+ConfFileReload=Recargando parámetros do ficheiro de configuración.
+PHPSupportPOSTGETOk=Este PHP admite variables POST e GET.
+PHPSupportPOSTGETKo=É posible que a súa configuración de PHP non admita variables POST e/ou GET. Comprobe o parámetro <b>variables_order</b> en php.ini.
+PHPSupportSessions=Este PHP admite sesións.
+PHPSupport=Este PHP admite funcións de %s.
+PHPMemoryOK=A memoria de sesión máxima de PHP está configurada en <b>%s</b>. Isto debería ser suficiente.
+PHPMemoryTooLow=A memoria de sesión máxima de PHP está configurada en <b>%s</b> bytes. Isto é demasiado baixo. Cambie o seu <b>php.ini</b> para establecer o parámetro <b>memory_limit</b> en polo menos <b>%s</b> bytes.
+Recheck=Faga clic aquí para unha proba máis detallada
+ErrorPHPDoesNotSupportSessions=A súa instalación de PHP non admite sesións. Esta función é precisa para que Dolibarr poida traballar. Comprobe a súa configuración de PHP e os permisos do directorio de sesións.
+ErrorPHPDoesNotSupportGD=A súa instalación de PHP non admite funcións gráficas GD. Non haberá gráficos dispoñibles.
+ErrorPHPDoesNotSupportCurl=A súa instalación de PHP non admite Curl.
+ErrorPHPDoesNotSupportCalendar=A súa instalación de PHP non admite extensións do calendario php.
+ErrorPHPDoesNotSupportUTF8=A súa instalación de PHP non admite funcións UTF8. Dolibarr non pode funcionar correctamente. Resolva isto antes de instalar Dolibarr.
+ErrorPHPDoesNotSupportIntl=​​= A súa instalación de PHP non admite funcións Intl.
+ErrorPHPDoesNotSupportxDebug=A súa instalación de PHP non admite funcións de depuración extensivas.
+ErrorPHPDoesNotSupport=A súa instalación de PHP non admite funcións de %s.
+ErrorDirDoesNotExists=O directorio %s non existe.
+ErrorGoBackAndCorrectParameters=Voltar atrás e comprobar/corrixir os parámetros.
+ErrorWrongValueForParameter=Pode que escribise un valor incorrecto para o parámetro '%s'.
+ErrorFailedToCreateDatabase=Fallo ao crear a base de datos '%s'.
+ErrorFailedToConnectToDatabase=Produciuse un fallo ao conectarse á base de datos '%s'.
+ErrorDatabaseVersionTooLow=A versión da base de datos (%s) é antiga de mais. É precisa a versión %s ou superior.
+ErrorPHPVersionTooLow=A versión de PHP é antiga de mais. É precisa a versión %s.
+ErrorConnectedButDatabaseNotFound=Conexión correcta ao servidor pero non se atopou a base de datos '%s'.
+ErrorDatabaseAlreadyExists=A base de datos '%s' xa existe.
+IfDatabaseNotExistsGoBackAndUncheckCreate=Se a base de datos non existe, volte atrás e marque a opción "Crear base de datos".
+IfDatabaseExistsGoBackAndCheckCreate=Se a base de datos xa existe, volte atrás e desmarque a opción "Crear base de datos".
+WarningBrowserTooOld=A versión do navegador é antiga de mais. É moi recomendable actualizar o seu navegador a unha versión recente de Firefox, Chrome ou Opera.
+PHPVersion=Versión de PHP
+License=Usando licenza
+ConfigurationFile=Ficheiro de configuración
+WebPagesDirectory=Directorio onde se almacenan as páxinas web
+DocumentsDirectory=Directorio para almacenar os documentos cargados e xerados
+URLRoot=Raíz URL
+ForceHttps=Forzar conexións seguras (https)
+CheckToForceHttps=Marque esta opción para forzar conexións seguras (https). <br> Isto require que o servidor web estexa configurado cun certificado SSL.
+DolibarrDatabase=Base de datos Dolibarr
+DatabaseType=Tipo de base de datos
+DriverType=Tipo de controlador
 Server=Servidor
-ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
-ServerPortDescription=Database server port. Keep empty if unknown.
-DatabaseServer=Database server
+ServerAddressDescription=Nome ou enderezo IP do servidor de base de datos. Normalmente "localhost" cando o servidor de base de datos está aloxado no mesmo servidor que o servidor web.
+ServerPortDescription=Porto do servidor da base de datos. Mantéñase baleiro se o descoñece.
+DatabaseServer=Servidor da base de datos
 DatabaseName=Nome da base de datos
-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.
+DatabasePrefix=Prefixo da táboa da base de datos
+DatabasePrefixDescription=Prefixo da táboa da base de datos. Se está baleiro, por defecto llx_.
+AdminLogin=Conta de usuario para o propietario da base de datos Dolibarr.
+PasswordAgain=Voltar a escribir a confirmación do contrasinal
+AdminPassword=Contrasinal para o propietario da base de datos Dolibarr.
+CreateDatabase=Crear base de datos
+CreateUser=Crear conta de usuario ou conceder permiso á conta de usuario na base de datos Dolibarr
+DatabaseSuperUserAccess=Servidor de base de datos: acceso ao superusuario
+CheckToCreateDatabase=Marque a caixa se a base de datos aínda non existe e se debe crear. <br> Neste caso, tamén debe cubrir o nome de usuario e o contrasinal da conta do superusuario na parte inferior desta páxina.
+CheckToCreateUser=Marque a caixa se: <br> a conta de usuario da base de datos aínda non existe e hai que creala, ou <br> se a conta de usuario existe pero a base de datos non existe e deben concederse permisos. <br> Neste caso, debe introducir a conta de usuario e o contrasinal e <b> tamén </b> o nome e o contrasinal da conta do superusuario na parte inferior desta páxina. Se esta caixa está desmarcada, o propietario e o contrasinal da base de datos xa deben existir.
+DatabaseRootLoginDescription=Nome da conta do superusuario (para crear novas bases de datos ou novos usuarios), obrigatorio se a base de datos ou o seu propietario non existen.
+KeepEmptyIfNoPassword=Deixe en branco se o superusuario non ten contrasinal (NON se recomenda)
+SaveConfigurationFile=Gardar parámetros en
+ServerConnection=Conexión ao servidor
+DatabaseCreation=Creación de bases de datos
+CreateDatabaseObjects=Creación de obxectos de base de datos
+ReferenceDataLoading=Carga de datos de referencia
+TablesAndPrimaryKeysCreation=Creación de táboas e claves primarias
+CreateTableAndPrimaryKey=Crear táboa %s
+CreateOtherKeysForTable=Crear claves e índices foráneos para a táboa %s
+OtherKeysCreation=Creación de claves e índices foráneos
+FunctionsCreation=Creación de funcións
+AdminAccountCreation=Creación do inicio de sesión do administrador
+PleaseTypePassword=Escriba un contrasinal, non se permiten contrasinais baleiros.
+PleaseTypeALogin=Prégase escriba un inicio de sesión.
+PasswordsMismatch=Os contrasinais son diferentes, ténteo de novo.
+SetupEnd=Fin da configuración
+SystemIsInstalled=Esta instalación rematou.
+SystemIsUpgraded=Dolibarr actualizouse correctamente.
+YouNeedToPersonalizeSetup=Debe configurar Dolibarr para que se adapte ás súas necesidades (aspecto, características, ...). Para facelo, siga a seguinte ligazón:
+AdminLoginCreatedSuccessfuly=O inicio de sesión do administrador Dolibarr '<b>%s </b>' creouse correctamente.
+GoToDolibarr=Ir a Dolibarr
+GoToSetupArea=Ir a Dolibarr (área de configuración)
+MigrationNotFinished=A versión da base de datos non está completamente actualizada: execute de novo o proceso de actualización.
+GoToUpgradePage=Ir de novo á páxina de actualización
+WithNoSlashAtTheEnd=Sen a barra inclinada "/" ao final
+DirectoryRecommendation=<span class="warning"> IMPORTANTE </span>: Debe empregar un directorio que está fóra das páxinas web (polo tanto, non use un subdirectorio do parámetro anterior).
+LoginAlreadyExists=Xa existe
+DolibarrAdminLogin=Inicio de sesión do administrador de Dolibarr
+AdminLoginAlreadyExists=A conta de administrador Dolibarr '<b>%s </b>' xa existe. Volte atrás se queres crear outro.
+FailedToCreateAdminLogin=Produciuse un fallo ao crear a conta de administrador de Dolibarr.
+WarningRemoveInstallDir=Aviso, por motivos de seguridade, unha vez finalizada a instalación ou actualización, debería engadir un ficheiro chamado <b> install.lock </b> ao directorio do documento Dolibarr para evitar o uso accidental/malicioso da instalación ferramentas de novo.
+FunctionNotAvailableInThisPHP=Non dispoñible neste PHP
+ChoosedMigrateScript=Escolla un script de migración
+DataMigration=Migración da base de datos (datos)
+DatabaseMigration=Migración da base de datos (estrutura + algúns datos)
+ProcessMigrateScript=Procesamento de scripts
+ChooseYourSetupMode=Elixa o seu modo de configuración e faga clic en "Inicio" ...
+FreshInstall=Instalación nova
+FreshInstallDesc=Use este modo se esta é a súa primeira instalación. Se non, este modo pode reparar unha instalación anterior incompleta. Se desexa actualizar a súa versión, escolla o modo "Actualizar".
 Upgrade=Actualización
-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
+UpgradeDesc=Utilice este modo se substituíu ficheiros Dolibarr antigos por ficheiros dunha versión máis recente. Isto actualizará a súa base de datos e os datos.
+Start=Inciciar
+InstallNotAllowed=A configuración non está permitida polos permisos en <b> conf.php </b>
+YouMustCreateWithPermission=Debe crear o ficheiro %s e establecer permisos de escritura nel para o servidor web durante o proceso de instalación.
+CorrectProblemAndReloadPage=Corrixa o problema e prema F5 para recargar a páxina.
+AlreadyDone=Xa migrou
+DatabaseVersion=Versión da base de datos
+ServerVersion=Versión do servidor de base de datos
+YouMustCreateItAndAllowServerToWrite=Debe crear este directorio e permitir que o servidor web escriba nel.
+DBSortingCollation=Orde de clasificación de caracteres
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Seleccionou crear base de datos <b>%s</b>, pero para iso, Dolibarr necesita conectarse ao servidor <b>%s</b> con permisos de superusuario <b>%s</b>.
+YouAskLoginCreationSoDolibarrNeedToConnect=Seleccionou crear usuario de base de datos <b>%s</b>, pero para iso, Dolibarr necesita conectarse ao servidor <b>%s</b> con permisos de superusuario <b>%s</b> .
+BecauseConnectionFailedParametersMayBeWrong=Fallou a conexión á base de datos: os parámetros host ou superusuario deben ser erroneos.
+OrphelinsPaymentsDetectedByMethod=Detectouse o pagamento de orfos polo método %s
+RemoveItManuallyAndPressF5ToContinue=Elimine manualmente e prema F5 para continuar.
+FieldRenamed=Cambiouse o nome do campo
+IfLoginDoesNotExistsCheckCreateUser=Se o usuario aínda non existe, debe marcar a opción "Crear usuario"
+ErrorConnection=O servidor "<b>%s</b>", o nome da base de datos "<b>%s</b>", o inicio de sesión "<b>%s</b>" ou o contrasinal da base de datos poden estar mal ou a versión do cliente de PHP pode ser demasiado antiga en comparación coa versión da base de datos.
+InstallChoiceRecommanded=Escolla recomendada para instalar a versión <b>%s</b> sobre a súa versión actual <b>%s</b>
+InstallChoiceSuggested=<b> Escolla de instalación suxerida polo instalador </b>.
+MigrateIsDoneStepByStep=A versión destino (%s) ten un oco de varias versións. O asistente de instalación volverá suxerir unha nova migración unha vez completada.
+CheckThatDatabasenameIsCorrect=Comprobe que o nome da base de datos "<b>%s</b>" é correcto.
+IfAlreadyExistsCheckOption=Se este nome é correcto e esa base de datos aínda non existe, debe marcar a opción "Crear base de datos".
+OpenBaseDir=Parámetro openbasedir de PHP
+YouAskToCreateDatabaseSoRootRequired=Marcou a caixa "Crear base de datos". Para iso, ten que proporcionar o nome de usuario/contrasinal do superusuario (parte inferior do formulario).
+YouAskToCreateDatabaseUserSoRootRequired=Marcou a caixa "Crear propietario da base de datos". Para iso, ten que proporcionar o nome de usuario/contrasinal do superusuario (parte inferior do formulario).
+NextStepMightLastALongTime=O paso actual pode levar varios minutos. Agarde ata que a seguinte pantalla se amose completamente antes de continuar.
+MigrationCustomerOrderShipping=Migrar o envío para o almacenamento de pedimentos de cliente
+MigrationShippingDelivery=Actualizar o almacenamento do envío
+MigrationShippingDelivery2=Actualizar o almacenamento do envío 2
+MigrationFinished=Rematou a migración
+LastStepDesc=​​= <strong> Último paso </strong>: defina aquí o inicio de sesión e o contrasinal que desexa usar para conectarse a Dolibarr. <b> Non o perda xa que é a conta principal para administrar todas as outras contas de usuario/ adicionais. </b>
+ActivateModule=Activar o módulo %s
+ShowEditTechnicalParameters=Faga clic aquí para amosar/editar parámetros avanzados (modo experto)
+WarningUpgrade=Aviso: \n Xestionou primeiro unha copia de seguridade da base de datos? \n Esto é moi recomendable. A perda de datos (por exemplo, erros na versión 5.5.40 /41/42/43 de mysql) pode ser posible durante este proceso, polo que é esencial facer unha descarga completa da súa base de datos antes de iniciar calquera migración. \n \n Prema Aceptar para iniciar o proceso de migración ...
+ErrorDatabaseVersionForbiddenForMigration=A súa versión de base de datos é %s. Ten un erro crítico, o que fai posible a perda de datos se realiza cambios estruturais na súa base de datos, como o require o proceso de migración. Por esta razón, a migración non se permitirá ata que actualice a base de datos a unha versión mayor sin errores (parcheada) (lista de versiónscoñecidas con este erro: %s)
+KeepDefaultValuesWamp=Usou o asistente de configuración Dolibarr de DoliWamp, polo que os valores aquí propostos xa están optimizados. Cambialos só se sabe o que fai.
+KeepDefaultValuesDeb=Usou o asistente de configuración Dolibarr desde un paquete Linux (Ubuntu, Debian, Fedora ...), polo que os valores aquí propostos xa están optimizados. Só se debe introducir o contrasinal do propietario da base de datos para crear. Cambia outros parámetros só se sabe o que fai.
+KeepDefaultValuesMamp=Usou o asistente de configuración Dolibarr de DoliMamp, polo que os valores aquí propostos xa están optimizados. Cambialos só se sabe o que fai.
+KeepDefaultValuesProxmox=Usou o asistente de configuración Dolibarr desde unha aplicación virtual Proxmox, polo que os valores aquí propostos xa están optimizados. Cambialos só se sabe o que fai.
+UpgradeExternalModule=Executa o proceso adicado de actualización do módulo externo
+SetAtLeastOneOptionAsUrlParameter=Establecer polo menos unha opción como parámetro no URL. Por exemplo: '... repair.php?Standard=confirmado'
+NothingToDelete=Nada que limpar/eliminar
 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
-ShowNotAvailableOptions=Show unavailable options
-HideNotAvailableOptions=Hide unavailable options
-ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
-YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
-YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
-ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=If an upgrade is in progress, please wait. If not, click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
-Loaded=Loaded
-FunctionTest=Function test
+MigrationFixData=Corrección de datos desnormalizados
+MigrationOrder=Migración de datos para os pedimentos a cliente
+MigrationSupplierOrder=Migración de datos para os pedimentos de provedor
+MigrationProposal=Migración de datos para propostas comerciais
+MigrationInvoice=Migración de datos para as facturas do cliente
+MigrationContract=Migración de datos para contratos
+MigrationSuccessfullUpdate=Actualización realizada correctamente
+MigrationUpdateFailed=Fallou o proceso de actualización
+MigrationRelationshipTables=Migración de datos para táboas de relacións (%s)
+MigrationPaymentsUpdate=Corrección de datos de pago
+MigrationPaymentsNumberToUpdate=%s pago(s) para actualizar
+MigrationProcessPaymentUpdate=Actualizar o(s) pagamento(s) %s
+MigrationPaymentsNothingToUpdate=Non hai máis cousas que facer
+MigrationPaymentsNothingUpdatable=Non hai máis pagamentos que se poidan corrixir
+MigrationContractsUpdate=Corrección de datos do contrato
+MigrationContractsNumberToUpdate=%s contrato(s) para actualizar
+MigrationContractsLineCreation=Crear unha liña de contrato para a ref. %S do contrato
+MigrationContractsNothingToUpdate=Non hai máis cousas que facer
+MigrationContractsFieldDontExist=O campo fk_facture xa non existe. Nada que facer.
+MigrationContractsEmptyDatesUpdate=Corrección de contratos de data baleira
+MigrationContractsEmptyDatesUpdateSuccess=A corrección da data baleira do contrato fíxose correctamente
+MigrationContractsEmptyDatesNothingToUpdate=Non hai data baleira do contrato para corrixir
+MigrationContractsEmptyCreationDatesNothingToUpdate=Non hai data de creación do contrato para corrixir
+MigrationContractsInvalidDatesUpdate=Corrección do contrato de data de valor incorrecto
+MigrationContractsInvalidDateFix=Contrato correcto %s (Data do contrato =%s, Data de inicio do servizo min =%s)
+MigrationContractsInvalidDatesNumber=%s contratos modificados
+MigrationContractsInvalidDatesNothingToUpdate=Non hai data con valor erroneo para corrixir
+MigrationContractsIncoherentCreationDateUpdate=Corrección da data de creación do contrato de valor incorrecto
+MigrationContractsIncoherentCreationDateUpdateSuccess=Corrección da data de creación do contrato de valor incorrecto feita correctamente
+MigrationContractsIncoherentCreationDateNothingToUpdate=Non hai ningún valor mal para corrixir a data de creación do contrato
+MigrationReopeningContracts=Contrato aberto e pechado por erro
+MigrationReopenThisContract=Voltar a abrir o contrato %s
+MigrationReopenedContractsNumber=%s contratos modificados
+MigrationReopeningContractsNothingToUpdate=Non hai contrato pechado para abrir
+MigrationBankTransfertsUpdate=Actualizar ligazóns entre a entrada bancaria e unha transferencia bancaria
+MigrationBankTransfertsNothingToUpdate=Todas as ligazóns están actualizadas
+MigrationShipmentOrderMatching=Actualización do recibo dos envíos
+MigrationDeliveryOrderMatching=Actualización do recibo de entrega
+MigrationDeliveryDetail=Actualización de entrega
+MigrationStockDetail=Actualizar o valor de stock dos produtos
+MigrationMenusDetail=Actualizar táboas de menús dinámicos
+MigrationDeliveryAddress=Actualizar o enderezo de entrega nos envíos
+MigrationProjectTaskActors=Migración de datos para a táboa llx_projet_task_actors
+MigrationProjectUserResp=Campo de migración de datos fk_user_resp de llx_projet para llx_element_contact
+MigrationProjectTaskTime=Tempo de actualización empregado en segundos
+MigrationActioncommElement=Actualizar datos sobre accións
+MigrationPaymentMode=Migración de datos para o tipo de pago
+MigrationCategorieAssociation=Migración de categorías
+MigrationEvents=Migración de eventos para engadir o propietario do evento á táboa de tarefas
+MigrationEventsContact=Migración de eventos para engadir contacto de evento á táboa de asignación
+MigrationRemiseEntity=Actualizar o valor do campo da entidade de llx_societe_remise
+MigrationRemiseExceptEntity=Actualizar o valor do campo da entidade de llx_societe_remise_except
+MigrationUserRightsEntity=Actualizar o valor do campo da entidade de llx_user_rights
+MigrationUserGroupRightsEntity=Actualizar o valor do campo da entidade de llx_usergroup_rights
+MigrationUserPhotoPath=Migración de enderezos de fotos para usuarios
+MigrationFieldsSocialNetworks=Migración de redes sociais dos campos dos usuarios (%s)
+MigrationReloadModule=Recargar o módulo %s
+MigrationResetBlockedLog=Restablecer o módulo BlockedLog para o algoritmo v7
+ShowNotAvailableOptions=Amosar as opcións non dispoñibles
+HideNotAvailableOptions=Ocultar opcións non dispoñibles
+ErrorFoundDuringMigration=Informáronse erros durante o proceso de migración polo que o seguinte paso non está dispoñible. Para ignorar os erros, pode <a href="%s"> facer clic aquí </a>, pero é posible que a aplicación ou algunhas funcións non funcionen correctamente ata que non se resolvan os erros.
+YouTryInstallDisabledByDirLock=A aplicación tentou actualizarse por si mesma, pero as páxinas de instalación/actualización desactiváronse por seguridade (directorio renomeado co sufixo .lock). <br>
+YouTryInstallDisabledByFileLock=A aplicación intentou actualizarse por si mesma, pero as páxinas de instalación/actualización desactiváronse por seguridade (pola existencia dun ficheiro de bloqueo <strong> install.lock </strong> no directorio de documentos dolibarr). <br>
+ClickHereToGoToApp=Fai clic aquí para ir á súa aplicación
+ClickOnLinkOrRemoveManualy=Se hai unha actualización en curso, agarde. Se non, faga clic na seguinte ligazón. Se sempre ve esta mesma páxina, debe eliminar/renomear o ficheiro install.lock no directorio de documentos.
+Loaded=Cargado
+FunctionTest=Función test
diff --git a/htdocs/langs/gl_ES/interventions.lang b/htdocs/langs/gl_ES/interventions.lang
index 37d18abb4c4..54d0c50751f 100644
--- a/htdocs/langs/gl_ES/interventions.lang
+++ b/htdocs/langs/gl_ES/interventions.lang
@@ -1,66 +1,68 @@
 # Dolibarr language file - Source file is en_US - interventions
 Intervention=Intervención
 Interventions=Intervencións
-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
+InterventionCard=Ficha intervención
+NewIntervention=Nova intervención
+AddIntervention=Crear intervención
+ChangeIntoRepeatableIntervention=Cambiar a intervención recorrente.
+ListOfInterventions=Listaxe de intervencións
+ActionsOnFicheInter=Eventos sobre a intervención
+LastInterventions=Últimas %s Intervencións
+AllInterventions=Todas as intervencións
 CreateDraftIntervention=Crear borrador
-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"
+InterventionContact=Contacto intervención
+DeleteIntervention=Eliminar intervención
+ValidateIntervention=Validar intervención
+ModifyIntervention=Modificar intervención
+DeleteInterventionLine=Eliminar liña de intervención
+ConfirmDeleteIntervention=¿Está certo de querer eliminar esta intervención?
+ConfirmValidateIntervention=¿Está certo de querer validar esta intervención baixo o nome <b>%s</b>?
+ConfirmModifyIntervention=¿Está ceto de querer modificar esta intervención?
+ConfirmDeleteInterventionLine=¿Está certo de querer eliminar esta liña da intervención?
+ConfirmCloneIntervention=¿Está certo de querer clonar esta intervención?
+NameAndSignatureOfInternalContact=Nome e sinatura do participante:
+NameAndSignatureOfExternalContact=Nome e sinatura do cliente:
+DocumentModelStandard=Documento modelo estándar para intervencións
+InterventionCardsAndInterventionLines=Intervencións e liñas de intervención
+InterventionClassifyBilled=Clasificar "Facturada"
+InterventionClassifyUnBilled=Clasificar "Non facturada"
+InterventionClassifyDone=Clasificar "Realizada"
 StatusInterInvoiced=Facturado
-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=Intervención %s enviada por e-mail
-InterventionDeletedInDolibarr=Intervention %s deleted
-InterventionsArea=Interventions area
-DraftFichinter=Draft interventions
+SendInterventionRef=Envío da intervención %s
+SendInterventionByMail=Enviar intervención por correo electrónico
+InterventionCreatedInDolibarr=Intervención %s creada
+InterventionValidatedInDolibarr=Intervención %s validada
+InterventionModifiedInDolibarr=Intervención %s modificada
+InterventionClassifiedBilledInDolibarr=Intervención %s clasificada como facturada
+InterventionClassifiedUnbilledInDolibarr=Intervención %s clasificada como non facturada
+InterventionSentByEMail=Intervención %s enviada por correo electrónico
+InterventionDeletedInDolibarr=Intervención %s eliminada
+InterventionsArea=Área intervencións
+DraftFichinter=Intervencións borrador
 LastModifiedInterventions=Últimas %s intervencións modificadas
-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
+FichinterToProcess=Intervencións a procesar
+TypeContact_fichinter_external_CUSTOMER=Seguimento do contacto co cliente
+PrintProductsOnFichinter=Imprimir tamén as liñas de tipo "produto" (non só servizos) nas fichas de intervención
+PrintProductsOnFichinterDetails=Intervencións xeradas desde pedimentos
+UseServicesDurationOnFichinter=Usar a duración dos servizos para as intervencións xradas desde os pedimentos
+UseDurationOnFichinter=Oculta o campo de duración para os rexistros de intervención
+UseDateWithoutHourOnFichinter=Oculta horas e minutos fora do campo de data para os registros de intervención
+InterventionStatistics=Estatísticas de intervencións
+NbOfinterventions=Nº de fichas de intervención
+NumberOfInterventionsByMonth=Nº de fichas de intervención por mes (data de validación)
+AmountOfInteventionNotIncludedByDefault=A cantidade de intervención non se inclúe por defecto no beneficio (na maioría dos casos, as follas de traballo úsanse para contar o tempo empregado). Engade a opción PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT a 1 en home-setup-other para incluílas.
+InterId=Id. intervención
+InterRef=Ref. intervención
+InterDateCreation=Data creación intervención
+InterDuration=Duración intervención
+InterStatus=Estado intervención
+InterNote=Nota intervención
+InterLine=Liña de intervención
+InterLineId=Id. liña intervención
+InterLineDate=Data liña intervención
+InterLineDuration=Duración liña intervención
+InterLineDesc=Descrición liña intervención
+RepeatableIntervention=Modelo de intervención
+ToCreateAPredefinedIntervention=Para crear unha intervención predefinida ou recorrente, cree unha intervención común e converta
+Reopen=Abrir de novo
+ConfirmReopenIntervention=Estás certo de que queres abrir de novo a intervención <b>%s</b>?
diff --git a/htdocs/langs/gl_ES/intracommreport.lang b/htdocs/langs/gl_ES/intracommreport.lang
index 576a0345c46..e0788dcbf47 100644
--- a/htdocs/langs/gl_ES/intracommreport.lang
+++ b/htdocs/langs/gl_ES/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 = Informe intracomm
+Module68000Desc = Xestión de informes intracomm (soporte para o formato francés DEB / DES)
+IntracommReportSetup = Configuración do módulo Intracommreport
+IntracommReportAbout = Acerca de 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_AGREMENT=Número de aprobación (emitido polo CISD do anexo)
+INTRACOMMREPORT_TYPE_ACTEUR=Tipo de actor
+INTRACOMMREPORT_ROLE_ACTEUR=Rol interpretado polo actor
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Nivel de obriga das presentacións
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Nivel de obriga dos envíos
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Categoría de servizos tipo "Franqueo"
 
-INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+INTRACOMMREPORT_NUM_DECLARATION=Número de declarante
 
 # Menu
-MenuIntracommReport=Intracomm report
-MenuIntracommReportNew=New declaration
+MenuIntracommReport=Informe intracomm
+MenuIntracommReportNew=Nova declaración
 MenuIntracommReportList=Listaxe
 
 # View
-NewDeclaration=New declaration
-Declaration=Declaration
-AnalysisPeriod=Analysis period
-TypeOfDeclaration=Type of declaration
-DEB=Goods exchange declaration (DEB)
-DES=Services exchange declaration (DES)
+NewDeclaration=Nova declaración
+Declaration=Declaracion
+AnalysisPeriod=Período de análise
+TypeOfDeclaration=Tipo de declaración
+DEB=Declaración de cambio de mercadorías (DEB)
+DES=Declaración de intercambio de servizos (DES)
 
 # Export page
-IntracommReportTitle=Preparation of an XML file in ProDouane format
+IntracommReportTitle=Preparación dun ficheiro XML en formato ProAduana
 
 # List
-IntracommReportList=List of generated declarations
-IntracommReportNumber=Numero of declaration
-IntracommReportPeriod=Period of nalysis
-IntracommReportTypeDeclaration=Type of declaration
-IntracommReportDownload=download XML file
+IntracommReportList=Lista de declaracións xeradas
+IntracommReportNumber=Número de declaración
+IntracommReportPeriod=Período de análise
+IntracommReportTypeDeclaration=Tipo de declaración
+IntracommReportDownload=descargar o ficheiro XML
 
 # Invoice
-IntracommReportTransportMode=Transport mode
+IntracommReportTransportMode=Modo de transporte
diff --git a/htdocs/langs/gl_ES/languages.lang b/htdocs/langs/gl_ES/languages.lang
index ce9d78410c2..a66520eaa71 100644
--- a/htdocs/langs/gl_ES/languages.lang
+++ b/htdocs/langs/gl_ES/languages.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_am_ET=Ethiopian
+Language_am_ET=Etíope
 Language_ar_AR=Árabe
-Language_ar_EG=Arabic (Egypt)
+Language_ar_EG=Árabe (Exipto)
 Language_ar_SA=Árabe
-Language_az_AZ=Azerbaijani
-Language_bn_BD=Bengali
+Language_az_AZ=Azerí
+Language_bn_BD=Bengalí
 Language_bn_IN=Bengali (India)
 Language_bg_BG=Búlgaro
 Language_bs_BA=Bosnio
@@ -14,61 +14,61 @@ Language_da_DA=Danés
 Language_da_DK=Danés
 Language_de_DE=Alemán
 Language_de_AT=Alemán (Austria)
-Language_de_CH=German (Switzerland)
+Language_de_CH=Alemán (Suíza)
 Language_el_GR=Grego
-Language_el_CY=Greek (Cyprus)
+Language_el_CY=Grego (Chipre)
 Language_en_AU=Inglés (Australia)
-Language_en_CA=English (Canada)
+Language_en_CA=Inglés (Canadá)
 Language_en_GB=Inglés (Reino Unido)
 Language_en_IN=Inglés (India)
 Language_en_NZ=Inglés (Nova Celandia)
 Language_en_SA=Inglés (Arabia Saudita)
-Language_en_SG=English (Singapore)
+Language_en_SG=Inglés (Singapur)
 Language_en_US=Inglés (Estados Unidos)
 Language_en_ZA=Inglés (Sudáfrica)
 Language_es_ES=Español
 Language_es_AR=Español (Arxentina)
-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_BO=Español (Bolivia)
+Language_es_CL=Español (Chile)
+Language_es_CO=Español (Colombia)
+Language_es_DO=Español (República Dominicana)
+Language_es_EC=Español (Ecuador)
+Language_es_GT=Español (Guatemala)
 Language_es_HN=Español (Honduras)
 Language_es_MX=Español (México)
-Language_es_PA=Spanish (Panama)
+Language_es_PA=Español (Panamá)
 Language_es_PY=Español (Paraguay)
 Language_es_PE=Español (Perú)
 Language_es_PR=Español (Porto Rico)
-Language_es_US=Spanish (USA)
-Language_es_UY=Spanish (Uruguay)
-Language_es_GT=Spanish (Guatemala)
-Language_es_VE=Spanish (Venezuela)
+Language_es_US=Español (USA)
+Language_es_UY=Español (Uruguai)
+Language_es_GT=Español (Guatemala)
+Language_es_VE=Español (Venezuela)
 Language_et_EE=Estoniano
 Language_eu_ES=Éuscaro
 Language_fa_IR=Persa
-Language_fi_FI=Finnish
+Language_fi_FI=Finés
 Language_fr_BE=Francés (Bélxica)
 Language_fr_CA=Francés (Canadá)
-Language_fr_CH=Francés (Suíza)
-Language_fr_CI=French (Cost Ivory)
-Language_fr_CM=French (Cameroun)
+Language_fr_CH=Francés (Suiza)
+Language_fr_CI=Francés (Costa Marfíl)
+Language_fr_CM=Francés (Camerún)
 Language_fr_FR=Francés
-Language_fr_GA=French (Gabon)
+Language_fr_GA=Francés (Gabón)
 Language_fr_NC=Francés (Nova Caledonia)
-Language_fr_SN=French (Senegal)
-Language_fy_NL=Frisian
-Language_gl_ES=Galician
+Language_fr_SN=Francés (Senegal)
+Language_fy_NL=Frisón
+Language_gl_ES=Galego
 Language_he_IL=Hebreo
 Language_hi_IN=Hindi (India)
 Language_hr_HR=Croata
 Language_hu_HU=Húngaro
-Language_id_ID=Indonesian
+Language_id_ID=Indonesio
 Language_is_IS=Islandés
 Language_it_IT=Italiano
-Language_it_CH=Italian (Switzerland)
+Language_it_CH=Italiano (Suíza)
 Language_ja_JP=Xaponés
-Language_ka_GE=Georgian
+Language_ka_GE=Xeorxiano
 Language_km_KH=Khmer
 Language_kn_IN=Kannada
 Language_ko_KR=Coreano
@@ -76,11 +76,11 @@ Language_lo_LA=Laos
 Language_lt_LT=Lituano
 Language_lv_LV=Letón
 Language_mk_MK=Macedonio
-Language_mn_MN=Mongolian
+Language_mn_MN=Mongol
 Language_nb_NO=Noruegués (Bokmål)
 Language_ne_NP=Nepali
 Language_nl_BE=Holandés (Bélxica)
-Language_nl_NL=Dutch
+Language_nl_NL=Alemán
 Language_pl_PL=Polaco
 Language_pt_BR=Portugués (Brasil)
 Language_pt_PT=Portugués
@@ -91,15 +91,15 @@ Language_tr_TR=Turco
 Language_sl_SI=Esloveno
 Language_sv_SV=Sueco
 Language_sv_SE=Sueco
-Language_sq_AL=Albanian
+Language_sq_AL=Albanés
 Language_sk_SK=Eslovaco
-Language_sr_RS=Serbian
+Language_sr_RS=Serbio
 Language_sw_SW=Kiswahili
-Language_th_TH=Thai
+Language_th_TH=Tailandés
 Language_uk_UA=Ucraíno
 Language_uz_UZ=Usbeco
 Language_vi_VN=Vietnamita
 Language_zh_CN=Chinés
-Language_zh_TW=Chinés (tradicional)
-Language_zh_HK=Chinese (Hong Kong)
-Language_bh_MY=Malay
+Language_zh_TW=Chinés (Tradicional)
+Language_zh_HK=Chinés (Hong Kong)
+Language_bh_MY=Malaio
diff --git a/htdocs/langs/gl_ES/ldap.lang b/htdocs/langs/gl_ES/ldap.lang
index 7957050d002..51bb44de08c 100644
--- a/htdocs/langs/gl_ES/ldap.lang
+++ b/htdocs/langs/gl_ES/ldap.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - ldap
-YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
-UserMustChangePassNextLogon=User must change password on the domain %s
-LDAPInformationsForThisContact=Information in LDAP database for this contact
-LDAPInformationsForThisUser=Information in LDAP database for this user
-LDAPInformationsForThisGroup=Information in LDAP database for this group
-LDAPInformationsForThisMember=Information in LDAP database for this member
-LDAPInformationsForThisMemberType=Information in LDAP database for this member type
-LDAPAttributes=LDAP attributes
-LDAPCard=LDAP card
-LDAPRecordNotFound=Record not found in LDAP database
-LDAPUsers=Users in LDAP database
+YouMustChangePassNextLogon=Débese cambiar o contrasinal do usuario <b>%s </b> no dominio <b>%s </b>.
+UserMustChangePassNextLogon=O usuario debe cambiar o contrasinal no dominio %s
+LDAPInformationsForThisContact=Información na base de datos LDAP deste contacto
+LDAPInformationsForThisUser=Información na base de datos LDAP para este usuario
+LDAPInformationsForThisGroup=Información na base de datos LDAP para este grupo
+LDAPInformationsForThisMember=Información na base de datos LDAP para este membro
+LDAPInformationsForThisMemberType=Información na base de datos LDAP para este tipo de membro
+LDAPAttributes=Atributos LDAP
+LDAPCard=Tarxeta LDAP
+LDAPRecordNotFound=Non se atopou o rexistro na base de datos LDAP
+LDAPUsers=Usuarios na base de datos LDAP
 LDAPFieldStatus=Estado
-LDAPFieldFirstSubscriptionDate=First subscription date
-LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Data da última cotización
-LDAPFieldLastSubscriptionAmount=Latest subscription amount
-LDAPFieldSkype=Skype id
-LDAPFieldSkypeExample=Example: skypeName
-UserSynchronized=User synchronized
-GroupSynchronized=Group synchronized
-MemberSynchronized=Member synchronized
-MemberTypeSynchronized=Member type synchronized
-ContactSynchronized=Contact synchronized
-ForceSynchronize=Force synchronizing Dolibarr -> LDAP
-ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
-PasswordOfUserInLDAP=Password of user in LDAP
+LDAPFieldFirstSubscriptionDate=Data da primeira cotización
+LDAPFieldFirstSubscriptionAmount=Importe da primeira cotización
+LDAPFieldLastSubscriptionDate=Datos da última cotización
+LDAPFieldLastSubscriptionAmount=Importe da última cotización
+LDAPFieldSkype=ID de Skype
+LDAPFieldSkypeExample=Exemplo: skypeName
+UserSynchronized=Usuario sincronizado
+GroupSynchronized=Grupo sincronizado
+MemberSynchronized=Membro sincronizado
+MemberTypeSynchronized=Tipo de membro sincronizado
+ContactSynchronized=Contacto sincronizado
+ForceSynchronize=Forzar a sincronización Dolibarr -> LDAP
+ErrorFailedToReadLDAP=Fallou ao ler a base de datos LDAP. Comprobe a configuración do módulo LDAP e a accesibilidade á base de datos.
+PasswordOfUserInLDAP=Contrasinal do usuario en LDAP
diff --git a/htdocs/langs/gl_ES/link.lang b/htdocs/langs/gl_ES/link.lang
index 1ffcd41a18b..4815cf15e64 100644
--- a/htdocs/langs/gl_ES/link.lang
+++ b/htdocs/langs/gl_ES/link.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
-LinkANewFile=Link a new file/document
-LinkedFiles=Linked files and documents
-NoLinkFound=No registered links
-LinkComplete=The file has been linked successfully
-ErrorFileNotLinked=The file could not be linked
-LinkRemoved=The link %s has been removed
-ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
-URLToLink=URL to link
-OverwriteIfExists=Overwrite file if exists
+LinkANewFile=Ligar un novo ficheiro/documento
+LinkedFiles=Ficheiros e documentos ligados
+NoLinkFound=Sen ligazóns registrados
+LinkComplete=O ficheiro foi ligado correctamente
+ErrorFileNotLinked=O ficheiro non puido ser ligado
+LinkRemoved=A ligazón %s foi eliminada
+ErrorFailedToDeleteLink= Erro ao eliminar a ligazón '<b>%s</b>'
+ErrorFailedToUpdateLink= Erro ao actualizar a ligazón '<b>%s</b>'
+URLToLink=URL a ligar
+OverwriteIfExists=Sobrescribir ficheiro se existe
diff --git a/htdocs/langs/gl_ES/mailmanspip.lang b/htdocs/langs/gl_ES/mailmanspip.lang
index bab4b3576b4..08dbb902cca 100644
--- a/htdocs/langs/gl_ES/mailmanspip.lang
+++ b/htdocs/langs/gl_ES/mailmanspip.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - mailmanspip
-MailmanSpipSetup=Mailman and SPIP module Setup
-MailmanTitle=Mailman mailing list system
-TestSubscribe=To test subscription to Mailman lists
-TestUnSubscribe=To test unsubscribe from Mailman lists
-MailmanCreationSuccess=Subscription test was executed successfully
-MailmanDeletionSuccess=Unsubscription test was executed successfully
-SynchroMailManEnabled=A Mailman update will be performed
-SynchroSpipEnabled=A Spip update will be performed
-DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
-DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
-DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
-DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
-SPIPTitle=SPIP Content Management System
-DescADHERENT_SPIP_SERVEUR=SPIP Server
-DescADHERENT_SPIP_DB=SPIP database name
-DescADHERENT_SPIP_USER=SPIP database login
-DescADHERENT_SPIP_PASS=SPIP database password
-AddIntoSpip=Add into SPIP
-AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
-AddIntoSpipError=Failed to add the user in SPIP
-DeleteIntoSpip=Remove from SPIP
-DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
-DeleteIntoSpipError=Failed to suppress the user from SPIP
-SPIPConnectionFailed=Failed to connect to SPIP
-SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
-SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
+MailmanSpipSetup=Configuración do módulo Mailman e SPIP
+MailmanTitle=Sistema de listaxes de correo Mailman
+TestSubscribe=Para comprobar a subscrición a listas Mailman
+TestUnSubscribe=Para comprobar a cancelación de subscricións a listas Mailman
+MailmanCreationSuccess=Subscrición de proba executada correctamente
+MailmanDeletionSuccess=Cancelación de subscrición de proba foi executada correctamente
+SynchroMailManEnabled=Unha actualización de Mailman será realizada
+SynchroSpipEnabled=Unha actualización de Spip será realizada
+DescADHERENT_MAILMAN_ADMINPW=Contrasinal de administrador Mailman
+DescADHERENT_MAILMAN_URL=URL para as subscricións Mailman
+DescADHERENT_MAILMAN_UNSUB_URL=URL para a cancelación de subscripcións Mailman
+DescADHERENT_MAILMAN_LISTS=Lista(s) para a subscripción automática dos novos membros (separados por comas)
+SPIPTitle=Sistema de xestión de contidos SPIP
+DescADHERENT_SPIP_SERVEUR=Servidor SPIP
+DescADHERENT_SPIP_DB=Nome da base de datos de SPIP
+DescADHERENT_SPIP_USER=Usuario da base de datos de SPIP
+DescADHERENT_SPIP_PASS=Contrasinal da base de datos de SPIP
+AddIntoSpip=Engadir a SPIP
+AddIntoSpipConfirmation=¿Está certo de querer engadir este membro a SPIP?
+AddIntoSpipError=Aconteceu un erro ao engadir o membro a SPIP
+DeleteIntoSpip=Eliminar de SPIP
+DeleteIntoSpipConfirmation=¿Está certo de querer eliminar este membro de SPIP?
+DeleteIntoSpipError=Aconteceu un erro ao eliminar o membro de SPIP
+SPIPConnectionFailed=Erro ao conectar con SPIP
+SuccessToAddToMailmanList=%s agregado con éxito a listaxe de mailman %s ou base de datos SPIP
+SuccessToRemoveToMailmanList=%s eliminado con éxito da listaxe de mailman %s ou base de datos SPIP
diff --git a/htdocs/langs/gl_ES/mails.lang b/htdocs/langs/gl_ES/mails.lang
index f3c5ab840b9..fa304de11c3 100644
--- a/htdocs/langs/gl_ES/mails.lang
+++ b/htdocs/langs/gl_ES/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Mails enviados por usuario
 MailingModuleDescDolibarrUsers=Usuarios con mails
 MailingModuleDescThirdPartiesByCategories=Terceiros (por categoría)
 SendingFromWebInterfaceIsNotAllowed=O envío dende a interfaz web non está permitido.
+EmailCollectorFilterDesc=Todos os filtros deben coincidir para recibir un correo electrónico
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Liña %s en ficheiro
@@ -106,9 +107,9 @@ SearchAMailing=Buscar un Mailing
 SendMailing=Enviar Mailing
 SentBy=Enviado por
 MailingNeedCommand=O envío dun mailing pode realizarse dende a liña de comandos. Solicite ao administrador do servidor que execute o siguiente comando para enviar o mailling a todos os destinatarios:
-MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
-ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
+MailingNeedCommand2=Porén, pode envialos en liña engadindo o parámetro MAILING_LIMIT_SENDBYWEB co valor do número máximo de correos electrónicos que desexa enviar por sesión. Para iso, vaia a Inicio-Configuración-Outro.
+ConfirmSendingEmailing=Se desexa enviar correos electrónicos directamente desde esta pantalla, confirme que está certo de querer enviar correos electrónicos agora desde o seu navegador?
+LimitSendingEmailing=Nota: o envío de mensaxes de correo electrónico desde a interface web faise varias veces por motivos de seguridade e tempo de espera, <b>%s</b> destinatarios á vez por cada sesión de envío.
 TargetsReset=Vaciar listaxe
 ToClearAllRecipientsClickHere=Para vaciar a listaxe dos destinatarios deste mailing, faga click no botón
 ToAddRecipientsChooseHere=Para engadir destinatarios, escolla os que figuran nas listaxes a continuación
@@ -125,22 +126,23 @@ TagMailtoEmail=Mail do destinatario (incluindo a ligazón html "mailto:")
 NoEmailSentBadSenderOrRecipientEmail=Non foi enviado o mail. O remitente ou destinatario é incorrecto. Comprobe os datos do usuario.
 # Module Notifications
 Notifications=Notificacións
-NoNotificationsWillBeSent=Ningunha notificación por mail está prevista para este evento e empresa
-ANotificationsWillBeSent=Unha notificación vai ser enviada por mail
-SomeNotificationsWillBeSent=%s notificaciones van ser enviadas por mail
-AddNewNotification=Activar un novo destinatario de notificacións
-ListOfActiveNotifications=Listaxe de destinatarios activos para notifiacións por mail
-ListOfNotificationsDone=Listaxe de notificacións enviadas
+NotificationsAuto=Notificacións Auto.
+NoNotificationsWillBeSent=Non hai previstas notificacións automáticas por correo electrónico para este tipo de evento e para esta empresa
+ANotificationsWillBeSent=Enviarase 1 notificación automática por correo electrónico
+SomeNotificationsWillBeSent=As notificacións automáticas de %s enviaranse por correo electrónico
+AddNewNotification=Subscribirse a unha nova notificación automática por correo electrónico (destino/evento)
+ListOfActiveNotifications=Lista todas as subscricións activas (obxectivos/eventos) para a notificación automática por correo electrónico
+ListOfNotificationsDone=Lista todas as notificacións automáticas enviadas por correo electrónico
 MailSendSetupIs=A configuración de mailings está a '%s'. Este modo non pode ser usado para enviar mails masivos.
 MailSendSetupIs2=Antes debe, cunha conta de administrador, no menú %sInicio - Configuración - E-Mails%s, cambiar o parámetro <strong>'%s'</strong> para usar o modo '%s'. Con este modo pode configurar un servidor SMTP do seu provedor de servizos de internet.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
-YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
-NbOfTargetedContacts=Current number of targeted contact emails
-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
+MailSendSetupIs3=Se ten algunha dúbida sobre como configurar o seu servidor SMTP, pode preguntar a %s.
+YouCanAlsoUseSupervisorKeyword=Tamén pode engadir a palabra clave <strong>__SUPERVISOREMAIL__</strong> para que se envíe un correo electrónico ao supervisor do usuario (só funciona se se define un correo electrónico para este supervisor)
+NbOfTargetedContacts=Número actual de correos electrónicos de contacto 
+UseFormatFileEmailToTarget=O ficheiro importado debe ter o formato <strong>email;name;name;other</strong>
+UseFormatInputEmailToTarget=Introduza unha cadea co formato <strong>email;name;firstname;other</strong>
+MailAdvTargetRecipients=Destinatarios (selección avanzada)
+AdvTgtTitle=Encha os campos de entrada para preseleccionar os terceiros ou os contactos/enderezos aos que desexa dirixirse
+AdvTgtSearchTextHelp=Use %% como comodíns. Por exemplo, para atopar todos os elementos como <b>jean, joe, jim</b>, pode introducir <b>j %% </b>, tamén pode usar; como separador de valor e usar ! para exceptuar este valor. Por exemplo <b>jean;joe;jim %% ;!jimo;!Jima %%</b> apuntará a todos jean, joe, ou comezaz con jim pero non jimo e non todo o que comeza con jima
 AdvTgtSearchIntHelp=Use un intervaldo para seleccionar valor int o float
 AdvTgtMinVal=Valor mínimo
 AdvTgtMaxVal=Valor máximo
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Crear filtro
 AdvTgtOrCreateNewFilter=Nome do novo filtro
 NoContactWithCategoryFound=Non atopáronse contactos/enderezos con algunha categoría
 NoContactLinkedToThirdpartieWithCategoryFound=Non atopáronse contactos/enderezos con algunha categoría
-OutGoingEmailSetup=Configuración do correo saínte
-InGoingEmailSetup=Configuración do correo entrante
-OutGoingEmailSetupForEmailing=Configuración do correo saínte (para correo masivo)
-DefaultOutgoingEmailSetup=Configuración do correo saínte predeterminada
+OutGoingEmailSetup=Configuración de correos electrónicos saíntes
+InGoingEmailSetup=Configuración de correos electrónicos entrantes
+OutGoingEmailSetupForEmailing=Configuración do correos electrónicos saíntes (para o módulo %s)
+DefaultOutgoingEmailSetup=A mesma configuración que a configuración de correos electrónicsoos saíntes predeterminados
 Information=Información
 ContactsWithThirdpartyFilter=Contactos con filtro de terceiros.
-Unanswered=Unanswered
-Answered=Answered
-IsNotAnAnswer=Is not answer (initial email)
-IsAnAnswer=Is an answer of an initial email
+Unanswered=Sen resposta
+Answered=Contestado
+IsNotAnAnswer=É unha resposta (a un coreo electrónico recibido)
+IsAnAnswer=É unha resposta de un coreo electrónico recibido
+RecordCreatedByEmailCollector=Rexistro creado polo receptor de correo electrónico %s a partir do correo electrónico %s
+DefaultBlacklistMailingStatus=Estado do contacto predeterminado para rexeitar correo electrónico masivo
+DefaultStatusEmptyMandatory=Baleiro pero obrigatorio
diff --git a/htdocs/langs/gl_ES/main.lang b/htdocs/langs/gl_ES/main.lang
index 5ccf9173975..affae88508a 100644
--- a/htdocs/langs/gl_ES/main.lang
+++ b/htdocs/langs/gl_ES/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Sen prantilla dispoñible para este tipo de e-mail
 AvailableVariables=Variables de substitución dispoñibles
 NoTranslation=Sen tradución
 Translation=Tradución
-EmptySearchString=Enter non empty search criterias
+CurrentTimeZone=Zona horaria PHP (Servidor)
+EmptySearchString=Entre unha cadea de busca non baleira
+EnterADateCriteria=Engadir un criterio de data
 NoRecordFound=Non atopáronse rexistros
 NoRecordDeleted=Non foi eliminado o rexistro
 NotEnoughDataYet=Non hai suficintes datos
@@ -37,18 +39,18 @@ Error=Erro
 Errors=Errores
 ErrorFieldRequired=O campo '%s' é obrigatorio
 ErrorFieldFormat=O campo '%s' ten un valor incorrecto
-ErrorFileDoesNotExists=O arquivo %s non existe
-ErrorFailedToOpenFile=Fallou ao abrir o arquivo %s
+ErrorFileDoesNotExists=O ficheiro %s non existe
+ErrorFailedToOpenFile=Fallou ao abrir o ficheiro %s
 ErrorCanNotCreateDir=Non pode crear o directorio %s
 ErrorCanNotReadDir=Non pode ler o directorio %s
 ErrorConstantNotDefined=Parámetro %s non definido
 ErrorUnknown=Erro descoñecido
 ErrorSQL=Erro de SQL
-ErrorLogoFileNotFound=O arquivo do logo '%s' non atópase
+ErrorLogoFileNotFound=O ficheiro do logo '%s' non atópase
 ErrorGoToGlobalSetup=Vaia á configuración 'Empresa/Organización' para corrixir isto
 ErrorGoToModuleSetup=Vaia á configuración do módulo para corrixir isto
 ErrorFailedToSendMail=Erro no envío do e-mail (emisor=%s, destinatario=%s)
-ErrorFileNotUploaded=Non foi posible actualizar o arquivo. Revisa que o tamaño non excede o máximo permitido, que hai espazo libre no disco e que non hai xa un arquivo co mesmo nome no directorio.
+ErrorFileNotUploaded=Non foi posible actualizar o ficheiro. Revisa que o tamaño non excede o máximo permitido, que hai espazo libre no disco e que non hai xa un ficheiro co mesmo nome no directorio.
 ErrorInternalErrorDetected=Erro detectado
 ErrorWrongHostParameter=Parámetro do servidor erroneo
 ErrorYourCountryIsNotDefined=O seu país non está definido. Vaia ao Inicio-Configuración-Edición e cubra novamente o formulario
@@ -59,7 +61,7 @@ ErrorNoRequestInError=Ningunha petición con erro
 ErrorServiceUnavailableTryLater=Servizo non dispoñible actualmente. Ténteo de novo mais tarde.
 ErrorDuplicateField=Valor duplicado nun único campo
 ErrorSomeErrorWereFoundRollbackIsDone=Atopáronse algúns erros. Modificacións desfeitas.
-ErrorConfigParameterNotDefined=O parámetro <b>%s</b> no está definido no   arquivo de configuración Dolibarr <b>conf.php</b>.
+ErrorConfigParameterNotDefined=O parámetro <b>%s</b> no está definido no ficheiro de configuración Dolibarr <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Imposible atopar ao usuario <b>%s</b> na base de datos Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Error, ningún tipo de IVE definido para o país '%s'.
 ErrorNoSocialContributionForSellerCountry=Erro, ningún tipo de taxa social/fiscal definida para o país '%s'.
@@ -75,16 +77,18 @@ ClickHere=Faga clic aquí
 Here=Aquí
 Apply=Aplicar
 BackgroundColorByDefault=Cor de fondo por defecto
-FileRenamed=O arquivo foi renomeado correctamente
-FileGenerated=O arquivo fo xerado correctamente
-FileSaved=O arquivo foi gardado correctamente
-FileUploaded=O arquivo subiuse correctamente
+FileRenamed=O ficheiro foi renomeado correctamente
+FileGenerated=O ficheiro fo xerado correctamente
+FileSaved=O ficheiro foi gardado correctamente
+FileUploaded=O ficheiro subiuse correctamente
 FileTransferComplete=Ficheiro(s) subidos(s) correctamente
 FilesDeleted=Ficheiros(s) eliminados correctamente
-FileWasNotUploaded=Un ficheiro foi seleccionado para axuntar, pero ainda non foi subido. Faga clic en "Axuntar este arquivo" para subilo.
+FileWasNotUploaded=Un ficheiro foi seleccionado para axuntar, pero ainda non foi subido. Faga clic en "Axuntar este ficheiro" para subilo.
 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
+HomePage=Páxina Inicio
 RecordSaved=Rexistro gardado
 RecordDeleted=Rexistro eliminado
 RecordGenerated=Registro xerado
@@ -109,7 +113,7 @@ RequestLastAccessInError=Último acceso á base de datos con erro na solicitude
 ReturnCodeLastAccessInError=Código de retorno de acceso á base de datos con erro para a última petición
 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 arquivo log ou establecer a opción $dolibarr_main_prod a '0' no seu arquivo de configuración para obter mais información.
+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)
 MoreInformation=Mais información
 TechnicalInformation=Información técnica
@@ -150,12 +154,12 @@ Deprecated=Obsoleto
 Disable=Desactivar
 Disabled=Desactivado
 Add=Engadir
-AddLink=Víncular
-RemoveLink=Eliminar vínculo
+AddLink=Ligar
+RemoveLink=Eliminar ligazón
 AddToDraft=Engadir a borrador
 Update=Actualizar
 Close=Pechar
-CloseAs=Set status to
+CloseAs=Establecer estado a
 CloseBox=Eliminar panel do seu taboleiro
 Confirm=Confirmar
 ConfirmSendCardByMail=¿Realmente quere enviar o contido desta ficha por correo a <b>%s</b>?
@@ -188,16 +192,16 @@ ShowCardHere=Ver a ficha
 Search=Procurar
 SearchOf=Procura
 SearchMenuShortCut=Ctrl + shift + f
-QuickAdd=Quick add
+QuickAdd=Engadido rápido
 QuickAddMenuShortCut=Ctrl + shift + l
 Valid=Validar
 Approve=Aprobar
 Disapprove=Desaprobar
 ReOpen=Reabrir
-Upload=Actualizar arquivo
-ToLink=Vínculo
+Upload=Actualizar ficheiro
+ToLink=Ligazón
 Select=Seleccionar
-SelectAll=Select all
+SelectAll=Seleccionar todo
 Choose=Escoller
 Resize=Redimensionar
 ResizeOrCrop=Cambiar o tamaño ou cortar
@@ -220,6 +224,7 @@ Value=Valor
 PersonalValue=Valor persoalizado
 NewObject=Novo %s
 NewValue=Novo valor
+OldValue=Valor anterior %s
 CurrentValue=Valor actual
 Code=Código
 Type=Tipo
@@ -249,7 +254,7 @@ Limits=Límites
 Logout=Desconectar
 NoLogoutProcessWithAuthMode=Sen funcionalidades de desconexión co modo de autenticación <b>%s</b>
 Connection=Usuario
-Setup=Config.
+Setup=Configuración
 Alert=Alerta
 MenuWarnings=Alertas
 Previous=Anterior
@@ -267,10 +272,10 @@ DateStart=Data de inicio
 DateEnd=Data de fin
 DateCreation=Data de creación
 DateCreationShort=Data creac.
-IPCreation=Creation IP
+IPCreation=Asignación IP
 DateModification=Data de modificación
 DateModificationShort=Data modif.
-IPModification=Modification IP
+IPModification=Modificación IP
 DateLastModification=Última data de modificación
 DateValidation=Data de validación
 DateClosing=Data de peche
@@ -324,7 +329,7 @@ Morning=Na mañá
 Afternoon=Na tarde
 Quadri=Trimestre
 MonthOfDay=Mes do día
-DaysOfWeek=Days of week
+DaysOfWeek=Días da semana
 HourShort=H
 MinuteShort=min
 Rate=Tipo
@@ -362,7 +367,7 @@ Amount=Importe
 AmountInvoice=Importe factura
 AmountInvoiced=Importe facturado
 AmountInvoicedHT=Importe facturado (excl. tax)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoicedTTC=Importe facturado (incl. tax)
 AmountPayment=Importe pagamento
 AmountHTShort=Base imp.
 AmountTTCShort=Importe
@@ -375,7 +380,7 @@ MulticurrencyPaymentAmount=Importe total na divisa orixinal
 MulticurrencyAmountHT=Base impoñible na divisa orixinal
 MulticurrencyAmountTTC=Total na divisa orixinal
 MulticurrencyAmountVAT=Importe IVE na divisa orixinal
-MulticurrencySubPrice=Amount sub price multi currency
+MulticurrencySubPrice=Cantidade sub prezo divisa orixinal
 AmountLT1=Importe Imposto 2
 AmountLT2=Importe IRPF
 AmountLT1ES=Importe RE
@@ -433,9 +438,10 @@ RemainToPay=Resta por pagar
 Module=Módulo/Aplicación
 Modules=Módulos/Aplicacións
 Option=Opción
+Filters=Filtros
 List=Listaxe
 FullList=Listaxe completo
-FullConversation=Full conversation
+FullConversation=Conversa completa
 Statistics=Estatísticas
 OtherStatistics=Outras estatísticas
 Status=Estado
@@ -494,7 +500,7 @@ By=Por
 From=De
 FromDate=De
 FromLocation=De
-at=at
+at=a
 to=a
 To=a
 and=e
@@ -517,7 +523,7 @@ Draft=Borrador
 Drafts=Borradores
 StatusInterInvoiced=Facturado
 Validated=Validado
-ValidatedToProduce=Validated (To produce)
+ValidatedToProduce=Valido (A fabricar)
 Opened=Activo
 OpenAll=Aberto (todo)
 ClosedAll=Pechado (Todo)
@@ -533,7 +539,7 @@ Topic=Asunto
 ByCompanies=Por terceiros
 ByUsers=Por usuario
 Links=Ligazóns
-Link=Vínculo
+Link=Ligazón
 Rejects=Devolucións
 Preview=Vista previa
 NextStep=Seguinte paso
@@ -650,6 +656,7 @@ SupplierPreview=Historial provedor
 ShowCustomerPreview=Amosar historial do cliente
 ShowSupplierPreview=Amosar historial do provedor
 RefCustomer=Ref. cliente
+InternalRef=Ref. interna
 Currency=Moeda
 InfoAdmin=Información para os administradores
 Undo=Anular
@@ -668,7 +675,7 @@ NotSent=Non enviado
 TextUsedInTheMessageBody=Texto no corpo da mensaxe
 SendAcknowledgementByMail=Enviar correo de confirmación
 SendMail=Enviar correo
-Email=E-mail
+Email=Correo electrónico
 NoEMail=Sen e-mail
 AlreadyRead=Xá lido
 NotRead=Non lido
@@ -677,7 +684,7 @@ Owner=Propietario
 FollowingConstantsWillBeSubstituted=As seguintes constantes serán substituidas polo seu valor correspondente.
 Refresh=Refrescar
 BackToList=Voltar á listaxe
-BackToTree=Back to tree
+BackToTree=Volta á árbore
 GoBack=Voltar atrás
 CanBeModifiedIfOk=Pode modificarse se é valido
 CanBeModifiedIfKo=Pode modificarse se non é valido
@@ -691,14 +698,14 @@ RecordsGenerated=%s rexistro(s) xerado(s)
 AutomaticCode=Creación automática de código
 FeatureDisabled=Función desactivada
 MoveBox=Mover panel
-Offered=Oferta
+Offered=Sen cargo
 NotEnoughPermissions=Non ten permisos para esta acción
 SessionName=Nome sesión
 Method=Método
 Receive=Recepción
-CompleteOrNoMoreReceptionExpected=Completado ou no agárdase mais
+CompleteOrNoMoreReceptionExpected=Completado ou non agárdase mais
 ExpectedValue=Valor agardado
-ExpectedQty=Expected Qty
+ExpectedQty=Cant. agardada
 PartialWoman=Parcial
 TotalWoman=Total
 NeverReceived=Nunca recibido
@@ -715,7 +722,7 @@ MenuECM=Documentos
 MenuAWStats=AWStats
 MenuMembers=Membros
 MenuAgendaGoogle=Axenda Google
-MenuTaxesAndSpecialExpenses=Taxes | Special expenses
+MenuTaxesAndSpecialExpenses=Taxas | Gastos especiais
 ThisLimitIsDefinedInSetup=Límite Dolibarr (Menú Inicio-configuración-seguridade): %s Kb, PHP limit: %s Kb
 NoFileFound=Non hai documentos gardados neste directorio
 CurrentUserLanguage=Idioma actual
@@ -729,16 +736,16 @@ For=Para
 ForCustomer=Para cliente
 Signature=Sinatura
 DateOfSignature=Data da sinatura
-HidePassword=Amosar comando con contrasinal oculta
+HidePassword=Amosar comando con contrasinal oculto
 UnHidePassword=Amosar comando con contrasinal á vista
 Root=Raíz
-RootOfMedias=Root of public medias (/medias)
+RootOfMedias=Raiz de medias públicas (/medias)
 Informations=Información
 Page=Páxina
 Notes=Notas
 AddNewLine=Engadir nova liña
-AddFile=Engadir arquivo
-FreeZone=Free-text product
+AddFile=Engadir ficheiro
+FreeZone=Sen produtos/servizos predefinidos
 FreeLineOfType=Entrada libre, tipo:
 CloneMainAttributes=Clonar o obxecto con estes atributos principais
 ReGeneratePDF=Xerar de novo o PDF
@@ -751,7 +758,7 @@ WarningYouAreInMaintenanceMode=Atención, está en modo mantemento, só o login
 CoreErrorTitle=Erro de sistema
 CoreErrorMessage=O sentimos, pero aconteceu un erro. Póñase en contacto co administrador do sistema para comprobar os rexistros ou desactive $dolibarr_main_prod=1 para obter mais información.
 CreditCard=Tarxeta de crédito
-ValidatePayment=Validar pago
+ValidatePayment=Validar pagamento
 CreditOrDebitCard=Tarxeta de crédito ou débito
 FieldsWithAreMandatory=Os campos marcados cun <b>%s</b> son obrigatorios
 FieldsWithIsForPublic=Os campos marcados co <b>%s</b> amosaránse na lista pública de membros. Se non desexa velos, desactive a caixa "público".
@@ -761,7 +768,7 @@ NotSupported=Non soportado
 RequiredField=Campo obrigatorio
 Result=Resultado
 ToTest=Probar
-ValidateBefore=Item must be validated before using this feature
+ValidateBefore=Para poder usar esta función debe validarse a ficha
 Visibility=Visibilidade
 Totalizable=Totalizable
 TotalizableDesc=Este campo é totalizable nas listaxes
@@ -778,18 +785,18 @@ IM=Mensaxería instantánea
 NewAttribute=Novo atributo
 AttributeCode=Código
 URLPhoto=Url da foto/logo
-SetLinkToAnotherThirdParty=Vincular a outro terceiro
-LinkTo=Vincular a
-LinkToProposal=Vincular a pedido
-LinkToOrder=Vincular a pedido
-LinkToInvoice=Vincular a factura
-LinkToTemplateInvoice=Vincular a prantilla de factura
-LinkToSupplierOrder=Vincular a pedido a provedor
-LinkToSupplierProposal=Vincular a orzamento de provedor
-LinkToSupplierInvoice=Vincular a factura de provedor
-LinkToContract=Vincular a contrato
-LinkToIntervention=Vincular a intervención
-LinkToTicket=Link to ticket
+SetLinkToAnotherThirdParty=Ligar a outro terceiro
+LinkTo=Ligar a
+LinkToProposal=Ligar a orzamento
+LinkToOrder=Ligar a pedimento
+LinkToInvoice=Ligar a factura
+LinkToTemplateInvoice=Ligar a prantilla de factura
+LinkToSupplierOrder=Ligar a pedimento a provedor
+LinkToSupplierProposal=Ligar a orzamento de provedor
+LinkToSupplierInvoice=Ligar a factura de provedor
+LinkToContract=Ligar a contrato
+LinkToIntervention=Ligar a intervención
+LinkToTicket=Ligar a ticket
 CreateDraft=Crear borrador
 SetToDraft=Voltar a borrador
 ClickToEdit=Clic para editar
@@ -823,8 +830,8 @@ Access=Acceso
 SelectAction=Seleccione acción
 SelectTargetUser=Seleccionar usuario/empregado de destino
 HelpCopyToClipboard=Use Ctrl+C para copiar ao portapapeis
-SaveUploadedFileWithMask=Gardar o arquivo no servidor co nome "<strong>%s</strong>" (senón "%s")
-OriginFileName=Nome do arquivo orixe
+SaveUploadedFileWithMask=Gardar o ficheiro no servidor co nome "<strong>%s</strong>" (senón "%s")
+OriginFileName=Nome do ficheiro orixe
 SetDemandReason=Definir orixe
 SetBankAccount=Definir conta bancaria
 AccountCurrency=Moeda da conta
@@ -857,12 +864,12 @@ Sincerely=Atentamente
 ConfirmDeleteObject=¿Está certo de querer eliminar esta liña?
 DeleteLine=Eliminación de liña
 ConfirmDeleteLine=¿Está certo de querer eliminar esta liña?
-ErrorPDFTkOutputFileNotFound=Error: the file was not generated. Please check that the 'pdftk' command is installed in a directory included in the $PATH environment variable (linux/unix only) or contact your system administrator.
+ErrorPDFTkOutputFileNotFound=Erro: o ficheiro non foi xerado. Comprobe que o comando 'pdftk' está instalado nun directorio incluído na variable de entorno $ PATH (só linux / unix) ou contacte co administrador do sistema.
 NoPDFAvailableForDocGenAmongChecked=Sen PDF dispoñibles para a xeración de documentos entre os rexistros seleccionados
 TooManyRecordForMassAction=Demasiados rexistros seleccionados para a acción masiva. A acción está restrinxida a unha listaxe de %s rexistros.
 NoRecordSelected=Sen rexistros seleccionados
-MassFilesArea=Área de arquivos xerados por accións masivas
-ShowTempMassFilesArea=Amosar área de arquivos xerados por accións masivas
+MassFilesArea=Área de ficheiros xerados por accións masivas
+ShowTempMassFilesArea=Amosar área de ficheiros xerados por accións masivas
 ConfirmMassDeletion=Confirmación borrado masivo
 ConfirmMassDeletionQuestion=¿Estás certo de querer eliminar os %s rexistro(s) seleccionado(s)?
 RelatedObjects=Obxectos relacionados
@@ -888,8 +895,8 @@ Miscellaneous=Miscelánea
 Calendar=Calendario
 GroupBy=Agrupado por...
 ViewFlatList=Ver listaxe plana
-ViewAccountList=View ledger
-ViewSubAccountList=View subaccount ledger
+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>.
 DirectDownloadLink=Ligazón de descarga directa (público/externo)
@@ -915,7 +922,7 @@ ConfirmSetToDraft=¿Está certo de querer voltar ao estado Borrador?
 ImportId=ID de importación
 Events=Eventos
 EMailTemplates=Prantillas E-mail
-FileNotShared=Arquivo non compartido ao público externo
+FileNotShared=Ficheiro non compartido ao público externo
 Project=Proxecto
 Projects=Proxectos
 LeadOrProject=Oportunidade | Proxecto
@@ -930,7 +937,7 @@ LineNb=Líña no.
 IncotermLabel=Incoterms
 TabLetteringCustomer=Letras do cliente
 TabLetteringSupplier=Letras do provedor
-Monday=lúns
+Monday=luns
 Tuesday=martes
 Wednesday=mércores
 Thursday=xoves
@@ -944,7 +951,7 @@ ThursdayMin=Xo
 FridayMin=Ve
 SaturdayMin=Sa
 SundayMin=Do
-Day1=lúns
+Day1=luns
 Day2=martes
 Day3=mércores
 Day4=xoves
@@ -958,39 +965,39 @@ ShortThursday=X
 ShortFriday=V
 ShortSaturday=S
 ShortSunday=D
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
-sixteen=sixteen
-seventeen=seventeen
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
-million=million
-billion=billion
-trillion=trillion
-quadrillion=quadrillion
+one=un
+two=dous
+three=tres
+four=catro
+five=cinco
+six=seis
+seven=sete
+eight=oito
+nine=nove
+ten=dez
+eleven=once
+twelve=doce
+thirteen=trece
+fourteen=catorce
+fifteen=quince
+sixteen=dezaseis
+seventeen=dezasete
+eighteen=dezaoito
+nineteen=dezanove
+twenty=vinte
+thirty=trinta
+forty=corenta
+fifty=cincuente
+sixty=sesenta
+seventy=setenta
+eighty=oitenta
+ninety=noventa
+hundred=cen
+thousand=mil
+million=millón
+billion=billón
+trillion=trillón
+quadrillion=quadrillón
 SelectMailModel=Seleccione unha prantilla de correo
 SetRef=Establecer ref
 Select2ResultFoundUseArrows=Algúns resultados atopados. Use as frechas para seleccionar.
@@ -1021,7 +1028,7 @@ SearchIntoCustomerShipments=Envíos a clientes
 SearchIntoExpenseReports=Informes de gastos
 SearchIntoLeaves=Día libre
 SearchIntoTickets=Tickets
-SearchIntoCustomerPayments=Customer payments
+SearchIntoCustomerPayments=Pagamentos dos clientes
 SearchIntoVendorPayments=Pagamentos a provedores
 SearchIntoMiscPayments=Pagamentos varios
 CommentLink=Comentarios
@@ -1042,7 +1049,7 @@ KeyboardShortcut=Atallo de teclado
 AssignedTo=Asignada a
 Deletedraft=Eliminar borrador
 ConfirmMassDraftDeletion=Confirmación de borrado en masa
-FileSharedViaALink=Ficheiro compartido ao través dun vínculo
+FileSharedViaALink=Ficheiro compartido ao través dunha ligazón
 SelectAThirdPartyFirst=Selecciona un terceiro antes...
 YouAreCurrentlyInSandboxMode=Estás actualmente no modo %s "sandbox"
 Inventory=Inventario
@@ -1078,32 +1085,38 @@ ContactAddedAutomatically=Engadido contacto dende os contactos de terceiros
 More=Mais
 ShowDetails=Amosar detalles
 CustomReports=Informe de custos
-StatisticsOn=Statistics on
-SelectYourGraphOptionsFirst=Select your graph options to build a graph
+StatisticsOn=Estatísticas en
+SelectYourGraphOptionsFirst=Seleccione as súas opcións de gráfico para construir un gráfico
 Measures=Medidas
-XAxis=X-Eixes
-YAxis=Y-Eixes
-StatusOfRefMustBe=Status de %s debe ser %s
-DeleteFileHeader=Confirmar borrado de ficheiro
+XAxis=X-Eixe
+YAxis=Y-Eixe
+StatusOfRefMustBe=O estado de %s ten que ser %s
+DeleteFileHeader=Confirmar ficheiro a eliminar
 DeleteFileText=Está certo de querer borrar este ficheiro?
-ShowOtherLanguages=Amosar outras linguas
-SwitchInEditModeToAddTranslation=Cambiar a modo edición para axuntar traducións a esta lingua
-NotUsedForThisCustomer=Non usado para este cliente
-AmountMustBePositive=Importe ten que ser positivo
+ShowOtherLanguages=Amosar outras lingoas
+SwitchInEditModeToAddTranslation=Cambie ao modo de edición para engadir traduciáns a esta lingoa
+NotUsedForThisCustomer=Non usado neste cliente
+AmountMustBePositive=O importe ten que ser positivo
 ByStatus=By status
 InformationMessage=Información
-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
+Used=Usado
+ASAP=Tan pronto como sexa posible
+CREATEInDolibarr=Rexistro %s creado
+MODIFYInDolibarr=Rexistro %s modificado
+DELETEInDolibarr=Rexistro %s eliminado
+VALIDATEInDolibarr=Rexistro %s validado
+APPROVEDInDolibarr=Rexistro %s aprobado
+DefaultMailModel=Modelo de correo predeterminado
+PublicVendorName=Nome público do provedor
+DateOfBirth=Data de nacemento
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=O token de seguridade caducou e a acción foi cancelada. Prégase intente de novo
+UpToDate=Ao día
+OutOfDate=Caducado
+EventReminder=Recordatorio de evento
+UpdateForAllLines=Actualizar todas as liñas
+OnHold=Agardando
+Civility=Cortesía
+AffectTag=Poñer etiqueta
+ConfirmAffectTag=Poñer etiqueta masiva
+ConfirmAffectTagQuestion=Está certo de que quere poñer ás etiquetas dos rexistros seleccionados %s?
+CategTypeNotFound=Non se atopou ningún tipo de etiqueta para o tipo de rexistros
diff --git a/htdocs/langs/gl_ES/members.lang b/htdocs/langs/gl_ES/members.lang
index 819a5522627..aefe3b7e52d 100644
--- a/htdocs/langs/gl_ES/members.lang
+++ b/htdocs/langs/gl_ES/members.lang
@@ -11,7 +11,7 @@ MembersTickets=Etiquetas membros
 FundationMembers=Membros da asociación
 ListOfValidatedPublicMembers=Listaxe de membros públicos validados
 ErrorThisMemberIsNotPublic=Este membro non é público
-ErrorMemberIsAlreadyLinkedToThisThirdParty=Outro membro (nombre: <b>%s</b>, login: <b>%s</b>) está ligado ao terceiro <b>%s</b>. Elimine a ligazón existente xa que un terceiro só pode estar ligado a un só membro (e viceversa).
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Outro membro (nome: <b>%s</b>, login: <b>%s</b>) está ligado ao terceiro <b>%s</b>. Elimine a ligazón existente xa que un terceiro só pode estar ligado a un só membro (e viceversa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Por razóns de seguridade, debe posuir os dereitos de modificación de todos os usuarios para poder ligar un membro a un usuario que non sexa vostede mesmo mesmo.
 SetLinkToUser=Ligar a un usuario Dolibarr
 SetLinkToThirdParty=Ligar a un terceiro Dolibarr
@@ -19,8 +19,8 @@ MembersCards=Carnés de membros
 MembersList=Listaxe de membros
 MembersListToValid=Listaxe de membros borrador (a validar)
 MembersListValid=Listaxe de membros validados
-MembersListUpToDate=List of valid members with up-to-date subscription
-MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListUpToDate=Lista de membros válidos con subscrición actualizada
+MembersListNotUpToDate=Lista de membros válidos con data vencida na subscrición
 MembersListResiliated=Listaxe dos membros dados de baixa
 MembersListQualified=Listaxe dos membros cualificados
 MenuMembersToValidate=Membros borrador
@@ -32,7 +32,7 @@ DateSubscription=Data afiliación
 DateEndSubscription=Data fin afiliación
 EndSubscription=Fin afiliación
 SubscriptionId=ID afiliación
-WithoutSubscription=Without subscription
+WithoutSubscription=Sen subscrición
 MemberId=ID membro
 NewMember=Novo membro
 MemberType=Tipo de membro
@@ -64,23 +64,23 @@ ConfirmDeleteMemberType=¿Está certo de querer eliminar este tipo de membro?
 MemberTypeDeleted=Tipo de membro eliminado
 MemberTypeCanNotBeDeleted=O tipo de membro non pode ser eliminado
 NewSubscription=Nova afiliación
-NewSubscriptionDesc=Utilice este formulario para rexistrarse como un novo membro daa asociación. Para unha renovación, se xa é membro, póñase en contacto coa asociación ao través do mail %s.
+NewSubscriptionDesc=Utilice este formulario para rexistrarse como un novo membro da asociación. Para unha renovación, se xa é membro, póñase en contacto coa asociación ao través do mail %s.
 Subscription=Afiliación
 Subscriptions=Afiliacións
 SubscriptionLate=En atraso
 SubscriptionNotReceived=Afiliación non recibida
 ListOfSubscriptions=Listaxe de afiliacións
-SendCardByMail=Enviar ficha por mail
+SendCardByMail=Enviar ficha por correo electrónico
 AddMember=Crear membro
 NoTypeDefinedGoToSetup=Ningún tipo de membro definido. Vaia a Configuración -> Tipos de membros
 NewMemberType=Novo tipo de membro
 WelcomeEMail=E-mail
-SubscriptionRequired=Precisa afilición
+SubscriptionRequired=Precisa afiliación
 DeleteType=Eliminar
 VoteAllowed=Voto autorizado
 Physical=Físico
 Moral=Xurídico
-MorAndPhy=Moral and Physical
+MorAndPhy=Xurídico e Físico
 Reenable=Reactivar
 ResiliateMember=Dar de baixa a un membro
 ConfirmResiliateMember=¿Está certo de querer dar de baixa a este membro?
@@ -116,7 +116,7 @@ SendingEmailOnMemberValidation=Enviar mail na validación dun novo membro
 SendingEmailOnNewSubscription=Enviar mail nunha nova afiliación
 SendingReminderForExpiredSubscription=Enviar un recordatorio para afiliación caducada
 SendingEmailOnCancelation=Enviar mail nunha cancelación
-SendingReminderActionComm=Sending reminder for agenda event
+SendingReminderActionComm=Enviando lembranzas desde os eventos da axenda
 # Topic of email templates
 YourMembershipRequestWasReceived=A súa membresía foi recibida.
 YourMembershipWasValidated=A súa membresía foi validada.
@@ -125,26 +125,26 @@ SubscriptionReminderEmail=Recordatorio de afiliación
 YourMembershipWasCanceled=A súa membresía foi cancelada.
 CardContent=Contido da súa ficha de membro
 # Text of email templates
-ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
-ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
-ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
-ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender Email for automatic emails
-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
+ThisIsContentOfYourMembershipRequestWasReceived=Queremos comunicarlle que se recibiu a súa solicitude de adhesión <br><br>
+ThisIsContentOfYourMembershipWasValidated=Queremos comunicarlle que a súa subscrición foi validada coa seguinte información:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=Queremos comunicarlle de que se rexistrou a súa nova subscrición<br><br>
+ThisIsContentOfSubscriptionReminderEmail=Queremos comunicarlle que a súa subscrición está a piques de caducar ou xa caducou (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Agardamos que a renove<br><br>
+ThisIsContentOfYourCard=Este é un resumo da información que temos sobre vostede. Póñase en contacto connosco se hai algo incorrecto<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Asunto do correo electrónico de notificación recibido en caso de inscrición automática dun convidado
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Contido do correo electrónico de notificación recibido en caso de inscrición automática dun convidado
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Modelo de correo electrónico para usar para envios de correo electrónico a membros na subscrición automática de membros
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Modelo de correo electrónico para usar para enviar correo electrónico a membros coa validación de membros
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Modelo de correo electrónico para usar para enviar correo electrónico a membros na nova gravación de subscrición
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Modelo de correo electrónico para usar para enviar recordatorios cando a subscrición está a piques de caducar
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Modelo de correo electrónico a usar para enviar a membros ao cancelar a subscrición
+DescADHERENT_MAIL_FROM=Correo electrónico do remitente para correos electrónicos automáticos
+DescADHERENT_ETIQUETTE_TYPE=Formato de páxinas de etiquetas
+DescADHERENT_ETIQUETTE_TEXT=Texto impreso nas follas de enderezos dos membros
+DescADHERENT_CARD_TYPE=Formato de páxinas de tarxetas
+DescADHERENT_CARD_HEADER_TEXT=Texto impreso na parte superior das tarxetas de membro
+DescADHERENT_CARD_TEXT=Texto impreso nas tarxetas de membro (aliñar á esquerda)
+DescADHERENT_CARD_TEXT_RIGHT=Texto impreso nas tarxetas de membro (aliñar á dereita)
+DescADHERENT_CARD_FOOTER_TEXT=Texto impreso na parte inferior das tarxetas de membro
 ShowTypeCard=Ver tipo '%s'
 HTPasswordExport=Xeración archivo htpassword
 NoThirdPartyAssociatedToMember=Ningún terceiro asociado a este membro
@@ -167,7 +167,7 @@ MembersStatisticsByState=Estatísticas de membros por provincia/pais
 MembersStatisticsByTown=Estatísticas de membros por poboación
 MembersStatisticsByRegion=Estatísticas de membros por rexión
 NbOfMembers=Número de membros
-NbOfActiveMembers=Number of current active members
+NbOfActiveMembers=Número de membros activos actuais
 NoValidatedMemberYet=Ningún membro validado atopado
 MembersByCountryDesc=Esta pantalla presenta unha estatística do número de membros por países. Porén, a gráfica utiliza o servizo en líña  de gráficas de Google e só é operativo cando ten operativa unha conexión a Internet.
 MembersByStateDesc=Esta pantalla presenta unha estatística do número de membros por paises/provincias/comunidades
@@ -177,7 +177,7 @@ MenuMembersStats=Estatísticas
 LastMemberDate=Última data de membro
 LatestSubscriptionDate=Data da última cotización
 MemberNature=Natureza do membro
-MembersNature=Nature of members
+MembersNature=Natureza dos membros
 Public=Información pública
 NewMemberbyWeb=Novo membro engadido. Agardando validación
 NewMemberForm=Novo formulario de membro
diff --git a/htdocs/langs/gl_ES/modulebuilder.lang b/htdocs/langs/gl_ES/modulebuilder.lang
index 460aef8103b..c5e4535245b 100644
--- a/htdocs/langs/gl_ES/modulebuilder.lang
+++ b/htdocs/langs/gl_ES/modulebuilder.lang
@@ -1,142 +1,143 @@
 # 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
-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=Go to 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 you want to execute for each business event executed.
-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=(Delete 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
-ModuleMustBeEnabled=The module/application must be enabled first
-IncludeRefGeneration=The reference of object must be generated automatically
-IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
-IncludeDocGeneration=I want to generate some documents from the object
-IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
-ShowOnCombobox=Show value into combobox
-KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
-NotEditable=Not editable
-ForeignKey=Foreign key
-TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
-AsciiToHtmlConverter=Ascii to HTML converter
-AsciiToPdfConverter=Ascii to PDF converter
-TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+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>.
+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>
+ModuleBuilderDesc3=Atopáronse módulos xerados/editables: <strong>%s </strong>
+ModuleBuilderDesc4=Detéctase un módulo como "editable" cando o ficheiro <strong>%s </strong> existe no raíz do directorio do módulo
+NewModule=Novo
+NewObjectInModulebuilder=Novo obxecto
+ModuleKey=Chave de módulo
+ObjectKey=Chave do obxecto
+ModuleInitialized=Módulo inicializado
+FilesForObjectInitialized=Os ficheiros do novo obxecto '%s' inicializados
+FilesForObjectUpdated=Actualizáronse os ficheiros do obxecto '%s' (ficheiros .sql e ficheiro .class.php)
+ModuleBuilderDescdescription=Introduza aquí toda a información xeral que describe o seu módulo.
+ModuleBuilderDescspecifications=Pode introducir aquí unha descrición detallada das especificacións do seu módulo que aínda non están estruturadas noutras lapelas. Entón ten ao seu alcance todas as regras a desenvolver. Este contido de texto tamén se incluirá na documentación xerada (ver última lapela). Podes usar o formato Markdown, pero recoméndase usar o formato Asciidoc (comparación entre .md e .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Defina aquí os obxectos que desexa xestionar co seu módulo. Xerarase unha clase DAO CRUD, ficheiros SQL, páxina para listar o rexistro de obxectos, para crear/editar/ver un rexistro e unha API.
+ModuleBuilderDescmenus=Esta guía está adicada a definir as entradas de menú proporcionadas polo seu módulo.
+ModuleBuilderDescpermissions=Esta guía está adicada a definir os novos permisos que desexa proporcionar co seu módulo.
+ModuleBuilderDesctriggers=Esta é a vista dos triggers proporcionados polo seu módulo. Para incluír o código executado cando se inicia un evento comercial desencadeado, só ten que editar este ficheiro.
+ModuleBuilderDeschooks=Esta lapela está adicada aos hooks.
+ModuleBuilderDescwidgets=Esta guía está adicada a xestionar/construír widgets.
+ModuleBuilderDescbuildpackage=Pode xerar aquí un ficheiro de paquete "listo para distribuír" (un ficheiro .zip normalizado) do seu módulo e un ficheiro de documentación "listo para distribuír". Só ten que facer clic no botón para crear o paquete ou o ficheiro de documentación.
+EnterNameOfModuleToDeleteDesc=Pode eliminar o seu módulo. AVISO: Eliminaranse todos os ficheiros de codificación do módulo (xerados ou creados manualmente) E os datos estruturados e a documentación.
+EnterNameOfObjectToDeleteDesc=Pode eliminar un obxecto. AVISO: Eliminaranse todos os ficheiros de codificación (xerados ou creados manualmente) relacionados co obxecto.
+DangerZone=Zona de perigo
+BuildPackage=Construír o paquete
+BuildPackageDesc=Pode xerar un paquete zip da súa aplicación para que estea listo para distribuílo en calquera Dolibarr. Tamén podes distribuílo ou vendelo no mercado como <a href="https://www.dolistore.com"> DoliStore.com </a>.
+BuildDocumentation=Documentación de compilación
+ModuleIsNotActive=Este módulo aínda non está activado. Vaia a %s para activalo ou faga clic aquí
+ModuleIsLive=Este módulo activouse. Calquera cambio pode romper unha función activa actualmente.
+DescriptionLong=Descrición longa
+EditorName=Nome do editor
+EditorUrl=URL do editor
+DescriptorFile=Ficheiro descriptor do módulo
+ClassFile=Arquivo para a clase PHP DAO CRUD
+ApiClassFile=Ficheiro para a clase PHP API
+PageForList=Páxina PHP para a lista de rexistros
+PageForCreateEditView=Páxina PHP para crear/editar/ver un rexistro
+PageForAgendaTab=Páxina PHP para a lapela de evento
+PageForDocumentTab=Páxina PHP para a lapela de documento
+PageForNoteTab=Páxina PHP para o separador de notas
+PageForContactTab=Páxina PHP para o separador de contacto
+PathToModulePackage=Ruta ao zip do paquete de módulo/aplicación
+PathToModuleDocumentation=Ruta ao ficheiro da documentación do módulo/aplicación (%s)
+SpaceOrSpecialCharAreNotAllowed=Non se permiten espazos nin caracteres especiais.
+FileNotYetGenerated=O ficheiro aínda non foi xerado
+RegenerateClassAndSql=Forzar a actualización dos ficheiros .class e .sql
+RegenerateMissingFiles=Xerar ficheiros que faltan
+SpecificationFile=Arquivo de documentación
+LanguageFile=Ficheiro para o idioma
+ObjectProperties=Propiedades do obxecto
+ConfirmDeleteProperty=Está certo de que quere eliminar a propiedade <strong>%s </strong>? Isto cambiará o código na clase PHP pero tamén eliminará a columna da definición de obxecto da táboa.
+NotNull=Non NULO
+NotNullDesc=1= Establecer a base de datos como NOT NULL. -1= Permitir valores nulos e forzar o valor NULL se está baleiro ('' ou 0).
+SearchAll=Usado para "buscar todo"
+DatabaseIndex=Índice da base de datos
+FileAlreadyExists=O ficheiro %s xa existe
+TriggersFile=Ficheiro para o código de trigger
+HooksFile=Ficheiro para o código de hooks
+ArrayOfKeyValues=​​= Matriz de chave-valor
+ArrayOfKeyValuesDesc=Matriz de chaves e valores se o campo é unha lista combinada con valores fixos
+WidgetFile=Ficheiro widget
+CSSFile=Ficheiro CSS
+JSFile=Ficheiro Javascript
+ReadmeFile=Ficheiro Léame
+ChangeLog=Ficheiro ChangeLog
+TestClassFile=Ficheiro para a clase PHP Test
+SqlFile=Ficheiro SQL
+PageForLib=Ficheiro para a biblioteca común de PHP
+PageForObjLib=Ficheiro da biblioteca PHP dedicado a obxectos
+SqlFileExtraFields=Ficheiro SQL para atributos complementarios
+SqlFileKey=Ficheiro SQL para chaves
+SqlFileKeyExtraFields=Ficheiro SQL para chaves de atributos complementarios
+AnObjectAlreadyExistWithThisNameAndDiffCase=Xa existe un obxecto con este nome e un caso diferente
+UseAsciiDocFormat=Pode usar o formato Markdown, pero recoméndase usar o formato Asciidoc (comparación entre .md e .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=É unha medida
+DirScanned=Directorio analizado
+NoTrigger=Non hai trigger
+NoWidget=Non hai widget
+GoToApiExplorer=Explorador de API
+ListOfMenusEntries=Listaxe de entradas de menú
+ListOfDictionariesEntries=Listaxe de entradas de dicionarios
+ListOfPermissionsDefined=Listaxe de permisos definidos
+SeeExamples=Ver exemplos aquí
+EnabledDesc=Condición para ter activo este campo (Exemplos: 1 ou $ conf-> global-> MYMODULE_MYOPTION)
+VisibleDesc=¿É visible o campo? (Exemplos: 0= Nunca visible, 1= Visible na lista e crear/actualizar/ver formularios, 2= Visible só na lista, 3= Visible só na forma de crear/actualizar/ver (non lista), 4= Visible na lista e actualizar/ver formulario só (non crear), 5= Visible só no formulario de visualización final da lista (non crear, non actualizar). <br> <br> Usar un valor negativo significa que o campo non se amosa por defecto na lista, pero pódese seleccionar para ver). <br> <br> Pode ser unha expresión, por exemplo: <br> preg_match ('/ public /', $ _SERVER ['PHP_SELF'])?0:1 <br> ($ usuario-> dereitos->vacacións->definir_ vacacións?1:0)
+DisplayOnPdfDesc=Amosar este campo en documentos PDF compatibles, pode xestionar a posición co campo "Posición". <br/> Actualmente, os modelos de PDF compatibles coñecidos son: eratosthene (pedimento), espadon (envío), sponge (facturas), cian ( orzamento), cornas (pedimento de provedor) <br/> <br/> <strong> Para documento: </strong> <br/> 0= non amosado <br/> 1= visualización <br/> 2= visualización só se non está baleiro <br/> <br/> <strong> Para liñas de documento: </strong> <br/> 0= non amosado <br/> 1= amosado nunha columna <br/> 3= amosado en liña columna de descrición despois da descrición <br/> 4= amosar na columna de descrición despois da descrición só se non está baleira
+DisplayOnPdf=Amosar en PDF
+IsAMeasureDesc=¿Pódese acumular o valor do campo para obter un total na lista? (Exemplos: 1 ou 0)
+SearchAllDesc=¿O campo utilízase para facer unha procura desde a ferramenta de busca rápida? (Exemplos: 1 ou 0)
+SpecDefDesc=Introduza aquí toda a documentación que desexa proporcionar co seu módulo que non estexa xa definida por outras pestanas. Pode usar .md ou mellor, a rica sintaxe .asciidoc.
+LanguageDefDesc=Introduza neste ficheiro toda a clave e a tradución para cada ficheiro de idioma.
+MenusDefDesc=Defina aquí os menús proporcionados polo seu módulo
+DictionariesDefDesc=Defina aquí os dicionarios proporcionados polo seu módulo
+PermissionsDefDesc=Defina aquí os novos permisos proporcionados polo seu módulo
+MenusDefDescTooltip=Os menús proporcionados polo seu módulo/aplicación están definidos no array <strong> $this->menús </strong> no ficheiro descriptor do módulo. Pode editar este ficheiro manualmente ou usar o editor incrustado. <br> <br> Nota: Unha vez definido (e reactivado o módulo), os menús tamén son visibles no editor de menú dispoñible para os usuarios administradores en %s.
+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 de activación o código que desexa executar para cada evento empresarial executado.
+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
+TryToUseTheModuleBuilder=Se ten coñecemento de SQL e PHP, pode empregar o asistente para o creador de módulos nativos. <br> Active o módulo <strong>%s </strong> e use o asistente facendo clic no <span class="fa fa-bug "> </span> no menú superior dereito. <br> Aviso: esta é unha función avanzada para desenvolvedores, <b> non </b> experimente no seu sitio de produción.
+SeeTopRightMenu=Ver <span class="fa fa-bug"> </span> no menú superior dereito
+AddLanguageFile=Engadir ficheiro de idioma
+YouCanUseTranslationKey=Pode usar aquí unha chave que é a chave de tradución que se atopa no ficheiro de idioma (ver lapela "Idiomas")
+DropTableIfEmpty=(Destruír a táboa se está baleira)
+TableDoesNotExists=A táboa %s non existe
+TableDropped=Eliminouse a táboa %s
+InitStructureFromExistingTable=Construír a cadea de array de estruturas dunha táboa existente
+UseAboutPage=Desactivar a páxina sobre
+UseDocFolder=Desactivar o cartafol de documentación
+UseSpecificReadme=Usar un ReadMe específico
+ContentOfREADMECustomized=Nota: o contido do ficheiro README.md foi substituído polo valor específico definido na configuración de ModuleBuilder.
+RealPathOfModule=Ruta real do módulo
+ContentCantBeEmpty=O contido do ficheiro non pode estar baleiro
+WidgetDesc=Pode xerar e editar aquí os widgets que se incorporarán ao seu módulo.
+CSSDesc=Pode xerar e editar aquí un ficheiro con CSS personalizado incrustado no seu módulo.
+JSDesc=Pode xerar e editar aquí un ficheiro con Javascript personalizado incrustado co seu módulo.
+CLIDesc=Pode xerar aquí algúns scripts de liña de comandos que desexa proporcionar co seu módulo.
+CLIFile=Ficheiro CLI
+NoCLIFile=Non hai ficheiros CLI
+UseSpecificEditorName = Usar un nome de editor específico
+UseSpecificEditorURL = Usar unha URL de editor específico
+UseSpecificFamily = Usar unha familia específica
+UseSpecificAuthor = Usar un autor específico
+UseSpecificVersion = Usar unha versión inicial específica
+IncludeRefGeneration=A referencia do obxecto debe xerarse automaticamente
+IncludeRefGenerationHelp=Sinale esta opción se quere incluír código para xestionar a xeración automaticamente da referencia
+IncludeDocGeneration=Quero xerar algúns documentos a partir do obxecto
+IncludeDocGenerationHelp=Se marca isto, xerarase algún código para engadir unha caixa "Xerar documento" no rexistro.
+ShowOnCombobox=Mostrar o valor en combobox
+KeyForTooltip=Chave para a información sobre ferramentas
+CSSClass=Clase CSS
+NotEditable=Non editable
+ForeignKey=Chave estranxeira
+TypeOfFieldsHelp=Tipo de campos: <br> varchar (99), double (24,8), real, text, html, datetime, timestamp, integer, integer: ClassName:relativepath/to/classfile.class.php[:1[:filter]] ("1" significa que engadimos un botón + despois do combo para crear o rexistro, "filter" pode ser "status=1 AND fk_user=__USER_ID AND entity IN (__SHARED_ENTITIES__)" por exemplo)
+AsciiToHtmlConverter=Conversor de ascii a HTML
+AsciiToPdfConverter=Conversor de ascii a PDF
+TableNotEmptyDropCanceled=A táboa non está baleira. Cancelouse a eliminación.
+ModuleBuilderNotAllowed=O creador de módulos está dispoñible pero non permitido ao seu usuario.
diff --git a/htdocs/langs/gl_ES/mrp.lang b/htdocs/langs/gl_ES/mrp.lang
index 84a0177e4de..26bc6d491ef 100644
--- a/htdocs/langs/gl_ES/mrp.lang
+++ b/htdocs/langs/gl_ES/mrp.lang
@@ -1,80 +1,104 @@
-Mrp=Ordes de fabricación
-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 Material
-BOMsSetup=Setup of module BOM
-ListOfBOMs=List of bills of material - BOM
-ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
-BOMsNumberingModules=BOM numbering templates
-BOMsModelModule=BOM document templates
-MOsNumberingModules=MO numbering templates
-MOsModelModule=MO document templates
-FreeLegalTextOnBOMs=Free text on document of BOM
-WatermarkOnDraftBOMs=Watermark on draft BOM
-FreeLegalTextOnMOs=Free text on document of MO
-WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
-ManufacturingEfficiency=Manufacturing efficiency
-ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
-ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
-DeleteBillOfMaterials=Delete Bill Of Materials
-DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
-MenuMRP=Ordes de fabricación
-NewMO=New Manufacturing Order
-QtyToProduce=Qty to produce
-DateStartPlannedMo=Date start planned
-DateEndPlannedMo=Date end planned
-KeepEmptyForAsap=Empty means 'As Soon As Possible'
-EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
-ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
-ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
-ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
-StatusMOProduced=Produced
-QtyFrozen=Frozen Qty
-QuantityFrozen=Frozen Quantity
-QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
-DisableStockChange=Stock change disabled
-DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
-BomAndBomLines=Bills Of Material and lines
-BOMLine=Line of BOM
-WarehouseForProduction=Warehouse for production
-CreateMO=Create MO
-ToConsume=To consume
-ToProduce=To produce
-QtyAlreadyConsumed=Qty already consumed
-QtyAlreadyProduced=Qty already produced
-QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
-ConsumeOrProduce=Consume or Produce
-ConsumeAndProduceAll=Consume and Produce All
-Manufactured=Manufactured
-TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
-ForAQuantityOf=For a quantity to produce of %s
-ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
-ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRef=Production of %s
-AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
-NoStockChangeOnServices=No stock change on services
-ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
-AddNewConsumeLines=Add new line to consume
-ProductsToConsume=Products to consume
-ProductsToProduce=Products to produce
-UnitCost=Unit cost
-TotalCost=Total cost
-BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
-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
+Mrp=Pedimentos de fabricación
+MOs=Pedimentos de fabricación
+ManufacturingOrder=Pedimento de fabricación
+MRPDescription=Módulo para xestionar pedimentos de fabricación (MO).
+MRPArea=Área MRP
+MrpSetupPage=Configuración do módulo MRP
+MenuBOM=Listaxe de material
+LatestBOMModified=Últimas %s listaxes de materiais modificadas
+LatestMOModified=Últimos %s pedimentos de material modificados
+Bom=Listaxes de material
+BillOfMaterials=Listaxe de material
+BOMsSetup=Configuración do módulo BOM
+ListOfBOMs=Listaxe de facturas de materiais - BOM
+ListOfManufacturingOrders=Listaxe de pedimentos de fabricación
+NewBOM=Nova listaxe de materiais
+ProductBOMHelp=Produto a crear con este BOM.<br>Nota: os produtos coa propiedade 'Natureza do producto'='Materia prima' non están visibles nesta listaxe.
+BOMsNumberingModules=Modelos de numeración BOM
+BOMsModelModule=Prantillas de documentos BOMS
+MOsNumberingModules=Modelos de numeración MO
+MOsModelModule=Prantillas de documentos MO
+FreeLegalTextOnBOMs=Texto libre no documento BOM
+WatermarkOnDraftBOMs=Marca de auga no borrador MO
+FreeLegalTextOnMOs=Texto libre no documento MO
+WatermarkOnDraftMOs=Marca de auga no borrador MO
+ConfirmCloneBillOfMaterials=¿Está certo de querer clonar esta listaxe de materiais %s?
+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
+ValueOfMeansLossForProductProduced=O valor de 0,95 significa unha media do 5 %% da perda do produto producido
+DeleteBillOfMaterials=Eliminar listaxe de material
+DeleteMo=Borra pedimentos de manufacturación
+ConfirmDeleteBillOfMaterials=¿Está certo de querer eliminar esta Listaxe de Material?
+ConfirmDeleteMo=¿Está certo de querer eliminar esta Listaxe de Material?
+MenuMRP=Pedimentos de manufacturación
+NewMO=Novo pedimento de manufacturación
+QtyToProduce=Cant. a producir
+DateStartPlannedMo=Data de inicio prevista
+DateEndPlannedMo=Date de finalización prevista
+KeepEmptyForAsap=Baleiro quere dicir 'Tan pronto como sexa posible'
+EstimatedDuration=Duración estimada
+EstimatedDurationDesc=Duración estimada para manufacturar este produto usando este BOM
+ConfirmValidateBom=Está certo de que desexa validar a listaxe de materias coa referencia <strong>%s</strong> (poderá usala para crear novos pedimentos de fabricación)
+ConfirmCloseBom=¿Está certo de que quere cancelar esta listaxe de materiales (xa non poderá usalo para crear novos pedimentos de fabricación)?
+ConfirmReopenBom=Está certo de que quere voltar a abrir esta listaxe de materiales (poderá usala para construír novos pedimentoss de fabricación)
+StatusMOProduced=Producido
+QtyFrozen=Cant. conxelada
+QuantityFrozen=Cantidade conxelada
+QuantityConsumedInvariable=Cando se sinala esta marca, a cantidade consumida sempre é o valor definido e non é relativa á cantidade producida.
+DisableStockChange=Cambio de stock desactivado
+DisableStockChangeHelp=Cando se sinala esta marca, non hai cambio de stock neste produto, calquera que sexa a cantidade consumida
+BomAndBomLines=Listaxes de material e liñas
+BOMLine=Liña de BOM
+WarehouseForProduction=Almacén para produción
+CreateMO=Crear MO
+ToConsume=A consumir
+ToProduce=A poducir
+QtyAlreadyConsumed=Cant. xa consumida
+QtyAlreadyProduced=Cant. xa producida
+QtyRequiredIfNoLoss=Cant. precisa se non hai perda (a eficiencia de fabricación é do 100 %%)
+ConsumeOrProduce=Consumir ou producir
+ConsumeAndProduceAll=Consumir e producir todo
+Manufactured=Fabricado
+TheProductXIsAlreadyTheProductToProduce=O produto a engadir xa é o produto a fabricar.
+ForAQuantityOf=Para producir unha cantidade de %s
+ConfirmValidateMo=Está certo de que desexa validar este pedimento de fabricación?
+ConfirmProductionDesc=Ao facer clic en '%s', validará o consumo e/ou a produción para as cantidades establecidas. Isto tamén actualizará o stock e rexistrará os movementos de stock.
+ProductionForRef=Produción de %s
+AutoCloseMO=Pecha automaticamente o pedimento de fabricación se se alcanzan cantidades a consumir e producir
+NoStockChangeOnServices=Non hai cambio de stock nos servizos
+ProductQtyToConsumeByMO=Cantidade de produto aínda por consumir por MO aberto
+ProductQtyToProduceByMO=Cantidade de produto aínda por producir por MO aberto
+AddNewConsumeLines=Engadir nova liña para consumir
+ProductsToConsume=Produtos para consumir
+ProductsToProduce=Produtos para fabricar
+UnitCost=Custo unitario
+TotalCost=Custo total
+BOMTotalCost=O custo para producir este BOM está en función do custo de cada cantidade e produto a consumir (use o prezo de custo se se define, se non o prezo medio ponderado se se define, se non o mellor prezo de compra)
+GoOnTabProductionToProduceFirst=Primeiro debe iniciar a produción para pechar un pedimento de fabricación (ver a pestana '%s'). Pero pode cancelalo.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Non se pode usar un produto composto nunha lista de materiales nin nunha MO
+Workstation=Estación de traballo
+Workstations=Estacións de traballo
+WorkstationsDescription=Xestión de estacións de traballo
+WorkstationSetup = Configuración de estacións de traballo
+WorkstationSetupPage = Páxina de configuración de estacións de traballo
+WorkstationAbout = Acerca das estacións de traballo
+WorkstationAboutPage = Páxina acerca das estacións de traballo
+WorkstationList=Listaxe de estacións de traballo
+WorkstationCreate=Axuntar nova estación de traballo
+ConfirmEnableWorkstation=Está certo de querer activar a estación de traballo <b>%s</b>?
+EnableAWorkstation=Activar a estación de traballo
+ConfirmDisableWorkstation=Está certo de querer desactivar a estación de traballo <b>%s</b>?
+DisableAWorkstation=Desactivar unha estación de traballo
+DeleteWorkstation=Quitar
+NbOperatorsRequired=Número de operadores precisos
+THMOperatorEstimated=THM estimada operador
+THMMachineEstimated=THM estimada máquina
+WorkstationType=Tipo de estación de traballo
+Human=Humano
+Machine=Máquina
+HumanMachine=Humano/Máquina
+WorkstationArea=Area estación de traballo
+Machines=Máquinas
+THMEstimatedHelp=Esta taxa permite definir un custo estimado do artigo
diff --git a/htdocs/langs/gl_ES/multicurrency.lang b/htdocs/langs/gl_ES/multicurrency.lang
index c9ec381e5b6..27cbebdc7b8 100644
--- a/htdocs/langs/gl_ES/multicurrency.lang
+++ b/htdocs/langs/gl_ES/multicurrency.lang
@@ -20,3 +20,19 @@ MulticurrencyPaymentAmount=Importe total, moeda orixe
 AmountToOthercurrency=Cantidade a (en moeda da conta receptora)
 CurrencyRateSyncSucceed=Taxa da moeda sincronizada correctamente
 MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use a moeda do documento para pagos online
+TabTitleMulticurrencyRate=Listaxe de taxas
+ListCurrencyRate=Listaxe de tipos de cambio da moeda
+CreateRate=Crea unha taxa
+FormCreateRate=Creación de taxa
+FormUpdateRate=Modificación de taxa
+successRateCreate=Engadiuse a taxa de moeda %s á base de datos
+ConfirmDeleteLineRate=Está certo de querer eliminar a taxa de %s da moeda %s na data de %s?
+DeleteLineRate=Limpar taxa
+successRateDelete=Taxa eliminada
+errorRateDelete=Erro cando eliminaba taxa
+successUpdateRate=Modificación feita
+ErrorUpdateRate=Erro cando modificaba a taxa
+Codemulticurrency=Código moeda
+UpdateRate=Cambiar a taxa
+CancelUpdate=Cancelar
+NoEmptyRate=O campo de taxa non debe estar baleiro
diff --git a/htdocs/langs/gl_ES/oauth.lang b/htdocs/langs/gl_ES/oauth.lang
index 075ff49a895..1355842921f 100644
--- a/htdocs/langs/gl_ES/oauth.lang
+++ b/htdocs/langs/gl_ES/oauth.lang
@@ -1,32 +1,32 @@
 # Dolibarr language file - Source file is en_US - oauth
-ConfigOAuth=OAuth Configuration
-OAuthServices=OAuth Services
-ManualTokenGeneration=Manual token generation
-TokenManager=Token Manager
-IsTokenGenerated=Is token generated ?
-NoAccessToken=No access token saved into local database
-HasAccessToken=A token was generated and saved into local database
-NewTokenStored=Token received and saved
-ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
-TokenDeleted=Token deleted
-RequestAccess=Click here to request/renew access and receive a new token to save
-DeleteAccess=Click here to delete token
-UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
-ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
-OAuthSetupForLogin=Page to generate an OAuth token
-SeePreviousTab=See previous tab
-OAuthIDSecret=OAuth ID and Secret
-TOKEN_REFRESH=Token Refresh Present
-TOKEN_EXPIRED=Token expired
-TOKEN_EXPIRE_AT=Token expire at
-TOKEN_DELETE=Delete saved token
-OAUTH_GOOGLE_NAME=OAuth Google service
-OAUTH_GOOGLE_ID=OAuth Google Id
-OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">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
+ConfigOAuth=Configuración Oauth
+OAuthServices=Servizos OAuth
+ManualTokenGeneration=Xeración manual de token
+TokenManager=Xestor de token
+IsTokenGenerated=¿Está o token xerado?
+NoAccessToken=Non hai token de acceso gardado na base de datos local
+HasAccessToken=Foi xerado e gardado na base de datos local un token
+NewTokenStored=Token recibido e gardado
+ToCheckDeleteTokenOnProvider=Faga clic aquí para comprobar/eliminar a autorización gardada polo fornecedor de OAuth %s
+TokenDeleted=Token eliminado
+RequestAccess=Faga clic aquí para consultar/renovar acceso e recibir un novo token a gardar
+DeleteAccess=Faga clic aquí para eliminar o token
+UseTheFollowingUrlAsRedirectURI=Utilice o seguinte URL como redirección URI cando cree as súas credenciais co seu provedor de OAuth:
+ListOfSupportedOauthProviders=Introduza as credenciais proporcionadas polo seu provedor OAuth2. Aquí só figuran os provedores compatibles con OAuth2. Estes servizos poden ser empregados por outros módulos que precisan autenticación OAuth2.
+OAuthSetupForLogin=Páxina para xerar un token OAuth
+SeePreviousTab=Ver a lapela previa
+OAuthIDSecret=ID OAuth e contrasinal
+TOKEN_REFRESH=Actualizar o token actual
+TOKEN_EXPIRED=Token expirado
+TOKEN_EXPIRE_AT=Token expira o
+TOKEN_DELETE=Eliminar token gardado
+OAUTH_GOOGLE_NAME=Servicio Oauth Google
+OAUTH_GOOGLE_ID=Id Oauth Google
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Vaia a <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">esta páxina</a> e a "Credenciais" para crear credenciais Oauth
+OAUTH_GITHUB_NAME=Servizo Oauth GitHub
+OAUTH_GITHUB_ID=Id Oauth Github
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Vaia a <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">esta páxina</a> e a  "Rexistrar unha nova aplicación" para crear crecenciais Oauth
+OAUTH_STRIPE_TEST_NAME=Test OAuth Stripe
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/gl_ES/opensurvey.lang b/htdocs/langs/gl_ES/opensurvey.lang
index 9f83fcfb4f3..852bda171e5 100644
--- a/htdocs/langs/gl_ES/opensurvey.lang
+++ b/htdocs/langs/gl_ES/opensurvey.lang
@@ -1,61 +1,61 @@
 # 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=Data límite
-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
-CanSeeOthersVote=Voters can see other people's vote
-SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format:<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
-BackToCurrentMonth=Back to current month
-ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
-ErrorOpenSurveyOneChoice=Enter at least one choice
-ErrorInsertingComment=There was an error while inserting your comment
-MoreChoices=Enter more choices for the voters
-SurveyExpiredInfo=The poll has been closed or voting delay has expired.
-EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
-ShowSurvey=Show survey
-UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
+Survey=Enquisa
+Surveys=Enquisas
+OrganizeYourMeetingEasily=Organice facilmente as súas reunións e enquisas. Primeiro selecciona o tipo de enquisa ...
+NewSurvey=Nova enquisa
+OpenSurveyArea=Área de enquisas
+AddACommentForPoll=Pode engadir un comentario á enquisa ...
+AddComment=Engadir comentario
+CreatePoll=Crear enquisa
+PollTitle=Título da enquisa
+ToReceiveEMailForEachVote=Reciba un correo electrónico por cada voto
+TypeDate=Escriba a data
+TypeClassic=Tipo estándar
+OpenSurveyStep2=Seleccione as súas datas entre os días libres (gris). Os días seleccionados son verdes. Pode deseleccionar un día seleccionado previamente facendo clic de novo nel
+RemoveAllDays=Eliminar todos os días
+CopyHoursOfFirstDay=Copiar as horas do primeiro día
+RemoveAllHours=Eliminar todas as horas
+SelectedDays=Días seleccionados
+TheBestChoice=A mellor opción actualmente é
+TheBestChoices=As mellores opcións son actualmente
+with=con
+OpenSurveyHowTo=Se acepta votar nesta enquisa, ten que dar o seu nome, escoller os valores que mellor se axusten a vostede e validalo co botón ao final da liña.
+CommentsOfVoters=Comentarios dos votantes
+ConfirmRemovalOfPoll=Está certo de que quere eliminar esta votación (e todos os votos)
+RemovePoll=Eliminar enquisa
+UrlForSurvey=URL para comunicarse para ter acceso directo á enquisa
+PollOnChoice=Está a crear unha enquisa para facer unha opción múltiple para unha enquisa. Primeiro introduza todas as opcións posibles para a súa enquisa:
+CreateSurveyDate=Crear unha enquisa de data
+CreateSurveyStandard=Crear unha enquisa estándar
+CheckBox=caixa de verificación simple
+YesNoList=Lista (baleiro/si/non)
+PourContreList=Listaxe (baleiro/a favor/en contra)
+AddNewColumn=Engadir nova columna
+TitleChoice=Etiqueta de elección
+ExportSpreadsheet=Exportar folla de cálculo co resultado
+ExpireDate=Datos límite
+NbOfSurveys=Número de enquisas
+NbOfVoters=Non. de votantes
+SurveyResults=Resultados
+PollAdminDesc=Está autorizado a cambiar todas as liñas de voto desta enquisa co botón "Editar". Tamén pode eliminar unha columna ou unha liña con %s. Tamén pode engadir unha nova columna con %s.
+5MoreChoices=5 opcións máis
+Against=Contra
+YouAreInivitedToVote=Está convidado a votar nesta enquisa
+VoteNameAlreadyExists=Este nome xa se usou para esta enquisa
+AddADate=Engade unha data
+AddStartHour=Engadir hora de inicio
+AddEndHour=Engadir hora de finalización
+votes=voto(s)
+NoCommentYet=Aínda non se enviaron comentarios para esta enquisa
+CanComment=Os votantes poden comentar na enquisa
+CanSeeOthersVote=Os votantes poden ver o voto doutras persoas
+SelectDayDesc=Para cada día seleccionado, pode escoller ou non o horario de reunión no seguinte formato: <br> - baleiro, <br> - "8h", "8H" ou "8:00" para dar unha hora de comezo da reunión, <br> - "8-11", "8h-11h", "8H-11H" ou "8: 00-11: 00" para dar a hora de inicio e final da reunión, <br> - "8h15-11h15 "," 8H15-11H15 "ou" 8: 15-11: 15 "para o mesmo pero con minutos.
+BackToCurrentMonth=Voltar ao mes actual
+ErrorOpenSurveyFillFirstSection=Non encheu a primeira sección da creación da enquisa
+ErrorOpenSurveyOneChoice=Introduza polo menos unha opción
+ErrorInsertingComment=Houbo un erro ao inserir o seu comentario
+MoreChoices=Introduza máis opcións para os votantes
+SurveyExpiredInfo=Pechouse a votación ou caducou o tempo de votación.
+EmailSomeoneVoted=%s encheu unha liña. \nPode atopar a súa enquisa na ligazón:\n %s
+ShowSurvey=Amosar a enquisa
+UserMustBeSameThanUserUsedToVote=Debe ter votado e usar o mesmo nome de usuario que o usado para votar, para publicar un comentario
diff --git a/htdocs/langs/gl_ES/orders.lang b/htdocs/langs/gl_ES/orders.lang
index 2bb9401c922..c7a3ac01b3d 100644
--- a/htdocs/langs/gl_ES/orders.lang
+++ b/htdocs/langs/gl_ES/orders.lang
@@ -53,7 +53,7 @@ StatusOrderToBill=Emitido
 StatusOrderApproved=Aprobado
 StatusOrderRefused=Rexeitado
 StatusOrderReceivedPartially=Recibido parcialmente
-StatusOrderReceivedAll=Todos os productos recibidos
+StatusOrderReceivedAll=Todos os produtos recibidos
 ShippingExist=Existe unha expedición
 QtyOrdered=Cant. pedida
 ProductQtyInDraft=Cantidades en borrador de pedimentos
@@ -80,22 +80,22 @@ NoOrder=Sen pedimentos
 NoSupplierOrder=Sen orde de compra
 LastOrders=Últimos %s pedimentos de clientes
 LastCustomerOrders=Últimos %s pedimentos de clientes
-LastSupplierOrders=Últimas %s ordes de compra
+LastSupplierOrders=Últimas %s pedimentos de provedor
 LastModifiedOrders=Últimos %s pedimentos de clientes modificados
 AllOrders=Todos os pedimentos
 NbOfOrders=Número de pedimentos
 OrdersStatistics=Estatísticas de pedimentos de clientes
-OrdersStatisticsSuppliers=Estatísticas de ordes de pedimento
+OrdersStatisticsSuppliers=Estatísticas de pedimentos a provedor
 NumberOfOrdersByMonth=Número de pedimentos por mes
 AmountOfOrdersByMonthHT=Importe total de pedimentos por mes (sen IVE)
 ListOfOrders=Listaxe de pedimentos
 CloseOrder=Pechar pedimento
-ConfirmCloseOrder=¿Está seguro de querer clasificar este pedimento como enviado? Una vez enviado un pedimento, solo podrá facturarse
-ConfirmDeleteOrder=¿Está seguro de querer eliminar este pedimento?
-ConfirmValidateOrder=¿Está seguro de querer validar este pedimento bajo la referencia <b>%s</b> ?
-ConfirmUnvalidateOrder=¿Está seguro de querer restaurar el pedimento <b>%s</b> al estado borrador?
-ConfirmCancelOrder=¿Está seguro de querer anular este pedimento?
-ConfirmMakeOrder=¿Está seguro de querer confirmar este pedimento en fecha de <b>%s</b> ?
+ConfirmCloseOrder=¿Está certo de querer clasificar este pedimento como enviado? Una vez enviado un pedimento, solo podrá facturarse
+ConfirmDeleteOrder=¿Está certo de querer eliminar este pedimento?
+ConfirmValidateOrder=¿Está certo de querer validar este pedimento bajo la referencia <b>%s</b> ?
+ConfirmUnvalidateOrder=¿Está certo de querer restaurar el pedimento <b>%s</b> al estado borrador?
+ConfirmCancelOrder=¿Está certo de querer anular este pedimento?
+ConfirmMakeOrder=¿Está certo de querer confirmar este pedimento en fecha de <b>%s</b> ?
 GenerateBill=Facturar
 ClassifyShipped=Clasificar enviado
 DraftOrders=Pedimentos borrador
@@ -112,13 +112,13 @@ OrderMode=Método de pedimento
 AuthorRequest=Autor/Solicitante
 UserWithApproveOrderGrant=Usuarios habilitados para aprobar os pedimentos
 PaymentOrderRef=Pago pedimento %s
-ConfirmCloneOrder=¿Está seguro de querer clonar este pedimento <b>%s</b>?
+ConfirmCloneOrder=¿Está certo de querer clonar este pedimento <b>%s</b>?
 DispatchSupplierOrder=Recepción do pedimento a provedor %s
 FirstApprovalAlreadyDone=Primeira aprobación realizada
 SecondApprovalAlreadyDone=Segunda aprobación realizada
-SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submited
-SupplierOrderClassifiedBilled=Purchase Order %s set billed
+SupplierOrderReceivedInDolibarr=Pedimento de provedor %s recibido %s
+SupplierOrderSubmitedInDolibarr=Pedimento de provedor %s solicitado
+SupplierOrderClassifiedBilled=Pedimento de provedor %s facturado
 OtherOrders=Outros pedimentos
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Responsable seguemento do pedimento cliente
@@ -161,29 +161,29 @@ CloseReceivedSupplierOrdersAutomatically=Pechar pedimento a modo "%s" automatica
 SetShippingMode=Indica o modo de envío
 WithReceptionFinished=Con recepción finalizada
 #### supplier orders status
-StatusSupplierOrderCanceledShort=Anulada
+StatusSupplierOrderCanceledShort=Anulado
 StatusSupplierOrderDraftShort=Borrador
 StatusSupplierOrderValidatedShort=Validado
 StatusSupplierOrderSentShort=Expedición en curso
 StatusSupplierOrderSent=Envío en curso
-StatusSupplierOrderOnProcessShort=Pedido
+StatusSupplierOrderOnProcessShort=Pedimento
 StatusSupplierOrderProcessedShort=Procesado
 StatusSupplierOrderDelivered=Emitido
 StatusSupplierOrderDeliveredShort=Emitido
 StatusSupplierOrderToBillShort=Emitido
-StatusSupplierOrderApprovedShort=Aprobada
-StatusSupplierOrderRefusedShort=Rexeitada
+StatusSupplierOrderApprovedShort=Aprobado
+StatusSupplierOrderRefusedShort=Rexeitado
 StatusSupplierOrderToProcessShort=A procesar
 StatusSupplierOrderReceivedPartiallyShort=Recibido parcialmente
 StatusSupplierOrderReceivedAllShort=Produtos recibidos
-StatusSupplierOrderCanceled=Anulada
+StatusSupplierOrderCanceled=Anulado
 StatusSupplierOrderDraft=Borrador (é preciso validar)
 StatusSupplierOrderValidated=Validado
-StatusSupplierOrderOnProcess=Pedido - Agardando recepción
-StatusSupplierOrderOnProcessWithValidation=Pedido - Agardando recibir ou validar
+StatusSupplierOrderOnProcess=Pedimento - Agardando recepción
+StatusSupplierOrderOnProcessWithValidation=Pedimento - Agardando recibir ou validar
 StatusSupplierOrderProcessed=Procesado
 StatusSupplierOrderToBill=Emitido
-StatusSupplierOrderApproved=Aprobada
-StatusSupplierOrderRefused=Rexeitada
+StatusSupplierOrderApproved=Aprobado
+StatusSupplierOrderRefused=Rexeitado
 StatusSupplierOrderReceivedPartially=Recibido parcialmente
-StatusSupplierOrderReceivedAll=Todos os productos recibidos
+StatusSupplierOrderReceivedAll=Todos os produtos recibidos
diff --git a/htdocs/langs/gl_ES/other.lang b/htdocs/langs/gl_ES/other.lang
index c476990f905..5a52b287896 100644
--- a/htdocs/langs/gl_ES/other.lang
+++ b/htdocs/langs/gl_ES/other.lang
@@ -1,154 +1,156 @@
 # 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
-BirthdayDate=Birthday date
-DateToBirth=Birth date
-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
-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
-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
-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__
-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
-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
-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=tonne
+SecurityCode=Código seguridade
+NumberingShort=Nº
+Tools=Utilidades
+TMenuTools=Utilidades
+ToolsDesc=Todas as utilidades que non están incluidas noutras entradas do menú atópanse aquí.<br>Todas as utilidades están dispoñibles no menú da esquerda.
+Birthday=Aniversario
+BirthdayAlertOn=Alerta de aniversario activa
+BirthdayAlertOff=Alerta de aniversario inactiva
+TransKey=Tradución da clave TransKey
+MonthOfInvoice=Mes (número 1-12) da data da factura
+TextMonthOfInvoice=Mes (texto) da data da factura
+PreviousMonthOfInvoice=Mes anterior (número 1-12) da data da factura
+TextPreviousMonthOfInvoice=Mes anterior (texto) da data da factura
+NextMonthOfInvoice=Mes seguinte (número 1-12) da data da factura
+TextNextMonthOfInvoice=Mes seguinte (texto) da data da factura
+PreviousMonth=Mes previo
+CurrentMonth=Mes actual
+ZipFileGeneratedInto=Ficheiro zip xerado en <b>%s</b>.
+DocFileGeneratedInto=Ficheiro documento xerado en <b>%s</b>.
+JumpToLogin=Desconectado. Ir á páxina de inicio de sesión ...
+MessageForm=Mensaxe no formulario de pago en liña
+MessageOK=Mensaxe na páxina de retorno de pago confirmado
+MessageKO=Mensaxe na páxina de retorno de pago cancelado
+ContentOfDirectoryIsNotEmpty=O contido deste directorio non está baleiro
+DeleteAlsoContentRecursively=Comprobe para eliminar todo o contido recursivamente
+PoweredBy=Fornecido by
+YearOfInvoice=Ano da data da factura
+PreviousYearOfInvoice=Ano previo da data da factura
+NextYearOfInvoice=Ano seguinte da data da factura
+DateNextInvoiceBeforeGen=Data da próxima factura (antes da xeración)
+DateNextInvoiceAfterGen=Data da próxima factura (despois da xeración)
+GraphInBarsAreLimitedToNMeasures=Os gráficos están limitados ao % medidos en modo "Barras". O modo 'Liñas' foi automáticamente seleccionado no seu lugar.
+OnlyOneFieldForXAxisIsPossible=Actualmente só e posible 1 campo como eixo X. Só escolleu o primeiro campo seleccionado.
+AtLeastOneMeasureIsRequired=Requírese polo menos1 campo para medir
+AtLeastOneXAxisIsRequired=Reuírese polo menos un campo para o eixo X
+LatestBlogPosts=Última publicación no blog
+Notify_ORDER_VALIDATE=Validación pedimento cliente
+Notify_ORDER_SENTBYMAIL=Envío pedimento do cliente por correo electrónico
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Envío pedimento ao provedor por correo electrónico
+Notify_ORDER_SUPPLIER_VALIDATE=Pedimento a provedor aprobado
+Notify_ORDER_SUPPLIER_APPROVE=Pedimento a provedor aprobado
+Notify_ORDER_SUPPLIER_REFUSE=Pedimento a provedor rexeitado
+Notify_PROPAL_VALIDATE=Validación orzamento cliente
+Notify_PROPAL_CLOSE_SIGNED=Orzamento cliente pechado como asinado
+Notify_PROPAL_CLOSE_REFUSED=Orzamento cliente pechado como rexeitado
+Notify_PROPAL_SENTBYMAIL=Envío orzamento cliente por correo electrónico
+Notify_WITHDRAW_TRANSMIT=Transmisión domiciliación
+Notify_WITHDRAW_CREDIT=Abono domiciliación
+Notify_WITHDRAW_EMIT=Emisión domiciliación
+Notify_COMPANY_CREATE=Creación terceiro
+Notify_COMPANY_SENTBYMAIL=Correos enviados dende a ficha do terceiro
+Notify_BILL_VALIDATE=Validada factura a cliente
+Notify_BILL_UNVALIDATE=Non validade factura a cliente
+Notify_BILL_PAYED=Factura do cliente pagada
+Notify_BILL_CANCEL=Cancelación factura a cliente
+Notify_BILL_SENTBYMAIL=Envío factura a cliente por correo electrónico
+Notify_BILL_SUPPLIER_VALIDATE=Validación factura de provedor
+Notify_BILL_SUPPLIER_PAYED=Factura do provedor pagada
+Notify_BILL_SUPPLIER_SENTBYMAIL=Envío factura de provedor por correo electrónico
+Notify_BILL_SUPPLIER_CANCELED=Factura del provedor cancelada
+Notify_CONTRACT_VALIDATE=Validación contrato
+Notify_FICHINTER_VALIDATE=Intervención validada
+Notify_FICHINTER_ADD_CONTACT=Contacto engadido a intervención
+Notify_FICHINTER_SENTBYMAIL=Intervención enviada por correo electrónico
+Notify_SHIPPING_VALIDATE=Envío validado
+Notify_SHIPPING_SENTBYMAIL=Expedición enviada por correo electrónico
+Notify_MEMBER_VALIDATE=Membro validado
+Notify_MEMBER_MODIFY=Membro modificado
+Notify_MEMBER_SUBSCRIPTION=Membro afiliado
+Notify_MEMBER_RESILIATE=Membro de baixa
+Notify_MEMBER_DELETE=Eliminación membro
+Notify_PROJECT_CREATE=Creación de proxecto
+Notify_TASK_CREATE=Tarefa creada
+Notify_TASK_MODIFY=Tarefa modificada
+Notify_TASK_DELETE=Tarefa eliminada
+Notify_EXPENSE_REPORT_VALIDATE=Informe de gastos validado (requírese aprobación)
+Notify_EXPENSE_REPORT_APPROVE=Informe de gastos aprobado
+Notify_HOLIDAY_VALIDATE=Petición días libres validada (requírese aprobación)
+Notify_HOLIDAY_APPROVE=Petición días libres aprobada
+Notify_ACTION_CREATE=Acción engadida na Axenda
+SeeModuleSetup=Vexa a configuración do módulo %s
+NbOfAttachedFiles=Número ficheiros/documentos axuntados
+TotalSizeOfAttachedFiles=Tamaño total dos ficheiros/documentos axuntados
+MaxSize=Tamaño máximo
+AttachANewFile=Axuntar novo ficheiro/documento
+LinkedObject=Obxecto ligado
+NbOfActiveNotifications=Número de notificacións (nº de destinatarios)
+PredefinedMailTest=__(Hello)__\nEste é un correo de proba enviado a __EMAIL__.\nAs dúas liñas están separadas por un retorno de carro.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Hello)__\nEste é un correo de <b> proba</b> (a palabra proba debe estar en negrita). <br> As dúas liñas están separadas por un retorno de carro. <br> <br> __USER_SIGNATURE__
+PredefinedMailContentContract=__(Ola)__\n\n\n__(Sinceiramente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nAquí atopará a factura __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nGostariamos de advertirlle que a factura __REF__ parece non estar paga. Así que enviamoslle de novo a factura no ficheiro axuntado, coma un recordatorio.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nPoñémonos en contacto con vostede para facilitarlle o orzamento __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPoñémonos en contacto con vostede para facilitarlle o orzamento __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Hello)__\n\nPoñémonos en contacto con vostede para facilitarlle o pedimento __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPoñémonos en contacto con vostede para facilitarlle o pedimento __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPoñémonos en contacto con vostede para facilitarlle a factura __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Hello)__\n\nPoñémonos en contacto con vostede para facilitarlle o envío __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Hello)__\n\nPoñémonos en contacto con vostede para facilitarllea intervención __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentLink=Pode facer clic na seguinte ligazón para realizar o seu pago, se aínda non o fixo.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sinceiramente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Lembranza do evento "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>Está é uynha mensaxe automática, prégase non respostar.
+DemoDesc=Dolibarr é un ERP/CRM que suporta varios módulos de negocio. Non ten sentido unha demostración que amose xa que este escenario non sucede nunca (varios centos dispoñibles). Así, hai varios perfís dispoñibles de demostración.
+ChooseYourDemoProfil=Escolla o perfil de demostración que mellor se adapte as súas necesidades ...
+ChooseYourDemoProfilMore=... ou constrúa seu perfil<br>(modo de selección manual)
+DemoFundation=Xestión de membros dunha asociación
+DemoFundation2=Xestión de membros e contas bancarias dunha asociación
+DemoCompanyServiceOnly=Empresa ou traballador por conta propia vendendo só servizos
+DemoCompanyShopWithCashDesk=Xestión dunha tenda con caixa
+DemoCompanyProductAndStocks=Empresa vendendo produtos con punto de venda
+DemoCompanyManufacturing=Empresa fabricadora de produtos
+DemoCompanyAll=Empresa con actividades múltiples (todos os módulos principais)
+CreatedBy=Creado por %s
+ModifiedBy=Modificado por %s
+ValidatedBy=Validado por %s
+ClosedBy=Pechado por %s
+CreatedById=Id usuario que foi creado
+ModifiedById=Id de usuario no que foi realizado último cambio
+ValidatedById=Id usuario que validou
+CanceledById=Id usuario que canelou
+ClosedById=Id usuario que pechou
+CreatedByLogin=Login usuario que creou
+ModifiedByLogin=Login de usuario que fixo o último cambio
+ValidatedByLogin=Login usuario que validou
+CanceledByLogin=Login usuario que cancelou
+ClosedByLogin=Login usuario que pechou
+FileWasRemoved=O ficheiro %s foi eliminado
+DirWasRemoved=O directorio %s foi eliminado
+FeatureNotYetAvailable=Funcionalidade ainda non dispoñible nesta versión actual
+FeaturesSupported=Funcionalidades dispoñibles
+Width=Ancho
+Height=Alto
+Depth=Fondo
+Top=Superior
+Bottom=Inferior
+Left=Esquerda
+Right=Dereita
+CalculatedWeight=Peso calculado
+CalculatedVolume=Volume calculado
+Weight=Peso
+WeightUnitton=tonelada
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
-WeightUnitpound=pound
-WeightUnitounce=ounce
-Length=Length
+WeightUnitpound=libra
+WeightUnitounce=onza
+Length=Lonxitude
 LengthUnitm=m
 LengthUnitdm=dm
 LengthUnitcm=cm
 LengthUnitmm=mm
-Surface=Area
+Surface=Área
 SurfaceUnitm2=m²
 SurfaceUnitdm2=dm²
 SurfaceUnitcm2=cm²
@@ -162,125 +164,127 @@ VolumeUnitcm3=cm³ (ml)
 VolumeUnitmm3=mm³ (µl)
 VolumeUnitfoot3=ft³
 VolumeUnitinch3=in³
-VolumeUnitounce=ounce
-VolumeUnitlitre=litre
-VolumeUnitgallon=gallon
+VolumeUnitounce=onza
+VolumeUnitlitre=litro
+VolumeUnitgallon=galón
 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 in number of referring entities (no. of invoice, or order...)
-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.
-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
-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
+SizeUnitinch=pulgada
+SizeUnitfoot=pe
+SizeUnitpoint=punto
+BugTracker=Incidencias
+SendNewPasswordDesc=Este formulario permítelle solicitar un novo contrasinal. Enviarase ao seu enderezo de correo electrónico. <br> O cambio será efectivo unha vez faga clic na ligazón de confirmación do correo electrónico. <br> Comprobe a súa caixa de entrada.
+BackToLoginPage=Voltar á páxina de inicio de sesión
+AuthenticationDoesNotAllowSendNewPassword=O modo de autenticación é <b>% s </b>. <br> Neste modo, Dolibarr non pode saber nin cambiar o seu contrasinal. <br> Póñase en contacto co administrador do sistema se quere cambiar o seu contrasinal.
+EnableGDLibraryDesc=Instalar ou habilitar a biblioteca GD na súa instalación de PHP para usar esta opción.
+ProfIdShortDesc=<b> Id. Profesional% s </b> é unha información que depende dun país de terceiros. <br> Por exemplo, para o país <b>% s </b>, é o código <b>% s </ b>.
+DolibarrDemo=Demo de Dolibarr ERP/CRM
+StatsByNumberOfUnits=Estatísticas para suma de unidades de produto/servizo
+StatsByNumberOfEntities=Estatísticas en número de identidades referentes (nº de facturas o pedimentos...)
+NumberOfProposals=Número de pedimentos
+NumberOfCustomerOrders=Número de pedimentos de clientes
+NumberOfCustomerInvoices=Número de facturas a clientes
+NumberOfSupplierProposals=Número de orzamentos de provedores
+NumberOfSupplierOrders=Número de pedimentos a provedores
+NumberOfSupplierInvoices=Número de facturas de provedores
+NumberOfContracts=Número de contratos
+NumberOfMos=Número de pedimentos de fabricación
+NumberOfUnitsProposals=Número de unidades nos orzamentos a clientes
+NumberOfUnitsCustomerOrders=Número de unidades nos pedimentos de clientes
+NumberOfUnitsCustomerInvoices=Número de unidades nas facturas a clientes
+NumberOfUnitsSupplierProposals=Número de unidades nos orzamentos de provedores
+NumberOfUnitsSupplierOrders=Número de unidades nos pedimentos de provedores
+NumberOfUnitsSupplierInvoices=Número de unidades nas facturas de provedores
+NumberOfUnitsContracts=Número de unidades en contratos
+NumberOfUnitsMos=Número de unidades a producir nos pedimentos de fabricación
+EMailTextInterventionAddedContact=Unha nova intervencións %s foi asignada a vostede
+EMailTextInterventionValidated=Ficha intervención %s validada
+EMailTextInvoiceValidated=Factura %s validada
+EMailTextInvoicePayed=A factura %s foi pagada.
+EMailTextProposalValidated=O orzamento %s  do seu interese foi validado.
+EMailTextProposalClosedSigned=O orzamento %s foi pechado e asinado
+EMailTextOrderValidated=Pedimento %s validado.
+EMailTextOrderApproved=Pedimento %s aprobado
+EMailTextOrderValidatedBy=Pedimento %s rexistrado por %s.
+EMailTextOrderApprovedBy=Pedimento %s aprobado por %s
+EMailTextOrderRefused=Pedimento %s rexeitado
+EMailTextOrderRefusedBy=Pedimento %s rexeitado por %s
+EMailTextExpeditionValidated=Envío %s validado.
+EMailTextExpenseReportValidated=Informe de gastos %s validado.
+EMailTextExpenseReportApproved=Informe de gastos %s aprobado.
+EMailTextHolidayValidated=Petición de días libres %s validada.
+EMailTextHolidayApproved=Petición de días libres %s aprobada.
+EMailTextActionAdded=A acción %s foi engadida na axenda
+ImportedWithSet=Lote de importación
+DolibarrNotification=Notificación automática
+ResizeDesc=Introduza o novo ancho <b>O</b> a nova altura. A relación conservase ao cambiar o tamaño ...
+NewLength=Novo ancho
+NewHeight=Nova altura
+NewSizeAfterCropping=Novas dimensións desois de recortar
+DefineNewAreaToPick=Establezca la zona de imagen a conservar (clic izquierdo sobre la imagen y arrastre hasta la esquina opuesta)
+CurrentInformationOnImage=Esta herramienta le permite cambiar el tamaño o cuadrar la imagen. Aquí hay información sobre la imagen que se está editando
+ImageEditor=Editor de imaxe
+YouReceiveMailBecauseOfNotification=Vostede está a recibir esta mensaxe porque o seu correo electrónico está subscrito a algunhas notificacións automáticas para informalo acerca de eventos especiais do programa %s de %s.
+YouReceiveMailBecauseOfNotification2=O evento en cuestión é o seguinte:
+ThisIsListOfModules=Amosámoslle un listado de módulos preseleccionados para este perfil de demostración (nesta demo só os mais comúns son accesibles). Axuste as súas preferencias e faga clic en "Iniciar".
+UseAdvancedPerms=Usar os dereitos avanzados nos permisos dalgúns módulos
+FileFormat=Formato de ficheiro
+SelectAColor=Escolla unha cor
+AddFiles=Engadir ficheiros
+StartUpload=Transferir
+CancelUpload=Cancelar a transferencia
+FileIsTooBig=O ficheiro é grande de mais
+PleaseBePatient=Pregamos sexa paciente...
+NewPassword=Novo contrasinal
+ResetPassword=Renovar contrasinal
+RequestToResetPasswordReceived=Foi recibida unha solicitude para cambiar o seu contrasinal de Dolibarr
+NewKeyIs=Este é o seu novo contrasinal para iniciar sesión
+NewKeyWillBe=O seu novo contradinal para iniciar sesión no software será
+ClickHereToGoTo=Faga click aquí para ir a %s
+YouMustClickToChange=Porén, debe facer click primeiro na seguinte ligazón para validar este cambio de contrasinal
+ForgetIfNothing=Se vostede non ten solicitado este cambio, simplemente ignore este correo electrónico. A súas credenciais son gardadas de forma segura.
+IfAmountHigherThan=Se o importe é maior que <strong>%s</strong>
+SourcesRepository=Repositorio das fontes
+Chart=Gráfico
+PassEncoding=Cifrado de contrasinal
+PermissionsAdd=Permisos engadidos
+PermissionsDelete=Permisos eliminados
+YourPasswordMustHaveAtLeastXChars=O seu contrasinal debe ter alo menos <strong>%s</strong>  caracteres
+YourPasswordHasBeenReset=O seu contrasinal foi restablecido con éxito
+ApplicantIpAddress=Enderezo IP do solicitante
+SMSSentTo=SMS enviado a %s
+MissingIds=IDs perdidos
+ThirdPartyCreatedByEmailCollector=Terceiro creado polo recolector de correos electrónicos do MSGID de correo electrónico %s
+ContactCreatedByEmailCollector=Contacto/enderezo creado polo recolector de correos electrónicos do MSGID de correo electrónico %s
+ProjectCreatedByEmailCollector=Proxecto creado polo recolector de correos electrónicos do MSGID de correo electrónico %s
+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
+PrefixSession=Prefixo do Id da sesión
 
 ##### Export #####
-ExportsArea=Exports area
-AvailableFormats=Available formats
-LibraryUsed=Library used
-LibraryVersion=Library version
-ExportableDatas=Exportable data
-NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions)
+ExportsArea=Área de exportación
+AvailableFormats=Formatos dispoñibles
+LibraryUsed=Librería utilizada
+LibraryVersion=Versión librería
+ExportableDatas=Datos exportables
+NoExportableData=Non hai datos exportables (sen módulos con datos exportables cargados, ou non teñen permisos)
 ##### External sites #####
-WebsiteSetup=Setup of module website
-WEBSITE_PAGEURL=URL of page
+WebsiteSetup=Configuración do módulo website
+WEBSITE_PAGEURL=URL da páxina
 WEBSITE_TITLE=Título
 WEBSITE_DESCRIPTION=Descrición
-WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
-WEBSITE_KEYWORDS=Keywords
-LinesToImport=Lines to import
+WEBSITE_IMAGE=Imaxe
+WEBSITE_IMAGEDesc=Ruta relativa das imaxes. Pode mantela baleira, rara vez ten uso (pode ser usada polo contido dinámico para amosar una vista previa dunha listaxe de publicacións de blog). Use __WEBSITE_KEY__ no  path se o path depende do nome do sitio web
+WEBSITE_KEYWORDS=Chaves
+LinesToImport=Liñas a importar
 
-MemoryUsage=Memory usage
-RequestDuration=Duration of request
-ProductsPerPopularity=Products/Services by popularity
-PopuProp=Products/Services by popularity in Proposals
-PopuCom=Products/Services by popularity in Orders
-ProductStatistics=Products/Services Statistics
-NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+MemoryUsage=Uso de memoria
+RequestDuration=Duración da solicitude
+ProductsPerPopularity=Produtos/Servizos por popularidade
+PopuProp=Produtos/Servizos por popularidade en Orzamentos
+PopuCom=Produtos/Servizos por popularidade e Pedimentos
+ProductStatistics=Estatísticas de Produtos/Servizos
+NbOfQtyInOrders=Cantidade en pedimentos
+SelectTheTypeOfObjectToAnalyze=Seleccione o tipo de obxecto a nalizar...
diff --git a/htdocs/langs/gl_ES/paybox.lang b/htdocs/langs/gl_ES/paybox.lang
index e993d94eb67..533eea03695 100644
--- a/htdocs/langs/gl_ES/paybox.lang
+++ b/htdocs/langs/gl_ES/paybox.lang
@@ -1,31 +1,30 @@
 # Dolibarr language file - Source file is en_US - paybox
-PayBoxSetup=PayBox module setup
-PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
-PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome to our online payment service
-ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-ThisIsInformationOnPayment=This is information on payment to do
-ToComplete=To complete
-YourEMail=Email to receive payment confirmation
-Creditor=Creditor
-PaymentCode=Payment code
-PayBoxDoPayment=Pay with Paybox
-YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
+PayBoxSetup=Configuración do módulo PayBox
+PayBoxDesc=Este módulo ofrece páxinas para permitir o pago en <a href="http://www.paybox.com" target="_blank">PayBox</a> por parte dos clientes. Pode usarse para un pago gratuíto ou para un pago dun obxecto Dolibarr en particular (factura, pedido, ...)
+FollowingUrlAreAvailableToMakePayments=As seguintes URL están dispoñibles para ofrecer unha páxina a un cliente na que facer un pago en obxectos Dolibarr
+PaymentForm=Forma de pagamento
+WelcomeOnPaymentPage=A nosa benvida ao servizo de pagamento en liña
+ThisScreenAllowsYouToPay=Esta pantalla permítelle facer un pagamento en liña a %s.
+ThisIsInformationOnPayment=Esta é información sobre o pagamento a facer
+ToComplete=Completar
+YourEMail=Correo electrónico para recibir a confirmación do pagamento
+Creditor=Acredor
+PaymentCode=Código do pagamento
+PayBoxDoPayment=Pagamento con Paybox
+YouWillBeRedirectedOnPayBox=Será redirixido á páxina segura de PayBox para introducir a información da súa tarxeta de crédito
 Continue=Seguinte
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
-AccountParameter=Account parameters
-UsageParameter=Usage parameters
-InformationToFindParameters=Help to find your %s account information
-PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
-VendorName=Name of vendor
-CSSUrlForPaymentForm=CSS style sheet url for payment form
-NewPayboxPaymentReceived=New Paybox payment received
-NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
-PAYBOX_HMAC_KEY=HMAC key
+SetupPayBoxToHavePaymentCreatedAutomatically=Configure a súa caixa de pagamento coa url <b>%s</b> para que o pagamento se cree automaticamente cando o valide PayBox.
+YourPaymentHasBeenRecorded=Esta páxina confirma que se rexistrou o seu pagamento. Grazas.
+YourPaymentHasNotBeenRecorded=O seu pagamento NON se rexistrou e cancelouse a transacción. Grazas.
+AccountParameter=Parámetros da conta
+UsageParameter=Parámetros de uso
+InformationToFindParameters=Axuda a atopar a información da súa conta %s
+PAYBOX_CGI_URL_V2=URL do módulo CGI de PayBox para pagamento
+CSSUrlForPaymentForm=URL da folla de estilo CSS para o formulario de pagamento
+NewPayboxPaymentReceived=Novo pagamento de PayBox recibido
+NewPayboxPaymentFailed=Novo intento de pagamento de PayBox pero fallou
+PAYBOX_PAYONLINE_SENDEMAIL=Nnotificación por correo electrónico despois do intento de pagamento (éxito ou fallo)
+PAYBOX_PBX_SITE=Valor para PBX SITE
+PAYBOX_PBX_RANG=Valor para PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Valor para Id PBX 
+PAYBOX_HMAC_KEY=Chave HMAC
diff --git a/htdocs/langs/gl_ES/paypal.lang b/htdocs/langs/gl_ES/paypal.lang
index 5eb5f389445..1544765cc29 100644
--- a/htdocs/langs/gl_ES/paypal.lang
+++ b/htdocs/langs/gl_ES/paypal.lang
@@ -1,36 +1,36 @@
 # Dolibarr language file - Source file is en_US - paypal
-PaypalSetup=PayPal module setup
-PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
-PaypalDoPayment=Pay with PayPal
-PAYPAL_API_SANDBOX=Mode test/sandbox
-PAYPAL_API_USER=API username
-PAYPAL_API_PASSWORD=API password
-PAYPAL_API_SIGNATURE=API signature
-PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
+PaypalSetup=Configuración do módulo PayPal
+PaypalDesc=Este módulo permite pagos de clientes vía <a href="http://www.paypal.com" target="_blank">Paypal</a>. Isto pode usarse para realizar calquera pago en relación cun obxecto Dolibarr (facturas, pedimentos ...)
+PaypalOrCBDoPayment=Pagar con Paypal (tarxeta ou Paypal)
+PaypalDoPayment=Pago mediante Paypal
+PAYPAL_API_SANDBOX=Modo de probas/sandbox
+PAYPAL_API_USER=Nome usuario API
+PAYPAL_API_PASSWORD=Contrasinal API
+PAYPAL_API_SIGNATURE=Sinatura API
+PAYPAL_SSLVERSION=Versión Curl SSL
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Propor pago integral (Tarxeta+Paypal) ou só Paypal
 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
+PaypalModeOnlyPaypal=Só PayPal
+ONLINE_PAYMENT_CSS_URL=URL ou CSS opcional da folla de estilo na páxina de pago en liña
+ThisIsTransactionId=Identificador da transacción: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=Engadir a url del pago Paypal ao enviar un documento por correo electrónico
+NewOnlinePaymentReceived=Novo pago en liña recibido
+NewOnlinePaymentFailed=Intentouse un novo pago en liña pero fallou
+ONLINE_PAYMENT_SENDEMAIL=Enderezo de correo electrónico a notificar no caso de intento de pago (con éxito ou non)
+ReturnURLAfterPayment=URL de retorno despois do pago
+ValidationOfOnlinePaymentFailed=Fallou a validación do pago en liña
+PaymentSystemConfirmPaymentPageWasCalledButFailed=A páxina de confirmación de pago foi chamada polo sistema de pago devolveu un erro
+SetExpressCheckoutAPICallFailed=Chamada á API SetExpressCheckout fallou.
+DoExpressCheckoutPaymentAPICallFailed=Chamada á API DoExpressCheckoutPayment fallou.
+DetailedErrorMessage=Detalle da mensaxe de erro
+ShortErrorMessage=Mensaxe curto de erro
+ErrorCode=Código do erro
+ErrorSeverityCode=Gravidade do código de erro
+OnlinePaymentSystem=Sistema de pago online
+PaypalLiveEnabled=Paypal en vivo habilitado (do contrario, modo proba/sandbox)
+PaypalImportPayment=Importe pagos Paypal
+PostActionAfterPayment=Accións despois dos pagos
+ARollbackWasPerformedOnPostActions=Foi executada unha reversión en todas as accións. Debe completar as acciones de publicación manualmente se son precisas.
+ValidationOfPaymentFailed=A validación do pago Paypal fallou
+CardOwner=Titular da tarxeta
+PayPalBalance=Crédito paypal
diff --git a/htdocs/langs/gl_ES/printing.lang b/htdocs/langs/gl_ES/printing.lang
index 97d17227276..19739ba42ba 100644
--- a/htdocs/langs/gl_ES/printing.lang
+++ b/htdocs/langs/gl_ES/printing.lang
@@ -43,12 +43,12 @@ IPP_State_reason1=Razon 1 do estado
 IPP_BW=Branco e negro
 IPP_Color=Cor
 IPP_Device=Dispositivo
-IPP_Media=Printer media
-IPP_Supported=Type of media
-DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
-GoogleAuthNotConfigured=Google OAuth has not been setup. Enable module OAuth and set a Google ID/Secret.
-GoogleAuthConfigured=Google OAuth credentials were found into setup of module OAuth.
-PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
-PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
-PrintTestDescprintgcp=List of Printers for Google Cloud Print.
-PrintTestDescprintipp=List of Printers for Cups.
+IPP_Media=Impresora
+IPP_Supported=Tipo de soporte
+DirectPrintingJobsDesc=Esta páxina enumera os traballos de impresión atopados nas impresoras dispoñibles.
+GoogleAuthNotConfigured=Google OAuth non se configurou. Habilite o módulo OAuth e configure un ID/segredo de Google.
+GoogleAuthConfigured=As credenciais de Google OAuth atopáronse na configuración do módulo OAuth.
+PrintingDriverDescprintgcp=Variables de configuración para o controlador de impresión Google Cloud Print.
+PrintingDriverDescprintipp=Variables de configuración  de drivers para impresoras Cups
+PrintTestDescprintgcp=Listaxe de impresoras para Google Cloud Print.
+PrintTestDescprintipp=Listaxe de impresoras para servidor Cups
diff --git a/htdocs/langs/gl_ES/productbatch.lang b/htdocs/langs/gl_ES/productbatch.lang
index a2cd4187edb..79377f94908 100644
--- a/htdocs/langs/gl_ES/productbatch.lang
+++ b/htdocs/langs/gl_ES/productbatch.lang
@@ -1,6 +1,6 @@
 # ProductBATCH language file - en_US - ProductBATCH
 ManageLotSerial=Usar numeración por lote/serie
-ProductStatusOnBatch=Se (é preciso lote/serie)
+ProductStatusOnBatch=Sí (é preciso lote/serie)
 ProductStatusNotOnBatch=Non (non é preciso lote/serie)
 ProductStatusOnBatchShort=Sí
 ProductStatusNotOnBatchShort=Non
diff --git a/htdocs/langs/gl_ES/products.lang b/htdocs/langs/gl_ES/products.lang
index 585ebaf1788..ba1300b6c83 100644
--- a/htdocs/langs/gl_ES/products.lang
+++ b/htdocs/langs/gl_ES/products.lang
@@ -2,7 +2,7 @@
 ProductRef=Ref. produto
 ProductLabel=Etiqueta produto
 ProductLabelTranslated=Tradución etiqueta de produto
-ProductDescription=Product description
+ProductDescription=Descrición do produto
 ProductDescriptionTranslated=Tradución da descrición de produto
 ProductNoteTranslated=Tradución notas de produto
 ProductServiceCard=Ficha Produto/Servizo
@@ -18,12 +18,12 @@ Reference=Referencia
 NewProduct=Novo produto
 NewService=Novo servizo
 ProductVatMassChange=Cambio de IVE masivo
-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.
+ProductVatMassChangeDesc=Esta ferramenta actualiza o tipo de IVE definido en <b><u>ALL</b></u>produtos e servizos
+MassBarcodeInit=Inicio masivo de código de barras
+MassBarcodeInitDesc=Esta páxina pódese usar para inicializar un código de barras en obxectos que non teñen definido un código de barras. Comprobe antes de completar a configuración do código de barras do módulo.
 ProductAccountancyBuyCode=Código contable (compra)
-ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
-ProductAccountancyBuyExportCode=Accounting code (purchase import)
+ProductAccountancyBuyIntraCode=Código contable (compra intra-comunitaria)
+ProductAccountancyBuyExportCode=Código contable (compra importación)
 ProductAccountancySellCode=Código contable (venda)
 ProductAccountancySellIntraCode=Código contable (venda intracomunitaria)
 ProductAccountancySellExportCode=Código contable (venda de exportación)
@@ -31,23 +31,23 @@ ProductOrService=Produto ou servizo
 ProductsAndServices=Produtos e servizos
 ProductsOrServices=Produtos ou servizos
 ProductsPipeServices=Produtos | Servizos
-ProductsOnSale=Products for sale
-ProductsOnPurchase=Products for purchase
+ProductsOnSale=Produtos á venda
+ProductsOnPurchase=Produtos en compra
 ProductsOnSaleOnly=Produtos só á venda
 ProductsOnPurchaseOnly=Produtos só en compra
 ProductsNotOnSell=Produtos nin á venda nin en compra
-ProductsOnSellAndOnBuy=Produtos en venda e en compra
-ServicesOnSale=Services for sale
-ServicesOnPurchase=Services for purchase
+ProductsOnSellAndOnBuy=Produtos en venda mais en compra
+ServicesOnSale=Servizos en venda
+ServicesOnPurchase=Servizos en compra
 ServicesOnSaleOnly=Servizos só á venda
 ServicesOnPurchaseOnly=Servizos só en compra
 ServicesNotOnSell=Servizos fora de venda e de compra
-ServicesOnSellAndOnBuy=Servizos á venda e en compra
-LastModifiedProductsAndServices=Latest %s modified products/services
+ServicesOnSellAndOnBuy=Servizos á venda mais en compra
+LastModifiedProductsAndServices=Últimos %s produtos/servizos modificados
 LastRecordedProducts=Últimos %s produtos rexistrados
 LastRecordedServices=Últimos %s servizos rexistrados
-CardProduct0=Produto
-CardProduct1=Servizo
+CardProduct0=Ficha produto
+CardProduct1=Ficha servizo
 Stock=Stock
 MenuStocks=Stocks
 Stocks=Stocks e localización de produtos (almacén)
@@ -72,22 +72,22 @@ AppliedPricesFrom=Prezo de venda
 SellingPrice=Prezo de venda
 SellingPriceHT=Prezo de venda sen IVE
 SellingPriceTTC=Prezo de venda con IVE
-SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to store 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.
+SellingMinPriceTTC=Prezo mínimo de venda (IVE incluido)
+CostPriceDescription=Este campo de prezo (sen impostos) pode usarse para almacenar o importe medio que este produto custa á súa empresa. Pode ser calquera prezo que calcule vostede mesmo, por exemplo a partir do prezo medio de compra máis o custo medio de produción e distribución.
+CostPriceUsage=Este valor podería usarse para o cálculo de marxes
 SoldAmount=Importe vendas
 PurchasedAmount=Importe compras
 NewPrice=Novo prezo
 MinPrice=Prezo de venda mín.
 EditSellingPriceLabel=Editar etiqueta prezo de venda
-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=Pechada
+CantBeLessThanMinPrice=O prezo de venda non pode ser inferior ao mínimo permitido para este produto (%s sen impostos). Esta mensaxe tamén pode aparecer se escribe un desconto demasiado alto.
+ContractStatusClosed=Pechado
 ErrorProductAlreadyExists=Un produto coa referencia %s xa existe.
-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.
+ErrorProductBadRefOrLabel=Valor incorrecto como referencia ou etiqueta.
+ErrorProductClone=Houbo un problema ao tentar clonar o produto ou servizo.
+ErrorPriceCantBeLowerThanMinPrice=Erro, o prezo non pode ser inferior ao prezo mínimo.
 Suppliers=Provedores
-SupplierRef=Vendor SKU
+SupplierRef=SKU Provedor
 ShowProduct=Amosar produto
 ShowService=Amosar servizo
 ProductsAndServicesArea=Área produtos e servizos
@@ -104,25 +104,26 @@ SetDefaultBarcodeType=Defina o tipo de código de barras
 BarcodeValue=Valor do código de barras
 NoteNotVisibleOnBill=Nota (non visible nas facturas, orzamentos...)
 ServiceLimitedDuration=Se o produto é un servizo con duración limitada :
-FillWithLastServiceDates=Fill with last service line dates
-MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
-MultiPricesNumPrices=Number of prices
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
-AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this kit
-ParentProductsNumber=Number of parent packaging product
-ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
+FillWithLastServiceDates=Complete coas últimas datas da liña de servizo
+MultiPricesAbility=Varios segmentos de prezos por produto/servizo (cada cliente está nun segmento)
+MultiPricesNumPrices=Nº de prezos
+DefaultPriceType=Base de prezos por defecto (con ou sen impostos) ao engadir novos prezos de venda
+AssociatedProductsAbility=Activar produtos compostos (kits)
+VariantsAbility=Activar variantes (variantes de produtos, por exemplo cor, tamaño)
+AssociatedProducts=Produtos compostos
+AssociatedProductsNumber=Nº de produtos que compoñen este produto
+ParentProductsNumber=Nº de produtos que este produto comptén
+ParentProducts=Produtos pai
+IfZeroItIsNotAVirtualProduct=Se 0, este produto non é un produto composto
+IfZeroItIsNotUsedByVirtualProduct=Se 0, este produto non está sendo utilizado por ningún produto composto
 KeywordFilter=Filtro por clave
-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
+CategoryFilter=Filtro por categoría
+ProductToAddSearch=Procurar produtos a axuntar
+NoMatchFound=Non atopáronse resultados
+ListOfProductsServices=Listaxe de produtos/servizos
+ProductAssociationList=Listaxe de produtos/servizos que compoñen este produto composto
+ProductParentList=Listaxe de produtos/servizos con este produto como compoñente
+ErrorAssociationIsFatherOfThis=Un dos produtos seleccionados é pai do produto en curso
 DeleteProduct=Eliminar un produto/servizo
 ConfirmDeleteProduct=¿Está certo de querer eliminar este produto/servizo?
 ProductDeleted=O produto/servizo "%s" foi eliminado da base de datos.
@@ -134,8 +135,8 @@ DeleteProductLine=Eliminar liña  de produto
 ConfirmDeleteProductLine=¿Está certo de querer eliminar esta liña  de produto?
 ProductSpecial=Especial
 QtyMin=Cantidad mínima de compra
-PriceQtyMin=Price quantity min.
-PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
+PriceQtyMin=Prezo para esta cantidade mínima
+PriceQtyMinCurrency=Prezo (moeda) para esta cantidade mínima (sen desconto)
 VATRateForSupplierProduct=Tasa IVE (para este produto/provedor)
 DiscountQtyMin=Desconto para esta cantidade
 NoPriceDefinedForThisSupplier=Ningún prezo/cant. definido para este provedor/produto
@@ -157,8 +158,8 @@ RowMaterial=Materia prima
 ConfirmCloneProduct=¿Está certo de querer clonar o produto ou servizo <b>%s</b>?
 CloneContentProduct=Clonar a información principal do produto/servizo
 ClonePricesProduct=Clonar prezos
-CloneCategoriesProduct=Clone tags/categories linked
-CloneCompositionProduct=Clone virtual product/service
+CloneCategoriesProduct=Clonar etiquetas/categorías ligadas
+CloneCompositionProduct=Clonar produto/servizo virtual
 CloneCombinationsProduct=Clonar variantes de produto
 ProductIsUsed=Este produto é utilizado
 NewRefForClone=Ref. do novo produto/servizo
@@ -167,11 +168,13 @@ BuyingPrices=Prezos de compra
 CustomerPrices=Prezos a clientes
 SuppliersPrices=Prezos a provedores
 SuppliersPricesOfProductsOrServices=Prezos de provedores (de produtos ou servizos)
-CustomCode=Código aduaneiro / Mercancía /
+CustomCode=Aduanda / Mercadoría / Código HS
 CountryOrigin=País de orixe
-Nature=Nature of product (material/finished)
-NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+RegionStateOrigin=Rexión de orixe
+StateOrigin=Estado|Provincia de orixe
+Nature=Natureza do produto (material/manufacturado)
+NatureOfProductShort=Natureza do produto
+NatureOfProductDesc=Materia prima ou produto manufacturado
 ShortLabel=Etiqueta curta
 Unit=Unidade
 p=u.
@@ -205,12 +208,12 @@ unitLM=Metro lineal
 unitM2=Metro cadrado
 unitM3=Metro cúbico
 unitL=Litro
-unitT=ton
+unitT=tonelada
 unitKG=kg
 unitG=Gramo
 unitMG=mg
-unitLB=pound
-unitOZ=ounce
+unitLB=libra
+unitOZ=onza
 unitM=Metro
 unitDM=dm
 unitCM=cm
@@ -229,8 +232,8 @@ unitCM3=cm³
 unitMM3=mm³
 unitFT3=ft³
 unitIN3=in³
-unitOZ3=ounce
-unitgallon=gallon
+unitOZ3=onza
+unitgallon=galón
 ProductCodeModel=Modelo de ref. de produto
 ServiceCodeModel=Modelo de ref. de servizo
 CurrentProductPrice=Prezo actual
@@ -239,15 +242,15 @@ AlwaysUseFixedPrice=Usar o prezo fixado
 PriceByQuantity=Prezos diferentes por cantidade
 DisablePriceByQty=Desactivar prezos por cantidade
 PriceByQuantityRange=Rango cantidade
-MultipriceRules=Regras para segmento de prezos
-UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
+MultipriceRules=Prezos automaticamente por segmento
+UseMultipriceRules=Usar regras do segmento de prezos (definidas na configuración do módulo de produto) para calcular automaticamente os prezos de todos os outros segmentos segundo o primeiro segmento
 PercentVariationOver=%% variación sobre %s
 PercentDiscountOver=%% desconto sobre %s
 KeepEmptyForAutoCalculation=Mantéñase baleiro para que calcule automáticamente o peso ou volume dos produtos
-VariantRefExample=Examples: COL, SIZE
-VariantLabelExample=Examples: Color, Size
+VariantRefExample=Exemplo: COR, TAMAÑO
+VariantLabelExample=Exemplo: Cor, Tamaño
 ### composition fabrication
-Build=Fabricar
+Build=Producir
 ProductsMultiPrice=Produtos e prezos para cada segmento de prezos
 ProductsOrServiceMultiPrice=Prezos a clientes (de produtos ou servizos, multiprezos)
 ProductSellByQuarterHT=Facturación trimestral de produtos antes de impostos
@@ -257,15 +260,15 @@ Quarter2=2º trimestre
 Quarter3=3º trimestre
 Quarter4=4º trimestre
 BarCodePrintsheet=Imprimir código de barras
-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.
+PageToGenerateBarCodeSheets=Con esta ferramenta pode imprimir follas de pegatinas de código de barras. Escolla o formato da páxina da pegatina, o tipo de código de barras e o valor do código de barras e prema no botón <b>%s</b>.
+NumberOfStickers=Número de pegatinas para imprimir na páxina
+PrintsheetForOneBarCode=Imprimir varias pegatinas para un código de barras
+BuildPageToPrint=Xerar páxina para imprimir
+FillBarCodeTypeAndValueManually=Cubrir o tipo e o valor do código de barras manualmente.
+FillBarCodeTypeAndValueFromProduct=Cubrir o tipo de código de barras e o valor do código de barras dun produto.
+FillBarCodeTypeAndValueFromThirdParty=Cubrir o tipo de código de barras e o valor do código de barras dun terceiro.
+DefinitionOfBarCodeForProductNotComplete=A definición do tipo ou valor do código de barras non está completa para o produto %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=A definición do tipo ou valor do código de barras non completo para terceiros %s.
 BarCodeDataForProduct=Información do código de barras do produto %s:
 BarCodeDataForThirdparty=Información do código de barras do terceiro %s:
 ResetBarcodeForAllRecords=Definir valores de codigo de barras para todos os rexistros (isto restablecerá os valores de códigos de barras xa rexistrados cos novos valores)
@@ -280,68 +283,68 @@ MinimumRecommendedPrice=O prezo mínimo recomendado é: %s
 PriceExpressionEditor=Editor de expresión de prezos
 PriceExpressionSelected=Expresión de prezos seleccionada
 PriceExpressionEditorHelp1="price = 2 + 2" ou "2 + 2" para configurar un prezo. Use ; para separar expresións
-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>
+PriceExpressionEditorHelp2=Pode acceder a ExtraFields con variables como  <b>#extrafield_myextrafieldkey#</b> e variables globais con <b>#global_mycode#</b>
+PriceExpressionEditorHelp3=Tanto en produto/servizo como nos prezos de provedores hai estas variables dispoñibles:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=Só no prezo do produto/servizo:  <b>#supplier_min_price#</b><br>Só nos prezos do provedor:  <b>#supplier_quantity# and #supplier_tva_tx#</b>
 PriceExpressionEditorHelp5=Valores globais dispoñibles:
 PriceMode=Modo prezo
 PriceNumeric=Número
 DefaultPrice=Prezo por defecto
-DefaultPriceLog=Log of previous default prices
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Child products
+DefaultPriceLog=Rexistro de prezos predeterminados anteriores
+ComposedProductIncDecStock=Incrementar/Diminuir stock ao mudar o pai
+ComposedProduct=Subproduto
 MinSupplierPrice=Prezo mínimo de compra
 MinCustomerPrice=Prezo mínimo de venda
 DynamicPriceConfiguration=Configuración de prezo dinámico
-DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
+DynamicPriceDesc=Pode definir fórmulas matemáticas para calcular os prezos do cliente ou do provedor. Tales fórmulas poden empregar todos os operadores matemáticos, algunhas constantes e variables. Pode definir aquí as variables que desexa empregar. Se a variable precisa unha actualización automática, pode definir a URL externa para permitir a Dolibarr actualizar o valor automaticamente.
 AddVariable=Engadir variable
 AddUpdater=Engadir Actualizador
 GlobalVariables=Variables globais
 VariableToUpdate=Variable a actualizar
-GlobalVariableUpdaters=External updaters for variables
+GlobalVariableUpdaters=Variables globais a actualizar
 GlobalVariableUpdaterType0=datos JSON
-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"}}
+GlobalVariableUpdaterHelp0=Analiza os datos JSON do URL especificado, VALUE especifica a localización do valor relevante,
+GlobalVariableUpdaterHelpFormat0=Formato da solicitude {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=Datos do servizo web
+GlobalVariableUpdaterHelp1=Analiza os datos do Webservice a partir dun URL especificado, NS especifica o espazo de nomes, VALUE especifica a localización do valor relevante, DATA debe conter os datos que se enviarán e METHOD é o método WS a chamar
+GlobalVariableUpdaterHelpFormat1=O formato da solicitude é {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your":"data","to":"send"}}
 UpdateInterval=Intervalo de actualización (minutos)
 LastUpdated=Última actualización
 CorrectlyUpdated=Actualizado correctamente
-PropalMergePdfProductActualFile=Arcquivos usados para engadir no PDF Azur son
-PropalMergePdfProductChooseFile=Seleccione os arquivos PDF
-IncludingProductWithTag=Produtos/servizos incluidos co tag
+PropalMergePdfProductActualFile=Ficheiros usados para engadir no PDF Azur son
+PropalMergePdfProductChooseFile=Seleccione os ficheiros PDF
+IncludingProductWithTag=Produtos/servizos incluidos coa etiqueta
 DefaultPriceRealPriceMayDependOnCustomer=Prezo por defecto, ou prezo real pode depender do cliente
 WarningSelectOneDocument=Seleccione alo menos un documento
 DefaultUnitToShow=Unidade
 NbOfQtyInProposals=Cant. en orzamentos
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+ClinkOnALinkOfColumn=Click na ligazón da columna %s para obter unha vista detallada...
 ProductsOrServicesTranslations=Tradución Produtos/Servizos
-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
+TranslatedLabel=Tradución da etiqueta
+TranslatedDescription=Tradución da descrición
+TranslatedNote=Tradución das notas
+ProductWeight=Peso para 1 produto
+ProductVolume=Volume para 1 produto
+WeightUnits=Peso unitario
+VolumeUnits=Volumen unitario
+WidthUnits=Ancho unitario
+LengthUnits=Lonxitude unitaria
+HeightUnits=Peso unitario
+SurfaceUnits=Superficie unitaria
+SizeUnits=Tamaño unitario
+DeleteProductBuyPrice=Eliminar prezo de compra
+ConfirmDeleteProductBuyPrice=¿Está certo de querer eliminar este prezo de compra?
+SubProduct=Subproduto
+ProductSheet=Folla de produto
+ServiceSheet=Folla de servizo
+PossibleValues=Valores posibles
 GoOnMenuToCreateVairants=Vaia ao menú %s - %s para preparar variables de atributos (como cores, tamaño, ...)
-UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
-ProductSupplierDescription=Vendor description for the product
-UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
-PackagingForThisProduct=Packaging
-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
+UseProductFournDesc=Engade unha función para definir as descricións dos produtos definidos polos provedores ademais das descricións para os clientes
+ProductSupplierDescription=Descrición do produto do provedor
+UseProductSupplierPackaging=Utilice o envase nos prezos do provedor (recalcule as cantidades segundo o prezo do empaquetado do provedor ao engadir/actualizar a liña nos documentos do provedor)
+PackagingForThisProduct=Empaquetado
+PackagingForThisProductDesc=No pedimento do provedor, solicitará automaticamente esta cantidade (ou un múltiplo desta cantidade). Non pode ser inferior á cantidade mínima de compra
+QtyRecalculatedWithPackaging=A cantidade da liña recalculouse segundo o empaquetado do provedor
 
 #Attributes
 VariantAttributes=Atributos variantes
@@ -364,31 +367,31 @@ SelectCombination=Seleccione combinación
 ProductCombinationGenerator=Xerador de variantes
 Features=Funcións
 PriceImpact=Impacto no prezo
-ImpactOnPriceLevel=Impact on price level %s
-ApplyToAllPriceImpactLevel= Apply to all levels
-ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
+ImpactOnPriceLevel=Impacto sobre o prexo no nivel %s
+ApplyToAllPriceImpactLevel= Aplicar a todos os niveis
+ApplyToAllPriceImpactLevelHelp=Ao facer clic aquí establecerá o mesmo impacto no prezo en todos os niveis
 WeightImpact=Impacto no peso
 NewProductAttribute=Novo atributo
 NewProductAttributeValue=Novo valor de atributo
 ErrorCreatingProductAttributeValue=Ocurriu un erro ao crear o valor do atributo. Esto pode ser por que xa existía un valor con esta referencia
-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.
+ProductCombinationGeneratorWarning=Se continúa, antes de xerar novas variantes, ELIMINARÁ todas as anteriores. as xa existentes actualizaranse cos novos valores
+TooMuchCombinationsWarning=Xerar moitas variantes pode producir un alto uso da CPU, uso de memoria e Dolibarr será quen de crealas. Activar a opción "%s" pode axudar a reducir o uso de memoria.
 DoNotRemovePreviousCombinations=Non remover variantes previas
 UsePercentageVariations=Utilizar variacións porcentuais
 PercentageVariation=Variación porcentual
 ErrorDeletingGeneratedProducts=Aconteceu un erro mentres eliminaba as variantes de produtos existentes
 NbOfDifferentValues=Nº de valores diferentes
-NbProducts=Number of products
-ParentProduct=Parent product
+NbProducts=Nº de produtos
+ParentProduct=Produto pai
 HideChildProducts=Ocultar as variantes de produtos
 ShowChildProducts=Amosar a variantes de produtos
-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=Referencia de produto de destino
+NoEditVariants=Vaia á tarxeta de produto principal e edite o impacto do prezo das variantes na lapela de variantes
+ConfirmCloneProductCombinations=¿Quere copiar todas as variantes do produto a outro produto pai coa referencia dada?
+CloneDestinationReference=Referencia de produto  destino
 ErrorCopyProductCombinations=Aconteceu un erro ao copiar as variantes de produto
 ErrorDestinationProductNotFound=Destino do produto non atopado
 ErrorProductCombinationNotFound=Variante do produto non atopada
-ActionAvailableOnVariantProductOnly=Action only available on the variant of product
-ProductsPricePerCustomer=Product prices per customers
-ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
-DeleteLinkedProduct=Delete the child product linked to the combination
+ActionAvailableOnVariantProductOnly=Acción só dispoñible na variante do produto
+ProductsPricePerCustomer=Prezos de produto por cliente
+ProductSupplierExtraFields=Atributos adicionais (Prezos Provedor)
+DeleteLinkedProduct=Eliminar o produto fillo ligado á combinación
diff --git a/htdocs/langs/gl_ES/projects.lang b/htdocs/langs/gl_ES/projects.lang
index 58766a79bc1..55a7a3e1624 100644
--- a/htdocs/langs/gl_ES/projects.lang
+++ b/htdocs/langs/gl_ES/projects.lang
@@ -41,22 +41,22 @@ SetProject=Definir proxecto
 NoProject=Ningún proxecto definido ou propiedade de
 NbOfProjects=Nº de proxectos
 NbOfTasks=Nº de tarefas
-TimeSpent=Tempo adicado
-TimeSpentByYou=Tempo adicado por vostede
-TimeSpentByUser=Tempo adicado por usuario
+TimeSpent=Tempo empregado
+TimeSpentByYou=Tempo empregado por vostede
+TimeSpentByUser=Tempo empregado por usuario
 TimesSpent=Tempos adicados
 TaskId=ID Tarefa
 RefTask=Ref. tarefa
 LabelTask=Etiqueta tarefa
-TaskTimeSpent=Tempo adicado en tarefas
+TaskTimeSpent=Tempo empregado en tarefas
 TaskTimeUser=Usuario
 TaskTimeNote=Nota
 TaskTimeDate=Data
 TasksOnOpenedProject=Tarefas en proxectos abertos
 WorkloadNotDefined=Carga de traballo non definida
-NewTimeSpent=Tempo adicado
-MyTimeSpent=Meu tempo adicado
-BillTime=Facturar tempo adicado
+NewTimeSpent=Tempo empregado
+MyTimeSpent=Meu tempo empregado
+BillTime=Facturar tempo empregado
 BillTimeShort=Facturar tempo
 TimeToBill=Tempo non facturado
 TimeBilled=Tempo facturado
@@ -67,7 +67,7 @@ TaskDateEnd=Data finalización tarefa
 TaskDescription=Descrición tarefa
 NewTask=Nova tarefa
 AddTask=Crear tarefa
-AddTimeSpent=Engadir tempo adicado
+AddTimeSpent=Engadir tempo empregado
 AddHereTimeSpentForDay=Engadir tempo empregado neste día/tarefa
 AddHereTimeSpentForWeek=Engadir tempo empregado nesta semana/tarefa
 Activity=Actividade
@@ -85,6 +85,7 @@ ProgressCalculated=Progresión calculada
 WhichIamLinkedTo=que eu liguei a
 WhichIamLinkedToProject=que eu liguei ao proxecto
 Time=Tempo
+TimeConsumed=Consumido
 ListOfTasks=Listaxe de tarefas
 GoToListOfTimeConsumed=Ir á listaxe de tempos empregados
 GanttView=Vista de Gantt
@@ -99,8 +100,8 @@ ListShippingAssociatedProject=Listaxe de envíos asociados ao proxecto
 ListFichinterAssociatedProject=Listaxe de intervencións asociadas ao proxecto
 ListExpenseReportsAssociatedProject=Listaxe de informes de gastos asociados ao proxecto
 ListDonationsAssociatedProject=Listaxe de doacións/subvencións asociadas ao proxecto
-ListVariousPaymentsAssociatedProject=Listaxe de pagos diversos asociados ao proxecto
-ListSalariesAssociatedProject=Listaxe de pagos de salarios asociados ao proxecto
+ListVariousPaymentsAssociatedProject=Listaxe de pagamentos diversos asociados ao proxecto
+ListSalariesAssociatedProject=Listaxe de pagamentos de salarios asociados ao proxecto
 ListActionsAssociatedProject=Listaxe de eventos asociados ao proxecto
 ListMOAssociatedProject=Listaxe de ordes de fabricación asociadas ao proxecto
 ListTaskTimeUserProject=Listaxe de tempo empregado nas tarefas do proxecto
@@ -115,7 +116,7 @@ ChildOfTask=Fío da tarefa
 TaskHasChild=A tarefa ten fíos
 NotOwnerOfProject=Non é dono deste proxecto privado
 AffectedTo=Asignado a
-CantRemoveProject=Este proxecto non pode ser eliminado porque está referenciado por algúns outros obxectoss (facturas, pedimentos ou outras). Ver lapela de referencias.
+CantRemoveProject=Este proxecto non pode ser eliminado porque está referenciado por algúns outros obxectoss (facturas, pedimentos ou outras). Ver lapela '%s'.
 ValidateProject=Validar proxecto
 ConfirmValidateProject=¿Está certo de querer validar este proxecto?
 CloseAProject=Pechar proxecto
@@ -126,25 +127,25 @@ ConfirmReOpenAProject=Está certo de querer reabrir este proxecto?
 ProjectContact=Contactos do proxecto
 TaskContact=Contactos de tarefas
 ActionsOnProject=Eventos do proxecto
-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
-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.
+YouAreNotContactOfProject=Vostede non é contacto deste proxecto privado
+UserIsNotContactOfProject=O usuario non é contacto deste proxecto privado
+DeleteATimeSpent=Eliminación de tempo empregado
+ConfirmDeleteATimeSpent=¿Está certo de querer eliminar este tempo empregado?
+DoNotShowMyTasksOnly=Ver tamén tarefas non asignadas a min
+ShowMyTasksOnly=Ver só tarefas asignadas a min
+TaskRessourceLinks=Contactos da tarefa
+ProjectsDedicatedToThisThirdParty=Proxectos adicados a este terceiro
+NoTasks=Ningunha tarefa para este proxecto
+LinkedToAnotherCompany=Ligado a outro terceiro
+TaskIsNotAssignedToUser=Tarefa non asignada ao usuario. Use o botón '<strong>%s</strong>' para asignar a tarefa agora.
+ErrorTimeSpentIsEmpty=O tempo consumido está baleiro
+ThisWillAlsoRemoveTasks=Esta operación tamén eliminará todas as tarefas do proxecto (<b>%s</b> tarefas neste intre) e todas as entradas de tempo empregado.
+IfNeedToUseOtherObjectKeepEmpty=Se os obxectos (factura, pedimento, ...) pertencen a outro terceiro, debe estar ligado ao proxecto a crear, deixe isto baleiro para permitir asignar o proxecto a distintos terceiros.
 CloneTasks=Clonar as tarefas
 CloneContacts=Clonar os contactos
 CloneNotes=Clonar a notas
 CloneProjectFiles=Clonar os ficheiros engadidos no proxecto
-CloneTaskFiles=Clonar os ficheiros engadidos da(s) tarefa(s) (se se clonan  a(s) tarefa(s))
+CloneTaskFiles=Clonar tarefa(s) engadida(s) a ficheiro(s) (se se clonaron  a(s) tarefa(s))
 CloneMoveDate=¿Actualizar as datas dos proxectos/tarefas?
 ConfirmCloneProject=¿Está certo de querer clonar este proxecto?
 ProjectReportDate=Cambiar data das tarefas segundo a data de inicio do novo proxecto
@@ -178,7 +179,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Participante
 TypeContact_project_task_external_TASKCONTRIBUTOR=Participante
 SelectElement=Escolla elemento
 AddElement=Ligar ao elemento
-LinkToElementShort=Vincular a
+LinkToElementShort=Ligar a
 # Documents models
 DocumentModelBeluga=Prantilla de documento para a descrición dos obxectos ligados
 DocumentModelBaleine=Prantilla de documendo do proxecto para tarefas
@@ -187,12 +188,12 @@ PlannedWorkload=Carga de traballo planificada
 PlannedWorkloadShort=Carga de traballo
 ProjectReferers=Items relacionados
 ProjectMustBeValidatedFirst=O proxecto previamente ten que validarse
-FirstAddRessourceToAllocateTime=Asignar a un usuario a unha tarefa para asignar tempo
+FirstAddRessourceToAllocateTime=Asignar un usuario a unha tarefa para asignar tempo
 InputPerDay=Entrada por día
 InputPerWeek=Entrada por semana
 InputPerMonth=Entrada por mes
 InputDetail=Detalle de entrada
-TimeAlreadyRecorded=Tempo adicado xa rexistrado para esta tarefa/día e usuario %s
+TimeAlreadyRecorded=Tempo empregado xa rexistrado para esta tarefa/día e usuario %s
 ProjectsWithThisUserAsContact=Proxectos con este usuario como contacto
 TasksWithThisUserAsContact=Tarefas asignadas a este usuario
 ResourceNotAssignedToProject=Non asignado ao proxecto
@@ -211,12 +212,12 @@ ProjectNbProjectByMonth=Nº de proxectos creados por mes
 ProjectNbTaskByMonth=Nº de tarefas creadas por mes
 ProjectOppAmountOfProjectsByMonth=Importe de oportunidades por mes
 ProjectWeightedOppAmountOfProjectsByMonth=Importe medio oportunidades por mes
-ProjectOpenedProjectByOppStatus=Open project|lead by lead status
-ProjectsStatistics=Statistics on projects or leads
-TasksStatistics=Statistics on tasks of projects or leads
+ProjectOpenedProjectByOppStatus=Proxectos/oportunidades abertas por estado da oportunidade
+ProjectsStatistics=Estatísticas sobre proxectos/oportunidades
+TasksStatistics=Estatísticas sobre tarefas en proxectos/oportunidade
 TaskAssignedToEnterTime=Tarefa asignada. Debería poder introducir tempos nesta tarefa.
 IdTaskTime=Id tempo da tarefa
-YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
+YouCanCompleteRef=Se desexa completar a referencia con algún sufixo, recoméndase engadir un carácter - para separala, polo que a numeración automática aínda funcionará correctamente para os próximos proxectos. Por exemplo %s-MYSUFFIX
 OpenedProjectsByThirdparties=Proxectos abertos de terceiros
 OnlyOpportunitiesShort=Só oportunidades
 OpenedOpportunitiesShort=Oportunidades abertas
@@ -238,7 +239,7 @@ LatestProjects=Últimos %s proxectos
 LatestModifiedProjects=Últimos %s proxectos modificados
 OtherFilteredTasks=Outras tarefas filtradas
 NoAssignedTasks=Sen tarefas asignadas ( Asigne proxectos/tarefas ao usuario actual dende o selector superior  para indicar tempos nelas)
-ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
+ThirdPartyRequiredToGenerateInvoice=Debe definirse un terceiro no proxecto para poder facturalo.
 ChooseANotYetAssignedTask=Escolla unha tarefa non asignada aínda a vostede
 # Comments trans
 AllowCommentOnTask=Permitir comentarios dos usuarios nas tarefas
@@ -254,7 +255,7 @@ TimeSpentForInvoice=Tempo empregado
 OneLinePerUser=Unha liña por usuario
 ServiceToUseOnLines=Servizo a usar en liñas
 InvoiceGeneratedFromTimeSpent=Factura %s foi xerada co tempo empregado no proxecto
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
+ProjectBillTimeDescription=Comprobe se introduce unha folla de tempo nas tarefas do proxecto e planea xerar factura(s) a partir da folla de tempo para facturar ao cliente do proxecto (non comprobe se pensa crear unha factura que non estexa baseada nas follas de traballo introducidas). Nota: para xerar factura, vaia a pestana "Tempo empregado" do proxecto e selecciona as liñas a incluír.
 ProjectFollowOpportunity=Seguir oportunidade
 ProjectFollowTasks=Seguir tarefa
 Usage=Uso
diff --git a/htdocs/langs/gl_ES/propal.lang b/htdocs/langs/gl_ES/propal.lang
index c0d0b31f60c..af8b0cff643 100644
--- a/htdocs/langs/gl_ES/propal.lang
+++ b/htdocs/langs/gl_ES/propal.lang
@@ -1,87 +1,91 @@
 # Dolibarr language file - Source file is en_US - propal
 Proposals=Orzamentos
-Proposal=Commercial proposal
+Proposal=Orzamento
 ProposalShort=Orzamento
 ProposalsDraft=Orzamentos borrador
-ProposalsOpened=Open commercial proposals
-CommercialProposal=Commercial proposal
-PdfCommercialProposalTitle=Commercial proposal
-ProposalCard=Proposal card
-NewProp=New commercial proposal
-NewPropal=New proposal
+ProposalsOpened=Orzamentos abertos
+CommercialProposal=Orzamento
+PdfCommercialProposalTitle=Orzamento
+ProposalCard=Ficha orzamento
+NewProp=Novo orzamento
+NewPropal=Novo orzamento
 Prospect=Cliente potencial
-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
+DeleteProp=Eliminar orzamento
+ValidateProp=Validar orzamento
+AddProp=Crear orzamento
+ConfirmDeleteProp=¿Está certo de querer eliminar este orzamento?
+ConfirmValidateProp=¿Está certo de querer validar este orzamento coa referencia <b>%s</b> ?
+LastPropals=Últimos %s orzamentos
 LastModifiedProposals=Últimos %s orzamentos modificados
-AllPropals=All proposals
-SearchAProposal=Search a proposal
-NoProposal=No proposal
-ProposalsStatistics=Commercial proposal's statistics
+AllPropals=Todos os orzamentos
+SearchAProposal=Atopar un orzamento
+NoProposal=Sen orzamentos
+ProposalsStatistics=Estatísticas de orzamentos
 NumberOfProposalsByMonth=Número por mes
-AmountOfProposalsByMonthHT=Amount by month (excl. tax)
-NbOfProposals=Number of commercial proposals
-ShowPropal=Show proposal
+AmountOfProposalsByMonthHT=Importe por mes (sen IVE)
+NbOfProposals=Número de orzamentos
+ShowPropal=Ver orzamento
 PropalsDraft=Borradores
-PropalsOpened=Aberta
+PropalsOpened=Abertos
 PropalStatusDraft=Borrador (é preciso validar)
-PropalStatusValidated=Validated (proposal is open)
-PropalStatusSigned=Signed (needs billing)
-PropalStatusNotSigned=Not signed (closed)
+PropalStatusValidated=Validado (Orzamento aberto)
+PropalStatusSigned=Asinado (a facturar)
+PropalStatusNotSigned=Non asinado (pechado)
 PropalStatusBilled=Facturado
 PropalStatusDraftShort=Borrador
-PropalStatusValidatedShort=Validated (open)
-PropalStatusClosedShort=Pechada
-PropalStatusSignedShort=Signed
-PropalStatusNotSignedShort=Not signed
+PropalStatusValidatedShort=Validado (aberto)
+PropalStatusClosedShort=Pechado
+PropalStatusSignedShort=Asinado
+PropalStatusNotSignedShort=Non asinado
 PropalStatusBilledShort=Facturado
-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
-CloseAs=Set status to
-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
-AvailabilityPeriod=Availability delay
-SetAvailability=Set availability delay
-AfterOrder=after order
-OtherProposals=Other proposals
+PropalsToClose=Orzamentos a pechar
+PropalsToBill=Orzamentos asinados a facturar
+ListOfProposals=Listaxe de orzamentos
+ActionsOnPropal=Eventos no orzamento
+RefProposal=Ref. orzamento
+SendPropalByMail=Enviar orzamento por mail
+DatePropal=Data orzamento
+DateEndPropal=Data fin de validez
+ValidityDuration=Duración de validez
+SetAcceptedRefused=Establecer aceptado/rexeitado
+ErrorPropalNotFound=Orzamento %s non atopado
+AddToDraftProposals=Engadir borrador do orzamento
+NoDraftProposals=Sen orzamentos borrador
+CopyPropalFrom=Crear orzamento por copia dun existente
+CreateEmptyPropal=Crear proposta comercial baleira ou dende a listaxe de produtos/servizos.
+DefaultProposalDurationValidity=Prazo de validez por defecto (en días)
+UseCustomerContactAsPropalRecipientIfExist=Utilizar enderezo do contacto de seguemento do cliente definido, na vez do enderezo do terceiro como destinatario dos orzamentos
+ConfirmClonePropal=¿Está certo de querer clonar o orzamento <b>%s</b>?
+ConfirmReOpenProp=¿Está certo de abrir de novo o orzamento <b>%s</b>?
+ProposalsAndProposalsLines=Orzamentos e liñas de orzamentos
+ProposalLine=Liña de orzamento
+AvailabilityPeriod=Tempo de entrega
+SetAvailability=Definir o tempo de entrega
+AfterOrder=dende a sinatura
+OtherProposals=Outros orzamentos
 ##### Availability #####
-AvailabilityTypeAV_NOW=Immediate
-AvailabilityTypeAV_1W=1 week
-AvailabilityTypeAV_2W=2 weeks
-AvailabilityTypeAV_3W=3 weeks
-AvailabilityTypeAV_1M=1 month
+AvailabilityTypeAV_NOW=Inmediata
+AvailabilityTypeAV_1W=1 semana
+AvailabilityTypeAV_2W=2 semanas
+AvailabilityTypeAV_3W=3 semanas
+AvailabilityTypeAV_1M=1 mes
 ##### Types de contacts #####
-TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
-TypeContact_propal_external_BILLING=Contacto cliente facturación pedido
-TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
-TypeContact_propal_external_SHIPPING=Customer contact for delivery
+TypeContact_propal_internal_SALESREPFOLL=Comercial seguemento orzamento
+TypeContact_propal_external_BILLING=Contacto cliente de facturación orzamento
+TypeContact_propal_external_CUSTOMER=Contacto cliente seguemento orzamento
+TypeContact_propal_external_SHIPPING=Contacto cliente para envíos
 # 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
+DocModelAzurDescription=Modelo de orzamento completo (vella implementación de modelo Cyan)
+DocModelCyanDescription=Modelo de orzamento completo
+DefaultModelPropalCreate=Modelo por defecto
+DefaultModelPropalToBill=Modelo por defecto ao pechar un orzamento (a facturar)
+DefaultModelPropalClosed=Modelo por defecto ao pechar un orzamento (non facturado)
+ProposalCustomerSignature=Aceptado: sinatura dixital (selo da empresa, data e sinatura)
+ProposalsStatisticsSuppliers=Estatísticas orzamentos de provedores
+CaseFollowedBy=Caso seguido por
+SignedOnly=Só asinado
+IdProposal=ID orzamento
+IdProduct=ID Produto
+PrParentLine=Liña principal do orzamento
+LineBuyPriceHT=Importe do prezo de compra neto sen impostos para a liña
+
diff --git a/htdocs/langs/gl_ES/receiptprinter.lang b/htdocs/langs/gl_ES/receiptprinter.lang
index e8a421ecd45..15589e95e61 100644
--- a/htdocs/langs/gl_ES/receiptprinter.lang
+++ b/htdocs/langs/gl_ES/receiptprinter.lang
@@ -1,82 +1,82 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
-ReceiptPrinterSetup=Setup of module ReceiptPrinter
-PrinterAdded=Printer %s added
-PrinterUpdated=Printer %s updated
-PrinterDeleted=Printer %s deleted
-TestSentToPrinter=Test Sent To Printer %s
-ReceiptPrinter=Receipt printers
-ReceiptPrinterDesc=Setup of receipt printers
-ReceiptPrinterTemplateDesc=Setup of Templates
-ReceiptPrinterTypeDesc=Description of Receipt Printer's type
-ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
-ListPrinters=List of Printers
-SetupReceiptTemplate=Template Setup
-CONNECTOR_DUMMY=Dummy Printer
-CONNECTOR_NETWORK_PRINT=Network Printer
-CONNECTOR_FILE_PRINT=Local Printer
-CONNECTOR_WINDOWS_PRINT=Local Windows Printer
-CONNECTOR_CUPS_PRINT=Cups Printer
-CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
+ReceiptPrinterSetup=Configuración do módulo ReceiptPrinter
+PrinterAdded=Engadiuse a impresora %s
+PrinterUpdated=Actualizouse a impresora %s
+PrinterDeleted=Eliminouse a impresora %s
+TestSentToPrinter=Proba enviada á impresora %s
+ReceiptPrinter=Impresoras de recibos
+ReceiptPrinterDesc=Configuración de impresoras de recibos
+ReceiptPrinterTemplateDesc=Configuración de Modelos
+ReceiptPrinterTypeDesc=Descrición do tipo de impresora de recibos
+ReceiptPrinterProfileDesc=Descrición do perfil da impresora de recibos
+ListPrinters=Listaxe de impresoras
+SetupReceiptTemplate=Configuración do modelo
+CONNECTOR_DUMMY=Impresora ficticia
+CONNECTOR_NETWORK_PRINT=Impresora de rede
+CONNECTOR_FILE_PRINT=Impresora local
+CONNECTOR_WINDOWS_PRINT=Impresora local en Windows
+CONNECTOR_CUPS_PRINT=Impresora CUPS
+CONNECTOR_DUMMY_HELP=Impresora falsa para proba, non fai nada
 CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
 CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
-CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
-PROFILE_DEFAULT=Default Profile
-PROFILE_SIMPLE=Simple Profile
-PROFILE_EPOSTEP=Epos Tep Profile
-PROFILE_P822D=P822D Profile
-PROFILE_STAR=Star Profile
-PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
-PROFILE_SIMPLE_HELP=Simple Profile No Graphics
-PROFILE_EPOSTEP_HELP=Epos Tep Profile
-PROFILE_P822D_HELP=P822D Profile No Graphics
-PROFILE_STAR_HELP=Star Profile
-DOL_LINE_FEED=Skip line
-DOL_ALIGN_LEFT=Left align text
-DOL_ALIGN_CENTER=Center text
-DOL_ALIGN_RIGHT=Right align text
-DOL_USE_FONT_A=Use font A of printer
-DOL_USE_FONT_B=Use font B of printer
-DOL_USE_FONT_C=Use font C of printer
+CONNECTOR_CUPS_PRINT_HELP=CUPS nome da impresora, exemplo: HPRT_TP805L
+PROFILE_DEFAULT=Perfil predeterminado
+PROFILE_SIMPLE=Perfil simple
+PROFILE_EPOSTEP=Perfil Epos Tep
+PROFILE_P822D=Perfil P822D
+PROFILE_STAR=Perfil Start
+PROFILE_DEFAULT_HELP=Perfil predeterminado adecuado para impresoras Epson
+PROFILE_SIMPLE_HELP=Perfil simple sen gráficos
+PROFILE_EPOSTEP_HELP=Perfil Epos Tep
+PROFILE_P822D_HELP=Perfil P822D Sen gráficos
+PROFILE_STAR_HELP=Perfil Star
+DOL_LINE_FEED=Saltar a liña
+DOL_ALIGN_LEFT=Aliñar á esquerda o texto
+DOL_ALIGN_CENTER=Centrar o texto
+DOL_ALIGN_RIGHT=Aliñar texto á dereita
+DOL_USE_FONT_A=Usar o tipo de letra A da impresora
+DOL_USE_FONT_B=Usar o tipo de letra B da impresora
+DOL_USE_FONT_C=Usar o tipo de letra C da impresora
 DOL_PRINT_BARCODE=Imprimir código de barras
-DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
-DOL_CUT_PAPER_FULL=Cut ticket completely
-DOL_CUT_PAPER_PARTIAL=Cut ticket partially
-DOL_OPEN_DRAWER=Open cash drawer
-DOL_ACTIVATE_BUZZER=Activate buzzer
-DOL_PRINT_QRCODE=Print QR Code
-DOL_PRINT_LOGO=Print logo of my company
-DOL_PRINT_LOGO_OLD=Print logo of my company (old printers)
-DOL_BOLD=Bold
-DOL_BOLD_DISABLED=Disable bold
-DOL_DOUBLE_HEIGHT=Double height size
-DOL_DOUBLE_WIDTH=Double width size
-DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
-DOL_UNDERLINE=Enable underline
-DOL_UNDERLINE_DISABLED=Disable underline
-DOL_BEEP=Beed sound
-DOL_PRINT_TEXT=Print text
-DateInvoiceWithTime=Invoice date and time
-YearInvoice=Invoice year
-DOL_VALUE_MONTH_LETTERS=Invoice month in letters
-DOL_VALUE_MONTH=Invoice month
-DOL_VALUE_DAY=Invoice day
-DOL_VALUE_DAY_LETTERS=Inovice day in letters
-DOL_LINE_FEED_REVERSE=Line feed reverse
-InvoiceID=Invoice ID
+DOL_PRINT_BARCODE_CUSTOMER_ID=Imprimir o código de barras do cliente
+DOL_CUT_PAPER_FULL=Cortar o ticket por completo
+DOL_CUT_PAPER_PARTIAL=Cortar parcialmente o ticket
+DOL_OPEN_DRAWER=Caixón aberto
+DOL_ACTIVATE_BUZZER=Activar o zumbador
+DOL_PRINT_QRCODE=Imprimir código QR
+DOL_PRINT_LOGO=Imprimir o logotipo da miña empresa
+DOL_PRINT_LOGO_OLD=Imprimir o logotipo da miña empresa (impresoras antigas)
+DOL_BOLD=Negrita
+DOL_BOLD_DISABLED=Desactivar negrita
+DOL_DOUBLE_HEIGHT=Tamaño de dobre altura
+DOL_DOUBLE_WIDTH=Tamaño de dobre ancho
+DOL_DEFAULT_HEIGHT_WIDTH=Tamaño e ancho predeterminados
+DOL_UNDERLINE=Activar subliñado
+DOL_UNDERLINE_DISABLED=Desactivar o subliñado
+DOL_BEEP=Pitido
+DOL_PRINT_TEXT=Imprimir texto
+DateInvoiceWithTime=Data e hora da factura
+YearInvoice=Ano de factura
+DOL_VALUE_MONTH_LETTERS=Mes de factura en letras
+DOL_VALUE_MONTH=Mes da factura
+DOL_VALUE_DAY=Día da factura
+DOL_VALUE_DAY_LETTERS=Día factura en letras
+DOL_LINE_FEED_REVERSE=Avance de liña inverso
+InvoiceID=ID de factura
 InvoiceRef=Ref. factura
-DOL_PRINT_OBJECT_LINES=Invoice lines
-DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
-DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
-DOL_VALUE_CUSTOMER_MAIL=Customer mail
-DOL_VALUE_CUSTOMER_PHONE=Customer phone
-DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
-DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
-DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
-DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
-DOL_VALUE_MYSOC_NAME=Your company name
-VendorLastname=Vendor last name
-VendorFirstname=Vendor first name
-VendorEmail=Vendor email
-DOL_VALUE_CUSTOMER_POINTS=Customer points
-DOL_VALUE_OBJECT_POINTS=Object points
+DOL_PRINT_OBJECT_LINES=Liñas de factura
+DOL_VALUE_CUSTOMER_FIRSTNAME=Nome do cliente
+DOL_VALUE_CUSTOMER_LASTNAME=Apelido do cliente
+DOL_VALUE_CUSTOMER_MAIL=Correo do cliente
+DOL_VALUE_CUSTOMER_PHONE=Teléfono do cliente
+DOL_VALUE_CUSTOMER_MOBILE=Móbil do cliente
+DOL_VALUE_CUSTOMER_SKYPE=Cliente Skype
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Número fiscal do cliente
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Saldo da conta do cliente
+DOL_VALUE_MYSOC_NAME=Nome da súa empresa
+VendorLastname=Apelido do vendedor
+VendorFirstname=Nome do vendedor
+VendorEmail=Correo electrónico do vendedor
+DOL_VALUE_CUSTOMER_POINTS=Puntos de cliente
+DOL_VALUE_OBJECT_POINTS=Puntos obxecto
diff --git a/htdocs/langs/gl_ES/receptions.lang b/htdocs/langs/gl_ES/receptions.lang
index aa749200b20..6c33af15572 100644
--- a/htdocs/langs/gl_ES/receptions.lang
+++ b/htdocs/langs/gl_ES/receptions.lang
@@ -1,47 +1,47 @@
 # 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
+ReceptionsSetup=Configuración da recepción del producto
+RefReception=Ref. recepción
+Reception=Recepción
+Receptions=Recepcións
+AllReceptions=Todas as recepcións
+Reception=Recepción
+Receptions=Recepcións
+ShowReception=Amosar recepcións
+ReceptionsArea=Área recepcións
+ListOfReceptions=Listaxe de recepcións
+ReceptionMethod=Método de recepción
+LastReceptions=Últimas %s recepciones
+StatisticsOfReceptions=Estadísticas de recepciones
+NbOfReceptions=Número de recepciones
+NumberOfReceptionsByMonth=Número de recepciones por mes
+ReceptionCard=Ficha recepción
+NewReception=Nova recepción
+CreateReception=Crear recepción
+QtyInOtherReceptions=Cant. en outras recepcións
+OtherReceptionsForSameOrder=Outras recepciones deste pedimento
+ReceptionsAndReceivingForSameOrder=Recepcións e recibos deste pedimento.
+ReceptionsToValidate=Recepcións a validar
 StatusReceptionCanceled=Anulado
 StatusReceptionDraft=Borrador
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validado (produtos a enviar ou enviados)
 StatusReceptionProcessed=Procesado
 StatusReceptionDraftShort=Borrador
 StatusReceptionValidatedShort=Validado
 StatusReceptionProcessedShort=Procesado
-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 order card.
-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
+ReceptionSheet=Folla de recepción
+ConfirmDeleteReception=¿Está certo de querer eliminar esta recepción?
+ConfirmValidateReception=¿Está certo de querer validar esta recepción coa referencia <b>%s</b>?
+ConfirmCancelReception=¿Está certo de querer cancelar esta recepción?
+StatsOnReceptionsOnlyValidated=Estatísticas realizadas únicamente sobre as recepcións validadas. A data usada é a data de validación da recepción (a data prevista de envío aínda non é coñecida)
+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 da tarxeta de pedimento.
+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
+ValidateOrderFirstBeforeReception=Primeiro debe validar o pedimento antes de poder facer recepcións.
+ReceptionsNumberingModules=Módulo de numeración para recepcións
+ReceptionsReceiptModel=Modeloss de documentos para recepcións.
+NoMorePredefinedProductToDispatch=Non hai máis produtos predefinidos para enviar
 
diff --git a/htdocs/langs/gl_ES/recruitment.lang b/htdocs/langs/gl_ES/recruitment.lang
index f97c12e25bb..f247bc5bd29 100644
--- a/htdocs/langs/gl_ES/recruitment.lang
+++ b/htdocs/langs/gl_ES/recruitment.lang
@@ -18,58 +18,59 @@
 #
 
 # Module label 'ModuleRecruitmentName'
-ModuleRecruitmentName = Recruitment
+ModuleRecruitmentName = Contratación
 # Module description 'ModuleRecruitmentDesc'
-ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+ModuleRecruitmentDesc = Xestionar e seguir campañas de contratación para novos postos de traballo
 
 #
 # Admin page
 #
-RecruitmentSetup = Recruitment setup
+RecruitmentSetup = Configuración da contratación
 Settings = Configuracións
-RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
-RecruitmentArea=Recruitement area
-PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
-EnablePublicRecruitmentPages=Enable public pages of open jobs
+RecruitmentSetupPage = Introduza aquí a configuración das principais opcións para o módulo de contratación
+RecruitmentArea=Área de contratación
+PublicInterfaceRecruitmentDesc=As páxinas públicas dos traballos son URL públicas para mostrar e responder aos traballos dispoñibles. Hai un enlace diferente para cada traballo dispoñible, que se atopa en cada rexistro de traballo.
+EnablePublicRecruitmentPages=Activar páxinas públicas de traballos dispoñibles
 
 #
 # About page
 #
-About = Acerca de
-RecruitmentAbout = About Recruitment
-RecruitmentAboutPage = Recruitment about page
-NbOfEmployeesExpected=Expected nb of employees
-JobLabel=Label of job position
-WorkPlace=Work place
-DateExpected=Expected date
-FutureManager=Future manager
-ResponsibleOfRecruitement=Responsible of recruitment
-IfJobIsLocatedAtAPartner=If job is located at a partner place
+About = page
+RecruitmentAbout = Acerca de contratación
+RecruitmentAboutPage = Páxina acerca de contratación
+NbOfEmployeesExpected=Número esperado de empregados
+JobLabel=Etiqueta de posto de traballo
+WorkPlace=Lugar de traballo
+DateExpected=Data agardado
+FutureManager=Xestor de futuro
+ResponsibleOfRecruitement=Responsable da contratación
+IfJobIsLocatedAtAPartner=Se o traballo está situado nun lugar asociado
 PositionToBeFilled=Posto de traballo
-PositionsToBeFilled=Job positions
+PositionsToBeFilled=Listaxe de postos de traballo
 ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+NewPositionToBeFilled=Novos postos de traballo
 
-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)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+JobOfferToBeFilled=Posto de traballo a ocupar
+ThisIsInformationOnJobPosition=Información do posto de traballo a ocupar
+ContactForRecruitment=Contacto para a contratación
+EmailRecruiter=Correo electrónico do responsable de contratación
+ToUseAGenericEmail=Para usar un correo electrónico xenérico. Se non se define, utilizarase o correo electrónico do responsable de contratación
+NewCandidature=Nova aplicación
+ListOfCandidatures=Listaxe de aplicacións
+RequestedRemuneration=Remuneración solicitada
+ProposedRemuneration=Proposta de remuneración
+ContractProposed=Poroposta de contrato
+ContractSigned=Contrato asinado
+ContractRefused=Rexeitouse o contrato
+RecruitmentCandidature=Solicitude
+JobPositions=Postos de traballo
+RecruitmentCandidatures=Solicitudes
+InterviewToDo=Entrevista a realizar
+AnswerCandidature=Resposta da solicitude
+YourCandidature=A súa solicitude
+YourCandidatureAnswerMessage=Grazas pola túa solicitude.<br>...
+JobClosedTextCandidateFound=O posto de traballo está pechado. O posto foi cuberto.
+JobClosedTextCanceled=O posto de traballo está pechado
+ExtrafieldsJobPosition=Atributos complementarios (postos de traballo)
+ExtrafieldsCandidatures=Atributos complementarios (solicitudes de traballo)
+MakeOffer=Facer unha oferta
diff --git a/htdocs/langs/gl_ES/resource.lang b/htdocs/langs/gl_ES/resource.lang
index 360dbebb5ac..3f2853318eb 100644
--- a/htdocs/langs/gl_ES/resource.lang
+++ b/htdocs/langs/gl_ES/resource.lang
@@ -1,39 +1,39 @@
 # Dolibarr language file - Source file is en_US - resource
 MenuResourceIndex=Recursos
-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
+MenuResourceAdd=Novo recurso
+DeleteResource=Eliminar recurso
+ConfirmDeleteResourceElement=Confirme eliminar o recurso deste elemento
+NoResourceInDatabase=Sen recursos na base de datos.
+NoResourceLinked=Sen recursos ligados
+ActionsOnResource=Eventos sobre este recurso
+ResourcePageIndex=Listaxe de recursos
+ResourceSingular=Recurso
+ResourceCard=Ficha do recurso
+AddResource=Crear un recurso
+ResourceFormLabel_ref=Nome do recurso
+ResourceType=Tipo de recurso
+ResourceFormLabel_description=Descrición do recurso
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=Recursos ligados ao elemento
 
-ShowResource=Show resource
+ShowResource=Amosar recurso
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceElementPage=Elementos de recursos
+ResourceCreatedWithSuccess=Recurso creado correctamente
+RessourceLineSuccessfullyDeleted=Liña de recurso eliminada correctamente
+RessourceLineSuccessfullyUpdated=Liña de recurso actualizada correctamente
+ResourceLinkedWithSuccess=Recurso ligado correctamente
 
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+ConfirmDeleteResource=Confirme eliminar este recurso
+RessourceSuccessfullyDeleted=Recurso eliminado correctamente
+DictionaryResourceType=Tipo de recursos
 
-SelectResource=Select resource
+SelectResource=Seleccionar o recurso
 
-IdResource=Id resource
-AssetNumber=Serial number
-ResourceTypeCode=Resource type code
+IdResource=Id do recurso
+AssetNumber=Número de serie
+ResourceTypeCode=Código do tipo de recurso
 ImportDataset_resource_1=Recursos
 
-ErrorResourcesAlreadyInUse=Some resources are in use
-ErrorResourceUseInEvent=%s used in %s event
+ErrorResourcesAlreadyInUse=Algúns recursos están en uso
+ErrorResourceUseInEvent=%s usado en  %s evento
diff --git a/htdocs/langs/gl_ES/sendings.lang b/htdocs/langs/gl_ES/sendings.lang
index 7a2a0c2ce0b..99d7be5b352 100644
--- a/htdocs/langs/gl_ES/sendings.lang
+++ b/htdocs/langs/gl_ES/sendings.lang
@@ -1,74 +1,76 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=Ref. shipment
-Sending=Shipment
+RefSending=Ref. envío
+Sending=Envío
 Sendings=Envíos
-AllSendings=All Shipments
-Shipment=Shipment
+AllSendings=Todos os envíos
+Shipment=Envío
 Shipments=Envíos
-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
+ShowSending=Amosar envíos
+Receivings=Recepcións
+SendingsArea=Área envíos
+ListOfSendings=Listaxe de envíos
+SendingMethod=Método de envío
+LastSendings=Últimos %s envíos
+StatisticsOfSendings=Estatísticas de envíos
+NbOfSendings=Número de envíos
+NumberOfShipmentsByMonth=Número de envíos por mes
+SendingCard=Ficha envío
+NewSending=Novo envío
+CreateShipment=Crear envío
+QtyShipped=Cant. enviada
+QtyShippedShort=Cant. env.
+QtyPreparedOrShipped=Cant. preparada ou enviada
+QtyToShip=Cant. a enviar
+QtyToReceive=Cant. a recibir
+QtyReceived=Cant. recibida
+QtyInOtherShipments=Cant. en outros envíos
+KeepToShip=Resto a enviar
+KeepToShipShort=Pendente
+OtherSendingsForSameOrder=Outros envíos deste pedimento
+SendingsAndReceivingForSameOrder=Envíos e recepcións deste pedimento
+SendingsToValidate=Envíos a validar
 StatusSendingCanceled=Anulado
+StatusSendingCanceledShort=Anulada
 StatusSendingDraft=Borrador
-StatusSendingValidated=Validated (products to ship or already shipped)
+StatusSendingValidated=Validado (produtos a enviar ou enviados)
 StatusSendingProcessed=Procesado
 StatusSendingDraftShort=Borrador
 StatusSendingValidatedShort=Validado
 StatusSendingProcessedShort=Procesado
-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 conducted on shipments only validated. Date used is date of validation of shipment (planed 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 order card.
-ShipmentLine=Shipment line
-ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
-ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
-ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
-NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
-WeightVolShort=Weight/Vol.
-ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+SendingSheet=Nota de entrega
+ConfirmDeleteSending=¿Está certo de querer eliminar esta expedición?
+ConfirmValidateSending=¿Está certo de querer validar esta expedición coa referencia <b>%s</b>?
+ConfirmCancelSending=¿Está certo de querer anular esta expedición?
+DocumentModelMerou=Modelo Merou A5
+WarningNoQtyLeftToSend=Alerta, ningún produto agardando para ser enviado.
+StatsOnShipmentsOnlyValidated=Estatísticas realizadas únicamente sobre as expedicións validadas
+DateDeliveryPlanned=Data prevista de entrega
+RefDeliveryReceipt=Ref. nota de entrega
+StatusReceipt=Estado nota de entrega
+DateReceived=Data real de recepción
+ClassifyReception=Clasificar recibido
+SendShippingByEMail=Envío de expedición por correo electrónico
+SendShippingRef=Envío da expedición %s
+ActionsOnShipping=Eventos sobre a expedición
+LinkToTrackYourPackage=Ligazón para o seguimento do seu paquete
+ShipmentCreationIsDoneFromOrder=Polo momento, a creación dun novo envío faise a partir da tarxeta de pedimento.
+ShipmentLine=Liña de expedición
+ProductQtyInCustomersOrdersRunning=Cantidade en pedimentos de clientes abertos
+ProductQtyInSuppliersOrdersRunning=Cantidade en pedimentos a provedores abertos
+ProductQtyInShipmentAlreadySent=Cantidade de produto do pedimento de cliente aberto xa enviado
+ProductQtyInSuppliersShipmentAlreadyRecevied=Cantidade en pedimentos a proveedores xa recibidos
+NoProductToShipFoundIntoStock=Non se atopou ningún produto para enviar no almacén <b>% s </b>. Corrixir o stock ou voltar a escoller outro almacén.
+WeightVolShort=Peso/Vol.
+ValidateOrderFirstBeforeShipment=Antes de poder realizar envíos debe validar o pedimento.
 
 # Sending methods
 # ModelDocument
-DocumentModelTyphon=More complete document model for delivery receipts (logo...)
-Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
-SumOfProductVolumes=Sum of product volumes
-SumOfProductWeights=Sum of product weights
+DocumentModelTyphon=Modelo de documento mais completo de nota de entrega  (logo...)
+DocumentModelStorm=Modelo de documento máis completo para a compatibilidade de recibos de entrega e campos extra (logo ...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constante EXPEDITION_ADDON_NUMBER no definida
+SumOfProductVolumes=Suma do volume dos produtos
+SumOfProductWeights=Suma do peso dos produtos
 
 # warehouse details
-DetailWarehouseNumber= Warehouse details
-DetailWarehouseFormat= W:%s (Qty: %d)
+DetailWarehouseNumber= Detalles do almacén
+DetailWarehouseFormat= Alm.:%s (Cant. : %d)
diff --git a/htdocs/langs/gl_ES/sms.lang b/htdocs/langs/gl_ES/sms.lang
index 75f91e553c4..6d1b63764fb 100644
--- a/htdocs/langs/gl_ES/sms.lang
+++ b/htdocs/langs/gl_ES/sms.lang
@@ -36,16 +36,16 @@ SmsStatusSentCompletely=Envío completado
 SmsStatusError=Erro
 SmsStatusNotSent=Non enviado
 SmsSuccessfulySent=SMS enviado correctamente (de 1%s a 1%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)
+ErrorSmsRecipientIsEmpty=O número de destino está baleiro
+WarningNoSmsAdded=Non hai ningún número de teléfono novo para engadir á lista de destinos
+ConfirmValidSms=Confirmas a validación desta campaña?
+NbOfUniqueSms=Nº números de teléfonos únicos
+NbOfSms=Nº de números de teléfono
+ThisIsATestMessage=Esta é unha mensaxe de proba
+SendSms=Enviar SMS
+SmsInfoCharRemain=Nº de caracteres restantes
+SmsInfoNumero= (formato internacional ex.: +33899701761)
+DelayBeforeSending=Atraso antes de envío (minutos)
+SmsNoPossibleSenderFound=Sen remitente dispoñible. Comprobe a configuración do seu fornecedor de SMS.
+SmsNoPossibleRecipientFound=Sen destino dispoñible. Comprobe a configuración do seu fornecedor de SMS.
+DisableStopIfSupported=Desctivar a mensaxe STOP (sé é soportado)
diff --git a/htdocs/langs/gl_ES/stocks.lang b/htdocs/langs/gl_ES/stocks.lang
index dbe81a57b5b..489350367f1 100644
--- a/htdocs/langs/gl_ES/stocks.lang
+++ b/htdocs/langs/gl_ES/stocks.lang
@@ -1,242 +1,244 @@
 # Dolibarr language file - Source file is en_US - stocks
-WarehouseCard=Warehouse card
+WarehouseCard=Ficha almacén
 Warehouse=Almacén
-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=Delete sending
-CancelSending=Cancel sending
-DeleteSending=Delete sending
+Warehouses=Almacéns
+ParentWarehouse=Almacén pai
+NewWarehouse=Novo almacén / Zona de almacenaxe
+WarehouseEdit=Modificar almacén
+MenuNewWarehouse=Novo almacén
+WarehouseSource=Almacén orixe
+WarehouseSourceNotDefined=Sen almacéns definidos,
+AddWarehouse=Crear almacén
+AddOne=Engadir un
+DefaultWarehouse=Almacén por defecto
+WarehouseTarget=Almacén destino
+ValidateSending=Validar envío
+CancelSending=Anular envío
+DeleteSending=Eliminar envío
 Stock=Stock
 Stocks=Stocks
-MissingStocks=Missing stocks
-StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
-StocksByLotSerial=Stocks by lot/serial
-LotSerial=Lots/Serials
-LotSerialList=List of lot/serials
+MissingStocks=Falta sock
+StockAtDate=Stocks á data
+StockAtDateInPast=Data no pasado
+StockAtDateInFuture=Data no futuro
+StocksByLotSerial=Stocks por lotes/serie
+LotSerial=Lotes/Series
+LotSerialList=Listaxe de lotes/series
 Movements=Movementos
-ErrorWarehouseRefRequired=Warehouse reference name is required
-ListOfWarehouses=List of warehouses
+ErrorWarehouseRefRequired=O nome de referencia do almacén é obrigado
+ListOfWarehouses=Listaxe de almacéns
 ListOfStockMovements=Listaxe de movementos de stock
-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
+ListOfInventories=Listaxe de inventarios
+MovementId=ID movemento
+StockMovementForId=ID movemento %d
+ListMouvementStockProject=Listaxe de movementos de stock asociados ao proxecto
+StocksArea=Área almacéns
+AllWarehouses=Todos os almacéns
+IncludeEmptyDesiredStock=Inclúe tamén stock negativo con stock desexado indefinido
+IncludeAlsoDraftOrders=Incluir tamén pedimentos borrador
 Location=Localización
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
-NumberOfProducts=Total number of products
-LastMovement=Latest movement
-LastMovements=Latest movements
+LocationSummary=Nome curto da localización
+NumberOfDifferentProducts=Número de produtos diferentes
+NumberOfProducts=Numero total de produtos
+LastMovement=Último movemento
+LastMovements=Últimos movementos
 Units=Unidades
 Unit=Unidade
-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)
+StockCorrection=Corrección stock
+CorrectStock=Corrixir stock
+StockTransfer=Transferencia de stock
+TransferStock=Transferir stock
+MassStockTransferShort=Transferencia de stock masiva
+StockMovement=Movemento de stock
+StockMovements=Movementos de stock
+NumberOfUnit=Número de unidades
+UnitPurchaseValue=Prezo de compra unitario
+StockTooLow=Stock insuficinte
+StockLowerThanLimit=O stock é menor que o límite da alerta (%s)
 EnhancedValue=Valor
-PMPValue=Weighted average price
-PMPValueShort=WAP
-EnhancedValueOfWarehouses=Warehouses value
-UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
-RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
-UserDefaultWarehouse=Set a warehouse on Users
-MainDefaultWarehouse=Default warehouse
-MainDefaultWarehouseUser=Use a default warehouse for each user
-MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
-IndependantSubProductStock=Product stock and subproduct stock are independent
-QtyDispatched=Quantity dispatched
-QtyDispatchedShort=Qty dispatched
-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 for a warning as soon as 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 date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
-IdWarehouse=Id warehouse
-DescWareHouse=Description warehouse
-LieuWareHouse=Localisation warehouse
-WarehousesAndProducts=Warehouses and products
-WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average price
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
-SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value for sell
-EstimatedStockValueSell=Value for sell
-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 onto "%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=Type 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').
+PMPValue=Prezo medio ponderado
+PMPValueShort=PMP
+EnhancedValueOfWarehouses=Valor de stocks en almacén
+UserWarehouseAutoCreate=Crea automáticamente un almacén de usuarios ao crear un usuario
+AllowAddLimitStockByWarehouse=Xestionar tamén o valor do stock mínimo e desexado por emparellamento (produto-almacén) ademais do valor do stock mínimo e stock desexado por produto
+RuleForWarehouse=Regras para almacén
+WarehouseAskWarehouseDuringPropal=Establecer un almacén en orzamento a cliente
+WarehouseAskWarehouseDuringOrder=Establecer un almacén para pedimentos de provedor
+UserDefaultWarehouse=Establecer un almacén para usuarios
+MainDefaultWarehouse=Almacén por defecto
+MainDefaultWarehouseUser=Usar un almacén por defecto para cada usuario
+MainDefaultWarehouseUserDesc=Ao activar esta opción, durante a creación dun produto, o almacén asignado ao produto definirase nesta. Se non se define ningún almacén no usuario, defínese automaticamente o almacén predeterminado.
+IndependantSubProductStock=Stock do producto e stock do subproducto son independentes
+QtyDispatched=Cantidade enviada
+QtyDispatchedShort=Cant. enviada
+QtyToDispatchShort=Cant. a enviar
+OrderDispatch=Artigos recibidos
+RuleForStockManagementDecrease=Escolla Regra para diminución automática de stock (sempre é posible a diminución manual, aínda que estexa activada unha regra de diminución automática)
+RuleForStockManagementIncrease=Escolla Regra para o aumento automático de stock (o aumento manual sempre é posible, aínda que estexa activada unha regra de aumento automático)
+DeStockOnBill=Diminuir o stock real na validación da factura/nota de crédito do cliente
+DeStockOnValidateOrder=Diminuír o stock real na validación do pedimento de provedor
+DeStockOnShipment=Diminuír o stock real na validación do envío
+DeStockOnShipmentOnClosing=Diminúe o stock real cando o envío está pechado
+ReStockOnBill=Aumenta o stock real na validación da factura/nota de crédito do provedor
+ReStockOnValidateOrder=Aumenta o stock real na aprobación do pedimento de provedor
+ReStockOnDispatchOrder=Aumentar o stock real no envío manual ao almacén, despois da recepción da mercadoría do pedimento de provedor
+StockOnReception=Aumento o stock real na validación da recepción
+StockOnReceptionOnClosing=Aumenta o stock real cando pecha a recepción
+OrderStatusNotReadyToDispatch=O pedimento de cliente aínda non ten ou non ten un estado que permite o envío de produtos en almacéns.
+StockDiffPhysicTeoric=Explicación da diferenza entre stock físico e virtual
+NoPredefinedProductToDispatch=Non hai produtos predefinidos para este obxecto. Polo tanto, non é preciso o stock en envío.
+DispatchVerb=Enviado
+StockLimitShort=Límite para alerta
+StockLimit=Stock límite para alertas
+StockLimitDesc=(baleiro) significa que non hai aviso.<br> 0 pode usarse como aviso en canto o stock estexa baleiro.
+PhysicalStock=Stock físico
+RealStock=Stock real
+RealStockDesc=O stock físico/real é o stock actualmente existente nos almacéns
+RealStockWillAutomaticallyWhen=O stock real modificarase segundo esta regra (como se define no módulo Stock):
+VirtualStock=Stock virtual
+VirtualStockAtDate=Stock virtual á data
+VirtualStockAtDateDesc=Stock virtual unha vez finalizados todos os pedidos pendentes que se prevé facer antes da data
+VirtualStockDesc=O stock virtual é o stock calculado dispoñible unha vez pechadas todas as accións abertas/pendentes (que afectan ao stock) (pedimentos a provedor recibidos, pedimentos de cliente enviados, pedimentos de fabricación producidos, etc.)
+IdWarehouse=Id. almacén
+DescWareHouse=Descrición almacén
+LieuWareHouse=Localización almacén
+WarehousesAndProducts=Almacéns e produtos
+WarehousesAndProductsBatchDetail=Almacéns e produtos (con detalle por lote/serie)
+AverageUnitPricePMPShort=Prezo medio ponderado (PMP)
+AverageUnitPricePMPDesc=O prezo unitario medio de entrada que houbo que pagar aos provedores para que o produto estivese no noso stock.
+SellPriceMin=Prezo de venda unitario
+EstimatedStockValueSellShort=Valor de venda
+EstimatedStockValueSell=Valor de venda
+EstimatedStockValueShort=Valor compra de stock
+EstimatedStockValue=Valor de compra de stock
+DeleteAWarehouse=Eliminar un almacén
+ConfirmDeleteWarehouse=¿Está certo de querer eliminar o almacén <b>%s</b>?
+PersonalStock=Stock persoal %s
+ThisWarehouseIsPersonalStock=Este almacén representa o stock persoal de %s %s
+SelectWarehouseForStockDecrease=Seleccione o almacén a usar no decremento de stock
+SelectWarehouseForStockIncrease=Seleccione o almacén a usar no incremento de stock
+NoStockAction=Sen accións sobre o stock
+DesiredStock=Stock óptimo desexado
+DesiredStockDesc=Esta cantidade será o valor que se utilizará para encher o stock no reposición.
+StockToBuy=A pedir
+Replenishment=Reposición
+ReplenishmentOrders=Ordes de reposición
+VirtualDiffersFromPhysical=Segundo as opcións de aumento/disminución, o stock físico e virtual (pedimentos en curso+stock físico) pode diferir
+UseRealStockByDefault=Usar stock real por defecto, en lugar de stock virtual, para o reposición
+ReplenishmentCalculation=A cantidade a pedir será (cantidade desexada - stock real) en lugar de (cantidade desexada - stock virtual)
+UseVirtualStock=Usar stock virtual
+UsePhysicalStock=Usar stock físico
+CurentSelectionMode=Modo de selección actual
+CurentlyUsingVirtualStock=Stock virtual
+CurentlyUsingPhysicalStock=Stock físico
+RuleForStockReplenishment=Regra para o reposicion de stock
+SelectProductWithNotNullQty=Seleccione alo menos un produto cunha cantidade distinta de cero e un provedor
+AlertOnly= Só alertas
+IncludeProductWithUndefinedAlerts = Inclúe tamén stock negativo para produtos sen cantidade desexada definida, para restablecelos a 0
+WarehouseForStockDecrease=Para o decremento de stock usarase o almacén <b>%s</b>
+WarehouseForStockIncrease=Para o incremento de stock usarase o almacén <b>%s</b>
+ForThisWarehouse=Para este almacén
+ReplenishmentStatusDesc=Esta é unha listaxe de todos os produtos cun stock inferior ao stock desexado (ou inferior ao valor de alerta se a caixa de verificación "só alerta" está marcada). Usando a caixa de verificación, pode crear pedimentos de provedor para cubrir a diferenza.
+ReplenishmentStatusDescPerWarehouse=Se desexa unha reposición baseada na cantidade desexada definida por almacén, debe engadir un filtro no almacén.
+ReplenishmentOrdersDesc=Esta é unha listaxe de todos os pedimentos a provedor abertos, incluídos os produtos predefinidos. Aquí só son visibles os pedimentos abertos con produtos predefinidos, polo que os pedimentos  poden afectar ao stock..
+Replenishments=Reposicións
+NbOfProductBeforePeriod=Cantidade de produto %s en stock antes do período seleccionado (<%s)
+NbOfProductAfterPeriod=Cantidade de produto %s en stock despois do período seleccionado (>%s)
+MassMovement=Movementos en masa
+SelectProductInAndOutWareHouse=Seleccione un almacén de orixe e un almacén de destino, un produto e unha cantidade e prema en "%s". Unha vez feito isto para todos os movementos precisos, faga clic en "%s".
+RecordMovement=Rexistrar transferencia
+ReceivingForSameOrder=Recepcións deste pedimento
+StockMovementRecorded=Movemento de stock rexistrado
+RuleForStockAvailability=Reglas de requerimento de stock
+StockMustBeEnoughForInvoice=O nivel de stock debe ser suficiente para engadir produto/servizo á factura (a comprobación faise no stock real actual ao engadir unha liña na factura calquera que sexa a regra para o cambio automático de stock)
+StockMustBeEnoughForOrder=O nivel de stock debe ser suficiente para engadir produto/servizo ao pedimento (a comprobación faise no stock real actual ao engadir unha liña no pedimento calquera que sexa a regra para o cambio de stock automático)
+StockMustBeEnoughForShipment= O nivel de stock debe ser suficiente para engadir produto/servizo ao envío (a comprobación faise no stock real actual cando se engade unha liña ao envío calquera que sexa a regra para o cambio automático de stock)
+MovementLabel=Etiqueta do movemento
+TypeMovement=Tipo de movemento
+DateMovement=Data de movemento
+InventoryCode=Movemento ou código de inventario
+IsInPackage=Contido no paquete
+WarehouseAllowNegativeTransfer=O stock pode ser negativvo
+qtyToTranferIsNotEnough=Non ten stock suficiente no seu almacén de orixe e a súa configuración non permite stocks negativos
+qtyToTranferLotIsNotEnough=Non ten stock suficiente para este número de lote no seu almacén de orixe e a súa configuración non permite existencias negativas (a cantidade para o produto '%s' co lote '%s' é %s no almacén '%s').
 ShowWarehouse=Ver almacén
-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>).
-OpenAll=Open for all actions
-OpenInternal=Open only for internal actions
-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
+MovementCorrectStock=Correción de sotck do produto %s
+MovementTransferStock=Transferencia de stock do produto %s a outro almacén
+InventoryCodeShort=Código Inv./Mov.
+NoPendingReceptionOnSupplierOrder=Non agárdanse recepcións do pedimento a provedor
+ThisSerialAlreadyExistWithDifferentDate=Este número de lote/serie (<strong>%s</strong>) xa existe, pero cunha data de caducidade ou venda distinta (atopada <strong>%s</strong> pero vostede introduce <strong>%s</strong>).
+OpenAll=Aberto para todas as accións
+OpenInternal=Aberto só a accións internas
+UseDispatchStatus=Use un estado de envío (aprobar/rexeitar) para as liñas de produtos na recepción do pedimento de provedor
+OptionMULTIPRICESIsOn=A opción "varios prezos por segmento" está activada. Significa que un produto ten varios prezos de venda polo que o valor para a venda non se pode calcular
+ProductStockWarehouseCreated=Límite stock para alertas e stock óptimo desxeado creado correctamente
+ProductStockWarehouseUpdated=Límite stock para alertas e stock óptimo desexado actualizado correctamente
+ProductStockWarehouseDeleted=Límite stock para alertas e stock óptimo desexado eliminado correctamente
+AddNewProductStockWarehouse=Indicar novo límite para alertas e stock óptimo desexado
+AddStockLocationLine=Disminúa a cantidade, e a continuación, faga clic para agregar outro almacén para este produto
+InventoryDate=Data inventario
+NewInventory=Novo inventario
+inventorySetup = Configuración inventario
+inventoryCreatePermission=Crear novo inventario
+inventoryReadPermission=Ver inventarios
+inventoryWritePermission=Actualizar inventarios
+inventoryValidatePermission=Validar inventario
 inventoryTitle=Inventario
-inventoryListTitle=Inventories
-inventoryListEmpty=No inventory in progress
-inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
-inventoryEdit=Editar
+inventoryListTitle=Inventarios
+inventoryListEmpty=Sen inventario en progreso
+inventoryCreateDelete=Crear/Eliminar inventario
+inventoryCreate=Crear novo
+inventoryEdit=Modificar
 inventoryValidate=Validado
 inventoryDraft=En servizo
-inventorySelectWarehouse=Warehouse choice
+inventorySelectWarehouse=Selección de almacén
 inventoryConfirmCreate=Crear
-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
+inventoryOfWarehouse=Inventario para o almacén: %s
+inventoryErrorQtyAdd=Erro: A cantidade é menor que cero
+inventoryMvtStock=Por inventario
+inventoryWarningProductAlreadyExists=Este producto xa atópase no listado
+SelectCategory=Filtro por categoría
+SelectFournisseur=Filtro provedor
 inventoryOnDate=Inventario
-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
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Os movementos de stock terán a data do inventario (en lugar da data da validación do inventario)
+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
+LastPA=Último BP
+CurrentPA=BP actual
+RecordedQty=Cant. gardada
+RealQty=Cant. real
+RealValue=Valor Real
+RegulatedQty=Cant. Regulada
+AddInventoryProduct=Engadir produto ao inventario
 AddProduct=Engadir
-ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action?
-InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
+ApplyPMP=Aplicar PMP
+FlushInventory=Inventario
+ConfirmFlushInventory=¿Confirma esta acción?
+InventoryFlushed=Inventario finalizado
+ExitEditMode=Sair da edición
 inventoryDeleteLine=Eliminación de liña
-RegulateStock=Regulate Stock
+RegulateStock=Regular stock
 ListInventory=Listaxe
-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 future
-CurrentStock=Current stock
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|serial barcode)
+StockSupportServices=A xestión de stock soporta Servizos
+StockSupportServicesDesc=Por defecto só pode almacenar o produto co tipo "produto". Se está activado e se o servizo de módulo está activado, tamén pode almacenar un produto co tipo "servizo"
+ReceiveProducts=Recibir artigos
+StockIncreaseAfterCorrectTransfer=Incremento por corrección/transferencia
+StockDecreaseAfterCorrectTransfer=Decremento por corrección/transferencia
+StockIncrease=Incremento de stock
+StockDecrease=Decremento de stock
+InventoryForASpecificWarehouse=Inventario para un almacén determinado
+InventoryForASpecificProduct=Inventario para un produto determinado
+StockIsRequiredToChooseWhichLotToUse=Stock é solicitado para escoller que lote usar
+ForceTo=Forzar a
+AlwaysShowFullArbo=Mostrar a árbore completa do almacén na ventá emerxente das ligazóns do almacén (aviso: isto pode diminuír drasticamente o rendemento)
+StockAtDatePastDesc=Aquí pode ver o stock (stock real) nunha data determinada no pasado
+StockAtDateFutureDesc=Aquí pode ver 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=Actualiza 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.
diff --git a/htdocs/langs/gl_ES/stripe.lang b/htdocs/langs/gl_ES/stripe.lang
index 38f22b6ab4d..9cd983083e0 100644
--- a/htdocs/langs/gl_ES/stripe.lang
+++ b/htdocs/langs/gl_ES/stripe.lang
@@ -1,72 +1,71 @@
 # 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
+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...)
+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
+WelcomeOnPaymentPage=A nosa benvida ao servizo de pagamento en liña
+ThisScreenAllowsYouToPay=Esta pantalla permítelle facer un pagamento en liña a %s.
+ThisIsInformationOnPayment=Esta é información sobre o pagamento a facer
+ToComplete=Completar
+YourEMail=Correo electrónico para recibir unha confirmación do pagamento
+STRIPE_PAYONLINE_SENDEMAIL=Notificación por correo electrónico despois dun intento de pagamento (éxito ou fracaso)
+Creditor=Acredor
+PaymentCode=Código do pagamento
+StripeDoPayment=Pagar con Stripe
+YouWillBeRedirectedOnStripe=Será redirixido á páxina segura de Stripe para introducir a información da súa tarxeta de crédito
 Continue=Seguinte
-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
-VendorName=Name of vendor
-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
+ToOfferALinkForOnlinePayment=URL para o pagamento de %s
+ToOfferALinkForOnlinePaymentOnOrder=URL para ofrecer unha páxina de pagamento en liña %s para un pedimento de cliente
+ToOfferALinkForOnlinePaymentOnInvoice=URL para ofrecer unha páxina de pagamento en liña %s para a factura dun cliente
+ToOfferALinkForOnlinePaymentOnContractLine=URL para ofrecer unha páxina de pagamento en liña %s para unha liña de contrato
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL para ofrecer unha páxina de pagamento en liña de %s de calquera cantidade sen ningún obxecto existente
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL para ofrecer unha páxina de pagamento en liña %s para unha subscrición de membro
+ToOfferALinkForOnlinePaymentOnDonation=URL para ofrecer unha páxina de pagamento en liña %s para o pagamento dunha doazón/subvención
+YouCanAddTagOnUrl=Tamén pode engadir o parámetro URL <b>&tag=<i>valore</i> </b> a calquera deses URL (obrigatorio só para o pagamento non ligado a un obxecto) para engadir a súa propia etiqueta de comentario de pagamento. <br> Para a URL de pagamentos sen ningún obxecto existente, tamén pode engadir o parámetro <strong> &noidempotency=1 </strong> para que a mesma ligazón coa mesma etiqueta poida usarse varias veces (algúns modos de pagamento poden limitar o pagamento a 1 por cada ligazón diferente sen este parámetro)
+SetupStripeToHavePaymentCreatedAutomatically=Configure o seu Stripe coa url <b>%s </b> para que o pagamento se cree automaticamente cando o valide Stripe.
+AccountParameter=Parámetros da conta
+UsageParameter=Parámetros de uso
+InformationToFindParameters=Axuda para atopar a información da súa conta %s
+STRIPE_CGI_URL_V2=URL do módulo CGI Stripe para o pagamento
+CSSUrlForPaymentForm=URL da folla de estilo CSS para o formulario de pagamento
+NewStripePaymentReceived=Recibiuse un novo pagamento Stripe
+NewStripePaymentFailed=Intentouse un novo pagamento por Stripe pero fallou
+FailedToChargeCard=Non se puido cargar a tarxeta
+STRIPE_TEST_SECRET_KEY=Chave de proba secreta
+STRIPE_TEST_PUBLISHABLE_KEY=Chave de proba publicable
+STRIPE_TEST_WEBHOOK_KEY=Chave de proba de Webhook
+STRIPE_LIVE_SECRET_KEY=Chave live secreta
+STRIPE_LIVE_PUBLISHABLE_KEY=Chave live publicable
+STRIPE_LIVE_WEBHOOK_KEY=Chave live de Webhook
+ONLINE_PAYMENT_WAREHOUSE=Stock que se usará para diminuír o stock cando se faga o pagamento en liña <br> (TODO Cando se fai a opción de diminuír o stock nunha acción de factura e o pagamento en liña xera a factura?)
+StripeLiveEnabled=Stripe live activado (se non, proba modo sandbox)
+StripeImportPayment=Importar pagamentos de Stripe
+ExampleOfTestCreditCard=Exemplo de tarxeta de crédito para a proba:%s => válido,%s => erro CVC,%s => caducado,%s => falla de carga
+StripeGateways=Pasarelas de Stripe
+OAUTH_STRIPE_TEST_ID=Id de cliente de Stripe Connect (ca _...)
+OAUTH_STRIPE_LIVE_ID=Id de cliente Stripe Connect (ca _...)
+BankAccountForBankTransfer=Conta bancaria para os as transferencias
+StripeAccount=Conta Stripe
+StripeChargeList=Listaxe de cargos Stripe
+StripeTransactionList=Listaxe de transaccións
+StripeCustomerId=Id de cliente de Stripe
+StripePaymentModes=Modos de pagamento de Stripe
+LocalID=ID local
+StripeID=ID Stripe
+NameOnCard=Nome na tarxeta
+CardNumber=Número de tarxeta
+ExpiryDate=Datos de caducidade
 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=Eliminar tarxeta
+ConfirmDeleteCard=Este certo querer eliminar esta tarxeta de Crédito ou Débito?
+CreateCustomerOnStripe=Crear cliente en Stripe
+CreateCardOnStripe=Crear unha tarxeta en Stripe
+ShowInStripe=Amosar en Stripe
+StripeUserAccountForActions=Conta de usuario a utilizar para a notificación por correo electrónico dalgúns eventos de Stripe (pagos de Stripe)
+StripePayoutList=Listaxe de pagamentos de Stripe
+ToOfferALinkForTestWebhook=Ligazón para configurar Stripe WebHook para chamar ao IPN (modo de proba)
+ToOfferALinkForLiveWebhook=Ligazón para configurar Stripe WebHook para chamar ao IPN (modo en directo)
+PaymentWillBeRecordedForNextPeriod=O pago será rexistrado para o seguinte período.
+ClickHereToTryAgain=<a href="%s"> Faga clic aquí para tentalo de novo ... </a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Debido a fortes regras de autenticación do cliente, a creación dunha tarxeta debe facerse desde o backoffice de Stripe. Pode facer clic aquí para activar o rexistro de cliente de Stripe:%s
diff --git a/htdocs/langs/gl_ES/supplier_proposal.lang b/htdocs/langs/gl_ES/supplier_proposal.lang
index 1446d11794a..1d11586a557 100644
--- a/htdocs/langs/gl_ES/supplier_proposal.lang
+++ b/htdocs/langs/gl_ES/supplier_proposal.lang
@@ -1,54 +1,55 @@
 # 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=Prezo orzamentos
-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=Orzamentos de provedor
-SupplierProposalsShort=Orzamentos de provedor
-NewAskPrice=New price request
-ShowSupplierProposal=Show price request
-AddSupplierProposal=Create a price request
-SupplierProposalRefFourn=Vendor ref
+SupplierProposal=Orzamentos de provedor
+supplier_proposalDESC=Xestiona orzamentos de provedor
+SupplierProposalNew=Novo orzamento
+CommRequest=Orzamento
+CommRequests=Orzamentos
+SearchRequest=Buscar un orzamento
+DraftRequests=Orzamentos borrador
+SupplierProposalsDraft=Orzamentos de provedor borrador
+LastModifiedRequests=Últimos %s orzamentos modificados
+RequestsOpened=Orzamentos abertos
+SupplierProposalArea=Área orzamentos de provedor
+SupplierProposalShort=Orzamento de provedor
+SupplierProposals=Orzamentos de provedores
+SupplierProposalsShort=Orzamentos de provedores
+AskPrice=Orzamento
+NewAskPrice=Novo orzamento
+ShowSupplierProposal=Amosar orzamento
+AddSupplierProposal=Crear un orzamento
+SupplierProposalRefFourn=Ref. provedor
 SupplierProposalDate=Data de entrega
-SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
-ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
-DeleteAsk=Delete request
-ValidateAsk=Validate request
-SupplierProposalStatusDraft=Borrador (é preciso validar)
-SupplierProposalStatusValidated=Validated (request is open)
-SupplierProposalStatusClosed=Pechada
-SupplierProposalStatusSigned=Accepted
+SupplierProposalRefFournNotice=Antes de pechar a "Aceptado", pense en comprender as referencias dos provedores.
+ConfirmValidateAsk=Está certo de querer validar esta solicitude de prezo co nome <b> %s</b>?
+DeleteAsk=Eliminar orzamento
+ValidateAsk=Validar orzamento
+SupplierProposalStatusDraft=Borrador (a validar)
+SupplierProposalStatusValidated=Validado (orzamento aberto)
+SupplierProposalStatusClosed=Pechado
+SupplierProposalStatusSigned=Aceptado
 SupplierProposalStatusNotSigned=Rexeitado
 SupplierProposalStatusDraftShort=Borrador
 SupplierProposalStatusValidatedShort=Validado
-SupplierProposalStatusClosedShort=Pechada
-SupplierProposalStatusSignedShort=Accepted
+SupplierProposalStatusClosedShort=Pechado
+SupplierProposalStatusSignedShort=Aceptado
 SupplierProposalStatusNotSignedShort=Rexeitado
-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
+CopyAskFrom=Crear orzamento por copia dun existente
+CreateEmptyAsk=Crear un orzamento en branco
+ConfirmCloneAsk=¿Está certo de querer clonar o orzamento <b>%s</b>?
+ConfirmReOpenAsk=¿Está certo de querer abrir de novo o orzamento <b>%s</b>?
+SendAskByMail=Enviar orzamento por correo electrónico
+SendAskRef=Enviando o orzamento %s
+SupplierProposalCard=Ficha orzamento
+ConfirmDeleteAsk=¿Está certo de querer eliminar este orzamento <b>%s</b>?
+ActionsOnSupplierProposal=Eventos do orzamento
+DocModelAuroreDescription=Modelo de orzamento completo (logo...)
+CommercialAsk=Orzamento
+DefaultModelSupplierProposalCreate=Modelo por defecto
+DefaultModelSupplierProposalToBill=Modelo por defecto ao pechar un orzamento (aceptado)
+DefaultModelSupplierProposalClosed=Modelo por defecto ao pechar un orzamento (rexeitado)
+ListOfSupplierProposals=Listaxe de orzamentos de provedor
+ListSupplierProposalsAssociatedProject=Listaxe de orzamentos de provedor asociados ao proxecto
+SupplierProposalsToClose=Orzamentos de provedor a pechar
+SupplierProposalsToProcess=Orzamentos de provedor a procesar
+LastSupplierProposals=Últimos %s orzamentos
+AllPriceRequests=Todos os orzamentos
diff --git a/htdocs/langs/gl_ES/suppliers.lang b/htdocs/langs/gl_ES/suppliers.lang
index 99bc16f91d3..1d835ebdedb 100644
--- a/htdocs/langs/gl_ES/suppliers.lang
+++ b/htdocs/langs/gl_ES/suppliers.lang
@@ -6,43 +6,43 @@ NewSupplier=Novo provedor
 History=Histórico
 ListOfSuppliers=Listaxe de provedores
 ShowSupplier=Ver provedor
-OrderDate=Data de pedido
+OrderDate=Data de pedimento
 BuyingPriceMin=Mellor prezo de compra
 BuyingPriceMinShort=Mellor prezo de compra
-TotalBuyingPriceMinShort=Total dos prezos de compra dos subproductos
-TotalSellingPriceMinShort=Total dos prezos de venda dos subproductos
-SomeSubProductHaveNoPrices=Algúns subproductos non teñen prezo definido
+TotalBuyingPriceMinShort=Total dos prezos de compra dos subprodutos
+TotalSellingPriceMinShort=Total dos prezos de venda dos subprodutos
+SomeSubProductHaveNoPrices=Algúns subprodutos non teñen prezo definido
 AddSupplierPrice=Engadir prezo de compra
 ChangeSupplierPrice=Mudar prezo de compra
 SupplierPrices=Prezos provedor
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Esta referencia de provedor xa está asociada á referencia: %s
-NoRecordedSuppliers=Sen provedores registrados
+NoRecordedSuppliers=Sen provedores rexistrados
 SupplierPayment=Pagos a provedor
 SuppliersArea=Área provedores
 RefSupplierShort=Ref. provedor
 Availability=Dispoñibilidade
-ExportDataset_fournisseur_1=Facturas de provedor e detalle da factura
-ExportDataset_fournisseur_2=Facturas de provedor e pagos
-ExportDataset_fournisseur_3=Pedidos a provedor e detalles de pedido
-ApproveThisOrder=Aprobar este pedido
-ConfirmApproveThisOrder=Está certo de querer aprobar o pedido a provedor <b>%s</b>?
-DenyingThisOrder=Denegar este pedido
-ConfirmDenyingThisOrder=¿Está certo de querer denegar o pedido a provedor <b>%s</b>?
-ConfirmCancelThisOrder=¿Está certo de querer cancelar o pedido a provedor <b>%s</b>?
-AddSupplierOrder=Crear pedido a provedor
+ExportDataset_fournisseur_1=Facturas de provedor e liñas de factura
+ExportDataset_fournisseur_2=Facturas de provedor e pagamentos
+ExportDataset_fournisseur_3=Pedimentos a provedor e liñas de pedimento
+ApproveThisOrder=Aprobar este pedimento
+ConfirmApproveThisOrder=Está certo de querer aprobar o pedimento a provedor <b>%s</b>?
+DenyingThisOrder=Denegar este pedimento
+ConfirmDenyingThisOrder=¿Está certo de querer denegar o pedimento a provedor <b>%s</b>?
+ConfirmCancelThisOrder=¿Está certo de querer cancelar o pedimento a provedor <b>%s</b>?
+AddSupplierOrder=Crear pedimento a provedor
 AddSupplierInvoice=Crear factura de provedor
 ListOfSupplierProductForSupplier=Listaxe de produtos e prezos do provedor <b>%s</b>
 SentToSuppliers=Enviado a provedores
-ListOfSupplierOrders=Listaxe de pedidos de compra
-MenuOrdersSupplierToBill=Pedidos de provedor a facturar
-NbDaysToDelivery=Tempo de entrega (días)
-DescNbDaysToDelivery=O maior atraso nas entregas de produtos deste pedido
+ListOfSupplierOrders=Listaxe de pedimentos a provedor
+MenuOrdersSupplierToBill=Pedimentos a provedor a facturar
+NbDaysToDelivery=Tempo de entrega (en días)
+DescNbDaysToDelivery=O maior atraso nas entregas de produtos deste pedimento
 SupplierReputation=Reputación provedor
-ReferenceReputation=Reference reputation
-DoNotOrderThisProductToThisSupplier=Non realizar pedidos
+ReferenceReputation=Reputación de referencia
+DoNotOrderThisProductToThisSupplier=Non realizar pedimentos
 NotTheGoodQualitySupplier=Mala calidade
 ReputationForThisProduct=Reputación
 BuyerName=Nome do comprador
-AllProductServicePrices=Todos os prezos de produto / servizo
-AllProductReferencesOfSupplier=All references of vendor
+AllProductServicePrices=Todos os prezos de produto/servizo
+AllProductReferencesOfSupplier=Todas as referencias de provedores de produto/servizo
 BuyingPriceNumShort=Prezos provedor
diff --git a/htdocs/langs/gl_ES/ticket.lang b/htdocs/langs/gl_ES/ticket.lang
index e99c740d69d..d9268409b20 100644
--- a/htdocs/langs/gl_ES/ticket.lang
+++ b/htdocs/langs/gl_ES/ticket.lang
@@ -19,289 +19,286 @@
 #
 
 Module56000Name=Tickets
-Module56000Desc=Ticket system for issue or request management
+Module56000Desc=Sistema detickets para a xestión de emisións ou solicitudes
 
-Permission56001=See tickets
-Permission56002=Modify tickets
-Permission56003=Delete tickets
-Permission56004=Manage tickets
-Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+Permission56001=Ver tickets
+Permission56002=Modificar tickets
+Permission56003=Eliminar tickets
+Permission56004=Administrar tickets
+Permission56005=Ver tickets de todos os terceiros (non aplicable para usuarios externos, sempre estará limitado ao terceiro do que dependen)
 
-TicketDictType=Ticket - Types
-TicketDictCategory=Ticket - Groupes
-TicketDictSeverity=Ticket - Severities
-TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
+TicketDictType=Tipo de tickets
+TicketDictCategory=Grupos de tickets
+TicketDictSeverity=Gravidade dos tickets
+TicketDictResolution=Resolución dos tickets
 
-TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
-TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortCOM=Pregunta comercial
+TicketTypeShortHELP=Solicitar axuda sobre funcións
+TicketTypeShortISSUE=Erro, bug ou problema
+TicketTypeShortREQUEST=Solicitude de cambio ou mellora
 TicketTypeShortPROJET=Proxecto
 TicketTypeShortOTHER=Outro
 
 TicketSeverityShortLOW=Baixo
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Alto
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Crítico / Bloqueo
 
-ErrorBadEmailAddress=Field '%s' incorrect
-MenuTicketMyAssign=My tickets
-MenuTicketMyAssignNonClosed=My open tickets
-MenuListNonClosed=Open tickets
+ErrorBadEmailAddress=O campo '%s' é incorrecto
+MenuTicketMyAssign=Meus tickets
+MenuTicketMyAssignNonClosed=Meus tickets abertos
+MenuListNonClosed=Tickets abertos
 
 TypeContact_ticket_internal_CONTRIBUTOR=Participante
-TypeContact_ticket_internal_SUPPORTTEC=Assigned user
-TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
-TypeContact_ticket_external_CONTRIBUTOR=External contributor
+TypeContact_ticket_internal_SUPPORTTEC=Usuario asignado
+TypeContact_ticket_external_SUPPORTCLI=Contacto seguemento cliente/incidente
+TypeContact_ticket_external_CONTRIBUTOR=Contribuidor externo
 
-OriginEmail=Email source
-Notify_TICKET_SENTBYMAIL=Send ticket message by email
+OriginEmail=Orixe E-Mail
+Notify_TICKET_SENTBYMAIL=Enviar mensaxe de ticket por e-mail
 
 # Status
-NotRead=Non lido
 Read=Lido
-Assigned=Assigned
+Assigned=Asignado
 InProgress=En progreso
-NeedMoreInformation=Waiting for information
-Answered=Answered
-Waiting=Waiting
-Closed=Pechada
-Deleted=Deleted
+NeedMoreInformation=Agardando información
+Answered=Contestado
+Waiting=Agardando
+Closed=Pechado
+Deleted=Eliminado
 
 # Dict
 Type=Tipo
-Severity=Severity
+Severity=Gravidade
 
 # Email templates
-MailToSendTicketMessage=To send email from ticket message
+MailToSendTicketMessage=Enviar correo electrónico dende ticket
 
 #
 # Admin page
 #
-TicketSetup=Ticket module setup
+TicketSetup=Configuración do módulo de ticket
 TicketSettings=Configuracións
 TicketSetupPage=
-TicketPublicAccess=A public interface requiring no identification is available at the following url
-TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
-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 notification to main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to send an email to "Notification email from" address (see setup below)
-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
-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 is added
-TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
-TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicAccess=Na seguinte url está dispoñible unha interface pública que non precisa identificación
+TicketSetupDictionaries=Os tipos de categorías e  os niveis de gravidade podense configurar nos diccionarios
+TicketParamModule=Configuración de variables do módulo
+TicketParamMail=Configuración de correo electrónicol
+TicketEmailNotificationFrom=E-mail de notificación de
+TicketEmailNotificationFromHelp=Utilizado na resposta da mensaxe do ticket por exemplo
+TicketEmailNotificationTo=Notificacións e-mail a
+TicketEmailNotificationToHelp=Envíe notificacións por e-mail a este enderezo.
+TicketNewEmailBodyLabel=Mensaxe de texto enviado despois de crear un ticket
+TicketNewEmailBodyHelp=O texto especificado aquí será insertado no correo electrónico de confirmación de creación dun novo ticket dende a interfaz pública. A información sobre a consulta do ticket agregase automáticamente.
+TicketParamPublicInterface=Configuración da interfaz pública
+TicketsEmailMustExist=Requirir un enderezo de e-mail existente para crear un ticket
+TicketsEmailMustExistHelp=Na interfaz pública, o enderezo de correo electrónico debe ser cuberto na base de datos para crear un novo ticket.
+PublicInterface=Interfaz pública.
+TicketUrlPublicInterfaceLabelAdmin=URL alternativa de interfaz pública
+TicketUrlPublicInterfaceHelpAdmin=É posible definir un alias para o servidor web e así poñer a disposición a interface pública con outro URL (o servidor debe actuar como proxy neste novo URL)
+TicketPublicInterfaceTextHomeLabelAdmin=Texto de benvida da interfaz pública
+TicketPublicInterfaceTextHome=Pode crear un ticket de asistencia ou ver algún existente desde o identificados do seu ticket de seguimento.
+TicketPublicInterfaceTextHomeHelpAdmin=O texto aquí definido aparecerá na páxina de inicio da interface pública.
+TicketPublicInterfaceTopicLabelAdmin=Título da interfaz
+TicketPublicInterfaceTopicHelp=Este texto aparecerá como o título da interfaz pública.
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Texto de axuda á entrada da mensaxe
+TicketPublicInterfaceTextHelpMessageHelpAdmin=Este texto aparecerá sobre o área de entrada de mensaxes do usuario.
+ExtraFieldsTicket=Campos adicionais
+TicketCkEditorEmailNotActivated=O editor HTML non está activado. Poña o contido de FCKEDITOR_ENABLE_MAIL en 1 para obtelo.
+TicketsDisableEmail=Non enviar correos electrónicos de creación de tickets ou grabación de mensaxes
+TicketsDisableEmailHelp=Por defecto, os correos electrónicos envíanse cando se crean novas entradas ou mensaxes. Active esta opción para desactivar as notificacións de correo electrónico *all*
+TicketsLogEnableEmail=Activar o rexistro por correo electrónico
+TicketsLogEnableEmailHelp=A cada cambio, enviarase un correo electrónico **to each contact** asociado ao ticket.
+TicketParams=Parámetros
+TicketsShowModuleLogo=Amosar o logotipo do módulo na interfaz pública
+TicketsShowModuleLogoHelp=Active esta opción para ocultar o logotipo nas páxinas da interfaz pública
+TicketsShowCompanyLogo=Amosar o logotipo da empresa na interfaz pública
+TicketsShowCompanyLogoHelp=Active esta opción para ocultar o logotipo da empresa principal nas páxinas da interfaz pública
+TicketsEmailAlsoSendToMainAddress=Envíe tamén notificacións a enderezo de correo electrónico principal
+TicketsEmailAlsoSendToMainAddressHelp=Active esta opción para enviar un correo electrónico ao enderezo "Notificación de correo electrónico desde" (ver configuración a continuación)
+TicketsLimitViewAssignedOnly=Restrinxir a visualización aos tickets asignados ao usuario actual (non é efectivo para usuarios externos, limítase sempre ao terceiro do que dependen)
+TicketsLimitViewAssignedOnlyHelp=Só serán visibles os tickets asignados ao usuario actual. Non se aplica a un usuario con dereitos de xestión de tickets.
+TicketsActivatePublicInterface=Activar a interface pública
+TicketsActivatePublicInterfaceHelp=A interface pública permite aos visitantes crear entradas.
+TicketsAutoAssignTicket=Asignar automaticamente ao usuario que creou o ticket
+TicketsAutoAssignTicketHelp=Ao crear un ticket, o usuario pode asignarse automaticamente ao ticket.
+TicketNumberingModules=Módulo de numeración de entradas
+TicketsModelModule=Modelos de documentos para os tickets
+TicketNotifyTiersAtCreation=Notificar a terceiros a creación
+TicketsDisableCustomerEmail=Desactiva sempre os correos electrónicos cando se crea un ticket desde a interface pública
+TicketsPublicNotificationNewMessage=Enviar correo electrónico cando se engada unha nova mensaxe
+TicketsPublicNotificationNewMessageHelp=Enviar correo electrónico cando se engada unha nova mensaxe desde a interface pública (ao usuario asignado ou ao correo electrónico de notificacións a (actualizar) e/ou ao correo electrónico de notificacións a)
+TicketPublicNotificationNewMessageDefaultEmail=Correo electrónico de notificacións a (actualizar)
+TicketPublicNotificationNewMessageDefaultEmailHelp=Envía por correo electrónico novas mensaxes a este enderezo se o ticket non ten asignado un usuario ou o usuario non ten un correo electrónico.
 #
 # Index & list page
 #
-TicketsIndex=Tickets area
-TicketList=List of tickets
-TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
-NoTicketsFound=No ticket found
-NoUnreadTicketsFound=No unread ticket found
-TicketViewAllTickets=View all tickets
-TicketViewNonClosedOnly=View only open tickets
-TicketStatByStatus=Tickets by status
-OrderByDateAsc=Sort by ascending date
-OrderByDateDesc=Sort by descending date
-ShowAsConversation=Show as conversation list
-MessageListViewType=Show as table list
+TicketsIndex=Área Tickets
+TicketList=Listaxe de tickets
+TicketAssignedToMeInfos=Esta páxina amosa o listado de tickets que están asignados ao usuario actual
+NoTicketsFound=Ningún ticket atopado
+NoUnreadTicketsFound=Ningún ticket sen ler atopado
+TicketViewAllTickets=Ver todos os tickets
+TicketViewNonClosedOnly=Ver só tickets abertos
+TicketStatByStatus=Tickets por estado
+OrderByDateAsc=Ordear por data ascendente
+OrderByDateDesc=Ordear por data descendente
+ShowAsConversation=Amosar a listaxe de conversa
+MessageListViewType=Amosar a listaxe de taboas
 
 #
 # 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=Grupo
-SeeTicket=See ticket
-TicketMarkedAsRead=Ticket has been marked as read
-TicketReadOn=Read on
+TicketCard=Ficha ticket
+CreateTicket=Crear ticket
+EditTicket=Editar ticket
+TicketsManagement=Xestión de tickets
+CreatedBy=Creado por
+NewTicket=Novo ticket
+SubjectAnswerToTicket=Resposta
+TicketTypeRequest=Tipo de solicitude
+TicketCategory=Grúpo
+SeeTicket=Ver ticket
+TicketMarkedAsRead=O ticket foi marcado como lido
+TicketReadOn=Lido o
 TicketCloseOn=Data de peche
-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
-Properties=Classification
-LatestNewTickets=Latest %s newest tickets (not read)
-TicketSeverity=Severity
-ShowTicket=See ticket
-RelatedTickets=Related tickets
-TicketAddIntervention=Create intervention
-CloseTicket=Close ticket
-CloseATicket=Close a ticket
-ConfirmCloseAticket=Confirm ticket closing
-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.
+MarkAsRead=Marcar ticket como lido
+TicketHistory=Historial
+AssignUser=Asignar ao usuario
+TicketAssigned=O Ticket foi asignado
+TicketChangeType=Cambiar tipo
+TicketChangeCategory=Cambiar categoría
+TicketChangeSeverity=Cambiar gravidade
+TicketAddMessage=Engadir mensaxe
+AddMessage=Engadir mensaxe
+MessageSuccessfullyAdded=Ticket engadido
+TicketMessageSuccessfullyAdded=Mensaxe engadida correctamente
+TicketMessagesList=Listaxe de mensaxes
+NoMsgForThisTicket=Ningunha mensaxe para este ticket
+Properties=Clasificación
+LatestNewTickets=Últimos %s tickets (non lidos)
+TicketSeverity=Gravidade
+ShowTicket=Ver ticket
+RelatedTickets=Tickets relacionados
+TicketAddIntervention=Crear intervención
+CloseTicket=Pechar ticket
+CloseATicket=Pechar un ticket
+ConfirmCloseAticket=Confirmar o peche do ticket
+ConfirmDeleteTicket=Confirme a eliminación do ticket
+TicketDeletedSuccess=Ticket eliminado con éxito
+TicketMarkedAsClosed=Ticket marcado como pechado
+TicketDurationAuto=Duración calculada
+TicketDurationAutoInfos=Duración calculada automáticamente a partir da intervención relacionada
+TicketUpdated=Ticket actualizado
+SendMessageByEmail=Enviar mensaxe por e-mail
+TicketNewMessage=Nova mensaxe
+ErrorMailRecipientIsEmptyForSendTicketMessage=O destinatario está baleiro. Non foi enviado o email
+TicketGoIntoContactTab=Vaia á lapela "Contactos" para seleccionalos
+TicketMessageMailIntro=Introdución
+TicketMessageMailIntroHelp=Este texto é engadido só ao principio do email e non será gardado.
+TicketMessageMailIntroLabelAdmin=Introdución á mensaxe cando enviase un e-mail
+TicketMessageMailIntroText=Ola, <br>Enviouse unha nova resposta a un ticket. Aquí está a mensaxe: <br>
+TicketMessageMailIntroHelpAdmin=Este texto será insertado antes do texto daa resposta a un ticket.
 TicketMessageMailSignature=Sinatura
-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
-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.
-PublicInterfaceNotEnabled=Public interface was not enabled
-ErrorTicketRefRequired=Ticket reference name is required
+TicketMessageMailSignatureHelp=Este texto será agregado só ao final do correo electrónico e non será gardado.
+TicketMessageMailSignatureText=<p>Cordialmente,</p><p>--</p>
+TicketMessageMailSignatureLabelAdmin=Sinatura do correo electónico de resposta
+TicketMessageMailSignatureHelpAdmin=Este texto será insertado despois da mensaxe de resposta.
+TicketMessageHelp=Só este texto será gardado na listaxe de mensaxes na ficha do ticket
+TicketMessageSubstitutionReplacedByGenericValues=As variables de substitución son reemplazadas por valores xenéricos.
+TimeElapsedSince=Tempo transcurrido dende
+TicketTimeToRead=Tempo transcurrido antes de ler o ticket
+TicketContacts=Contactos do ticket
+TicketDocumentsLinked=Documentos ligados ao ticket
+ConfirmReOpenTicket=¿Está certo de querer reabrir este ticket?
+TicketMessageMailIntroAutoNewPublicMessage=Publicouse unha nova mensaxe no ticket co asunto %s:
+TicketAssignedToYou=Ticket asignado
+TicketAssignedEmailBody=Foille asignado o ticket #%s por %s
+MarkMessageAsPrivate=Marcar mensaxe como privada
+TicketMessagePrivateHelp=Esta mensaxe non será amosada aos usuarios externos
+TicketEmailOriginIssuer=Emisor orixe dos tickets
+InitialMessage=Mensaxe inicial
+LinkToAContract=Ligar a un contrato
+TicketPleaseSelectAContract=Seleccione un contrato
+UnableToCreateInterIfNoSocid=Non pode crearse unha intervención se non hai definidos terceiros
+TicketMailExchanges=Intercambios de correos electrónicos
+TicketInitialMessageModified=Mensaxe inicial modificada
+TicketMessageSuccesfullyUpdated=Mensaxe actualizada con éxito
+TicketChangeStatus=Cambiar estado
+TicketConfirmChangeStatus=¿Confirma o cambio de estado: %s?
+TicketLogStatusChanged=Estado cambiado: %s a %s
+TicketNotNotifyTiersAtCreate=Non notificar á compañía ao crear
+Unread=Non lido
+TicketNotCreatedFromPublicInterface=Non dispoñible. O ticket non se creou desde a interface pública.
+ErrorTicketRefRequired=O nome da referencia do ticket é obrigatorio
 
 #
 # Logs
 #
-TicketLogMesgReadBy=Ticket %s read by %s
-NoLogForThisTicket=No log for this ticket yet
-TicketLogAssignedTo=Ticket %s assigned to %s
-TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
-TicketLogClosedBy=Ticket %s closed by %s
-TicketLogReopen=Ticket %s re-open
+TicketLogMesgReadBy=Ticket %s lido por %s
+NoLogForThisTicket=Aínda no hai rexistro para este ticket
+TicketLogAssignedTo=Ticket %s asignado a %s
+TicketLogPropertyChanged=Ticket %s modificado: clasificación: de %s a %s
+TicketLogClosedBy=Ticket %s pechado por %s
+TicketLogReopen=Ticket %s aberto de novo
 
 #
 # 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!
+TicketSystem=Sistema de tickets
+ShowListTicketWithTrackId=Amosar listado de tickets con track ID
+ShowTicketWithTrackId=Amosar ticket desde id de seguemento
+TicketPublicDesc=Pode crear un ticket de soporte ou comprobar un ID existente.
+YourTicketSuccessfullySaved=Ticket gardado con éxito!
+MesgInfosPublicTicketCreatedWithTrackId=Foi creado un novo ticket con ID %s.
+PleaseRememberThisId=Pregase que conserve o número de seguimento que lle podemos pedir máis adiante.
+TicketNewEmailSubject=Confirmación de creación de ticket
+TicketNewEmailSubjectCustomer=Novo ticket de soporte
+TicketNewEmailBody=Este é un correo electrónico automático para confirmar que foi rexistrado un novo ticket.
+TicketNewEmailBodyCustomer=Este es un e-mail automático para confirmar que creouse un novo ticket na súa conta.
+TicketNewEmailBodyInfosTicket=Información para monitorear o ticket
+TicketNewEmailBodyInfosTrackId=Número de seguemento do ticket: %s
+TicketNewEmailBodyInfosTrackUrl=Pode ver o progreso do ticket facendo click sobre a seguinte ligazón.
+TicketNewEmailBodyInfosTrackUrlCustomer=Pode ver o progreso do ticket na interfaz específica facendo clic na seguinte ligazón
+TicketEmailPleaseDoNotReplyToThisEmail=Prégase non respostar directamente a este correo. Use a ligazón para respostar.
+TicketPublicInfoCreateTicket=Este formulario permitelle rexistrar un ticket de soporte no noso sistema.
+TicketPublicPleaseBeAccuratelyDescribe=Prégase describa de forma precisa o problema. Aporte a maior cantidade de información posible para permitirnos identificar a súa solicitude.
+TicketPublicMsgViewLogIn=Ingrese o ID de seguemento do ticket
+TicketTrackId=ID público de seguemento
+OneOfTicketTrackId=Un dos seus ID de seguemento
+ErrorTicketNotFound=Non foi atopado o ticket co id de seguemento %s!
 Subject=Asunto
-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
+ViewTicket=Ver ticket
+ViewMyTicketList=Ver a miña listaxe de tickets
+ErrorEmailMustExistToCreateTicket=Erro: enderezo de correo electrónico non atopado na nosa base de datos
+TicketNewEmailSubjectAdmin=Novo ticket creado.
+TicketNewEmailBodyAdmin=<p> O ticket foi creado co ID # %s, ver información: </p>
+SeeThisTicketIntomanagementInterface=Ver Ticket na interfaz de administración
+TicketPublicInterfaceForbidden=A interfaz pública para os tickets non estaba habilitada.
+ErrorEmailOrTrackingInvalid=ID de seguemento ou enderezo de correo electrónico incorrectos
+OldUser=Usuario antigo
 NewUser=Novo usuario
-NumberOfTicketsByMonth=Number of tickets per month
-NbOfTickets=Number of tickets
+NumberOfTicketsByMonth=Número de tickets por mes
+NbOfTickets=Número de 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
+TicketNotificationEmailSubject=Ticket %s actualizado
+TicketNotificationEmailBody=Esta é unha mensaxe automática para notificarlle queo ticket %s acaba de ser actualizado
+TicketNotificationRecipient=Recipiente de notificación
+TicketNotificationLogMessage=Rexistro de mensaxe
+TicketNotificationEmailBodyInfosTrackUrlinternal=Ver ticket na interfaz
+TicketNotificationNumberEmailSent=Enviouse un correo electrónico de notificación: %s
 
-ActionsOnTicket=Events on ticket
+ActionsOnTicket=Eventos no ticket
 
 #
 # Boxes
 #
-BoxLastTicket=Latest created tickets
-BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicket=Últimos tickets creados
+BoxLastTicketDescription=Últimos %s tickets creados
 BoxLastTicketContent=
-BoxLastTicketNoRecordedTickets=No recent unread tickets
-BoxLastModifiedTicket=Latest modified tickets
-BoxLastModifiedTicketDescription=Latest %s modified tickets
+BoxLastTicketNoRecordedTickets=Non hai tickets recentes sen ler
+BoxLastModifiedTicket=Últimos tickets modificados
+BoxLastModifiedTicketDescription=Últimos %s tickets modificados
 BoxLastModifiedTicketContent=
-BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
+BoxLastModifiedTicketNoRecordedTickets=Non hai tickets modificados recentemente
diff --git a/htdocs/langs/gl_ES/trips.lang b/htdocs/langs/gl_ES/trips.lang
index 639e621d831..98087e25679 100644
--- a/htdocs/langs/gl_ES/trips.lang
+++ b/htdocs/langs/gl_ES/trips.lang
@@ -1,151 +1,151 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Show expense report
+ShowExpenseReport=Ver informe de gastos
 Trips=Informes de gastos
-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 inform for validation.
-TripSociete=Information company
-TripNDF=Informations expense report
-PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
-ExpenseReportLine=Expense report line
+TripsAndExpenses=Informes de gastos
+TripsAndExpensesStatistics=Estatísticas de informes de gastos
+TripCard=Ficha de informe gasto
+AddTrip=Crear informe de informes de gasto
+ListOfTrips=Listaxe de informes de gastos
+ListOfFees=Listaxe de honorarios
+TypeFees=Tipos de honorarios
+ShowTrip=Ver informe de gastos
+NewTrip=Novo informe de gasto
+LastExpenseReports=Últimos %s informes de gastos
+AllExpenseReports=Todos os informes de gastos
+CompanyVisited=Empresa/organización visitada
+FeesKilometersOrAmout=Importe ou quilómetros
+DeleteTrip=Eliminar informe de gasto
+ConfirmDeleteTrip=¿Está certo de querer eliminar este informe de gasto?
+ListTripsAndExpenses=Listaxe de informe de gastos
+ListToApprove=Agardando aprobación
+ExpensesArea=Área de informe de gastos
+ClassifyRefunded=Clasificar 'Reembolsado'
+ExpenseReportWaitingForApproval=Foi enviado un novo informe de gasto para ser aprobado
+ExpenseReportWaitingForApprovalMessage=Foi enviado un novo ginforme de asto e está agardando para ser aprobado.<br>- Usuario: %s<br>- Periodo. %s<br>Faga clic aquí para validalo: %s
+ExpenseReportWaitingForReApproval=Foi enviado un novo informe de gasto para aprobalo de novo
+ExpenseReportWaitingForReApprovalMessage=Foi enviado un novo informe de gasto e está agardando para ser aprobado de novo.<br>O %s, rexeitou a súa aprobación por esta razón: %s<br>Foi proposta unha nova versión e agarda a súa aprobación.<br>- Usuario: %s<br>- Periodo. %s<br>Faga clic aquí para validalo: %s
+ExpenseReportApproved=Un novo informe de gasto foi aprobado
+ExpenseReportApprovedMessage=O informe de gasto %s foi aprobado.<br>- Usuario: %s<br>- Aprobado por: %s<br>Faga clic aquí para validalo: %s
+ExpenseReportRefused=Un informe de gasto foi rexeitado
+ExpenseReportRefusedMessage=O informe de gasto %s foi rexeitado.<br>- Usuario: %s<br>- Rexeitado por: %s<br>- Motivo do rexeitamento: %s<br>Faga clic aquí ver o gasto: %s
+ExpenseReportCanceled=Un informe de gasto foi cancelado
+ExpenseReportCanceledMessage=O informe de gasto %s foi cancelado.<br>- Usuario: %s<br>- Cancelado por: %s<br>- Motivo da cancelación: %s<br>Faga clic aquí ver o gasto: %s
+ExpenseReportPaid=Un informe de gasto foi pagado
+ExpenseReportPaidMessage=O informe de gasto %s foi pagado.<br>- Usuario: %s<br>- Pagado por: %s<br>Faga clic aquí ver o gasto: %s
+TripId=Id de informe de gasto
+AnyOtherInThisListCanValidate=Persoa a informar para a validación
+TripSociete=Información da empresa
+TripNDF=Información do informe de gasto
+PDFStandardExpenseReports=Prantilla estandard para xerar un documento de informe de gasto
+ExpenseReportLine=Liña de informe gasto
 TF_OTHER=Outro
-TF_TRIP=Transportation
-TF_LUNCH=Lunch
+TF_TRIP=Transporte
+TF_LUNCH=Xantar
 TF_METRO=Metro
-TF_TRAIN=Train
-TF_BUS=Bus
+TF_TRAIN=Trén
+TF_BUS=Autocar
 TF_CAR=Coche
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
+TF_PEAGE=Peaxe
+TF_ESSENCE=Combustible
 TF_HOTEL=Hotel
 TF_TAXI=Taxi
-EX_KME=Mileage costs
-EX_FUE=Fuel CV
+EX_KME=Custos de quilometraxe
+EX_FUE=Combustible
 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
+EX_PAR=Estacionamento
+EX_TOL=Peaxe
+EX_TAX=Impostos varios
+EX_IND=Suscrición de indemnización por transporte
+EX_SUM=Mantemento
+EX_SUO=Material de oficina
+EX_CAR=Aluguer de vehículos
+EX_DOC=Documentación
+EX_CUR=Os clientes reciben
+EX_OTR=Outros receptores
+EX_POS=Franqueo
+EX_CAM=Mantemento e reparación
+EX_EMM=Alimentación de empregados
+EX_GUM=Alimentación dos hóspedes
+EX_BRE=Almorzo
+EX_FUE_VP=Combustible
+EX_TOL_VP=Peaxe
+EX_PAR_VP=Estacionamento
+EX_CAM_VP=Mantemento e reparacións
+DefaultCategoryCar=Modo de transporte predeterminado
+DefaultRangeNumber=Número de rango predeterminado
+UploadANewFileNow=Subir un novo documento agora
+Error_EXPENSEREPORT_ADDON_NotDefined=Erro, a regra para a ref de numeración do informe de gastos non se definiu na configuración do módulo "Informe de gastos"
+ErrorDoubleDeclaration=Declarou outro informe de gastos nun intervalo de datas similar.
+AucuneLigne=Non hai gastos declarados
+ModePaiement=Modo de pagamento
+VALIDATOR=Usuario responsable para aprobación
 VALIDOR=Aprobado por
-AUTHOR=Recorded by
+AUTHOR=Rexistrado por
 AUTHORPAIEMENT=Pagado por
-REFUSEUR=Denied by
-CANCEL_USER=Deleted by
+REFUSEUR=Denegado por
+CANCEL_USER=Eliminado por
 MOTIF_REFUS=Razón
 MOTIF_CANCEL=Razón
-DATE_REFUS=Deny date
+DATE_REFUS=Data de denegación
 DATE_SAVE=Data de validación
-DATE_CANCEL=Cancelation date
-DATE_PAIEMENT=Data de pago
-BROUILLONNER=Reopen
-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=Expense report milles index
-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
+DATE_CANCEL=Data de cancelación
+DATE_PAIEMENT=Data de pagamento
+BROUILLONNER=Abrir de novo
+ExpenseReportRef=Ref. informe de gasto
+ValidateAndSubmit=Validar e enviar para aprobar
+ValidatedWaitingApproval=Validado (agardando aprobación)
+NOT_AUTHOR=Non é o autor deste informe de gasto. Operación cancelada.
+ConfirmRefuseTrip=¿Está certo de querer denegar este informe de gasto?
+ValideTrip=Aprobar informe de gasto
+ConfirmValideTrip=¿Está certo de querer aprobar este informe de gasto?
+PaidTrip=Pagarinforme de  gasto
+ConfirmPaidTrip=¿Está certo de querer cambiar o estado deste informe de gasto a "Pagado"?
+ConfirmCancelTrip=¿Está certo de querer cancelar este informe de gasto?
+BrouillonnerTrip=Devolver o informe de gasto ao estado "Borrador"
+ConfirmBrouillonnerTrip=¿Está certo de querer devolver este informe de gasto ao estado "Borrador"?
+SaveTrip=Validar informe de gasto
+ConfirmSaveTrip=¿Está certo de querer validar este informe de gasto?
+NoTripsToExportCSV=Sen informe de gasto a exportar para este periodo.
+ExpenseReportPayment=Informe de pagamentos de gastos
+ExpenseReportsToApprove=Informe de gastos a aprobar
+ExpenseReportsToPay=Informe de gastos a pagar
+ConfirmCloneExpenseReport=¿Está certo de querer eliminar este informe de gastos?
+ExpenseReportsIk=Configuración das tarifas de quilometraxe
+ExpenseReportsRules=Regras de informe de gastos
+ExpenseReportIkDesc=Pode modificar o cálculo do gasto en quilómetros por categoría e intervalo que se definiron previamente. <b> d </b> é a distancia en quilómetros
+ExpenseReportRulesDesc=Pode crear ou actualizar calquera regra de cálculo. Esta parte utilizase cando o usuario cree un novo informe de gastos
 expenseReportOffset=Decálogo
-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
+expenseReportCoef=Coeficiente
+expenseReportTotalForFive=Exemplo con <u>d</u>= 5
+expenseReportRangeFromTo=de %d a %d
+expenseReportRangeMoreThan=mais de %d
+expenseReportCoefUndefined=(valor non definido)
+expenseReportCatDisabled=Categoría deshabilitada - vexa o diccionario c_exp_tax_cat
+expenseReportRangeDisabled=Intervalo deshabilitado: consulte o diccionario c_exp_tax_range
 expenseReportPrintExample=offset + (d x coef) = %s
-ExpenseReportApplyTo=Apply to
-ExpenseReportDomain=Domain to apply
-ExpenseReportLimitOn=Limit on
-ExpenseReportDateStart=Date start
-ExpenseReportDateEnd=Date end
-ExpenseReportLimitAmount=Limite amount
-ExpenseReportRestrictive=Restrictive
-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
-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
-nolimitbyEX_DAY=by day (no limitation)
-nolimitbyEX_MON=by month (no limitation)
-nolimitbyEX_YEA=by year (no limitation)
-nolimitbyEX_EXP=by line (no limitation)
-CarCategory=Category of car
-ExpenseRangeOffset=Offset amount: %s
-RangeIk=Mileage range
-AttachTheNewLineToTheDocument=Attach the line to an uploaded document
+ExpenseReportApplyTo=Aplicar a
+ExpenseReportDomain=Dominio a aplicar
+ExpenseReportLimitOn=Límite en
+ExpenseReportDateStart=Data inicio
+ExpenseReportDateEnd=Data fin
+ExpenseReportLimitAmount=Importe límite
+ExpenseReportRestrictive=Restrictivo
+AllExpenseReport=Todo tipo de informe de gastos
+OnExpense=Liña de gastos
+ExpenseReportRuleSave=Foi gardada a regra de informe de gastos
+ExpenseReportRuleErrorOnSave=Erro: %s
+RangeNum=Intervalo %d
+ExpenseReportConstraintViolationError=Id de infracción [%s]: %s é superior a %s %s
+byEX_DAY=por día (limitación a %s)
+byEX_MON=por mes (limitación a %s)
+byEX_YEA=por ano (limitación a %s)
+byEX_EXP=por liña(limitación a %s)
+ExpenseReportConstraintViolationWarning=Id de infracción [%s]: %s é superior a %s %s
+nolimitbyEX_DAY=por día (sen limitación)
+nolimitbyEX_MON=por mes (sen limitación)
+nolimitbyEX_YEA=por ano (sen limitación)
+nolimitbyEX_EXP=por liña (sen limitación)
+CarCategory=Categoría do vehículo
+ExpenseRangeOffset=Importe compensado: %s
+RangeIk=Intervalo de quilometraxe
+AttachTheNewLineToTheDocument=Engadir a liña a un documento actualizado
diff --git a/htdocs/langs/gl_ES/users.lang b/htdocs/langs/gl_ES/users.lang
index e6bcfc93d77..18657d820b1 100644
--- a/htdocs/langs/gl_ES/users.lang
+++ b/htdocs/langs/gl_ES/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Eliminar do grupo
 PasswordChangedAndSentTo=Contrasinal cambiado e enviado a <b>%s</b>.
 PasswordChangeRequest=Solicitude para cambiar o contrasinal de <b>%s</b>
 PasswordChangeRequestSent=Solicitude de cambio de contrasinal para <b>%s</b> enviado a <b>%s</b>.
+IfLoginExistPasswordRequestSent=Se este inicio de sesión é unha conta válida, enviouse un correo electrónico para restablecer o contrasinal.
+IfEmailExistPasswordRequestSent=Se este correo electrónico é unha conta válida, enviouse un correo electrónico para restablecer o contrasinal.
 ConfirmPasswordReset=Confirmar restablecemento de contrasinal
 MenuUsersAndGroups=Usuarios e grupos
 LastGroupsCreated=Últimos %s grupos creados
@@ -73,6 +75,7 @@ CreateInternalUserDesc=Este formulario permitelle engadir un usuario interno par
 InternalExternalDesc=Un usuario <b>interno</b> é un usuario que pertence a súa empresa/organización.<br>Un usuario <b>externo</b> é un usuario cliente, provedor ou outro.<br><br>Nos dous casos, os permisos de usuarios definen os dereitos de acceso, pero o usuario externo pode a maiores ter un xestor de menús diferente ao usuario interno (véxase Inicio - Configuración - Entorno)
 PermissionInheritedFromAGroup=O permiso concédese xa que o hereda dun grupo ao cal pertence o usuario.
 Inherited=Heredado
+UserWillBe=Será o usuario creado
 UserWillBeInternalUser=O usuario creado será un usuario interno (xa que non está ligado a un terceiro en particular)
 UserWillBeExternalUser=O usuario creado será un usuario externo (xa que está ligado a un terceiro en particular)
 IdPhoneCaller=ID chamada recibida (teléfono)
@@ -108,13 +111,15 @@ DisabledInMonoUserMode=Desactivado en modo mantemento
 UserAccountancyCode=Código contable usuario
 UserLogoff=Usuario desconectado
 UserLogged=Usuario conectado
-DateOfEmployment=Employment date
-DateEmployment=Data de contratación do empregado
+DateOfEmployment=Data de contratación empregado
+DateEmployment=Contratación empregado
+DateEmploymentstart=Data de comezo da contratación do empregado
 DateEmploymentEnd=Data de baixa do empregado
+RangeOfLoginValidity=Rango de data de validez do inicio de sesión
 CantDisableYourself=Pode desactivar o seu propio rexistro de usuario
 ForceUserExpenseValidator=Forzar validación do informe de gasto
 ForceUserHolidayValidator=Forzar validación do rexeitamento do gasto
-ValidatorIsSupervisorByDefault=Por defecto, o responsable da validación é o supervisor do usuario. Manter baleiro para manter este comportamento.
+ValidatorIsSupervisorByDefault=Por defecto, o responsable da validación é o supervisor do usuario. Manter baleiro para gardar este comportamento.
 UserPersonalEmail=Email persoal
 UserPersonalMobile=Teléfono móbil persoal
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+WarningNotLangOfInterface=Aviso, este é o idioma principal que fala o usuario, non o idioma da interface que escolleu ver. Para cambiar o idioma da interface visible por este usuario, vaia a lapela %s
diff --git a/htdocs/langs/gl_ES/website.lang b/htdocs/langs/gl_ES/website.lang
index e16ee97f8fa..7691822ddf4 100644
--- a/htdocs/langs/gl_ES/website.lang
+++ b/htdocs/langs/gl_ES/website.lang
@@ -1,139 +1,139 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Código
-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
-HomePage=Home Page
+WebsiteSetupDesc=​​ Cree aquí os sitios web que desexa usar. Despois vaia ao menú de sitios web para editalos.
+DeleteWebsite=Eliminar sitio web
+ConfirmDeleteWebsite=¿Está certo de querer eliminar este sitio web? Tamén se eliminarán todas as súas páxinas e o contido. Os ficheiros cargados (como no directorio multimedia, no módulo ECM, ...) permanecerán.
+WEBSITE_TYPE_CONTAINER=Tipo de páxina / contedor
+WEBSITE_PAGE_EXAMPLE=Páxina web para usar como exemplo
+WEBSITE_PAGENAME=Nome/alias da páxina
+WEBSITE_ALIASALT=Nomes/alias alternativos de páxinas
+WEBSITE_ALIASALTDesc=Use aquí a listaxe doutros nomes/alias para que tamén se poida acceder á páxina usando outros nomes/alias (por exemplo, o nome antigo despois de renomear o alias para manter a ligazón de retroceso na ligazón/nome antigo funcionando). A sintaxe é:<br> nome alternativo1,nome alternativo2, ...
+WEBSITE_CSS_URL=URL do ficheiro CSS externo
+WEBSITE_CSS_INLINE=Contido do ficheiro CSS (común a todas as páxinas)
+WEBSITE_JS_INLINE=Contido do ficheiro Javascript (común a todas as páxinas)
+WEBSITE_HTML_HEADER=Adición na parte inferior da cabeceira HTML (común a todas as páxinas)
+WEBSITE_ROBOT=Ficheiro robots (robots.txt)
+WEBSITE_HTACCESS=Ficheiro .htaccess do sitio web
+WEBSITE_MANIFEST_JSON=Ficheiro manifest.json do sitio web
+WEBSITE_README=Ficheiro README.md
+WEBSITE_KEYWORDSDesc=Use unha coma para separar os valores
+EnterHereLicenseInformation=Introduza aquí metadatos ou información de licenza para facer un ficheiro README.md. se distribúe o seu sitio web como modelo, o ficheiro incluirase no paquete temtate.
+HtmlHeaderPage=Cabeceira HTML (específica só para esta páxina)
+PageNameAliasHelp=Nome ou alias da páxina. <br> Este alias tamén se usa para forxar un URL de SEO cando o sitio web se executa desde un servidor virtual dun servidor web (como Apacke, Nginx, ...). Use o botón "<strong>%s </strong>" para editar este alias.
+EditTheWebSiteForACommonHeader=Nota: Se desexa definir unha cabeceira personalizada para todas as páxinas, edite a cabeceira a nivel de sitio en lugar de a páxina/contedor.
+MediaFiles=Librería de medios
+EditCss=Editar propiedades do sitio web
+EditMenu=Menú Editar
+EditMedias=Editar medios
+EditPageMeta=Editar as propiedades da páxina/contedor
+EditInLine=Editar en liña
+AddWebsite=Engadir sitio web
+Webpage=Páxina web/contedor
+AddPage=Engadir páxina/contedor
 PageContainer=Páxina
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
-RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
-SiteDeleted=Web site '%s' deleted
-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 virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
+PreviewOfSiteNotYetAvailable=A vista previa do seu sitio web <strong>%s </strong> aínda non está dispoñible. Primeiro debe "<strong> Importar un modelo de sitio web completo </strong>" ou simplemente "<strong> Engadir unha páxina/contedor </strong>".
+RequestedPageHasNoContentYet=A páxina solicitada co id %s aínda non ten contido ou a caché file.tpl.php foi eliminada. Edite o contido da páxina para solucionar isto.
+SiteDeleted=Eliminouse o sitio web '%s'
+PageContent=Páxina/Contedor
+PageDeleted=Eliminouse a páxina/Contedor '%s' do sitio web %s
+PageAdded=Engadiuse a páxina/Contedor '%s'
+ViewSiteInNewTab=Ver o sitio nunha nova lapela
+ViewPageInNewTab=Ver a páxina nunha nova lapela
+SetAsHomePage=Establecer como páxina de inicio
+RealURL=URL real
+ViewWebsiteInProduction=Ver o sitio web usando URL de inicio
+SetHereVirtualHost=<u> Usar con Apache/NGinx/... </u> <br> Cree no seu servidor web (Apache, Nginx, ...) un host virtual adicado con PHP habilitado e un directorio raíz en <br > <strong>%s </strong>
+ExampleToUseInApacheVirtualHostConfig=Exemplo para usar na configuración do host virtual Apache:
+YouCanAlsoTestWithPHPS=<u> Usar con servidor incorporado PHP </u> <br> No entorno de desenvolvemento, pode que prefira probar o sitio co servidor web incorporado PHP (é preciso PHP 5.5) executando <br> <strong> php -S 0.0.0.0:8080 -t %s </strong>
+YouCanAlsoDeployToAnotherWHP=<u> Execute o seu sitio web con outro provedor de hospedaxe Dolibarr </u> <br> Se non ten un servidor web como Apache ou NGinx dispoñible en internet, pode exportar e importar o seu sitio web a outro Dolibarr por outro provedor de hospedaxe Dolibarr que proporciona unha integración completa co módulo do sitio web. Pode atopar unha lista dalgúns provedores de hospedaxe Dolibarr en <a href="https://saas.dolibarr.org" target="_blank"> https://saas.dolibarr.org </a>
+CheckVirtualHostPerms=Comprobe tamén que o servidor virtual ten permiso <strong>%s </strong> para ficheiros en <br> <strong>%s </strong>
 ReadPerm=Lido
-WritePerm=Write
-TestDeployOnWeb=Test/deploy on web
-PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
-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 URL of pages are not user friendly and start with 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 point on directory<br><strong>%s</strong><br>then enter the name of this virtual server and click on the other preview button.
-VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
-NoPageYet=No pages yet
-YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
-SyntaxHelp=Help on specific syntax tips
-YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+WritePerm=Escribe
+TestDeployOnWeb=Probar/despregar na web
+PreviewSiteServedByWebServer=<u> Previsualizar %s nunha nova pestana. </u> <br> <br> O %s será servido por un servidor web externo (como Apache, Nginx, IIS). Debe instalar e configurar este servidor antes para apuntar ao directorio: <br> <strong>%s </strong> <br> URL ofrecido por un servidor externo: <br> <strong>%s </strong>
+PreviewSiteServedByDolibarr=<u> Previsualizar %s nunha nova lapela. </u> <br> <br> O servidor Dolibarr servirá o %s polo que non precisa instalar ningún servidor web adicional (como Apache, Nginx, IIS). <br> O inconveniente é que o URL das páxinas non é fácil de usar e empeza co camiño do Dolibarr. <br> URL servido por Dolibarr: <br> <strong>%s </strong> <br> < br> Para usar o seu propio servidor web externo para servir este sitio web, cree un servidor virtual no seu servidor web que apunte no directorio <br> <strong>%s </strong> <br> e logo introduza o nome deste servidor virtual e faga clic no outro botón de vista previa.
+VirtualHostUrlNotDefined=O URL do host virtual ofrecido por un servidor web externo non está definido
+NoPageYet=Aínda non hai páxinas
+YouCanCreatePageOrImportTemplate=Pode crear unha nova páxina ou importar un modelo de sitio web completo
+SyntaxHelp=Axuda sobre consellos específicos de sintaxe
+YouCanEditHtmlSourceckeditor=Pode editar o código fonte HTML empregando o botón "Fonte" do editor.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Pode incluír código PHP nesta fonte empregando etiquetas <strong>&lt;?php ?&gt;</strong>. Están dispoñibles as seguintes variables: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> Tamén podes incluír contido doutra páxina/contedor coa seguinte sintaxe: <br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span>  Pode facer unha redirección a outra páxina / contedor coa seguinte sintaxe (Nota: non publique ningún contido antes dunha redirección): <br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span>  Para engadir unha ligazón a outra páxina, use a sintaxe: :<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> Para incluír unha <strong> ligazón para descargar </strong> un ficheiro almacenado no directorio <strong> documentos </strong>, use o envoltorio <strong> document.php</strong> wrapper:<br>Exemplo, para un ficheiro en documentos / ecm (hai que rexistralo), a sintaxe é :<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Para un ficheiro en documentos/medios (abrir o directorio para acceso público), a sintaxe é: <br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Para un ficheiro compartido con unha ligazón para compartir (acceso aberto empregando a chave hash para compartir ficheiro), a sintaxe é: <br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> Para incluír unha <strong> imaxe </strong> almacenada no directorio <strong> documentos </strong>, use o envoltorio <strong>viewimage.php</strong> <br>Exemplo, para unha imaxe en documentos/medios (directorio aberto para acceso público), a sintaxe é:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSource2=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
+YouCanEditHtmlSource2=Para unha imaxe compartida cunha ligazón de uso compartido (acceso aberto mediante a chave hash para compartir ficheiro), a sintaxe é: <br><strong>&lt;img src =" viewimage.php? Hashp=12345679012 ..."&gt;<br></strong>
+YouCanEditHtmlSourceMore=<br>Máis exemplos de código HTML ou dinámico dispoñibles na <a href="%s" target="_blank">documentación wiki</a><br>
+ClonePage=Clonar páxina/contedor
+CloneSite=Clonar sitio
+SiteAdded=Sitio web engadido
+ConfirmClonePage=Introduza o código/alias da nova páxina e se é unha tradución da páxina clonada.
+PageIsANewTranslation=A nova páxina é unha tradución da páxina actual?
+LanguageMustNotBeSameThanClonedPage=Vostede clona unha páxina como tradución. O idioma da nova páxina debe ser diferente do idioma da páxina de orixe.
+ParentPageId=ID da páxina principal
+WebsiteId=ID do sitio web
+CreateByFetchingExternalPage=Crear páxina/contedor recuperando páxina desde un URL externo ...
+OrEnterPageInfoManually=Ou crea a páxina desde cero ou a partir dun modelo de páxina ...
+FetchAndCreate=Obter e crear
+ExportSite=Exportar sitio web
+ImportSite=Importar prantilla de sitio web
+IDOfPage=Id da páxina
 Banner=Banner
-BlogPost=Blog post
-WebsiteAccount=Website account
+BlogPost=Entrada no blog
+WebsiteAccount=Conta do sitio web
 WebsiteAccounts=Contas do sitio web
-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=Include 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
+AddWebsiteAccount=Crear unha conta de sitio web
+BackToListForThirdParty=Votar á listaxe do terceiros
+DisableSiteFirst=Desactivar primeiro o sitio web
+MyContainerTitle=Título do sitio web
+AnotherContainer=Isto é como incluír contido doutra páxina/contedor (pode ter un erro aquí se activa o código dinámico porque o subcontedor incrustado pode que non exista)
+SorryWebsiteIsCurrentlyOffLine=Sentímolo, este sitio web está actualmente fóra de liña. Por favor, volte máis tarde ...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Activar a táboa de contas do sitio web
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Habilite a táboa para almacenar as contas do sitio web (inicio de sesión/contrasinal) para cada sitio web/terceiro
+YouMustDefineTheHomePage=Primeiro debe definir a páxina de inicio predeterminada
+OnlyEditionOfSourceForGrabbedContentFuture=Aviso: a creación dunha páxina web importando unha páxina web externa está reservada a usuarios experimentados. Dependendo da complexidade da páxina de orixe, o resultado da importación pode diferir do orixinal. Tamén se a páxina de orixe usa estilos CSS comúns ou javascript en conflito, pode rachar o aspecto ou as características do editor de sitios web cando se traballa nesta páxina. Este método é un xeito máis rápido de crear unha páxina, pero recoméndase crear a súa nova páxina desde cero ou a partir dun modelo de páxina suxerido. <br> Teña en conta tamén que é posible que o editor en liña non funcione correctamente cando se usa nunha páxina externa.
+OnlyEditionOfSourceForGrabbedContent=Só é posible a edición de orixe HTML cando se capturou contido dun sitio externo
+GrabImagesInto=Toma tamén imaxes atopadas en css e páxina.
+ImagesShouldBeSavedInto=As imaxes deberían gardarse no directorio
+WebsiteRootOfImages=Directorio raíz para as imaxes do sitio web
+SubdirOfPage=Subdirectorio adicado á páxina
+AliasPageAlreadyExists=A páxina de alias <strong>%s </strong> xa existe
+CorporateHomePage=Páxina de inicio da empresa
+EmptyPage=Páxina baleira
+ExternalURLMustStartWithHttp=O URL externo debe comezar con http:// ou https://
+ZipOfWebsitePackageToImport=Cargue o ficheiro Zip do paquete de modelos do sitio web
+ZipOfWebsitePackageToLoad=ou Escolla un paquete de modelo de sitio web incrustado dispoñible
+ShowSubcontainers=Mostrar contido dinámico
+InternalURLOfPage=URL interno da páxina
+ThisPageIsTranslationOf=Esta páxina/contedor é unha tradución de
+ThisPageHasTranslationPages=Esta páxina/contedor ten tradución
+NoWebSiteCreateOneFirst=Aínda non se creou ningún sitio web. Cree un primeiro.
+GoTo=Ir a
+DynamicPHPCodeContainsAForbiddenInstruction=Engade un código PHP dinámico que contén a instrución PHP '<strong>%s </strong>' que está prohibida por defecto como contido dinámico (ver as opcións ocultas WEBSITE_PHP_ALLOW_xxx para aumentar a lista de comandos permitidos).
+NotAllowedToAddDynamicContent=Non ten permiso para engadir ou editar contido dinámico PHP en sitios web. Solicite permiso ou simplemente manteña o código nas etiquetas PHP sen modificar.
+ReplaceWebsiteContent=Buscar ou substituír contido do sitio web
+DeleteAlsoJs=¿Eliminar tamén todos os ficheiros javascript específicos deste sitio web?
+DeleteAlsoMedias=¿Quere eliminar tamén todos os ficheiros multimedia específicos deste sitio web?
+MyWebsitePages=Páxinas do sitio web
+SearchReplaceInto=Buscar|Substituir por
+ReplaceString=Nova cadea
+CSSContentTooltipHelp=Introduza aquí contido CSS. Para evitar calquera conflito co CSS da aplicación, asegúrese de antepoñer toda a declaración coa clase .bodywebsite. Por exemplo: <br> <br> #mycssselector, input.myclass:hover {...} <br> debe ser <br> .bodywebsite #mycssselector,.bodywebsite input.myclass:hover {...} <br> <br> Nota: Se ten un ficheiro grande sen este prefixo, pode usar "lessc" para convertelo para engadir o prefixo .bodywebsite en todas partes.
+LinkAndScriptsHereAreNotLoadedInEditor=Aviso: este contido só se emite cando se accede ao sitio desde un servidor. Non se usa no modo de edición, polo que se precisa cargar ficheiros javascript tamén no modo de edición, só ten que engadir a súa etiqueta 'script src=...' á páxina.
+Dynamiccontent=Mostra dunha páxina con contido dinámico
+ImportSite=Importar prantilla de sitio web
+EditInLineOnOff=O modo 'Editar en liña' é %s
+ShowSubContainersOnOff=O modo para executar "contido dinámico" é %s
+GlobalCSSorJS=Ficheiro global CSS/JS/Header do sitio web
+BackToHomePage=Voltar á páxina de inicio ...
+TranslationLinks=Ligazóns de tradución
+YouTryToAccessToAFileThatIsNotAWebsitePage=Tenta acceder a unha páxina que non está dispoñible. <br> (ref =%s, type =%s, status =%s)
+UseTextBetween5And70Chars=Para boas prácticas de SEO, use un texto de entre 5 e 70 caracteres
+MainLanguage=Idioma principal
+OtherLanguages=​​ Outros idiomas
+UseManifest=Proporciona un ficheiro manifest.json
+PublicAuthorAlias=​​ Alias ​​de autor público
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Os idiomas dispoñibles defínense nas propiedades do sitio web
+ReplacementDoneInXPages=Substitución feita en %s páxinas ou contedores
 RSSFeed=Fíos RSS
-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
+RSSFeedDesc=Pode obter unha fonte RSS dos últimos artigos co tipo 'blogpost' usando este URL
+PagesRegenerated=%s páxina(s)/contedor(es) rexenerados
+RegenerateWebsiteContent=Rexenerar ficheiros de caché do sitio web
+AllowedInFrames=Permitido en marcos
+DefineListOfAltLanguagesInWebsiteProperties=Define a listaxe de todos os idiomas dispoñibles nas propiedades do sitio web.
diff --git a/htdocs/langs/gl_ES/withdrawals.lang b/htdocs/langs/gl_ES/withdrawals.lang
index 396c348cb5f..595d3694f5b 100644
--- a/htdocs/langs/gl_ES/withdrawals.lang
+++ b/htdocs/langs/gl_ES/withdrawals.lang
@@ -1,148 +1,152 @@
 # 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
+CustomersStandingOrdersArea=Área domiciliacións
+SuppliersStandingOrdersArea=Área domiciliacións
+StandingOrdersPayment=Domiciliacións
 StandingOrderPayment=Domiciliación
-NewStandingOrder=New direct debit order
-NewPaymentByBankTransfer=New payment by credit transfer
+NewStandingOrder=Nova domiciliación
+NewPaymentByBankTransfer=Novo pagamenyo por transferencia
 StandingOrderToProcess=A procesar
-PaymentByBankTransferReceipts=Credit transfer orders
-PaymentByBankTransferLines=Credit transfer order lines
+PaymentByBankTransferReceipts=Solicitudes de transferencia
+PaymentByBankTransferLines=Liñas de ordes de transferencia
 WithdrawalsReceipts=Domiciliacións
 WithdrawalReceipt=Domiciliación
-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
+BankTransferReceipts=Solicitudes de transferencia
+BankTransferReceipt=Ordes 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
+CreditTransferLine=Liña de orde de transferencia
+WithdrawalsLines=Liñas de ordes de domiciliación
+CreditTransferLines=Liñas de ordes de transferencia
+RequestStandingOrderToTreat=Peticións de domiciliacións a procesar
+RequestStandingOrderTreated=Peticións de domiciliacións procesadas
+RequestPaymentsByBankTransferToTreat=Solicitudes de transferencia a tramitar
+RequestPaymentsByBankTransferTreated=Solicitudes de transferencia a procesar
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Aínda non é posible. O estado da domiciliación debe ser 'abonada' antes de poder realizar devolucións as súas líñas
+NbOfInvoiceToWithdraw=Nº de facturas pendentes de domiciliación
+NbOfInvoiceToWithdrawWithInfo=Número de facturas agardando domiciliación para clientes que teñen o seu número de conta definida
+NbOfInvoiceToPayByBankTransfer=Nº de facturas de provedores agardando un pagamento mediante transferencia 
+SupplierInvoiceWaitingWithdraw=Factura de provedor agardando pagamento mediante transferencia
+InvoiceWaitingWithdraw=Facturas agardando domiciliación
+InvoiceWaitingPaymentByBankTransfer=Factura agardando transferencia
+AmountToWithdraw=Cantidade a domiciliar
+NoInvoiceToWithdraw=Non hai ningunha factura aberta para '%s' agardando. Vaia á lapela '%s' da tarxeta de factura para facer unha solicitude.
+NoSupplierInvoiceToWithdraw=Non hai ningunha factura do provedor con "Solicitudes de crédito" abertas. Vaia á pestana '%s' da tarxeta da factura para facer unha solicitude.
+ResponsibleUser=Usuario responsable das domiciliacións
+WithdrawalsSetup=Configuración das domiciliacións
+CreditTransferSetup=Configuración das transferencias
+WithdrawStatistics=Estatísticas de domiciliacións
+CreditTransferStatistics=Estatísticas das transferencias
 Rejects=Devolucións
-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
-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>.
-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=Enviado
-StatusDebited=Debited
-StatusCredited=Credited
-StatusPaid=Pagada
-StatusRefused=Rexeitado
-StatusMotif0=Unspecified
-StatusMotif1=Insufficient funds
-StatusMotif2=Request contested
-StatusMotif3=No direct debit payment order
-StatusMotif4=Pedido de cliente
-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
+LastWithdrawalReceipt=As %s últimas domiciliacións
+MakeWithdrawRequest=Realizar unha petición de domiciliación
+MakeBankTransferOrder=Realizar unha petición de transferencia
+WithdrawRequestsDone=%s domiciliacións rexistradas
+BankTransferRequestsDone=%s transferencias rexistradas
+ThirdPartyBankCode=Código banco do terceiro
+NoInvoiceCouldBeWithdrawed=Non se facturou 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.
+ClassCredited=Clasificar como "Abonada"
+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
+Send=Enviar
+Lines=Líñas
+StandingOrderReject=Emitir unha devolución
+WithdrawsRefused=Devolución de domiciliación
+WithdrawalRefused=Retirada rexeitada
+CreditTransfersRefused=Transferencia rexeitada
+WithdrawalRefusedConfirm=¿Está certo de querer crear unha devolución de domiciliación para a empresa
+RefusedData=Data de devolución
+RefusedReason=Motivo de devolución
+RefusedInvoicing=Facturación da devolución
+NoInvoiceRefused=Non facturar a devolución
+InvoiceRefused=Factura rexeitada (Cargar os gastos ao cliente)
+StatusDebitCredit=Estado de débito/crédito
+StatusWaiting=Agardando
+StatusTrans=Enviada
+StatusDebited=Adebedado
+StatusCredited=Abonada
+StatusPaid=Paga
+StatusRefused=Rexeitada
+StatusMotif0=Non especificado
+StatusMotif1=Fondos insuficintes
+StatusMotif2=Solicitude rexeitada
+StatusMotif3=Sen domiciliacións
+StatusMotif4=Pedimento do cliente
+StatusMotif5=Conta inexistente
+StatusMotif6=Conta sen saldo
+StatusMotif7=Decisión xudicial
+StatusMotif8=Outro motivo
+CreateForSepaFRST=Domiciliar (SEPA FRST)
+CreateForSepaRCUR=Domiciliar (SEPA RCUR)
+CreateAll=Domiciliar (todas)
+CreateFileForPaymentByBankTransfer=Crear un ficheiro para a transferencia
+CreateSepaFileForPaymentByBankTransfer=Crear un ficheiro de transferencia (SEPA)
+CreateGuichet=Só oficina
+CreateBanque=Só banco
+OrderWaiting=Agardando proceso
+NotifyTransmision=Envío de domiciliación
+NotifyCredit=Abono de domiciliación
+NumeroNationalEmetter=Número Nacional do Emisor
+WithBankUsingRIB=Para as contas bancarias que utilizan RIB
+WithBankUsingBANBIC=Para as contas bancarias que utilizan o código BAN/BIC/SWIFT
+BankToReceiveWithdraw=Conta bancaria para recibir a domiciliación
+BankToPayCreditTransfer=Conta bancaria empregada como fonte de pagamentos
+CreditDate=Abonada o
+WithdrawalFileNotCapable=Non se pode xerar o ficheiro de recibo de retirada para o seu país %s (o seu país non está incluido)
+ShowWithdraw=Ver domiciliación
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Porén, se a factura ten polo menos unha orde de pagamento por domiciliación bancaria aínda non procesada, non se configurará como paga para permitir a xestión previa da retirada.
+DoStandingOrdersBeforePayments=Esta lapela permítelle solicitar unha orde de pagamento por domiciliación bancaria. Unha vez feito isto, entra no menú Banco-> Pago mediante domiciliación bancaria para xerar e xestionar a orde de domiciliación bancaria. Cando se pecha a orde de domiciliación bancaria, o pagamento das facturas rexistrarase automaticamente e as facturas pecharanse se o resto do pago é nulo.
+DoCreditTransferBeforePayments=Esta lapela permítelle solicitar unha orde de transferencia. Unha vez feito isto, entra no menú Banco-> Pago mediante transferencia  para xerar e xestionar a orde de transferencia. Cando se pecha a orde de transferencia, o pagamento das facturas rexistrarase automaticamente e as facturas pecharanse se o resto do pago é nulo.
+WithdrawalFile=Ficheiro de domiciliación
+CreditTransferFile=Ficheiro de transferencia
+SetToStatusSent=Clasificar como "Ficheiro enviado"
+ThisWillAlsoAddPaymentOnInvoice=Isto tamén rexistrará os pagos nas facturas e clasificaos como "Pagados" se queda por pagar é nulo
+StatisticsByLineStatus=Estatísticas por estado das liñas
+RUM=RUM
+DateRUM=Data da sinatura do mandato
+RUMLong=Referencia única do mandato
+RUMWillBeGenerated=Se está baleiro, o número RUM /Referencia Única do Mandato) xérase unha vez gardada a información da conta bancaria
+WithdrawMode=Modo domiciliación (FRST o RECUR)
+WithdrawRequestAmount=Importe da domiciliación
+BankTransferAmount=Importe da solicitude
+WithdrawRequestErrorNilAmount=Non é posible crear unha domiciliación sen importe
+SepaMandate=Mandato SEPA
+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 de 8 semanas a partires 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.
+CreditorIdentifier=Identificador Acredor
+CreditorName=Nome acredor
+SEPAFillForm=(B) Cubra todos os campos marcados con *
+SEPAFormYourName=O seu nome
+SEPAFormYourBAN=IBAN da  súa conta bancaria
+SEPAFormYourBIC=BIC do seu banco
+SEPAFrstOrRecur=Tipo de pagamento
+ModeRECUR=Pago recorrente
+ModeFRST=Pago único
+PleaseCheckOne=Escolla só un
+CreditTransferOrderCreated=Creouse a orde de transferencia %s
+DirectDebitOrderCreated=Domiciliación %s creada
+AmountRequested=Importe solicitado
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
-ExecutionDate=Execution date
-CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
-END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
-USTRD="Unstructured" SEPA XML tag
-ADDDAYS=Add days to Execution Date
-NoDefaultIBANFound=No default IBAN found for this third party
+ExecutionDate=Data de execución
+CreateForSepa=Crear ficheiro de domiciliación bancaria
+ICS=Identificador de acreedor CI
+ICSTransfer=Identificador de acredor CI para transferencia bancaria
+END_TO_END=Etiqueta XML SEPA "EndToEndId" - ID único asignada por transacción
+USTRD=Etiqueta SEPA XML "Unstructured"
+ADDDAYS=Engadir días á data de execución
+NoDefaultIBANFound=Non atopouse o IBAN deste terceiro
 ### 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.
+InfoCreditSubject=Abono de domiciliación %s polo banco
+InfoCreditMessage=A orde de domiciliación %s foi abonada polo banco<br>Data de abono: %s
+InfoTransSubject=Envío de domiciliación %s ao banco
+InfoTransMessage=A orde de domiciliación %s foi enviada ao banco por %s %s.<br><br>
+InfoTransData=Importe: %s<br>Método: %s<br>Data: %s
+InfoRejectSubject=Domiciliación devolta
+InfoRejectMessage=Bos días:<br><br>a domiciliación da factura %s por conta da empresa %s, cun importe de %s foi devolta polo banco.<br><br>--<br>%s
+ModeWarning=Non estableceuse a opción de modo real, deteremonos despois desta simulación
+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
diff --git a/htdocs/langs/gl_ES/workflow.lang b/htdocs/langs/gl_ES/workflow.lang
index 299be277e1d..7be56785df7 100644
--- a/htdocs/langs/gl_ES/workflow.lang
+++ b/htdocs/langs/gl_ES/workflow.lang
@@ -1,23 +1,25 @@
 # Dolibarr language file - Source file is en_US - workflow
-WorkflowSetup=Workflow module setup
-WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
-ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+WorkflowSetup=Configuración do modulo Fluxo de Traballo
+WorkflowDesc=Este módulo permite algunhas accíóns automátizadas. Por defecto, o fluxo de traballo está aberto (podense facer cousas na orde desexada) mais aquí pode activar algunhas accións automátizadas.
+ThereIsNoWorkflowToModify=No hai dispoñibles modificacións de fluxo de traballo nos módulos activados.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crear automáticamente un pedimento de cliente despois da sinatura dun orzamento (o novo pedimento terá o mesmo importe que o orzamento)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crear automáticamente una factura a cliente despois da sinatura dun orzamento (a nova factura terá o mesmo importe que o orzamento)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear unha factura a cliente automáticamente despois de validar un contrato
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crear automáticamente unha factura a cliente despois de pechar o pedimento de cliente ( nova factura terá o mesmo importe que o pedimento)
 # 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_BILLED_PROPAL=Clasificar orzamento orixe como facturado cando o pedimento do cliente sexa marcado como facturado (e se o importe do pedimento é igual á suma dos importes dos orzamentos ligados)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasificar o orzamento orixe como facturados cando a factura ao cliente sexa validada (e se o importe da factura é igual á suma dos importes dos orzamentos ligados)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasificar pedimento de cliente orixe como facturado cando a factura ao cliente sexa validada (e se o importe da factura é igual á suma dos importes dos pedimentos ligados)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasificar pedimento de cliente orixe como facturado cando a factura ao cliente sexa marcada como pagada (e se o importe da factura é igual á suma dos importes dos pedimentos ligados)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasificar automáticamente o pedimento orixe como enviado cando o envío sexa validado (e se a cantidade enviada por todos os envíos é a mesma que o pedimento a actualizar)
 # Autoclassify purchase order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasificar o orzamento ligado de provedor orixe como facturado cando a factura de provedor sexa validada (e se o importe da factura é igual á suma do importe dos orzamentos ligados)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasificar o pedimento orixe a provedor ligado como facturado cando a factura de provedor sexa validada (e se o importe da factura é igual á suma do importe dos pedimentos ligados)
+descWORKFLOW_BILL_ON_RECEPTION=Clasificar recepcións a "facturado" cando sexa validado un pedimento de provedor ligado
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
-AutomaticCreation=Automatic creation
-AutomaticClassification=Automatic classification
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Pecha todas as intervencións ligadas ao ticket cando o ticket está pechado
+AutomaticCreation=Creación automática
+AutomaticClassification=Clasificación automática
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Clasifique o envío orixe ligado como pechado cando a factura ao cliente sexa validada
diff --git a/htdocs/langs/gl_ES/zapier.lang b/htdocs/langs/gl_ES/zapier.lang
index a92ff38f3ce..64d3db80452 100644
--- a/htdocs/langs/gl_ES/zapier.lang
+++ b/htdocs/langs/gl_ES/zapier.lang
@@ -26,4 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier para modulo de Dolibarr
 # Admin page
 #
 ZapierForDolibarrSetup = Configuración de Zapier para Dolibarr
-ZapierDescription=Interface with Zapier
+ZapierDescription=Interfaz con Zapier
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index 3211a0b62df..9e084932477 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index e630e1c2258..73aaf8f75be 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -56,6 +56,8 @@ GUISetup=להציג
 SetupArea=הגדרת
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=טופס לבדוק העלאת קובץ (על פי ההגדרה)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=הערה: כן, הוא יעיל רק אם <b>%s</b> מודול מופעלת
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=הצג תצוגה מקדימה
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=לא זמין תצוגה מקדימה
 ThemeCurrentlyActive=פעיל כרגע הנושא
-CurrentTimeZone=אזור PHP (שרת)
 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=מרחב
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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=לטהר עכשיו
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 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>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=רשימה של ספריות ותבניות OpenDocument
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=דוגמאות תחביר: <br> c: \\ mydir <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> לדעת איך ליצור תבניות ODT המסמכים שלך, לפני אחסונם ספריות אלה, קרא את התיעוד wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=עמדת שם / שם משפחה
@@ -406,7 +408,7 @@ UrlGenerationParameters=פרמטרים כדי להבטיח את כתובות ה
 SecurityTokenIsUnique=השתמש פרמטר ייחודי securekey עבור כל כתובת אתר
 EnterRefToBuildUrl=הזן התייחסות %s אובייקט
 GetSecuredUrl=לקבל את כתובת האתר מחושב
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ ServiceSetup=מודול שירותי התקנה
 ProductServiceSetup=מוצרים ושירותים ההתקנה מודולים
 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
+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 the language of the third party
+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=ברקוד מסוג ברירת מחדל עבור מוצרים
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=תפריט חדש
 MenuHandler=תפריט המטפל
 MenuModule=מקור מודול
-HideUnauthorizedMenu= הסתר תפריטים בלתי מורשים (אפור)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=מזהה התפריט
 DetailMenuHandler=תפריט המטפל היכן להציג תפריט חדש
 DetailMenuModule=שם מודול אם סעיף מתפריט באים מודול
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=רוכסן
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang
index 9500a5b8b2e..81a23238550 100644
--- a/htdocs/langs/he_IL/banks.lang
+++ b/htdocs/langs/he_IL/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/he_IL/blockedlog.lang b/htdocs/langs/he_IL/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/he_IL/blockedlog.lang
+++ b/htdocs/langs/he_IL/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/he_IL/boxes.lang b/htdocs/langs/he_IL/boxes.lang
index 5fe5dc964a7..bc3d4ba7b02 100644
--- a/htdocs/langs/he_IL/boxes.lang
+++ b/htdocs/langs/he_IL/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+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.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/he_IL/cashdesk.lang b/htdocs/langs/he_IL/cashdesk.lang
index 0e214defc7a..ddc13c48ea3 100644
--- a/htdocs/langs/he_IL/cashdesk.lang
+++ b/htdocs/langs/he_IL/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+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
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/he_IL/categories.lang b/htdocs/langs/he_IL/categories.lang
index c8bfcef77e2..d01b7fcecb9 100644
--- a/htdocs/langs/he_IL/categories.lang
+++ b/htdocs/langs/he_IL/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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=משלימים תכונות
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
index 2537b7e9b2f..d1b5cde4dac 100644
--- a/htdocs/langs/he_IL/companies.lang
+++ b/htdocs/langs/he_IL/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index 3dd45972e01..6635b8b2829 100644
--- a/htdocs/langs/he_IL/compta.lang
+++ b/htdocs/langs/he_IL/compta.lang
@@ -111,7 +111,7 @@ 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 ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/he_IL/cron.lang b/htdocs/langs/he_IL/cron.lang
index d2da7ded67e..2ebdda1e685 100644
--- a/htdocs/langs/he_IL/cron.lang
+++ b/htdocs/langs/he_IL/cron.lang
@@ -6,14 +6,15 @@ 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
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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 environement you can use Scheduled task tools 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
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+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
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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
@@ -76,8 +78,14 @@ 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+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/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 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.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/he_IL/exports.lang b/htdocs/langs/he_IL/exports.lang
index 2dcf4317e00..a0eb7161ef2 100644
--- a/htdocs/langs/he_IL/exports.lang
+++ b/htdocs/langs/he_IL/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 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.
@@ -131,3 +133,4 @@ 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/he_IL/mails.lang b/htdocs/langs/he_IL/mails.lang
index 041207e7c48..8e5376e51f9 100644
--- a/htdocs/langs/he_IL/mails.lang
+++ b/htdocs/langs/he_IL/mails.lang
@@ -92,6 +92,7 @@ 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
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=הודעות
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index f6d4759a902..05e91914906 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
+CurrentTimeZone=אזור PHP (שרת)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Value
 PersonalValue=Personal value
 NewObject=New %s
 NewValue=New value
+OldValue=Old value %s
 CurrentValue=Current value
 Code=Code
 Type=Type
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ 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
@@ -671,7 +678,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/he_IL/modulebuilder.lang b/htdocs/langs/he_IL/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/he_IL/modulebuilder.lang
+++ b/htdocs/langs/he_IL/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/he_IL/mrp.lang b/htdocs/langs/he_IL/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/he_IL/mrp.lang
+++ b/htdocs/langs/he_IL/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
index 374c864f7dc..d8012ef5cac 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index fe9deabbb4e..d9cb3f15d68 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -108,7 +108,8 @@ 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=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index c69aa3209c0..22aa61251a1 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -76,15 +76,16 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/he_IL/recruitment.lang b/htdocs/langs/he_IL/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/he_IL/recruitment.lang
+++ b/htdocs/langs/he_IL/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/he_IL/sendings.lang b/htdocs/langs/he_IL/sendings.lang
index 80e3aa3af9c..17d8f937b82 100644
--- a/htdocs/langs/he_IL/sendings.lang
+++ b/htdocs/langs/he_IL/sendings.lang
@@ -30,6 +30,7 @@ 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
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang
index 8907a4d5091..5d1abeffa0d 100644
--- a/htdocs/langs/he_IL/stocks.lang
+++ b/htdocs/langs/he_IL/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/he_IL/ticket.lang b/htdocs/langs/he_IL/ticket.lang
index a8353b66744..39e0b9f8175 100644
--- a/htdocs/langs/he_IL/ticket.lang
+++ b/htdocs/langs/he_IL/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=אחר
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/he_IL/website.lang b/htdocs/langs/he_IL/website.lang
index bc14948946c..e476cd982a3 100644
--- a/htdocs/langs/he_IL/website.lang
+++ b/htdocs/langs/he_IL/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/he_IL/withdrawals.lang b/htdocs/langs/he_IL/withdrawals.lang
index 114a8d9dd6c..059b3451c11 100644
--- a/htdocs/langs/he_IL/withdrawals.lang
+++ b/htdocs/langs/he_IL/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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/he_IL/workflow.lang b/htdocs/langs/he_IL/workflow.lang
index 299be277e1d..494a0424a75 100644
--- a/htdocs/langs/he_IL/workflow.lang
+++ b/htdocs/langs/he_IL/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/hi_IN/accountancy.lang b/htdocs/langs/hi_IN/accountancy.lang
index 0afe8f7a50d..46d584fa5d7 100644
--- a/htdocs/langs/hi_IN/accountancy.lang
+++ b/htdocs/langs/hi_IN/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=यह सेवा
 ThisProduct=यह उत्पाद
 DefaultForService=सेवा के लिए डिफ़ॉल्ट
 DefaultForProduct=उत्पाद के लिए डिफ़ॉल्ट
+ProductForThisThirdparty=Product for this thirdparty
+ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=सुझाव नहीं दे सकते
 AccountancySetupDoneFromAccountancyMenu=लेखाकर्म का अधिकांश सेटअप मेनू से किया जाता है %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/hi_IN/admin.lang b/htdocs/langs/hi_IN/admin.lang
index 976284cbff1..5adf390f9fa 100644
--- a/htdocs/langs/hi_IN/admin.lang
+++ b/htdocs/langs/hi_IN/admin.lang
@@ -56,6 +56,8 @@ 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.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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.
@@ -256,6 +257,7 @@ 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.
@@ -375,7 +377,7 @@ 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:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+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
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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
+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 the language of the third party
+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
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+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
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/hi_IN/banks.lang b/htdocs/langs/hi_IN/banks.lang
index 9500a5b8b2e..81a23238550 100644
--- a/htdocs/langs/hi_IN/banks.lang
+++ b/htdocs/langs/hi_IN/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/hi_IN/blockedlog.lang b/htdocs/langs/hi_IN/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/hi_IN/blockedlog.lang
+++ b/htdocs/langs/hi_IN/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/hi_IN/boxes.lang b/htdocs/langs/hi_IN/boxes.lang
index d6fd298a3a7..9a751483fb1 100644
--- a/htdocs/langs/hi_IN/boxes.lang
+++ b/htdocs/langs/hi_IN/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+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.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/hi_IN/cashdesk.lang b/htdocs/langs/hi_IN/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/hi_IN/cashdesk.lang
+++ b/htdocs/langs/hi_IN/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+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
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/hi_IN/categories.lang b/htdocs/langs/hi_IN/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/hi_IN/categories.lang
+++ b/htdocs/langs/hi_IN/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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
diff --git a/htdocs/langs/hi_IN/companies.lang b/htdocs/langs/hi_IN/companies.lang
index e9f51f14885..1481398db45 100644
--- a/htdocs/langs/hi_IN/companies.lang
+++ b/htdocs/langs/hi_IN/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/hi_IN/compta.lang b/htdocs/langs/hi_IN/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/hi_IN/compta.lang
+++ b/htdocs/langs/hi_IN/compta.lang
@@ -111,7 +111,7 @@ 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 ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/hi_IN/cron.lang b/htdocs/langs/hi_IN/cron.lang
index 1de1251831a..2ebdda1e685 100644
--- a/htdocs/langs/hi_IN/cron.lang
+++ b/htdocs/langs/hi_IN/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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
@@ -46,6 +47,7 @@ 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
@@ -56,7 +58,7 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
@@ -82,3 +84,8 @@ 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/hi_IN/errors.lang b/htdocs/langs/hi_IN/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/hi_IN/errors.lang
+++ b/htdocs/langs/hi_IN/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 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.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/hi_IN/exports.lang b/htdocs/langs/hi_IN/exports.lang
index 3549e3f8b23..a0eb7161ef2 100644
--- a/htdocs/langs/hi_IN/exports.lang
+++ b/htdocs/langs/hi_IN/exports.lang
@@ -133,3 +133,4 @@ 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/hi_IN/mails.lang b/htdocs/langs/hi_IN/mails.lang
index 1235eef3b27..2d02c5ddcf9 100644
--- a/htdocs/langs/hi_IN/mails.lang
+++ b/htdocs/langs/hi_IN/mails.lang
@@ -92,6 +92,7 @@ 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
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/hi_IN/main.lang b/htdocs/langs/hi_IN/main.lang
index 50363abd476..7f67e16d9ea 100644
--- a/htdocs/langs/hi_IN/main.lang
+++ b/htdocs/langs/hi_IN/main.lang
@@ -28,7 +28,9 @@ 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
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Value
 PersonalValue=Personal value
 NewObject=New %s
 NewValue=New value
+OldValue=Old value %s
 CurrentValue=Current value
 Code=Code
 Type=Type
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ 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
@@ -671,7 +678,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/hi_IN/modulebuilder.lang b/htdocs/langs/hi_IN/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/hi_IN/modulebuilder.lang
+++ b/htdocs/langs/hi_IN/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/hi_IN/mrp.lang b/htdocs/langs/hi_IN/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/hi_IN/mrp.lang
+++ b/htdocs/langs/hi_IN/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/hi_IN/other.lang b/htdocs/langs/hi_IN/other.lang
index 54c0572d453..7a895bb1ca5 100644
--- a/htdocs/langs/hi_IN/other.lang
+++ b/htdocs/langs/hi_IN/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/hi_IN/products.lang b/htdocs/langs/hi_IN/products.lang
index 97db059594f..9ecc11ed93d 100644
--- a/htdocs/langs/hi_IN/products.lang
+++ b/htdocs/langs/hi_IN/products.lang
@@ -108,7 +108,8 @@ 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=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/hi_IN/projects.lang b/htdocs/langs/hi_IN/projects.lang
index baf0ecde17f..05aa1f5a560 100644
--- a/htdocs/langs/hi_IN/projects.lang
+++ b/htdocs/langs/hi_IN/projects.lang
@@ -76,15 +76,16 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/hi_IN/recruitment.lang b/htdocs/langs/hi_IN/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/hi_IN/recruitment.lang
+++ b/htdocs/langs/hi_IN/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/hi_IN/sendings.lang b/htdocs/langs/hi_IN/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/hi_IN/sendings.lang
+++ b/htdocs/langs/hi_IN/sendings.lang
@@ -30,6 +30,7 @@ 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
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/hi_IN/stocks.lang b/htdocs/langs/hi_IN/stocks.lang
index 660443bcded..a1f55010139 100644
--- a/htdocs/langs/hi_IN/stocks.lang
+++ b/htdocs/langs/hi_IN/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/hi_IN/ticket.lang b/htdocs/langs/hi_IN/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/hi_IN/ticket.lang
+++ b/htdocs/langs/hi_IN/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/hi_IN/website.lang b/htdocs/langs/hi_IN/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/hi_IN/website.lang
+++ b/htdocs/langs/hi_IN/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/hi_IN/withdrawals.lang b/htdocs/langs/hi_IN/withdrawals.lang
index 114a8d9dd6c..059b3451c11 100644
--- a/htdocs/langs/hi_IN/withdrawals.lang
+++ b/htdocs/langs/hi_IN/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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/hi_IN/workflow.lang b/htdocs/langs/hi_IN/workflow.lang
index 299be277e1d..494a0424a75 100644
--- a/htdocs/langs/hi_IN/workflow.lang
+++ b/htdocs/langs/hi_IN/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index d3f1ceacc61..f5ba4bd62f1 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Oznaka računa
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Broj komada
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 073e9232710..7e0ec932d8e 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Prikaz
 SetupArea=Postavke
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Obrazac za testiranje uploada datoteka (sukladno postavkama)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Napomena: DA je efektivno samo ako je modul <b>%s</b> omogućen
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Prikaži pregled
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Pregled nije dostupan
 ThemeCurrentlyActive=Tema trenutno aktivna
-CurrentTimeZone=Vremenska zona PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Razmak
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Trajno izbriši
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Obriši privremene datoteke
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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=Izbriši sada
 PurgeNothingToDelete=Nema mapa i datoteka za brisanje.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferirani partneri
 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>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=Popis mapa sa OpenDocument predlošcima
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Primjer:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Da bi ste saznali kako kreirati ODT predloške dokumenata, prije pohranjivanja istih u navedene mape, pročitajte wiki dokumentaciju na:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Pozicija Imena/Prezimena
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametri za osiguranje URL-a
 SecurityTokenIsUnique=Koristi jedinstven securekey parametar za svaki URL
 EnterRefToBuildUrl=Unesite referencu za objekt %s
 GetSecuredUrl=Traži izračunan URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Stara stopa PDV-a
 NewVATRates=Nova stopa PDV-a
 PriceBaseTypeToChange=Promjeni cijene sa baznom referentnom vrijednosti definiranoj na
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Anketa, Upitnik ili Glasanje
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Marže
-Module59000Desc=Modul za upravljanje maržama
+Module59000Desc=Module to follow margins
 Module60000Name=Provizije
 Module60000Desc=Modul za upravljanje provizijama
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Optimizacija pretrage
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ ServiceSetup=Podešavanje modula usluga
 ProductServiceSetup=Podešavanje modula Proizvoda i usluga
 NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
 ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
+DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
+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 the language of the third party
+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=Zadana vrsta barkoda za korištenje kod proizvoda
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Osobni izbornici nisu povezani na gornji izbornik
 NewMenu=Novi izbornik
 MenuHandler=Nosioc izbornika
 MenuModule=Izvorni modul
-HideUnauthorizedMenu= Sakrij neautorizirane izbornike (sivo)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=ID Izbornika
 DetailMenuHandler=Nosioc izbornika gdje da se prikaže novi izbornik
 DetailMenuModule=Naziv modula ako stavka izbornika dolazi iz modula
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=PBR
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang
index 722bbc6949d..6e93525512f 100644
--- a/htdocs/langs/hr_HR/banks.lang
+++ b/htdocs/langs/hr_HR/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/hr_HR/blockedlog.lang b/htdocs/langs/hr_HR/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/hr_HR/blockedlog.lang
+++ b/htdocs/langs/hr_HR/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/hr_HR/boxes.lang b/htdocs/langs/hr_HR/boxes.lang
index 91564430c76..62c1870fd62 100644
--- a/htdocs/langs/hr_HR/boxes.lang
+++ b/htdocs/langs/hr_HR/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Zadnjih %s izmjenjenih donacija
 BoxTitleLastModifiedExpenses=Zadnjih %s izmjenjenih izvještaja troškova
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Globalna aktivnost (računi, prijedlozi, nalozi)
 BoxGoodCustomers=Dobar kupac
 BoxTitleGoodCustomers=%s dobrih kupaca
+BoxScheduledJobs=Planirani poslovi
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Datum zadnjeg osvježavanja
 NoRecordedBookmarks=Nema definiranih oznaka.
@@ -92,8 +95,8 @@ LastXMonthRolling=Zadnja %s tekuća mjesece
 ChooseBoxToAdd=Dodaj prozorčić na početnu stranicu
 BoxAdded=Widget was added in your dashboard
 BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Računovodstvo
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/hr_HR/cashdesk.lang b/htdocs/langs/hr_HR/cashdesk.lang
index f03eb1340b0..ac1d97cc447 100644
--- a/htdocs/langs/hr_HR/cashdesk.lang
+++ b/htdocs/langs/hr_HR/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Broj računa
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/hr_HR/categories.lang b/htdocs/langs/hr_HR/categories.lang
index b3f785c8df7..38b81102ca5 100644
--- a/htdocs/langs/hr_HR/categories.lang
+++ b/htdocs/langs/hr_HR/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Sučelje kategorija projekata
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=Popis kategorija
+CatListAll=List of tags/categories (all types)
 NewCategory=Nova kategorija
 ModifCat=Promjeni kategoriju
 CatCreated=Kategorija kreirana
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=ID Kategorije
-CatSupList=List of vendor tags/categories
-CatCusList=Popis kategorija kupaca/potencijalnih kupaca
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Popis kategorija proizvoda
 CatMemberList=Popis kategorija članova
-CatContactList=Popis kategorija kontakta
-CatSupLinks=Veze između dobavljača i kategorija
+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=Veze između kupaca/potencijalnih kupaca i kategorija
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Veze izmeđi proizvoda/usluga i kategorija
-CatProJectLinks=Veze između projekata i kategorija
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Veze između projekata i kategorija
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Makni iz kategorije
 ExtraFieldsCategories=Dodatni atributi
 CategoriesSetup=Podešavanje kategorija
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index 70f428267e7..ab89dcbabc0 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Zaposlenici
 ProspectLevelShort=Potencijal
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index 35de89eb445..78940a5a086 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -111,7 +111,7 @@ Refund=Povrat
 SocialContributionsPayments=Plaćanja društveni/fiskalni porez
 ShowVatPayment=Prikaži PDV plaćanja
 TotalToPay=Ukupno za platiti
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+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=Konto kupca
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Jeste li sigurni da želite obrisati ovu uplatu
 ExportDataset_tax_1=Društveni i fiskalni porezi i plaćanja
 CalcModeVATDebt=Način <b>%sPDV na računovodstvene usluge%s</b>
 CalcModeVATEngagement=Način <b>%sPDV na prihode-troškove%s</b>
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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= Način <b>%sRE na računima kupaca - računima dobavljača%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Stanje prihoda i troškova, godišnji sažetak
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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=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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Računi za predujam nisu uključeni
 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=Izvještaj po RE komitenta
 LT2ReportByCustomersES=Izvještaj po IRPF komitenta
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/hr_HR/cron.lang b/htdocs/langs/hr_HR/cron.lang
index d91b7a5fb77..1f2d530e535 100644
--- a/htdocs/langs/hr_HR/cron.lang
+++ b/htdocs/langs/hr_HR/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Obriši planirani posao
 Permission23104 = Pokreni planirani posao
 # Admin
 CronSetup=Postavljanje upravljanja planiranih poslova
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Ili za provjeru i pokretanje specifičnog posla
+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=Sigurnosni ključ za URL za pokretanje cron zadataka
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=U Unix okolini potrebno je korisititi sljedeći crontab unos za pokretanje komande svakih 5 minuta
 CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Klasa %s ne sadrži niti jednu %s metodu
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Number of launches
 CronMaxRun=Maximum number of launches
 CronEach=Svakih
 JobFinished=Posao pokrenut i završen
+Scheduled=Scheduled
 #Page card
 CronAdd= Dodaj poslove
 CronEvery=Izvrši posao svaki
@@ -56,7 +58,7 @@ CronNote=Napomena
 CronFieldMandatory=Polja %s su obavezna
 CronErrEndDateStartDt=Datum kraja ne može biti prije datuma početka
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Omogući
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Onemogući
 CronTaskInactive=Ovaj posao je onemogućen
 CronId=ID
@@ -76,8 +78,14 @@ 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=Idite na izbornik "Home - Admin tools - Scheduled jobs" za prikaz i uređivanje planiranih poslova.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Posao onemogućen
 MakeLocalDatabaseDumpShort=Lakalni backup baze
 MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' or filename to build, number of backup files to keep
 WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+DATAPOLICYJob=Data cleaner and anonymizer
+JobXMustBeEnabled=Job %s must be enabled
+# 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/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index 8b017fff9cf..cf19fd01b31 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 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.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/hr_HR/exports.lang b/htdocs/langs/hr_HR/exports.lang
index f8f24af0ed9..f214e7f85dd 100644
--- a/htdocs/langs/hr_HR/exports.lang
+++ b/htdocs/langs/hr_HR/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Biblioteka
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Step
 FormatedImport=Čarobnjak za unos podataka
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -131,3 +133,4 @@ 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/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang
index 80155474705..2b7ce391248 100644
--- a/htdocs/langs/hr_HR/mails.lang
+++ b/htdocs/langs/hr_HR/mails.lang
@@ -92,6 +92,7 @@ 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
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Obavijesti
-NoNotificationsWillBeSent=Nema planiranih obavijesti za ovaj događaj i tvrtku
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Podatak
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 8ef879f459d..ad0c07d9405 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Nema predloška za taj tip e-pošte
 AvailableVariables=Dostupne zamjenske vrijednosti
 NoTranslation=Bez prijevoda
 Translation=Prijevod
+CurrentTimeZone=Vremenska zona PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Spis nije pronađen
 NoRecordDeleted=Spis nije izbrisan
 NotEnoughDataYet=Nedovoljno podataka
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Podatak spremljen
 RecordDeleted=Podatak obrisan
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Vrijednost
 PersonalValue=Osobna vrijednost
 NewObject=Novi%s
 NewValue=Nova vrijednost
+OldValue=Old value %s
 CurrentValue=Trenutna vrijednost
 Code=Oznaka
 Type=Vrsta
@@ -354,8 +359,8 @@ UnitPrice=Jedinična cijena
 UnitPriceHT=Jedinična cijena (bez poreza)
 UnitPriceHTCurrency=Jedinična cijena (bez poreza) (u valuti)
 UnitPriceTTC=Jedinična cijena
-PriceU=Jed. cijena
-PriceUHT=Jed. cijena
+PriceU=Jed. cij.
+PriceUHT=J.C. netto
 PriceUHTCurrency=J.C. (valuta)
 PriceUTTC=J.C. (s porezom)
 Amount=Iznos
@@ -391,7 +396,7 @@ TotalHTShort=Ukupno (bez poreza)
 TotalHT100Short=Total 100%% (excl.)
 TotalHTShortCurrency=Total (excl. in currency)
 TotalTTCShort=Ukupno s PDV-om
-TotalHT=Ukupno bez PDV-a
+TotalHT=Ukupno netto
 TotalHTforthispage=Ukupno (bez PDV-a) na ovoj stranici
 Totalforthispage=Ukupno na ovoj stranici
 TotalTTC=Ukupno s PDV-om
@@ -433,6 +438,7 @@ RemainToPay=Preostalo za platiti
 Module=Modul/Aplikacija
 Modules=Moduli/Aplikacije
 Option=Opcija
+Filters=Filters
 List=Popis
 FullList=Cijeli popis
 FullConversation=Cijeli razgovor
@@ -650,6 +656,7 @@ SupplierPreview=Prikaz dobavljača
 ShowCustomerPreview=Prikaži kupca
 ShowSupplierPreview=Prikaži dobavljača
 RefCustomer=Vezani dokument pri kupcu
+InternalRef=Internal ref.
 Currency=Valuta
 InfoAdmin=Podaci za administratore
 Undo=Povrati
@@ -671,7 +678,7 @@ SendMail=Pošalji e-poštu
 Email=E-pošta
 NoEMail=Nema e-pošte
 AlreadyRead=Već pročitano
-NotRead=Nije pročitano
+NotRead=Unread
 NoMobilePhone=Nema mobilnog telefona
 Owner=Vlasnik
 FollowingConstantsWillBeSubstituted=Sljedeće konstante bit će zamjenjene s odgovarajućom vrijednošću. 
@@ -1007,7 +1014,7 @@ SearchIntoMembers=Članovi
 SearchIntoUsers=Korisnici
 SearchIntoProductsOrServices=Proizvodi ili usluge
 SearchIntoProjects=Projekti
-SearchIntoMO=Manufacturing Orders
+SearchIntoMO=Proizvodni nalozi
 SearchIntoTasks=Zadaci
 SearchIntoCustomerInvoices=Računi za kupce
 SearchIntoSupplierInvoices=Ulazni računi
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/hr_HR/modulebuilder.lang b/htdocs/langs/hr_HR/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/hr_HR/modulebuilder.lang
+++ b/htdocs/langs/hr_HR/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/hr_HR/mrp.lang b/htdocs/langs/hr_HR/mrp.lang
index f018be890cc..d40d51ab493 100644
--- a/htdocs/langs/hr_HR/mrp.lang
+++ b/htdocs/langs/hr_HR/mrp.lang
@@ -1,17 +1,17 @@
-Mrp=Manufacturing Orders
+Mrp=Proizvodni nalozi
 MOs=Manufacturing orders
-ManufacturingOrder=Manufacturing Order
+ManufacturingOrder=Proizvodni nalog
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
 MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified
-Bom=Bills of Material
-BillOfMaterials=Bill of Material
+Bom=Sastavnice
+BillOfMaterials=Sastavnica
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
-ListOfManufacturingOrders=List of Manufacturing Orders
+ListOfManufacturingOrders=Lista proizvodnih naloga
 NewBOM=New bill of material
 ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
@@ -32,13 +32,13 @@ DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
 ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
 ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
-MenuMRP=Manufacturing Orders
-NewMO=New Manufacturing Order
+MenuMRP=Proizvodni nalozi
+NewMO=Novi proizvodni nalog
 QtyToProduce=Qty to produce
-DateStartPlannedMo=Date start planned
-DateEndPlannedMo=Date end planned
+DateStartPlannedMo=Datum početka planirani
+DateEndPlannedMo=Datum završetka planirani
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
-EstimatedDuration=Estimated duration
+EstimatedDuration=Procjena trajanja
 EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index f2b9c16f0f7..e96a3a7a4a4 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -5,8 +5,6 @@ Tools=Alati
 TMenuTools=Alati
 ToolsDesc=Svi alati koji nisu uključeni u ostalim sučeljima grupirani su ovdje.<br>Možete im pristupiti uz pomoć izbornika lijevo.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -99,6 +100,7 @@ PredefinedMailContentSendShipping=Poštovana/ni,\nposlali smo vam robu prema dos
 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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Izračunata masa
 CalculatedVolume=Izračunati volumen
 Weight=Masa
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index bceda0c20e6..62d40d82a31 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Broj cijena
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+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=Broj matičnih grupiranih proizvoda
@@ -167,8 +168,10 @@ BuyingPrices=Nabavne cijene
 CustomerPrices=Cijene kupaca
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Zemlja porijekla
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Koristi fiksnu cijenu
 PriceByQuantity=Različite cijene prema količini
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Raspon količine
-MultipriceRules=Pravila odjelnih cijena
+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=%% varijacija preko %s
 PercentDiscountOver=%% popust preko %s
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index 0b381082a17..ff826d9e7a5 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -76,15 +76,16 @@ MyActivities=Moji zadaci/aktivnosti
 MyProjects=Moji projekti
 MyProjectsArea=Sučelje mojih projekata
 DurationEffective=Efektivno trajanje
-ProgressDeclared=Objavljeni napredak
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Napredak zadatka
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=Deklarirani napredak manji je za %s od pretpostavljenog napretka
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Deklarirani napredak veći je za %s od pretpostavljenog napretka
-ProgressCalculated=Izračunati napredak
+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=s kojim sam povezan
 WhichIamLinkedToProject=projekt s kojim sam povezan
 Time=Vrijeme
+TimeConsumed=Consumed
 ListOfTasks=Popis zadataka
 GoToListOfTimeConsumed=Idi na popis utrošenog vremena
 GanttView=Gantogram
diff --git a/htdocs/langs/hr_HR/recruitment.lang b/htdocs/langs/hr_HR/recruitment.lang
index 31f81481a9c..519a3ae434e 100644
--- a/htdocs/langs/hr_HR/recruitment.lang
+++ b/htdocs/langs/hr_HR/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/hr_HR/sendings.lang b/htdocs/langs/hr_HR/sendings.lang
index 9d7ec4b228e..220a0004a70 100644
--- a/htdocs/langs/hr_HR/sendings.lang
+++ b/htdocs/langs/hr_HR/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Ostale isporuke za ovu narudžbu
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Isporuke za ovjeru
 StatusSendingCanceled=Poništeno
+StatusSendingCanceledShort=Poništeno
 StatusSendingDraft=Skica
 StatusSendingValidated=Ovjereno (proizvodi za isporuku ili su isporučeni)
 StatusSendingProcessed=Obrađen
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Prvo morate ovjeriti narudžbu prije izrade otp
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Kompletan model dokumenta za dostavnu primku (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstanta EXPEDITION_ADDON_NUMBER nije definirana
 SumOfProductVolumes=Ukupni volumen proizvoda
 SumOfProductWeights=Ukupna masa proizvoda
diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang
index 20f7b0c745c..66ac338fa3a 100644
--- a/htdocs/langs/hr_HR/stocks.lang
+++ b/htdocs/langs/hr_HR/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Vrijednost skladišta
 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/hr_HR/ticket.lang b/htdocs/langs/hr_HR/ticket.lang
index 70e17eef676..7a4ddd8295d 100644
--- a/htdocs/langs/hr_HR/ticket.lang
+++ b/htdocs/langs/hr_HR/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Ostalo
 TicketSeverityShortLOW=Nisko
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Visoko
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Nije pročitano
 Read=Read
 Assigned=Assigned
 InProgress=U postupku
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang
index 41f2e8808aa..893a4042577 100644
--- a/htdocs/langs/hr_HR/website.lang
+++ b/htdocs/langs/hr_HR/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Strana
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/hr_HR/withdrawals.lang b/htdocs/langs/hr_HR/withdrawals.lang
index 9d80e1ba9bd..1ac48911293 100644
--- a/htdocs/langs/hr_HR/withdrawals.lang
+++ b/htdocs/langs/hr_HR/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Označi kao kreditirano
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Opcija za stvarni način nije postavljena, zaustavljamo nakon ove simulacije
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/hr_HR/workflow.lang b/htdocs/langs/hr_HR/workflow.lang
index 8fc3bf1c296..0e485d46ab2 100644
--- a/htdocs/langs/hr_HR/workflow.lang
+++ b/htdocs/langs/hr_HR/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index 70ffa6bdfbb..342be1b6de1 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Dátum
 Docref=Hivatkozás
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 2beca20a1c0..76ed7753d26 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Kijelző
 SetupArea=Beállítás
 UploadNewTemplate=Új sablon(ok) feltöltése
 FormToTestFileUploadForm=A fájlfeltöltés tesztelésének űrlapja (beállítás szerint)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Megjegyzés: az 'igen' csak akkor eredményes, ha a <b>%s</b> modul engedélyezve van 
 RemoveLock=Távolítsa el / nevezze át a(z) <b>%s</b> fájlt, ha létezik, hogy engedélyezze a Frissítés / Telepítés eszközt.
 RestoreLock=Állítsa vissza az <b>%s</b> fájlt, csak olvasási jogokat engedélyezzen, hogy le lehessen tiltani a Frissítés / Telepítés eszköz további használatát.
@@ -85,7 +87,6 @@ ShowPreview=Előnézet megtekintése
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Előnézet nem elérhető
 ThemeCurrentlyActive=Jelenleg aktív téma
-CurrentTimeZone=A PHP (szerver) időzónája
 MySQLTimeZone=MySql (adatbázis) időzóna
 TZHasNoEffect=A dátumokat az adatbázis-kiszolgáló karakterláncként tárolja és küldi vissza. Az időzónának csak az UNIX_TIMESTAMP funkció használatakor van hatása (ezt a Dolibarr nem használhatja, tehát az adatbázis TZ-nek nincs hatása, még akkor sem, ha az adatok bevitele után megváltozott).
 Space=Hely
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Ez a terület adminisztrációs lehetőségeket biztosít. A
 Purge=Tisztítsd
 PurgeAreaDesc=Ezen az oldalon törölheti a Dolibarr által létrehozott vagy tárolt összes fájlt (ideiglenes fájlok vagy az <b>%s</b> könyvtárban lévő fájlok). Ennek a szolgáltatásnak a használata általában nem szükséges. Megkerülő megoldásként szolgál azoknak a felhasználóknak, akiknek a Dolibarr-ját olyan szolgáltató üzemelteti, amely nem engedélyezi a webszerver által generált fájlok törlését.
 PurgeDeleteLogFile=Naplófájlok törlése, beleértve a(z) <b>%s</b> fájlt, amely a Syslog modulhoz lett megadva (nincs adatvesztés kockázata)
-PurgeDeleteTemporaryFiles=Az összes ideiglenes fájl törlése (nincs adatvesztés kockázata). Megjegyzés: A törlés csak akkor történik meg, ha a temp könyvtárat 24 órával ezelőtt hozták létre.
-PurgeDeleteTemporaryFilesShort=Ideiglenes fájlok törlése
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 PurgeDeleteAllFilesInDocumentsDir=Az összes fájlt törölése ebben a könyvtárban: <b> %s </b>. <br> Ezzel törölheti az elemekhez kapcsolódó összes generált dokumentumot (harmadik felek, számlák stb.), az ECM modulba feltöltött fájlokat, az adatbázis biztonsági mentési ürlapjait és az ideiglenes fájlokat.
 PurgeRunNow=Ürítsd ki most
 PurgeNothingToDelete=Nincs törlésre váró fájl vagy könyvtár
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferált partnerek
 OtherResources=Egyéb források
 ExternalResources=Külső források
 SocialNetworks=Közösségi hálózatok
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=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>
 HelpCenterDesc1=Itt kaphat a Dolibarr-rel kapcsolatban segítséget és támogatást.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Példák az aktuális konfigurációval
 ListOfDirectories=OpenDocument sablonok listája könyvtárak
 ListOfDirectoriesForModelGenODT=Az OpenDocument formátumú sablonfájlokat tartalmazó könyvtárak listája. <br> <br> Írja ide a könyvtárak teljes elérési útját. <br> Nyomjon "Enter"-t minden egyes könyvtár között. <br> A GED modul könyvtárának hozzáadása: <b>DOL_DATA_ROOT/ecm/saját_könyvtár_neve</b>. <br> <br> Az e könyvtárakban található fájloknak <b>.odt</b> vagy <b>.ods</b> kiterjesztésre kell végződni.
 NumberOfModelFilesFound=Ezekben a könyvtárakban található ODT / ODS sablon fájlok száma
-ExampleOfDirectoriesForModelGen=Példák a szintaxis: <br> c: \\ mydir <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Ha tudod, hogyan kell létrehozni a odt dokumentumsablonok, mielőtt tárolja őket azokra a könyvtárakra, olvasd el a wiki dokumentáció:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=A név / vezetéknév sorrendje
@@ -406,7 +408,7 @@ UrlGenerationParameters=URL paraméterek biztosítása
 SecurityTokenIsUnique=Használjunk olyan egyedi securekey paraméter az URL
 EnterRefToBuildUrl=Adja meg az objektum referencia %s
 GetSecuredUrl=Get URL számított
-ButtonHideUnauthorized=Rejtett gombok elrejtése nem adminisztrátorok számára az illetéktelen tevékenységekhez a szürke letiltott gombok megjelenítése helyett
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Régi ÁFA-kulcs
 NewVATRates=Új ÁFA-kulcs
 PriceBaseTypeToChange=Módosítsa az árakat a meghatározott alap referenciaértékkel
@@ -668,7 +670,7 @@ Module54000Desc=Közvetlen nyomtatás (a dokumentumok kinyitása nélkül) a Cup
 Module55000Name=Szavazás, felmérés vagy választás
 Module55000Desc=Hozzon létre online szavazást, felmérést vagy választást (például Doodle, Studs, RDVz stb.)
 Module59000Name=Margók
-Module59000Desc=Az árrések kezelésére szolgáló modul
+Module59000Desc=Module to follow margins
 Module60000Name=Jutalékok
 Module60000Desc=Modul a jutalékok kezelésére
 Module62000Name=Nemzetközi kereskedelmi feltételek
@@ -1306,7 +1308,7 @@ YouUseBestDriver=A(z) %s illesztőprogramot használja, amely a jelenleg elérhe
 YouDoNotUseBestDriver=A(z) %s illesztőprogramot használja, de az %s illesztőprogram használata ajánlott.
 NbOfObjectIsLowerThanNoPb=Csak %s %s van az adatbázisban. Ez nem igényel különösebb optimalizálást.
 SearchOptim=Keresés optimalizálása
-YouHaveXObjectUseSearchOptim=%s %s van az adatbázisban. A Nyitólap->Beállítások->Egyéb beállítások oldalon adja hozzá a %s konstanst 1 értékkel. Korlátozza a keresést a karakterláncok elejére, amely lehetővé teszi az adatbázis számára az indexek használatát, és azonnali választ eredményez.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=%s %s van az adatbázisban, és az %s konstans értéke 1-re van állítva a Nyitólap->Beállítások->Egyéb beállítások oldalon.
 BrowserIsOK=A(z) %s webböngészőt használja. Ez a böngésző rendben van a biztonság és a teljesítmény szempontjából.
 BrowserIsKO=Az %s webböngészőt használja. Ez a böngésző köztudottan rossz választás a biztonság, a teljesítmény és a megbízhatóság szempontjából. Javasoljuk a Firefox, a Chrome, az Opera vagy a Safari használatát.
@@ -1596,8 +1598,13 @@ ServiceSetup=Szolgáltatások modul beállítása
 ProductServiceSetup=Termékek és szolgáltatások modulok beállítása
 NumberOfProductShowInSelect=A kombinált kiválasztási listákban megjelenítendő termékek maximális száma (0 = nincs korlátozás)
 ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup)
+DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
+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=A termékleírások megjelenítése a partner nyelvén
+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=Alapértelmezett típusú vonalkód használatát termékek
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Új menü
 MenuHandler=Menü kezelő
 MenuModule=Forrás modul
-HideUnauthorizedMenu= Hide jogosulatlan menük (szürke)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menü
 DetailMenuHandler=Menü, ahol a kezelő jelzi az új menü
 DetailMenuModule=Modul neve, ha menübejegyzés származnak modul
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang
index b526b83be5c..ccc93640d6a 100644
--- a/htdocs/langs/hu_HU/banks.lang
+++ b/htdocs/langs/hu_HU/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/hu_HU/blockedlog.lang b/htdocs/langs/hu_HU/blockedlog.lang
index 8a37fe90724..e2c08d1d937 100644
--- a/htdocs/langs/hu_HU/blockedlog.lang
+++ b/htdocs/langs/hu_HU/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/hu_HU/boxes.lang b/htdocs/langs/hu_HU/boxes.lang
index 93ca573083a..ead5517a357 100644
--- a/htdocs/langs/hu_HU/boxes.lang
+++ b/htdocs/langs/hu_HU/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Időzített feladatok
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=Nincs könyvjezlő. Kattintson <a href="%s">ide</a> könyvjelző hozzáadásához.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/hu_HU/cashdesk.lang b/htdocs/langs/hu_HU/cashdesk.lang
index f562064c20c..3215e0e3839 100644
--- a/htdocs/langs/hu_HU/cashdesk.lang
+++ b/htdocs/langs/hu_HU/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Számlák száma
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/hu_HU/categories.lang b/htdocs/langs/hu_HU/categories.lang
index 741cab33de6..f16ea1f8280 100644
--- a/htdocs/langs/hu_HU/categories.lang
+++ b/htdocs/langs/hu_HU/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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=Kiegészítő tulajdonságok
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index d6179acca4b..7848c56a7d1 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Ellenőrizze a Közösségen belüli ÁFA-azonosítót
 VATIntraManualCheck=Manuálisan ellenőrizheti az Európai Bizottság webhelyén <a href="%s" target="_blank"> %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=Jogi személy típusa
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Alkalmazottak
 ProspectLevelShort=Potenciális
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index e750d016947..58ff2d8bdcf 100644
--- a/htdocs/langs/hu_HU/compta.lang
+++ b/htdocs/langs/hu_HU/compta.lang
@@ -111,7 +111,7 @@ Refund=Visszatérítés
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Mutasd ÁFA fizetési
 TotalToPay=Összes fizetni
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Jelentés a harmadik fél IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/hu_HU/cron.lang b/htdocs/langs/hu_HU/cron.lang
index 70fd2ff5e3c..88f0a731a8c 100644
--- a/htdocs/langs/hu_HU/cron.lang
+++ b/htdocs/langs/hu_HU/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Ütemezett feladatok törlése
 Permission23104 = Ütemezett feladat végrehajtása
 # Admin
 CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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
@@ -46,6 +47,7 @@ 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
@@ -56,7 +58,7 @@ CronNote=Megjegyzés
 CronFieldMandatory=A %s mezőket kötelező kitölteni
 CronErrEndDateStartDt=A befejezés időpontja nem lehet hamarabb mint a kezdet
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Engedélyez
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Letiltás
 CronTaskInactive=Ez a feladat ki van kapcsolva
 CronId=Id
@@ -82,3 +84,8 @@ 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/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index 2fcfb92b003..66351dfdb7e 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s rossz
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=A %s felhasználói név már létezik.
 ErrorGroupAlreadyExists=A %s csoport már létezik.
 ErrorRecordNotFound=A rekord nem található
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Néhány kötelezően kitöltendő mező még üres.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Nem sikerült létrehozni egy könyvtárat. Ellenőrizze, hogy a Web szerver felhasználó engedélyekkel rendelkezik, hogy ültesse át Dolibarr dokumentumok könyvtárba. Ha a paraméter <b>safe_mode</b> engedélyezve van ez a PHP-t, ellenőrizze, hogy Dolibarr PHP fájlok tulajdonosa a webszerver felhasználó (vagy csoport).
 ErrorNoMailDefinedForThisUser=Nincs megadva a felhasználó email címe
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=A funkcó működéséhez Javascript aktiválására van szükség. A beállítások - képernyő részben beállíthatja.
 ErrorTopMenuMustHaveAParentWithId0=Egy menü típusú &quot;fent&quot; nem lehet egy szülő menüben. Tedd 0 szülő menüből, vagy válasszon egy menüt típusú &quot;baloldal&quot;.
 ErrorLeftMenuMustHaveAParentId=Egy menü típusú &quot;Bal&quot; kell egy szülő id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr LDAP-egyezés nem teljes.
 ErrorLDAPMakeManualTest=Egy. LDIF fájlt keletkezett %s könyvtárban. Próbálja meg kézzel betölteni a parancssorból, hogy több információt hibákat.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref használt létrehozására már létezik.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/hu_HU/exports.lang b/htdocs/langs/hu_HU/exports.lang
index 69e7436c345..207e255a0f7 100644
--- a/htdocs/langs/hu_HU/exports.lang
+++ b/htdocs/langs/hu_HU/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Mező cím
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Könyvtár
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Lépés
 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.
@@ -131,3 +133,4 @@ 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/hu_HU/mails.lang b/htdocs/langs/hu_HU/mails.lang
index a00af6c7a1f..97cce391084 100644
--- a/htdocs/langs/hu_HU/mails.lang
+++ b/htdocs/langs/hu_HU/mails.lang
@@ -92,6 +92,7 @@ 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=Vonal %s fájlban
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Értesítések
-NoNotificationsWillBeSent=Nincs e-mail értesítést terveznek erre az eseményre és vállalati
-ANotificationsWillBeSent=1 értesítést küldünk e-mailben
-SomeNotificationsWillBeSent=%s értesítést küldünk e-mailben
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=Lista minden e-mail értesítést küldeni
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Információ
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 1cb2ef1cbf2..8b26160d391 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Ilyen e-mail típushoz nincs elérhető sablon
 AvailableVariables=Elérhető helyettesítő változók
 NoTranslation=Nincs fordítás
 Translation=Fordítás
+CurrentTimeZone=A PHP (szerver) időzónája
 EmptySearchString=Adjon meg nem üres keresési feltételeket
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Rekord nem található
 NoRecordDeleted=Nincs törölt rekord
 NotEnoughDataYet=Nincs elég adat
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Rekord elmentve
 RecordDeleted=Rekord törölve
 RecordGenerated=Rekord létrehozva
@@ -220,6 +224,7 @@ Value=Érték
 PersonalValue=Személyes Érték
 NewObject=Új %s
 NewValue=Új Érték
+OldValue=Old value %s
 CurrentValue=Jelenlegi Érték
 Code=Kód
 Type=Típus
@@ -433,6 +438,7 @@ RemainToPay=Még fizetendő
 Module=Modul/Alkalmazás
 Modules=Modulok/alkalmazások
 Option=Opció
+Filters=Filters
 List=Lista
 FullList=Teljes lista
 FullConversation=Teljes beszélgetés
@@ -650,6 +656,7 @@ SupplierPreview=Eladói előnézet
 ShowCustomerPreview=Ügyfél előnézet mutatása
 ShowSupplierPreview=Eladói előnézet megjelenítése
 RefCustomer=Ügyfél Ref.
+InternalRef=Internal ref.
 Currency=Pénznem
 InfoAdmin=Információ adminisztrátorok számára
 Undo=Visszacsinál
@@ -671,7 +678,7 @@ SendMail=E-mail küldése
 Email=E-mail
 NoEMail=Nincs email
 AlreadyRead=Már elolvasott
-NotRead=Nem olvasott
+NotRead=Unread
 NoMobilePhone=Nincs mobilszám
 Owner=Tulajdonos
 FollowingConstantsWillBeSubstituted=Az alábbi konstansok helyettesítve leszenek a hozzájuk tartozó értékekkel.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/hu_HU/modulebuilder.lang b/htdocs/langs/hu_HU/modulebuilder.lang
index 460aef8103b..d257f8a1b0b 100644
--- a/htdocs/langs/hu_HU/modulebuilder.lang
+++ b/htdocs/langs/hu_HU/modulebuilder.lang
@@ -5,7 +5,7 @@ EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use upp
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
 ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
 ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
-NewModule=New module
+NewModule=Új modul
 NewObjectInModulebuilder=New object
 ModuleKey=Module key
 ObjectKey=Object key
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/hu_HU/mrp.lang b/htdocs/langs/hu_HU/mrp.lang
index 0a110b4dee4..74f340cce90 100644
--- a/htdocs/langs/hu_HU/mrp.lang
+++ b/htdocs/langs/hu_HU/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
index 934ae54ceb1..db482da70da 100644
--- a/htdocs/langs/hu_HU/other.lang
+++ b/htdocs/langs/hu_HU/other.lang
@@ -5,8 +5,6 @@ Tools=Eszközök
 TMenuTools=Eszközök
 ToolsDesc=A menükben nem szereplő összes eszköz ide van gyűjtve. <br> Az eszközök a bal oldali menüből érhetők el.
 Birthday=Születésnap
-BirthdayDate=Születésnap dátuma
-DateToBirth=Születési dátum
 BirthdayAlertOn=Születésnaposok aktív
 BirthdayAlertOff=Születésnaposok inaktív
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=A számla dátumát megelőző hónap (1–12)
 TextPreviousMonthOfInvoice=A számla dátumát megelőző hónap (szöveges)
 NextMonthOfInvoice=A számla dátumát követő hónap (1-12)
 TextNextMonthOfInvoice=A számla dátumát követő hónap (szöveges)
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=A(z) <b>%s</b> fájlba létrehozott ZIP-fájl.
 DocFileGeneratedInto=A(z) <b>%s</b>  fájlba létrehozott dokumentum fájl.
 JumpToLogin=A kapcsolat megszakadt. Ugrás a bejelentkezési oldalra ...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=A költségjelentés érvényesítve (jóváhagy
 Notify_EXPENSE_REPORT_APPROVE=A költségjelentés jóváhagyva
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=Lásd a %s modul beállításait
 NbOfAttachedFiles=Száma csatolt fájlok / dokumentumok
 TotalSizeOfAttachedFiles=Teljes méretű csatolt fájlok / dokumentumok
@@ -99,6 +100,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=A kifizetéshez kattintson az alábbi linkre, ha még nem történt meg.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Helló)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=A Dolibarr egy kompakt ERP/CRM, amely számos üzleti modult támogat. Az összes modult bemutató demonstrációnak nincs értelme, mivel ez a forgatókönyv soha nem fordul elő (több száz elérhető). Azonban számos demo profil elérhető.
 ChooseYourDemoProfil=Válassza ki az igényeinek leginkább megfelelő bemutató profilt ...
 ChooseYourDemoProfilMore=... vagy készítsen saját profilt <br>(manuális modulválasztás)
@@ -214,6 +216,7 @@ EMailTextExpenseReportValidated=Az %s költségjelentés érvényesítve.
 EMailTextExpenseReportApproved=Az %s költségjelentés jóváhagyva.
 EMailTextHolidayValidated=Az %sszabadságkérelem érvényesítve.
 EMailTextHolidayApproved=Az %s szabadságkérelem jóváhagyva.
+EMailTextActionAdded=The action %s has been added to the Agenda.
 ImportedWithSet=Behozatal adathalmaz
 DolibarrNotification=Automatikus értesítés
 ResizeDesc=Írja be az új szélesség <b>vagy</b> új magasság. Arányt kell tartani során átméretezés ...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Az elérhetőség/cím létrehozva az e-mail gyű
 ProjectCreatedByEmailCollector=A projektet létrehozva az e-mail gyűjtő által az MSGID %s e-mailből
 TicketCreatedByEmailCollector=A jegy létrehozva az e-mail gyűjtő által az MSGID %s e-mailből
 OpeningHoursFormatDesc=A nyitvatartási időket (-tól-ig) kötőjellel (-) válassza el. <br> Használjon szóközt a különböző idősávok megadásához. <br> Példa: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Az export területén
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index f260c21a8ac..6add4db3590 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Több árszegmens termékenként / szolgáltatásonként (minden ügyfél egy árszegmensben van)
 MultiPricesNumPrices=Árak száma
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Vételi árak
 CustomerPrices=Végfelhasználói árak
 SuppliersPrices=Eladási árak
 SuppliersPricesOfProductsOrServices=Eladási árak (termékek vagy szolgáltatások)
-CustomCode=Vám / Áru / HS kód
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Származási ország
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Használja a fix árat
 PriceByQuantity=Mennyiségtől függő ár
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Mennyiségi intervallum
-MultipriceRules=Árazási szabályok
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Használjon árszegmens-szabályokat (meghatározva a termékmodul beállításában), hogy automatikusan kiszámítsa az összes többi szegmens árát az első szegmens szerint
 PercentVariationOver=%% változó ár %s fölött
 PercentDiscountOver=%% kedvezmény %s fölött
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index 6dec0368501..faec1be92fe 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -1,18 +1,18 @@
 # 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
+RefProject=Ref. projekt
+ProjectRef=Projekt ref.
+ProjectId=Projekt azonosítója
+ProjectLabel=Projekt címke
+ProjectsArea=Projektek területe
+ProjectStatus=Projekt állapota
 SharedProject=Mindenki
 PrivateProject=Projekt kapcsolatok
-ProjectsImContactFor=Projects for which I am explicitly a contact
-AllAllowedProjects=All project I can read (mine + public)
+ProjectsImContactFor=Olyan projektek, amelyekkel kifejezetten kapcsolatban állok
+AllAllowedProjects=Az összes projekt, amit el tudok olvasni (az enyém + nyilvános)
 AllProjects=Minden projekt
-MyProjectsDesc=This view is limited to projects you are a contact for
+MyProjectsDesc=Ez a nézet azokra a projektekre korlátozódik, amelyekhez Ön kapcsolattartó
 ProjectsPublicDesc=Ez a nézet minden az ön által megtekinthető projektre van korlátozva.
-TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
+TasksOnProjectsPublicDesc=Ez a nézet azokat a projekteket mutatja be, amelyeket elolvashat.
 ProjectsPublicTaskDesc=Ez a nézet minden az ön által megtekinthető projektre van korlátozva.
 ProjectsDesc=Ez a nézet minden projektet tartalmaz.
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
@@ -26,244 +26,245 @@ OnlyYourTaskAreVisible=Only tasks assigned to you are visible. Assign task to yo
 ImportDatasetTasks=Tasks of projects
 ProjectCategories=Project tags/categories
 NewProject=Új projekt
-AddProject=Create project
+AddProject=Projekt létrehozása
 DeleteAProject=Projekt törlése
 DeleteATask=Feladat törlése
-ConfirmDeleteAProject=Are you sure you want to delete this project?
-ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
-OpportunitiesStatusForProjects=Leads amount of projects by status
+ConfirmDeleteAProject=Biztosan törli a projektet?
+ConfirmDeleteATask=Biztosan törli ezt a feladatot?
+OpenedProjects=Nyitott projektek
+OpenedTasks=Nyitott feladatok
+OpportunitiesStatusForOpenedProjects=Vezet a nyitott projektek mennyisége állapot szerint
+OpportunitiesStatusForProjects=Vezeti a projektek mennyiségét állapot szerint
 ShowProject=Projektek mutatása
 ShowTask=Feladat mutatása
 SetProject=Projekt beállítása
 NoProject=Nincs létrehozott vagy tulajdonolt projekt
-NbOfProjects=Number of projects
-NbOfTasks=Number of tasks
+NbOfProjects=Projektek száma
+NbOfTasks=Feladatok száma
 TimeSpent=Eltöltött idő
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
-TimesSpent=Töltött idő
-TaskId=Task ID
-RefTask=Task ref.
-LabelTask=Task label
-TaskTimeSpent=Time spent on tasks
+TimeSpentByYou=Ön által eltöltött idő
+TimeSpentByUser=A felhasználó által eltöltött idő
+TimesSpent=Eltöltött idő
+TaskId=Feladat azonosítója
+RefTask=Feladat ref.
+LabelTask=Feladat címke
+TaskTimeSpent=Feladatokra fordított idő
 TaskTimeUser=Felhasználó
 TaskTimeNote=Megjegyzés
 TaskTimeDate=Dátum
-TasksOnOpenedProject=Tasks on open projects
-WorkloadNotDefined=Workload not defined
+TasksOnOpenedProject=Feladatok nyílt projektekről
+WorkloadNotDefined=A munkaterhelés nincs meghatározva
 NewTimeSpent=Töltött idő
 MyTimeSpent=Az én eltöltött időm
-BillTime=Bill the time spent
-BillTimeShort=Bill time
-TimeToBill=Time not billed
-TimeBilled=Time billed
+BillTime=Bill az eltöltött idő
+BillTimeShort=Bill idő
+TimeToBill=Az idő nincs számlázva
+TimeBilled=Számlázott idő
 Tasks=Feladatok
 Task=Feladat
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
+TaskDateStart=A feladat kezdési dátuma
+TaskDateEnd=A feladat befejezésének dátuma
+TaskDescription=Feladatleírás
 NewTask=Új feladat
-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
+AddTask=Feladat létrehozása
+AddTimeSpent=Hozzon létre töltött időt
+AddHereTimeSpentForDay=Adja ide a napra / feladatra fordított időt
+AddHereTimeSpentForWeek=Adja ide a hétre / feladatra fordított időt
 Activity=Aktivitás
 Activities=Feladatok/aktivitások
 MyActivities=Feladataim/Aktivitásaim
 MyProjects=Projektjeim
-MyProjectsArea=My projects Area
+MyProjectsArea=Saját projektek Terület
 DurationEffective=Effektív időtartam
-ProgressDeclared=Declared progress
-TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
-WhichIamLinkedTo=which I'm linked to
-WhichIamLinkedToProject=which I'm linked to project
+ProgressDeclared=Deklarált valódi haladás
+TaskProgressSummary=A feladat előrehaladása
+CurentlyOpenedTasks=Gondosan nyitott feladatok
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=A bejelentett valós haladás inkább %s, mint a fogyasztás terén elért haladás
+ProgressCalculated=Haladás a fogyasztás terén
+WhichIamLinkedTo=amihez kapcsolódom
+WhichIamLinkedToProject=amelyet a projekthez kötök
 Time=Idő
-ListOfTasks=List of tasks
-GoToListOfTimeConsumed=Go to list of time consumed
-GanttView=Gantt View
-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
+TimeConsumed=Consumed
+ListOfTasks=Feladatok listája
+GoToListOfTimeConsumed=Ugrás az elfogyasztott idő listájára
+GanttView=Gantt nézet
+ListProposalsAssociatedProject=A projekttel kapcsolatos kereskedelmi javaslatok felsorolása
+ListOrdersAssociatedProject=A projekthez kapcsolódó értékesítési rendelések listája
+ListInvoicesAssociatedProject=A projekttel kapcsolatos ügyfélszámlák listája
+ListPredefinedInvoicesAssociatedProject=A projekthez kapcsolódó ügyfélsablonok listája
+ListSupplierOrdersAssociatedProject=A projekthez kapcsolódó beszerzési rendelések listája
+ListSupplierInvoicesAssociatedProject=A projekthez kapcsolódó szállítói számlák listája
+ListContractAssociatedProject=A projekttel kapcsolatos szerződések listája
+ListShippingAssociatedProject=A projekthez kapcsolódó szállítások listája
+ListFichinterAssociatedProject=A projekttel kapcsolatos beavatkozások listája
+ListExpenseReportsAssociatedProject=A projekthez kapcsolódó költségjelentések listája
+ListDonationsAssociatedProject=A projekthez kapcsolódó adományok listája
+ListVariousPaymentsAssociatedProject=A projekthez kapcsolódó különféle kifizetések listája
+ListSalariesAssociatedProject=A projekthez kapcsolódó fizetések fizetési listája
+ListActionsAssociatedProject=A projekttel kapcsolatos események listája
+ListMOAssociatedProject=A projekthez kapcsolódó gyártási megrendelések listája
+ListTaskTimeUserProject=A projekt feladataihoz felhasznált idő listája
+ListTaskTimeForTask=A feladathoz felhasznált idő listája
+ActivityOnProjectToday=A projekt tevékenysége ma
+ActivityOnProjectYesterday=Tegnapi projekt tevékenység
 ActivityOnProjectThisWeek=Heti projekt aktivitás
 ActivityOnProjectThisMonth=Havi projekt aktivitás
 ActivityOnProjectThisYear=Évi projekt aktivitás
 ChildOfProjectTask=Projekt/Feladat gyermeke
-ChildOfTask=Child of task
-TaskHasChild=Task has child
+ChildOfTask=A feladat gyermeke
+TaskHasChild=Feladatnak gyermeke van
 NotOwnerOfProject=Nem tulajdonosa ennek a privát projektnek
 AffectedTo=Érinti
-CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See tab '%s'.
+CantRemoveProject=Ez a projekt nem távolítható el, mivel más objektumok (számla, megrendelések vagy egyéb) hivatkoznak rá. Lásd az '%s' lapot.
 ValidateProject=Projekt hitelesítése
-ConfirmValidateProject=Are you sure you want to validate this project?
+ConfirmValidateProject=Biztosan érvényesíteni szeretné ezt a projektet?
 CloseAProject=Projekt lezárása
-ConfirmCloseAProject=Are you sure you want to close this project?
-AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
+ConfirmCloseAProject=Biztosan bezárja ezt a projektet?
+AlsoCloseAProject=Szintén zárja be a projektet (tartsa nyitva, ha továbbra is követnie kell a gyártási feladatokat rajta)
 ReOpenAProject=Projekt nyitása
-ConfirmReOpenAProject=Are you sure you want to re-open this project?
+ConfirmReOpenAProject=Biztosan újra megnyitja ezt a projektet?
 ProjectContact=A projekt kapcsolatai
-TaskContact=Task contacts
+TaskContact=Feladat kapcsolattartói
 ActionsOnProject=Projekteh tartozó cselekvések
 YouAreNotContactOfProject=Nem kapcsolata ennek a privát projektnek
-UserIsNotContactOfProject=User is not a contact of this private project
+UserIsNotContactOfProject=A felhasználó nem a privát projekt kapcsolattartója
 DeleteATimeSpent=Eltöltött idő törlése
-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
+ConfirmDeleteATimeSpent=Biztosan törli ezt az eltöltött időt?
+DoNotShowMyTasksOnly=Lásd még a hozzám nem rendelt feladatokat
+ShowMyTasksOnly=Csak a hozzám rendelt feladatokat tekintheti meg
+TaskRessourceLinks=A feladat kapcsolatai
 ProjectsDedicatedToThisThirdParty=Harmadik félhnek dedikált projektek
 NoTasks=Nincs a projekthez tartozó feladat
 LinkedToAnotherCompany=Harmadik félhez kapcsolva
-TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
+TaskIsNotAssignedToUser=A feladat nincs hozzárendelve a felhasználóhoz. A feladat hozzárendeléséhez használja az '<strong> %s </strong>' gombot.
 ErrorTimeSpentIsEmpty=Töltött idő üres
 ThisWillAlsoRemoveTasks=Ez a művelet is törli az összes feladatot a projekt <b>(%s</b> feladatokat a pillanatban), és az összes bemenet eltöltött idő.
 IfNeedToUseOtherObjectKeepEmpty=Ha egyes tárgyakat (számla, megrendelés, ...), amelyek egy másik harmadik félnek kell kapcsolódniuk a projekt létrehozásához, tartsa ezt az üres, hogy a projekt, hogy több harmadik fél.
-CloneTasks=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
+CloneTasks=Klónfeladatok
+CloneContacts=Klónozza a névjegyeket
+CloneNotes=Klón jegyzetek
+CloneProjectFiles=Klón projekt csatlakozott fájlokhoz
+CloneTaskFiles=Feladat (ok) egyesített fájljainak klónozása (ha feladat (ok) klónozása)
+CloneMoveDate=Frissíti a projekteket / feladatokat mostantól?
+ConfirmCloneProject=Biztosan klónozza ezt a projektet?
+ProjectReportDate=Módosítsa a feladat dátumát az új projekt kezdési dátumának megfelelően
+ErrorShiftTaskDate=Lehetetlen áthelyezni a feladat dátumát az új projekt kezdési dátumának megfelelően
+ProjectsAndTasksLines=Projektek és feladatok
+ProjectCreatedInDolibarr=%s projekt létrehozva
+ProjectValidatedInDolibarr=Az %s projekt érvényesítve
+ProjectModifiedInDolibarr=Az %s projekt módosítva
+TaskCreatedInDolibarr=Az %s feladat létrehozva
+TaskModifiedInDolibarr=Az %s feladat módosítva
+TaskDeletedInDolibarr=Az %s feladat törölve
+OpportunityStatus=Ólom státusz
+OpportunityStatusShort=Ólom státusz
+OpportunityProbability=Ólom valószínűsége
+OpportunityProbabilityShort=Ólom probab.
+OpportunityAmount=Ólom mennyisége
+OpportunityAmountShort=Ólom mennyisége
+OpportunityWeightedAmount=Lehetőséggel súlyozott összeg
+OpportunityWeightedAmountShort=Opp. súlyozott összeg
+OpportunityAmountAverageShort=Átlagos ólommennyiség
+OpportunityAmountWeigthedShort=Súlyozott ólommennyiség
+WonLostExcluded=Nyert / elveszett kizárva
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Projekt vezető
 TypeContact_project_external_PROJECTLEADER=Projekt vezető
 TypeContact_project_internal_PROJECTCONTRIBUTOR=Hozzájáruló
 TypeContact_project_external_PROJECTCONTRIBUTOR=Hozzájáruló
-TypeContact_project_task_internal_TASKEXECUTIVE=Kivitelező
-TypeContact_project_task_external_TASKEXECUTIVE=Task Kivitelező
+TypeContact_project_task_internal_TASKEXECUTIVE=Feladatvezető
+TypeContact_project_task_external_TASKEXECUTIVE=Feladatvezető
 TypeContact_project_task_internal_TASKCONTRIBUTOR=Hozzájáruló
 TypeContact_project_task_external_TASKCONTRIBUTOR=Hozzájáruló
-SelectElement=Select element
-AddElement=Link to element
+SelectElement=Válasszon elemet
+AddElement=Link elemhez
 LinkToElementShort=Hivatkozás erre:
 # 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
+DocumentModelBeluga=Projektdokumentum-sablon a kapcsolt objektumok áttekintéséhez
+DocumentModelBaleine=Projektdokumentum sablon feladatokhoz
+DocumentModelTimeSpent=Projekt jelentés sablon a töltött időre
+PlannedWorkload=Tervezett terhelés
+PlannedWorkloadShort=Munkaterhelés
 ProjectReferers=Kapcsolódó elemek
-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 me
-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
+ProjectMustBeValidatedFirst=A projektet először érvényesíteni kell
+FirstAddRessourceToAllocateTime=Rendeljen felhasználói erőforrást a projekt kapcsolattartójává az időosztáshoz
+InputPerDay=Bevitel naponta
+InputPerWeek=Heti bevitel
+InputPerMonth=Havi bevitel
+InputDetail=Bemenet részletei
+TimeAlreadyRecorded=Ez az a nap, amelyet erre a feladatra már naponta rögzítettünk, és az %s felhasználó
+ProjectsWithThisUserAsContact=Vetíti ezt a felhasználót kapcsolattartóként
+TasksWithThisUserAsContact=A felhasználóhoz rendelt feladatok
+ResourceNotAssignedToProject=Nincs hozzárendelve a projekthez
+ResourceNotAssignedToTheTask=Nincs hozzárendelve a feladathoz
+NoUserAssignedToTheProject=Nincs felhasználó hozzárendelve ehhez a projekthez
+TimeSpentBy=Által töltött idő
+TasksAssignedTo=Hozzárendelt feladatok
+AssignTaskToMe=Rendeljen nekem feladatot
+AssignTaskToUser=Hozzárendelje a feladatot az %s fájlhoz
+SelectTaskToAssign=Válassza ki a hozzárendelni kívánt feladatot ...
+AssignTask=Hozzárendelni
+ProjectOverview=Áttekintés
+ManageTasks=Használja a projekteket a feladatok követésére és / vagy az eltöltött idő jelentésére (munkaidő-táblázatok)
+ManageOpportunitiesStatus=Használja a projekteket a vezetők / ügyfelek követésére
+ProjectNbProjectByMonth=Létrehozott projektek száma hónaponként
+ProjectNbTaskByMonth=A létrehozott feladatok száma hónaponként
+ProjectOppAmountOfProjectsByMonth=A leadek száma havonta
+ProjectWeightedOppAmountOfProjectsByMonth=Súlyozott leadmennyiség havonta
+ProjectOpenedProjectByOppStatus=Nyitott projekt | vezető a vezető státus szerint
+ProjectsStatistics=Projektek vagy leadek statisztikája
+TasksStatistics=Statisztika a projektek vagy a vezetők feladatairól
+TaskAssignedToEnterTime=Feladat kijelölve. Lehetővé kell tenni a feladat megadásának idejét.
+IdTaskTime=Id feladat idő
+YouCanCompleteRef=Ha a ref-et valamilyen utótaggal szeretné kiegészíteni, akkor ajánlott egy - karakter hozzáadása az elválasztáshoz, így az automatikus számozás továbbra is megfelelően fog működni a következő projekteknél. Például %s-MYSUFFIX
+OpenedProjectsByThirdparties=Nyitott projektek harmadik felektől
+OnlyOpportunitiesShort=Csak vezet
+OpenedOpportunitiesShort=Nyílt vezetők
+NotOpenedOpportunitiesShort=Nem nyílt vezető
+NotAnOpportunityShort=Nem ólom
+OpportunityTotalAmount=A leadek teljes száma
+OpportunityPonderatedAmount=Súlyozott mennyiségű ólom
+OpportunityPonderatedAmountDesc=A valószínűséggel súlyozott ólomösszeg
+OppStatusPROSP=Felkutatás
+OppStatusQUAL=Képesítés
 OppStatusPROPO=Javaslat
-OppStatusNEGO=Negociation
-OppStatusPENDING=Folyamatban
-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.
-ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+OppStatusNEGO=Tárgyalás
+OppStatusPENDING=Függőben levő
+OppStatusWON=Megnyert
+OppStatusLOST=Elveszett
+Budget=Költségvetés
+AllowToLinkFromOtherCompany=Engedélyezheti a másik vállalat projektjeinek összekapcsolását harmadik felek vesszővel elválasztott azonosítói: összekapcsolhatják e harmadik fél összes projektjét (példa: 123,4795,53) <br>
+LatestProjects=Legfrissebb %s projektek
+LatestModifiedProjects=A legújabb %s módosított projektek
+OtherFilteredTasks=Egyéb szűrt feladatok
+NoAssignedTasks=Nem található hozzárendelt feladat (az aktuális felhasználóhoz rendeljen projektet / feladatokat a felső jelölőnégyzetből az idő megadásához)
+ThirdPartyRequiredToGenerateInvoice=A számlázáshoz meg kell határozni egy harmadik felet a projekten.
+ChooseANotYetAssignedTask=Válasszon ki egy olyan feladatot, amely még nincs hozzárendelve
 # 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
-TimeSpentForInvoice=Töltött idő
-OneLinePerUser=One line per user
-ServiceToUseOnLines=Service to use on lines
-InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
-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
+AllowCommentOnTask=Felhasználói megjegyzések engedélyezése a feladatokhoz
+AllowCommentOnProject=Felhasználói megjegyzések engedélyezése a projektekhez
+DontHavePermissionForCloseProject=Nincs engedélye az %s projekt bezárására
+DontHaveTheValidateStatus=Az %s projektnek nyitva kell lennie a lezáráshoz
+RecordsClosed=%s projekt lezárult
+SendProjectRef=Információs projekt %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=A „Fizetések” modulnak lehetővé kell tennie az alkalmazottak óradíjának meghatározását az eltöltött idő valorizálása érdekében
+NewTaskRefSuggested=A feladat ref már használatban van, új feladat ref szükséges
+TimeSpentInvoiced=Számlázással töltött idő
+TimeSpentForInvoice=Eltöltött idő
+OneLinePerUser=Felhasználónként egy sor
+ServiceToUseOnLines=A vonalakon használható szolgáltatás
+InvoiceGeneratedFromTimeSpent=Az %s számla a projektre fordított időből származik
+ProjectBillTimeDescription=Ellenőrizze, hogy beírta-e a munkaidő-nyilvántartást a projekt feladataira, ÉS azt tervezi, hogy számlákat generál az időről, hogy kiszámlázza a projekt ügyfelét (ne ellenőrizze, hogy olyan számlát kíván-e létrehozni, amely nem a beírt munkaidő-nyilvántartások alapján készül). Megjegyzés: Számla előállításához lépjen a projekt „Idő eltelt” fülére, és válassza ki a beépítendő sorokat.
+ProjectFollowOpportunity=Kövesse a lehetőséget
+ProjectFollowTasks=Kövesse a feladatokat vagy az eltöltött időt
+Usage=Használat
+UsageOpportunity=Használat: Lehetőség
+UsageTasks=Használat: Feladatok
+UsageBillTimeShort=Használat: Számlaidő
+InvoiceToUse=Használandó számlatervezet
 NewInvoice=Új számla
-OneLinePerTask=One line per task
-OneLinePerPeriod=One line per period
-RefTaskParent=Ref. Parent Task
-ProfitIsCalculatedWith=Profit is calculated using
+OneLinePerTask=Feladatonként egy sor
+OneLinePerPeriod=Periódusonként egy sor
+RefTaskParent=Ref. Szülői feladat
+ProfitIsCalculatedWith=A nyereség kiszámítása
diff --git a/htdocs/langs/hu_HU/recruitment.lang b/htdocs/langs/hu_HU/recruitment.lang
index 17638802c51..590a003a8f0 100644
--- a/htdocs/langs/hu_HU/recruitment.lang
+++ b/htdocs/langs/hu_HU/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/hu_HU/sendings.lang b/htdocs/langs/hu_HU/sendings.lang
index 9e47080363d..aba9cc8f51b 100644
--- a/htdocs/langs/hu_HU/sendings.lang
+++ b/htdocs/langs/hu_HU/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Más szállítások ehhez a megrendeléshez
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Hitelesítésre váró szállítások
 StatusSendingCanceled=Megszakítva
+StatusSendingCanceledShort=Visszavonva
 StatusSendingDraft=Piszkozat
 StatusSendingValidated=Hitelesítve (már szállítva)
 StatusSendingProcessed=Feldolgozott
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Teljesebb dokumentum modell bizonylatokhoz (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Állandó EXPEDITION_ADDON_NUMBER nincs definiálva
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index c41ce038ee2..d6a04f7d23e 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Raktárak értéke
 UserWarehouseAutoCreate=Felhasználói raktár automatikus létrehozása felhasználó hozzáadásakor
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/hu_HU/ticket.lang b/htdocs/langs/hu_HU/ticket.lang
index 79cde86ee8b..eca711a1cf2 100644
--- a/htdocs/langs/hu_HU/ticket.lang
+++ b/htdocs/langs/hu_HU/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Egyéb
 TicketSeverityShortLOW=Alacsony
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Magas
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Nem olvasott
 Read=Olvas
 Assigned=Assigned
 InProgress=Folyamatban
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang
index 25d8faccd6d..d7e4a43010d 100644
--- a/htdocs/langs/hu_HU/website.lang
+++ b/htdocs/langs/hu_HU/website.lang
@@ -30,7 +30,6 @@ EditInLine=Szerkesztés inline
 AddWebsite=Webhely hozzáadása
 Webpage=Weblap / tároló
 AddPage=Oldal / tároló hozzáadása
-HomePage=Honlap
 PageContainer=Oldal
 PreviewOfSiteNotYetAvailable=A weboldal előnézete <strong>%s</strong> még nem érhető el. Először &#39; <strong>Teljes weboldal-sablont</strong> kell <strong>importálnia</strong> &#39; vagy csak &#39; <strong>Oldal / tároló hozzáadása</strong> &#39; <strong>elemet</strong> .
 RequestedPageHasNoContentYet=Az %s azonosítóval kért oldalnak még nincs tartalma, vagy a .tpl.php gyorsítótár fájlt eltávolították. Szerkessze az oldal tartalmát ennek megoldásához.
@@ -101,7 +100,7 @@ EmptyPage=Üres oldal
 ExternalURLMustStartWithHttp=A külső URL-nek http: // vagy https: // -el kell kezdődnie.
 ZipOfWebsitePackageToImport=Töltse fel a webhelysablon-csomag Zip fájlját
 ZipOfWebsitePackageToLoad=vagy Válasszon egy elérhető beágyazott webhelysablon-csomagot
-ShowSubcontainers=Vegye fel a dinamikus tartalmat
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Az oldal belső URL-je
 ThisPageIsTranslationOf=Ez az oldal / konténer a(z) ... nyelv fordítása
 ThisPageHasTranslationPages=Ezen az oldalon / tárolóban van fordítás
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/hu_HU/withdrawals.lang b/htdocs/langs/hu_HU/withdrawals.lang
index 7522b6d2bd1..64d418be9f1 100644
--- a/htdocs/langs/hu_HU/withdrawals.lang
+++ b/htdocs/langs/hu_HU/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Jóváírtan osztályozva
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Opció a valós módban nem volt beállítva, akkor hagyja abba ezt követően szimuláció
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/hu_HU/workflow.lang b/htdocs/langs/hu_HU/workflow.lang
index 569e1e15dc3..245805b071d 100644
--- a/htdocs/langs/hu_HU/workflow.lang
+++ b/htdocs/langs/hu_HU/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatikus létrehozás
 AutomaticClassification=Automatikus minősítés
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index 669c6b2ad04..f8548a63d79 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=Layanan ini
 ThisProduct=Produk ini
 DefaultForService=Standar untuk Layanan
 DefaultForProduct=Standar untuk Produk
+ProductForThisThirdparty=Product for this thirdparty
+ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Tidak bisa menyarankan
 AccountancySetupDoneFromAccountancyMenu=Kebanyakan aturan akutansi dilakukan dari bilah menu %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -48,6 +50,7 @@ CountriesExceptMe=Semua negara kecuali %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Akun akuntansi utama untuk pelanggan tidak ditentukan dalam pengaturan
 MainAccountForSuppliersNotDefined=Akun akuntansi utama untuk vendor tidak ditentukan dalam pengaturan
@@ -144,7 +147,7 @@ NotVentilatedinAccount=Tidak terikat pada akun akuntansi
 XLineSuccessfullyBinded=%s produk/layanan berhasil diikat ke akun akuntansi
 XLineFailedToBeBinded=Produk/layanan %s tidak terikat pada akun akuntansi mana pun
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Jumlah elemen yang akan dijilidkan ditunjukkan oleh halaman (maksimum yang disarankan: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Mulailah menyortir halaman "Binding to do" oleh elemen-elemen terbaru
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Mulailah menyortir halaman "Binding done" oleh elemen-elemen terbaru
 
@@ -198,7 +201,8 @@ Docdate=Tanggal
 Docref=Referensi
 LabelAccount=Label Akun
 LabelOperation=Operasi label
-Sens=Sen
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Kode huruf
 Lettering=Tulisan
 Codejournal=Jurnal
@@ -206,7 +210,8 @@ JournalLabel=Label jurnal
 NumPiece=Jumlah potongan
 TransactionNumShort=Tidak. transaksi
 AccountingCategory=Grup yang dipersonalisasi
-GroupByAccountAccounting=Kelompokkan dengan akun akuntansi
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Anda dapat mendefinisikan di sini beberapa grup akun akuntansi. Mereka akan digunakan untuk laporan akuntansi yang dipersonalisasi.
 ByAccounts=Dengan akun
 ByPredefinedAccountGroups=Oleh kelompok yang telah ditentukan
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Pembayaran tidak terkait dengan produk / layanan apa
 OpeningBalance=Saldo awal
 ShowOpeningBalance=Tampilkan saldo awal
 HideOpeningBalance=Sembunyikan saldo awal
-ShowSubtotalByGroup=Tampilkan subtotal menurut grup
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Grup akun
 PcgtypeDesc=Grup akun digunakan sebagai kriteria 'filter' dan 'pengelompokan' yang telah ditentukan sebelumnya untuk beberapa laporan akuntansi. Misalnya, 'PENGHASILAN' atau 'BEBAN' digunakan sebagai grup untuk akun akuntansi produk untuk membangun laporan pengeluaran / pendapatan.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Konsultasikan di sini daftar garis laporan pengeluaran y
 DescVentilExpenseReportMore=Jika Anda mengatur akun akuntansi pada jenis garis laporan pengeluaran, aplikasi akan dapat membuat semua ikatan antara garis laporan pengeluaran Anda dan akun akuntansi dari bagan akun Anda, cukup dengan satu klik dengan tombol<strong>"%s" </strong>. Jika akun tidak ditetapkan pada kamus biaya atau jika Anda masih memiliki beberapa baris yang tidak terikat pada akun apa pun, Anda harus membuat manual yang mengikat dari menu "<strong> %s </strong>".
 DescVentilDoneExpenseReport=Konsultasikan di sini daftar garis laporan pengeluaran dan akun akuntansi biayanya
 
+Closure=Annual closure
 DescClosure=Konsultasikan di sini jumlah gerakan berdasarkan bulan yang tidak divalidasi & tahun fiskal sudah terbuka
 OverviewOfMovementsNotValidated=Langkah 1 / Ikhtisar gerakan yang tidak divalidasi. (Diperlukan untuk menutup tahun fiskal)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 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
-SelectMonthAndValidate=Pilih bulan dan validasi gerakan
 
 ValidateHistory=Mengikat Secara Otomatis
 AutomaticBindingDone=Pengikatan otomatis dilakukan
@@ -293,6 +300,7 @@ Accounted=Disumbang dalam buku besar
 NotYetAccounted=Belum diperhitungkan dalam buku besar
 ShowTutorial=Perlihatkan Tutorial
 NotReconciled=Tidak didamaikan
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +345,7 @@ Modelcsv_LDCompta10=Ekspor untuk LD Compta (v10 & lebih tinggi)
 Modelcsv_openconcerto=Ekspor untuk OpenConcerto (Uji)
 Modelcsv_configurable=Ekspor CSV Dapat Dikonfigurasi
 Modelcsv_FEC=Ekspor FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Ekspor untuk Sage 50 Swiss
 Modelcsv_winfic=Ekspor Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index d5b84801d2d..6053f1fcc05 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -37,8 +37,8 @@ UnlockNewSessions=Hapuskan penguncian koneksi.
 YourSession=Sesi Anda
 Sessions=Sesi Pengguna
 WebUserGroup=Server web pengguna / grup
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
+PermissionsOnFilesInWebRoot=Izin pada file di direktori root web
+PermissionsOnFile=Izin pada file %s
 NoSessionFound=Konfigurasi PHP Anda tampaknya tidak diizinkan untuk membuat daftar untuk sesi yang aktif. Direktori yang digunakan untuk menyimpan sesi (<b>%s</b>) mungkin dilindungi (misalnya pengaturan izin OS atau oleh pengaturan direktif PHP open_basedir).
 DBStoringCharset=Karakter set atau charset dari basisdata untuk menyimpan data
 DBSortingCharset=Karakter set atau charset dari basisdata untuk penyortiran data
@@ -56,6 +56,8 @@ GUISetup=Tampakan Display
 SetupArea=Pengaturan
 UploadNewTemplate=Unggah templat baru(s)
 FormToTestFileUploadForm=Halaman percobaan untuk mengunggah berkas (berdasarkan konfigurasi di pengaturan)
+ModuleMustBeEnabled=Modul/aplikasi <b> %s </b> harus diaktifkan
+ModuleIsEnabled=Modul/aplikasi <b> %s </b> telah diaktifkan
 IfModuleEnabled=Catatan: Ya akan hanya efektif ketika modul <b>%s</b> diaktifkan
 RemoveLock=Hapus / ganti nama berkas <b>%s</b> jika sudah ada, untuk memperbolehkan pemakaian alat Perbarui / Instal.
 RestoreLock=Pulihkan berkas <b>%s</b>, dengan izin baca saja, untuk menonaktifkan pemakaian alat Pembaruan / Instal lebih lanjut.
@@ -73,7 +75,7 @@ DisableJavascriptNote=Catatan: Untuk tujuan pengujian atau debug. Pengoptimasian
 UseSearchToSelectCompanyTooltip=Juga jika Anda memiliki banyak pihak ketiga (> 100.000), Anda dapat mempercepat dengan menetapkan konstanta COMPANY_DONOTSEARCH_ANYWHERE menjadi 1 pada Pengaturan-> Lainnya. Pencarian akan dibatasi kemudian untuk memulai string.
 UseSearchToSelectContactTooltip=Dan juga jika Anda memiliki banyak pihak ketiga (> 100.000), Anda dapat mempercepatnya dengan menetapkan konstanta CONTACT_DONOTSEARCH_ANYWHERE menjadi 1 di Pengaturan-> Lainnya. Pencarian akan kemudian dibatasi untuk memulai string.
 DelaiedFullListToSelectCompany=Tunggu hingga tombol ditekan sebelum memuat konten dari daftar kombo Pihak Ketiga.<br> Ini dapat meningkatkan kecepatan kinerja jika Anda memiliki banyak pihak ketiga, tetapi cara ini kurang nyaman.
-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=Tunggu hingga tombol ditekan sebelum memuat konten dari daftar kombo Kontak. <br> Ini dapat meningkatkan kinerja jika Anda memiliki banyak kontak, tetapi bisa menjadi kurang nyaman.
 NumberOfKeyToSearch=Jumlah karakter yang memicu pencarian: %s
 NumberOfBytes=Jumlah Bytes
 SearchString=Cari string
@@ -82,10 +84,9 @@ AllowToSelectProjectFromOtherCompany=Pada dokumen pihak ketiga, dapat memilih pr
 JavascriptDisabled=JavaScript dinonaktifkan
 UsePreviewTabs=Gunakan tab pratinjau
 ShowPreview=Tampilkan pratinjau
-ShowHideDetails=Show-Hide details
+ShowHideDetails=Tampilkan-Sembunyikan rincian
 PreviewNotAvailable=Preview tidak tersedia
 ThemeCurrentlyActive=Tema yang sedang aktif
-CurrentTimeZone=TimeZone PHP (Server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Tanggal disimpan dan dikembalikan oleh server database seolah-olah disimpan sebagai string yang dikirimkan. Zona waktu hanya berpengaruh bila menggunakan fungsi UNIX_TIMESTAMP (yang seharusnya tidak digunakan oleh Dolibarr, jadi basis data TZ seharusnya tidak berpengaruh, bahkan jika diubah setelah data dimasukkan).
 Space=Ruang
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Area ini menyediakan fungsi administrasi. Gunakan menu untuk
 Purge=Perbersihan
 PurgeAreaDesc=Halaman ini memungkinkan Anda untuk menghapus semua file yang dihasilkan atau disimpan oleh Dolibarr (file sementara atau semua file di<b>%s</b>direktori). Menggunakan fitur ini biasanya tidak diperlukan. Ini disediakan sebagai solusi untuk pengguna yang Dolibarr di-host oleh penyedia yang tidak menawarkan izin untuk menghapus file yang dihasilkan oleh server web.
 PurgeDeleteLogFile=Hapus file log, termasuk<b>%s</b>didefinisikan untuk modul Syslog (tidak ada risiko kehilangan data)
-PurgeDeleteTemporaryFiles=Hapus semua file sementara (tidak ada risiko kehilangan data). Catatan: Penghapusan dilakukan hanya jika direktori temp dibuat 24 jam yang lalu.
-PurgeDeleteTemporaryFilesShort=Hapus file sementara
+PurgeDeleteTemporaryFiles=Hapus semua log dan file sementara (tidak ada risiko kehilangan data). Catatan: Penghapusan file sementara dilakukan hanya jika direktori temp (sementara)  dibuat lebih dari 24 jam yang lalu.
+PurgeDeleteTemporaryFilesShort=Hapus log dan file sementara
 PurgeDeleteAllFilesInDocumentsDir=Hapus semua file dalam direktori:<b>%s </b>. <br> Ini akan menghapus semua dokumen yang dihasilkan terkait dengan elemen (pihak ketiga, faktur dll ...), file yang diunggah ke dalam modul ECM, kesedihan cadangan database dan file sementara.
 PurgeRunNow=Bersihkan sekarang
 PurgeNothingToDelete=Tidak ada direktori atau file untuk dihapus.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Mitra yang Dipilih
 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>
 HelpCenterDesc1=Berikut adalah beberapa sumber untuk mendapatkan bantuan dan dukungan dengan Dolibarr.
@@ -274,7 +276,7 @@ NoticePeriod=Periode pemberitahuan
 NewByMonth=Baru setiap bulan
 Emails=Email
 EMailsSetup=Penyiapan email
-EMailsDesc=This page allows you to set parameters or options for email sending.
+EMailsDesc=Halaman ini memungkinkan Anda mengatur parameter atau pilihan untuk pengiriman email.
 EmailSenderProfiles=Email profil pengirim
 EMailsSenderProfileDesc=Anda dapat menyimpan bagian ini kosong. Jika Anda memasukkan beberapa email di sini, mereka akan ditambahkan ke daftar kemungkinan pengirim ke kotak kombo saat Anda menulis email baru.
 MAIN_MAIL_SMTP_PORT=Port SMTP / SMTPS (nilai default dalam php.ini:<b>%s </b>)
@@ -292,7 +294,7 @@ MAIN_MAIL_SMTPS_ID=ID SMTP (jika server pengirim memerlukan otentikasi)
 MAIN_MAIL_SMTPS_PW=Kata Sandi SMTP (jika server pengirim memerlukan otentikasi)
 MAIN_MAIL_EMAIL_TLS=Gunakan enkripsi TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Gunakan enkripsi TLS (STARTTLS)
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Otorisasi les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Gunakan DKIM untuk menghasilkan tanda tangan email
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domain Email untuk digunakan dengan dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Nama pemilih dkim
@@ -304,9 +306,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Email pengirim default untuk pengiriman manual (Email
 UserEmail=Email pengguna
 CompanyEmail=Email Perusahaan
 FeatureNotAvailableOnLinux=Fitur tidak tersedia di sistem seperti Unix. Uji program sendmail Anda secara lokal.
-FixOnTransifex=Fix the translation on the online translation platform of project
+FixOnTransifex=Perbaiki terjemahan pada platform online terjemahan proyek
 SubmitTranslation=Jika terjemahan untuk bahasa ini tidak lengkap atau Anda menemukan kesalahan, Anda dapat memperbaikinya dengan mengedit file dalam direktori<b>langs / %s</b>dan kirimkan perubahan Anda ke www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
+SubmitTranslationENUS=Jika terjemahan untuk bahasa ini tidak lengkap atau Anda menemukan kesalahan, Anda dapat memperbaikinya dengan mengedit file ke direktori <b> langs/%s</b> dan mengirimkan file yang telah diubah ke dolibarr.org/forum atau, jika Anda seorang pengembang, dengan PR di github .com / Dolibarr / dolibarr
 ModuleSetup=Setup Modul
 ModulesSetup=Modul / Pengaturan aplikasi
 ModuleFamilyBase=Sistem
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Contoh dengan konfigurasi saat ini
 ListOfDirectories=Daftar direktori templat OpenDocument
 ListOfDirectoriesForModelGenODT=Daftar direktori yang berisi file templat dengan format OpenDocument. <br> <br> Masukkan path direktori lengkap di sini. <br> Tambahkan carriage return antara direktori eah. <br> Untuk menambahkan direktori modul GED, tambahkan di sini<b>DOL_DATA_ROOT / ecm / yourdirectoryname </b>. <br> <br> File dalam direktori tersebut harus diakhiri dengan<b>.odt</b>atau<b>.ods </b>.
 NumberOfModelFilesFound=Jumlah file template ODT / ODS yang ditemukan di direktori ini
-ExampleOfDirectoriesForModelGen=Contoh sintaks: <br> c: \\ mydir <br> / home / mydir<br>DOL_DATA_ROOT / ecm / ecmdir
+ExampleOfDirectoriesForModelGen=Contoh sintaks: <br> c: \\myapp\\mydocumentdir\\mysubdir <br> /home/myapp/mydocumentdir/mysubdir <br> DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed= <br> Untuk mengetahui cara membuat tempt dokumen ODT Anda, sebelum menyimpannya di direktori tersebut, baca dokumentasi wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Posisi Nama/Nama Belakang
@@ -391,12 +393,12 @@ ModuleMustBeEnabledFirst=Modul<b>%s</b>harus diaktifkan terlebih dahulu jika And
 SecurityToken=Kunci untuk mengamankan URL
 NoSmsEngine=Tidak ada manajer pengirim SMS yang tersedia. Manajer pengirim SMS tidak diinstal dengan distribusi default karena tergantung pada vendor eksternal, tetapi Anda dapat menemukannya di %s
 PDF=PDF
-PDFDesc=Global options for PDF generation
-PDFAddressForging=Rules for address section
+PDFDesc=Pilihan / opsi global untuk pembuatan PDF
+PDFAddressForging=Aturan untuk bagian dari alamat
 HideAnyVATInformationOnPDF=Sembunyikan semua informasi yang terkait dengan Pajak Penjualan / PPN
 PDFRulesForSalesTax=Aturan untuk Pajak Penjualan / PPN
 PDFLocaltax=Aturan untuk %s
-HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
+HideLocalTaxOnPDF=Sembunyikan tarif %s pada kolom Pajak Penjualan / PPN
 HideDescOnPDF=Sembunyikan deskripsi produk
 HideRefOnPDF=Sembunyikan produk ref.
 HideDetailsOnPDF=Sembunyikan detail lini produk
@@ -406,16 +408,16 @@ UrlGenerationParameters=Parameter untuk mengamankan URL
 SecurityTokenIsUnique=Gunakan parameter keamanan unik untuk setiap URL
 EnterRefToBuildUrl=Masukkan referensi untuk objek %s
 GetSecuredUrl=Dapatkan URL yang dihitung
-ButtonHideUnauthorized=Sembunyikan tombol untuk pengguna non-admin untuk tindakan yang tidak sah alih-alih menunjukkan tombol yang dinonaktifkan yang berwarna abu-abu
+ButtonHideUnauthorized=Sembunyikan juga tombol tindakan tidak sah untuk pengguna internal (jika tidak berwarna abu-abu)
 OldVATRates=Suku VAT lama
 NewVATRates=Suku VAT baru
 PriceBaseTypeToChange=Ubah harga dengan nilai referensi dasar ditentukan pada
 MassConvert=Luncurkan konversi massal
 PriceFormatInCurrentLanguage=Format Harga Dalam Bahasa Saat Ini
 String=Tali
-String1Line=String (1 line)
+String1Line=String (1 baris)
 TextLong=Teks panjang
-TextLongNLines=Long text (n lines)
+TextLongNLines=Teks panjang (n baris)
 HtmlText=Teks html
 Int=Bilangan bulat
 Float=Mengapung
@@ -442,9 +444,9 @@ ExtrafieldParamHelpPassword=Membiarkan baris ini kosong berarti nilai ini akan d
 ExtrafieldParamHelpselect=Daftar nilai harus berupa garis dengan kunci format, nilai (di mana kunci tidak boleh '0') <br> <br> misalnya: <br> 1, nilai1<br>2, nilai2 a0342fccfda0b3f0f0f0fb0f0f0fb03 daftar tergantung pada daftar atribut pelengkap lain: <br> 1, nilai1 | options_ <i> parent_list_code </i>: parent_key<br>2, value2 | options_ <i> parent_list_code </i>: parent_key <br> <br> dalam rangka untuk memiliki daftar tergantung pada daftar lain: <br> 1, nilai1 | <i> parent_list_code </i>: parent_key<br>2, value2 | <i> parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Daftar nilai harus berupa garis dengan kunci format, nilai (di mana kunci tidak boleh '0') <br> <br> misalnya: <br> 1, value1<br>2, value2 a0342fccfda2b3f0f3f0f3f
 ExtrafieldParamHelpradio=Daftar nilai harus berupa garis dengan kunci format, nilai (di mana kunci tidak boleh '0') <br> <br> misalnya: <br> 1, value1<br>2, value2 a0342fccfda2b3f0f3f0f3f
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=Daftar nilai berasal dari tabel <br> Sintaks: nama_tabel: label_field: id_field :: filter <br> Contoh: c_typent: libelle: id :: filter <br> <br> - id_field adalah kunci utama = 1) untuk menampilkan hanya nilai aktif <br> Anda juga dapat menggunakan $ ID $ in filter yang merupakan id saat ini dari objek <br> Untuk menggunakan SELECT ke dalam filter, gunakan kata kunci $ SEL $ untuk melewati perlindungan anti-injeksi. <br> jika Anda ingin memfilter extrafields gunakan sintaks extra.fieldcode = ... (di mana kode field adalah kode dari extrafield) <br> <br> Untuk memiliki daftar tergantung pada daftar atribut pelengkap lainnya: <br> c_typ: libelle: id19bz0 <i> parent_list_code </i> | parent_column: filter <br> <br> Untuk memiliki daftar yang bergantung pada daftar lain: <br> c_typent: libelle: id_col33_list: parentkolom
 ExtrafieldParamHelpchkbxlst=Daftar nilai berasal dari tabel<br>Sintaks: table_name: label_field: id_field :: filter<br>Contoh: c_typent: libelle: id :: filter <br> <br> filter a hanya dapat ditampilkan sebagai contoh a juga dapat menggunakan $ ID $ dalam penyihir filter adalah id saat ini dari objek saat ini<br>Untuk melakukan SELECT dalam menggunakan $ SEL $ <br> jika Anda ingin memfilter pada extrafields gunakan sintaks extra.fieldcode = ... (di mana kode baris adalah kode extrafield) <br> <br> dalam rangka untuk memiliki daftar tergantung pada daftar atribut pelengkap lain: <br> c_typent: Libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> dalam rangka untuk memiliki daftar tergantung pada daftar lain: c_typent <br>: libelle: id: <i> parent_list_code </i> | parent_column: filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
+ExtrafieldParamHelplink=Parameter harus ObjectName: Classpath <br> Sintaks: ObjectName: Classpath
 ExtrafieldParamHelpSeparator=Biarkan kosong untuk pemisah sederhana<br>Setel ini menjadi 1 untuk pemisah runtuh (buka secara default untuk sesi baru, kemudian status disimpan untuk setiap sesi pengguna) status disimpan sebelum setiap sesi pengguna)
 LibraryToBuildPDF=Perpustakaan digunakan untuk pembuatan PDF
 LocalTaxDesc=Beberapa negara dapat menerapkan dua atau tiga pajak pada setiap baris faktur. Jika demikian, pilih jenis untuk pajak kedua dan ketiga beserta tarifnya. Jenis yang mungkin adalah: <br> 1: pajak daerah berlaku untuk produk dan layanan tanpa PPN (pajak lokal dihitung berdasarkan jumlah tanpa pajak) <br> 2: pajak daerah berlaku untuk produk dan layanan termasuk PPN (pajak lokal dihitung berdasarkan jumlah + pajak utama) a0342fccfda19bz 3: pajak lokal berlaku untuk produk tanpa pajak (pajak lokal dihitung berdasarkan jumlah tanpa pajak) <br> 4: pajak lokal berlaku untuk produk termasuk pajak (pajak lokal dihitung atas jumlah + pajak utama) <br> 5: pajak lokal berlaku untuk layanan tanpa pajak (pajak lokal dihitung pada jumlah tanpa pajak) <br> 6: pajak lokal berlaku untuk layanan termasuk PPN (pajak lokal dihitung atas jumlah + pajak)
@@ -482,13 +484,13 @@ ModuleCompanyCodeCustomerDigitaria=%s diikuti oleh nama pelanggan terpotong deng
 ModuleCompanyCodeSupplierDigitaria=%s diikuti oleh nama pemasok terpotong dengan jumlah karakter: %s untuk kode akuntansi pemasok.
 Use3StepsApproval=Secara default, Pesanan Pembelian harus dibuat dan disetujui oleh 2 pengguna yang berbeda (satu langkah / pengguna untuk membuat dan satu langkah / pengguna untuk menyetujui. Perhatikan bahwa jika pengguna memiliki izin untuk membuat dan menyetujui, satu langkah / pengguna akan cukup) . Anda dapat bertanya dengan opsi ini untuk memperkenalkan langkah ketiga / persetujuan pengguna, jika jumlahnya lebih tinggi dari nilai yang ditentukan (jadi 3 langkah diperlukan: 1 = validasi, 2 = persetujuan pertama dan 3 = persetujuan kedua jika jumlahnya cukup). <br> Set ini menjadi kosong jika satu persetujuan (2 langkah) sudah cukup, setel ke nilai yang sangat rendah (0,1) jika persetujuan kedua (3 langkah) selalu diperlukan.
 UseDoubleApproval=Gunakan persetujuan 3 langkah saat jumlah (tanpa pajak) lebih tinggi dari ...
-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=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
+WarningPHPMail=PERINGATAN: Pengaturan untuk mengirim email dari aplikasi menggunakan pengaturan umum default. Seringkali lebih baik mengatur email keluar untuk menggunakan server email Penyedia Layanan Email Anda daripada pengaturan default karena beberapa alasan:
+WarningPHPMailA=- Menggunakan server Penyedia Layanan Email meningkatkan kepercayaan email Anda, sehingga meningkatkan pengiriman tanpa ditandai sebagai SPAM
+WarningPHPMailB=- Beberapa Penyedia Layanan Email (seperti Yahoo) tidak mengizinkan Anda mengirim email dari server lain selain dari server mereka sendiri. Pengaturan Anda saat ini menggunakan server aplikasi untuk mengirim email dan bukan server penyedia email Anda, jadi beberapa penerima (yang kompatibel dengan protokol DMARC terbatas), akan menanyakan penyedia email Anda apakah mereka dapat menerima email Anda dan beberapa penyedia email (seperti Yahoo) mungkin menjawab "tidak" karena server tersebut bukan milik mereka, jadi beberapa Email yang Anda kirim mungkin tidak dapat diterima untuk pengiriman (hati-hati juga dengan kuota pengiriman penyedia email Anda).
+WarningPHPMailC=- Menggunakan server SMTP milik Penyedia Layanan Email Anda sendiri untuk mengirim email juga menarik sehingga semua email yang dikirim dari aplikasi juga akan disimpan ke direktori "Terkirim" di kotak surat Anda.
+WarningPHPMailD=Jika metode 'PHP Mail' benar-benar metode yang ingin Anda gunakan, Anda dapat menghapus peringatan ini dengan menambahkan MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP konstan ke 1 di Home - Setup - Other.
 WarningPHPMail2=Jika penyedia SMTP email Anda perlu membatasi klien email ke beberapa alamat IP (sangat jarang), ini adalah alamat IP dari agen pengguna email (MUA) untuk aplikasi ERP CRM Anda:<strong>%s </strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=Jika nama domain di alamat email pengirim Anda dilindungi oleh data SPF (tanya pendaftar nama domain), Anda harus menambahkan IP berikut di data SPF DNS domain Anda: <strong> %s </strong>.
 ClickToShowDescription=Klik untuk menampilkan deskripsi
 DependsOn=Modul ini membutuhkan modul
 RequiredBy=Modul ini diperlukan oleh modul
@@ -554,9 +556,9 @@ Module54Desc=Manajemen kontrak (layanan atau langganan berulang)
 Module55Name=Barcode
 Module55Desc=Manajemen barcode
 Module56Name=Pembayaran dengan transfer kredit
-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=Manajemen pembayaran pemasok dengan pesanan Transfer Kredit. Ini termasuk pembuatan file SEPA untuk negara-negara Eropa.
+Module57Name=Pembayaran dengan Debit Langsung
+Module57Desc=Pengelolaan pesanan Debit Langsung. Ini termasuk pembuatan file SEPA untuk negara-negara Eropa.
 Module58Name=ClickToDial
 Module58Desc=Integrasi sistem ClickToDial (Asterisk, ...)
 Module60Name=Stiker
@@ -662,13 +664,13 @@ Module50200Desc=Menawarkan pelanggan halaman pembayaran online PayPal (akun PayP
 Module50300Name=Garis
 Module50300Desc=Menawarkan pelanggan halaman pembayaran online Stripe (kartu kredit / debit). Ini dapat digunakan untuk memungkinkan pelanggan Anda melakukan pembayaran ad-hoc atau pembayaran yang terkait dengan objek Dolibarr tertentu (faktur, pesanan, dll ...)
 Module50400Name=Akuntansi (entri ganda)
-Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Manajemen akuntansi (entri ganda, mendukung Buku Besar Umum dan Pembantu). Ekspor buku besar dalam beberapa format perangkat lunak akuntansi lainnya.
 Module54000Name=PrintIPP
 Module54000Desc=Cetak langsung (tanpa membuka dokumen) menggunakan antarmuka Cups IPP (Printer harus terlihat dari server, dan CUPS harus diinstal pada server).
 Module55000Name=Polling, Survei atau Vote
 Module55000Desc=Buat jajak pendapat, survei, atau suara online (seperti Doodle, Studs, RDVz dll ...)
 Module59000Name=Margin
-Module59000Desc=Modul untuk mengelola margin
+Module59000Desc=Modul untuk mengikuti margin
 Module60000Name=Komisi
 Module60000Desc=Modul untuk mengelola komisi
 Module62000Name=Istilah Ekonomi Internasional
@@ -677,7 +679,7 @@ Module63000Name=Sumber daya
 Module63000Desc=Kelola sumber daya (printer, mobil, kamar, ...) untuk dialokasikan ke agenda
 Permission11=Membaca Nota Pelanggan
 Permission12=Membuat/Merubah Nota Pelanggan
-Permission13=Invalidate customer invoices
+Permission13=Faktur pelanggan tidak valid
 Permission14=Validasi Nota Pelanggan
 Permission15=Mengirim Nota Pelanggan Menggunakan EMail
 Permission16=Mencatat Pembayaran Untuk Nota Pelanggan
@@ -694,7 +696,7 @@ Permission32=Membuat/Merubah produk
 Permission34=Menghapus Produk
 Permission36=Lihat / kelola produk tersembunyi
 Permission38=Produk ekspor
-Permission39=Ignore minimum price
+Permission39=Abaikan harga minimum
 Permission41=Baca proyek dan tugas (proyek bersama dan proyek yang saya hubungi). Dapat juga memasukkan waktu yang dikonsumsi, untuk saya atau hierarki saya, pada tugas yang diberikan (absen)
 Permission42=Buat / modifikasi proyek (proyek bersama dan proyek yang saya hubungi). Dapat juga membuat tugas dan menetapkan pengguna untuk proyek dan tugas
 Permission44=Hapus proyek (proyek bersama dan proyek yang saya hubungi)
@@ -703,9 +705,9 @@ Permission61=Baca intervensi
 Permission62=Buat / modifikasi intervensi
 Permission64=Hapus intervensi
 Permission67=Intervensi ekspor
-Permission68=Send interventions by email
-Permission69=Validate interventions
-Permission70=Invalidate interventions
+Permission68=Kirim intervensi melalui email
+Permission69=Validasi intervensi
+Permission70=Intervensi tidak valid
 Permission71=Membaca Data Anggota
 Permission72=Membuat/Merubah Data Anggota
 Permission74=Menghapus Data Anggota
@@ -728,7 +730,7 @@ Permission95=Membaca Laporan
 Permission101=Baca kiriman
 Permission102=Buat / ubah pengiriman
 Permission104=Validasi pengiriman
-Permission105=Send sendings by email
+Permission105=Kirim kiriman melalui email
 Permission106=Pengiriman ekspor
 Permission109=Hapus pengiriman
 Permission111=Baca akun keuangan
@@ -836,11 +838,11 @@ Permission402=Buat / ubah diskon
 Permission403=Validasi diskon
 Permission404=Hapus diskon
 Permission430=Gunakan Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
+Permission511=Baca pembayaran gaji (milik Anda dan bawahan)
 Permission512=Buat / ubah pembayaran gaji
 Permission514=Hapus pembayaran gaji
-Permission517=Read payments of salaries of everybody
-Permission519=Export salaries
+Permission517=Baca pembayaran gaji semua orang
+Permission519=Gaji ekspor
 Permission520=Baca Pinjaman
 Permission522=Buat / modifikasi pinjaman
 Permission524=Hapus pinjaman
@@ -851,19 +853,19 @@ Permission532=Membuat/Merubah Jasa
 Permission534=Menghapus Jasa
 Permission536=Lihat / kelola layanan tersembunyi
 Permission538=Layanan ekspor
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
-Permission601=Read stickers
-Permission602=Create/modify stickers
-Permission609=Delete stickers
+Permission561=Baca perintah pembayaran melalui transfer kredit
+Permission562=Buat / ubah perintah pembayaran melalui transfer kredit
+Permission563=Mengirim / Mengirimkan perintah pembayaran melalui transfer kredit
+Permission564=Catat Debit / Penolakan transfer kredit
+Permission601=Baca stiker
+Permission602=Buat / modifikasi stiker
+Permission609=Hapus stiker
 Permission650=Baca Bills of Material
 Permission651=Buat / Perbarui Bills of Material
 Permission652=Hapus Bills of Material
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission660=Baca Pesanan Pabrikan (MO)
+Permission661=Buat / Perbarui Pesanan Pabrikan (MO)
+Permission662=Hapus Pesanan Pabrikan (MO)
 Permission701=Membaca Sumbangan
 Permission702=Membuat/Merubah Sumbangan
 Permission703=Menghapus Sumbangan
@@ -873,8 +875,8 @@ Permission773=Hapus laporan pengeluaran
 Permission774=Baca semua laporan pengeluaran (bahkan untuk pengguna bukan bawahan)
 Permission775=Menyetujui laporan pengeluaran
 Permission776=Membayar laporan pengeluaran
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=Baca laporan pengeluaran semua orang
+Permission778=Buat / ubah laporan pengeluaran semua orang
 Permission779=Laporan pengeluaran ekspor
 Permission1001=Membaca Stok
 Permission1002=Membuat/Merubah Gudang
@@ -899,9 +901,9 @@ Permission1185=Setujui pesanan pembelian
 Permission1186=Memesan pesanan pembelian
 Permission1187=Mengakui tanda terima pesanan pembelian
 Permission1188=Hapus pesanan pembelian
-Permission1189=Check/Uncheck a purchase order reception
+Permission1189=Centang / Hapus centang pada penerimaan pesanan pembelian
 Permission1190=Menyetujui (persetujuan kedua) pesanan pembelian
-Permission1191=Export supplier orders and their attributes
+Permission1191=Ekspor pesanan pemasok dan atributnya
 Permission1201=Dapatkan hasil ekspor
 Permission1202=Buat / Ubah ekspor
 Permission1231=Baca faktur vendor
@@ -915,8 +917,8 @@ Permission1251=Menjalankan impor massal data eksternal ke dalam basis data (memu
 Permission1321=Ekspor faktur, atribut, dan pembayaran pelanggan
 Permission1322=Buka kembali tagihan yang dibayar
 Permission1421=Ekspor pesanan dan atribut penjualan
-Permission1521=Read documents
-Permission1522=Delete documents
+Permission1521=Baca dokumen
+Permission1522=Hapus dokumen
 Permission2401=Baca tindakan (agenda atau tugas) yang ditautkan dengan akun penggunanya (jika pemilik agenda atau baru saja ditugaskan)
 Permission2402=Buat / modifikasi tindakan (agenda atau tugas) yang ditautkan ke akun penggunanya (jika pemilik agenda)
 Permission2403=Hapus tindakan (agenda atau tugas) yang ditautkan ke akun penggunanya (jika pemilik agenda)
@@ -931,7 +933,7 @@ Permission2515=Siapkan direktori dokumen
 Permission2801=Gunakan klien FTP dalam mode baca (hanya menjelajah dan mengunduh)
 Permission2802=Gunakan klien FTP dalam mode tulis (hapus atau unggah file)
 Permission3200=Baca agenda yang diarsipkan dan sidik jari
-Permission3301=Generate new modules
+Permission3301=Hasilkan modul baru
 Permission4001=Lihat karyawan
 Permission4002=Buat karyawan
 Permission4003=Hapus karyawan
@@ -951,13 +953,13 @@ Permission23001=Baca pekerjaan terjadwal
 Permission23002=Buat / perbarui pekerjaan yang Dijadwalkan
 Permission23003=Hapus pekerjaan terjadwal
 Permission23004=Jalankan pekerjaan yang Dijadwalkan
-Permission50101=Use Point of Sale (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
+Permission50101=Gunakan Point of Sale (SimplePOS)
+Permission50151=Gunakan Point of Sale (TakePOS)
 Permission50201=Membaca Data Transaksi
 Permission50202=Transaksi impor
-Permission50330=Read objects of Zapier
-Permission50331=Create/Update objects of Zapier
-Permission50332=Delete objects of Zapier
+Permission50330=Membaca objek Zapier
+Permission50331=Buat / Perbarui objek Zapier
+Permission50332=Hapus objek Zapier
 Permission50401=Ikat produk dan faktur dengan akun akuntansi
 Permission50411=Baca operasi dalam buku besar
 Permission50412=Tulis / Edit operasi dalam buku besar
@@ -981,21 +983,21 @@ Permission63001=Baca sumber daya
 Permission63002=Buat / modifikasi sumber daya
 Permission63003=Hapus sumber daya
 Permission63004=Tautkan sumber daya ke agenda agenda
-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=Izinkan pencetakan langsung
+Permission67000=Izinkan pencetakan tanda terima
+Permission68001=Baca laporan intracomm
+Permission68002=Membuat / mengubah laporan intracomm
+Permission68004=Hapus laporan intracomm
+Permission941601=Tanda terima telah dibaca
+Permission941602=Membuat dan mengubah tanda terima
+Permission941603=Validasi tanda terima
+Permission941604=Kirim tanda terima melalui email
+Permission941605=Ekspor tanda terima
+Permission941606=Hapus tanda terima
 DictionaryCompanyType=Jenis pihak ketiga
 DictionaryCompanyJuridicalType=Badan hukum pihak ketiga
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
+DictionaryProspectLevel=Tingkat prospek potensial bagi perusahaan
+DictionaryProspectContactLevel=Tingkatkan prospek potensial untuk kontak
 DictionaryCanton=Negara Bagian / Provinsi
 DictionaryRegion=Daerah
 DictionaryCountry=Negara
@@ -1025,14 +1027,14 @@ DictionaryEMailTemplates=Template Email
 DictionaryUnits=Unit
 DictionaryMeasuringUnits=Unit Pengukur
 DictionarySocialNetworks=Jaringan sosial
-DictionaryProspectStatus=Prospect status for companies
-DictionaryProspectContactStatus=Prospect status for contacts
+DictionaryProspectStatus=Status prospek untuk perusahaan
+DictionaryProspectContactStatus=Status prospek untuk kontak
 DictionaryHolidayTypes=Jenis cuti
 DictionaryOpportunityStatus=Status memimpin untuk proyek / prospek
 DictionaryExpenseTaxCat=Laporan biaya - Kategori transportasi
 DictionaryExpenseTaxRange=Laporan biaya - Kisaran berdasarkan kategori transportasi
-DictionaryTransportMode=Intracomm report - Transport mode
-TypeOfUnit=Type of unit
+DictionaryTransportMode=Laporan Intracomm - Mode transportasi
+TypeOfUnit=Jenis unit
 SetupSaved=Pengaturan disimpan
 SetupNotSaved=Pengaturan tidak disimpan
 BackToModuleList=Kembali ke daftar Modul
@@ -1083,7 +1085,7 @@ LabelUsedByDefault=Label digunakan secara default jika tidak ada terjemahan yang
 LabelOnDocuments=Beri label pada dokumen
 LabelOrTranslationKey=Label atau kunci terjemahan
 ValueOfConstantKey=Nilai konstanta konfigurasi
-ConstantIsOn=Option %s is on
+ConstantIsOn=Opsi %s aktif
 NbOfDays=Jumlah hari
 AtEndOfMonth=diakhir bulan
 CurrentNext=Sekarang / selanjutnya
@@ -1128,7 +1130,7 @@ LoginPage=Halaman masuk
 BackgroundImageLogin=Gambar latar belakang
 PermanentLeftSearchForm=Formulir pencarian permanen di menu sebelah kiri
 DefaultLanguage=Bahasa default
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
+EnableMultilangInterface=Aktifkan dukungan multibahasa untuk hubungan pelanggan atau vendor
 EnableShowLogo=Tampilkan logo perusahaan di menu
 CompanyInfo=Perusahaan/Organisasi
 CompanyIds=Identitas Perusahaan / Organisasi
@@ -1182,7 +1184,7 @@ InfoWebServer=Tentang Server Web
 InfoDatabase=Tentang Basis Data
 InfoPHP=Tentang PHP
 InfoPerf=Tentang Pertunjukan
-InfoSecurity=About Security
+InfoSecurity=Tentang Keamanan
 BrowserName=Nama peramban
 BrowserOS=OS peramban
 ListOfSecurityEvents=Daftar agenda keamanan Dolibarr
@@ -1233,7 +1235,7 @@ RestoreDesc2=Kembalikan file cadangan (misalnya file zip) dari direktori "dokume
 RestoreDesc3=Kembalikan struktur database dan data dari file dump cadangan ke dalam database instalasi Dolibarr baru atau ke dalam database instalasi saat ini (<b> %s </b>). Peringatan, setelah pemulihan selesai, Anda harus menggunakan login / kata sandi, yang ada dari waktu cadangan / instalasi untuk terhubung lagi. <br> Untuk mengembalikan database cadangan ke dalam instalasi saat ini, Anda dapat mengikuti asisten ini.
 RestoreMySQL=Impor MySQL
 ForcedToByAModule=Aturan ini dipaksa untuk<b>%s</b>oleh modul yang diaktifkan
-ValueIsForcedBySystem=This value is forced by the system. You can't change it.
+ValueIsForcedBySystem=Nilai ini dipaksakan oleh sistem. Anda tidak bisa mengubahnya.
 PreviousDumpFiles=File cadangan yang ada
 PreviousArchiveFiles=File arsip yang ada
 WeekStartOnDay=Hari pertama dalam seminggu
@@ -1294,8 +1296,8 @@ WarningAtLeastKeyOrTranslationRequired=Kriteria pencarian diperlukan setidaknya
 NewTranslationStringToShow=String terjemahan baru untuk ditampilkan
 OriginalValueWas=Terjemahan aslinya ditimpa. Nilai asli adalah: <br> <br> %s
 TransKeyWithoutOriginalValue=Anda memaksa terjemahan baru untuk kunci terjemahan '<strong> %s </strong>' yang tidak ada dalam file bahasa apa pun
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Modul yang diaktifkan
+TotalNumberOfActivatedModules=Modul yang diaktifkan: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Anda setidaknya harus mengaktifkan 1 modul
 ClassNotFoundIntoPathWarning=Kelas %s tidak ditemukan di jalur PHP
 YesInSummer=Ya di musim panas
@@ -1306,7 +1308,7 @@ YouUseBestDriver=Anda menggunakan driver %s yang merupakan driver terbaik yang s
 YouDoNotUseBestDriver=Anda menggunakan driver %s tetapi driver %s disarankan.
 NbOfObjectIsLowerThanNoPb=Anda hanya memiliki %s %s dalam database. Ini tidak memerlukan optimasi tertentu.
 SearchOptim=Optimasi pencarian
-YouHaveXObjectUseSearchOptim=Anda memiliki %s %s dalam database. Anda harus menambahkan konstanta %s ke 1 di Home-Setup-Other. Batasi pencarian hingga awal string yang memungkinkan database menggunakan indeks dan Anda harus segera mendapat respons.
+YouHaveXObjectUseSearchOptim=Anda memiliki %s %s di database. Anda dapat menambahkan konstanta %s ke 1 di Home-Setup-Other. Batasi pencarian hingga awal string yang memungkinkan database menggunakan indeks dan Anda akan mendapatkan respons segera.
 YouHaveXObjectAndSearchOptimOn=Anda memiliki %s %s di database dan konstanta %s diatur ke 1 di Home-Setup-Other.
 BrowserIsOK=Anda menggunakan browser web %s. Browser ini ok untuk keamanan dan kinerja.
 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.
@@ -1314,7 +1316,7 @@ 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".
 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".
-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".
+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
 FillThisOnlyIfRequired=Contoh: +2 (isi hanya jika masalah offset zona waktu dialami)
@@ -1322,7 +1324,7 @@ GetBarCode=Dapatkan barcode
 NumberingModules=Model penomoran
 DocumentModules=Model dokumen
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Kembalikan kata sandi yang dibuat sesuai dengan algoritma Dolibarr internal: karakter %s yang berisi angka dan karakter bersama dalam huruf kecil.
 PasswordGenerationNone=Jangan menyarankan kata sandi yang dihasilkan. Kata sandi harus diketik secara manual.
 PasswordGenerationPerso=Kembalikan kata sandi sesuai dengan konfigurasi yang Anda tentukan secara pribadi.
 SetupPerso=Menurut konfigurasi Anda
@@ -1421,7 +1423,7 @@ AdherentMailRequired=Diperlukan email untuk membuat anggota baru
 MemberSendInformationByMailByDefault=Kotak centang untuk mengirim konfirmasi email kepada anggota (validasi atau berlangganan baru) diaktifkan secara default
 VisitorCanChooseItsPaymentMode=Pengunjung dapat memilih dari mode pembayaran yang tersedia
 MEMBER_REMINDER_EMAIL=Aktifkan pengingat otomatis<b>melalui email</b>dari langganan yang kedaluwarsa. Catatan: Modul<strong>%s </strong> harus diaktifkan dan diatur dengan benar untuk mengirim pengingat.
-MembersDocModules=Document templates for documents generated from member record
+MembersDocModules=Templat dokumen untuk dokumen yang dihasilkan dari catatan anggota
 ##### LDAP setup #####
 LDAPSetup=Pengaturan LDAP
 LDAPGlobalParameters=Parameter Global
@@ -1564,9 +1566,9 @@ LDAPDescValues=Nilai contoh dirancang untuk<b>OpenLDAP</b>dengan skema dimuat be
 ForANonAnonymousAccess=Untuk akses yang diautentikasi (misalnya untuk akses tulis)
 PerfDolibarr=Pengaturan kinerja / laporan optimalisasi
 YouMayFindPerfAdviceHere=Halaman ini menyediakan beberapa pemeriksaan atau saran yang berkaitan dengan kinerja.
-NotInstalled=Not installed.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
+NotInstalled=Tidak terpasang.
+NotSlowedDownByThis=Tidak diperlambat oleh ini.
+NotRiskOfLeakWithThis=Tidak ada resiko bocor dengan ini.
 ApplicativeCache=Cache yang berlaku
 MemcachedNotAvailable=Tidak ditemukan cache aplikatif. Anda dapat meningkatkan kinerja dengan menginstal server cache Memcached dan modul dapat menggunakan server cache ini. <br> Informasi lebih lanjut di sini <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN"> http://wiki.dolibarr.org/index.php/Module_MemCached_EN </a>. <br> Perhatikan bahwa banyak penyedia hosting web tidak menyediakan server cache seperti itu.
 MemcachedModuleAvailableButNotSetup=Modul memcached untuk cache aplikatif ditemukan tetapi pengaturan modul tidak lengkap.
@@ -1596,8 +1598,13 @@ ServiceSetup=Pengaturan modul layanan
 ProductServiceSetup=Pengaturan modul Produk dan Layanan
 NumberOfProductShowInSelect=Jumlah maksimum produk yang ditampilkan dalam daftar pilihan kombo (0 = tanpa batas)
 ViewProductDescInFormAbility=Tampilkan deskripsi produk dalam bentuk (jika tidak ditampilkan dalam popup tooltip)
+DoNotAddProductDescAtAddLines=Jangan tambahkan deskripsi produk (dari kartu produk) saat mengirimkan tambahkan baris pada formulir
+OnProductSelectAddProductDesc=Cara menggunakan deskripsi produk saat menambahkan produk sebagai baris dokumen
+AutoFillFormFieldBeforeSubmit=Isi kolom input deskripsi secara otomatis dengan deskripsi produk
+DoNotAutofillButAutoConcat=Jangan isi otomatis kolom input dengan deskripsi produk. Deskripsi produk akan digabungkan dengan deskripsi yang dimasukkan secara otomatis.
+DoNotUseDescriptionOfProdut=Deskripsi produk tidak akan pernah dimasukkan ke dalam deskripsi baris dokumen
 MergePropalProductCard=Aktifkan di produk / layanan File Terlampir tab pilihan untuk menggabungkan dokumen PDF produk ke proposal PDF azur jika produk / layanan ada di proposal
-ViewProductDescInThirdpartyLanguageAbility=Tampilkan deskripsi produk dalam bahasa pihak ketiga
+ViewProductDescInThirdpartyLanguageAbility=Menampilkan deskripsi produk dalam bentuk dalam bahasa pihak ketiga (sebaliknya dalam bahasa pengguna)
 UseSearchToSelectProductTooltip=Juga jika Anda memiliki sejumlah besar produk (> 100.000), Anda dapat meningkatkan kecepatan dengan menetapkan konstan PRODUCT_DONOTSEARCH_ANYWHERE ke 1 di Pengaturan-> Lainnya. Pencarian kemudian akan dibatasi untuk memulai string.
 UseSearchToSelectProduct=Tunggu hingga Anda menekan tombol sebelum memuat konten dari daftar kombo produk (Ini dapat meningkatkan kinerja jika Anda memiliki sejumlah besar produk, tetapi itu kurang nyaman)
 SetDefaultBarcodeTypeProducts=Jenis barcode default untuk digunakan untuk produk
@@ -1614,9 +1621,9 @@ SyslogLevel=Tingkat
 SyslogFilename=Nama file dan jalur
 YouCanUseDOL_DATA_ROOT=Anda dapat menggunakan DOL_DATA_ROOT / dolibarr.log untuk file log di direktori "dokumen" Dolibarr. Anda dapat mengatur jalur lain untuk menyimpan file ini.
 ErrorUnknownSyslogConstant=Constant %s bukan konstanta Syslog yang dikenal
-OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
+OnlyWindowsLOG_USER=Di Windows, hanya fasilitas LOG_USER yang akan didukung
 CompressSyslogs=Kompresi dan cadangan file log debug (dihasilkan oleh modul Log untuk debug)
-SyslogFileNumberOfSaves=Number of backup logs to keep
+SyslogFileNumberOfSaves=Jumlah log cadangan yang harus disimpan
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Konfigurasikan pekerjaan terjadwal untuk mengatur frekuensi cadangan log
 ##### Donations #####
 DonationsSetup=Pengaturan modul donasi
@@ -1672,7 +1679,7 @@ AdvancedEditor=Editor tingkat lanjut
 ActivateFCKeditor=Aktifkan editor lanjutan untuk:
 FCKeditorForCompany=WYSIWIG pembuatan / edisi deskripsi elemen dan catatan (kecuali produk / layanan)
 FCKeditorForProduct=WYSIWIG pembuatan / edisi deskripsi produk dan layanan / catatan
-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>
+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>
 FCKeditorForMailing= Pembuatan / edisi WYSIWIG untuk eMailing massal (Alat-> eMailing)
 FCKeditorForUserSignature=WYSIWIG pembuatan / edisi tanda tangan pengguna
 FCKeditorForMail=Pembuatan / edisi WYSIWIG untuk semua email (kecuali Tools-> eMailing)
@@ -1682,14 +1689,14 @@ StockSetup=Pengaturan modul stok
 IfYouUsePointOfSaleCheckModule=Jika Anda menggunakan modul Point of Sale (POS) yang disediakan secara default atau modul eksternal, pengaturan ini mungkin diabaikan oleh modul POS Anda. Sebagian besar modul POS dirancang secara default untuk membuat faktur segera dan mengurangi stok terlepas dari opsi di sini. Jadi jika Anda perlu atau tidak memiliki penurunan stok saat mendaftarkan penjualan dari POS Anda, periksa juga pengaturan modul POS Anda.
 ##### Menu #####
 MenuDeleted=Menu dihapus
-Menu=Menu
+Menu=Tidak bisa
 Menus=Menu
 TreeMenuPersonalized=Menu yang dipersonalisasi
 NotTopTreeMenuPersonalized=Menu yang dipersonalisasi tidak ditautkan ke entri menu teratas
 NewMenu=Menu baru
 MenuHandler=Penangan menu
 MenuModule=Modul sumber
-HideUnauthorizedMenu= Sembunyikan menu yang tidak sah (abu-abu)
+HideUnauthorizedMenu=Sembunyikan juga menu yang tidak sah untuk pengguna internal (berwarna abu-abu jika tidak)
 DetailId=Menu id
 DetailMenuHandler=Penangan menu tempat menampilkan menu baru
 DetailMenuModule=Nama modul jika entri menu berasal dari modul
@@ -1737,16 +1744,16 @@ AGENDA_USE_EVENT_TYPE=Gunakan jenis agenda (dikelola dalam Pengaturan menu -> Ka
 AGENDA_USE_EVENT_TYPE_DEFAULT=Secara otomatis mengatur nilai default ini untuk jenis agenda di agenda buat formulir
 AGENDA_DEFAULT_FILTER_TYPE=Secara otomatis mengatur jenis agenda ini di filter pencarian tampilan agenda
 AGENDA_DEFAULT_FILTER_STATUS=Secara otomatis mengatur status ini untuk agenda di filter pencarian tampilan agenda
-AGENDA_DEFAULT_VIEW=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=Tampilan mana yang ingin Anda buka secara default saat memilih menu Agenda
+AGENDA_REMINDER_BROWSER=Aktifkan pengingat acara <b> pada browser pengguna </b> (Ketika tanggal pengingat tercapai, popup ditampilkan oleh browser. Setiap pengguna dapat menonaktifkan pemberitahuan tersebut dari pengaturan pemberitahuan browser).
 AGENDA_REMINDER_BROWSER_SOUND=Aktifkan pemberitahuan suara
-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 task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL=Aktifkan pengingat acara <b> melalui email </b> (opsi pengingat / penundaan dapat ditentukan pada setiap acara).
+AGENDA_REMINDER_EMAIL_NOTE=Catatan: Frekuensi tugas %s harus cukup untuk memastikan bahwa pengingat dikirim pada saat yang tepat.
 AGENDA_SHOW_LINKED_OBJECT=Tampilkan objek yang ditautkan ke tampilan agenda
 ##### Clicktodial #####
 ClickToDialSetup=Klik Untuk Memanggil pengaturan modul
 ClickToDialUrlDesc=Url dipanggil ketika klik pada telepon picto dilakukan. Di URL, Anda dapat menggunakan tag <br><b>__PHONETO__</b>yang akan diganti dengan nomor telepon orang untuk memanggil <br><b>__PHONEFROM__</b>yang akan diganti dengan nomor telepon memanggil orang (Anda) <br><b>__LOGIN__</b>yang akan diganti dengan clicktodial login (didefinisikan pada kartu pengguna) <br><b>__PASS__</b>yang akan diganti dengan password clicktodial (didefinisikan pada kartu pengguna).
-ClickToDialDesc=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=Modul ini mengubah nomor telepon, saat menggunakan komputer desktop, menjadi tautan yang dapat diklik. Satu klik akan memanggil nomor tersebut. Ini dapat digunakan untuk memulai panggilan telepon saat menggunakan telepon lunak di desktop Anda atau saat menggunakan sistem CTI berdasarkan protokol SIP misalnya. Catatan: Saat menggunakan ponsel cerdas, nomor telepon selalu dapat diklik.
 ClickToDialUseTelLink=Gunakan hanya tautan "tel:" pada nomor telepon
 ClickToDialUseTelLinkDesc=Gunakan metode ini jika pengguna Anda memiliki softphone atau antarmuka perangkat lunak yang diinstal pada komputer yang sama dengan browser, dan dipanggil ketika Anda mengklik tautan di browser Anda yang dimulai dengan "tel:". Jika Anda memerlukan solusi server lengkap (tidak perlu instalasi perangkat lunak lokal), Anda harus mengatur ini ke "Tidak" dan isi kolom selanjutnya.
 ##### Point Of Sale (CashDesk) #####
@@ -1876,7 +1883,7 @@ EnterAnyCode=Baris ini berisi referensi untuk mengidentifikasi baris. Masukkan n
 Enter0or1=Masukkan 0 atau 1
 UnicodeCurrency=Masukkan di sini di antara kurung kurawal, daftar nomor byte yang mewakili simbol mata uang. Misalnya: untuk $, masukkan [36] - untuk brazil real R $ [82,36] - untuk €, masukkan [8364]
 ColorFormat=Warna RGB dalam format HEX, mis .: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+PictoHelp=Nama ikon dalam format dolibarr ('image.png' jika masuk ke direktori tema saat ini, 'image.png@nom_du_module' jika masuk ke direktori / img / modul)
 PositionIntoComboList=Posisi baris ke dalam daftar kombo
 SellTaxRate=Tarif pajak penjualan
 RecuperableOnly=Ya untuk PPN "Tidak Ditanggapi tetapi Dapat Dipulihkan" yang didedikasikan untuk beberapa negara bagian di Prancis. Simpan nilai "Tidak" dalam semua kasus lainnya.
@@ -1907,7 +1914,7 @@ MailToSendReception=Penerimaan
 MailToThirdparty=Pihak Ketiga
 MailToMember=Anggota
 MailToUser=Pengguna
-MailToProject=Projects
+MailToProject=Proyek
 MailToTicket=Tiket
 ByDefaultInList=Tampilkan secara default pada tampilan daftar
 YouUseLastStableVersion=Anda menggunakan versi stabil terbaru
@@ -1917,7 +1924,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s tersedia. Versi %s ada
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s tersedia. Versi %s adalah versi pemeliharaan, jadi hanya berisi perbaikan bug. Kami menyarankan semua pengguna untuk meningkatkan ke versi ini. Rilis pemeliharaan tidak memperkenalkan fitur baru atau perubahan pada database. Anda dapat mengunduhnya dari area unduhan https://www.dolibarr.org portal (subdirektori versi Stabil). Anda dapat membaca <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> untuk daftar lengkap perubahan.
 MultiPriceRuleDesc=Ketika opsi "Beberapa tingkat harga per produk / layanan" diaktifkan, Anda dapat menentukan harga yang berbeda (satu per tingkat harga) untuk setiap produk. Untuk menghemat waktu Anda, di sini Anda dapat memasukkan aturan untuk secara otomatis menghitung ulang harga untuk setiap level berdasarkan harga level pertama, jadi Anda hanya perlu memasukkan harga untuk level pertama untuk setiap produk. Halaman ini dirancang untuk menghemat waktu Anda tetapi hanya berguna jika harga Anda untuk setiap level relatif terhadap level pertama. Anda dapat mengabaikan halaman ini dalam banyak kasus.
 ModelModulesProduct=Template untuk dokumen produk
-WarehouseModelModules=Templates for documents of warehouses
+WarehouseModelModules=Template untuk dokumen gudang
 ToGenerateCodeDefineAutomaticRuleFirst=Agar dapat menghasilkan kode secara otomatis, Anda harus terlebih dahulu menetapkan manajer untuk secara otomatis menentukan nomor kode batang.
 SeeSubstitutionVars=Lihat * catatan untuk daftar kemungkinan variabel substitusi
 SeeChangeLog=Lihat file ChangeLog (hanya bahasa Inggris)
@@ -1956,7 +1963,7 @@ MAIN_PDF_MARGIN_LEFT=Margin kiri pada PDF
 MAIN_PDF_MARGIN_RIGHT=Margin kanan pada PDF
 MAIN_PDF_MARGIN_TOP=Margin teratas pada PDF
 MAIN_PDF_MARGIN_BOTTOM=Margin bawah pada PDF
-MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Tinggi untuk logo di PDF
 NothingToSetup=Tidak diperlukan pengaturan khusus untuk modul ini.
 SetToYesIfGroupIsComputationOfOtherGroups=Setel ini menjadi ya jika grup ini merupakan perhitungan grup lain
 EnterCalculationRuleIfPreviousFieldIsYes=Masukkan aturan kalkulasi jika baris sebelumnya disetel ke Ya (Misalnya 'CODEGRP1 + CODEGRP2')
@@ -1983,11 +1990,12 @@ EMailHost=Host server IMAP email
 MailboxSourceDirectory=Direktori sumber kotak surat
 MailboxTargetDirectory=Direktori target kotak surat
 EmailcollectorOperations=Operasi yang harus dilakukan oleh kolektor
+EmailcollectorOperationsDesc=Operasi dijalankan dari urutan atas ke bawah
 MaxEmailCollectPerCollect=Jumlah email maksimum yang dikumpulkan per kumpulkan
 CollectNow=Kumpulkan sekarang
 ConfirmCloneEmailCollector=Anda yakin ingin mengkloning kolektor Email %s?
-DateLastCollectResult=Tanggal kumpulkan terbaru dicoba
-DateLastcollectResultOk=Tanggal terbaru kumpulkan berhasill
+DateLastCollectResult=Tanggal percobaan koleksi terbaru
+DateLastcollectResultOk=Tanggal keberhasilan koleksi terbaru
 LastResult=Hasil terbaru
 EmailCollectorConfirmCollectTitle=Konfirmasi pengumpulan email
 EmailCollectorConfirmCollect=Apakah Anda ingin menjalankan koleksi untuk kolektor ini sekarang?
@@ -1996,16 +2004,16 @@ 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=Create ticket (and link to third party if it was loaded by a previous operation)
+CreateTicketAndThirdParty=Buat tiket (dan tautkan ke pihak ketiga jika dimuat oleh operasi sebelumnya)
 CodeLastResult=Kode hasil terbaru
 NbOfEmailsInInbox=Jumlah email dalam direktori sumber
 LoadThirdPartyFromName=Muat pihak ketiga yang mencari di %s (hanya memuat)
 LoadThirdPartyFromNameOrCreate=Muat pencarian pihak ketiga di %s (buat jika tidak ditemukan)
-WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
-WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
-WithDolTrackingIDInMsgId=Message sent from Dolibarr
-WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+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
+WithoutDolTrackingIDInMsgId=Pesan TIDAK dikirim dari Dolibarr
+CreateCandidature=Buat lamaran kerja
 FormatZip=Kode Pos
 MainMenuCode=Kode entri menu (mainmenu)
 ECMAutoTree=Tampilkan pohon ECM otomatis
@@ -2019,7 +2027,7 @@ DisabledResourceLinkContact=Nonaktifkan fitur untuk menautkan sumber daya ke kon
 EnableResourceUsedInEventCheck=Aktifkan fitur untuk memeriksa apakah sumber daya digunakan dalam suatu agenda
 ConfirmUnactivation=Konfirmasikan setel ulang modul
 OnMobileOnly=Hanya pada layar kecil (smartphone)
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
+DisableProspectCustomerType=Nonaktifkan jenis pihak ketiga "Prospek + Pelanggan" (sehingga pihak ketiga haruslah "Prospek" atau "Pelanggan", tetapi tidak boleh keduanya)
 MAIN_OPTIMIZEFORTEXTBROWSER=Sederhanakan antarmuka untuk orang buta
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Aktifkan opsi ini jika Anda adalah orang buta, atau jika Anda menggunakan aplikasi dari peramban teks seperti Lynx atau Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Ubah warna antarmuka untuk orang buta warna
@@ -2041,15 +2049,15 @@ UseDebugBar=Gunakan bilah debug
 DEBUGBAR_LOGS_LINES_NUMBER=Jumlah baris log terakhir untuk disimpan di konsol
 WarningValueHigherSlowsDramaticalyOutput=Peringatan, nilai yang lebih tinggi memperlambat output yang dramatis
 ModuleActivated=Modul %s diaktifkan dan memperlambat antarmuka
-IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
-AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+IfYouAreOnAProductionSetThis=Jika Anda berada di lingkungan produksi, Anda harus menyetel properti ini ke %s.
+AntivirusEnabledOnUpload=Antivirus diaktifkan pada file yang diunggah
 EXPORTS_SHARE_MODELS=Model ekspor dibagi dengan semua orang
 ExportSetup=Pengaturan ekspor modul
 ImportSetup=Pengaturan impor modul
 InstanceUniqueID=ID unik dari instance
 SmallerThan=Lebih kecil dari
 LargerThan=lebih besar dari
-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=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 tindakan ini untuk menggunakan konten email untuk menemukan dan memuat pihak ketiga yang ada di database Anda. Pihak ketiga yang ditemukan (atau dibuat) akan digunakan untuk mengikuti tindakan yang membutuhkannya. Di baris parameter Anda dapat menggunakan misalnya 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)' jika Anda ingin mengekstrak nama pihak ketiga dari string 'Nama: nama untuk menemukan' ditemukan di dalam tubuh.
@@ -2073,13 +2081,17 @@ RssNote=Catatan: Setiap definisi umpan RSS menyediakan widget yang harus Anda ak
 JumpToBoxes=Langsung ke Pengaturan -> Widget
 MeasuringUnitTypeDesc=Gunakan di sini nilai seperti "ukuran", "permukaan", "volume", "berat", "waktu"
 MeasuringScaleDesc=Skala adalah jumlah tempat Anda harus memindahkan bagian desimal untuk mencocokkan unit referensi default. Untuk tipe unit "waktu", itu adalah jumlah detik. Nilai antara 80 dan 99 adalah nilai yang dicadangkan.
-TemplateAdded=Template added
-TemplateUpdated=Template updated
-TemplateDeleted=Template deleted
-MailToSendEventPush=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 module may expose sensitive data. If you don't need it, disable it.
-ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+TemplateAdded=Template ditambahkan
+TemplateUpdated=Template diperbarui
+TemplateDeleted=Template dihapus
+MailToSendEventPush=Email pengingat acara
+SwitchThisForABetterSecurity=Direkomendasikan untuk mengganti nilai ini ke %s untuk keamanan lebih
+DictionaryProductNature= Sifat produk
+CountryIfSpecificToOneCountry=Negara (jika khusus untuk negara tertentu)
+YouMayFindSecurityAdviceHere=Anda mungkin menemukan nasihat keamanan di sini
+ModuleActivatedMayExposeInformation=Modul ini dapat mengekspos data sensitif. Jika Anda tidak membutuhkannya, nonaktifkan.
+ModuleActivatedDoNotUseInProduction=Modul yang dirancang untuk pengembangan telah diaktifkan. Jangan mengaktifkannya di lingkungan produksi.
+CombinationsSeparator=Karakter pemisah untuk kombinasi produk
+SeeLinkToOnlineDocumentation=Lihat tautan ke dokumenter online di menu atas untuk mengetahui contohnya
+SHOW_SUBPRODUCT_REF_IN_PDF=Jika fitur "%s" modul <b> %s </b> digunakan, tampilkan detail subproduk kit di PDF.
+AskThisIDToYourBank=Hubungi bank Anda untuk mendapatkan ID ini
diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang
index 4f6a68201fd..d7bdb21cbd5 100644
--- a/htdocs/langs/id_ID/banks.lang
+++ b/htdocs/langs/id_ID/banks.lang
@@ -173,10 +173,11 @@ SEPAMandate=Mandat SEPA
 YourSEPAMandate=Mandat SEPA Anda
 FindYourSEPAMandate=Ini adalah mandat SEPA Anda untuk mengotorisasi perusahaan kami untuk melakukan pemesanan debit langsung ke bank Anda. Kembalikan ditandatangani (pindai dokumen yang ditandatangani) atau kirimkan melalui pos ke
 AutoReportLastAccountStatement=Isi kolom 'nomor rekening bank' secara otomatis dengan nomor pernyataan terakhir saat melakukan rekonsiliasi
-CashControl=Pagar kas POS
-NewCashFence=Pagar uang tunai baru
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Warnai gerakan
 BankColorizeMovementDesc=Jika fungsi ini diaktifkan, Anda dapat memilih warna latar belakang spesifik untuk gerakan debit atau kredit
 BankColorizeMovementName1=Warna latar belakang untuk pergerakan debit
 BankColorizeMovementName2=Warna latar belakang untuk pergerakan kredit
 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
diff --git a/htdocs/langs/id_ID/blockedlog.lang b/htdocs/langs/id_ID/blockedlog.lang
index 6e33a07b94f..45c2d2264dd 100644
--- a/htdocs/langs/id_ID/blockedlog.lang
+++ b/htdocs/langs/id_ID/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Penghapusan donasi logis
 logMEMBER_SUBSCRIPTION_CREATE=Langganan anggota dibuat
 logMEMBER_SUBSCRIPTION_MODIFY=Langganan anggota diubah
 logMEMBER_SUBSCRIPTION_DELETE=Penghapusan logis langganan anggota
-logCASHCONTROL_VALIDATE=Rekaman pagar uang tunai
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Unduhan faktur pelanggan
 BlockedLogBillPreview=Pratinjau faktur pelanggan
 BlockedlogInfoDialog=Detail Log
diff --git a/htdocs/langs/id_ID/boxes.lang b/htdocs/langs/id_ID/boxes.lang
index d4ae8002577..9ffe9c3402a 100644
--- a/htdocs/langs/id_ID/boxes.lang
+++ b/htdocs/langs/id_ID/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Donasi terbaru %s yang dimodifikasi
 BoxTitleLastModifiedExpenses=Laporan pengeluaran termodifikasi %s terbaru
 BoxTitleLatestModifiedBoms=BOM dimodifikasi %s terbaru
 BoxTitleLatestModifiedMos=Modifikasi Pesanan Manufaktur %s terbaru
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Aktivitas global (faktur, proposal, pesanan)
 BoxGoodCustomers=Pelanggan yang baik
 BoxTitleGoodCustomers=%s Pelanggan yang baik
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Gagal menyegarkan fluks RSS. Tanggal penyegaran yang sukses terakhir: %s
 LastRefreshDate=Tanggal penyegaran terbaru
 NoRecordedBookmarks=Tidak ada penanda yang ditentukan.
@@ -92,8 +95,8 @@ LastXMonthRolling=Rolling bulan %s terbaru
 ChooseBoxToAdd=Tambahkan widget ke dasbor Anda
 BoxAdded=Widget ditambahkan di dasbor Anda
 BoxTitleUserBirthdaysOfMonth=Ulang tahun bulan ini (pengguna)
-BoxLastManualEntries=Entri manual terakhir dalam akuntansi
-BoxTitleLastManualEntries=entri manual terbaru %s
+BoxLastManualEntries=Latest record in accountancy entered manually or without source document
+BoxTitleLastManualEntries=%s latest record entered manually or without source document
 NoRecordedManualEntries=Tidak ada entri manual yang dicatat dalam akuntansi
 BoxSuspenseAccount=Hitung operasi akuntansi dengan akun suspense
 BoxTitleSuspenseAccount=Jumlah garis yang tidak terisi
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Akun penangguhan tidak ditentukan
 BoxLastCustomerShipments=Pengiriman pelanggan terakhir
 BoxTitleLastCustomerShipments=Pengiriman pelanggan %s terbaru
 NoRecordedShipments=Tidak ada pengiriman pelanggan yang direkam
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Akuntansi
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/id_ID/cashdesk.lang b/htdocs/langs/id_ID/cashdesk.lang
index bc39b8bf56b..b18ea4ad4a5 100644
--- a/htdocs/langs/id_ID/cashdesk.lang
+++ b/htdocs/langs/id_ID/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Catatan Kaki
 AmountAtEndOfPeriod=Jumlah pada akhir periode (hari, bulan atau tahun)
 TheoricalAmount=Jumlah teoretis
 RealAmount=Jumlah nyata
-CashFence=Anggaran uang tunai
-CashFenceDone=Anggaran uang tunai yang dilakukan untuk periode tersebut
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb faktur
 Paymentnumpad=Jenis Pad untuk memasukkan pembayaran
 Numberspad=Angka pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Modul penomoran untuk penjualan POS
 CashDeskGenericMaskCodes6 =  tag <br><b>{TN}</b>digunakan untuk menambahkan nomor terminal
 TakeposGroupSameProduct=Kelompokkan lini produk yang sama
 StartAParallelSale=Mulai penjualan paralel baru
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Tutup pagar uang
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Laporan tunai
 MainPrinterToUse=Printer utama untuk digunakan
 OrderPrinterToUse=Memesan printer untuk digunakan
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/id_ID/categories.lang b/htdocs/langs/id_ID/categories.lang
index 15b8b143200..d37a907add2 100644
--- a/htdocs/langs/id_ID/categories.lang
+++ b/htdocs/langs/id_ID/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Area label/kategori Proyek
 UsersCategoriesArea=Area label/kategori Pengguna
 SubCats=Sub-kategori
 CatList=Daftar label/kategori
+CatListAll=List of tags/categories (all types)
 NewCategory=Label/kategori baru
 ModifCat=Ubah label/kategori
 CatCreated=Label/kategori dibuat
@@ -65,16 +66,22 @@ UsersCategoriesShort=Label/kategori pengguna
 StockCategoriesShort=Label/kategori gudang
 ThisCategoryHasNoItems=Kategori ini tidak mengandung barang apa pun.
 CategId=Label/id kategori
-CatSupList=Daftar label/kategori vendor
-CatCusList=Daftar label/kategori pelanggan/prospek
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Daftar label/kategori produk
 CatMemberList=Daftar label/kategori anggota
-CatContactList=Daftar label/kategori kontak
-CatSupLinks=Tautan antara pemasok dan label/kategori
+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=Tautan antara pelanggan/prospek dan label/kategori
 CatContactsLinks=Tautan antara kontak/alamat dan label/kategori
 CatProdLinks=Tautan antara produk/layanan dan label/kategori
-CatProJectLinks=Tautan antara proyek dan label/kategori
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Tautan antara proyek dan label/kategori
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Hapus dari label/kategori
 ExtraFieldsCategories=Atribut pelengkap
 CategoriesSetup=Pengaturan label/kategori
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index 3dd19063424..08b96e96903 100644
--- a/htdocs/langs/id_ID/companies.lang
+++ b/htdocs/langs/id_ID/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Periksa ID PPN intra-Komunitas di situs web Komisi Ero
 VATIntraManualCheck=Anda juga dapat memeriksa secara manual di situs web Komisi Eropa <a href="%s" target="_blank"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Periksa tidak mungkin. Layanan cek tidak disediakan oleh negara anggota (%s).
 NorProspectNorCustomer=Bukan prospek, bukan pelanggan
-JuridicalStatus=Jenis Badan Hukum
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=karyawan
 ProspectLevelShort=Potensi
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index 5b49606be63..9e62c742f29 100644
--- a/htdocs/langs/id_ID/compta.lang
+++ b/htdocs/langs/id_ID/compta.lang
@@ -111,7 +111,7 @@ Refund=Pengembalian dana
 SocialContributionsPayments=Pembayaran pajak sosial / fiskal
 ShowVatPayment=Tampilkan pembayaran PPN
 TotalToPay=Total yang harus dibayar
-BalanceVisibilityDependsOnSortAndFilters=Saldo terlihat dalam daftar ini hanya jika tabel diurutkan naik pada %s dan difilter untuk 1 rekening bank
+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=Kode akuntansi pelanggan
 SupplierAccountancyCode=Kode akuntansi vendor
 CustomerAccountancyCodeShort=Cust. Akun. kode
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Anda yakin ingin menghapus pembayaran pajak sosi
 ExportDataset_tax_1=Pajak dan pembayaran sosial dan fiskal
 CalcModeVATDebt=Mode<b>%sVAT pada komitmen akuning%s </b>.
 CalcModeVATEngagement=Mode<b>%sVAT pada pendapatan-pengeluaran%s </b>.
-CalcModeDebt=Analisis faktur tercatat yang diketahui bahkan jika mereka belum diperhitungkan dalam buku besar.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analisis pembayaran tercatat yang diketahui, bahkan jika mereka belum diperhitungkan dalam Buku Besar.
 CalcModeBookkeeping=Analisis data dijurnal dalam tabel Pembukuan Pembukuan.
 CalcModeLT1= Mode<b>%sRE pada faktur pelanggan - pemasok invoices%s </b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Neraca pendapatan dan pengeluaran, ringkasan tahuna
 AnnualByCompanies=Saldo pendapatan dan pengeluaran, menurut kelompok akun yang telah ditentukan
 AnnualByCompaniesDueDebtMode=Neraca pendapatan dan pengeluaran, perincian menurut kelompok yang telah ditentukan, mode<b>%sClaims-Debts%s</b>berkata<b>akuntansi akuntan a09a4b7f0f
 AnnualByCompaniesInputOutputMode=Neraca pendapatan dan pengeluaran, perincian menurut kelompok yang telah ditentukan, mode<b>%s Penghasilan-Pengeluaran%s</b>mengatakan<b>akuntansi kas a09a4b739f178
-SeeReportInInputOutputMode=Lihat %sanalisis pembayaran%s untuk perhitungan pembayaran aktual yang dilakukan bahkan jika mereka belum diperhitungkan dalam Ledger.
-SeeReportInDueDebtMode=Lihat %s analisis faktur %s untuk perhitungan berdasarkan faktur tercatat yang diketahui bahkan jika mereka belum diperhitungkan dalam Ledger.
-SeeReportInBookkeepingMode=Lihat<b>%sLaporan pembuatan%s</b>untuk perhitungan pada<b>Tabel Pembukuan Pembukuan a09a4b739f17f8f0z
+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=- 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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Ini menunjukkan catatan dalam Buku Besar Anda
 SeePageForSetup=Lihat menu <a href="%s"> %s </a> untuk pengaturan
 DepositsAreNotIncluded=- Faktur pembayaran tidak termasuk
 DepositsAreIncluded=- Faktur pembayaran disertakan
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Laporkan pajak 2 oleh pihak ketiga
 LT2ReportByCustomers=Laporkan pajak 3 oleh pihak ketiga
 LT1ReportByCustomersES=Laporan oleh RE pihak ketiga
 LT2ReportByCustomersES=Laporkan oleh IRPF pihak ketiga
 VATReport=Laporan pajak penjualan
 VATReportByPeriods=Laporan pajak penjualan berdasarkan periode
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Laporan pajak penjualan berdasarkan tarif
 VATReportByThirdParties=Laporan pajak penjualan oleh pihak ketiga
 VATReportByCustomers=Laporan pajak penjualan oleh pelanggan
diff --git a/htdocs/langs/id_ID/cron.lang b/htdocs/langs/id_ID/cron.lang
index 611fd7aa4ba..226c36001ea 100644
--- a/htdocs/langs/id_ID/cron.lang
+++ b/htdocs/langs/id_ID/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Hapus pekerjaan terjadwal
 Permission23104 = Jalankan pekerjaan yang Dijadwalkan
 # Admin
 CronSetup=Penyiapan manajemen pekerjaan terjadwal
-URLToLaunchCronJobs=URL untuk memeriksa dan meluncurkan pekerjaan cron yang berkualitas
-OrToLaunchASpecificJob=Atau untuk memeriksa dan meluncurkan pekerjaan tertentu
+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=Kunci keamanan untuk URL untuk meluncurkan pekerjaan cron
 FileToLaunchCronJobs=Baris perintah untuk memeriksa dan meluncurkan pekerjaan cron yang berkualitas
 CronExplainHowToRunUnix=Pada lingkungan Unix Anda harus menggunakan entri crontab berikut untuk menjalankan baris perintah setiap 5 menit
 CronExplainHowToRunWin=Pada lingkungan Microsoft (tm) Windows Anda dapat menggunakan alat Tugas Terjadwal untuk menjalankan baris perintah setiap 5 menit
 CronMethodDoesNotExists=Kelas %s tidak mengandung metode apa pun %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Profil pekerjaan Cron didefinisikan ke dalam file deskriptor modul. Ketika modul diaktifkan, mereka dimuat dan tersedia sehingga Anda dapat mengelola pekerjaan dari menu alat admin %s.
 CronJobProfiles=Daftar profil pekerjaan cron yang telah ditentukan
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Jumlah peluncuran
 CronMaxRun=Jumlah maksimum peluncuran
 CronEach=Setiap
 JobFinished=Pekerjaan diluncurkan dan selesai
+Scheduled=Scheduled
 #Page card
 CronAdd= Tambahkan pekerjaan
 CronEvery=Jalankan pekerjaan masing-masing
@@ -56,7 +58,7 @@ CronNote=Komentar
 CronFieldMandatory=Bidang %s wajib diisi
 CronErrEndDateStartDt=Tanggal akhir tidak boleh sebelum tanggal mulai
 StatusAtInstall=Status pada pemasangan modul
-CronStatusActiveBtn=Memungkinkan
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Nonaktifkan
 CronTaskInactive=Pekerjaan ini dinonaktifkan
 CronId=Indo
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Pencadangan basis data lokal
 MakeLocalDatabaseDump=Buat dump basis data lokal. Parameternya adalah: kompresi ('gz' atau 'bz' atau 'tidak ada'), jenis cadangan ('mysql', 'pgsql', 'auto'), 1, 'otomatis' atau nama file yang akan dibuat, jumlah file cadangan yang akan disimpan
 WarningCronDelayed=Perhatian, untuk tujuan kinerja, apa pun tanggal berikutnya pelaksanaan pekerjaan yang diaktifkan, pekerjaan Anda mungkin tertunda hingga maksimum %s jam, sebelum dijalankan.
 DATAPOLICYJob=Pembersih data dan penganonim
+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/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index 0d776c69a27..73af84cd831 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Tidak ada kesalahan, kami berkomitmen
 # Errors
 ErrorButCommitIsDone=Kesalahan ditemukan tetapi kami memvalidasinya
 ErrorBadEMail=Email %s salah
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s salah
 ErrorBadValueForParamNotAString=Nilai buruk untuk parameter Anda. Biasanya ditambahkan ketika terjemahan tidak ada.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s sudah ada.
 ErrorGroupAlreadyExists=Grup %s sudah ada.
 ErrorRecordNotFound=Rekaman tidak ditemukan.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Beberapa bidang wajib diisi tidak terisi.
 ErrorSubjectIsRequired=Diperlukan topik email
 ErrorFailedToCreateDir=Gagal membuat direktori. Periksa apakah pengguna server Web memiliki izin untuk menulis ke direktori dokumen Dolibarr. Jika parameter<b>safe_mode</b>diaktifkan pada PHP ini, periksa apakah file-file Dolibarr php milik pengguna web server (atau grup).
 ErrorNoMailDefinedForThisUser=Tidak ada surat yang ditentukan untuk pengguna ini
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Fitur ini perlu javascript untuk diaktifkan agar berfungsi. Ubah ini dalam pengaturan - tampilan.
 ErrorTopMenuMustHaveAParentWithId0=Menu bertipe 'Top' tidak dapat memiliki menu induk. Masukkan 0 di menu induk atau pilih menu dengan tipe 'Kiri'.
 ErrorLeftMenuMustHaveAParentId=Menu bertipe 'Kiri' harus memiliki id induk.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Nama profil ini sudah ada untuk set ekspor ini.
 ErrorLDAPSetupNotComplete=Pencocokan Dolibarr-LDAP tidak lengkap.
 ErrorLDAPMakeManualTest=File .ldif telah dibuat di direktori %s. Cobalah memuatnya secara manual dari baris perintah untuk mendapatkan informasi lebih lanjut tentang kesalahan.
 ErrorCantSaveADoneUserWithZeroPercentage=Tidak dapat menyimpan tindakan dengan "status tidak dimulai" jika bidang "dilakukan oleh" juga diisi.
-ErrorRefAlreadyExists=Referensi yang digunakan untuk pembuatan sudah ada.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Masukkan nama laporan bank tempat entri harus dilaporkan (Format YYYYMM atau YYYYMMDD)
 ErrorRecordHasChildren=Gagal menghapus catatan karena memiliki beberapa catatan anak.
 ErrorRecordHasAtLeastOneChildOfType=Objek memiliki setidaknya satu anak tipe %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Anda harus memilih apakah artikel
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Diskon yang Anda coba terapkan lebih besar daripada tetap membayar. Membagi diskon menjadi 2 diskon lebih kecil sebelumnya.
 ErrorFileNotFoundWithSharedLink=File tidak ditemukan. Mungkin kunci berbagi diubah atau file dihapus baru-baru ini.
 ErrorProductBarCodeAlreadyExists=Barcode produk %s sudah ada pada referensi produk lain.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Perhatikan juga bahwa menggunakan produk virtual untuk menambah / mengurangi subproduk secara otomatis tidak dimungkinkan ketika setidaknya satu sub-produk (atau subproduk dari subproduk) memerlukan nomor seri / lot.
+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=Deskripsi adalah wajib untuk saluran dengan produk gratis
 ErrorAPageWithThisNameOrAliasAlreadyExists=Halaman / wadah<strong>%s </strong> memiliki nama atau alias alternatif yang sama dengan yang Anda coba gunakan
 ErrorDuringChartLoad=Kesalahan saat memuat bagan akun. Jika beberapa akun tidak dimuat, Anda masih dapat memasukkannya secara manual.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Kesalahan, string untuk diganti menjadi kosong
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+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
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Parameter PHP Anda upload_max_filesize (%s) lebih tinggi dari parameter PHP post_max_size (%s). Ini bukan pengaturan yang konsisten.
 WarningPasswordSetWithNoAccount=Kata sandi ditetapkan untuk anggota ini. Namun, tidak ada akun pengguna yang dibuat. Jadi kata sandi ini disimpan tetapi tidak dapat digunakan untuk masuk ke Dolibarr. Ini dapat digunakan oleh modul / antarmuka eksternal tetapi jika Anda tidak perlu mendefinisikan login atau kata sandi untuk anggota, Anda dapat menonaktifkan opsi "Kelola login untuk setiap anggota" dari pengaturan modul Anggota. Jika Anda perlu mengelola login tetapi tidak memerlukan kata sandi, Anda dapat mengosongkan isian ini untuk menghindari peringatan ini. Catatan: Email juga dapat digunakan sebagai login jika anggota tersebut tertaut ke pengguna.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Info masuk Anda telah diubah. Untuk tujua
 WarningAnEntryAlreadyExistForTransKey=Entri sudah ada untuk kunci terjemahan untuk bahasa ini
 WarningNumberOfRecipientIsRestrictedInMassAction=Peringatan, jumlah penerima yang berbeda terbatas pada<b>%s</b>saat menggunakan aksi massa dalam daftar
 WarningDateOfLineMustBeInExpenseReportRange=Peringatan, tanggal saluran tidak dalam kisaran laporan pengeluaran
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Proyek ditutup. Anda harus membukanya kembali terlebih dahulu.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Beberapa transaksi bank dihapus setelah kwitansi termasuk mereka dihasilkan. Jadi nb cek dan total penerimaan mungkin berbeda dari jumlah dan total dalam daftar.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, gagal menambahkan entri file ke tabel indeks basis data ECM
+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.
diff --git a/htdocs/langs/id_ID/exports.lang b/htdocs/langs/id_ID/exports.lang
index dcf4255886e..39cc5685c18 100644
--- a/htdocs/langs/id_ID/exports.lang
+++ b/htdocs/langs/id_ID/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Kunci (kolom) untuk digunakan untuk memperbarui data yang ad
 NbInsert=Jumlah baris yang dimasukkan: %s
 NbUpdate=Jumlah baris yang diperbarui: %s
 MultipleRecordFoundWithTheseFilters=Beberapa catatan telah ditemukan dengan filter ini: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/id_ID/mails.lang b/htdocs/langs/id_ID/mails.lang
index 60dae133949..6d4d3003efc 100644
--- a/htdocs/langs/id_ID/mails.lang
+++ b/htdocs/langs/id_ID/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Masukan input email oleh pengguna
 MailingModuleDescDolibarrUsers=Pengguna dengan Email
 MailingModuleDescThirdPartiesByCategories=Pihak ketiga (berdasarkan kategori)
 SendingFromWebInterfaceIsNotAllowed=Mengirim dari antarmuka web tidak diizinkan.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Baris %s dalam berkas
@@ -125,12 +126,13 @@ TagMailtoEmail=Email Penerima (termasuk tautan html "mailto:")
 NoEmailSentBadSenderOrRecipientEmail=Tidak ada email yang dikirim. Pengirim atau penerima email salah. Verifikasi profil pengguna.
 # Module Notifications
 Notifications=Notifikasi
-NoNotificationsWillBeSent=Tidak ada pemberitahuan email yang direncanakan untuk agenda dan perusahaan ini
-ANotificationsWillBeSent=1 notifikasi akan dikirim melalui email
-SomeNotificationsWillBeSent=notifikasi %s akan dikirim melalui email
-AddNewNotification=Aktifkan pemberitahuan email baru untuk target/agenda
-ListOfActiveNotifications=Daftar semua target/agenda aktif untuk pemberitahuan email
-ListOfNotificationsDone=Daftar semua pemberitahuan email yang dikirim
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Konfigurasi pengiriman email telah diatur ke '%s'. Mode ini tidak dapat digunakan untuk mengirim email masal.
 MailSendSetupIs2=Anda pertama-tama harus pergi, dengan akun admin, ke dalam menu %sHome - Setup - EMails%s untuk mengubah parameter<strong>'%s' </strong> untuk menggunakan mode ' %s'. Dengan mode ini, Anda dapat masuk ke pengaturan server SMTP yang disediakan oleh Penyedia Layanan Internet Anda dan menggunakan fitur kirim email dengan skala besar.
 MailSendSetupIs3=Jika Anda memiliki pertanyaan tentang cara mengatur server SMTP Anda, Anda dapat bertanya ke %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Berkas yang diimpor harus memiliki format email <stro
 UseFormatInputEmailToTarget=Masukkan string dengan format<strong>email;nama;nama depan;lainnya</strong>
 MailAdvTargetRecipients=Penerima (pilihan lanjutan)
 AdvTgtTitle=Isi kolom input untuk memilih pihak ketiga atau kontak/alamat yang ditargetkan
-AdvTgtSearchTextHelp=Gunakan %% sebagai wildcard. Misalnya untuk menemukan semua item seperti <b>jean, joe, jim</b>, Anda dapat memasukkan <b>j%%</b>, Anda juga dapat menggunakan ; sebagai pemisah untuk nilai, dan gunakan ! sebagai kecuali nilai ini. Sebagai contoh <b>jean;joe;jim%%;!jimo;!jima%</b> akan menargetkan semua jean, joe, mulai dengan jim tetapi tidak jimo dan tidak semua yang dimulai dengan jima
+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=Gunakan sela untuk memilih nilai int atau float
 AdvTgtMinVal=Nilai minimum
 AdvTgtMaxVal=Nilai maksimum
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Buat filter
 AdvTgtOrCreateNewFilter=Nama filter baru
 NoContactWithCategoryFound=Tidak ditemukan kontak/alamat dengan kategori
 NoContactLinkedToThirdpartieWithCategoryFound=Tidak ditemukan kontak/alamat dengan kategori
-OutGoingEmailSetup=Pengaturan email keluar
-InGoingEmailSetup=Penyiapan email masuk
-OutGoingEmailSetupForEmailing=Pengaturan Email Keluar (untuk modul %s)
-DefaultOutgoingEmailSetup=Pengaturan email keluar standar
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informasi
 ContactsWithThirdpartyFilter=Kontak dengan filter pihak ketiga
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index def7208cb73..92771fd72b5 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Tidak ada templat yang tersedia untuk jenis email ini
 AvailableVariables=Variabel substitusi yang tersedia
 NoTranslation=Tanpa terjemahan
 Translation=Terjemahan
+CurrentTimeZone=TimeZone PHP (Server)
 EmptySearchString=Masukkan kriteria pencarian yang tidak kosong
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Tidak ada catatan yang ditemukan
 NoRecordDeleted=Tidak ada catatan yang dihapus
 NotEnoughDataYet=Tidak cukup data
@@ -85,6 +87,8 @@ FileWasNotUploaded=File dipilih untuk lampiran tetapi belum diunggah. Klik pada
 NbOfEntries=Jumlah entri
 GoToWikiHelpPage=Baca bantuan online (Diperlukan akses Internet)
 GoToHelpPage=Baca bantuan
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Rekam disimpan
 RecordDeleted=Rekam dihapus
 RecordGenerated=Rekaman dihasilkan
@@ -220,6 +224,7 @@ Value=Nilai
 PersonalValue=Nilai pribadi
 NewObject=%s baru
 NewValue=Nilai baru
+OldValue=Old value %s
 CurrentValue=Nilai sekarang
 Code=Kode
 Type=Tipe
@@ -433,6 +438,7 @@ RemainToPay=Tetap membayar
 Module=Modul / Aplikasi
 Modules=Modul / Aplikasi
 Option=Pilihan
+Filters=Filters
 List=Daftar
 FullList=Daftar lengkap
 FullConversation=Percakapan penuh
@@ -650,6 +656,7 @@ SupplierPreview=Pratinjau vendor
 ShowCustomerPreview=Tampilkan pratinjau pelanggan
 ShowSupplierPreview=Tampilkan pratinjau vendor
 RefCustomer=Ref. pelanggan
+InternalRef=Internal ref.
 Currency=Mata uang
 InfoAdmin=Informasi untuk administrator
 Undo=Membuka
@@ -671,7 +678,7 @@ SendMail=Mengirim email
 Email=Email
 NoEMail=Tidak ada email
 AlreadyRead=Sudah baca
-NotRead=Tidak membaca
+NotRead=Unread
 NoMobilePhone=Tidak ada ponsel
 Owner=Pemilik
 FollowingConstantsWillBeSubstituted=Konstanta berikut akan diganti dengan nilai yang sesuai.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/id_ID/modulebuilder.lang b/htdocs/langs/id_ID/modulebuilder.lang
index e8584203a6e..aeecb827d2a 100644
--- a/htdocs/langs/id_ID/modulebuilder.lang
+++ b/htdocs/langs/id_ID/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=Halaman PHP untuk membuat / mengedit / melihat catatan
 PageForAgendaTab=Halaman PHP untuk tab agenda
 PageForDocumentTab=Halaman PHP untuk tab dokumen
 PageForNoteTab=Halaman PHP untuk tab note
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path ke zip paket modul / aplikasi
 PathToModuleDocumentation=Path ke file modul / dokumentasi aplikasi (%s)
 SpaceOrSpecialCharAreNotAllowed=Spasi atau karakter khusus tidak diperbolehkan.
@@ -77,7 +78,7 @@ IsAMeasure=Adalah ukuran
 DirScanned=Direktori dipindai
 NoTrigger=Tidak ada pemicu
 NoWidget=Tidak ada widget
-GoToApiExplorer=Buka Penjelajah API
+GoToApiExplorer=API explorer
 ListOfMenusEntries=Daftar entri menu
 ListOfDictionariesEntries=Daftar entri kamus
 ListOfPermissionsDefined=Daftar izin yang ditentukan
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Jika Anda memiliki pengetahuan tentang SQL dan PHP, And
 SeeTopRightMenu=Lihat <span class="fa fa-bug"> </span> di menu kanan atas
 AddLanguageFile=Tambahkan file bahasa
 YouCanUseTranslationKey=Di sini Anda dapat menggunakan kunci yang merupakan kunci terjemahan yang ditemukan dalam file bahasa (lihat tab "Bahasa")
-DropTableIfEmpty=(Hapus tabel jika kosong)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=Tabel %s tidak ada
 TableDropped=Tabel %s dihapus
 InitStructureFromExistingTable=Membangun string array struktur dari tabel yang ada
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Gunakan URL editor tertentu
 UseSpecificFamily = Gunakan keluarga tertentu
 UseSpecificAuthor = Gunakan penulis tertentu
 UseSpecificVersion = Gunakan versi awal tertentu
-ModuleMustBeEnabled=Modul / aplikasi harus diaktifkan terlebih dahulu
 IncludeRefGeneration=Referensi objek harus dihasilkan secara otomatis
 IncludeRefGenerationHelp=Periksa ini jika Anda ingin memasukkan kode untuk mengelola pembuatan referensi secara otomatis
 IncludeDocGeneration=Saya ingin menghasilkan beberapa dokumen dari objek
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Jenis bidang: <br> varchar (99), ganda (24,8), real, teks, html
 AsciiToHtmlConverter=Pengonversi Ascii ke HTML
 AsciiToPdfConverter=Pengonversi ascii ke PDF
 TableNotEmptyDropCanceled=Meja tidak kosong. Drop telah dibatalkan.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/id_ID/mrp.lang b/htdocs/langs/id_ID/mrp.lang
index 0dab77fbf41..53bc718c450 100644
--- a/htdocs/langs/id_ID/mrp.lang
+++ b/htdocs/langs/id_ID/mrp.lang
@@ -78,3 +78,27 @@ TotalCost=Total biaya
 BOMTotalCost=Biaya untuk menghasilkan BOM ini berdasarkan pada biaya setiap kuantitas dan produk yang akan dikonsumsi (gunakan harga Biaya jika ditentukan, selain itu Harga Rata-rata Tertimbang jika ditentukan, selain itu harga pembelian Terbaik)
 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang
index 67d6dae2501..dc4e9b6e401 100644
--- a/htdocs/langs/id_ID/other.lang
+++ b/htdocs/langs/id_ID/other.lang
@@ -5,8 +5,6 @@ Tools=Alat
 TMenuTools=Alat
 ToolsDesc=Semua alat yang tidak termasuk dalam entri menu lain dikelompokkan di sini.<br>Semua alat dapat diakses melalui menu kiri.
 Birthday=Ulang tahun
-BirthdayDate=Tanggal lahir
-DateToBirth=Tanggal lahir
 BirthdayAlertOn=peringatan ulang tahun aktif
 BirthdayAlertOff=peringatan ulang tahun tidak aktif
 TransKey=Terjemahan dari kunci TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Bulan sebelumnya (nomor 1-12) dari tanggal faktur
 TextPreviousMonthOfInvoice=Bulan sebelumnya (teks) dari tanggal faktur
 NextMonthOfInvoice=Bulan berikutnya (nomor 1-12) dari tanggal faktur
 TextNextMonthOfInvoice=Bulan berikutnya (teks) dari tanggal faktur
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=File zip dihasilkan menjadi<b>%s </b>.
 DocFileGeneratedInto=File Doc dihasilkan menjadi<b>%s </b>.
 JumpToLogin=Terputus. Buka halaman login ...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Laporan biaya divalidasi (diperlukan persetujuan)
 Notify_EXPENSE_REPORT_APPROVE=Laporan biaya disetujui
 Notify_HOLIDAY_VALIDATE=Tinggalkan permintaan divalidasi (diperlukan persetujuan)
 Notify_HOLIDAY_APPROVE=Biarkan permintaan disetujui
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=Lihat pengaturan modul %s
 NbOfAttachedFiles=Jumlah file / dokumen yang dilampirkan
 TotalSizeOfAttachedFiles=Ukuran total file / dokumen yang dilampirkan
@@ -99,6 +100,7 @@ PredefinedMailContentSendShipping=__(Halo)__\n\nSilakan temukan pengiriman __REF
 PredefinedMailContentSendFichInter=__(Halo)__\n\nSilakan temukan intervensi __REF__ terlampir\n\n\n__ (Hormat) __\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Anda dapat mengklik tautan di bawah untuk melakukan pembayaran jika belum dilakukan.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr adalah ERP / CRM ringkas yang mendukung beberapa modul bisnis. Demo yang menampilkan semua modul tidak masuk akal karena skenario ini tidak pernah terjadi (beberapa ratus tersedia). Jadi, beberapa profil demo tersedia.
 ChooseYourDemoProfil=Pilih profil demo yang paling sesuai dengan kebutuhan Anda ...
 ChooseYourDemoProfilMore=... atau buat profil Anda sendiri <br> (pemilihan modul manual)
@@ -214,6 +216,7 @@ EMailTextExpenseReportValidated=Laporan biaya %s telah divalidasi.
 EMailTextExpenseReportApproved=Laporan biaya %s telah disetujui.
 EMailTextHolidayValidated=Tinggalkan permintaan %s telah divalidasi.
 EMailTextHolidayApproved=Tinggalkan permintaan %s telah disetujui.
+EMailTextActionAdded=The action %s has been added to the Agenda.
 ImportedWithSet=Kumpulan data impor
 DolibarrNotification=Pemberitahuan otomatis
 ResizeDesc=Masukkan lebar baru<b>OR</b>tinggi baru. Rasio akan disimpan selama mengubah ukuran ...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Kontak / alamat yang dibuat oleh kolektor email d
 ProjectCreatedByEmailCollector=Proyek dibuat oleh kolektor email dari email MSGID %s
 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
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Area ekspor
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index 74921ca30f8..aa10df00723 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Beberapa segmen harga per produk / layanan (setiap pelanggan berada dalam satu segmen harga)
 MultiPricesNumPrices=Jumlah harga
 DefaultPriceType=Basis harga per default (dengan versus tanpa pajak) saat menambahkan harga jual baru
-AssociatedProductsAbility=Activate kits (virtual products)
+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=Jumlah produk kemasan induk
@@ -167,8 +168,10 @@ BuyingPrices=Harga beli
 CustomerPrices=Harga pelanggan
 SuppliersPrices=Harga penjual
 SuppliersPricesOfProductsOrServices=Harga vendor (produk atau layanan)
-CustomCode=Bea Cukai / Komoditas / kode HS
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Negara Asal
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Sifat produk (bahan / selesai)
 NatureOfProductShort=Sifat produk
 NatureOfProductDesc=Bahan baku mentah atau produk jadi
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Gunakan harga tetap
 PriceByQuantity=Harga berbeda dengan kuantitas
 DisablePriceByQty=Nonaktifkan harga berdasarkan kuantitas
 PriceByQuantityRange=Rentang kuantitas
-MultipriceRules=Aturan segmen harga
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Gunakan aturan segmen harga (didefinisikan dalam pengaturan modul produk) untuk secara otomatis menghitung harga semua segmen lain sesuai dengan segmen pertama
 PercentVariationOver=variasi %% lebih dari %s
 PercentDiscountOver=%% diskon lebih dari %s
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index 51c8fa22f38..b10e1fcca51 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -76,15 +76,16 @@ MyActivities=Tugas / kegiatan saya
 MyProjects=Proyek saya
 MyProjectsArea=Proyek saya Area
 DurationEffective=Durasi efektif
-ProgressDeclared=Menyatakan kemajuan
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Kemajuan tugas
 CurentlyOpenedTasks=Buka tugas saat ini
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=Kemajuan yang dideklarasikan kurang dari %s dari progresi yang dihitung
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Kemajuan yang dideklarasikan adalah lebih %s dari progresi yang dihitung
-ProgressCalculated=Kemajuan yang dihitung
+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=yang terhubung dengan saya
 WhichIamLinkedToProject=yang saya tautkan ke proyek
 Time=Waktu
+TimeConsumed=Consumed
 ListOfTasks=Daftar tugas
 GoToListOfTimeConsumed=Buka daftar waktu yang digunakan
 GanttView=Lihat Gantt
diff --git a/htdocs/langs/id_ID/recruitment.lang b/htdocs/langs/id_ID/recruitment.lang
index e1e686e6d5f..97ceb8dc169 100644
--- a/htdocs/langs/id_ID/recruitment.lang
+++ b/htdocs/langs/id_ID/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/id_ID/sendings.lang b/htdocs/langs/id_ID/sendings.lang
index c780874113f..cb5514d96ea 100644
--- a/htdocs/langs/id_ID/sendings.lang
+++ b/htdocs/langs/id_ID/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Pengiriman lain untuk pesanan ini
 SendingsAndReceivingForSameOrder=Pengiriman dan kwitansi untuk pesanan ini
 SendingsToValidate=Pengiriman untuk divalidasi
 StatusSendingCanceled=Dibatalkan
+StatusSendingCanceledShort=Dibatalkan
 StatusSendingDraft=Konsep
 StatusSendingValidated=Divalidasi (produk untuk dikirim atau pun sudah dikirim)
 StatusSendingProcessed=Diproses
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Anda harus terlebih dahulu memvalidasi pesanan
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Model dokumen yang lebih lengkap untuk tanda terima pengiriman (logo ...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER Konstan tidak ditentukan
 SumOfProductVolumes=Jumlah volume produk
 SumOfProductWeights=Jumlah bobot produk
diff --git a/htdocs/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang
index 88ba7c376fd..fb71e9c978f 100644
--- a/htdocs/langs/id_ID/stocks.lang
+++ b/htdocs/langs/id_ID/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Nilai gudang
 UserWarehouseAutoCreate=Buat gudang pengguna secara otomatis saat membuat pengguna
 AllowAddLimitStockByWarehouse=Kelola juga nilai untuk stok minimum dan yang diinginkan per pasangan (gudang produk) selain nilai untuk stok minimum dan yang diinginkan per produk
 RuleForWarehouse=Aturan untuk gudang
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Atur gudang berdasarkan pesanan Penjualan
 UserDefaultWarehouse=Tetapkan gudang pada Pengguna
 MainDefaultWarehouse=Gudang bawaan
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/id_ID/ticket.lang b/htdocs/langs/id_ID/ticket.lang
index d8bc9fd797a..2a25919c9be 100644
--- a/htdocs/langs/id_ID/ticket.lang
+++ b/htdocs/langs/id_ID/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Tiket - Jenis
 TicketDictCategory=Tiket - Grup
 TicketDictSeverity=Tiket - Tingkat Permasalahan
 TicketDictResolution=Tiket - Resolusi
-TicketTypeShortBUGSOFT=Logika Tidak Berfungsi 
-TicketTypeShortBUGHARD=Materi Tidak Berfungsi
-TicketTypeShortCOM=Pertanyaan komersial
 
+TicketTypeShortCOM=Pertanyaan komersial
 TicketTypeShortHELP=Permintaan bantuan fungsional
 TicketTypeShortISSUE=Masalah, bug, atau masalah
 TicketTypeShortREQUEST=Ubah atau tingkatkan permintaan
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Lainnya
 TicketSeverityShortLOW=Rendah
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Tinggi
-TicketSeverityShortBLOCKING=Kritis/Memblokir
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Bidang '%s' salah
 MenuTicketMyAssign=Tiket saya
@@ -60,7 +58,6 @@ OriginEmail=Sumber email
 Notify_TICKET_SENTBYMAIL=Kirim pesan tiket melalui email
 
 # Status
-NotRead=Tidak membaca
 Read=Baca
 Assigned=Ditugaskan
 InProgress=Sedang berlangsung
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Antarmuka publik memungkinkan setiap pengunju
 TicketsAutoAssignTicket=Secara otomatis menetapkan pengguna yang membuat tiket
 TicketsAutoAssignTicketHelp=Saat membuat tiket, pengguna dapat secara otomatis ditugaskan ke tiket.
 TicketNumberingModules=Modul penomoran tiket
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Beri tahu pihak ketiga saat membuat
 TicketsDisableCustomerEmail=Selalu nonaktifkan email saat tiket dibuat dari antarmuka publik
 TicketsPublicNotificationNewMessage=Kirim email saat pesan baru ditambahkan
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status berubah: %s menjadi %s
 TicketNotNotifyTiersAtCreate=Tidak memberi tahu perusahaan saat membuat
 Unread=Belum dibaca
 TicketNotCreatedFromPublicInterface=Tidak tersedia. Tiket tidak dibuat dari antarmuka publik.
-PublicInterfaceNotEnabled=Antarmuka publik tidak diaktifkan
 ErrorTicketRefRequired=Diperlukan nama referensi tiket
 
 #
diff --git a/htdocs/langs/id_ID/website.lang b/htdocs/langs/id_ID/website.lang
index 9d0b6cc0fe1..eb522b5a859 100644
--- a/htdocs/langs/id_ID/website.lang
+++ b/htdocs/langs/id_ID/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit sebaris
 AddWebsite=Tambahkan situs web
 Webpage=Halaman web / wadah
 AddPage=Tambahkan halaman / wadah
-HomePage=Halaman Depan
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Pratinjau situs web Anda<strong>%s </strong> belum tersedia. Anda harus terlebih dahulu '<strong> Impor template situs web lengkap </strong>' atau hanya '<strong> Tambahkan halaman / wadah </strong>'.
 RequestedPageHasNoContentYet=Halaman yang diminta dengan id %s belum memiliki konten, atau file cache .tpl.php telah dihapus. Edit konten halaman untuk menyelesaikan ini.
@@ -101,7 +100,7 @@ EmptyPage=Halaman kosong
 ExternalURLMustStartWithHttp=URL eksternal harus dimulai dengan http: // atau https: //
 ZipOfWebsitePackageToImport=Unggah file Zip dari paket templat situs web
 ZipOfWebsitePackageToLoad=atau Pilih paket templat situs web tertanam yang tersedia
-ShowSubcontainers=Sertakan konten dinamis
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=URL halaman internal
 ThisPageIsTranslationOf=Halaman / wadah ini adalah terjemahan dari
 ThisPageHasTranslationPages=Halaman / wadah ini memiliki terjemahan
@@ -137,3 +136,4 @@ RSSFeedDesc=Anda bisa mendapatkan RSS feed dari artikel terbaru dengan mengetikk
 PagesRegenerated=%s halaman / wadah dibuat ulang
 RegenerateWebsiteContent=Regenerate web site cache files
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/id_ID/withdrawals.lang b/htdocs/langs/id_ID/withdrawals.lang
index 1ff4c8b5eef..9b5daafd94b 100644
--- a/htdocs/langs/id_ID/withdrawals.lang
+++ b/htdocs/langs/id_ID/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Tanda terima debit langsung %s terbaru
 MakeWithdrawRequest=Buat permintaan pembayaran debit langsung
 MakeBankTransferOrder=Buat Permintaan Transfer Kredit
 WithdrawRequestsDone=%s permintaan pembayaran debit langsung dicatat
+BankTransferRequestsDone=%s credit transfer requests recorded
 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>.
 ClassCredited=Klasifikasi dikreditkan
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Tanggal eksekusi
 CreateForSepa=Buat berkas debet langsung
-ICS=Pengidentifikasi Kreditor CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END=Tag XML SEPA "EndToEndId" - Id unik yang ditetapkan untuk setiap transaksi
 USTRD=Tag XML SEPA "Tidak Terstruktur"
 ADDDAYS=Tambahkan hari ke Tanggal Eksekusi
@@ -146,3 +148,5 @@ InfoRejectSubject=Pesanan pembayaran debit langsung ditolak
 InfoRejectMessage=Halo, <br> <br>, urutan pembayaran debit langsung dari %s yang terkait dengan perusahaan %s, dengan jumlah %s telah ditolak oleh bank. <br> <br> - <br> %s
 ModeWarning=Opsi untuk mode nyata tidak disetel, kami berhenti setelah simulasi ini
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/id_ID/workflow.lang b/htdocs/langs/id_ID/workflow.lang
index eab46445c72..c1d6e986377 100644
--- a/htdocs/langs/id_ID/workflow.lang
+++ b/htdocs/langs/id_ID/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Pembuatan Otomatis
 AutomaticClassification=Pengklasifikasian Otomatis
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index c83c3cef1d6..5c45bf600e6 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index a97b287a176..2b6093184ff 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Skoða
 SetupArea=Skipulag
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form til að prófa skrá hlaða (samkvæmt skipulag)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Ath: er já aðeins gild ef <b>einingin %s </b> er virkt
 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.
@@ -85,7 +87,6 @@ ShowPreview=Sýna forskoðun
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Forskoðun er ekki í boði
 ThemeCurrentlyActive=Þema virk
-CurrentTimeZone=PHP-miðlara Tímasvæði
 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
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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=Hreinsa nú
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 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>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=Listi yfir OpenDocument sniðmát framkvæmdarstjóra
 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=Dæmi um setningafræði: <br> c: \\ mydir <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Til að vita hvernig á að búa odt skjalið sniðmát, áður en að geyma þá í þeim möppum, lesa wiki skjöl:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Staðsetning firstname / nafn
@@ -406,7 +408,7 @@ UrlGenerationParameters=Breytur til að tryggja vefslóðir
 SecurityTokenIsUnique=Nota einstakt securekey breytu fyrir hvert slóð
 EnterRefToBuildUrl=Sláðu inn tilvísun til %s mótmæla
 GetSecuredUrl=Fá reiknað slóð
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ ServiceSetup=Þjónusta mát skipulag
 ProductServiceSetup=Vörur og Þjónusta einingar skipulag
 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
+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 the language of the third party
+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 tegund til nota fyrir vörur
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Nýr matseðill
 MenuHandler=Valmynd dýraþjálfari
 MenuModule=Heimild mát
-HideUnauthorizedMenu= Fela óviðkomandi valmyndir (grátt)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Auðkenni Valmynd
 DetailMenuHandler=Valmynd dýraþjálfari hvar á að birta nýja valmynd
 DetailMenuModule=Module nafn ef matseðill færsla kemur frá einingu
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/is_IS/banks.lang b/htdocs/langs/is_IS/banks.lang
index ca4aef62431..dbe306c9acb 100644
--- a/htdocs/langs/is_IS/banks.lang
+++ b/htdocs/langs/is_IS/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/is_IS/blockedlog.lang b/htdocs/langs/is_IS/blockedlog.lang
index 4a0e02851e2..ffd835ef987 100644
--- a/htdocs/langs/is_IS/blockedlog.lang
+++ b/htdocs/langs/is_IS/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/is_IS/boxes.lang b/htdocs/langs/is_IS/boxes.lang
index d1b8a7367be..fdb47cd6d8f 100644
--- a/htdocs/langs/is_IS/boxes.lang
+++ b/htdocs/langs/is_IS/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+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=Engin bókamerki skilgreind. Smelltu <a href="%s">hér</a> til að bæta við bókamerki.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Bókhalds
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/is_IS/cashdesk.lang b/htdocs/langs/is_IS/cashdesk.lang
index e5ac19f8ff5..244a0b22645 100644
--- a/htdocs/langs/is_IS/cashdesk.lang
+++ b/htdocs/langs/is_IS/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=NB af reikningum
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/is_IS/categories.lang b/htdocs/langs/is_IS/categories.lang
index 12ea7e5e036..b5b63e566bb 100644
--- a/htdocs/langs/is_IS/categories.lang
+++ b/htdocs/langs/is_IS/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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=Fyllingar eiginleika
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang
index 1ec0e068f53..86883bf1c40 100644
--- a/htdocs/langs/is_IS/companies.lang
+++ b/htdocs/langs/is_IS/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Möguleiki
diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang
index 8a3d0831930..b281068b1a6 100644
--- a/htdocs/langs/is_IS/compta.lang
+++ b/htdocs/langs/is_IS/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Sýna VSK greiðslu
 TotalToPay=Samtals borga
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Skýrsla um þriðja aðila IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/is_IS/cron.lang b/htdocs/langs/is_IS/cron.lang
index 2d3b08fe463..52aaabab757 100644
--- a/htdocs/langs/is_IS/cron.lang
+++ b/htdocs/langs/is_IS/cron.lang
@@ -6,14 +6,15 @@ 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
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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 environement you can use Scheduled task tools 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
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Forgangur
 CronLabel=Merki
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+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
@@ -56,16 +58,16 @@ CronNote=Athugasemd
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Slökkva
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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=Frá
@@ -76,8 +78,14 @@ 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+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/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index 05a5bca9bb6..82755eaab2b 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s  er rangt
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Innskráning %s  er þegar til.
 ErrorGroupAlreadyExists=Group %s  er þegar til.
 ErrorRecordNotFound=Upptaka fannst ekki.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Sumir Nauðsynlegir reitir voru ekki fylltir.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Ekki tókst að búa til möppu. Athugaðu að vefþjóninn notandi hefur réttindi til að skrifa inn Dolibarr skjöl skrá. Ef viðfang <b>safe_mode</b> er virkt á þessu PHP, athuga hvort Dolibarr PHP skrár á nú á netþjóninn notandi (eða hóp).
 ErrorNoMailDefinedForThisUser=Nei póstur er skilgreind fyrir þennan notanda
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Þessi aðgerð þarfnast javascript til að virkja til vinnu. Breyting þessi hefur skipulag - sýna.
 ErrorTopMenuMustHaveAParentWithId0=A valmynd af gerðinni 'Efst' má ekki hafa foreldri valmyndinni. Put 0 í valmyndinni foreldri eða veldu Valmynd af gerðinni 'Vinstri'.
 ErrorLeftMenuMustHaveAParentId=A valmynd af gerðinni 'Vinstri' verða að hafa foreldri kt.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP samsvörun er ekki lokið.
 ErrorLDAPMakeManualTest=A. LDIF skrá hefur verið búin til í %s . Prófaðu að hlaða það handvirkt úr stjórn lína að hafa meiri upplýsingar um villur.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref notað sköpun er þegar til.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/is_IS/exports.lang b/htdocs/langs/is_IS/exports.lang
index 63970ffbd21..a9f6a31bddf 100644
--- a/htdocs/langs/is_IS/exports.lang
+++ b/htdocs/langs/is_IS/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field titill
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Bókasafn
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Skref
 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.
@@ -131,3 +133,4 @@ 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/is_IS/mails.lang b/htdocs/langs/is_IS/mails.lang
index 0c77e81bb81..6f2c1d0b683 100644
--- a/htdocs/langs/is_IS/mails.lang
+++ b/htdocs/langs/is_IS/mails.lang
@@ -92,6 +92,7 @@ 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=Lína %s  í skrá
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Tilkynningar
-NoNotificationsWillBeSent=Engar tilkynningar í tölvupósti er mjög spennandi fyrir þennan atburð og fyrirtæki
-ANotificationsWillBeSent=1 tilkynning verður send með tölvupósti
-SomeNotificationsWillBeSent=%s  tilkynningar verða sendar í tölvupósti
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=Sýna allar tilkynningar í tölvupósti sendi
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index 55729865831..0c0dae311ad 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Þýðing
+CurrentTimeZone=PHP-miðlara Tímasvæði
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Upptaka vistuð
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Gildi
 PersonalValue=Starfsfólk gildi
 NewObject=New %s
 NewValue=Nýtt gildi
+OldValue=Old value %s
 CurrentValue=Núverandi gildi
 Code=Code
 Type=Tegund
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Valkostur
+Filters=Filters
 List=Listi
 FullList=Sjá lista
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ SupplierPreview=Vendor preview
 ShowCustomerPreview=Sýna viðskiptavinum sýnishorn
 ShowSupplierPreview=Show vendor preview
 RefCustomer=Tilv. viðskiptavina
+InternalRef=Internal ref.
 Currency=Gjaldmiðill
 InfoAdmin=Upplýsingar fyrir stjórnendur
 Undo=Hætta við
@@ -671,7 +678,7 @@ SendMail=Senda tölvupóst
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Eigandi
 FollowingConstantsWillBeSubstituted=Eftir Fastar verður staðgengill með samsvarandi gildi.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/is_IS/modulebuilder.lang b/htdocs/langs/is_IS/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/is_IS/modulebuilder.lang
+++ b/htdocs/langs/is_IS/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/is_IS/mrp.lang b/htdocs/langs/is_IS/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/is_IS/mrp.lang
+++ b/htdocs/langs/is_IS/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang
index 6eef3ff2036..fb1ea9d9c80 100644
--- a/htdocs/langs/is_IS/other.lang
+++ b/htdocs/langs/is_IS/other.lang
@@ -5,8 +5,6 @@ Tools=Verkfæri
 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=Afmæli
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=afmæli viðvörun virk
 BirthdayAlertOff=afmæli viðvörun óvirk
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Fjöldi meðfylgjandi skrá / gögn
 TotalSizeOfAttachedFiles=Heildarstærð meðfylgjandi skrá / gögn
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Hægri
 CalculatedWeight=Reiknað þyngd
 CalculatedVolume=Reiknað magn
 Weight=Þyngd
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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=Innflutningur gögnum
 DolibarrNotification=Sjálfvirk tilkynning
 ResizeDesc=Sláðu inn nýja breidd <b>EÐA</b> nýja hæð. Hlutfall verður haldið á resizing ...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Útflutningur area
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 028eea77a82..a43c32766fd 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Fjöldi verð
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Uppruni land
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index f48818ff1f4..8e693b106e7 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -76,15 +76,16 @@ MyActivities=verkefni mín / starfsemi
 MyProjects=Verkefnin mín
 MyProjectsArea=My projects Area
 DurationEffective=Árangursrík Lengd
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Tími
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/is_IS/recruitment.lang b/htdocs/langs/is_IS/recruitment.lang
index feaa40a6de2..411fc152c09 100644
--- a/htdocs/langs/is_IS/recruitment.lang
+++ b/htdocs/langs/is_IS/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/is_IS/sendings.lang b/htdocs/langs/is_IS/sendings.lang
index b498380aa64..9bb3e783a22 100644
--- a/htdocs/langs/is_IS/sendings.lang
+++ b/htdocs/langs/is_IS/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Aðrar sendingar fyrir þessari röð
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Sendi til að sannreyna
 StatusSendingCanceled=Hætt við
+StatusSendingCanceledShort=Hætt við
 StatusSendingDraft=Víxill
 StatusSendingValidated=Staðfestar (vörur til skip eða þegar flutt)
 StatusSendingProcessed=Afgreitt
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Meira heill skjal líkan fyrir kvittunum sending (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER skilgreind ekki
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang
index eb22f8deba6..9741ab77235 100644
--- a/htdocs/langs/is_IS/stocks.lang
+++ b/htdocs/langs/is_IS/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Vöruhús gildi
 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/is_IS/ticket.lang b/htdocs/langs/is_IS/ticket.lang
index 956e3b0a629..113be596543 100644
--- a/htdocs/langs/is_IS/ticket.lang
+++ b/htdocs/langs/is_IS/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Önnur
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Hár
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Lesa
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/is_IS/website.lang b/htdocs/langs/is_IS/website.lang
index 5f3b13b98b1..bcec388e753 100644
--- a/htdocs/langs/is_IS/website.lang
+++ b/htdocs/langs/is_IS/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/is_IS/withdrawals.lang b/htdocs/langs/is_IS/withdrawals.lang
index 755bbeb6aee..2390a284ffe 100644
--- a/htdocs/langs/is_IS/withdrawals.lang
+++ b/htdocs/langs/is_IS/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Flokka fært
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Valkostur fyrir alvöru ham var ekki sett, að hætta við eftir þessa uppgerð
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/is_IS/workflow.lang b/htdocs/langs/is_IS/workflow.lang
index 8f682447322..50064fb4035 100644
--- a/htdocs/langs/is_IS/workflow.lang
+++ b/htdocs/langs/is_IS/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/it_CH/compta.lang b/htdocs/langs/it_CH/compta.lang
deleted file mode 100644
index c7c41488180..00000000000
--- a/htdocs/langs/it_CH/compta.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
diff --git a/htdocs/langs/it_CH/mrp.lang b/htdocs/langs/it_CH/mrp.lang
new file mode 100644
index 00000000000..f03d631dfd4
--- /dev/null
+++ b/htdocs/langs/it_CH/mrp.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - mrp
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
diff --git a/htdocs/langs/it_CH/products.lang b/htdocs/langs/it_CH/products.lang
index 6e900475275..2a38b9b0181 100644
--- a/htdocs/langs/it_CH/products.lang
+++ b/htdocs/langs/it_CH/products.lang
@@ -1,2 +1,2 @@
 # Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
+AssociatedProductsAbility=Enable Kits (set of several products)
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index efd66d86cb6..7651e63da89 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=Questo servizio
 ThisProduct=Questo prodotto
 DefaultForService=Predefinito per servizio
 DefaultForProduct=Predefinito per prodotto
+ProductForThisThirdparty=Product for this thirdparty
+ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Non posso suggerire
 AccountancySetupDoneFromAccountancyMenu=La maggior parte del setup della contabilità è effettuata dal menù %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -48,6 +50,7 @@ CountriesExceptMe=Tutti i paesi eccetto %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Account principale di contabilità per i clienti non definito nel setup
 MainAccountForSuppliersNotDefined=Account principale di contabilità per fornitori non definito nel setup
@@ -144,7 +147,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=Numero di elementi da associare mostrato per pagina (massimo raccomandato: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 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
 
@@ -198,7 +201,8 @@ Docdate=Data
 Docref=Riferimento
 LabelAccount=Etichetta conto
 LabelOperation=Etichetta operazione
-Sens=Verso
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Codice impressioni
 Lettering=Impressioni
 Codejournal=Giornale
@@ -206,7 +210,8 @@ JournalLabel=Etichetta del giornale
 NumPiece=Numero del pezzo
 TransactionNumShort=Num. transazione
 AccountingCategory=Gruppi personalizzati
-GroupByAccountAccounting=Raggruppamento piano dei conti
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Qui puoi definire alcuni gruppi di conti contabili. Saranno utilizzati per rapporti contabili personalizzati.
 ByAccounts=Per conto
 ByPredefinedAccountGroups=Per gruppi predefiniti
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Saldo di apertura
 ShowOpeningBalance=Mostra bilancio di apertura
 HideOpeningBalance=Nascondi bilancio di apertura
-ShowSubtotalByGroup=Mostra totale parziale per gruppo
+ShowSubtotalByGroup=Show subtotal by level
 
 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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consultare qui il numero di movimenti per mese che non sono stati convalidati e gli anni fiscali già aperti
 OverviewOfMovementsNotValidated=Passaggio 1 / Panoramica dei movimenti non convalidati. (Necessario per chiudere un anno fiscale)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Convalida i movimenti
 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
-SelectMonthAndValidate=Seleziona il mese e convalida i movimenti
 
 ValidateHistory=Collega automaticamente
 AutomaticBindingDone=Collegamento automatico fatto
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Mostra tutorial
 NotReconciled=Non conciliata
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +345,7 @@ 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_Sage50_Swiss=Export for Sage 50 Switzerland
 Modelcsv_winfic=Esporta Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
@@ -381,7 +390,7 @@ 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)
+ErrorNoAccountingCategoryForThisCountry=Nessun gruppo di piano dei conti disponibile per il paese %s ( Vedi Home - Impostazioni - Dizionari )
 ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Alcune righe della fattura non sono collegato a un piano dei conti.
 ExportNotSupported=Il formato di esportazione configurato non è supportato in questa pagina
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index b20c40b7563..29b516e2c33 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Aspetto grafico e lingua
 SetupArea=Impostazioni
 UploadNewTemplate=Carica nuovi modelli
 FormToTestFileUploadForm=Modulo per provare il caricamento file (secondo la configurazione)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Nota: funziona solo se il <b>modulo %s</b> è attivo
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Vedi anteprima
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Anteprima non disponibile
 ThemeCurrentlyActive=Tema attualmente attivo
-CurrentTimeZone=Fuso orario attuale
 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=Spazio
@@ -153,8 +154,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 temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Cancella fle temporanei
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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.
@@ -256,6 +257,7 @@ 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>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,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=Esempi di sintassi: <br/> c: dir \\ <br/> /Home/mydir <br/> DOL_DATA_ROOT/ECM/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br/>Per sapere come creare i modelli di documento odt, prima di salvarli in queste directory, leggere la documentazione wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Posizione del cognome/nome
@@ -406,7 +408,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=Nascondi i pulsanti per azioni non autorizzate anziché mostrare i pulsanti disabilitati
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Vecchia aliquota IVA
 NewVATRates=Nuova aliquota IVA
 PriceBaseTypeToChange=Modifica i prezzi con la valuta di base definita.
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Sondaggio, Indagine o Votazione
 Module55000Desc=Modulo per creare sondaggi, indagini o feedback online (Doodle, Studs, Rdvz o simili)
 Module59000Name=Margini
-Module59000Desc=Modulo per gestire margini
+Module59000Desc=Module to follow margins
 Module60000Name=Commissioni
 Module60000Desc=Modulo per gestire commissioni
 Module62000Name=Import-Export
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Ottimizzazione della ricerca
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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 forms (otherwise shown in a tooltip popup)
+DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
+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 the language of the third party
+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=Tipo di codici a barre predefinito da utilizzare per i prodotti
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Nuovo menu
 MenuHandler=Gestore menu
 MenuModule=Modulo sorgente
-HideUnauthorizedMenu= Nascondere i menu non autorizzati
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Gestore menu dove mostrare il nuovo menu
 DetailMenuModule=Nome del modulo, per le voci di menu provenienti da un modulo
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=CAP
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index 67051003cf9..0391c90cf1b 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Colora i movimenti
 BankColorizeMovementDesc=Se questa funzione è abilitata, è possibile scegliere il colore di sfondo specifico per i movimenti di debito o credito
 BankColorizeMovementName1=Colore di sfondo per il movimento di debito
 BankColorizeMovementName2=Colore di sfondo per il movimento del credito
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
+NoBankAccountDefined=No bank account defined
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index 930f6948a9e..fb10fd9b8d9 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -379,7 +379,7 @@ InvoiceAutoValidate=Convalida le fatture automaticamente
 GeneratedFromRecurringInvoice=Fattura ricorrente %s generata dal modello
 DateIsNotEnough=Data non ancora raggiunta
 InvoiceGeneratedFromTemplate=Fattura %s generata da modello ricorrente %s
-GeneratedFromTemplate=Generated from template invoice %s
+GeneratedFromTemplate=Generata dal modello di fattura %s
 WarningInvoiceDateInFuture=Attenzione, la data della fattura è successiva alla data odierna
 WarningInvoiceDateTooFarInFuture=Attenzione, la data della fattura è troppo lontana dalla data odierna
 ViewAvailableGlobalDiscounts=Mostra gli sconti disponibili
@@ -531,6 +531,7 @@ TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 InvoiceFirstSituationAsk=Prima fattura di avanzamento lavori
 InvoiceFirstSituationDesc=La <b>fatturazione ad avanzamento lavori</b> è collegata a una progressione e a un avanzamento dello stato del lavoro, ad esempio la progressione di una costruzione. Ogni avanzamento lavori è legato a una fattura.
 InvoiceSituation=Fattura ad avanzamento lavori
+PDFInvoiceSituation=Fattura di avanzamento lavori
 InvoiceSituationAsk=Fattura a seguito di avanzamento lavori
 InvoiceSituationDesc=Crea un nuovo avanzamento lavori a seguito di uno già esistente
 SituationAmount=Importo della fattura di avanzamento lavori (al netto delle imposte)
@@ -575,3 +576,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Fattura fornitore eliminata
 UnitPriceXQtyLessDiscount=Prezzo unitario x Qtà - Sconto
 CustomersInvoicesArea=Area fatturazione clienti
 SupplierInvoicesArea=Area di fatturazione del fornitore
+FacParentLine=Genitore riga fattura
+SituationTotalRayToRest=Resto da pagare senza tasse
+PDFSituationTitle=Situazione n ° %d
+SituationTotalProgress=Avanzamento totale %d %%
diff --git a/htdocs/langs/it_IT/blockedlog.lang b/htdocs/langs/it_IT/blockedlog.lang
index 7a37bfa4034..98846601074 100644
--- a/htdocs/langs/it_IT/blockedlog.lang
+++ b/htdocs/langs/it_IT/blockedlog.lang
@@ -22,8 +22,8 @@ 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_PAYED=Fattura attiva pagata
+logBILL_UNPAYED=Fattura attiva impostata "non pagata"
 logBILL_VALIDATE=Convalida fattura attiva
 logBILL_SENTBYMAIL=Customer invoice send by mail
 logBILL_DELETE=Customer invoice logically deleted
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Registrazione chiusura cassa
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/it_IT/boxes.lang b/htdocs/langs/it_IT/boxes.lang
index 9c5a07767a4..c9877141918 100644
--- a/htdocs/langs/it_IT/boxes.lang
+++ b/htdocs/langs/it_IT/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Ultime %s donazioni modificate
 BoxTitleLastModifiedExpenses=Ultime %s note spese modificate
 BoxTitleLatestModifiedBoms=Ultime %s distinte componenti modificate
 BoxTitleLatestModifiedMos=Ultimi %s ordini di produzione modificati
+BoxTitleLastOutstandingBillReached=Clienti con il massimo in sospeso superato
 BoxGlobalActivity=Attività generale (fatture, proposte, ordini)
 BoxGoodCustomers=Buoni clienti
 BoxTitleGoodCustomers=%s Buoni clienti
+BoxScheduledJobs=Processi pianificati
+BoxTitleFunnelOfProspection=Imbuto di piombo
 FailedToRefreshDataInfoNotUpToDate=Aggiornamento del flusso RSS fallito. Data dell'ultimo aggiornamento valido: %s
 LastRefreshDate=Data dell'ultimo aggiornamento
 NoRecordedBookmarks=Nessun segnalibro presente
@@ -83,8 +86,8 @@ BoxTitleLatestModifiedSupplierOrders=Ordini fornitore: ultimi %s modificati
 BoxTitleLastModifiedCustomerBills=Fatture attive: ultime %s modificate
 BoxTitleLastModifiedCustomerOrders=Ordini: ultimi %s modificati
 BoxTitleLastModifiedPropals=Ultime %s proposte modificate
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Ultimi %s jobs modificati
+BoxTitleLatestModifiedCandidatures=Ultime candidature modificate %s
 ForCustomersInvoices=Fatture attive
 ForCustomersOrders=Ordini cliente
 ForProposals=Proposte
@@ -92,8 +95,8 @@ LastXMonthRolling=Ultimi %s mesi
 ChooseBoxToAdd=Aggiungi widget alla dashboard
 BoxAdded=Widget aggiunto al pannello principale
 BoxTitleUserBirthdaysOfMonth=Compleanni di questo mese (utenti)
-BoxLastManualEntries=Ultime registrazioni manuali in contabilità
-BoxTitleLastManualEntries=%s ultime voci del manuale
+BoxLastManualEntries=Latest record in accountancy entered manually or without source document
+BoxTitleLastManualEntries=%s latest record entered manually or without source document
 NoRecordedManualEntries=Nessuna registrazione manuale registrata in contabilità
 BoxSuspenseAccount=Conta l'operazione contabile con l'account suspense
 BoxTitleSuspenseAccount=Numero di righe non allocate
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=L'account Suspense non è definito
 BoxLastCustomerShipments=Ultime spedizioni cliente
 BoxTitleLastCustomerShipments=Ultime %s spedizioni cliente
 NoRecordedShipments=Nessuna spedizione cliente registrata
+BoxCustomersOutstandingBillReached=Clienti con limite eccezionale raggiunto
 # Pages
 AccountancyHome=Contabilità
+ValidatedProjects=Progetti convalidati
diff --git a/htdocs/langs/it_IT/cashdesk.lang b/htdocs/langs/it_IT/cashdesk.lang
index da0aaa59816..b8069c4f189 100644
--- a/htdocs/langs/it_IT/cashdesk.lang
+++ b/htdocs/langs/it_IT/cashdesk.lang
@@ -47,10 +47,10 @@ Receipt=Ricevuta
 Header=Header
 Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
-TheoricalAmount=Theorical amount
+TheoricalAmount=Importo teorico
 RealAmount=Real amount
-CashFence=Cassetta dei contanti
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Numero di fatture
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Modulo di numerazione per vendite POS
 CashDeskGenericMaskCodes6 =  <br> Il tag <b> {TN} </b> viene utilizzato per aggiungere il numero del terminale
 TakeposGroupSameProduct=Raggruppa le stesse linee di prodotti
 StartAParallelSale=Inizia una nuova vendita parallela
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Chiudi cassetta contanti
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Rapporto di cassa
 MainPrinterToUse=Stampante principale da utilizzare
 OrderPrinterToUse=Ordine stampante da utilizzare
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/it_IT/categories.lang b/htdocs/langs/it_IT/categories.lang
index 7d60396caab..8de361ac0e1 100644
--- a/htdocs/langs/it_IT/categories.lang
+++ b/htdocs/langs/it_IT/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Area tag/categorie progetti
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categorie
 CatList=Lista delle tag/categorie
+CatListAll=Elenco di tag / categorie (tutti i tipi)
 NewCategory=Nuova tag/categoria
 ModifCat=Modifica tag/categoria
 CatCreated=Tag/categoria creata
@@ -65,28 +66,34 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Tag / categorie di magazzino
 ThisCategoryHasNoItems=Questa categoria non contiene alcun elemento.
 CategId=ID Tag/categoria
-CatSupList=List of vendor tags/categories
-CatCusList=Lista delle tag/categorie clienti
+ParentCategory=Tag / categoria principale
+ParentCategoryLabel=Etichetta del tag / categoria principale
+CatSupList=Elenco di tag / categorie di fornitori
+CatCusList=Elenco di tag / categorie di clienti / potenziali clienti
 CatProdList=Elenco delle tag/categorie prodotti
 CatMemberList=Lista delle tag/categorie membri
-CatContactList=Lista delle tag/categorie contatti
-CatSupLinks=Collegamenti tra fornitori e tag/categorie
+CatContactList=Elenco di tag / categorie di contatti
+CatProjectsList=Elenco di tag / categorie di progetti
+CatUsersList=Elenco di tag / categorie di utenti
+CatSupLinks=Collegamenti tra fornitori e tag / categorie
 CatCusLinks=Collegamenti tra clienti e tag/categorie
 CatContactsLinks=Collegamento fra: contatti/indirizzi e tags/categorie
 CatProdLinks=Collegamenti tra prodotti/servizi e tag/categorie
-CatProJectLinks=Collegamenti tra progetti e tag/categorie
+CatMembersLinks=Collegamenti tra membri e tag/categorie
+CatProjectsLinks=Collegamenti tra progetti e tag/categorie
+CatUsersLinks=Collegamenti tra utenti e tag / categorie
 DeleteFromCat=Elimina dalla tag/categoria
 ExtraFieldsCategories=Campi extra
 CategoriesSetup=Impostazioni Tag/categorie
 CategorieRecursiv=Collega automaticamente alla tag/categoria padre
 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
 AddProductServiceIntoCategory=Aggiungi il seguente prodotto/servizio
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
+AddCustomerIntoCategory=Assegna la categoria al cliente
+AddSupplierIntoCategory=Assegna la categoria al fornitore
 ShowCategory=Mostra tag/categoria
 ByDefaultInList=Default nella lista
 ChooseCategory=Choose category
 StocksCategoriesArea=Categorie magazzini
 ActionCommCategoriesArea=Categorie eventi
-WebsitePagesCategoriesArea=Page-Container Categories
+WebsitePagesCategoriesArea=Pagina-Contenitore delle Categorie
 UseOrOperatorForCategories=Uso o operatore per le categorie
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index 703fa6018f2..a5ca94be7b1 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -144,7 +144,7 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=UID-Nummer
+ProfId1CH=Numero UID
 ProfId2CH=-
 ProfId3CH=numero federale
 ProfId4CH=numero registrazione commerciale
@@ -282,11 +282,11 @@ CustomerAbsoluteDiscountShort=Sconto assoluto
 CompanyHasRelativeDiscount=Il cliente ha uno sconto del <b> %s%% </b>
 CompanyHasNoRelativeDiscount=Il cliente non ha alcuno sconto relativo impostato
 HasRelativeDiscountFromSupplier=Hai uno sconto predefinito di <b>%s%%</b> da questo fornitore
-HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
+HasNoRelativeDiscountFromSupplier=Non esistono sconti relativi predefiniti per questo fornitore\n
 CompanyHasAbsoluteDiscount=Questo cliente ha degli sconti disponibili (note di credito o anticipi) per un totale di <b>%s</b>%s
 CompanyHasDownPaymentOrCommercialDiscount=Questo cliente ha uno sconto disponibile (commerciale, anticipi) per <b>%s</b>%s
 CompanyHasCreditNote=Il cliente ha ancora note di credito per <b> %s %s </b>
-HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
+HasNoAbsoluteDiscountFromSupplier=Il fornitore non ha disponibile alcuno sconto assoluto per credito
 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
@@ -358,8 +358,8 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=È anche possibile controllare manualmente sul sito della Commissione Europea <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Non è possibile effettuare il controllo. Servizio non previsto per lo stato membro ( %s).
 NorProspectNorCustomer=Né cliente, né cliente potenziale
-JuridicalStatus=Forma giuridica
-Workforce=Workforce
+JuridicalStatus=Tipo di entità aziendale
+Workforce=Forza lavoro
 Staff=Dipendenti
 ProspectLevelShort=Cl. Pot.
 ProspectLevel=Liv. cliente potenziale
@@ -462,8 +462,8 @@ PaymentTermsSupplier=Termine di pagamento - Fornitore
 PaymentTypeBoth=Tipo di pagamento - Cliente e fornitore
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Valuta
-InEEC=Europe (EEC)
-RestOfEurope=Rest of Europe (EEC)
-OutOfEurope=Out of Europe (EEC)
-CurrentOutstandingBillLate=Current outstanding bill late
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
+InEEC=Europa (CEE)
+RestOfEurope=Resto d'Europa (CEE)
+OutOfEurope=Fuori dall'Europa (CEE)
+CurrentOutstandingBillLate=Fatture scadute in ritardo
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Fai attenzione, a seconda delle impostazioni del prezzo del prodotto, dovresti cambiare terze parti prima di aggiungere il prodotto al POS.
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index 8243a338ffc..a7638fb2824 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -111,7 +111,7 @@ Refund=Rimborso
 SocialContributionsPayments=Pagamenti tasse/contributi
 ShowVatPayment=Visualizza pagamento IVA
 TotalToPay=Totale da pagare
-BalanceVisibilityDependsOnSortAndFilters=Il bilancio è visibile in questo elenco solo se la tabella è ordinata in verso ascendente per %s e filtrata per un conto bancario
+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=Cod. cont. cliente
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Sei sicuro di voler cancellare il pagamento di q
 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=Analisi delle fatture registrate anche se non sono ancora contabilizzate nel libro mastro.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 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>
@@ -154,9 +154,9 @@ 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=Vedi %sanalisi dei pagamenti%s per un calcolo sui pagamenti effettivi effettuati anche se non ancora contabilizzati nel libro mastro.
-SeeReportInDueDebtMode=Vedi %sanalisi delle fatture %s per un calcolo basato sulle fatture registrate anche se non ancora contabilizzate nel libro mastro.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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=- 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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Sono incluse le fatture d'acconto
+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=IRPF soggetti terzi(Spagna)
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
@@ -208,7 +211,7 @@ DescPurchasesJournal=Storico acquisti
 CodeNotDef=Non definito
 WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
 DatePaymentTermCantBeLowerThanObjectDate=La data termine di pagamento non può essere anteriore alla data dell'oggetto
-Pcg_version=Chart of accounts models
+Pcg_version=Modelli piano dei conti
 Pcg_type=Tipo pcg
 Pcg_subtype=Sottotipo Pcg
 InvoiceLinesToDispatch=Riga di fattura da spedire *consegnare
diff --git a/htdocs/langs/it_IT/cron.lang b/htdocs/langs/it_IT/cron.lang
index bc04e98bec5..988a944ddfd 100644
--- a/htdocs/langs/it_IT/cron.lang
+++ b/htdocs/langs/it_IT/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Elimina processo pianificato
 Permission23104 = Esegui processo pianificato
 # Admin
 CronSetup=Impostazione delle azioni pianificate
-URLToLaunchCronJobs=URL per controllare ed eseguire i processi in cron
-OrToLaunchASpecificJob=O per lanciare un processo specifico
+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=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
 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
@@ -46,6 +47,7 @@ CronNbRun=Num. lancio
 CronMaxRun=Numero massimo di lanci
 CronEach=Ogni
 JobFinished=Processo eseguito e completato
+Scheduled=Scheduled
 #Page card
 CronAdd= Aggiungi processo
 CronEvery=Esegui ogni processo
@@ -56,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=Abilita
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disattiva
 CronTaskInactive=Questo processo è disabilitato
 CronId=Id
@@ -82,3 +84,8 @@ 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
+# 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/it_IT/deliveries.lang b/htdocs/langs/it_IT/deliveries.lang
index bc6a34e0149..a24bb962dac 100644
--- a/htdocs/langs/it_IT/deliveries.lang
+++ b/htdocs/langs/it_IT/deliveries.lang
@@ -27,5 +27,6 @@ Recipient=Destinatario
 ErrorStockIsNotEnough=Non ci sono sufficienti scorte
 Shippable=Disponibile per spedizione
 NonShippable=Non disponibile per spedizione
+ShowShippableStatus=Mostra lo stato di spedizione
 ShowReceiving=Mostra ricevuta di consegna
 NonExistentOrder=Ordine inesistente
diff --git a/htdocs/langs/it_IT/ecm.lang b/htdocs/langs/it_IT/ecm.lang
index f14a0514d5c..0eef308f02a 100644
--- a/htdocs/langs/it_IT/ecm.lang
+++ b/htdocs/langs/it_IT/ecm.lang
@@ -23,7 +23,7 @@ ECMSearchByKeywords=Ricerca per parole chiave
 ECMSearchByEntity=Ricerca per oggetto
 ECMSectionOfDocuments=Directory dei documenti
 ECMTypeAuto=Automatico
-ECMDocsBy=Documents linked to %s
+ECMDocsBy=Documenti collegati a %s
 ECMNoDirectoryYet=Nessuna directory creata
 ShowECMSection=Visualizza la directory
 DeleteSection=Eliminare la directory
@@ -38,6 +38,6 @@ ReSyncListOfDir=Aggiorna la lista delle cartelle
 HashOfFileContent=Hash contenuto file
 NoDirectoriesFound=Nessuna cartella trovata
 FileNotYetIndexedInDatabase=File non indicizzato nel database (prova a caricarlo di nuovo)
-ExtraFieldsEcmFiles=Extrafields Ecm Files
-ExtraFieldsEcmDirectories=Extrafields Ecm Directories
-ECMSetup=ECM Setup
+ExtraFieldsEcmFiles=File Ecm campi extra
+ExtraFieldsEcmDirectories=Directory Ecm campi extra
+ECMSetup=Configurazione ECM
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index 01a4e96f6b8..ec5b4234b48 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Nessun errore, committiamo
 # Errors
 ErrorButCommitIsDone=Sono stati trovati errori ma si convalida ugualmente
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=L'URL %s è sbagliato
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=L'utente %s esiste già.
 ErrorGroupAlreadyExists=Il gruppo %s esiste già
 ErrorRecordNotFound=Record non trovato
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Mancano alcuni campi obbligatori.
 ErrorSubjectIsRequired=Il titolo della 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
 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
@@ -75,7 +78,7 @@ 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=Il riferimento utilizzato esiste già.
+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 has at least one child of type %s
@@ -99,7 +102,7 @@ ErrorBadMaskBadRazMonth=Errore, valore di reset non valido
 ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
 ErrorCounterMustHaveMoreThan3Digits=Il contatore deve avere più di 3 cifre
 ErrorSelectAtLeastOne=Errore. Selezionare almeno una voce. 
-ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
+ErrorDeleteNotPossibleLineIsConsolidated=Impossibile eliminare il record collegato ad una transazione bancaria conciliata\n
 ErrorProdIdAlreadyExist=%s è già assegnato
 ErrorFailedToSendPassword=Impossibile inviare la password
 ErrorFailedToLoadRSSFile=Impossibile ottenere feed RSS. Se i messaggi di errore non forniscono informazioni sufficienti, prova ad ativare il debug con MAIN_SIMPLEXMLLOAD_DEBUG.
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -224,7 +227,7 @@ ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must hav
 ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
 ErrorURLMustStartWithHttp=URL %s must 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.
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Errore! Impossibile eliminare un pagamento collegato ad una fattura Pagata.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
 ErrorObjectMustHaveStatusActiveToBeDisabled=Gli oggetti devono avere lo stato 'Attivo' per essere disabilitati
 ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Gli oggetti devono avere lo stato 'Bozza' o 'Disabilitato' per essere abilitato
@@ -243,6 +246,16 @@ 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
+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
+
 # 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.
@@ -266,7 +279,11 @@ WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while
 WarningYourLoginWasModifiedPleaseLogin=La tua login è stata modificata. Per ragioni di sicurezza dove accedere con la nuova login prima di eseguire una nuova azione.
 WarningAnEntryAlreadyExistForTransKey=Esiste già una voce tradotta per la chiave di traduzione per questa lingua
 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
+WarningDateOfLineMustBeInExpenseReportRange=Attenzione, la data della riga non è compresa nel periodo della nota spese\n
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 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=Avviso, impossibile aggiungere la voce del file nella tabella dell'indice del database ECM
+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.
diff --git a/htdocs/langs/it_IT/exports.lang b/htdocs/langs/it_IT/exports.lang
index aa66a29179d..5b616c68eaf 100644
--- a/htdocs/langs/it_IT/exports.lang
+++ b/htdocs/langs/it_IT/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Chiave da utilizzare per l'aggiornamento dei dati
 NbInsert=Numero di righe inserite: %s
 NbUpdate=Numero di righe aggiornate: %s
 MultipleRecordFoundWithTheseFilters=Righe multiple sono state trovate con questi filtri: %s
+StocksWithBatch=Scorte e ubicazione (magazzino) dei prodotti con numero di lotto / seriale
diff --git a/htdocs/langs/it_IT/interventions.lang b/htdocs/langs/it_IT/interventions.lang
index 449510235a8..ef76939f5ec 100644
--- a/htdocs/langs/it_IT/interventions.lang
+++ b/htdocs/langs/it_IT/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Modello di intervento
 ToCreateAPredefinedIntervention=Per creare un intervento predefinito o ricorrente, creare un intervento comune e convertirlo in modello di intervento
+Reopen=Riapri
+ConfirmReopenIntervention=Sei sicuro di voler riaprire l'intervento <b> %s </b>?
diff --git a/htdocs/langs/it_IT/languages.lang b/htdocs/langs/it_IT/languages.lang
index 5e5be267cc1..b950698f946 100644
--- a/htdocs/langs/it_IT/languages.lang
+++ b/htdocs/langs/it_IT/languages.lang
@@ -40,7 +40,7 @@ Language_es_PA=Spagnolo (Panama)
 Language_es_PY=Spagnolo (Paraguay)
 Language_es_PE=Spagnolo (Perù)
 Language_es_PR=Spagnolo (Portorico)
-Language_es_US=Spanish (USA)
+Language_es_US=Spagnolo (USA)
 Language_es_UY=Spagnolo (Uruguay)
 Language_es_GT=Spagnolo (Guatemala)
 Language_es_VE=Spagnolo (Venezuela)
@@ -56,7 +56,7 @@ Language_fr_CM=Francese (Camerun)
 Language_fr_FR=Francese
 Language_fr_GA=Francese (Gabon)
 Language_fr_NC=Francese (Nuova Caledonia)
-Language_fr_SN=French (Senegal)
+Language_fr_SN=Francese (Senegal)
 Language_fy_NL=Frisone
 Language_gl_ES=Galiziano
 Language_he_IL=Ebraico
diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang
index af3f2044542..f6a0cc2c0a4 100644
--- a/htdocs/langs/it_IT/mails.lang
+++ b/htdocs/langs/it_IT/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
 MailingModuleDescThirdPartiesByCategories=Soggetti terzi (per categoria)
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+EmailCollectorFilterDesc=Tutti i filtri devono corrispondere affinché venga raccolta un'e-mail
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Riga %s nel file
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=Nessuna email inviata. Mittente o destinatario errati. Verifica il profilo utente.
 # Module Notifications
 Notifications=Notifiche
-NoNotificationsWillBeSent=Non sono previste notifiche per questo evento o società
-ANotificationsWillBeSent=Verrà inviata una notifica via email
-SomeNotificationsWillBeSent=%s notifiche saranno inviate via email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=Elenco delle notifiche spedite per email
+NotificationsAuto=Notifiche Auto.
+NoNotificationsWillBeSent=Non sono previste notifiche e-mail automatiche per questo tipo di evento e azienda
+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=Elenca tutti gli abbonamenti attivi (obiettivi / eventi) per la notifica e-mail automatica
+ListOfNotificationsDone=Elenco delle notifiche email 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.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Destinatari (selezione avanzata)
 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
+AdvTgtSearchTextHelp=Utilizza %% come caratteri jolly. Ad esempio, per trovare tutti gli articoli come <b> jean, joe, jim </b>, puoi inserire <b> j%% </b>, puoi anche usare; come separatore di valore e usa ! ad eccezione di questo valore. Ad esempio <b> jean; joe; jim%%;! Jimo;! Jima%% </b> sceglierà come target tutti i jeans, joe, inizia con jim ma non jimo e non tutto ciò che inizia con jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
 AdvTgtMinVal=Valore minimo
 AdvTgtMaxVal=Valore massimo
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Crea filtro
 AdvTgtOrCreateNewFilter=Titolo del nuovo filtro
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Configurazione email in uscita
-InGoingEmailSetup=Incoming email setup
+OutGoingEmailSetup=Email in uscita
+InGoingEmailSetup=Email in entrata
 OutGoingEmailSetupForEmailing=Configurazione della posta elettronica in uscita (per il modulo %s)
-DefaultOutgoingEmailSetup=Impostazione predefinita email in uscita
+DefaultOutgoingEmailSetup=Stessa configurazione della configurazione globale della posta in uscita
 Information=Informazioni
 ContactsWithThirdpartyFilter=Contacts with third-party filter
-Unanswered=Unanswered
+Unanswered=Senza risposta
 Answered=Answered
-IsNotAnAnswer=Is not answer (initial email)
-IsAnAnswer=Is an answer of an initial email
+IsNotAnAnswer=Non è risposta (email iniziale)
+IsAnAnswer=È la risposta di una prima email
+RecordCreatedByEmailCollector=Record creato da Email Collector %s dall'email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 0be748325f0..b7ba2b5fe0e 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Nessun tema disponibile per questo tipo di email
 AvailableVariables=Variabili di sostituzione disponibili
 NoTranslation=Nessuna traduzione
 Translation=Traduzioni
+CurrentTimeZone=Fuso orario attuale
 EmptySearchString=Inserisci criteri di ricerca non vuoti
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Nessun risultato trovato
 NoRecordDeleted=Nessun record eliminato
 NotEnoughDataYet=Dati insufficienti
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Record salvato
 RecordDeleted=Record cancellato
 RecordGenerated=Record generato
@@ -220,6 +224,7 @@ Value=Valore
 PersonalValue=Valore personalizzato
 NewObject=Nuovo %s
 NewValue=Nuovo valore
+OldValue=Old value %s
 CurrentValue=Valore attuale
 Code=Codice
 Type=Tipo
@@ -433,6 +438,7 @@ RemainToPay=Rimanente da pagare
 Module=Moduli/Applicazioni
 Modules=Moduli/Applicazioni
 Option=Opzione
+Filters=Filters
 List=Elenco
 FullList=Elenco completo
 FullConversation=Conversazione completa
@@ -650,6 +656,7 @@ SupplierPreview=Anteprima fornitore
 ShowCustomerPreview=Visualizza anteprima cliente
 ShowSupplierPreview=Visualizza anteprima fornitore
 RefCustomer=Rif. cliente
+InternalRef=Internal ref.
 Currency=Valuta
 InfoAdmin=Informazioni per gli amministratori
 Undo=Annulla
@@ -671,7 +678,7 @@ SendMail=Invia una email
 Email=Email
 NoEMail=Nessuna email
 AlreadyRead=Già letto
-NotRead=Non letto
+NotRead=Unread
 NoMobilePhone=Nessun cellulare
 Owner=Proprietario
 FollowingConstantsWillBeSubstituted=Le seguenti costanti saranno sostitute con i valori corrispondenti
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=In attesa
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/it_IT/modulebuilder.lang b/htdocs/langs/it_IT/modulebuilder.lang
index d15a6328f84..12630bc2936 100644
--- a/htdocs/langs/it_IT/modulebuilder.lang
+++ b/htdocs/langs/it_IT/modulebuilder.lang
@@ -40,6 +40,7 @@ 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=Pagina PHP per la scheda dei contatti
 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=Esplora API
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=Elenco voci dizionari
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+DropTableIfEmpty=(Distruggi la tabella se vuota)
 TableDoesNotExists=The table %s does not exists
 TableDropped=Table %s deleted
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=Il riferimento dell'oggetto deve essere generato automaticamente
 IncludeRefGenerationHelp=Seleziona questa opzione se desideri includere il codice per gestire la generazione automatica del riferimento
 IncludeDocGeneration=Desidero generare alcuni documenti da questo oggetto
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Tipo di campi: <br> varchar(99), double(24,8), real, text, html
 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.
diff --git a/htdocs/langs/it_IT/mrp.lang b/htdocs/langs/it_IT/mrp.lang
index e5048e22764..d169db398be 100644
--- a/htdocs/langs/it_IT/mrp.lang
+++ b/htdocs/langs/it_IT/mrp.lang
@@ -1,5 +1,5 @@
 Mrp=Ordini di produzione
-MOs=Manufacturing orders
+MOs=Ordini di produzione
 ManufacturingOrder=Ordine di produzione
 MRPDescription=Modulo per la gestione degli ordini di produzione (MO).
 MRPArea=MRP Area
@@ -76,5 +76,29 @@ ProductsToProduce=Prodotti da produrre
 UnitCost=Costo unitario
 TotalCost=Costo totale
 BOMTotalCost=Il costo per produrre questa distinta base in base al costo di ciascuna quantità e prodotto da consumare (utilizzare il prezzo di costo se definito, altrimenti il prezzo medio ponderato se definito, altrimenti il miglior prezzo di acquisto)
-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
+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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/it_IT/multicurrency.lang b/htdocs/langs/it_IT/multicurrency.lang
index 556b727c6d6..1344eb123be 100644
--- a/htdocs/langs/it_IT/multicurrency.lang
+++ b/htdocs/langs/it_IT/multicurrency.lang
@@ -2,7 +2,7 @@
 MultiCurrency=Multi currency
 ErrorAddRateFail=Error in added rate
 ErrorAddCurrencyFail=Error in added currency
-ErrorDeleteCurrencyFail=Error delete fail
+ErrorDeleteCurrencyFail=Errore! Eliminazione fallita
 multicurrency_syncronize_error=Synchronisation error: %s
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use date of document to find currency rate, instead of using latest known rate
 multicurrency_useOriginTx=When an object is created from another, keep the original rate of source object (otherwise use the latest known rate)
@@ -20,3 +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
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index 1e1fe945c8f..31a5514c3b0 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -5,8 +5,6 @@ Tools=Strumenti
 TMenuTools=Strumenti
 ToolsDesc=Quest'area è dedicata agli strumenti di gruppo non disponibili in altre voci di menu.<br>Tali strumenti sono raggiungibili dal menu laterale.
 Birthday=Compleanno
-BirthdayDate=Giorno di nascita
-DateToBirth=Data di nascita
 BirthdayAlertOn=Attiva avviso compleanni
 BirthdayAlertOff=Avviso compleanni inattivo
 TransKey=Traduzione della chiave TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Archivio zip generato in <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,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
 SeeModuleSetup=Vedi la configurazione del modulo %s
 NbOfAttachedFiles=Numero di file/documenti allegati
 TotalSizeOfAttachedFiles=Dimensione totale dei file/documenti allegati
@@ -99,6 +100,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.
 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)
@@ -137,7 +139,7 @@ Right=Destra
 CalculatedWeight=Peso calcolato
 CalculatedVolume=volume calcolato
 Weight=Peso
-WeightUnitton=t
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -173,7 +175,7 @@ SizeUnitinch=pollice
 SizeUnitfoot=piede
 SizeUnitpoint=punto
 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.
+SendNewPasswordDesc=Questo modulo consente di richiedere una nuova password che verrà inviata al tuo indirizzo email. <br> Il cambiamento sarà effettivo solo dopo aver cliccato sul link di conferma contenuto nell'email. <br> Controlla la tua casella di posta.
 BackToLoginPage=Torna alla pagina di login
 AuthenticationDoesNotAllowSendNewPassword=La modalità di autenticazione è <b>%s</b>.<br/>In questa modalità Dolibarr non può sapere né cambiare la tua password.<br/>Contatta l'amministratore di sistema se desideri cambiare password.
 EnableGDLibraryDesc=Per usare questa opzione bisogna installare o abilitare la libreria GD in PHP.
@@ -214,6 +216,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.
 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.
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Utilizzare - per separare gli orari di apertura e chiusura. <br> Utilizzare uno spazio per inserire intervalli diversi. <br> Esempio: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Area esportazioni
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index 46f0bfa0c75..dfc71f3ed8f 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -104,24 +104,25 @@ SetDefaultBarcodeType=Imposta tipo di codice a barre
 BarcodeValue=Valore codice a barre
 NoteNotVisibleOnBill=Nota (non visibile su fatture, proposte ...)
 ServiceLimitedDuration=Se il prodotto è un servizio di durata limitata:
-FillWithLastServiceDates=Fill with last service line dates
+FillWithLastServiceDates=Inserisci le date dell'ultima riga di servizio
 MultiPricesAbility=Diversi livelli di prezzo per prodotto/servizio (ogni cliente fa parte di un livello)
 MultiPricesNumPrices=Numero di prezzi per il multi-prezzi
 DefaultPriceType=Base dei prezzi per impostazione predefinita (con contro senza tasse) quando si aggiungono nuovi prezzi di vendita
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Abilita kit (set di diversi prodotti)
+VariantsAbility=Abilita varianti (variazioni dei prodotti, ad esempio colore, taglia)
 AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this kit
+AssociatedProductsNumber=Numero di prodotti che compongono questo kit
 ParentProductsNumber=Numero di prodotti associati che includono questo sottoprodotto
 ParentProducts=Prodotti genitore
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
+IfZeroItIsNotAVirtualProduct=Se 0, questo prodotto non è un kit
+IfZeroItIsNotUsedByVirtualProduct=Se 0, questo prodotto non è utilizzato da nessun kit
 KeywordFilter=Filtro per parola chiave
 CategoryFilter=Filtro categoria
 ProductToAddSearch=Cerca prodotto da aggiungere
 NoMatchFound=Nessun risultato trovato
 ListOfProductsServices=Elenco prodotti/servizi
-ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of kits with this product as a component
+ProductAssociationList=Elenco dei prodotti / servizi che sono componenti(e) di questo kit
+ProductParentList=Elenco dei kit con questo prodotto come componente
 ErrorAssociationIsFatherOfThis=Uno dei prodotti selezionati è padre dell'attuale prodotto
 DeleteProduct=Elimina un prodotto/servizio
 ConfirmDeleteProduct=Vuoi davvero eliminare questo prodotto/servizio?
@@ -167,8 +168,10 @@ BuyingPrices=Prezzi di acquisto
 CustomerPrices=Prezzi di vendita
 SuppliersPrices=Prezzi fornitore
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Dogana/Merce/Codice SA
+CustomCode=codice Customs|Commodity|HS
 CountryOrigin=Paese di origine
+RegionStateOrigin=Origine della regione
+StateOrigin=Stato | Provincia provenienza 
 Nature=Natura del prodotto (materiale / finito)
 NatureOfProductShort=Natura del prodotto
 NatureOfProductDesc=Materia prima o prodotto finito
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Usa prezzo non negoziabile
 PriceByQuantity=Prezzi diversi in base alla quantità
 DisablePriceByQty=Disabilitare i prezzi per quantità
 PriceByQuantityRange=Intervallo della quantità
-MultipriceRules=Regole del segmento di prezzo
+MultipriceRules=Prezzi automatici per segmento
 UseMultipriceRules=Utilizza le regole del segmento di prezzo (definite nell'impostazione del modulo del prodotto) per autocalcolare i prezzi di tutti gli altri segmenti in base al primo segmento
 PercentVariationOver=variazione %% su %s
 PercentDiscountOver=sconto %% su %s
@@ -287,7 +290,7 @@ PriceExpressionEditorHelp5=Valori globali disponibili:
 PriceMode=Modalità di prezzo
 PriceNumeric=Numero
 DefaultPrice=Prezzo predefinito
-DefaultPriceLog=Log of previous default prices
+DefaultPriceLog=Registro dei prezzi predefiniti precedenti
 ComposedProductIncDecStock=Aumenta e Diminuisci le scorte alla modifica del prodotto padre
 ComposedProduct=Sottoprodotto
 MinSupplierPrice=Prezzo d'acquisto minimo
@@ -340,7 +343,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 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
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
+PackagingForThisProductDesc=Su ordine del fornitore, ordinerai automaticamente questa quantità (o un multiplo di questa quantità). Non può essere inferiore alla quantità di acquisto minima
 QtyRecalculatedWithPackaging=La quantità della linea è stata ricalcolata in base all'imballaggio del fornitore
 
 #Attributes
@@ -364,9 +367,9 @@ SelectCombination=Selezione combinazione
 ProductCombinationGenerator=Generatore di varianti
 Features=Caratteristiche
 PriceImpact=Impatto sui prezzi
-ImpactOnPriceLevel=Impact on price level %s
-ApplyToAllPriceImpactLevel= Apply to all levels
-ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
+ImpactOnPriceLevel=Impatto sul livello dei prezzi %s
+ApplyToAllPriceImpactLevel= Applicare a tutti i livelli
+ApplyToAllPriceImpactLevelHelp=Facendo clic qui si imposta lo stesso impatto sul prezzo su tutti i livelli
 WeightImpact=Impatto del peso
 NewProductAttribute=Nuovo attributo
 NewProductAttributeValue=Nuovo valore dell'attributo
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index 9d68b1ca8f8..b30159947c7 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -76,15 +76,16 @@ MyActivities=I miei compiti / operatività
 MyProjects=I miei progetti
 MyProjectsArea=Area progetti
 DurationEffective=Durata effettiva
-ProgressDeclared=Avanzamento dichiarato
+ProgressDeclared=Avanzamento dichiarato reale
 TaskProgressSummary=Avanzamento compito
 CurentlyOpenedTasks=Compiti attualmente aperti
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Avanzamento calcolato
+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=Tempo
+TimeConsumed=Consumed
 ListOfTasks=Elenco dei compiti
 GoToListOfTimeConsumed=Vai all'elenco del tempo impiegato
 GanttView=Vista Gantt
@@ -212,8 +213,8 @@ 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
-ProjectsStatistics=Statistics on projects or leads
-TasksStatistics=Statistics on tasks of projects or leads
+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.
 IdTaskTime=Tempo compito id
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/it_IT/propal.lang b/htdocs/langs/it_IT/propal.lang
index b5b78417e8d..7eb57f84fb0 100644
--- a/htdocs/langs/it_IT/propal.lang
+++ b/htdocs/langs/it_IT/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Invia preventivo via e-mail
 DatePropal=Data del preventivo
 DateEndPropal=Data di fine validità
 ValidityDuration=Durata validità
-CloseAs=Imposta lo stato a
 SetAcceptedRefused=Imposta accettato/rifiutato
 ErrorPropalNotFound=Preventivo %s non trovato
 AddToDraftProposals=Aggiungi una bozza di preventivo
@@ -85,3 +84,8 @@ ProposalCustomerSignature=Accettazione scritta, timbro, data e firma
 ProposalsStatisticsSuppliers=Statistiche preventivi fornitori
 CaseFollowedBy=Caso seguito da
 SignedOnly=Solo firmato
+IdProposal=ID proposta
+IdProduct=ID prodotto
+PrParentLine=Riga genitore proposta
+LineBuyPriceHT=Prezzo di acquisto Importo al netto delle tasse per riga
+
diff --git a/htdocs/langs/it_IT/receiptprinter.lang b/htdocs/langs/it_IT/receiptprinter.lang
index a5fbeef5ad6..49621049ddf 100644
--- a/htdocs/langs/it_IT/receiptprinter.lang
+++ b/htdocs/langs/it_IT/receiptprinter.lang
@@ -54,7 +54,7 @@ DOL_DOUBLE_WIDTH=Doppia larghezza
 DOL_DEFAULT_HEIGHT_WIDTH=Altezza e larghezza predefinite
 DOL_UNDERLINE=Abilita sottolineatura
 DOL_UNDERLINE_DISABLED=Disabilita la sottolineatura
-DOL_BEEP=Suono di Beed
+DOL_BEEP=Suono di Beep
 DOL_PRINT_TEXT=Stampa il testo
 DateInvoiceWithTime=Data e ora della fattura
 YearInvoice=Anno della fattura
diff --git a/htdocs/langs/it_IT/recruitment.lang b/htdocs/langs/it_IT/recruitment.lang
index 3f136b5182e..b8e37753ea4 100644
--- a/htdocs/langs/it_IT/recruitment.lang
+++ b/htdocs/langs/it_IT/recruitment.lang
@@ -46,9 +46,9 @@ FutureManager=Manager futuro
 ResponsibleOfRecruitement=Responsabile della selezione
 IfJobIsLocatedAtAPartner=Se il luogo di lavoro è presso partner
 PositionToBeFilled=Posizione lavorativa
-PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+PositionsToBeFilled=Posizione lavorativa
+ListOfPositionsToBeFilled=Elenco posizioni lavorative
+NewPositionToBeFilled=Nuova posizione lavorativa
 
 JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=Informazioni sulla posizione lavorativa da compilare
@@ -60,10 +60,10 @@ ListOfCandidatures=List of applications
 RequestedRemuneration=Requested remuneration
 ProposedRemuneration=Proposed remuneration
 ContractProposed=Contract proposed
-ContractSigned=Contract signed
+ContractSigned=Contratto firmato
 ContractRefused=Contract refused
 RecruitmentCandidature=Application
-JobPositions=Job positions
+JobPositions=Posizione lavorativa
 RecruitmentCandidatures=Applications
 InterviewToDo=Interview to do
 AnswerCandidature=Application answer
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/it_IT/sendings.lang b/htdocs/langs/it_IT/sendings.lang
index 0820b5dbbe7..d902ac9d0f6 100644
--- a/htdocs/langs/it_IT/sendings.lang
+++ b/htdocs/langs/it_IT/sendings.lang
@@ -27,9 +27,10 @@ QtyInOtherShipments=Q.ta in altre spedizioni
 KeepToShip=Ancora da spedire
 KeepToShipShort=Rimanente
 OtherSendingsForSameOrder=Altre Spedizioni per questo ordine
-SendingsAndReceivingForSameOrder=Spedizioni e ricezioni per questo ordini
+SendingsAndReceivingForSameOrder=Spedizioni e ricezioni per questo ordine
 SendingsToValidate=Spedizione da convalidare
 StatusSendingCanceled=Annullato
+StatusSendingCanceledShort=Annullata
 StatusSendingDraft=Bozza
 StatusSendingValidated=Convalidata (prodotti per la spedizione o già spediti)
 StatusSendingProcessed=Processato
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=È necessario convalidare l'ordine prima di pot
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Modello più completo di documento per le ricevute di consegna (logo. ..)
+DocumentModelStorm=Modello di documento più completo per ricevute di consegna e compatibilità con campi extra (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER costante non definita
 SumOfProductVolumes=Totale volume prodotti
 SumOfProductWeights=Totale peso prodotti
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index 3e8770750a4..b2da8fe996d 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Imposta un magazzino sugli ordini di vendita
 UserDefaultWarehouse=Imposta un magazzino per gli utenti
 MainDefaultWarehouse=Magazzino predefinito
@@ -203,8 +204,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=Theorique qty
-TheoricalValue=Theorique qty
+TheoricalQty=Q.tà teorica
+TheoricalValue=Q.tà teorica
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Qtà registrata
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/it_IT/suppliers.lang b/htdocs/langs/it_IT/suppliers.lang
index 5138e9303e0..e178c00850b 100644
--- a/htdocs/langs/it_IT/suppliers.lang
+++ b/htdocs/langs/it_IT/suppliers.lang
@@ -38,7 +38,7 @@ MenuOrdersSupplierToBill=Ordini d'acquisto da fatturare
 NbDaysToDelivery=Tempi di consegna (giorni)
 DescNbDaysToDelivery=Il tempo di consegna più lungo dei prodotti di questo ordine
 SupplierReputation=Reputazione fornitore
-ReferenceReputation=Reference reputation
+ReferenceReputation=Reputazione di riferimento
 DoNotOrderThisProductToThisSupplier=Non ordinare
 NotTheGoodQualitySupplier=Bassa qualità
 ReputationForThisProduct=Reputazione
diff --git a/htdocs/langs/it_IT/ticket.lang b/htdocs/langs/it_IT/ticket.lang
index c51af811cb0..e40b57082bf 100644
--- a/htdocs/langs/it_IT/ticket.lang
+++ b/htdocs/langs/it_IT/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Risoluzione
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Richiesta di aiuto funzionale
 TicketTypeShortISSUE=Issue, bug o problemi
 TicketTypeShortREQUEST=Richiesta di modifica o miglioramento
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Altro
 TicketSeverityShortLOW=Basso
 TicketSeverityShortNORMAL=Normale
 TicketSeverityShortHIGH=Alto
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critico, bloccante
 
 ErrorBadEmailAddress=Campo '%s' non corretto
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Non letto
 Read=Da leggere
 Assigned=Assegnato
 InProgress=Avviato
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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=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=Invia e-mail quando viene aggiunto un nuovo messaggio
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Non disponibile. Il ticket non è stato creato dall'interfaccia pubblica.
-PublicInterfaceNotEnabled=L'interfaccia pubblica non è stata abilitata
 ErrorTicketRefRequired=È richiesto il nome di riferimento del biglietto
 
 #
@@ -265,7 +262,7 @@ TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
 TicketNewEmailBodyInfosTrackUrl=Puoi seguire l'avanzamento del ticket cliccando il link qui sopra
 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.
+TicketPublicInfoCreateTicket=Questo modulo consente di registrare un ticket di supporto nel nostro sistema di gestione ticketing.
 TicketPublicPleaseBeAccuratelyDescribe=Descrivi il problema dettagliatamente. Fornisci più informazioni possibili per consentirci di identificare la tua richiesta.
 TicketPublicMsgViewLogIn=Please enter ticket tracking ID
 TicketTrackId=Public Tracking ID
diff --git a/htdocs/langs/it_IT/users.lang b/htdocs/langs/it_IT/users.lang
index f03887e2e65..199b2cb1d45 100644
--- a/htdocs/langs/it_IT/users.lang
+++ b/htdocs/langs/it_IT/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Rimuovi dal gruppo
 PasswordChangedAndSentTo=Password cambiata ed inviata a <b>%s</b>
 PasswordChangeRequest=Richiesta di modifica della password per <b>%s</b>
 PasswordChangeRequestSent=Richiesta di cambio password per <b>%s</b> da inviare a <b>%s</b>.
+IfLoginExistPasswordRequestSent=Se questo accesso è un account valido, è stata inviata un'e-mail per reimpostare la password.
+IfEmailExistPasswordRequestSent=Se questa e-mail è un account valido, è stata inviata un'e-mail per reimpostare la password.
 ConfirmPasswordReset=Conferma la reimpostazione della password
 MenuUsersAndGroups=Utenti e gruppi
 LastGroupsCreated=Ultimi %s gruppi creati
@@ -69,10 +71,11 @@ InternalUser=Utente interno
 ExportDataset_user_1=Users and their properties
 DomainUser=Utente di dominio %s
 Reactivate=Riattiva
-CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
+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=Un utente <b> interno </b> è un utente che fa parte della tua azienda / organizzazione. <br> Un utente <b>  esterno </b> è un cliente, un fornitore o altro (La creazione di un utente esterno per una terza parte può essere effettuata dal record di contatto della terza parte). <br> <br> In entrambi i casi, le autorizzazioni definiscono i diritti su Dolibarr, anche l'utente esterno può avere un gestore di menu diverso rispetto all'utente interno (Vedi Home - Setup - Display)
 PermissionInheritedFromAGroup=Autorizzazioni ereditate dall'appartenenza al gruppo.
 Inherited=Ereditato
+UserWillBe=L'utente creato sarà
 UserWillBeInternalUser=L'utente sarà un utente interno (in quanto non collegato a un soggetto terzo)
 UserWillBeExternalUser=L'utente sarà un utente esterno (perché collegato ad un soggetto terzo)
 IdPhoneCaller=Id telefonico del chiamante
@@ -93,8 +96,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=No. of users
-NbOfPermissions=No. of permissions
+NbOfUsers=Numero di utenti
+NbOfPermissions=Numero di autorizzazioni
 DontDowngradeSuperAdmin=Solo un superadmin può declassare un superadmin
 HierarchicalResponsible=Supervisore
 HierarchicView=Vista gerarchica
@@ -109,12 +112,14 @@ UserAccountancyCode=Codice contabile utente
 UserLogoff=Logout utente
 UserLogged=Utente connesso
 DateOfEmployment=Data di assunzione
-DateEmployment=Data di assunzione
+DateEmployment=Dipendente
+DateEmploymentstart=Data di assunzione
 DateEmploymentEnd=Data di fine rapporto lavorativo
+RangeOfLoginValidity=Intervallo di date di validità dell'accesso
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Forza validatore rapporto spese
 ForceUserHolidayValidator=Convalida richiesta di congedo forzato
 ValidatorIsSupervisorByDefault=Per impostazione predefinita, il validatore è il supervisore dell'utente. Mantieni vuoto per mantenere questo comportamento.
 UserPersonalEmail=E-mail personale
 UserPersonalMobile=Cellulare personale
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+WarningNotLangOfInterface=Attenzione, questa è la lingua principale che l'utente parla, non la lingua dell'interfaccia che ha scelto di vedere. Per cambiare la lingua dell'interfaccia visibile da questo utente, vai sulla scheda %s
diff --git a/htdocs/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang
index 2037c7d7c8d..64f05d19a0a 100644
--- a/htdocs/langs/it_IT/website.lang
+++ b/htdocs/langs/it_IT/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Aggiungi sito web
 Webpage=Web page/container
 AddPage=Aggiungi pagina/contenitore
-HomePage=Home Page
 PageContainer=Pagina
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Mostra contenuto dinamico
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -135,5 +134,6 @@ ReplacementDoneInXPages=Sostituzione eseguite in%spagine o contenitori
 RSSFeed=Feed RSS
 RSSFeedDesc=Puoi ottenere un feed RSS degli articoli più recenti con il tipo "blogpost" utilizzando questo URL
 PagesRegenerated=%s pagina(e)/contenitore(i) rigenerato
-RegenerateWebsiteContent=Regenerate web site cache files
-AllowedInFrames=Allowed in Frames
+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.
diff --git a/htdocs/langs/it_IT/withdrawals.lang b/htdocs/langs/it_IT/withdrawals.lang
index 296e0fc1975..0e83d48d9eb 100644
--- a/htdocs/langs/it_IT/withdrawals.lang
+++ b/htdocs/langs/it_IT/withdrawals.lang
@@ -42,6 +42,7 @@ 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
 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>.
 ClassCredited=Classifica come accreditata
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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
diff --git a/htdocs/langs/it_IT/workflow.lang b/htdocs/langs/it_IT/workflow.lang
index bafaa694180..a662155b537 100644
--- a/htdocs/langs/it_IT/workflow.lang
+++ b/htdocs/langs/it_IT/workflow.lang
@@ -16,8 +16,10 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classifica "da spedire" l'ordine cl
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+descWORKFLOW_BILL_ON_RECEPTION=Classificare le ricezioni in "fatturate" quando un ordine fornitore collegato viene convalidato
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
+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
diff --git a/htdocs/langs/it_IT/zapier.lang b/htdocs/langs/it_IT/zapier.lang
index 7b9ad04fa29..5ec7be329d2 100644
--- a/htdocs/langs/it_IT/zapier.lang
+++ b/htdocs/langs/it_IT/zapier.lang
@@ -26,4 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier per modulo Dolibarr
 # Admin page
 #
 ZapierForDolibarrSetup = Installazione di Zapier per Dolibarr
-ZapierDescription=Interface with Zapier
+ZapierDescription=Interfaccia con Zapier
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index 03fca6294e9..5b7b279db04 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -1,5 +1,5 @@
 # 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
@@ -16,9 +16,11 @@ ThisService=このサービス
 ThisProduct=この製品
 DefaultForService=サービスのデフォルト
 DefaultForProduct=製品のデフォルト
+ProductForThisThirdparty=この取引先向けの製品
+ServiceForThisThirdparty=この取引先向けのサービス
 CantSuggest=提案できない
 AccountancySetupDoneFromAccountancyMenu=会計のほとんどの設定はメニュー%sから行われる
-ConfigAccountingExpert=モジュールアカウンティングの構成（複式簿記）
+ConfigAccountingExpert=モジュールアカウンティングの構成(複式簿記)
 Journalization=仕訳帳化
 Journals=仕訳日記帳
 JournalFinancial=財務仕訳帳
@@ -46,8 +48,9 @@ CountriesNotInEEC=EECにない国
 CountriesInEECExceptMe=%sを除くEECの国
 CountriesExceptMe=%sを除くすべての国
 AccountantFiles=ソースドキュメントのエクスポート
-ExportAccountingSourceDocHelp=このツールを使用すると、会計処理の生成に使用されたソースイベント（リストとPDF）をエクスポートできる。仕訳をエクスポートするには、メニューエントリ%s-%sを使用する。
+ExportAccountingSourceDocHelp=このツールを使用すると、会計処理の生成に使用されたソースイベント(リストとPDF)をエクスポートできる。仕訳をエクスポートするには、メニューエントリ%s-%sを使用する。
 VueByAccountAccounting=会計科目順に表示
+VueBySubAccountAccounting=アカウンティングサブアカウントで表示
 
 MainAccountForCustomersNotDefined=設定で定義されていない顧客のメインアカウンティング科目
 MainAccountForSuppliersNotDefined=設定で定義されていないベンダーのメインアカウンティング科目
@@ -58,7 +61,7 @@ MainAccountForSubscriptionPaymentNotDefined=セットアップで定義されて
 AccountancyArea=経理エリア
 AccountancyAreaDescIntro=会計モジュールの使用は、いくつかのステップで行われる。
 AccountancyAreaDescActionOnce=次のアクションは通常、1回だけ、または1年に1回実行される。
-AccountancyAreaDescActionOnceBis=次のステップは、仕訳帳化を行うときに正しいデフォルトの会計科目を提案することにより、将来の時間を節約するために実行する必要がある（仕訳帳および総勘定元帳にレコードを書き込む）
+AccountancyAreaDescActionOnceBis=次のステップは、仕訳帳化を行うときに正しいデフォルトの会計科目を提案することにより、将来の時間を節約するために実行する必要がある(仕訳帳および総勘定元帳にレコードを書き込む)
 AccountancyAreaDescActionFreq=次のアクションは通常、非常に大規模な企業の場合、毎月、毎週、または毎日実行される。
 
 AccountancyAreaDescJournalSetup=ステップ%s：メニュー%sから仕訳帳リストのコンテンツを作成または確認する
@@ -69,7 +72,7 @@ AccountancyAreaDescVat=ステップ%s：各VAT率の会計科目を定義する
 AccountancyAreaDescDefault=ステップ%s：デフォルトの会計科目を定義する。これには、メニューエントリ%sを使用する。
 AccountancyAreaDescExpenseReport=ステップ%s：経費報告書の種別ごとにデフォルトの会計科目を定義する。これには、メニューエントリ%sを使用する。
 AccountancyAreaDescSal=ステップ%s：給与支払いのデフォルトの会計科目を定義する。これには、メニューエントリ%sを使用する。
-AccountancyAreaDescContrib=ステップ%s：特別経費（雑税）のデフォルトの会計科目を定義する。これには、メニューエントリ%sを使用する。
+AccountancyAreaDescContrib=ステップ%s：特別経費(雑税)のデフォルトの会計科目を定義する。これには、メニューエントリ%sを使用する。
 AccountancyAreaDescDonation=ステップ%s：寄付のデフォルトの会計科目を定義する。これには、メニューエントリ%sを使用する。
 AccountancyAreaDescSubscription=ステップ%s：メンバーサブスクリプションのデフォルトのアカウンティング科目を定義する。これには、メニューエントリ%sを使用する。
 AccountancyAreaDescMisc=ステップ%s：その他のトランザクションの必須のデフォルト科目とデフォルトのアカウンティング科目を定義する。これには、メニューエントリ%sを使用する。
@@ -83,7 +86,7 @@ AccountancyAreaDescAnalyze=ステップ%s：既存のトランザクションを
 
 AccountancyAreaDescClosePeriod=ステップ%s：期間を閉じて、将来変更できないようにする。
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=セットアップの必須ステップが完了していない（すべての銀行口座に対して会計コード仕訳帳が定義されていない）
+TheJournalCodeIsNotDefinedOnSomeBankAccount=セットアップの必須ステップが完了していない(すべての銀行口座に対して会計コード仕訳帳が定義されていない)
 Selectchartofaccounts=アクティブな勘定科目表を選択する
 ChangeAndLoad=変更してロード
 Addanaccount=勘定科目を追加
@@ -144,18 +147,18 @@ NotVentilatedinAccount=会計科目にバインドされていない
 XLineSuccessfullyBinded=%s製品/サービスがアカウンティング科目に正常にバインドされた
 XLineFailedToBeBinded=%s製品/サービスはどの会計科目にもバインドされていない
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=ページごとに表示される紐付けする要素の数（最大推奨：50）
+ACCOUNTING_LIMIT_LIST_VENTILATION=リストおよびバインドページの最大行数(推奨：50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=「Bindingtodo」ページの最新の要素による並べ替えを開始する
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=「製本完了」ページの最新の要素による並べ替えを開始する
 
-ACCOUNTING_LENGTH_DESCRIPTION=x文字の後のリストの製品とサービスの説明を切り捨てます（ベスト= 50）
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=x文字の後のリストの製品とサービスの科目説明フォームを切り捨てます（ベスト= 50）
-ACCOUNTING_LENGTH_GACCOUNT=一般会計科目の長さ（ここで値を6に設定すると、勘定科目「706」は画面に「706000」のように表示される）
-ACCOUNTING_LENGTH_AACCOUNT=取引先のアカウンティング科目の長さ（ここで値を6に設定すると、科目「401」は画面に「401000」のように表示される）
-ACCOUNTING_MANAGE_ZERO=会計科目の最後に異なる数のゼロを管理できるようにする。一部の国（スイスなど）で必要です。オフ（デフォルト）に設定すると、次の2つのパラメーターを設定して、アプリケーションに仮想ゼロを追加するように要求できる。
+ACCOUNTING_LENGTH_DESCRIPTION=x文字の後のリストの製品とサービスの説明を切り捨てます(ベスト= 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=x文字の後のリストの製品とサービスの科目説明フォームを切り捨てます(ベスト= 50)
+ACCOUNTING_LENGTH_GACCOUNT=一般会計科目の長さ(ここで値を6に設定すると、勘定科目「706」は画面に「706000」のように表示される)
+ACCOUNTING_LENGTH_AACCOUNT=取引先のアカウンティング科目の長さ(ここで値を6に設定すると、科目「401」は画面に「401000」のように表示される)
+ACCOUNTING_MANAGE_ZERO=会計科目の最後に異なる数のゼロを管理できるようにする。一部の国(スイスなど)で必要です。オフ(デフォルト)に設定すると、次の2つのパラメーターを設定して、アプリケーションに仮想ゼロを追加するように要求できる。
 BANK_DISABLE_DIRECT_INPUT=銀行口座での取引の直接記録を無効にする
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=仕訳帳で下書きエクスポートを有効にする
-ACCOUNTANCY_COMBO_FOR_AUX=子会社科目のコンボリストを有効にする（取引先が多数ある場合は遅くなる可能性がある）
+ACCOUNTANCY_COMBO_FOR_AUX=子会社科目のコンボリストを有効にする(取引先が多数ある場合は遅くなる可能性がある)
 ACCOUNTING_DATE_START_BINDING=会計で紐付け力と移転を開始する日付を定義する。この日付を下回ると、トランザクションはアカウンティングに転送されない。
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=会計転送では、デフォルトで期間表示を選択する
 
@@ -166,8 +169,8 @@ ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 ACCOUNTING_HAS_NEW_JOURNAL=新規仕訳帳がある
 
-ACCOUNTING_RESULT_PROFIT=結果会計科目（利益）
-ACCOUNTING_RESULT_LOSS=結果会計科目（損失）
+ACCOUNTING_RESULT_PROFIT=結果会計科目(利益)
+ACCOUNTING_RESULT_LOSS=結果会計科目(損失)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=閉鎖の仕訳帳
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=移行銀行振込の会計科目
@@ -179,26 +182,27 @@ 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_PRODUCT_BUY_ACCOUNT=購入した製品のデフォルトの会計科目(製品シートで定義されていない場合に使用)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=EEC域内で購入した製品のデフォルト会計科目(製品シートで定義されていない場合に使用)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=購入品で、EEC域外から輸入された製品のデフォルト会計科目(製品シートで定義されていない場合に使用)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=販売された製品のデフォルトの会計科目(製品シートで定義されていない場合に使用)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=EECで販売された製品のデフォルトの会計科目(製品シートで定義されていない場合に使用)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=EECから販売およびエクスポートされた製品のデフォルトの会計科目(製品シートで定義されていない場合に使用)
 
-ACCOUNTING_SERVICE_BUY_ACCOUNT=購入したサービスのデフォルトのアカウンティング科目（サービスシートで定義されていない場合に使用）
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=EECで購入したサービスのデフォルトのアカウンティング科目（サービスシートで定義されていない場合に使用）
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=購入したサービスおよびEECからインポートされたサービスのデフォルトのアカウンティング科目（サービスシートで定義されていない場合に使用）
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=販売されたサービスのデフォルトのアカウンティング科目（サービスシートで定義されていない場合に使用）
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=EECで販売されるサービスのデフォルトのアカウンティング科目（サービスシートで定義されていない場合に使用）
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=EECから販売およびエクスポートされたサービスのデフォルトのアカウンティング科目（サービスシートで定義されていない場合に使用）
+ACCOUNTING_SERVICE_BUY_ACCOUNT=購入したサービスのデフォルトのアカウンティング科目(サービスシートで定義されていない場合に使用)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=EECで購入したサービスのデフォルトのアカウンティング科目(サービスシートで定義されていない場合に使用)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=購入したサービスおよびEECからインポートされたサービスのデフォルトのアカウンティング科目(サービスシートで定義されていない場合に使用)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=販売されたサービスのデフォルトのアカウンティング科目(サービスシートで定義されていない場合に使用)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=EECで販売されるサービスのデフォルトのアカウンティング科目(サービスシートで定義されていない場合に使用)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=EECから販売およびエクスポートされたサービスのデフォルトのアカウンティング科目(サービスシートで定義されていない場合に使用)
 
 Doctype=ドキュメントの種別
 Docdate=日付
 Docref=参照
 LabelAccount=ラベル科目
 LabelOperation=ラベル操作
-Sens=Sens
+Sens=方向
+AccountingDirectionHelp=顧客の会計科目の場合、貸方を使用して受け取った支払いを記録する。<br>仕入先の会計科目の場合、借方を使用して支払いを記録する。
 LetteringCode=レタリングコード
 Lettering=レタリング
 Codejournal=仕訳帳
@@ -206,7 +210,8 @@ JournalLabel=仕訳帳ラベル
 NumPiece=個数番号
 TransactionNumShort=数トランザクション
 AccountingCategory=パーソナライズされたグループ
-GroupByAccountAccounting=会計科目によるグループ化
+GroupByAccountAccounting=総勘定元帳勘定によるグループ化
+GroupBySubAccountAccounting=補助元帳アカウントでグループ化
 AccountingAccountGroupsDesc=ここで、会計科目のいくつかのグループを定義できる。それらは、パーソナライズされた会計レポートに使用される。
 ByAccounts=科目別
 ByPredefinedAccountGroups=事前定義されたグループによる
@@ -217,8 +222,8 @@ DeleteMvt=アカウンティングからいくつかの操作行を削除する
 DelMonth=削除する月
 DelYear=削除する年
 DelJournal=削除する仕訳帳
-ConfirmDeleteMvt=これにより、年/月および/または特定の仕訳帳の会計のすべての操作行が削除される（少なくとも1つの基準が必要です）。削除されたレコードを元帳に戻すには、機能「%s」を再利用する必要がある。
-ConfirmDeleteMvtPartial=これにより、トランザクションがアカウンティングから削除される（同じトランザクションに関連するすべての操作ラインが削除される）
+ConfirmDeleteMvt=これにより、年/月および/または特定の仕訳帳の会計のすべての操作行が削除される(少なくとも1つの基準が必要です)。削除されたレコードを元帳に戻すには、機能「%s」を再利用する必要がある。
+ConfirmDeleteMvtPartial=これにより、トランザクションがアカウンティングから削除される(同じトランザクションに関連するすべての操作ラインが削除される)
 FinanceJournal=財務仕訳帳
 ExpenseReportsJournal=経費報告仕訳帳
 DescFinanceJournal=銀行口座による全種別の支払いを含む財務仕訳帳
@@ -248,34 +253,36 @@ PaymentsNotLinkedToProduct=支払いはどの製品/サービスにもリンク
 OpeningBalance=期首残高
 ShowOpeningBalance=期首残高を表示する
 HideOpeningBalance=期首残高を非表示にする
-ShowSubtotalByGroup=グループごとに小計を表示
+ShowSubtotalByGroup=レベルごとに小計を表示
 
 Pcgtype=勘定科目のグループ
-PcgtypeDesc=科目のグループは、一部のアカウンティングレポートの事前定義された「フィルター」および「グループ化」基準として使用される。たとえば、「INCOME」または「EXPENSE」は、費用/収入レポートを作成するための製品の会計科目のグループとして使用される。
+PcgtypeDesc=科目のグループは、一部のアカウンティングレポートの事前定義された「フィルタ」および「グループ化」基準として使用される。たとえば、「INCOME」または「EXPENSE」は、費用/収入レポートを作成するための製品の会計科目のグループとして使用される。
 
 Reconcilable=調整可能
 
 TotalVente=税引前総売上高
 TotalMarge=売上総利益
 
-DescVentilCustomer=製品会計科目にバインドされている（またはバインドされていない）顧客請求書行のリストをここで参照すること
+DescVentilCustomer=製品会計科目にバインドされている(またはバインドされていない)顧客請求書行のリストをここで参照すること
 DescVentilMore=ほとんどの場合、事前定義された製品またはサービスを使用し、製品/サービスカードに科目番号を設定すると、アプリケーションは、請求書の行と勘定科目表の会計科目の間のすべての紐付をボタン<strong> "%s" </strong>でワンクリックする。製品/サービスカードに科目が設定されていない場合、または科目に紐付けされていない行がまだある場合は、メニュー「<strong>%s</strong>」から手動で紐付けする必要がある。
 DescVentilDoneCustomer=請求書の顧客の行とその製品会計科目のリストをここで参照すること
 DescVentilTodoCustomer=製品会計科目にまだ紐付けされていない請求書行を紐付けする
 ChangeAccount=選択したラインの製品/サービス会計科目を次の会計科目に変更する。
 Vide=-
-DescVentilSupplier=製品会計科目にバインドされている、またはまだバインドされていない仕入先請求書明細のリストをここで参照すること（会計でまだ転送されていないレコードのみが表示される）
+DescVentilSupplier=製品会計科目にバインドされている、またはまだバインドされていない仕入先請求書明細のリストをここで参照すること(会計でまだ転送されていないレコードのみが表示される)
 DescVentilDoneSupplier=ベンダーの請求書の行とその会計科目のリストをここで参照すること
 DescVentilTodoExpenseReport=まだ料金会計科目に紐付けされていない経費レポート行を紐付けする
-DescVentilExpenseReport=手数料会計科目にバインドされている（またはバインドされていない）経費報告行のリストをここで参照すること
+DescVentilExpenseReport=手数料会計科目にバインドされている(またはバインドされていない)経費報告行のリストをここで参照すること
 DescVentilExpenseReportMore=経費報告行の種別で会計科目を設定すると、アプリケーションは、ボタン<strong> "%s" </strong>をワンクリックするだけで、経費報告行と勘定科目表の会計科目の間のすべての紐付けを行うことができる。科目が料金辞書に設定されていない場合、または科目に紐付けされていない行がまだある場合は、メニュー「<strong>%s</strong>」から手動で紐付けする必要がある。
 DescVentilDoneExpenseReport=経費報告書の行とその手数料会計科目のリストをここで参照すること
 
+Closure=年次閉鎖
 DescClosure=検証されていない月ごとの動きの数とすでに開いている会計年度をここで参照すること
-OverviewOfMovementsNotValidated=ステップ1 /検証されていない動きの概要。 （決算期に必要）
+OverviewOfMovementsNotValidated=ステップ1 /検証されていない動きの概要。 (決算期に必要)
+AllMovementsWereRecordedAsValidated=すべての動きは検証済みとして記録された
+NotAllMovementsCouldBeRecordedAsValidated=すべての動きを検証済みとして記録できるわけではない
 ValidateMovements=動きを検証する
 DescValidateMovements=書き込み、レタリング、削除の変更または削除は禁止される。演習のすべてのエントリを検証する必要がある。検証しないと、閉じることができない。
-SelectMonthAndValidate=月を選択し、動きを検証する
 
 ValidateHistory=自動的に紐付け
 AutomaticBindingDone=自動紐付けが行われた
@@ -293,6 +300,7 @@ Accounted=元帳に計上
 NotYetAccounted=元帳にはまだ計上されていない
 ShowTutorial=チュートリアルを表示
 NotReconciled=調整されていない
+WarningRecordWithoutSubledgerAreExcluded=警告、補助元帳アカウントが定義されていないすべての操作はフィルタリングされ、このビューから除外される
 
 ## Admin
 BindingOptions=製本オプション
@@ -315,9 +323,9 @@ ErrorAccountingJournalIsAlreadyUse=この仕訳帳はすでに使用されてい
 AccountingAccountForSalesTaxAreDefinedInto=注：消費税の会計科目は、メニュー<b> %s </b> --<b> %s</b>に定義されている。
 NumberOfAccountancyEntries=エントリー数
 NumberOfAccountancyMovements=楽章の数
-ACCOUNTING_DISABLE_BINDING_ON_SALES=販売の会計における紐付け力と移転を無効にする（顧客の請求書は会計に考慮されない）
-ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=購入時の会計における紐付け力と移転を無効にする（ベンダーの請求書は会計で考慮されない）
-ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=経費報告書の会計における紐付け力と移転を無効にする（経費報告書は会計で考慮されない）
+ACCOUNTING_DISABLE_BINDING_ON_SALES=販売の会計における紐付け力と移転を無効にする(顧客の請求書は会計に考慮されない)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=購入時の会計における紐付け力と移転を無効にする(ベンダーの請求書は会計で考慮されない)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=経費報告書の会計における紐付け力と移転を無効にする(経費報告書は会計で考慮されない)
 
 ## Export
 ExportDraftJournal=下書き仕訳帳のエクスポート
@@ -332,15 +340,16 @@ Modelcsv_quadratus=QuadratusQuadraComptaのエクスポート
 Modelcsv_ebp=EBPのエクスポート
 Modelcsv_cogilog=Cogilogのエクスポート
 Modelcsv_agiris=Agirisのエクスポート
-Modelcsv_LDCompta=LD Compta（v9）のエクスポート（テスト）
-Modelcsv_LDCompta10=LD Compta（v10以降）のエクスポート
-Modelcsv_openconcerto=OpenConcertoのエクスポート（テスト）
+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=セージ50スイスへのエクスポート
 Modelcsv_winfic=Winficのエクスポート-eWinfic-WinSisCompta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5Export for Gestinum (v5)
+Modelcsv_Gestinumv3=Gestinum(v3)のエクスポート
+Modelcsv_Gestinumv5Export Gestinum(v5)の場合
 ChartofaccountsId=勘定科目表ID
 
 ## Tools - Init accounting account on product / service
@@ -381,7 +390,7 @@ Formula=式
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=セットアップのいくつかの必須の手順が実行されないでした。それらを完了すること
-ErrorNoAccountingCategoryForThisCountry=国%sで使用できる会計科目グループがない（ ホーム - 設定 - 辞書 を参照）
+ErrorNoAccountingCategoryForThisCountry=国%sで使用できる会計科目グループがない( ホーム - 設定 - 辞書 を参照)
 ErrorInvoiceContainsLinesNotYetBounded=請求書<strong>%s </strong>の一部の行を仕訳しようとしたが、他の一部の行はまだ会計科目にバインドされていない。この請求書のすべての請求書行の仕訳は拒否される。
 ErrorInvoiceContainsLinesNotYetBoundedShort=請求書の一部の行は、会計科目にバインドされていない。
 ExportNotSupported=設定されたエクスポート形式は、このページではサポートされていない
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 489bb909061..fc6e2f4da0b 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -56,6 +56,8 @@ GUISetup=表示
 SetupArea=設定
 UploadNewTemplate=新規テンプレート(s)をアップロード
 FormToTestFileUploadForm=ファイルのアップロードをテストするために形成する ( 設定に応じて ) 
+ModuleMustBeEnabled=モジュール/アプリケーション<b>%s</b>を有効にする必要がある
+ModuleIsEnabled=モジュール/アプリケーション<b>%s</b>が有効になった
 IfModuleEnabled=注：【はい】は、モジュールの<b>%sが</b>有効<b>になっ</b>ている場合にのみ有効 
 RemoveLock=ファイル<b>%s </b>が存在する場合、それを削除/改名することで、更新/インストール のツールが使用可能になる。
 RestoreLock=ファイル<b>%s </b>を読取権限のみで復元すると、これ以上の更新/インストール のツール使用が不可になる。
@@ -85,7 +87,6 @@ ShowPreview=プレビューを表示
 ShowHideDetails=詳細を 表示-非表示
 PreviewNotAvailable=プレビューは利用不可
 ThemeCurrentlyActive=現在有効なテーマ
-CurrentTimeZone=PHP(サーバー)のタイムゾーン
 MySQLTimeZone=MySql(データベース)のタイムゾーン
 TZHasNoEffect=日付は、送信された文字列として保持されているかのように、データベースサーバーによって保存され返される。タイムゾーンは、UNIX_TIMESTAMP関数を使用する場合にのみ有効 (Dolibarrでは不使用を推奨し、そうすると、データ入力後に変更があったとしても、データベースTZの影響を受けなくなる ) 。
 Space=スペース
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=この領域は管理機能を提供する。メニューを
 Purge=パージ
 PurgeAreaDesc=このページでは、Dolibarrによって生成または保存されたすべてのファイル ( 一時ファイルまたは<b> %s </b>ディレクトリ内のすべてのファイル ) を削除できる。通常、この機能を使用する必要はない。これは、Webサーバーによって生成されたファイルを削除する権限を提供しないプロバイダーによってDolibarrがホストされているユーザの回避策として提供されている。
 PurgeDeleteLogFile=Syslogモジュール用に定義された<b>%s </b>を含むログファイルを削除する ( データを失うリスクはない ) 
-PurgeDeleteTemporaryFiles=すべての一時ファイルを削除する ( データを失うリスクはない ) 。注：削除は、一時ディレクトリが24時間前に作成された場合にのみ実行される。
-PurgeDeleteTemporaryFilesShort=一時ファイルを削除する
+PurgeDeleteTemporaryFiles=すべてのログファイルと一時ファイルを削除する(データを失うリスクなし)。注：一時ファイルの削除は、一時ディレクトリが24時間以上前に作成された場合にのみ実行される。
+PurgeDeleteTemporaryFilesShort=ログと一時ファイルを削除する
 PurgeDeleteAllFilesInDocumentsDir=ディレクトリ：<b> %s</b> 内のすべてのファイルを削除する。 <br>これにより、要素 ( 取引先、請求書など ) に関連する生成されたすべてのドキュメント、ECMモジュールにアップロードされたファイル、データベースのバックアップダンプ、および一時ファイルが削除される。
 PurgeRunNow=今パージ
 PurgeNothingToDelete=削除するディレクトリやファイルはない。
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=優先パートナー
 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>
 HelpCenterDesc1=Dolibarrのヘルプとサポートを受けるためのリソースをいくつか紹介する。
@@ -375,7 +377,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=構文の例： <br> C：\\ mydirに<br> / home / mydirの<br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=構文の例:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>あなたのODTドキュメントテンプレートを作成する方法を知って、それらのディレクトリに格納する前に、ウィキのドキュメントをお読みください。
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=名/姓の位置
@@ -406,7 +408,7 @@ UrlGenerationParameters=URLを確保するためのパラメータ
 SecurityTokenIsUnique=各URLごとに一意securekeyパラメータを使用して、
 EnterRefToBuildUrl=オブジェクト%sの参照を入力する。
 GetSecuredUrl=計算されたURLを取得する
-ButtonHideUnauthorized=灰色の無効なボタンを表示する代わりに、管理者以外のユーザの不正なアクションのボタンを非表示にする
+ButtonHideUnauthorized=内部ユーザーに対しても不正なアクションボタンを非表示にする(それ以外の場合は灰色で表示される)
 OldVATRates=古いVAT率
 NewVATRates=新規VAT率
 PriceBaseTypeToChange=で定義された基本参照値を使用して価格を変更する
@@ -442,8 +444,8 @@ ExtrafieldParamHelpPassword=このフィールドを空白のままにすると
 ExtrafieldParamHelpselect=値のリストは、 key,value形式 (key は '0' 以外) の行であること。<br><br> 例: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>別の補完属性リストに応じたリストを作るには:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>別のリストに応じたリストを作るには:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=値のリストは、 key,value形式 (key は '0' 以外) の行であること<br><br>例 : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=値のリストは、 key,value形式 (key は '0' 以外) の行であること<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=値のリストはテーブルから取得される<br>構文：table_name：label_field：id_field :: filter <br>例：c_typent：libelle：id :: filter <br> <br> --id_fieldは必然的にプライマリintキーa0342fccfda = 1 ) アクティブな値のみを表示するには<br>現在のオブジェクトの現在のIDであるフィルターで$ ID $を使用することもできる<br>フィルターにSELECTを使用するには、キーワード$ SEL $を使用してインジェクション防止保護をバイパスする。 <br>エクストラフィールドでフィルタリングする場合は、構文extra.fieldcode = ... ( フィールドコードはエクストラフィールドのコード ) を使用する。<br><br>別の補完属性リストに依存するリストを作成するには：<br> c_typent：libelle：id：options_ <i> parent_list_code </i> | parent_column：filter <br> <br>リストを別のリストに依存させるには：<br> c_typent：libelle：id：<i> parent_list_code
-ExtrafieldParamHelpchkbxlst=値のリストはテーブルから取得される<br>構文：table_name：label_field：id_field :: filter <br>例：c_typent：libelle：id :: filter <br> <br>フィルターは、アクティブな値a0342cfのみを表示する簡単なテスト ( 例：active = 1 ) にすることができるフィルタで$ ID $を使用することもできる。witchは現在のオブジェクトの現在のID。<br>フィルタでSELECTを実行するには、エクストラフィールドでフィルタリングする場合は$ SEL $ <br>を使用する。構文extra.fieldcode = ...を使用する ( フィールドコードはエクストラフィールドのコード ) <br> <br>別の補完属性リストに依存するリストを作成するには、次のようにする。 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> --id_fieldは必然的にプライマリintキーa0342fccfda = 1 ) アクティブな値のみを表示するには<br>現在のオブジェクトの現在のIDであるフィルタで$ ID $を使用することもできる<br>フィルタにSELECTを使用するには、キーワード$ SEL $を使用してインジェクション防止保護をバイパスする。 <br>エクストラフィールドでフィルタリングする場合は、構文extra.fieldcode = ... ( フィールドコードはエクストラフィールドのコード ) を使用する。<br><br>別の補完属性リストに依存するリストを作成するには：<br> c_typent：libelle：id：options_ <i> parent_list_code </i> | parent_column：filter <br> <br>リストを別のリストに依存させるには：<br> c_typent：libelle：id：<i> parent_list_code
+ExtrafieldParamHelpchkbxlst=値のリストはテーブルから取得される<br>構文：table_name：label_field：id_field :: filter <br>例：c_typent：libelle：id :: filter <br> <br>フィルタは、アクティブな値a0342cfのみを表示する簡単なテスト ( 例：active = 1 ) にすることができるフィルタで$ ID $を使用することもできる。witchは現在のオブジェクトの現在のID。<br>フィルタでSELECTを実行するには、エクストラフィールドでフィルタリングする場合は$ SEL $ <br>を使用する。構文extra.fieldcode = ...を使用する ( フィールドコードはエクストラフィールドのコード ) <br> <br>別の補完属性リストに依存するリストを作成するには、次のようにする。 libelle：id：<i> parent_list_code </i> | parent_column：filter
 ExtrafieldParamHelplink=パラメータはObjectName：Classpathでなければなりません<br>構文：ObjectName：Classpath
 ExtrafieldParamHelpSeparator=単純なセパレーターの場合は空のままにする<br>折りたたみセパレーターの場合はこれを1に設定する ( 新規セッションの場合はデフォルトで開き、ユーザセッションごとにステータスが保持される ) <br>折りたたみセパレーターの場合はこれを2に設定する ( 新規セッションの場合はデフォルトで折りたたむ。ステータスは各ユーザセッションの間保持される ) 
 LibraryToBuildPDF=PDF生成に使用されるライブラリ
@@ -668,7 +670,7 @@ Module54000Desc=Cups IPPインターフェイスを使用した ( ドキュメ
 Module55000Name=投票、調査または投票
 Module55000Desc=オンライン投票、調査、投票を作成する ( Doodle、スタッド、RDVzなど ) 
 Module59000Name=マージン
-Module59000Desc=マージンを管理するモジュール
+Module59000Desc=マージンに従うモジュール
 Module60000Name=手数料
 Module60000Desc=手数料を管理するモジュール
 Module62000Name=インコタームズ
@@ -836,7 +838,7 @@ Permission402=割引を作成/変更
 Permission403=割引を検証する
 Permission404=割引を削除する。
 Permission430=デバッグバーを使用する
-Permission511=給与の支払いを見る（自分と部下）
+Permission511=給与の支払いを見る(自分と部下)
 Permission512=給与の支払いを作成/変更する
 Permission514=給与の支払いを削除する
 Permission517=全員の給料支払いを見る
@@ -1306,7 +1308,7 @@ YouUseBestDriver=現在利用可能な最高のドライバーであるドライ
 YouDoNotUseBestDriver=ドライバー%sを使用するが、ドライバー%sをお勧めする。
 NbOfObjectIsLowerThanNoPb=データベースには%s%sしかない。これには、特別な最適化は必要ない。
 SearchOptim=検索最適化
-YouHaveXObjectUseSearchOptim=データベースに%s%sがある。 Home-Setup-Otherで定数%sを1に追加する必要がある。検索を文字列の先頭に制限する。これにより、データベースでインデックスを使用できるようになり、すぐに応答が返される。
+YouHaveXObjectUseSearchOptim=データベースに%s%sがある。 Home-Setup-Otherで定数%sを1に追加できます。検索を文字列の先頭に制限する。これにより、データベースでインデックスを使用できるようになり、すぐに応答が返される。
 YouHaveXObjectAndSearchOptimOn=データベースに%s%sがあり、Home-Setup-Otherで定数%sが1に設定されている。
 BrowserIsOK=%sWebブラウザーを使用している。このブラウザは、セキュリティとパフォーマンスに問題はない。
 BrowserIsKO=%sWebブラウザーを使用している。このブラウザは、セキュリティ、パフォーマンス、信頼性の点で悪い選択であることが知られている。 Firefox、Chrome、Opera、またはSafariの使用をお勧めする。
@@ -1314,7 +1316,7 @@ PHPModuleLoaded=PHPコンポーネント%sがロードされる
 PreloadOPCode=プリロードされたOPCodeが使用される
 AddRefInList=顧客/仕入先参照を表示する。情報リスト ( 選択リストまたはコンボボックス ) およびほとんどのハイパーリンク。 <br>取引先は、「CC12345-SC45678-The BigCompanycorp。」という名前の形式で表示される。 「TheBigCompanycorp」の代わりに。
 AddAdressInList=顧客/仕入先の住所情報リストを表示する ( リストまたはコンボボックスを選択 ) <br>取引先は、「TheBigCompanycorp。」ではなく「TheBigCompanycorp。-21jumpstreet 123456Bigtown-USA」の名前形式で表示される。
-AddEmailPhoneTownInContactList=連絡先の電子メール（または未定義の場合は電話）と町の情報リスト（選択リストまたはコンボボックス）を表示<br>連絡先は以下の名称と形式で表記される："Dupond Durand" の形式でなく、 "Dupond Durand - dupond.durand@email.com - Paris" または "Dupond Durand - 06 07 59 65 66 - Paris" 。
+AddEmailPhoneTownInContactList=連絡先の電子メール(または未定義の場合は電話)と町の情報リスト(選択リストまたはコンボボックス)を表示<br>連絡先は以下の名称と形式で表記される："Dupond Durand" の形式でなく、 "Dupond Durand - dupond.durand@email.com - Paris" または "Dupond Durand - 06 07 59 65 66 - Paris" 。
 AskForPreferredShippingMethod=取引先の優先配送方法を尋ねる。
 FieldEdition=フィールド%sのエディション
 FillThisOnlyIfRequired=例：+2 ( タイムゾーンオフセットの問題が発生した場合にのみ入力 ) 
@@ -1501,7 +1503,7 @@ LDAPDolibarrMapping=Dolibarrマッピング
 LDAPLdapMapping=LDAPのマッピング
 LDAPFieldLoginUnix=ログイン ( UNIX ) 
 LDAPFieldLoginExample=例：uid
-LDAPFilterConnection=検索フィルター
+LDAPFilterConnection=検索フィルタ
 LDAPFilterConnectionExample=例：＆ ( objectClass = inetOrgPerson ) 
 LDAPFieldLoginSamba=ログイン ( サンバ、ActiveDirectoryを ) 
 LDAPFieldLoginSambaExample=例：samaccountname
@@ -1584,9 +1586,9 @@ CacheByClient=ブラウザによるキャッシュ
 CompressionOfResources=HTTP応答の圧縮
 CompressionOfResourcesDesc=たとえば、Apacheディレクティブ「AddOutputFilterByTypeDEFLATE」を使用する
 TestNotPossibleWithCurrentBrowsers=このような自動検出は、現在のブラウザでは不可能。
-DefaultValuesDesc=ここでは、新規レコードを作成するときに使用するデフォルト値や、レコードを一覧表示するときのデフォルトのフィルターまたは並べ替え順序を定義できる。
+DefaultValuesDesc=ここでは、新規レコードを作成するときに使用するデフォルト値や、レコードを一覧表示するときのデフォルトのフィルタまたは並べ替え順序を定義できる。
 DefaultCreateForm=デフォルト値 ( フォームで使用 ) 
-DefaultSearchFilters=デフォルトの検索フィルター
+DefaultSearchFilters=デフォルトの検索フィルタ
 DefaultSortOrder=デフォルトのソート順
 DefaultFocus=デフォルトのフォーカスフィールド
 DefaultMandatory=必須のフォームフィールド
@@ -1596,8 +1598,13 @@ ServiceSetup=サービスモジュールの設定
 ProductServiceSetup=製品とサービスモジュールの設定
 NumberOfProductShowInSelect=コンボ選択リストに表示する製品の最大数 ( 0 =制限なし ) 
 ViewProductDescInFormAbility=製品の説明をフォームに表示する ( それ以外の場合はツールチップポップアップに表示される ) 
+DoNotAddProductDescAtAddLines=フォームの追加行の送信時に(製品カードから)製品説明を追加しないこと
+OnProductSelectAddProductDesc=ドキュメントの行として製品追加するときの、製品説明の使用方法
+AutoFillFormFieldBeforeSubmit=説明入力フィールドに製品説明を自動入力する
+DoNotAutofillButAutoConcat=入力フィールドに製品説明を自動入力しない。製品説明は、入力された説明に自動的に連結される。
+DoNotUseDescriptionOfProdut=製品説明が文書の行の説明に含まれることはない
 MergePropalProductCard=製品/サービスが提案に含まれている場合、製品/サービスの【添付ファイル】タブで、製品のPDFドキュメントを提案のPDFazurにマージするオプションをアクティブにする
-ViewProductDescInThirdpartyLanguageAbility=取引先の言語で製品の説明を表示する
+ViewProductDescInThirdpartyLanguageAbility=フォームでは製品説明を取引先の言語(それ以外の場合はユーザの言語)で表示
 UseSearchToSelectProductTooltip=また、製品の数が多い ( > 100 000 ) 場合は、【設定】-> 【その他】で定数PRODUCT_DONOTSEARCH_ANYWHEREを1に設定することで速度を上げることができる。その後、検索は文字列の先頭に限定される。
 UseSearchToSelectProduct=キーを押すまで待ってから、製品コンボリストのコンテンツをロードすること ( これにより、製品の数が多い場合にパフォーマンスが向上する可能性があるが、あまり便利ではない ) 
 SetDefaultBarcodeTypeProducts=製品に使用するデフォルトのバーコードの種類
@@ -1672,7 +1679,7 @@ AdvancedEditor=高度なエディタ
 ActivateFCKeditor=のための高度なエディタをアクティブにする。
 FCKeditorForCompany=要素の説明と注意事項のWYSIWIGエディタの作成/版 ( 製品/サービスを除く ) 
 FCKeditorForProduct=製品/サービスの説明と注意事項のWYSIWIGエディタの作成/版
-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>
+FCKeditorForProductDetails=WYSIWIGによる製品の作成/編集では、すべてのエンティティ(提案、注文、請求書など)の詳細行が示される。 <span class="warning">警告：この場合にこのオプションを使用することは、PDFファイルを作成するときに特殊文字やページの書式設定で問題が発生する可能性があるため、真剣に推奨されない。 </span>
 FCKeditorForMailing= 郵送のWYSIWIGエディタの作成/版
 FCKeditorForUserSignature=WYSIWIGによるユーザ署名の作成/編集
 FCKeditorForMail=すべてのメールのWYSIWIG作成/エディション ( 【ツール】-> 【電子メール】を除く ) 
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=トップメニューエントリにリンクされ
 NewMenu=新メニュー
 MenuHandler=メニューハンドラ
 MenuModule=ソース·モジュール
-HideUnauthorizedMenu= 不正なメニュー ( グレー ) を非表示
+HideUnauthorizedMenu=内部ユーザーに対しても許可されていないメニューを非表示にする(それ以外の場合は灰色で表示される)
 DetailId=idのメニュー
 DetailMenuHandler=新規メニューを表示するメニューハンドラ
 DetailMenuModule=モジュール名のメニューエントリは、モジュールから来る場合
@@ -1735,12 +1742,12 @@ PasswordTogetVCalExport=エクスポートのリンクを許可するキー
 PastDelayVCalExport=より古いイベントはエクスポートしない
 AGENDA_USE_EVENT_TYPE=イベント種別を使用する ( メニューの【設定】-> 【辞書】-> 【アジェンダイベントの種別】で管理 ) 
 AGENDA_USE_EVENT_TYPE_DEFAULT=イベント作成フォームでイベントの種別にこのデフォルト値を自動的に設定する
-AGENDA_DEFAULT_FILTER_TYPE=アジェンダビューの検索フィルターでこの種別のイベントを自動的に設定する
-AGENDA_DEFAULT_FILTER_STATUS=アジェンダビューの検索フィルターでイベントのこのステータスを自動的に設定する
+AGENDA_DEFAULT_FILTER_TYPE=アジェンダビューの検索フィルタでこの種別のイベントを自動的に設定する
+AGENDA_DEFAULT_FILTER_STATUS=アジェンダビューの検索フィルタでイベントのこのステータスを自動的に設定する
 AGENDA_DEFAULT_VIEW=メニューの議題を選択するときに、デフォルトでどのビューを開くか
-AGENDA_REMINDER_BROWSER=ユーザーのブラウザ</b>でイベントリマインダー<b>を有効にする（リマインダーの日付に達すると、ブラウザにポップアップが表示される。各ユーザーは、ブラウザの通知設定からそのような通知を無効にできる）。
+AGENDA_REMINDER_BROWSER=ユーザーのブラウザ</b>でイベントリマインダー<b>を有効にする(リマインダーの日付に達すると、ブラウザにポップアップが表示される。各ユーザーは、ブラウザの通知設定からそのような通知を無効にできる)。
 AGENDA_REMINDER_BROWSER_SOUND=音声通知を有効にする
-AGENDA_REMINDER_EMAIL=電子メール</b>でイベントリマインダー<b>を有効にする（リマインダーオプション/遅延は各イベントで定義できる）。
+AGENDA_REMINDER_EMAIL=電子メール</b>でイベントリマインダー<b>を有効にする(リマインダーオプション/遅延は各イベントで定義できる)。
 AGENDA_REMINDER_EMAIL_NOTE=注：タスク%sの頻度は、リマインダーが正しいタイミングで送信されることを確認するのに十分でなければならない。
 AGENDA_SHOW_LINKED_OBJECT=リンクされたオブジェクトを議題ビューに表示する
 ##### Clicktodial #####
@@ -1962,8 +1969,8 @@ SetToYesIfGroupIsComputationOfOtherGroups=このグループが他のグルー
 EnterCalculationRuleIfPreviousFieldIsYes=前のフィールドが「はい」に設定されている場合は、計算ルールを入力する ( たとえば、「CODEGRP1 + CODEGRP2」 ) 
 SeveralLangugeVariatFound=いくつかの言語バリアントが見つかりました
 RemoveSpecialChars=特殊文字を削除する
-COMPANY_AQUARIUM_CLEAN_REGEX=値をクリーンアップするための正規表現フィルター ( COMPANY_AQUARIUM_CLEAN_REGEX ) 
-COMPANY_DIGITARIA_CLEAN_REGEX=値をクリーンアップするための正規表現フィルター ( COMPANY_DIGITARIA_CLEAN_REGEX ) 
+COMPANY_AQUARIUM_CLEAN_REGEX=値をクリーンアップするための正規表現フィルタ ( COMPANY_AQUARIUM_CLEAN_REGEX ) 
+COMPANY_DIGITARIA_CLEAN_REGEX=値をクリーンアップするための正規表現フィルタ ( COMPANY_DIGITARIA_CLEAN_REGEX ) 
 COMPANY_DIGITARIA_UNIQUE_CODE=複製は許可されていない
 GDPRContact=データ保護責任者 ( DPO、データプライバシーまたはGDPRの連絡先 ) 
 GDPRContactDesc=ヨーロッパの企業/市民に関するデータを保存する場合は、ここで一般データ保護規則の責任者を指定できる
@@ -1983,15 +1990,16 @@ EMailHost=電子メールIMAPサーバーのホスト
 MailboxSourceDirectory=メールボックスのソースディレクトリ
 MailboxTargetDirectory=メールボックスのターゲットディレクトリ
 EmailcollectorOperations=コレクターによる操作
+EmailcollectorOperationsDesc=操作は上から下の順序で実行される
 MaxEmailCollectPerCollect=収集ごとに収集される電子メールの最大数
 CollectNow=今すぐ収集
 ConfirmCloneEmailCollector=メールコレクター%sのクローンを作成してもよいか？
-DateLastCollectResult=最新の収集が試行された日付
-DateLastcollectResultOk=最新の収集が成功した日付
+DateLastCollectResult=最新の取得試行の日付
+DateLastcollectResultOk=最新の取得成功の日付
 LastResult=最新の結果
 EmailCollectorConfirmCollectTitle=メール収集確認
 EmailCollectorConfirmCollect=このコレクターのコレクションを今すぐ実行するか？
-NoNewEmailToProcess=処理する新規電子メール ( 一致するフィルター ) はない
+NoNewEmailToProcess=処理する新規電子メール ( 一致するフィルタ ) はない
 NothingProcessed=何もしていない
 XEmailsDoneYActionsDone=%s電子メールが修飾され、%s電子メールが正常に処理されました ( %sレコード/アクションが実行された場合 ) 
 RecordEvent=メールイベントを記録する
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Dolibarrから送信された最初の電子メールによっ
 WithoutDolTrackingID=Dolibarrから送信されていない最初の電子メールによって開始された会話からのメッセージ
 WithDolTrackingIDInMsgId=Dolibarrから送信されたメッセージ
 WithoutDolTrackingIDInMsgId=Dolibarrからメッセージが送信されていない
-CreateCandidature=候補を作成する
+CreateCandidature=求人応募を作成する
 FormatZip=ZIP
 MainMenuCode=メニュー入力コード ( メインメニュー ) 
 ECMAutoTree=自動ECMツリーを表示する
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=国 ( 特定の国に固有の場合 )
 YouMayFindSecurityAdviceHere=ここにセキュリティアドバイザリがある
 ModuleActivatedMayExposeInformation=このモジュールは機密データを公開する可能性がある。不要な場合は無効にすること。
 ModuleActivatedDoNotUseInProduction=開発用に設計されたモジュールが有効になった。実稼働環境では有効にしないこと。
+CombinationsSeparator=製品の組み合わせの区切り文字
+SeeLinkToOnlineDocumentation=例については、トップメニューのオンラインドキュメントへのリンクを参照すること
+SHOW_SUBPRODUCT_REF_IN_PDF=モジュール<b>%s </b>の機能「%s」を使用する場合は、キットの副産物の詳細をPDFで表示すること。
+AskThisIDToYourBank=このIDを取得するには、銀行に問い合わせること
diff --git a/htdocs/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang
index a918ed85c32..e6c0411be42 100644
--- a/htdocs/langs/ja_JP/agenda.lang
+++ b/htdocs/langs/ja_JP/agenda.lang
@@ -1,26 +1,26 @@
 # Dolibarr language file - Source file is en_US - agenda
-IdAgenda=ID event
+IdAgenda=IDイベント
 Actions=イベント
 Agenda=議題
 TMenuAgenda=議題
-Agendas=アジェンダ
-LocalAgenda=Internal calendar
-ActionsOwnedBy=Event owned by
+Agendas=議題s
+LocalAgenda=内部カレンダー
+ActionsOwnedBy=が所有するイベント
 ActionsOwnedByShort=所有者
 AffectedTo=影響を受ける
 Event=イベント
 Events=イベント
-EventsNb=Number of events
+EventsNb=イベント数
 ListOfActions=イベントのリスト
-EventReports=Event reports
+EventReports=イベントレポート
 Location=場所
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=グループ内の任意のユーザーに割り当てられたイベント
 EventOnFullDay=一日のイベント
 MenuToDoActions=すべての不完全なイベント
 MenuDoneActions=すべての終了イベント
 MenuToDoMyActions=私の不完全なイベント
 MenuDoneMyActions=私の終了イベント
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=イベント一覧(内部カレンダー)
 ActionsAskedBy=によって報告されたイベント
 ActionsToDoBy=イベントへの影響を受けた
 ActionsDoneBy=によって行われたイベント
@@ -28,141 +28,142 @@ ActionAssignedTo=イベントに影響を受けた
 ViewCal=月間表示
 ViewDay=日表示
 ViewWeek=週ビュー
-ViewPerUser=Per user view
-ViewPerType=Per type view
+ViewPerUser=ユーザービューごと
+ViewPerType=種別ビューごと
 AutoActions= 議題の自動充填
-AgendaAutoActionDesc= Here you may define events which you want Dolibarr to create automatically  in Agenda. If nothing is checked, only manual actions will be included in logs and displayed in Agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
-AgendaSetupOtherDesc= This page provides options to allow the export of your Dolibarr events into an external calendar (Thunderbird, Google Calendar etc...)
-AgendaExtSitesDesc=このページでは、Dolibarrの議題にそれらのイベントを表示するにはカレンダーの外部ソースを宣言することができます。
+AgendaAutoActionDesc= ここで、Dolibarrが議題で自動的に作成するイベントを定義できる。何もチェックされていない場合、手動アクションのみがログに含まれ、議題に表示されます。オブジェクトに対して実行されたビジネスアクション(検証、ステータス変更)の自動追跡は保存されません。
+AgendaSetupOtherDesc= このページには、Dolibarrイベントを外部カレンダー(Thunderbird、Googleカレンダーなど)にエクスポートできるようにするオプションがある。
+AgendaExtSitesDesc=このページでは、Dolibarrの議題にそれらのイベントを表示するにはカレンダーの外部ソースを宣言することができる。
 ActionsEvents=Dolibarrが自動的に議題でアクションを作成する対象のイベント
-EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
+EventRemindersByEmailNotEnabled=電子メールによるイベントリマインダーは、%sモジュールセットアップで有効になっていなかった。
 ##### Agenda event labels #####
-NewCompanyToDolibarr=Third party %s created
-COMPANY_DELETEInDolibarr=Third party %s deleted
-ContractValidatedInDolibarr=Contract %s validated
-CONTRACT_DELETEInDolibarr=Contract %s deleted
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
+NewCompanyToDolibarr=取引先%sは作成済
+COMPANY_DELETEInDolibarr=取引先%sは削除済
+ContractValidatedInDolibarr=契約%sは検証済
+CONTRACT_DELETEInDolibarr=契約%sは削除済
+PropalClosedSignedInDolibarr=提案%sが署名された
+PropalClosedRefusedInDolibarr=提案%sは拒否された
 PropalValidatedInDolibarr=提案%sは、検証
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=請求書%sは、検証
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+PropalClassifiedBilledInDolibarr=提案%s分類請求済
+InvoiceValidatedInDolibarr=請求書%sは検証済
+InvoiceValidatedInDolibarrFromPos=POSから検証された請求書%s
 InvoiceBackToDraftInDolibarr=請求書%sはドラフトの状態に戻って
-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
-ReceptionValidatedInDolibarr=Reception %s validated
-OrderCreatedInDolibarr=Order %s created
-OrderValidatedInDolibarr=注文%sは、検証
-OrderDeliveredInDolibarr=Order %s classified delivered
-OrderCanceledInDolibarr=ご注文はキャンセル%s
-OrderBilledInDolibarr=Order %s classified billed
-OrderApprovedInDolibarr=注文%sは、承認された
-OrderRefusedInDolibarr=Order %s refused
+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は削除済
+ReceptionValidatedInDolibarr=受信%sは検証済
+OrderCreatedInDolibarr=注文%sは作成済
+OrderValidatedInDolibarr=注文%sは検証済
+OrderDeliveredInDolibarr=分類された%sを注文して配達
+OrderCanceledInDolibarr=注文%s は取消済
+OrderBilledInDolibarr=注文 %sは分類請求済
+OrderApprovedInDolibarr=注文%sは承認済
+OrderRefusedInDolibarr=注文%sが拒否された
 OrderBackToDraftInDolibarr=注文%sは、ドラフトの状態に戻って
-ProposalSentByEMail=Commercial proposal %s sent by email
-ContractSentByEMail=Contract %s sent by email
-OrderSentByEMail=Sales order %s sent by email
-InvoiceSentByEMail=Customer invoice %s sent by email
-SupplierOrderSentByEMail=Purchase order %s sent by email
-ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
-SupplierInvoiceSentByEMail=Vendor invoice %s sent by email
-ShippingSentByEMail=Shipment %s sent by email
-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_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
+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_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は取消済
 ##### End agenda events #####
-AgendaModelModule=Document templates for event
+AgendaModelModule=イベントのドキュメントテンプレート
 DateActionStart=開始日
 DateActionEnd=終了日
-AgendaUrlOptions1=また、出力をフィルタリングするには、次のパラメータを追加することができます。
-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=Show 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)
+AgendaUrlOptions1=また、出力をフィルタリングするには、次のパラメータを追加することができる。
+AgendaUrlOptions3= <b> logina = %s </b>は、出力をユーザーが所有するアクションに制限する<b>%s</b>。
+AgendaUrlOptionsNotAdmin= <b> logina =！%s </b>は、出力をユーザーが所有していないアクションに制限する<b> %s</b>。
+AgendaUrlOptions4= <b> logint = %s </b>は、出力をユーザー<b> %s </b>(所有者など)に割り当てられたアクションに制限する。
+AgendaUrlOptionsProject= <b> project = __ PROJECT_ID__ </b>は、出力をプロジェクト<b> __PROJECT_ID__</b>にリンクされたアクションに制限する。
+AgendaUrlOptionsNotAutoEvent= 自動イベントを除外するには、<b> notactiontype = systemauto</b>。
+AgendaUrlOptionsIncludeHolidays= <b> includeholidays = 1 </b>は、休日のイベントを含む。
+AgendaShowBirthdayEvents=連絡先の誕生日を表示する
+AgendaHideBirthdayEvents=連絡先の誕生日を非表示にする
+Busy=忙しい
+ExportDataset_event1=議題イベントのリスト
+DefaultWorkingDays=デフォルトの稼働日は週単位です(例：1-5、1-6)
+DefaultWorkingHours=1日のデフォルトの労働時間(例：9-18)
 # External Sites ical
 ExportCal=輸出カレンダー
 ExtSites=外部カレンダーをインポートする
-ExtSitesEnableThisTool=Show external calendars (defined in global setup) in Agenda. Does not affect external calendars defined by users.
+ExtSitesEnableThisTool=議題に外部カレンダー(グローバル設定で定義)を表示する。ユーザーが定義した外部カレンダーには影響しない。
 ExtSitesNbOfAgenda=カレンダーの数
-AgendaExtNb=Calendar no. %s
+AgendaExtNb=カレンダー番号%s
 ExtSiteUrlAgenda=。iCalファイルにアクセスするためのURL
-ExtSiteNoLabel=全く説明がありません
-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
-EveryWeek=Every week
-EveryMonth=Every month
-DayOfMonth=Day of month
-DayOfWeek=Day of week
-DateStartPlusOne=Date start + 1 hour
-SetAllEventsToTodo=Set all events to todo
-SetAllEventsToInProgress=Set all events to in progress
-SetAllEventsToFinished=Set all events to finished
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+ExtSiteNoLabel=説明なし
+VisibleTimeRange=目に見える時間範囲
+VisibleDaysRange=目に見える日の範囲
+AddEvent=イベントを作成する
+MyAvailability=私の可用性
+ActionType=イベント種別
+DateActionBegin=イベント開始日
+ConfirmCloneEvent=イベント<b>%s </b>のクローンを作成してもよろしいですか？
+RepeatEvent=イベントを繰り返す
+OnceOnly=一回だけ
+EveryWeek=毎週
+EveryMonth=毎月
+DayOfMonth=曜日
+DayOfWeek=曜日
+DateStartPlusOne=開始日+1時間
+SetAllEventsToTodo=すべてのイベントをToDoに設定する
+SetAllEventsToInProgress=すべてのイベントを進行中に設定する
+SetAllEventsToFinished=すべてのイベントを終了に設定する
+ReminderTime=イベント前のリマインダー期間
+TimeType=期間種別
+ReminderType=コールバック種別
+AddReminder=このイベントの自動リマインダー通知を作成する
+ErrorReminderActionCommCreation=このイベントのリマインダー通知の作成中にエラーが発生した
+BrowserPush=ブラウザのポップアップ通知
diff --git a/htdocs/langs/ja_JP/assets.lang b/htdocs/langs/ja_JP/assets.lang
index 1e340ada3ad..756ce14ea3c 100644
--- a/htdocs/langs/ja_JP/assets.lang
+++ b/htdocs/langs/ja_JP/assets.lang
@@ -16,50 +16,50 @@
 #
 # 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=削除する
-DeleteAnAssetType=Delete an asset type
-ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
-ShowTypeCard=タイプ &quot;%s&quot;を表示
+Assets = 資産
+NewAsset = 新規資産
+AccountancyCodeAsset = 会計コード(資産)
+AccountancyCodeDepreciationAsset = 会計コード(減価償却資産勘定)
+AccountancyCodeDepreciationExpense = 会計コード(減価償却費勘定)
+NewAssetType=新規資産種別
+AssetsTypeSetup=資産種別の設定
+AssetTypeModified=資産種別変更済
+AssetType=資産種別
+AssetsLines=資産
+DeleteType=削除
+DeleteAnAssetType=資産種別を削除
+ConfirmDeleteAssetType=この資産種別を削除したいのね、いいよね？
+ShowTypeCard=種別 ’%s' を表示
 
 # Module label 'ModuleAssetsName'
-ModuleAssetsName = Assets
+ModuleAssetsName = 資産
 # Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc = Assets description
+ModuleAssetsDesc = 資産の説明
 
 #
 # Admin page
 #
-AssetsSetup = Assets setup
-Settings = Settings
-AssetsSetupPage = Assets setup page
-ExtraFieldsAssetsType = Complementary attributes (Asset type)
-AssetsType=Asset type
-AssetsTypeId=Asset type id
-AssetsTypeLabel=Asset type label
-AssetsTypes=Assets types
+AssetsSetup = 資産s設定
+Settings = 設定
+AssetsSetupPage = 資産s設定ページ
+ExtraFieldsAssetsType = 補完属性(資産種別)
+AssetsType=資産種別
+AssetsTypeId=資産種別 ID
+AssetsTypeLabel=資産種別ラベル
+AssetsTypes=資産種別
 
 #
 # Menu
 #
-MenuAssets = Assets
-MenuNewAsset = New asset
-MenuTypeAssets = Type assets
-MenuListAssets = リスト
-MenuNewTypeAssets = 新しい
-MenuListTypeAssets = リスト
+MenuAssets = 資産
+MenuNewAsset = 新規資産
+MenuTypeAssets = 種別 資産s
+MenuListAssets = 一覧
+MenuNewTypeAssets = 新規
+MenuListTypeAssets = 一覧
 
 #
 # Module
 #
-NewAssetType=New asset type
-NewAsset=New asset
+NewAssetType=新規資産種別
+NewAsset=新規資産
diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang
index c04eea05179..b7097ecbc9f 100644
--- a/htdocs/langs/ja_JP/banks.lang
+++ b/htdocs/langs/ja_JP/banks.lang
@@ -49,7 +49,7 @@ BankAccountDomiciliation=銀行の住所
 BankAccountCountry=口座国
 BankAccountOwner=口座所有者名
 BankAccountOwnerAddress=口座所有者のアドレス
-RIBControlError=値の整合性チェックに失敗した。これは、この口座番号の情報が完全でないか、正しくないことを意味する（国、番号、およびIBANを確認）。
+RIBControlError=値の整合性チェックに失敗した。これは、この口座番号の情報が完全でないか、正しくないことを意味する(国、番号、およびIBANを確認)。
 CreateAccount=口座を作成
 NewBankAccount=新規口座
 NewFinancialAccount=新規金融口座
@@ -109,7 +109,7 @@ SocialContributionPayment=社会/財政税の支払
 BankTransfer=銀行口座振替
 BankTransfers=クレジット転送
 MenuBankInternalTransfer=内部転送
-TransferDesc=ある口座から別の口座に転送すると、Dolibarrは2つのレコード（ソース口座の借方とターゲット口座の貸方）を書込む。同じ金額（記号を除く）、ラベル、日付がこの取引に使用される）
+TransferDesc=ある口座から別の口座に転送すると、Dolibarrは2つのレコード(ソース口座の借方とターゲット口座の貸方)を書込む。同じ金額(記号を除く)、ラベル、日付がこの取引に使用される)
 TransferFrom=期初
 TransferTo=期末
 TransferFromToDone=<b>%s %s</b> %sからの<b>%s</b>への転送が記録されています。
@@ -171,12 +171,13 @@ VariousPaymentLabel=その他の支払ラベル
 ConfirmCloneVariousPayment=雑費のクローンを確認
 SEPAMandate=SEPA指令
 YourSEPAMandate=あなたのSEPA指令
-FindYourSEPAMandate=これは、当法人が銀行に口座振替を注文することを承認するSEPA指令です。署名済（署名済ドキュメントをスキャン）で返送するか、メールで送付すること
+FindYourSEPAMandate=これは、当法人が銀行に口座振替を注文することを承認するSEPA指令です。署名済(署名済ドキュメントをスキャン)で返送するか、メールで送付すること
 AutoReportLastAccountStatement=照合を行うときに、フィールド「銀行取引明細書の番号」に最後の取引明細書番号を自動的に入力する
-CashControl=POSキャッシュフェンス
-NewCashFence=新規キャッシュフェンス
+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.
+IfYouDontReconcileDisableProperty=一部の銀行口座で銀行照合を行わない場合は、それらのプロパティ "%s"を無効にして、この警告を削除すること。
+NoBankAccountDefined=銀行口座が定義されていない
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 281ae230ffd..0fd32cc6afc 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -28,7 +28,7 @@ InvoiceReplacementAsk=請求書の交換請求書
 InvoiceReplacementDesc= <b>交換用請求書</b>は、支払をまだ受け取っていない請求書を完全に交換するために使用される。 <br> <br>注：交換できるのは、支払のない請求書のみ。交換する請求書がまだ閉じられていない場合は、自動的に閉じられ「放棄」になる。
 InvoiceAvoir=貸方表
 InvoiceAvoirAsk=請求書を訂正するために貸方表
-InvoiceAvoirDesc=<b>貸方表</b>は、請求書に実際に支払われた金額とは異なる金額が表示されているという事実を修正するために使用される負の請求書です（たとえば、顧客が誤って支払った金額が多すぎる、または一部の製品が返品されたために全額を支払わない）。 。
+InvoiceAvoirDesc=<b>貸方表</b>は、請求書に実際に支払われた金額とは異なる金額が表示されているという事実を修正するために使用される負の請求書です(たとえば、顧客が誤って支払った金額が多すぎる、または一部の製品が返品されたために全額を支払わない)。 。
 invoiceAvoirWithLines=元の請求書の行を使用して貸方表を作成する
 invoiceAvoirWithPaymentRestAmount=未払原産地請求書が残っている貸方表を作成する
 invoiceAvoirLineWithPaymentRestAmount=残りの未払い金額の貸方表
@@ -83,9 +83,9 @@ PaymentRule=支払ルール
 PaymentMode=支払種別
 PaymentTypeDC=デビット/クレジットカード
 PaymentTypePP=PayPal
-IdPaymentMode=支払種別（id）
-CodePaymentMode=支払種別（コード）
-LabelPaymentMode=支払種別（ラベル）
+IdPaymentMode=支払種別(id)
+CodePaymentMode=支払種別(コード)
+LabelPaymentMode=支払種別(ラベル)
 PaymentModeShort=支払種別
 PaymentTerm=支払条件
 PaymentConditions=支払条件
@@ -120,17 +120,17 @@ DisabledBecauseRemainderToPayIsZero=未払残りがゼロであるため無効
 PriceBase=価格ベース
 BillStatus=請求書の状況
 StatusOfGeneratedInvoices=生成された請求書のステータス
-BillStatusDraft=下書き（検証する必要がある）
+BillStatusDraft=下書き(検証する必要がある)
 BillStatusPaid=有料
 BillStatusPaidBackOrConverted=貸方表の払戻または利用可能なクレジットとしてマーク
-BillStatusConverted=支払済（最終請求書で消費できる状態）
+BillStatusConverted=支払済(最終請求書で消費できる状態)
 BillStatusCanceled=放棄された
-BillStatusValidated=（支払する必要がある）を検証
+BillStatusValidated=(支払する必要がある)を検証
 BillStatusStarted=開始
 BillStatusNotPaid=未支払
 BillStatusNotRefunded=未返金
-BillStatusClosedUnpaid=クローズ（無給）
-BillStatusClosedPaidPartially=有料（一部）
+BillStatusClosedUnpaid=クローズ(無給)
+BillStatusClosedPaidPartially=有料(一部)
 BillShortStatusDraft=下書き
 BillShortStatusPaid=支払済
 BillShortStatusPaidBackOrConverted=返金済または変換済
@@ -142,7 +142,7 @@ BillShortStatusStarted=開始済
 BillShortStatusNotPaid=未支払
 BillShortStatusNotRefunded=未返金
 BillShortStatusClosedUnpaid=閉じた
-BillShortStatusClosedPaidPartially=支払済（一部）
+BillShortStatusClosedPaidPartially=支払済(一部)
 PaymentStatusToValidShort=検証するには
 ErrorVATIntraNotConfigured=コミュニティ内のVAT番号はまだ定義されていない
 ErrorNoPaiementModeConfigured=デフォルトの支払種別は定義されていない。これを修正するには、請求書モジュールのセットアップに移動。
@@ -151,7 +151,7 @@ ErrorBillNotFound=請求書%sは存在しない。
 ErrorInvoiceAlreadyReplaced=エラー、請求書%sを置き換えるために請求書を検証しようとしました。しかし、これはすでに請求書%sに置き換えられている。
 ErrorDiscountAlreadyUsed=既に使用されるエラー、割引
 ErrorInvoiceAvoirMustBeNegative=エラーは、正しい請求書は、負の金額を持っている必要がある
-ErrorInvoiceOfThisTypeMustBePositive=エラー、この種別の請求書には、正の税額（またはnull）を除いた金額が必要です
+ErrorInvoiceOfThisTypeMustBePositive=エラー、この種別の請求書には、正の税額(またはnull)を除いた金額が必要です
 ErrorCantCancelIfReplacementInvoiceNotValidated=エラーは、下書きの状態のままで別の請求書に置き換えられている請求書を取り消すことはできない
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=この部分または別の部分はすでに使用されているため、割引シリーズを削除することはできない。
 BillFrom=期初
@@ -184,14 +184,14 @@ 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は、貸方表なしで回収。
+ConfirmClassifyPaidPartiallyReasonAvoir=残りの未払い<b>(%s %s)</b>は、期間前に支払が行われたために付与された割引。私はVATを貸方表で正規化。
+ConfirmClassifyPaidPartiallyReasonDiscount=残りの未払い<b>(%s %s)</b>は、期間前に支払が行われたために付与された割引。
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=残りの未払い<b>(%s %s)</b>は、期間前に支払が行われたために付与された割引。この割引でVATを失うことに同意。
+ConfirmClassifyPaidPartiallyReasonDiscountVat=残りの未払い<b>(%s %s)</b>は、期間前に支払が行われたために付与された割引。この割引のVATは、貸方表なしで回収。
 ConfirmClassifyPaidPartiallyReasonBadCustomer=悪い顧客
 ConfirmClassifyPaidPartiallyReasonProductReturned=製品は、部分的に返される
 ConfirmClassifyPaidPartiallyReasonOther=その他の理由で放棄された金額
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=この選択は、請求書に適切なコメントが提供されている場合に可能。 （例«実際に支払われた価格に対応する税金のみが控除の権利を与える»）
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=この選択は、請求書に適切なコメントが提供されている場合に可能。 (例«実際に支払われた価格に対応する税金のみが控除の権利を与える»)
 ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=一部の国では、請求書に正しいメモが含まれている場合にのみ、この選択が可能になる場合がある。
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=他のすべてに適合しない場合は、この選択肢を使用して、
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>悪い顧客</b>とは、負債の支払を拒否する顧客。
@@ -207,8 +207,8 @@ UnvalidateBill=請求書を未検証に戻す
 NumberOfBills=請求書の数
 NumberOfBillsByMonth=1か月あたりの請求書の数
 AmountOfBills=請求書の金額
-AmountOfBillsHT=請求書の金額（税抜き）
-AmountOfBillsByMonthHT=月別請求書の金額（税引後）
+AmountOfBillsHT=請求書の金額(税抜き)
+AmountOfBillsByMonthHT=月別請求書の金額(税引後)
 UseSituationInvoices=状況請求書を許可する
 UseSituationInvoicesCreditNote=状況請求書貸方表を許可する
 Retainedwarranty=保持保証
@@ -228,7 +228,7 @@ RetainedWarrantyDateLimit=保証期間の制限
 RetainedWarrantyNeed100Percent=PDFに表示するには、状況請求書が100%%の進行状況である必要がある
 AlreadyPaid=既に支払済
 AlreadyPaidBack=すでに払戻済
-AlreadyPaidNoCreditNotesNoDeposits=すでに支払済（貸方表と頭金 以外）
+AlreadyPaidNoCreditNotesNoDeposits=すでに支払済(貸方表と頭金 以外)
 Abandoned=放棄済
 RemainderToPay=未払まま
 RemainderToTake=残りの金額
@@ -237,10 +237,10 @@ Rest=保留中
 AmountExpected=請求額
 ExcessReceived=超過受領額
 ExcessPaid=超過支払額
-EscompteOffered=提供される割引（前払）
+EscompteOffered=提供される割引(前払)
 EscompteOfferedShort=割引
 SendBillRef=請求書の提出%s
-SendReminderBillRef=請求書の提出%s（リマインダー）
+SendReminderBillRef=請求書の提出%s(リマインダー)
 NoDraftBills=下書きの請求なし
 NoOtherDraftBills=他の下書きの請求なし
 NoDraftInvoices=下書きの請求なし
@@ -307,7 +307,7 @@ CreditNoteDepositUse=この種のクレジットを使用するには、請求
 NewGlobalDiscount=新規絶対割引
 NewRelativeDiscount=新規相対的な割引
 DiscountType=割引種別
-NoteReason=（注）/理由
+NoteReason=(注)/理由
 ReasonDiscount=理由
 DiscountOfferedBy=によって付与された
 DiscountStillRemaining=利用可能な割引またはクレジット
@@ -316,8 +316,8 @@ CustomerDiscounts=顧客割引
 SupplierDiscounts=仕入先割引
 BillAddress=ビル·住所
 HelpEscompte=この割引は、支払が期間前に行われたために顧客に付与される割引。
-HelpAbandonBadCustomer=この金額は放棄されており（顧客は悪い顧客であると言われている）、例外的な損失と見なされる。
-HelpAbandonOther=この金額はエラーであったため放棄された（たとえば、間違った顧客または請求書が別のものに置き換えられました）
+HelpAbandonBadCustomer=この金額は放棄されており(顧客は悪い顧客であると言われている)、例外的な損失と見なされる。
+HelpAbandonOther=この金額はエラーであったため放棄された(たとえば、間違った顧客または請求書が別のものに置き換えられました)
 IdSocialContribution=社会/財政納税ID
 PaymentId=支払番号
 PaymentRef=支払参照
@@ -328,12 +328,12 @@ InvoiceStatus=請求書の状況
 InvoiceNote=請求書に注意
 InvoicePaid=支払われた請求
 InvoicePaidCompletely=完全に支払われた
-InvoicePaidCompletelyHelp=完全に支払われる請求書。これには、部分的に支払われる請求書は含まれない。すべての「クローズ」または「クローズ」以外の請求書のリストを取得するには、請求書のステータスにフィルターを使用することを勧める。
+InvoicePaidCompletelyHelp=完全に支払われる請求書。これには、部分的に支払われる請求書は含まれない。すべての「クローズ」または「クローズ」以外の請求書のリストを取得するには、請求書のステータスにフィルタを使用することを勧める。
 OrderBilled=請求済の注文
 DonationPaid=寄付金を支払ました
 PaymentNumber=支払番号
 RemoveDiscount=割引を削除
-WatermarkOnDraftBill=下書きの請求書上にウォーターマーク（空の場合はNothing）
+WatermarkOnDraftBill=下書きの請求書上にウォーターマーク(空の場合はNothing)
 InvoiceNotChecked=ない請求書が選択されていない
 ConfirmCloneInvoice=この請求書のクローンを作成してもよいか<b>%s </b>？
 DisabledBecauseReplacedInvoice=請求書が交換されたため、アクションを無効に
@@ -411,9 +411,9 @@ PaymentCondition14D=14日間
 PaymentConditionShort14DENDMONTH=月末の14日
 PaymentCondition14DENDMONTH=月末から14日以内
 FixAmount=固定金額-ラベル「%s」の1行
-VarAmount=可変量（%% tot。）
-VarAmountOneLine=可変量（%% tot。）-ラベル「%s」の1行
-VarAmountAllLines=可変量（%% tot。）-すべて同じ行
+VarAmount=可変量(%% tot。)
+VarAmountOneLine=可変量(%% tot。)-ラベル「%s」の1行
+VarAmountAllLines=可変量(%% tot。)-すべて同じ行
 # PaymentType
 PaymentTypeVIR=銀行の転送
 PaymentTypeShortVIR=銀行の転送
@@ -425,7 +425,7 @@ PaymentTypeCB=クレジットカード
 PaymentTypeShortCB=クレジットカード
 PaymentTypeCHQ=小切手
 PaymentTypeShortCHQ=小切手
-PaymentTypeTIP=ヒント（支払に対する文書）
+PaymentTypeTIP=ヒント(支払に対する文書)
 PaymentTypeShortTIP=ヒント支払
 PaymentTypeVAD=オンライン支払
 PaymentTypeShortVAD=オンライン支払
@@ -459,8 +459,8 @@ FullPhoneNumber=電話
 TeleFax=ファックス
 PrettyLittleSentence=財政主管庁により承認された会計協会のメンバーとして私の名前で発行された小切手による支払の量を受け入れる。
 IntracommunityVATNumber=コミュニティ内VATID
-PaymentByChequeOrderedTo=小切手による支払（税込）は%sに支払う必要があり、
-PaymentByChequeOrderedToShort=小切手による支払（税込）は、
+PaymentByChequeOrderedTo=小切手による支払(税込)は%sに支払う必要があり、
+PaymentByChequeOrderedToShort=小切手による支払(税込)は、
 SendTo=送り先
 PaymentByTransferOnThisBankAccount=以下の銀行口座への振込による支払
 VATIsNotUsedForInvoice=CGIの*非適用される付加価値税がart-293B
@@ -509,7 +509,7 @@ RevenueStamp=税印紙
 YouMustCreateInvoiceFromThird=このオプションは、取引先の"顧客"タブから請求書を作成する場合にのみ使用できる。
 YouMustCreateInvoiceFromSupplierThird=このオプションは、取引先の"仕入先"タブから請求書を作成する場合にのみ使用できる。
 YouMustCreateStandardInvoiceFirstDesc=最初に標準請求書を作成し、それを「テンプレート」に変換して、新規テンプレートの請求書を作成する必要がある
-PDFCrabeDescription=請求書PDFテンプレートクレイブ。完全な請求書テンプレート（Spongeテンプレートの古い実装）
+PDFCrabeDescription=請求書PDFテンプレートクレイブ。完全な請求書テンプレート(Spongeテンプレートの古い実装)
 PDFSpongeDescription=請求書PDFテンプレートスポンジ。完全な請求書テンプレート
 PDFCrevetteDescription=請求書PDFテンプレートクレベット。シチュエーション請求書の完全な請求書テンプレート
 TerreNumRefModelDesc1=戻る数値の書式は、標準請求書の場合は%syymm-nnnn、貸方表の場合は%syymm-nnnn、ここで yy は年、mm は月、nnnn は欠番なく連続した0に戻らない数値
@@ -534,7 +534,7 @@ InvoiceSituation=状況請求書
 PDFInvoiceSituation=状況請求書
 InvoiceSituationAsk=状況に応じた請求書
 InvoiceSituationDesc=既存の状況に続いて新規状況を作成する
-SituationAmount=状況請求額（純額）
+SituationAmount=状況請求額(純額)
 SituationDeduction=状況減算
 ModifyAllLines=すべての行を変更する
 CreateNextSituationInvoice=次の状況を作成する
@@ -558,10 +558,10 @@ invoiceLineProgressError=請求書ラインの進行状況は、次の請求書
 updatePriceNextInvoiceErrorUpdateline=エラー：請求書行の価格を更新：%s
 ToCreateARecurringInvoice=この契約の定期的な請求書を作成するには、最初にこの下書き請求書を作成し、次にそれを請求書テンプレートに変換して、将来の請求書を生成する頻度を定義。
 ToCreateARecurringInvoiceGene=将来の請求書を定期的かつ手動で生成するには、メニュー<strong> %s --%s --%s</strong>に移動。
-ToCreateARecurringInvoiceGeneAuto=このような請求書を自動的に生成する必要がある場合は、管理者にモジュール<strong> %s</strong>を有効にしてセットアップするように依頼して。両方の方法（手動と自動）を一緒に使用すると、重複のリスクがないことに注意して。
+ToCreateARecurringInvoiceGeneAuto=このような請求書を自動的に生成する必要がある場合は、管理者にモジュール<strong> %s</strong>を有効にしてセットアップするように依頼して。両方の方法(手動と自動)を一緒に使用すると、重複のリスクがないことに注意して。
 DeleteRepeatableInvoice=テンプレートの請求書を削除する
 ConfirmDeleteRepeatableInvoice=テンプレートの請求書を削除してもよいか？
-CreateOneBillByThird=取引先ごとに1つの請求書を作成する（それ以外の場合は、注文ごとに1つの請求書を作成する）
+CreateOneBillByThird=取引先ごとに1つの請求書を作成する(それ以外の場合は、注文ごとに1つの請求書を作成する)
 BillCreated=%s請求書(s)が作成された
 StatusOfGeneratedDocuments=ドキュメント生成のステータス
 DoNotGenerateDoc=ドキュメントファイルを生成しない
diff --git a/htdocs/langs/ja_JP/blockedlog.lang b/htdocs/langs/ja_JP/blockedlog.lang
index 239cc0674ba..d30b407f1d8 100644
--- a/htdocs/langs/ja_JP/blockedlog.lang
+++ b/htdocs/langs/ja_JP/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=寄付は論理削除済
 logMEMBER_SUBSCRIPTION_CREATE=メンバーサブスクリプションは作成済
 logMEMBER_SUBSCRIPTION_MODIFY=メンバーサブスクリプションは変更済
 logMEMBER_SUBSCRIPTION_DELETE=メンバーサブスクリプションは論理削除済
-logCASHCONTROL_VALIDATE=キャッシュフェンスの記録
+logCASHCONTROL_VALIDATE=現金出納帳の締めを記録中
 BlockedLogBillDownload=顧客請求書のダウンロード
 BlockedLogBillPreview=顧客請求書のプレビュー
 BlockedlogInfoDialog=ログの詳細
@@ -50,5 +50,5 @@ BlockedLogAreRequiredByYourCountryLegislation=変更不可能なログモジュ
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=あなたの国の法律により、変更不可能なログモジュールがアクティブ化済。このモジュールを無効にすると、税務監査で検証できないため、法律および法律ソフトウェアの使用に関して将来の取引が無効になる可能性あり。
 BlockedLogDisableNotAllowedForCountry=このモジュールの使用が必須である国のリスト(誤ってモジュールを無効にするのを防ぐために、あなたの国がこのリストにある場合、最初にこのリストを編集しないとモジュールを無効にできない。このモジュールの有効/無効は、変更不可能なログに追跡されることに注意)。
 OnlyNonValid=無効
-TooManyRecordToScanRestrictFilters=スキャン/分析するにはレコードが多すぎ。より制限の厳しいフィルターでリストを制限すること。
+TooManyRecordToScanRestrictFilters=スキャン/分析するにはレコードが多すぎ。より制限の厳しいフィルタでリストを制限すること。
 RestrictYearToExport=エクスポートする月/年を制限する
diff --git a/htdocs/langs/ja_JP/bookmarks.lang b/htdocs/langs/ja_JP/bookmarks.lang
index 5cc7c85d517..3c8c690c6b6 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://URL) または内部/相対リンク(/DOLIBARR_ROOT/htdocs/...)を使用 
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=リンクされたページを現在のタブで開くか、新規タブで開くかを選択 
 BookmarksManagement=ブックマークの管理
 BookmarksMenuShortCut=Ctrl +シフト+ m
diff --git a/htdocs/langs/ja_JP/boxes.lang b/htdocs/langs/ja_JP/boxes.lang
index 2b6ffad8f97..6f69a9dff73 100644
--- a/htdocs/langs/ja_JP/boxes.lang
+++ b/htdocs/langs/ja_JP/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContacts=最新の連絡先/住所
 BoxLastMembers=最新のメンバー
 BoxFicheInter=最新の介入
 BoxCurrentAccounts=口座残高
-BoxTitleMemberNextBirthdays=今月の誕生日（会員）
+BoxTitleMemberNextBirthdays=今月の誕生日(会員)
 BoxTitleLastRssInfos=%sからの最新の%sニュース
 BoxTitleLastProducts=製品/サービス：最後に変更された%s
 BoxTitleProductsAlertStock=製品：在庫アラート
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=最新の%s変更された寄付
 BoxTitleLastModifiedExpenses=最新の%s変更された経費報告書
 BoxTitleLatestModifiedBoms=最新の%s変更されたBOM
 BoxTitleLatestModifiedMos=最新の%s変更された製造オーダー
-BoxGlobalActivity=グローバルアクティビティ（請求書、提案、注文）
+BoxTitleLastOutstandingBillReached=最大未払い額を超えた顧客
+BoxGlobalActivity=グローバルアクティビティ(請求書、提案、注文)
 BoxGoodCustomers=良い顧客
 BoxTitleGoodCustomers=%s良い顧客
+BoxScheduledJobs=スケジュールジョブ
+BoxTitleFunnelOfProspection=リードファンネル
 FailedToRefreshDataInfoNotUpToDate=RSSフラックスの更新に失敗しました。最新の正常な更新日：%s
 LastRefreshDate=最新の更新日
 NoRecordedBookmarks=ブックマークが定義されていない。
@@ -68,7 +71,7 @@ NoContractedProducts=ない製品/サービスは、契約しない
 NoRecordedContracts=全く記録された契約をしない
 NoRecordedInterventions=記録された介入はない
 BoxLatestSupplierOrders=最新の注文書
-BoxLatestSupplierOrdersAwaitingReception=最新の注文書（受付待ち）
+BoxLatestSupplierOrdersAwaitingReception=最新の注文書(受付待ち)
 NoSupplierOrder=注文書は記録されていない
 BoxCustomersInvoicesPerMonth=1か月あたりの顧客の請求書
 BoxSuppliersInvoicesPerMonth=1か月あたりの仕入先の請求書
@@ -91,9 +94,9 @@ ForProposals=提案
 LastXMonthRolling=最新の %s 月ローリング
 ChooseBoxToAdd=ダッシュボードにウィジェットを追加する
 BoxAdded=ダッシュボードにウィジェットが追加された
-BoxTitleUserBirthdaysOfMonth=今月の誕生日（ユーザー）
-BoxLastManualEntries=会計の最後の手動入力
-BoxTitleLastManualEntries=%s最新のマニュアルエントリ
+BoxTitleUserBirthdaysOfMonth=今月の誕生日(ユーザー)
+BoxLastManualEntries=手動またはソースドキュメントなしで入力された会計の最新レコード
+BoxTitleLastManualEntries=%s手動またはソースドキュメントなしで入力された最新のレコード
 NoRecordedManualEntries=会計に手動入力の記録はない
 BoxSuspenseAccount=サスペンスアカウントで会計操作をカウントする
 BoxTitleSuspenseAccount=未割り当て回線の数
@@ -102,6 +105,7 @@ SuspenseAccountNotDefined=一時停止アカウントが定義されていない
 BoxLastCustomerShipments=最後の顧客の出荷
 BoxTitleLastCustomerShipments=最新の%s顧客出荷
 NoRecordedShipments=顧客の出荷は記録されていない
+BoxCustomersOutstandingBillReached=上限に達した顧客
 # Pages
 AccountancyHome=会計
 ValidatedProjects=検証済みプロジェクト
diff --git a/htdocs/langs/ja_JP/cashdesk.lang b/htdocs/langs/ja_JP/cashdesk.lang
index 15f5a1bd3b0..e3dac47b1ba 100644
--- a/htdocs/langs/ja_JP/cashdesk.lang
+++ b/htdocs/langs/ja_JP/cashdesk.lang
@@ -1,9 +1,9 @@
 # Language file - Source file is en_US - cashdesk
 CashDeskMenu=販売時点
 CashDesk=販売時点
-CashDeskBankCash=銀行口座（現金）
-CashDeskBankCB=銀行口座（カード）
-CashDeskBankCheque=銀行口座（チェック）
+CashDeskBankCash=銀行口座(現金)
+CashDeskBankCB=銀行口座(カード)
+CashDeskBankCheque=銀行口座(チェック)
 CashDeskWarehouse=倉庫
 CashdeskShowServices=販売サービス
 CashDeskProducts=製品
@@ -46,11 +46,11 @@ SearchProduct=製品を検索する
 Receipt=領収書
 Header=ヘッダ
 Footer=フッター
-AmountAtEndOfPeriod=期末の金額（日、月、または年）
+AmountAtEndOfPeriod=期末の金額(日、月、または年)
 TheoricalAmount=理論量
 RealAmount=実数
-CashFence=キャッシュフェンス
-CashFenceDone=期間中に行われたキャッシュフェンス
+CashFence=現金出納帳の締め
+CashFenceDone=当該期間での現金出納帳の締めが完了
 NbOfInvoices=請求書のNb
 Paymentnumpad=支払いを入力するパッドのタイプ
 Numberspad=ナンバーズパッド
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=POS販売用の番号付けモジュール
 CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b>タグは端末番号を追加するために使用される
 TakeposGroupSameProduct=同じ製品ラインをグループ化する
 StartAParallelSale=新規並行販売を開始する
-ControlCashOpening=POSを開くときにキャッシュボックスを制御する
-CloseCashFence=キャッシュフェンスを閉じる
+SaleStartedAt=%sから販売開始
+ControlCashOpening=POSを開くときにキャッシュポップアップを制御する
+CloseCashFence=現金出納帳制御を閉じる
 CashReport=現金レポート
 MainPrinterToUse=使用するメインプリンター
 OrderPrinterToUse=使用するプリンタを注文する
diff --git a/htdocs/langs/ja_JP/categories.lang b/htdocs/langs/ja_JP/categories.lang
index f3d63b0723d..dc3c74ec703 100644
--- a/htdocs/langs/ja_JP/categories.lang
+++ b/htdocs/langs/ja_JP/categories.lang
@@ -19,7 +19,8 @@ ProjectsCategoriesArea=プロジェクトタグ/カテゴリ領域
 UsersCategoriesArea=ユーザータグ/カテゴリ領域
 SubCats=サブカテゴリ
 CatList=タグ/カテゴリのリスト
-NewCategory=新しいタグ/カテゴリ
+CatListAll=タグ/カテゴリのリスト(すべての種別)
+NewCategory=新規タグ/カテゴリ
 ModifCat=タグ/カテゴリを変更する
 CatCreated=作成されたタグ/カテゴリ
 CreateCat=タグ/カテゴリを作成する
@@ -65,24 +66,30 @@ UsersCategoriesShort=ユーザーのタグ/カテゴリ
 StockCategoriesShort=倉庫のタグ/カテゴリ
 ThisCategoryHasNoItems=このカテゴリにはアイテムは含まれていない。
 CategId=タグ/カテゴリID
-CatSupList=ベンダータグ/カテゴリのリスト
+ParentCategory=親タグ/カテゴリ
+ParentCategoryLabel=親タグ/カテゴリのラベル
+CatSupList=仕入先のタグ/カテゴリのリスト
 CatCusList=顧客/見込み客のタグ/カテゴリのリスト
 CatProdList=製品タグ/カテゴリのリスト
 CatMemberList=メンバーのタグ/カテゴリのリスト
 CatContactList=連絡先タグ/カテゴリのリスト
-CatSupLinks=サプライヤーとタグ/カテゴリー間のリンク
+CatProjectsList=プロジェクトのタグ/カテゴリのリスト
+CatUsersList=ユーザーのタグ/カテゴリのリスト
+CatSupLinks=仕入先とタグ/カテゴリ間のリンク
 CatCusLinks=顧客/見込み客とタグ/カテゴリ間のリンク
 CatContactsLinks=連絡先/アドレスとタグ/カテゴリ間のリンク
 CatProdLinks=製品/サービスとタグ/カテゴリ間のリンク
-CatProJectLinks=プロジェクトとタグ/カテゴリ間のリンク
+CatMembersLinks=メンバーとタグ/カテゴリ間のリンク
+CatProjectsLinks=プロジェクトとタグ/カテゴリ間のリンク
+CatUsersLinks=ユーザーとタグ/カテゴリ間のリンク
 DeleteFromCat=タグ/カテゴリから削除する
 ExtraFieldsCategories=補完的な属性
 CategoriesSetup=タグ/カテゴリの設定
 CategorieRecursiv=親タグ/カテゴリと自動的にリンクする
 CategorieRecursivHelp=オプションがオンの場合、製品をサブカテゴリに追加すると、製品も親カテゴリに追加される。
 AddProductServiceIntoCategory=次の製品/サービスを追加する
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
+AddCustomerIntoCategory=顧客にカテゴリを割り当てる
+AddSupplierIntoCategory=カテゴリをサプライヤに割り当てる
 ShowCategory=タグ/カテゴリを表示
 ByDefaultInList=デフォルトでリストに
 ChooseCategory=カテゴリを選択
diff --git a/htdocs/langs/ja_JP/commercial.lang b/htdocs/langs/ja_JP/commercial.lang
index 79dba07e867..4aca0632553 100644
--- a/htdocs/langs/ja_JP/commercial.lang
+++ b/htdocs/langs/ja_JP/commercial.lang
@@ -1,80 +1,80 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Commerce
-CommercialArea=Commerce area
+Commercial=コマース
+CommercialArea=コマースエリア
 Customer=顧客
-Customers=お客さま
-Prospect=見通し
-Prospects=見込み
-DeleteAction=Delete an event
-NewAction=New event
-AddAction=Create event
-AddAnAction=Create an event
-AddActionRendezVous=Create a Rendez-vous event
-ConfirmDeleteAction=Are you sure you want to delete this event?
+Customers=顧客s
+Prospect=見込
+Prospects=見込s
+DeleteAction=イベントを削除
+NewAction=新規イベント
+AddAction=イベントを作成
+AddAnAction=イベントを作成
+AddActionRendezVous=ランデブーイベントを作成
+ConfirmDeleteAction=このイベントを削除してもいいか？
 CardAction=イベントカード
-ActionOnCompany=Related company
-ActionOnContact=Related contact
-TaskRDVWith=%sとの会談
-ShowTask=タスクを表示する
+ActionOnCompany=関連法人
+ActionOnContact=関連連絡先
+TaskRDVWith=%sとの打合せ
+ShowTask=タスクを表示
 ShowAction=イベントを表示
 ActionsReport=イベントレポート
-ThirdPartiesOfSaleRepresentative=Third parties with sales representative
-SaleRepresentativesOfThirdParty=Sales representatives of third party
+ThirdPartiesOfSaleRepresentative=営業担当者との取引先
+SaleRepresentativesOfThirdParty=取引先の営業担当者
 SalesRepresentative=営業担当者
 SalesRepresentatives=営業担当者
-SalesRepresentativeFollowUp=営業担当者（フォローアップ）
-SalesRepresentativeSignature=営業担当者（署名）
-NoSalesRepresentativeAffected=特に営業担当者の影響を受けません
-ShowCustomer=顧客を表示する
+SalesRepresentativeFollowUp=営業担当者(フォローアップ)
+SalesRepresentativeSignature=営業担当者(署名)
+NoSalesRepresentativeAffected=特定の営業担当者は未割当
+ShowCustomer=顧客を表示
 ShowProspect=見通しを示す
 ListOfProspects=見込み客リスト
 ListOfCustomers=顧客リスト
-LastDoneTasks=Latest %s completed actions
-LastActionsToDo=Oldest %s not completed actions
+LastDoneTasks=最新の%s完了済アクション
+LastActionsToDo=最も古い%sが未完了アクション
 DoneAndToDoActions=完了し、イベントを実行するには
-DoneActions=完了イベント
-ToDoActions=不完全なイベント
-SendPropalRef=Submission of commercial proposal %s
-SendOrderRef=Submission of order %s
+DoneActions=完了済イベント
+ToDoActions=未完了イベント
+SendPropalRef=売買契約提案書%s の提出
+SendOrderRef=注文の提出%s
 StatusNotApplicable=適用されない
 StatusActionToDo=実行する
 StatusActionDone=完了する
-StatusActionInProcess=プロセスの
+StatusActionInProcess=処理中
 TasksHistoryForThisContact=この連絡先のイベント
-LastProspectDoNotContact=連絡しないでください
-LastProspectNeverContacted=連絡しないでください
-LastProspectToContact=連絡する
-LastProspectContactInProcess=プロセスの連絡先
-LastProspectContactDone=行わ連絡
-ActionAffectedTo=イベントに影響を受けた
-ActionDoneBy=することにより、イベントを行って
+LastProspectDoNotContact=連絡しないこと
+LastProspectNeverContacted=連絡未実施
+LastProspectToContact=連絡すること
+LastProspectContactInProcess=連絡実施中
+LastProspectContactDone=連絡実施済
+ActionAffectedTo=イベントは割当済
+ActionDoneBy=イベントは実行済
 ActionAC_TEL=電話
-ActionAC_FAX=FAXを送信
-ActionAC_PROP=メールで提案を送る
+ActionAC_FAX=FAX送信
+ActionAC_PROP=メールで提案を送信
 ActionAC_EMAIL=電子メールを送信
-ActionAC_EMAIL_IN=Reception of Email
-ActionAC_RDV=ミーティング
-ActionAC_INT=Intervention on site
-ActionAC_FAC=メールでの顧客の請求書を送る
-ActionAC_REL=メール（リマインダー）が顧客の請求書を送付
+ActionAC_EMAIL_IN=メールの受信
+ActionAC_RDV=打合せs
+ActionAC_INT=現場での介入
+ActionAC_FAC=メールでの顧客の請求書を送信
+ActionAC_REL=メール(リマインダー)が顧客の請求書を送付
 ActionAC_CLO=閉じる
 ActionAC_EMAILING=大量メールを送信
-ActionAC_COM=Send sales order by mail
-ActionAC_SHIP=メールでの発送を送る
-ActionAC_SUP_ORD=Send purchase order by mail
-ActionAC_SUP_INV=Send vendor invoice by mail
+ActionAC_COM=メールで販売注文を送信
+ActionAC_SHIP=メールでの発送を送信
+ActionAC_SUP_ORD=メールで注文書を送信
+ActionAC_SUP_INV=ベンダーの請求書をメールで送信
 ActionAC_OTH=その他
-ActionAC_OTH_AUTO=Automatically inserted events
-ActionAC_MANUAL=Manually inserted events
-ActionAC_AUTO=Automatically inserted events
-ActionAC_OTH_AUTOShort=Auto
-Stats=Sales statistics
-StatusProsp=見通しの状態
-DraftPropals=ドラフト商業の提案
-NoLimit=No limit
-ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
-ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
-ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commercial proposal %s
-FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
+ActionAC_OTH_AUTO=自動的に挿入されるイベント
+ActionAC_MANUAL=手動で挿入されたイベント
+ActionAC_AUTO=自動的に挿入されるイベント
+ActionAC_OTH_AUTOShort=自動
+Stats=販売統計
+StatusProsp=見込の状態
+DraftPropals=売買契約提案書の下書き
+NoLimit=制限なし
+ToOfferALinkForOnlineSignature=オンライン署名へのリンク
+WelcomeOnOnlineSignaturePage=%sからの売買契約提案書sを受諾するページへようこそ
+ThisScreenAllowsYouToSignDocFrom=この画面では、見積書/売買契約提案書を受諾して署名するか、拒否することができる
+ThisIsInformationOnDocumentToSign=これは、承認または拒否するドキュメントに関する情報です。
+SignatureProposalRef=見積書/売買契約提案書%s の署名
+FeatureOnlineSignDisabled=オンライン署名の機能が無効になっているか、機能が有効になる前にドキュメントが生成されました
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index 4296d39f2dd..536e29cf292 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -172,7 +172,7 @@ ProfId1ES=職 Id 1 (CIF/NIF)
 ProfId2ES=職 Id 2 (Social security number)
 ProfId3ES=職 Id 3 (CNAE)
 ProfId4ES=職 Id 4 (Collegiate number)
-ProfId5ES=EORI number
+ProfId5ES=EORI番号
 ProfId6ES=-
 ProfId1FR=職 Id 1 (SIREN)
 ProfId2FR=職 Id 2 (SIRET)
@@ -291,10 +291,10 @@ HasAbsoluteDiscountFromSupplier=この仕入先から、<b>%s</b> %s 相当の
 HasDownPaymentOrCommercialDiscountFromSupplier=この仕入先から、 <b>%s</b> %s 相当の割引が可能 (現金値引、頭金充当)
 HasCreditNoteFromSupplier=この仕入先から、<b>%s </b>%s相当の返金確約があり
 CompanyHasNoAbsoluteDiscount=この顧客は、使用可能な割引クレジットを持っていません
-CustomerAbsoluteDiscountAllUsers=絶対顧客割引（すべてのユーザーで付与）
-CustomerAbsoluteDiscountMy=絶対顧客割引（自身で付与）
-SupplierAbsoluteDiscountAllUsers=絶対仕入先割引（すべてのユーザーで入力）
-SupplierAbsoluteDiscountMy=絶対仕入先割引（自分で入力）
+CustomerAbsoluteDiscountAllUsers=絶対顧客割引(すべてのユーザーで付与)
+CustomerAbsoluteDiscountMy=絶対顧客割引(自身で付与)
+SupplierAbsoluteDiscountAllUsers=絶対仕入先割引(すべてのユーザーで入力)
+SupplierAbsoluteDiscountMy=絶対仕入先割引(自分で入力)
 DiscountNone=なし
 Vendor=仕入先
 Supplier=仕入先
@@ -332,7 +332,7 @@ ListOfContactsAddresses=連絡先s/住所sの一覧
 ListOfThirdParties=取引先s一覧
 ShowCompany=取引先
 ShowContact=連絡先-住所
-ContactsAllShort=すべて（フィルタなし）
+ContactsAllShort=すべて(フィルタなし)
 ContactType=連絡先種別
 ContactForOrders=注文の連絡先
 ContactForOrdersOrShipments=注文または配送の連絡先
@@ -352,13 +352,13 @@ CapitalOf=%sの首都
 EditCompany=会社を編集します。
 ThisUserIsNot=このユーザは見込客でも、顧客でも、仕入先でもない
 VATIntraCheck=チェック
-VATIntraCheckDesc=VAT IDには、国のプレフィックスを含めることが必要。リンク<b>%s </b>は、欧州VATチェッカーサービス（VIES）を使用し、そのためにはDolibarrサーバーからのインターネットアクセスが必要。
+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>で手動で確認可能
-ErrorVATCheckMS_UNAVAILABLE=ことはできませんを確認してください。サービスは加盟国（%s）によって提供されていません確認してください。
+ErrorVATCheckMS_UNAVAILABLE=ことはできませんを確認してください。サービスは加盟国(%s)によって提供されていません確認してください。
 NorProspectNorCustomer=見込客でない、顧客でない
-JuridicalStatus=法的組織種別
+JuridicalStatus=事業体種別
 Workforce=労働力
 Staff=従業員
 ProspectLevelShort=潜在的な
@@ -446,7 +446,7 @@ LeopardNumRefModelDesc=顧客/サプライヤーコードは無料です。こ
 ManagingDirectors=管理職(s)名称 (CEO, 部長, 社長...)
 MergeOriginThirdparty=重複する取引先 (削除したい取引先)
 MergeThirdparties=仕入先sを集約
-ConfirmMergeThirdparties=この取引先を現在の取引先に融合したいのね、いいよね？リンクされたすべてのオブジェクト（請求書、注文など...）は現在の取引先に移動され、この取引先には削除されるよ。
+ConfirmMergeThirdparties=この取引先を現在の取引先に融合したいのね、いいよね？リンクされたすべてのオブジェクト(請求書、注文など...)は現在の取引先に移動され、この取引先には削除されるよ。
 ThirdpartiesMergeSuccess=仕入先sは集約済み
 SaleRepresentativeLogin=販売担当者のログイン
 SaleRepresentativeFirstname=販売担当者の姓名の名
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index 2714ed31df3..379785639bb 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -5,9 +5,9 @@ TaxModuleSetupToModifyRulesLT=<a href="%s">法人設定</a>に移動して、計
 OptionMode=会計のためのオプション
 OptionModeTrue=オプション 収益・費用
 OptionModeVirtual=オプション 債権・債務
-OptionModeTrueDesc=この文脈では、売上高は、支払（支払日）に渡って計算される。この数値の妥当性は、簿記の記帳が請求書を経由して勘定科目に 入/出 していると精査されている場合にのみ保証される。
-OptionModeVirtualDesc=この文脈では、売上高は、請求書（検証日）に渡って計算される。これらの請求書が期日になると、支払いが済んでいるかどうかに関わらず、売上高の出力に記載される。
-FeatureIsSupportedInInOutModeOnly=​​債権・債務の会計モードでのみ使用可能な機能（会計モジュール設定を参照すること）
+OptionModeTrueDesc=この文脈では、売上高は、支払(支払日)に渡って計算される。この数値の妥当性は、簿記の記帳が請求書を経由して勘定科目に 入/出 していると精査されている場合にのみ保証される。
+OptionModeVirtualDesc=この文脈では、売上高は、請求書(検証日)に渡って計算される。これらの請求書が期日になると、支払いが済んでいるかどうかに関わらず、売上高の出力に記載される。
+FeatureIsSupportedInInOutModeOnly=​​債権・債務の会計モードでのみ使用可能な機能(会計モジュール設定を参照すること)
 VATReportBuildWithOptionDefinedInModule=ここに示されている金額は税モジュール設定によって定義されたルールを使用して計算される。
 LTReportBuildWithOptionDefinedInModule=ここに表示されている金額は、法人の設定で定義されたルールを使用して計算されている。
 Param=設定
@@ -25,7 +25,7 @@ PaymentsNotLinkedToInvoice=任意の請求書にリンクされていない支
 PaymentsNotLinkedToUser=すべてのユーザーにリンクされていない支払
 Profit=利益
 AccountingResult=会計結果
-BalanceBefore=残高（前）
+BalanceBefore=残高(前)
 Balance=残高
 Debit=借方
 Credit=貸方
@@ -111,7 +111,7 @@ Refund=払戻
 SocialContributionsPayments=社会/財政税支払
 ShowVatPayment=付加価値税支払を表示する
 TotalToPay=支払に合計
-BalanceVisibilityDependsOnSortAndFilters=このリストに残高が表示されるのは、テーブルが%sで昇順で並べ替えられ、1つの銀行口座でフィルタリングされている場合のみ。
+BalanceVisibilityDependsOnSortAndFilters=残高は、テーブルが%sで並べ替えられ、1つの銀行口座でフィルタリングされている場合にのみこのリストに表示される(他のフィルタはない)
 CustomerAccountancyCode=顧客会計コード
 SupplierAccountancyCode=ベンダー会計コード
 CustomerAccountancyCodeShort=カスト。アカウント。コード
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=この社会的/財政的納税を削除して
 ExportDataset_tax_1=社会的および財政的な税金と支払
 CalcModeVATDebt=コミットメントアカウンティングのモード<b>%sVAT%s</b>。
 CalcModeVATEngagement=収入のモード<b>%sVAT-expenses%s</b>。
-CalcModeDebt=元帳にまだ計上されていない場合でも、既知の記録された請求書の分析。
+CalcModeDebt=元帳未計上によらず、既知の記録済文書の分析。
 CalcModeEngagement=元帳にまだ計上されていない場合でも、既知の記録された支払の分析。
 CalcModeBookkeeping=簿記元帳テーブルにジャーナル化されたデータの分析。
 CalcModeLT1= 顧客の請求書のモード<b>%sRE-サプライヤーの請求書s%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=収支差額、年次要約
 AnnualByCompanies=事前定義されたアカウントグループによる収支差額
 AnnualByCompaniesDueDebtMode=収支差額、事前定義されたグループによる詳細、モード<b> %sClaims-Debts%s</b>は<b>コミットメント会計</b>と言える。
 AnnualByCompaniesInputOutputMode=収支差額、事前定義されたグループによる詳細、モード<b>%sIncomes-Expenses%s</b>は<b>現金会計</b>と言える。
-SeeReportInInputOutputMode=元帳にまだ計上されていない場合でも、実際に行われた支払の計算については、%s支払の分析%sを参照すること。
-SeeReportInDueDebtMode=既知の記録された請求書に基づく計算については、元帳にまだ計上されていない場合でも、請求書の%sanalysiss%sを参照すること。
-SeeReportInBookkeepingMode=<b>簿記元帳テーブル</b>の計算については、<b> %sBookeeping report%s</b>を参照すること。
+SeeReportInInputOutputMode=元帳未計上によらず、 <b>%s支払の分析%s</b> を参照すること。その対象は <b>記録済支払</b> に基づく計算。
+SeeReportInDueDebtMode=元帳未計上によらず、 <b>%s記録済文書sの分析%s</b> を参照すること。その対象は、既知の <b>記録済文書s </b> に基づく計算。
+SeeReportInBookkeepingMode=<b>%s簿記元帳テーブルの分析%s</b> を参照すること。その対象は、 <b>簿記元帳テーブル</b>基づくレポート。
 RulesAmountWithTaxIncluded=-表示されている金額はすべての税金が含まれている
 RulesResultDue=-未払いの請求書、経費、VAT、支払の有無にかかわらず寄付が含まれる。給与も含まれている。 <br>-請求書の請求日と、経費または税金支払期日に基づいている。給与モジュールで定義された給与の場合、支払の起算日が使用される。
 RulesResultInOut=-これには、請求書、経費、VAT、および給与に対して行われた実際支払が含まれる。 <br>-請求書、経費、VAT、給与支払日に基づいている。寄付の寄付日。
@@ -227,8 +227,8 @@ TurnoverPerProductInCommitmentAccountingNotRelevant=製品ごとに回収済売
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=売却税率ごとに回収済売上高のレポートは利用できない。このレポートは、請求済売上高に対してのみ使用できる。
 CalculationMode=計算モード
 AccountancyJournal=会計コードジャーナル
-ACCOUNTING_VAT_SOLD_ACCOUNT=販売時のVATのデフォルトの会計アカウント（VATディクショナリの設定で定義されていない場合に使用）
-ACCOUNTING_VAT_BUY_ACCOUNT=購入時のVATのデフォルトの会計アカウント（VATディクショナリ設定で定義されていない場合に使用）
+ACCOUNTING_VAT_SOLD_ACCOUNT=販売時のVATのデフォルトの会計アカウント(VATディクショナリの設定で定義されていない場合に使用)
+ACCOUNTING_VAT_BUY_ACCOUNT=購入時のVATのデフォルトの会計アカウント(VATディクショナリ設定で定義されていない場合に使用)
 ACCOUNTING_VAT_PAY_ACCOUNT=VATを支払うためのデフォルトの会計アカウント
 ACCOUNTING_ACCOUNT_CUSTOMER=顧客の第三者に使用される会計アカウント
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=サードパーティカードで定義された専用の会計アカウントは、補助元帳の会計にのみ使用される。これは総勘定元帳に使用され、サードパーティの専用顧客会計勘定が定義されていない場合は補助元帳会計のデフォルト値として使用される。
@@ -237,7 +237,7 @@ ACCOUNTING_ACCOUNT_SUPPLIER_Desc=サードパーティカードで定義され
 ConfirmCloneTax=社会税/財政税のクローンを確認する
 CloneTaxForNextMonth=来月のためにそれをクローンする
 SimpleReport=簡単なレポート
-AddExtraReport=追加レポート（海外および国内の顧客レポートを追加）
+AddExtraReport=追加レポート(海外および国内の顧客レポートを追加)
 OtherCountriesCustomersReport=外国の顧客の報告
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=自法人の国コードとは異なるVAT番号の最初の2文字に基づく
 SameCountryCustomersWithVAT=全国の顧客レポート
diff --git a/htdocs/langs/ja_JP/contracts.lang b/htdocs/langs/ja_JP/contracts.lang
index c20e279a29d..869f8fe95be 100644
--- a/htdocs/langs/ja_JP/contracts.lang
+++ b/htdocs/langs/ja_JP/contracts.lang
@@ -35,8 +35,8 @@ ActivateAllOnContract=すべてのサービスをアクティブ化する
 CloseAContract=契約を閉じる
 ConfirmDeleteAContract=こ契約とそのすべてのサービスを削除してもよいか？
 ConfirmValidateContract=こ契約を<b>%s </b>という名前で検証してもよいか？
-ConfirmActivateAllOnContract=これにより、すべてのサービスが開く（まだアクティブではない）。すべてのサービスを開始してもよいか？
-ConfirmCloseContract=これにより、すべてのサービスが閉じられる（アクティブでもなくても）。こ契約を終了してもよいか？
+ConfirmActivateAllOnContract=これにより、すべてのサービスが開く(まだアクティブではない)。すべてのサービスを開始してもよいか？
+ConfirmCloseContract=これにより、すべてのサービスが閉じられる(アクティブでもなくても)。こ契約を終了してもよいか？
 ConfirmCloseService=日付<b>%s </b>でこのサービスを終了してもよいか？
 ValidateAContract=契約を検証
 ActivateService=サービスをアクティブ化
@@ -49,7 +49,7 @@ ListOfInactiveServices=非アクティブサービスリスト
 ListOfExpiredServices=失効済アクティブサービスリスト
 ListOfClosedServices=クローズドサービスリスト
 ListOfRunningServices=実行中サービスリスト
-NotActivatedServices=非アクティブなサービス（検証済み契約の中で）
+NotActivatedServices=非アクティブなサービス(検証済み契約の中で)
 BoardNotActivatedServices=検証済み契約の中でアクティブにするサービス
 BoardNotActivatedServicesShort=アクティベートするサービス
 LastContracts=最新の%s契約
@@ -78,8 +78,8 @@ DeleteContractLine=契約の行を削除する
 ConfirmDeleteContractLine=こ契約行を削除してもよいか？
 MoveToAnotherContract=別契約にサービスを移動する。
 ConfirmMoveToAnotherContract=私は、新規ターゲット契約を選びましたし、私はこ契約には、このサービスを移動することを確認する。
-ConfirmMoveToAnotherContractQuestion=このサービスを移動する（同じサードパーティの）既存契約を選択するか？
-PaymentRenewContractId=契約回線（番号の%s）を​​更新
+ConfirmMoveToAnotherContractQuestion=このサービスを移動する(同じサードパーティの)既存契約を選択するか？
+PaymentRenewContractId=契約回線(番号の%s)を​​更新
 ExpiredSince=有効期限の日付
 NoExpiredServices=失効済アクティブサービス無し
 ListOfServicesToExpireWithDuration=%s日で失効済になるサービスリスト
diff --git a/htdocs/langs/ja_JP/cron.lang b/htdocs/langs/ja_JP/cron.lang
index 431b36d9c0d..0a94274deb6 100644
--- a/htdocs/langs/ja_JP/cron.lang
+++ b/htdocs/langs/ja_JP/cron.lang
@@ -7,12 +7,12 @@ Permission23103 = スケジュールされたジョブを削除する
 Permission23104 = スケジュールされたジョブを実行する
 # Admin
 CronSetup=スケジュールされたジョブ管理のセットアップ
-URLToLaunchCronJobs=修飾されたcronジョブを確認して起動するためのURL
-OrToLaunchASpecificJob=または、特定のジョブを確認して起動する
+URLToLaunchCronJobs=ブラウザから修飾されたcronジョブを確認して起動するためのURL
+OrToLaunchASpecificJob=または、ブラウザから特定のジョブを確認して起動する
 KeyForCronAccess=cronジョブを起動するためのURLのセキュリティキー
 FileToLaunchCronJobs=修飾されたcronジョブをチェックして起動するコマンドライン
 CronExplainHowToRunUnix=Unix環境では、次のcrontabエントリを使用して、5分ごとにコマンドラインを実行する必要がある。
-CronExplainHowToRunWin=Microsoft（tm）Windows環境では、スケジュールされたタスクツールを使用して、5分ごとにコマンドラインを実行できる。
+CronExplainHowToRunWin=Microsoft(tm)Windows環境では、スケジュールされたタスクツールを使用して、5分ごとにコマンドラインを実行できる。
 CronMethodDoesNotExists=クラス%sには、メソッド%sが含まれていない。
 CronMethodNotAllowed=クラス%sのメソッド%sは、禁止されているメソッドのブラックリストに含まれています
 CronJobDefDesc=cronジョブプロファイルは、モジュール記述子ファイルに定義されています。モジュールがアクティブ化されると、それらがロードされて使用可能になるため、管理ツールメニュー%sからジョブを管理できる。
@@ -76,7 +76,7 @@ CronFrom=から
 CronType=職種
 CronType_method=PHPクラスの呼び出しメソッド
 CronType_command=シェルコマンド
-CronCannotLoadClass=クラスファイル%sをロードできない（クラス%sを使用するため）
+CronCannotLoadClass=クラスファイル%sをロードできない(クラス%sを使用するため)
 CronCannotLoadObject=クラスファイル%sがロードされたが、オブジェクト%sが見つからなかった
 UseMenuModuleToolsToAddCronJobs=メニュー ”<a href="%s">ホーム - 管理ツール - スケジュールされたジョブ</a>" に移動して、スケジュールされたジョブを表示および編集する。
 JobDisabled=ジョブが無効 
@@ -84,3 +84,8 @@ MakeLocalDatabaseDumpShort=ローカルデータベースのバックアップ
 MakeLocalDatabaseDump=ローカルデータベースダンプを作成する。パラメータは次のもの: 圧縮 ('gz' or 'bz' or 'none')、バックアップ種別 ('mysql', 'pgsql', 'auto')、1、 'auto' またはビルドするファイル名、保持するバックアップファイルの数
 WarningCronDelayed=注意、パフォーマンスの目的で、有効なジョブの次の実行日が何であれ、ジョブは実行される前に最大%s時間まで遅延する可能性がある。
 DATAPOLICYJob=データクリーナとアノニマイザ
+JobXMustBeEnabled=ジョブ%sを有効にする必要がある
+# Cron Boxes
+LastExecutedScheduledJob=最後に実行されたスケジュールジョブ
+NextScheduledJobExecute=次に実行する予定のジョブ
+NumberScheduledJobError=エラーのあるスケジュールジョブの数
diff --git a/htdocs/langs/ja_JP/dict.lang b/htdocs/langs/ja_JP/dict.lang
index a699de6b8fe..38dbf01c4e3 100644
--- a/htdocs/langs/ja_JP/dict.lang
+++ b/htdocs/langs/ja_JP/dict.lang
@@ -11,17 +11,17 @@ CountryUK=イギリス
 CountryIE=アイルランド
 CountryCN=中国
 CountryTN=チュニジア
-CountryUS=、米国
+CountryUS=米国
 CountryMA=モロッコ
 CountryDZ=アルジェリア
-CountryCA=カナダの
+CountryCA=カナダ
 CountryTG=トーゴ
 CountryGA=ガボン
 CountryNL=オランダ
 CountryHU=ハンガリー
 CountryRU=ロシア
 CountrySE=スウェーデン
-CountryCI=Ivoiryコースト
+CountryCI=コートジボワール
 CountrySN=セネガル
 CountryAR=アルゼンチン
 CountryCM=カメルーン
@@ -69,7 +69,7 @@ CountryCF=中央アフリカ共和国
 CountryTD=チャド
 CountryCL=チリ
 CountryCX=クリスマス島
-CountryCC=ココス（キーリング）諸島
+CountryCC=ココス(キーリング)諸島
 CountryCO=コロンビア
 CountryKM=コモロ
 CountryCG=コンゴ
@@ -113,17 +113,17 @@ CountryGW=ギニアビサウ
 CountryGY=ガイアナ
 CountryHT=ハイチ
 CountryHM=ハード島とマクドナルド
-CountryVA=ローマ法王庁（バチカン市国）
+CountryVA=ローマ法王庁(バチカン市国)
 CountryHN=ホンジュラス
 CountryHK=香港
-CountryIS=Iceland
+CountryIS=アイスランド
 CountryIN=インド
 CountryID=インドネシア
 CountryIR=イラン
 CountryIQ=イラク
 CountryIL=イスラエル
 CountryJM=ジャマイカ
-CountryJP=日本の
+CountryJP=日本
 CountryJO=ヨルダン
 CountryKZ=カザフスタン
 CountryKE=ケニア
@@ -131,7 +131,7 @@ CountryKI=キリバス
 CountryKP=北朝鮮
 CountryKR=韓国
 CountryKW=クウェート
-CountryKG=Kyrgyzstan
+CountryKG=キルギス
 CountryLA=ラオ語
 CountryLV=ラトビア
 CountryLB=レバノン
@@ -147,7 +147,7 @@ CountryMG=マダガスカル
 CountryMW=マラウイ
 CountryMY=マレーシア
 CountryMV=モルディブ
-CountryML=庭師
+CountryML=マリ
 CountryMT=マルタ
 CountryMH=マーシャル諸島共和国
 CountryMQ=マルティニーク島
@@ -160,7 +160,7 @@ CountryMD=モルドバ
 CountryMN=モンゴル国
 CountryMS=モントセラト
 CountryMZ=モザンビーク
-CountryMM=Myanmar (Burma)
+CountryMM=ミャンマー (ビルマ)
 CountryNA=ナミビア
 CountryNR=ナウル
 CountryNP=ネパール
@@ -212,7 +212,7 @@ CountrySD=スーダン
 CountrySR=スリナム
 CountrySJ=スバールバル諸島ヤンマイエン島
 CountrySZ=スワジランド
-CountrySY=シリアの
+CountrySY=シリア
 CountryTW=台湾
 CountryTJ=タジキスタン
 CountryTZ=タンザニア
@@ -223,7 +223,7 @@ CountryTO=トンガ
 CountryTT=トリニダードトバゴ
 CountryTR=トルコ
 CountryTM=トルクメニスタン
-CountryTC=Turks and Caicos Islands
+CountryTC=タークス・カイコス諸島
 CountryTV=ツバル
 CountryUG=ウガンダ
 CountryUA=ウクライナ
@@ -250,24 +250,24 @@ CountryMF=サンマルタン島
 
 ##### Civilities #####
 CivilityMME=ミセス
-CivilityMR=氏
-CivilityMLE=さん
+CivilityMR=ミスター
+CivilityMLE=ミズ
 CivilityMTRE=マスタ
-CivilityDR=医師
+CivilityDR=ドクター
 ##### Currencies #####
 Currencyeuros=ユーロ
-CurrencyAUD=AUドル
-CurrencySingAUD=AUドル
-CurrencyCAD=ドルは、CAN
-CurrencySingCAD=ドルは、CAN
+CurrencyAUD=豪ドルs
+CurrencySingAUD=豪ドル
+CurrencyCAD=カナダドルs
+CurrencySingCAD=カナダドル
 CurrencyCHF=スイスフラン
 CurrencySingCHF=スイスフラン
 CurrencyEUR=ユーロ
 CurrencySingEUR=ユーロ
 CurrencyFRF=フランスのフラン
 CurrencySingFRF=フランスフラン
-CurrencyGBP=GBのポンド
-CurrencySingGBP=ギガバイトポンド
+CurrencyGBP=英ポンドs
+CurrencySingGBP=英ポンド
 CurrencyINR=インドルピー
 CurrencySingINR=インドルピー
 CurrencyMAD=ディルハム
@@ -276,12 +276,12 @@ CurrencyMGA=アリアリ
 CurrencySingMGA=アリアリ
 CurrencyMUR=モーリシャスルピー
 CurrencySingMUR=モーリシャスルピー
-CurrencyNOK=ノルウェークローネ
-CurrencySingNOK=Norwegian kronas
+CurrencyNOK=ノルウェークローネs
+CurrencySingNOK=ノルウェークローネ
 CurrencyTND=チュニジアディナール
 CurrencySingTND=チュニジアディナール
-CurrencyUSD=米ドル
-CurrencySingUSD=アメリカドル
+CurrencyUSD=米ドルs
+CurrencySingUSD=米ドル
 CurrencyUAH=グリブナ
 CurrencySingUAH=グリブナ
 CurrencyXAF=CFAフランBEAC
@@ -290,11 +290,11 @@ CurrencyXOF=CFAフランBCEAO
 CurrencySingXOF=CFAフランBCEAO
 CurrencyXPF=CFPフラン
 CurrencySingXPF=CFPフラン
-CurrencyCentEUR=cents
+CurrencyCentEUR=セントs
 CurrencyCentSingEUR=セント
 CurrencyCentINR=パイサ
-CurrencyCentSingINR=パイサ（複数）
-CurrencyThousandthSingTND=ミリーム
+CurrencyCentSingINR=パイサ(複数)
+CurrencyThousandthSingTND=千分の一
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=インターネット
 DemandReasonTypeSRC_CAMP_MAIL=メーリングキャンペーン
@@ -307,7 +307,7 @@ DemandReasonTypeSRC_WOM=口頭
 DemandReasonTypeSRC_PARTNER=パートナー
 DemandReasonTypeSRC_EMPLOYEE=従業員
 DemandReasonTypeSRC_SPONSORING=後援
-DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
+DemandReasonTypeSRC_SRC_CUSTOMER=顧客からのコンタクト
 #### Paper formats ####
 PaperFormatEU4A0=4A0 用紙
 PaperFormatEU2A0=2A0 用紙
@@ -329,9 +329,9 @@ PaperFormatCAP4=P4 カナダ用紙
 PaperFormatCAP5=P5 カナダ用紙
 PaperFormatCAP6=P6 カナダ用紙
 #### Expense report categories ####
-ExpAutoCat=Car
-ExpCycloCat=Moped
-ExpMotoCat=Motorbike
+ExpAutoCat=自動車
+ExpCycloCat=スクーター
+ExpMotoCat=オートバイ
 ExpAuto3CV=3 CV
 ExpAuto4CV=4 CV
 ExpAuto5CV=5 CV
@@ -353,7 +353,7 @@ 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
+ExpCyclo=最小容量は50cc
 ExpMoto12CV=Motorbike 1 or 2 CV
 ExpMoto345CV=Motorbike 3, 4 or 5 CV
 ExpMoto5PCV=Motorbike 5 CV and more
diff --git a/htdocs/langs/ja_JP/donations.lang b/htdocs/langs/ja_JP/donations.lang
index 6a498695940..e0b1a121335 100644
--- a/htdocs/langs/ja_JP/donations.lang
+++ b/htdocs/langs/ja_JP/donations.lang
@@ -4,7 +4,7 @@ Donations=寄付
 DonationRef=寄付参照
 Donor=ドナー
 AddDonation=寄付を作成する
-NewDonation=新しい寄付
+NewDonation=新規寄付
 DeleteADonation=寄付を削除する
 ConfirmDeleteADonation=この寄付を削除してもよいか？
 PublicDonation=義援金
diff --git a/htdocs/langs/ja_JP/ecm.lang b/htdocs/langs/ja_JP/ecm.lang
index db8e84a3e50..cd0cf844f89 100644
--- a/htdocs/langs/ja_JP/ecm.lang
+++ b/htdocs/langs/ja_JP/ecm.lang
@@ -15,7 +15,7 @@ ECMNbOfSubDir=サブディレクトリの数
 ECMNbOfFilesInSubDir=サブディレクトリ内のファイルの数
 ECMCreationUser=クリエイター
 ECMArea=DMS / ECMエリア
-ECMAreaDesc=DMS / ECM（ドキュメント管理システム/電子コンテンツ管理）エリアでは、Dolibarr内のあらゆる種類のドキュメントをすばやく保存、共有、検索できる。
+ECMAreaDesc=DMS / ECM(ドキュメント管理システム/電子コンテンツ管理)エリアでは、Dolibarr内のあらゆる種類のドキュメントをすばやく保存、共有、検索できる。
 ECMAreaDesc2=要素のカードからドキュメントを追加するときに*自動ディレクトリは自動的に入力される。 <br> *マニュアルのディレクトリは、特定の要素にリンクされていないドキュメントを保存するために使用することができる。
 ECMSectionWasRemoved=ディレクトリの<b>%sが</b>削除されている。
 ECMSectionWasCreated=ディレクトリ<b>%s</b>が作成された。
@@ -37,7 +37,7 @@ DirNotSynchronizedSyncFirst=このディレクトリは、ECMモジュールの
 ReSyncListOfDir=ディレクトリのリストを再同期する
 HashOfFileContent=ファイルコンテンツのハッシュ
 NoDirectoriesFound=ディレクトリが見つからない
-FileNotYetIndexedInDatabase=ファイルはまだデータベースにインデックス付けされていない（再アップロードしてみること）
+FileNotYetIndexedInDatabase=ファイルはまだデータベースにインデックス付けされていない(再アップロードしてみること)
 ExtraFieldsEcmFiles=ExtrafieldsEcmファイル
 ExtraFieldsEcmDirectories=ExtrafieldsEcmディレクトリ
 ECMSetup=ECMセットアップ
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index 60df8eba840..40d07d1e85b 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -5,9 +5,10 @@ NoErrorCommitIsDone=エラーなし、コミットする
 # Errors
 ErrorButCommitIsDone=エラーが見つかったが、これにもかかわらず検証する
 ErrorBadEMail=メール%sが間違っている
-ErrorBadMXDomain=メール%sが間違っているようだ（ドメインに有効なMXレコードがない）
+ErrorBadMXDomain=メール%sが間違っているようだ(ドメインに有効なMXレコードがない)
 ErrorBadUrl=URLの%sが間違っている
 ErrorBadValueForParamNotAString=パラメータ の値が正しくない。通常、翻訳が欠落している場合に追加される。
+ErrorRefAlreadyExists=参照<b>%s</b>はすでに存在する。
 ErrorLoginAlreadyExists=ログイン%sはすでに存在している。
 ErrorGroupAlreadyExists=グループ%sはすでに存在している。
 ErrorRecordNotFound=レコードが見つからなかった。
@@ -39,21 +40,22 @@ ErrorSupplierCodeAlreadyUsed=すでに使用されているベンダーコード
 ErrorBadParameters=パラメータ が不正で
 ErrorWrongParameters=パラメータ が間違っているか欠落している
 ErrorBadValueForParameter=パラメータ  "%s" の値 "%s" が間違っている
-ErrorBadImageFormat=画像ファイルはサポートされている形式ではない（PHPはこの形式の画像を変換する関数をサポートしていない）
+ErrorBadImageFormat=画像ファイルはサポートされている形式ではない(PHPはこの形式の画像を変換する関数をサポートしていない)
 ErrorBadDateFormat=値 '%s'に間違った日付の形式になっている
 ErrorWrongDate=日付が正しくない！
 ErrorFailedToWriteInDir=ディレクトリ%sの書き込みに失敗した
-ErrorFoundBadEmailInFile=ファイル内の%s線の発見誤った電子メールのシンタックス（電子メール= %sを使用したサンプルライン%s）
+ErrorFoundBadEmailInFile=ファイル内の%s線の発見誤った電子メールのシンタックス(電子メール= %sを使用したサンプルライン%s)
 ErrorUserCannotBeDelete=ユーザーを削除することはできない。多分それはDolibarrエンティティに関連付けられている。
 ErrorFieldsRequired=いくつかの必須フィールドが満たされていなかった。
 ErrorSubjectIsRequired=メールトピックが必要だ
-ErrorFailedToCreateDir=ディレクトリの作成に失敗した。そのWebサーバのユーザがDolibarrのドキュメントディレクトリに書き込む権限を持って確認すること。パラメータ の<b>safe_modeが</b>このPHPが有効になっている場合、Dolibarr PHPファイルは、Webサーバーのユーザー（またはグループ）に所有していることを確認すること。
+ErrorFailedToCreateDir=ディレクトリの作成に失敗した。そのWebサーバのユーザがDolibarrのドキュメントディレクトリに書き込む権限を持って確認すること。パラメータ の<b>safe_modeが</b>このPHPが有効になっている場合、Dolibarr PHPファイルは、Webサーバーのユーザー(またはグループ)に所有していることを確認すること。
 ErrorNoMailDefinedForThisUser=このユーザーに定義されたメールはない
+ErrorSetupOfEmailsNotComplete=メールの設定が完了していない
 ErrorFeatureNeedJavascript=この機能が動作するようにアクティブにするjavascriptをする必要がある。セットアップでこれを変更 - 表示される。
 ErrorTopMenuMustHaveAParentWithId0=タイプは 'top'のメニューが親メニューを持つことはできない。親メニューに0を置くか、または型 &quot;左&quot;のメニューを選択する。
 ErrorLeftMenuMustHaveAParentId=タイプ &quot;左&quot;のメニューは、親IDを持つ必要がある。
-ErrorFileNotFound=ファイルが見つかりませんでし<b>%s（PHP</b> openbasedirまたはセーフモードパラメータ によって拒否された不正なパスが、間違ったパーミッションやアクセス）
-ErrorDirNotFound=ディレクトリが見つかりません<b>%s（PHP</b> openbasedirまたはセーフモードパラメータ によって拒否された不正なパスが、間違ったパーミッションやアクセス）
+ErrorFileNotFound=ファイルが見つかりませんでし<b>%s(PHP</b> openbasedirまたはセーフモードパラメータ によって拒否された不正なパスが、間違ったパーミッションやアクセス)
+ErrorDirNotFound=ディレクトリが見つかりません<b>%s(PHP</b> openbasedirまたはセーフモードパラメータ によって拒否された不正なパスが、間違ったパーミッションやアクセス)
 ErrorFunctionNotAvailableInPHP=関数<b>%sは、</b>この機能を使用するために必要となるが、このバージョンの/ PHPのセットアップでは使用できない。
 ErrorDirAlreadyExists=この名前のディレクトリがすでに存在している。
 ErrorFileAlreadyExists=この名前を持つファイルがすでに存在している。
@@ -62,8 +64,8 @@ ErrorNoTmpDir=一時的なdirectyの%sが存在しません。
 ErrorUploadBlockedByAddon=PHP / Apacheプラグインによってブロックされてアップロードする。
 ErrorFileSizeTooLarge=ファイルサイズが大きすぎる。
 ErrorFieldTooLong=フィールド%sが長すぎる。
-ErrorSizeTooLongForIntType=（%s桁の最大値）int型に対して長すぎるサイズ
-ErrorSizeTooLongForVarcharType=文字列型（%s文字最大）長すぎるサイズ
+ErrorSizeTooLongForIntType=(%s桁の最大値)int型に対して長すぎるサイズ
+ErrorSizeTooLongForVarcharType=文字列型(%s文字最大)長すぎるサイズ
 ErrorNoValueForSelectType=選択リストの値を入力すること
 ErrorNoValueForCheckBoxType=チェックボックスリストの値を入力すること
 ErrorNoValueForRadioType=ラジオリストの値を入力すること
@@ -76,8 +78,8 @@ ErrorExportDuplicateProfil=このプロファイル名は、このエクスポ
 ErrorLDAPSetupNotComplete=Dolibarr-LDAPのマッチングは完全ではない。
 ErrorLDAPMakeManualTest=.ldifファイルは、ディレクトリ%sで生成された。エラーの詳細情報を持つようにコマンドラインから手動でそれをロードしようとする。
 ErrorCantSaveADoneUserWithZeroPercentage= "doneby" フィールドも入力されている場合、 "statusnotstarted" のアクションを保存できない。
-ErrorRefAlreadyExists=作成に使用refは、すでに存在している。
-ErrorPleaseTypeBankTransactionReportName=エントリを報告する必要のある銀行取引明細書名を入力すること（フォーマットYYYYMMまたはYYYYMMDD）
+ErrorRefAlreadyExists=参照<b>%s</b>はすでに存在する。
+ErrorPleaseTypeBankTransactionReportName=エントリを報告する必要のある銀行取引明細書名を入力すること(フォーマットYYYYMMまたはYYYYMMDD)
 ErrorRecordHasChildren=子レコードがいくつかあるため、レコードの削除に失敗した。
 ErrorRecordHasAtLeastOneChildOfType=オブジェクトには、タイプ%sの子が少なくとも1つある
 ErrorRecordIsUsedCantDelete=レコードを削除できない。すでに使用されているか、別のオブジェクトに含まれている。
@@ -88,9 +90,9 @@ ErrorWrongValueForField=フィールド<b>%s </b>： '<b> %s </b>' は、正規
 ErrorFieldValueNotIn=フィールド<b> %s </b>： '<b> %s </b>' が値が<b> %s </b> <b> %s </b>の分野では見られません
 ErrorFieldRefNotIn=フィールド<b>%s </b>： '<b> %s</b>' は存在する <b>%s</b> 参照ではない
 ErrorsOnXLines=%sエラーが見つかった
-ErrorFileIsInfectedWithAVirus=ウイルス対策プログラムがファイルを検証することができなかった（ファイルがウイルスに感染されるかもしれない）
+ErrorFileIsInfectedWithAVirus=ウイルス対策プログラムがファイルを検証することができなかった(ファイルがウイルスに感染されるかもしれない)
 ErrorSpecialCharNotAllowedForField=特殊文字は、フィールド &quot;%s&quot;に許可されていない
-ErrorNumRefModel=参照は、データベース（%s）に存在し、この番号規則と互換性がない。レコードを削除するか、このモジュールを有効にするために参照を変更した。
+ErrorNumRefModel=参照は、データベース(%s)に存在し、この番号規則と互換性がない。レコードを削除するか、このモジュールを有効にするために参照を変更した。
 ErrorQtyTooLowForThisSupplier=このベンダーの数量が少なすぎるか、このベンダーのこの製品に価格が定義されていない
 ErrorOrdersNotCreatedQtyTooLow=数量が少なすぎるため、一部の注文が作成されていない
 ErrorModuleSetupNotComplete=モジュール%sのセットアップが完了していないようだ。ホーム-セットアップ-モジュールに移動して完了する。
@@ -106,7 +108,7 @@ ErrorFailedToSendPassword=パスワードの送信に失敗した
 ErrorFailedToLoadRSSFile=RSSフィードの取得に失敗した。エラーメッセージが十分な情報を提供していない場合は定数MAIN_SIMPLEXMLLOAD_DEBUGを追加しようとする。
 ErrorForbidden=アクセスが拒否された。 <br>無効にされたモジュールのページ、領域、または機能にアクセスしようとしたか、認証されたセッションに参加していないか、ユーザーに許可されていない。
 ErrorForbidden2=このログインの許可は、メニュー%s  - &gt; %sからDolibarr管理者によって定義することができる。
-ErrorForbidden3=そのDolibarrが認証セッションを介して使用されていないようだ。認証を（htaccessファイルは、mod_authまたは他の...）を管理する方法を知ってDolibarrセットアップドキュメントを見てみよう。
+ErrorForbidden3=そのDolibarrが認証セッションを介して使用されていないようだ。認証を(htaccessファイルは、mod_authまたは他の...)を管理する方法を知ってDolibarrセットアップドキュメントを見てみよう。
 ErrorNoImagickReadimage=クラスImagickが、このPHPで発見さ​​れていない。なしプレビューは利用できない。管理者は、メニューのSetupから、このタブを無効にすることができる - 表示する。
 ErrorRecordAlreadyExists=レコードがすでに存在している
 ErrorLabelAlreadyExists=このラベルはすでに存在する
@@ -118,10 +120,10 @@ ErrorFailedToRunExternalCommand=外部コマンドの実行に失敗した。そ
 ErrorFailedToChangePassword=パスワードの変更に失敗した
 ErrorLoginDoesNotExists=ログイン<b>%s</b>を持つユーザーを見つけることができなかった。
 ErrorLoginHasNoEmail=このユーザーは電子メールアドレスを持っていない。プロセスが中止された。
-ErrorBadValueForCode=セキュリティコードの値が正しくない。新しい値で再試行すること...
+ErrorBadValueForCode=セキュリティコードの値が正しくない。新規値で再試行すること...
 ErrorBothFieldCantBeNegative=フィールド%s %sとは負の両方にすることはできない
-ErrorFieldCantBeNegativeOnInvoice=このタイプの請求書では、フィールド<strong> %s</strong>を負にすることはできない。割引ラインを追加する必要がある場合は、最初に割引を作成し（サードパーティカードのフィールド '%s'から）、それを請求書に適用する。
-ErrorLinesCantBeNegativeForOneVATRate=行の合計（税控除後）は、特定のnull以外のVAT率に対して負になることはできない（VAT率<b> %s </b> %%の負の合計が見つかった）。
+ErrorFieldCantBeNegativeOnInvoice=このタイプの請求書では、フィールド<strong> %s</strong>を負にすることはできない。割引ラインを追加する必要がある場合は、最初に割引を作成し(サードパーティカードのフィールド '%s'から)、それを請求書に適用する。
+ErrorLinesCantBeNegativeForOneVATRate=行の合計(税控除後)は、特定のnull以外のVAT率に対して負になることはできない(VAT率<b> %s </b> %%の負の合計が見つかった)。
 ErrorLinesCantBeNegativeOnDeposits=預金でラインがマイナスになることはない。あなたがそうするならば、あなたが最終的な請求書で預金を消費する必要があるとき、あなたは問題に直面するだろう。
 ErrorQtyForCustomerInvoiceCantBeNegative=顧客の請求書への明細の数量をマイナスにすることはできない
 ErrorWebServerUserHasNotPermission=Webサーバを実行するユーザーアカウントを使用<b>%s</b>そのための権限を持っていない
@@ -133,9 +135,9 @@ ErrorModuleFileRequired=Dolibarrモジュールパッケージファイルを選
 ErrorPhpCurlNotInstalled=PHPCURLがインストールされていない。これはPaypalと話すために不可欠だ。
 ErrorFailedToAddToMailmanList=レコード%sをMailmanリスト%sまたはSPIPベースに追加できなかった
 ErrorFailedToRemoveToMailmanList=レコード%sをMailmanリスト%sまたはSPIPベースに削除できなかった
-ErrorNewValueCantMatchOldValue=新しい値を古い値と等しくすることはできない
-ErrorFailedToValidatePasswordReset=パスワードの再初期化に失敗した。 reinitがすでに実行されている可能性がある（このリンクは1回しか使用できない）。そうでない場合は、再初期化プロセスを再開してみること。
-ErrorToConnectToMysqlCheckInstance=データベースへの接続に失敗。データベースサーバーが実行されていることを確認する（たとえば、mysql/mariadb なら、コマンドラインから "sudo service mysql start" を使用して起動できる）。
+ErrorNewValueCantMatchOldValue=新規値を古い値と等しくすることはできない
+ErrorFailedToValidatePasswordReset=パスワードの再初期化に失敗した。 reinitがすでに実行されている可能性がある(このリンクは1回しか使用できない)。そうでない場合は、再初期化プロセスを再開してみること。
+ErrorToConnectToMysqlCheckInstance=データベースへの接続に失敗。データベースサーバーが実行されていることを確認する(たとえば、mysql/mariadb なら、コマンドラインから "sudo service mysql start" を使用して起動できる)。
 ErrorFailedToAddContact=連絡先の追加に失敗した
 ErrorDateMustBeBeforeToday=日付は今日よりも低くする必要がある
 ErrorDateMustBeInFuture=日付は今日より大きくなければならない
@@ -144,7 +146,7 @@ ErrorPHPNeedModule=エラー、この機能を使用するには、PHPにモジ
 ErrorOpenIDSetupNotComplete=OpenID認証を許可するようにDolibarr構成ファイルを設定したが、OpenIDサービスのURLが定数%sに定義されていない
 ErrorWarehouseMustDiffers=ソースウェアハウスとターゲットウェアハウスは異なる必要がある
 ErrorBadFormat=悪いフォーマット！
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=エラー、このメンバーはまだサードパーティにリンクされていない。請求書付きのサブスクリプションを作成する前に、メンバーを既存のサードパーティにリンクするか、新しいサードパーティを作成すること。
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=エラー、このメンバーはまだサードパーティにリンクされていない。請求書付きのサブスクリプションを作成する前に、メンバーを既存のサードパーティにリンクするか、新規サードパーティを作成すること。
 ErrorThereIsSomeDeliveries=エラー、この出荷に関連するいくつかの配送がある。削除は拒否された。
 ErrorCantDeletePaymentReconciliated=調整された銀行エントリを生成した支払いを削除できない
 ErrorCantDeletePaymentSharedWithPayedInvoice=ステータスがPaidの少なくとも1つの請求書で共有されている支払いを削除できない
@@ -153,7 +155,7 @@ ErrorPriceExpression2=組み込み関数 '%s'を再定義できない
 ErrorPriceExpression3=関数定義の未定義変数 '%s'
 ErrorPriceExpression4=不正な文字 '%s'
 ErrorPriceExpression5=予期しない '%s'
-ErrorPriceExpression6=引数の数が間違っている（%sが指定され、%sが予期されている）
+ErrorPriceExpression6=引数の数が間違っている(%sが指定され、%sが予期されている)
 ErrorPriceExpression8=予期しない演算子 '%s'
 ErrorPriceExpression9=予期しないエラーが発生した
 ErrorPriceExpression10=演算子 '%s'にオペランドがない
@@ -170,8 +172,8 @@ ErrorPriceExpressionInternal=内部エラー '%s'
 ErrorPriceExpressionUnknown=不明なエラー '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=ソースウェアハウスとターゲットウェアハウスは異なる必要がある
 ErrorTryToMakeMoveOnProductRequiringBatchData=ロット/シリアル情報を必要とする製品 '%s'で、ロット/シリアル情報なしで在庫移動を行おうとするとエラーが発生した
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=記録されたすべての受信は、このアクションを実行する前に、まず確認（承認または拒否）する必要がある
-ErrorCantSetReceptionToTotalDoneWithReceptionDenied=このアクションを実行する前に、記録されたすべての受信を最初に確認（承認）する必要がある
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=記録されたすべての受信は、このアクションを実行する前に、まず確認(承認または拒否)する必要がある
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=このアクションを実行する前に、記録されたすべての受信を最初に確認(承認)する必要がある
 ErrorGlobalVariableUpdater0=HTTPリクエストがエラー "%s" で失敗した
 ErrorGlobalVariableUpdater1=無効なJSON形式 '%s'
 ErrorGlobalVariableUpdater2=パラメータ  '%s'がない
@@ -182,34 +184,34 @@ ErrorFieldMustBeANumeric=フィールド<b>%s</b>は数値である必要があ
 ErrorMandatoryParametersNotProvided=必須パラメータ (s)が提供されていない
 ErrorOppStatusRequiredIfAmount=このリードの見積もり金額を設定する。したがって、そのステータスも入力する必要がある。
 ErrorFailedToLoadModuleDescriptorForXXX=%sのモジュール記述子クラスのロードに失敗した
-ErrorBadDefinitionOfMenuArrayInModuleDescriptor=モジュール記述子のメニュー配列の定義が正しくない（キーfk_menuの値が正しくない）
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=モジュール記述子のメニュー配列の定義が正しくない(キーfk_menuの値が正しくない)
 ErrorSavingChanges=変更を保存するときにエラーが発生した
 ErrorWarehouseRequiredIntoShipmentLine=出荷するラインには倉庫が必要だ
 ErrorFileMustHaveFormat=ファイルの形式は%sである必要がある
 ErrorFilenameCantStartWithDot=ファイル名を "。" で始めることはできない。
 ErrorSupplierCountryIsNotDefined=このベンダーの国は定義されていない。最初にこれを修正すること。
 ErrorsThirdpartyMerge=2つのレコードのマージに失敗した。リクエストはキャンセルされた。
-ErrorStockIsNotEnoughToAddProductOnOrder=製品%sが新しい注文に追加するには、在庫が十分ではない。
-ErrorStockIsNotEnoughToAddProductOnInvoice=製品%sが新しい請求書に追加するには、在庫が十分ではない。
-ErrorStockIsNotEnoughToAddProductOnShipment=製品%sが新しい出荷に追加するには、在庫が十分ではない。
-ErrorStockIsNotEnoughToAddProductOnProposal=製品%sが新しい提案に追加するには、在庫が十分ではない。
+ErrorStockIsNotEnoughToAddProductOnOrder=製品%sが新規注文に追加するには、在庫が十分ではない。
+ErrorStockIsNotEnoughToAddProductOnInvoice=製品%sが新規請求書に追加するには、在庫が十分ではない。
+ErrorStockIsNotEnoughToAddProductOnShipment=製品%sが新規出荷に追加するには、在庫が十分ではない。
+ErrorStockIsNotEnoughToAddProductOnProposal=製品%sが新規提案に追加するには、在庫が十分ではない。
 ErrorFailedToLoadLoginFileForMode=モード "%s" のログインキーの取得に失敗した。
 ErrorModuleNotFound=モジュールのファイルが見つからなかった。
-ErrorFieldAccountNotDefinedForBankLine=ソース行ID%s（%s）に対してアカウンティングアカウントの値が定義されていない
-ErrorFieldAccountNotDefinedForInvoiceLine=請求書ID%s（%s）に定義されていない会計勘定の値
-ErrorFieldAccountNotDefinedForLine=行に定義されていない会計勘定の値（%s）
+ErrorFieldAccountNotDefinedForBankLine=ソース行ID%s(%s)に対してアカウンティングアカウントの値が定義されていない
+ErrorFieldAccountNotDefinedForInvoiceLine=請求書ID%s(%s)に定義されていない会計勘定の値
+ErrorFieldAccountNotDefinedForLine=行に定義されていない会計勘定の値(%s)
 ErrorBankStatementNameMustFollowRegex=エラー、銀行取引明細書名は次の構文規則に従う必要がある%s
 ErrorPhpMailDelivery=使用する受信者の数が多すぎないこと、および電子メールの内容がスパムに類似していないことを確認すること。詳細については、ファイアウォールとサーバーのログファイルを確認するように管理者に依頼すること。
 ErrorUserNotAssignedToTask=消費時間を入力できるようにするには、ユーザーをタスクに割り当てる必要がある。
 ErrorTaskAlreadyAssigned=すでにユーザーに割り当てられているタスク
 ErrorModuleFileSeemsToHaveAWrongFormat=モジュールパッケージの形式が間違っているようだ。
 ErrorModuleFileSeemsToHaveAWrongFormat2=モジュールのzipには、少なくとも1つの必須ディレクトリが存在する必要がある：<strong> %s</strong>または<strong>%s </strong>
-ErrorFilenameDosNotMatchDolibarrPackageRules=モジュールパッケージの名前（<strong> %s </strong>）が予期される名前の構文と一致しません：<strong> %s </strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=モジュールパッケージの名前(<strong> %s </strong>)が予期される名前の構文と一致しません：<strong> %s </strong>
 ErrorDuplicateTrigger=エラー、トリガー名%sが重複している。すでに%sからロードされている。
 ErrorNoWarehouseDefined=エラー、倉庫が定義されていない。
 ErrorBadLinkSourceSetButBadValueForRef=使用しているリンクは無効だ。支払いの "ソース" が定義されているが、 "ref" の値が無効だ。
 ErrorTooManyErrorsProcessStopped=エラーが多すぎる。プロセスが停止した。
-ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=このアクションで在庫を増減するオプションが設定されている場合、一括検証はできない（増加/減少する倉庫を定義できるように、1つずつ検証する必要がある）
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=このアクションで在庫を増減するオプションが設定されている場合、一括検証はできない(増加/減少する倉庫を定義できるように、1つずつ検証する必要がある)
 ErrorObjectMustHaveStatusDraftToBeValidated=オブジェクト%sを検証するには、ステータスが "ドラフト" である必要がある。
 ErrorObjectMustHaveLinesToBeValidated=オブジェクト%sには、検証する行が必要だ。
 ErrorOnlyInvoiceValidatedCanBeSentInMassAction= "電子メールで送信" 一括アクションを使用して送信できるのは、検証済みの請求書のみだ。
@@ -217,14 +219,14 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=記事が事前定義された製
 ErrorDiscountLargerThanRemainToPaySplitItBefore=あなたが適用しようとする割引は、支払うべき残りよりも大きいだ。前に割引を2つの小さな割引に分割する。
 ErrorFileNotFoundWithSharedLink=ファイルが見つからなかった。共有キーが変更されたか、ファイルが最近削除された可能性がある。
 ErrorProductBarCodeAlreadyExists=製品バーコード%sは、別の製品リファレンスにすでに存在する。
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=少なくとも1つのサブ製品（またはサブ製品のサブ製品）にシリアル番号/ロット番号が必要な場合、キットを使用してサブ製品を自動的に増減させることはできないことにも注意すること。
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=少なくとも1つのサブ製品(またはサブ製品のサブ製品)にシリアル番号/ロット番号が必要な場合、キットを使用してサブ製品を自動的に増減させることはできないことにも注意すること。
 ErrorDescRequiredForFreeProductLines=無料の製品を含むラインには説明が必須だ
 ErrorAPageWithThisNameOrAliasAlreadyExists=ページ/コンテナ<strong>%s </strong>は、使用しようとしているものと同じ名前または代替エイリアスを持っている
 ErrorDuringChartLoad=勘定科目表の読み込み中にエラーが発生した。ロードされていないアカウントが少ない場合でも、手動で入力できる。
 ErrorBadSyntaxForParamKeyForContent=paramkeyforcontentの構文が正しくない。 %sまたは%sで始まる値が必要だ
-ErrorVariableKeyForContentMustBeSet=エラー、名前%s（表示するテキストコンテンツ付き）または%s（表示する外部URL付き）の定数を設定する必要がある。
+ErrorVariableKeyForContentMustBeSet=エラー、名前%s(表示するテキストコンテンツ付き)または%s(表示する外部URL付き)の定数を設定する必要がある。
 ErrorURLMustStartWithHttp=URL %sは http:// または https:// で始まる必要がある
-ErrorNewRefIsAlreadyUsed=エラー、新しい参照はすでに使用されている
+ErrorNewRefIsAlreadyUsed=エラー、新規参照はすでに使用されている
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=エラー、クローズされた請求書にリンクされた支払いを削除することはできない。
 ErrorSearchCriteriaTooSmall=検索条件が小さすぎる。
 ErrorObjectMustHaveStatusActiveToBeDisabled=無効にするには、オブジェクトのステータスが "アクティブ" である必要がある
@@ -238,35 +240,43 @@ ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=エラー、ページを
 ErrorLanguageOfTranslatedPageIsSameThanThisPage=エラー、翻訳されたページの言語はこれと同じだ。
 ErrorBatchNoFoundForProductInWarehouse=倉庫 "%s" に製品 "%s" のロット/シリアルが見つかりません。
 ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=倉庫 "%s" の製品 "%s" のこのロット/シリアルに十分な数量がない。
-ErrorOnlyOneFieldForGroupByIsPossible='Group by'のフィールドは1つだけ可能だ（他のフィールドは破棄される）
-ErrorTooManyDifferentValueForSelectedGroupBy=フィールド '<b> %s </b>'に異なる値（<b> %s </b>以上）が多すぎるため、 それを図形に対する ' Group by ' として使用することはできない。フィールド "Group By" は削除された。 X軸として使用したかったのか？
+ErrorOnlyOneFieldForGroupByIsPossible='Group by'のフィールドは1つだけ可能だ(他のフィールドは破棄される)
+ErrorTooManyDifferentValueForSelectedGroupBy=フィールド '<b> %s </b>'に異なる値(<b> %s </b>以上)が多すぎるため、 それを図形に対する ' Group by ' として使用することはできない。フィールド "Group By" は削除された。 X軸として使用したかったのか？
 ErrorReplaceStringEmpty=エラー、置き換える文字列が空だ
 ErrorProductNeedBatchNumber=エラー、製品 '<b> %s</b>'にはロット/シリアル番号が必要だ
 ErrorProductDoesNotNeedBatchNumber=エラー、製品 '<b> %s</b>'はロット/シリアル番号を受け入れません
 ErrorFailedToReadObject=エラー、タイプ<b> %s</b>のオブジェクトの読み取りに失敗した
 ErrorParameterMustBeEnabledToAllwoThisFeature=エラー、パラメータ <b> %s </b>を<b>conf / conf.php <b>で有効にして、内部ジョブスケジューラでコマンドラインインターフェイスを使用できるようにする必要がある
 ErrorLoginDateValidity=エラー、このログインは有効期間外だ
+ErrorValueLength=フィールドの長さ '<b> %s </b>'は '<b> %s</b>'より大きくなければならない
+ErrorReservedKeyword=「<b>%s</b>」という単語は予約語 
+ErrorNotAvailableWithThisDistribution=このディストリビューションでは利用できない
+ErrorPublicInterfaceNotEnabled=パブリックインターフェイスが有効になっていない
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=別のページの翻訳として設定されている場合は、新しいページの言語を定義する必要がある
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=新しいページの言語は、別ページの翻訳として設定されている場合、ソース言語にしないこと
+ErrorAParameterIsRequiredForThisOperation=この操作にはパラメーターが必須です
+
 # Warnings
-WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHPパラメータ upload_max_filesize（%s）は、PHPパラメータ post_max_size（%s）よりも大きくなっている。これは一貫した設定ではない。
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHPパラメータ upload_max_filesize(%s)は、PHPパラメータ post_max_size(%s)よりも大きくなっている。これは一貫した設定ではない。
 WarningPasswordSetWithNoAccount=このメンバーにパスワードが設定された。ただし、ユーザーアカウントは作成されなかった。したがって、このパスワードは保存されるが、Dolibarrへのログインには使用できない。外部モジュール/インターフェースで使用できるが、メンバーのログインやパスワードを定義する必要がない場合は、メンバーモジュールの設定から "各メンバーのログインを管理する" オプションを無効にすることができる。ログインを管理する必要があるがパスワードは必要ない場合は、このフィールドを空のままにして、この警告を回避できる。注：メンバーがユーザーにリンクされている場合は、電子メールをログインとして使用することもできる。
 WarningMandatorySetupNotComplete=必須パラメータ を設定するには、ここをクリックすること
 WarningEnableYourModulesApplications=モジュールとアプリケーションを有効にするには、ここをクリックすること
 WarningSafeModeOnCheckExecDir=警告、PHPのオプション<b>セーフモードは、PHP</b>のパラメータ <b>safe_mode_exec_dirの</b>宣言されたディレクトリ内に格納する必要があるので、コマンドにある。
-WarningBookmarkAlreadyExists=この職種またはこのターゲットを使用して、ブックマーク（URL）がすでに存在している。
+WarningBookmarkAlreadyExists=この職種またはこのターゲットを使用して、ブックマーク(URL)がすでに存在している。
 WarningPassIsEmpty=警告は、データベースのパスワードは空だ。これはセキュリティホールだ。あなたのデータベースにパスワードを追加し、これを反映するようにconf.phpファイルを変更する必要がある。
 WarningConfFileMustBeReadOnly=警告、設定ファイル (<b>htdocs/conf/conf.php</b>) はWebサーバーによって上書きされうる。これは重大なセキュリティホールだ。 Webサーバーで使用されるオペレーティング·システム·ユーザーのために読み取り専用モードになるようにファイルのパーミッションを変更すること。あなたのディスクにWindowsとFATフォーマットを使用すると、このファイルシステムはファイルのパーミッションを追加することはできず、完全な安全を得られないことを知っている必要がある。
 WarningsOnXLines=<b>%s</b>ソース行に関する警告
 WarningNoDocumentModelActivated=ドキュメント生成用のモデルはアクティブ化されていない。モジュールの設定を確認するまで、デフォルトでモデルが選択される。
 WarningLockFileDoesNotExists=警告、セットアップが完了したら、ファイル<b> install.lock</b>をディレクトリ<b>%s </b>に追加して、インストール/移行ツールを無効にする必要がある。このファイルの作成を省略すると、重大なセキュリティリスクが発生する。
-WarningUntilDirRemoved=すべてのセキュリティ警告（管理者ユーザーのみに表示）は、脆弱性が存在する限り（または、 設定 -> その他の設定 で定数 MAIN_REMOVE_INSTALL_WARNING が追加されている限り）アクティブなままだ。
+WarningUntilDirRemoved=すべてのセキュリティ警告(管理者ユーザーのみに表示)は、脆弱性が存在する限り(または、 設定 -> その他の設定 で定数 MAIN_REMOVE_INSTALL_WARNING が追加されている限り)アクティブなままだ。
 WarningCloseAlways=警告、ソース要素とターゲット要素の間で量が異なっていても、クローズは行われる。この機能は注意して有効にすること。
 WarningUsingThisBoxSlowDown=警告、このボックスを使用すると、ボックスを表示しているすべてのページの速度が大幅に低下する。
-WarningClickToDialUserSetupNotComplete=ユーザーのClickToDial情報の設定が完了していない（ユーザーカードのClickToDialタブを参照）。
+WarningClickToDialUserSetupNotComplete=ユーザーのClickToDial情報の設定が完了していない(ユーザーカードのClickToDialタブを参照)。
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=表示設定が視覚障害者またはテキストブラウザ用に最適化されている場合、機能は無効になる。
-WarningPaymentDateLowerThanInvoiceDate=請求書%sの支払い日（%s）が請求日（%s）よりも前だ。
-WarningTooManyDataPleaseUseMoreFilters=データが多すぎる（%s行を超えている）。より多くのフィルターを使用するか、定数%sをより高い制限に設定すること。
+WarningPaymentDateLowerThanInvoiceDate=請求書%sの支払い日(%s)が請求日(%s)よりも前だ。
+WarningTooManyDataPleaseUseMoreFilters=データが多すぎる(%s行を超えている)。より多くのフィルタを使用するか、定数%sをより高い制限に設定すること。
 WarningSomeLinesWithNullHourlyRate=時間料金が定義されていないときに、一部のユーザーによって記録された時間もある。 1時間あたり0%sの値が使用されたが、これにより、費やされた時間の誤った評価が発生する可能性がある。
-WarningYourLoginWasModifiedPleaseLogin=ログインが変更された。セキュリティ上の理由から、次のアクションの前に新しいログインでログインする必要がある。
+WarningYourLoginWasModifiedPleaseLogin=ログインが変更された。セキュリティ上の理由から、次のアクションの前に新規ログインでログインする必要がある。
 WarningAnEntryAlreadyExistForTransKey=この言語の翻訳キーのエントリはすでに存在する
 WarningNumberOfRecipientIsRestrictedInMassAction=警告、リストで一括アクションを使用する場合、異なる受信者の数は<b> %s</b>に制限される
 WarningDateOfLineMustBeInExpenseReportRange=警告、行の日付が経費報告書の範囲内にない
@@ -276,3 +286,4 @@ WarningSomeBankTransactionByChequeWereRemovedAfter=一部の銀行取引は、
 WarningFailedToAddFileIntoDatabaseIndex=警告、ECMデータベースインデックステーブルにファイルエントリを追加できなかった
 WarningTheHiddenOptionIsOn=警告、非表示のオプション<b> %s</b>がオンになっている。
 WarningCreateSubAccounts=警告、サブアカウントを直接作成することはできない。このリストでそれらを見つけるには、サードパーティまたはユーザーを作成し、それらにアカウンティングコードを割り当てる必要がある
+WarningAvailableOnlyForHTTPSServers=HTTPSで保護された接続を使用している場合にのみ使用できます。
diff --git a/htdocs/langs/ja_JP/exports.lang b/htdocs/langs/ja_JP/exports.lang
index 1aefed12ba1..07f956fe22d 100644
--- a/htdocs/langs/ja_JP/exports.lang
+++ b/htdocs/langs/ja_JP/exports.lang
@@ -10,8 +10,8 @@ SelectImportDataSet=インポートしたいデータを選択...
 SelectExportFields=エクスポートするフィールドを選択するか、事前定義されたエクスポートプロファイルを選択する
 SelectImportFields=アンカー%sを使用して上下に移動することにより、インポートするソースファイルフィールドとデータベース内のそれらのターゲットフィールドを選択するか、事前定義されたインポートプロファイルを選択する。
 NotImportedFields=ソースファイルのフィールドがインポートされない
-SaveExportModel=選択内容をエクスポートプロファイル/テンプレートとして保存する（再利用用）。
-SaveImportModel=このインポートプロファイルを（再利用のために）保存する...
+SaveExportModel=選択内容をエクスポートプロファイル/テンプレートとして保存する(再利用用)。
+SaveImportModel=このインポートプロファイルを(再利用のために)保存する...
 ExportModelName=プロファイル名をエクスポートする
 ExportModelSaved=<b> %s</b>として保存されたエクスポートプロファイル。
 ExportableFields=エクスポート可能なフィールド
@@ -37,7 +37,7 @@ FormatedExportDesc1=これらのツールを使用すると、アシスタント
 FormatedExportDesc2=最初のステップは、事前定義されたデータセットを選択し、次にエクスポートするフィールドとその順序を選択すること 。
 FormatedExportDesc3=エクスポートするデータを選択すると、出力ファイルの形式を選択できる。
 Sheet=シート
-NoImportableData=いいえインポート可能なデータがない（データのインポートを可能にするための定義としないモジュール）
+NoImportableData=いいえインポート可能なデータがない(データのインポートを可能にするための定義としないモジュール)
 FileSuccessfullyBuilt=生成されたファイル
 SQLUsedForExport=データの抽出に使用されるSQLリクエスト
 LineId=行のid
@@ -49,16 +49,16 @@ LineQty=線の量
 LineTotalHT=除く金額ラインの税金
 LineTotalTTC=ラインのための税の額
 LineTotalVAT=ラインの付加価値税の額
-TypeOfLineServiceOrProduct=回線の種類（0 =製品、1 =サービス）
+TypeOfLineServiceOrProduct=回線の種類(0 =製品、1 =サービス)
 FileWithDataToImport=インポートするデータを持つファイル
 FileToImport=インポートするソースファイル
 FileMustHaveOneOfFollowingFormat=インポートするファイルは、次のいずれかの形式である必要がある
-DownloadEmptyExample=フィールドコンテンツ情報を含むテンプレートファイルをダウンロードする（*は必須フィールド ）
+DownloadEmptyExample=フィールドコンテンツ情報を含むテンプレートファイルをダウンロードする(*は必須フィールド )
 ChooseFormatOfFileToImport=%sアイコンをクリックして選択し、インポートファイル形式として使用するファイル形式を選択する...
 ChooseFileToImport=ファイルをアップロードし、%sアイコンをクリックして、ソースインポートファイルとしてファイルを選択する。
 SourceFileFormat=ソースファイルの形式
 FieldsInSourceFile=ソースファイル内のフィールド
-FieldsInTargetDatabase=Dolibarrデータベースのターゲットフィールド（太字=必須）
+FieldsInTargetDatabase=Dolibarrデータベースのターゲットフィールド(太字=必須)
 Field=フィールド
 NoFields=Noフィールド
 MoveField=フィールドの列番号%sを移動
@@ -70,7 +70,7 @@ FieldsTarget=対象となるフィールド
 FieldTarget=ターゲットとフィールド
 FieldSource=ソースフィールド
 NbOfSourceLines=ソースファイルの行数
-NowClickToTestTheImport=ファイルのファイル形式（フィールドと文字列の区切り文字）が表示されているオプションと一致していること、およびヘッダー行を省略していることを確認すること。一致していない場合、次のシミュレーションでエラーとしてフラグが付けられる。 <br>「<b>%s</b>」ボタンをクリックして、ファイル構造/コンテンツのチェックを実行し、インポートプロセスをシミュレートする。 <br><b>データベース</b>のデータは変更されない。
+NowClickToTestTheImport=ファイルのファイル形式(フィールドと文字列の区切り文字)が表示されているオプションと一致していること、およびヘッダー行を省略していることを確認すること。一致していない場合、次のシミュレーションでエラーとしてフラグが付けられる。 <br>「<b>%s</b>」ボタンをクリックして、ファイル構造/コンテンツのチェックを実行し、インポートプロセスをシミュレートする。 <br><b>データベース</b>のデータは変更されない。
 RunSimulateImportFile=インポートシミュレーションを実行する
 FieldNeedSource=このフィールドには、ソースファイルのデータが必要 
 SomeMandatoryFieldHaveNoSource=いくつかの必須フィールドは、データファイルからのソースがない
@@ -84,7 +84,7 @@ DataLoadedWithId=インポートされたデータには、各データベース
 ErrorMissingMandatoryValue=フィールド<b>%s</b>のソースファイルの必須データが空 。
 TooMuchErrors=エラーのある<b>%s </b>の他のソース行がまだあるが、出力は制限されている。
 TooMuchWarnings=警告のある他のソース行はまだ<b>%s </b> が、出力は制限されている。
-EmptyLine=空行（破棄される）
+EmptyLine=空行(破棄される)
 CorrectErrorBeforeRunningImport=<b>は、</b>が最終的なインポートを実行する前に、</b>がすべてのエラー<b>を修正する必要がある。
 FileWasImported=ファイルが数<b>%s</b>でインポートされた。
 YouCanUseImportIdToFindRecord=フィールド<b>import_key = '%s' </b>でフィルタリングすると、データベースにインポートされたすべてのレコードを見つけることができる。
@@ -92,8 +92,8 @@ NbOfLinesOK=エラーなしで警告なしの行数<b>：%s。</b>
 NbOfLinesImported=正常インポートの行数<b>：%s。</b>
 DataComeFromNoWhere=挿入する値は、ソース·ファイル内のどこからも来ていない。
 DataComeFromFileFieldNb=挿入する値は、ソースファイル内のフィールド番号<b>%s</b>から来ている。
-DataComeFromIdFoundFromRef=ソースファイルのフィールド番号<b>%s </b>からの値は、使用する親オブジェクトのIDを見つけるために使用される（したがって、オブジェクト<b> %s </b>がデータベースに存在し、ソースファイルからの参照符号を持つ必要がある）。
-DataComeFromIdFoundFromCodeId=ソースファイルのフィールド番号<b>%s </b>からのコードは、使用する親オブジェクトのIDを見つけるために使用される（したがって、ソースファイルのコードはディクショナリ<b> %s </b> に存在する必要がある）。 IDがわかっている場合、コードの代わりにソースファイルでそれを使用することもできる。インポートはどちらの場合でも機能するはず 。
+DataComeFromIdFoundFromRef=ソースファイルのフィールド番号<b>%s </b>からの値は、使用する親オブジェクトのIDを見つけるために使用される(したがって、オブジェクト<b> %s </b>がデータベースに存在し、ソースファイルからの参照符号を持つ必要がある)。
+DataComeFromIdFoundFromCodeId=ソースファイルのフィールド番号<b>%s </b>からのコードは、使用する親オブジェクトのIDを見つけるために使用される(したがって、ソースファイルのコードはディクショナリ<b> %s </b> に存在する必要がある)。 IDがわかっている場合、コードの代わりにソースファイルでそれを使用することもできる。インポートはどちらの場合でも機能するはず 。
 DataIsInsertedInto=ソースファイルからのデータは、次のフィールドに挿入される。
 DataIDSourceIsInsertedInto=ソースファイルのデータを使用して親オブジェクトのIDが見つかり、次のフィールドに挿入される。
 DataCodeIDSourceIsInsertedInto=コー​​ドから見つかった親行のIDは、次のフィールドに挿入される。
@@ -101,11 +101,11 @@ SourceRequired=データ値は必須 。
 SourceExample=可能なデータ値の例
 ExampleAnyRefFoundIntoElement=要素<b>%s</b>で見つかった何らかの参照符号
 ExampleAnyCodeOrIdFoundIntoDictionary=辞書<b>%s </b>で見つかった何らかのコード (またはID)
-CSVFormatDesc= <b>カンマ区切り値</b>ファイル形式（.csv）。 <br>これは、フィールドが区切り文字[%s]で区切られているテキストファイル形式 。フィールドコンテンツ内に区切り文字が見つかった場合、フィールドは丸め文字[%s]で丸められる。丸め文字をエスケープするエスケープ文字は[%s] 。
-Excel95FormatDesc= <b> Excel </b>ファイル形式（.xls）<br>これはネイティブのExcel 95形式（BIFF5） 。
-Excel2007FormatDesc= <b> Excel </b>ファイル形式（.xlsx）<br>これはネイティブのExcel 2007形式（SpreadsheetML） 。
-TsvFormatDesc= <b>タブ区切り値</b>ファイル形式（.tsv）<br>これは、フィールドがタブ文字 [tab] で区切られているテキストファイル形式 。
-ExportFieldAutomaticallyAdded=フィールド<b>%s</b>が自動的に追加された。類似の行を重複レコードとして扱うのを防止するように（このフィールドを付加すると、すべての行が独自のIDを所有し、異なるものとなる）。
+CSVFormatDesc= <b>カンマ区切り値</b>ファイル形式(.csv)。 <br>これは、フィールドが区切り文字[%s]で区切られているテキストファイル形式 。フィールドコンテンツ内に区切り文字が見つかった場合、フィールドは丸め文字[%s]で丸められる。丸め文字をエスケープするエスケープ文字は[%s] 。
+Excel95FormatDesc= <b> Excel </b>ファイル形式(.xls)<br>これはネイティブのExcel 95形式(BIFF5) 。
+Excel2007FormatDesc= <b> Excel </b>ファイル形式(.xlsx)<br>これはネイティブのExcel 2007形式(SpreadsheetML) 。
+TsvFormatDesc= <b>タブ区切り値</b>ファイル形式(.tsv)<br>これは、フィールドがタブ文字 [tab] で区切られているテキストファイル形式 。
+ExportFieldAutomaticallyAdded=フィールド<b>%s</b>が自動的に追加された。類似の行を重複レコードとして扱うのを防止するように(このフィールドを付加すると、すべての行が独自のIDを所有し、異なるものとなる)。
 CsvOptions=CSV形式のオプション
 Separator=フィールドセパレータ
 Enclosure=文字列区切り文字
@@ -115,11 +115,11 @@ ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: 年/月/日でフィルタ<br>YYYY+YYYY
 ExportNumericFilter=NNNNN は1つの値でフィルタ<br>NNNNN+NNNNN は値sの範囲でフィルタ<br>< NNNNN は、より低い値でフィルタ<br>> NNNNN は、より高い値でフィルタ
 ImportFromLine=行番号からインポート
 EndAtLineNb=行番号で終了
-ImportFromToLine=制限範囲（From-To）。例えば、ヘッダー行(s)を省略する。
+ImportFromToLine=制限範囲(From-To)。例えば、ヘッダー行(s)を省略する。
 SetThisValueTo2ToExcludeFirstLine=たとえば、この値を3に設定して、最初の2行を除外する。 <br>ヘッダー行が省略されていない場合、インポートシミュレーションで複数のエラーが発生する。
 KeepEmptyToGoToEndOfFile=ファイルの終わりまでのすべての行を処理するには、このフィールドを空のままにする。
 SelectPrimaryColumnsForUpdateAttempt=UPDATEインポートの主キーとして使用する列(s)を選択する
-UpdateNotYetSupportedForThisImport=このタイプのインポートでは更新はサポートされていない（挿入のみ）
+UpdateNotYetSupportedForThisImport=このタイプのインポートでは更新はサポートされていない(挿入のみ)
 NoUpdateAttempt=更新は実行されず、挿入のみが実行された
 ImportDataset_user_1=ユーザ (従業員であってもなくても) とプロパティ
 ComputedField=計算フィールド
@@ -129,7 +129,8 @@ FilteredFields=フィルタリングされたフィールド
 FilteredFieldsValues=フィルタの値
 FormatControlRule=フォーマット制御ルール
 ## imports updates
-KeysToUseForUpdates=<b>が</b>の既存データを更新するために使用するキー（列）
+KeysToUseForUpdates=<b>が</b>の既存データを更新するために使用するキー(列)
 NbInsert=挿入された行数：%s
 NbUpdate=更新された行数：%s
-MultipleRecordFoundWithTheseFilters=これらのフィルターで複数のレコードが見つかった：%s
+MultipleRecordFoundWithTheseFilters=これらのフィルタで複数のレコードが見つかった：%s
+StocksWithBatch=バッチ/シリアル番号のある製品の在庫と場所(倉庫)
diff --git a/htdocs/langs/ja_JP/externalsite.lang b/htdocs/langs/ja_JP/externalsite.lang
index 429769e901f..e13d16f892d 100644
--- a/htdocs/langs/ja_JP/externalsite.lang
+++ b/htdocs/langs/ja_JP/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
 ExternalSiteSetup=外部ウェブサイトへのリンクを設定
 ExternalSiteURL=外部サイトのURL
-ExternalSiteModuleNotComplete=モジュールExternalSite（外部サイト）が正しく構成されていませんでした。
+ExternalSiteModuleNotComplete=モジュールExternalSite(外部サイト)が正しく構成されていませんでした。
 ExampleMyMenuEntry=私のメニューエントリ
diff --git a/htdocs/langs/ja_JP/ftp.lang b/htdocs/langs/ja_JP/ftp.lang
index a95eeb0aa40..d1bf05d68c2 100644
--- a/htdocs/langs/ja_JP/ftp.lang
+++ b/htdocs/langs/ja_JP/ftp.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - ftp
 FTPClientSetup=FTPまたはSFTPクライアントモジュールの設定
-NewFTPClient=新しいFTP / FTPS接続の設定
+NewFTPClient=新規FTP / FTPS接続の設定
 FTPArea=FTP / FTPSエリア
 FTPAreaDesc=この画面には、FTPおよびSFTPサーバのビューが表示される。
 SetupOfFTPClientModuleNotComplete=FTPまたはSFTPクライアントモジュールの設定が不完全なようです
 FTPFeatureNotSupportedByYourPHP=お使いのPHPはFTPまたはSFTP機能をサポートしていない
-FailedToConnectToFTPServer=サーバ（サーバ%s、ポート%s）への接続に失敗した
+FailedToConnectToFTPServer=サーバ(サーバ%s、ポート%s)への接続に失敗した
 FailedToConnectToFTPServerWithCredentials=定義されたログイン/パスワードでサーバにログインできなかった
 FTPFailedToRemoveFile=ファイルの<b>%s</b>を削除できなかった。
 FTPFailedToRemoveDir=ディレクトリ<b>%s </b>の削除に失敗した：権限を確認し、ディレクトリが空であることを確認すること。
diff --git a/htdocs/langs/ja_JP/help.lang b/htdocs/langs/ja_JP/help.lang
index 211b5fe6a6f..b6b9f5e69c0 100644
--- a/htdocs/langs/ja_JP/help.lang
+++ b/htdocs/langs/ja_JP/help.lang
@@ -1,23 +1,23 @@
 # Dolibarr language file - Source file is en_US - help
-CommunitySupport=フォーラム/ Wikiのサポート
-EMailSupport=電子メールをサポート
-RemoteControlSupport=オンラインリアルタイム/リモートサポート
-OtherSupport=その他のサポート
-ToSeeListOfAvailableRessources=利用可能なリソースに連絡する/表示するには：
+CommunitySupport=フォーラム/ Wiki サポート
+EMailSupport=メール サポート
+RemoteControlSupport=オンライン 即時 / 遠隔 サポート
+OtherSupport=その他 サポート
+ToSeeListOfAvailableRessources=利用可能なリソースへの 連絡/表示：
 HelpCenter=ヘルプセンター
-DolibarrHelpCenter=Dolibarr Help and Support Center
-ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
-TypeOfSupport=Type of support
-TypeSupportCommunauty=コミュニティ（無料）
+DolibarrHelpCenter=Dolibarrヘルプとサポートセンター
+ToGoBackToDolibarr=それ以外の場合、<a href="%s">ここをクリックしてDolibarrを引き続き使用</a>
+TypeOfSupport=サポートの種類
+TypeSupportCommunauty=コミュニティ(無料)
 TypeSupportCommercial=コマーシャル
 TypeOfHelp=タイプ
 NeedHelpCenter=ヘルプやサポートが必要ですか？
 Efficiency=効率性
-TypeHelpOnly=唯一の助け
-TypeHelpDev=+の開発を支援
-TypeHelpDevForm=Help+Development+Training
-BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
-LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
+TypeHelpOnly=ヘルプのみ
+TypeHelpDev=ヘルプ+開発
+TypeHelpDevForm=ヘルプ+開発+トレーニング
+BackToHelpCenter=それ以外の場合、<a href="%s">ヘルプセンターのホームページに戻る</a>
+LinkToGoldMember=彼らのウィジェットをクリックすると(状態と最高価格は自動更新され)、Dolibarrによって事前選択されたトレーナーの1人と自分の言語 (%s) で電話できるよ。
 PossibleLanguages=サポートされる言語
-SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
+SubscribeToFoundation=Dolibarrプロジェクトを支援し、財団に登録
 SeeOfficalSupport=お使いの言語での公式Dolibarrサポート: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/ja_JP/holiday.lang b/htdocs/langs/ja_JP/holiday.lang
index 72861294057..855d22d946f 100644
--- a/htdocs/langs/ja_JP/holiday.lang
+++ b/htdocs/langs/ja_JP/holiday.lang
@@ -94,7 +94,7 @@ ManualUpdate=手動更新
 HolidaysCancelation=リクエストのキャンセルを残す
 EmployeeLastname=従業員の姓
 EmployeeFirstname=従業員の名
-TypeWasDisabledOrRemoved=休暇タイプ（id %s）が無効化または削除された
+TypeWasDisabledOrRemoved=休暇タイプ(id %s)が無効化または削除された
 LastHolidays=最新の%s休暇申請
 AllHolidays=すべての休暇申請
 HalfDay=半日
diff --git a/htdocs/langs/ja_JP/hrm.lang b/htdocs/langs/ja_JP/hrm.lang
index 4b9b1edd9d3..a7be093eebe 100644
--- a/htdocs/langs/ja_JP/hrm.lang
+++ b/htdocs/langs/ja_JP/hrm.lang
@@ -16,4 +16,4 @@ DictionaryFunction=HRM - 職位
 Employees=従業員s
 Employee=従業員
 NewEmployee=新規従業員
-ListOfEmployees=List of employees
+ListOfEmployees=従業員リスト
diff --git a/htdocs/langs/ja_JP/install.lang b/htdocs/langs/ja_JP/install.lang
index 72525b888a8..042be5d8fa0 100644
--- a/htdocs/langs/ja_JP/install.lang
+++ b/htdocs/langs/ja_JP/install.lang
@@ -4,7 +4,7 @@ MiscellaneousChecks=前提条件チェック
 ConfFileExists=コンフィギュレーションファイル<b>%sが</b>存在し<b>ている</b> 。
 ConfFileDoesNotExistsAndCouldNotBeCreated=構成ファイル<b>%s </b>が存在せず、作成できなかった。
 ConfFileCouldBeCreated=設定ファイルの<b>%sを</b>作成できる。
-ConfFileIsNotWritable=構成ファイル<b>%s</b>は書き込み可能ではありません。権限を確認すること。最初のインストールでは、Webサーバーが構成プロセス中にこのファイルに書き込める必要がある（たとえば、OSのようなUnixでは「chmod666」）。
+ConfFileIsNotWritable=構成ファイル<b>%s</b>は書き込み可能ではありません。権限を確認すること。最初のインストールでは、Webサーバーが構成プロセス中にこのファイルに書き込める必要がある(たとえば、OSのようなUnixでは「chmod666」)。
 ConfFileIsWritable=コンフィギュレーションファイルの<b>%sは</b>書き込み可能。
 ConfFileMustBeAFileNotADir=構成ファイル<b>%s </b>は、ディレクトリーではなくファイルでなければならない。
 ConfFileReload=構成ファイルからパラメーターを再ロードする。
@@ -41,8 +41,8 @@ ConfigurationFile=設定ファイル
 WebPagesDirectory=ウェブページが保存されているディレクトリ
 DocumentsDirectory=アップロードし、生成されたドキュメントを格納するディレクトリ
 URLRoot=URLのルート
-ForceHttps=力安全な接続（HTTPS）
-CheckToForceHttps=セキュアな接続（https）を強制的にこのオプションをチェックすること。 <br>これは、WebサーバがSSL証明書を使用して構成されている必要がある。
+ForceHttps=力安全な接続(HTTPS)
+CheckToForceHttps=セキュアな接続(https)を強制的にこのオプションをチェックすること。 <br>これは、WebサーバがSSL証明書を使用して構成されている必要がある。
 DolibarrDatabase=Dolibarrデータベース
 DatabaseType=データベース種別
 DriverType=ドライバ種別
@@ -61,8 +61,8 @@ CreateUser=Dolibarrデータベースでユーザアカウントを作成する
 DatabaseSuperUserAccess=データベースサーバ - スーパーユーザのアクセス
 CheckToCreateDatabase=データベースがまだ存在しないため、作成する必要がある場合は、チェックボックスをオンにする。 <br>この場合、このページの下部にスーパーユーザアカウントのユーザ名とパスワードも入力する必要がある。
 CheckToCreateUser=次の場合にチェックボックスをオンにする。<br>データベースユーザアカウントがまだ存在しないため作成する必要がある場合、またはユーザアカウントは存在するがデータベースが存在せず、アクセス許可を付与する必要がある場合は<br>。 <br>この場合、このページの下部にユーザアカウントとパスワードを入力する必要があり、<b>も</b>スーパーユーザアカウント名とパスワードを入力する必要がある。このボックスがオフの場合、データベースの所有者とパスワードがすでに存在する必要がある。
-DatabaseRootLoginDescription=スーパーユーザアカウント名（新しいデータベースまたは新しいユーザを作成するため）。データベースまたはその所有者がまだ存在しない場合は必須。
-KeepEmptyIfNoPassword=スーパーユーザにパスワードがない場合は空のままにする（非推奨）
+DatabaseRootLoginDescription=スーパーユーザアカウント名(新規データベースまたは新規ユーザを作成するため)。データベースまたはその所有者がまだ存在しない場合は必須。
+KeepEmptyIfNoPassword=スーパーユーザにパスワードがない場合は空のままにする(非推奨)
 SaveConfigurationFile=パラメータをに保存する
 ServerConnection=サーバーへの接続
 DatabaseCreation=データベースの作成
@@ -80,14 +80,14 @@ PasswordsMismatch=パスワードが異なる。もう一度お試しくださ
 SetupEnd=設定の終了
 SystemIsInstalled=このインストールは満了。
 SystemIsUpgraded=Dolibarrが正常にアップグレードされている。
-YouNeedToPersonalizeSetup=あなたのニーズに合わせてDolibarrを設定する必要がある（外観、機能、...).これを行うには、下記のリンクをクリックすること。
+YouNeedToPersonalizeSetup=あなたのニーズに合わせてDolibarrを設定する必要がある(外観、機能、...).これを行うには、下記のリンクをクリックすること。
 AdminLoginCreatedSuccessfuly=Dolibarr 管理者ログイン '<b>%s</b>' の作成が成功した。
 GoToDolibarr=Dolibarrに行く
-GoToSetupArea=Dolibarr（設定の領域）に移動する
+GoToSetupArea=Dolibarr(設定の領域)に移動する
 MigrationNotFinished=データベースのバージョンが完全に最新ではありません。アップグレードプロセスを再実行すること。
 GoToUpgradePage=アップグレードページへ再度行く
 WithNoSlashAtTheEnd=末尾のスラッシュ"/"なし
-DirectoryRecommendation= <span class="warning">重要</span>：Webページの外部にあるディレクトリを使用する必要がある（したがって、前のパラメータのサブディレクトリは使用しないこと）。
+DirectoryRecommendation= <span class="warning">重要</span>：Webページの外部にあるディレクトリを使用する必要がある(したがって、前のパラメータのサブディレクトリは使用しないこと)。
 LoginAlreadyExists=すでに存在する
 DolibarrAdminLogin=Dolibarr adminログイン
 AdminLoginAlreadyExists=Dolibarr管理者アカウント '<b> %s</b>'は既に存在する。別のものを作成したい場合は戻ってください。
@@ -95,14 +95,14 @@ FailedToCreateAdminLogin=Dolibarr管理者アカウントの作成に失敗し
 WarningRemoveInstallDir=警告、セキュリティ上の理由から、インストールまたはアップグレードが完了したら、インストールツールの偶発的/悪用を防ぐために、<b> install.lock</b>というファイルをDolibarrドキュメントディレクトリに追加する必要がある。
 FunctionNotAvailableInThisPHP=このPHPでは使用できない
 ChoosedMigrateScript=移行スクリプトを選択する。
-DataMigration=データベースの移行（データ）
-DatabaseMigration=データベースの移行（構造+一部のデータ）
+DataMigration=データベースの移行(データ)
+DatabaseMigration=データベースの移行(構造+一部のデータ)
 ProcessMigrateScript=スクリプト処理
 ChooseYourSetupMode=設定モードを選択し、"スタート"をクリック...
 FreshInstall=新規インストール
 FreshInstallDesc=これが初めてのインストールである場合は、このモードを使用すること。そうでない場合、このモードは不完全な以前のインストールを修復できる。バージョンをアップグレードする場合は、「アップグレード」モードを選択すること。
 Upgrade=アップグレード
-UpgradeDesc=あなたが新しいバージョンのファイルが古いDolibarrファイルを交換した場合、このモードを使用する。これにより、データベースとデータをアップグレードする。
+UpgradeDesc=あなたが新規バージョンのファイルが古いDolibarrファイルを交換した場合、このモードを使用する。これにより、データベースとデータをアップグレードする。
 Start=開始
 InstallNotAllowed=設定では<b>、conf.php</b>の権限で許可されていない
 YouMustCreateWithPermission=あなたは、ファイル%sを作成し、インストールプロセス中にWebサーバのためにそれへの書き込み権限を設定する必要がある。
@@ -122,12 +122,12 @@ IfLoginDoesNotExistsCheckCreateUser=ユーザがまだ存在しない場合は
 ErrorConnection=サーバ "<b>%s</b>"、データベース名 "<b>%s</b>"、ログイン "<b>%s</b>"、またはデータベースパスワードが違う、またはPHPクライアントバージョンがデータベースバージョンのに対して古すぎる。
 InstallChoiceRecommanded=あなたの現在のバージョンの<b>%s</b>からバージョン<b>%sを</b>インストールすることをお勧め選択肢
 InstallChoiceSuggested=<b>インストーラによって提案されたインストール選択肢</b> 。
-MigrateIsDoneStepByStep=ターゲットバージョン（%s）には、いくつかのバージョンのギャップがある。これが完了すると、インストールウィザードが戻ってきて、さらに移行することを提案する。
+MigrateIsDoneStepByStep=ターゲットバージョン(%s)には、いくつかのバージョンのギャップがある。これが完了すると、インストールウィザードが戻ってきて、さらに移行することを提案する。
 CheckThatDatabasenameIsCorrect=データベース名「<b>%s</b>」が正しいことを確認すること。
 IfAlreadyExistsCheckOption=この名前が正しいこと、およびそのデータベースがまだ存在しない場合は、オプションの"データベースの作成"をチェックする必要がある。
 OpenBaseDir=PHP openbasedirパラメータ
-YouAskToCreateDatabaseSoRootRequired=「データベースの作成」ボックスをチェックした。このためには、スーパーユーザのログイン/パスワードを入力する必要がある（フォームの下部）。
-YouAskToCreateDatabaseUserSoRootRequired= "データベース所有者を作成する" チェックボックスをオンにした。このためには、スーパーユーザのログイン/パスワードを入力する必要がある（フォームの下部）。
+YouAskToCreateDatabaseSoRootRequired=「データベースの作成」ボックスをチェックした。このためには、スーパーユーザのログイン/パスワードを入力する必要がある(フォームの下部)。
+YouAskToCreateDatabaseUserSoRootRequired= "データベース所有者を作成する" チェックボックスをオンにした。このためには、スーパーユーザのログイン/パスワードを入力する必要がある(フォームの下部)。
 NextStepMightLastALongTime=現在のステップには数分かかる場合がある。次の画面が完全に表示されるまで待ってから続行すること。
 MigrationCustomerOrderShipping=販売受注保管庫のための出荷を移行
 MigrationShippingDelivery=出荷の保管庫をアップグレード
@@ -136,10 +136,10 @@ MigrationFinished=マイグレーションが終了した
 LastStepDesc= <strong>最後のステップ</strong>：Dolibarrへの接続に使用するログインとパスワードをここで定義する。 <b>他のすべての/追加のユーザアカウントを管理するためのマスターアカウントであるため、これをなくさないでください。 </b>
 ActivateModule=モジュール%sをアクティブにする
 ShowEditTechnicalParameters=高度なパラメータを表示/編集するには、ここをクリックすること (エキスパートモード)
-WarningUpgrade=警告：\n最初にデータベースバックアップを実行したか？\nこれを強くお勧めする。このプロセス中にデータが失われる可能性があるため（たとえば、mysqlバージョン5.5.40 / 41/42/43のバグが原因）、移行を開始する前にデータベースの完全なダンプを取得することが不可欠。\n\n "OK" をクリックして移行プロセスを開始する...
-ErrorDatabaseVersionForbiddenForMigration=データベースのバージョンは%s。重大なバグがあり、移行プロセスで必要になるなど、データベースに構造的な変更を加えるとデータが失われる可能性がある。彼の理由により、データベースをレイヤー（パッチ）バージョンにアップグレードするまで移行は許可されません（既知のバグのあるバージョンのリスト：%s）
+WarningUpgrade=警告：\n最初にデータベースバックアップを実行したか？\nこれを強くお勧めする。このプロセス中にデータが失われる可能性があるため(たとえば、mysqlバージョン5.5.40 / 41/42/43のバグが原因)、移行を開始する前にデータベースの完全なダンプを取得することが不可欠。\n\n "OK" をクリックして移行プロセスを開始する...
+ErrorDatabaseVersionForbiddenForMigration=データベースのバージョンは%s。重大なバグがあり、移行プロセスで必要になるなど、データベースに構造的な変更を加えるとデータが失われる可能性がある。彼の理由により、データベースをレイヤー(パッチ)バージョンにアップグレードするまで移行は許可されません(既知のバグのあるバージョンのリスト：%s)
 KeepDefaultValuesWamp=DoliWampのDolibarr設定ウィザードを使用したため、ここで提案されている値はすでに最適化されている。自分が何をするのかがわかっている場合にのみ、それらを変更すること。
-KeepDefaultValuesDeb=Linuxパッケージ（Ubuntu、Debian、Fedora ...）のDolibarr設定ウィザードを使用したため、ここで提案する値はすでに最適化されている。作成するデータベース所有者のパスワードのみを入力する必要がある。自分が何をするかがわかっている場合にのみ、他のパラメータを変更すること。
+KeepDefaultValuesDeb=Linuxパッケージ(Ubuntu、Debian、Fedora ...)のDolibarr設定ウィザードを使用したため、ここで提案する値はすでに最適化されている。作成するデータベース所有者のパスワードのみを入力する必要がある。自分が何をするかがわかっている場合にのみ、他のパラメータを変更すること。
 KeepDefaultValuesMamp=DoliMampのDolibarr設定ウィザードを使用したため、ここで提案されている値はすでに最適化されている。自分が何をするのかがわかっている場合にのみ、それらを変更すること。
 KeepDefaultValuesProxmox=Proxmox仮想アプライアンスからDolibarr設定ウィザードを使用したため、ここで提案されている値はすでに最適化されている。自分が何をするのかがわかっている場合にのみ、それらを変更すること。
 UpgradeExternalModule=外部モジュールの専用アップグレードプロセスを実行する
@@ -158,12 +158,12 @@ MigrationSuccessfullUpdate=成功したアップグレード
 MigrationUpdateFailed=失敗したアップグレード·プロセス
 MigrationRelationshipTables=関係テーブル (%s) のデータ移行
 MigrationPaymentsUpdate=支払データ補正
-MigrationPaymentsNumberToUpdate=更新する%s支払い（秒）
-MigrationProcessPaymentUpdate=更新の支払い（秒）%s
+MigrationPaymentsNumberToUpdate=更新する%s支払い(秒)
+MigrationProcessPaymentUpdate=更新の支払い(秒)%s
 MigrationPaymentsNothingToUpdate=これ以上実行すべきことはない
 MigrationPaymentsNothingUpdatable=訂正することができるこれ以上の支払いなし
 MigrationContractsUpdate=契約データの補正
-MigrationContractsNumberToUpdate=更新する%s契約（複数可）
+MigrationContractsNumberToUpdate=更新する%s契約(複数可)
 MigrationContractsLineCreation=契約のref %sの契約回線を作成する。
 MigrationContractsNothingToUpdate=これ以上実行すべきことsはない
 MigrationContractsFieldDontExist=フィールドfk_factureはもう存在しません。何もすることはありません。
@@ -172,7 +172,7 @@ MigrationContractsEmptyDatesUpdateSuccess=契約の空の日付の修正が正
 MigrationContractsEmptyDatesNothingToUpdate=修正する契約空の日ない
 MigrationContractsEmptyCreationDatesNothingToUpdate=修正する契約作成日はない
 MigrationContractsInvalidDatesUpdate=不正な値の日付の契約補正
-MigrationContractsInvalidDateFix=正しい契約%s（契約日= %sの開始、サービス日分= %s）
+MigrationContractsInvalidDateFix=正しい契約%s(契約日= %sの開始、サービス日分= %s)
 MigrationContractsInvalidDatesNumber=%s契約が変更された
 MigrationContractsInvalidDatesNothingToUpdate=修正するために不正な値を持つ日付なし
 MigrationContractsIncoherentCreationDateUpdate=不正な値契約の作成日付補正
@@ -203,14 +203,14 @@ MigrationRemiseExceptEntity=llx_societe_remise_except のエンティティフ
 MigrationUserRightsEntity=llx_user_rightsのエンティティフィールド値を更新する
 MigrationUserGroupRightsEntity=llx_usergroup_rightsのエンティティフィールド値を更新する
 MigrationUserPhotoPath=ユーザの写真パスの移行
-MigrationFieldsSocialNetworks=ユーザフィールドソーシャルネットワークの移行（%s）
+MigrationFieldsSocialNetworks=ユーザフィールドソーシャルネットワークの移行(%s)
 MigrationReloadModule=モジュール %s を再読み込み
 MigrationResetBlockedLog=v7アルゴリズムのモジュールBlockedLogをリセット
 ShowNotAvailableOptions=利用できないオプションを表示する
 HideNotAvailableOptions=利用できないオプションを非表示にする
 ErrorFoundDuringMigration=移行プロセス中にエラーが報告されたため、次のステップは利用できない。エラーを無視するには、<a href="%s">ここをクリック</a>できるが、エラーが解決されるまで、アプリケーションまたは一部の機能が正しく動作しない場合がある。
-YouTryInstallDisabledByDirLock=アプリケーションは自己アップグレードを試みたが、インストール/アップグレードページはセキュリティのために無効になっている（ディレクトリの名前が.lockサフィックスに変更された）。 <br>
-YouTryInstallDisabledByFileLock=アプリケーションは自己アップグレードを試みたが、インストール/アップグレードページはセキュリティのために無効になっている（dolibarrドキュメントディレクトリにロックファイル<strong> install.lock </strong>が存在するため）。 <br>
+YouTryInstallDisabledByDirLock=アプリケーションは自己アップグレードを試みたが、インストール/アップグレードページはセキュリティのために無効になっている(ディレクトリの名前が.lockサフィックスに変更された)。 <br>
+YouTryInstallDisabledByFileLock=アプリケーションは自己アップグレードを試みたが、インストール/アップグレードページはセキュリティのために無効になっている(dolibarrドキュメントディレクトリにロックファイル<strong> install.lock </strong>が存在するため)。 <br>
 ClickHereToGoToApp=アプリケーションに移動するには、ここをクリックすること
 ClickOnLinkOrRemoveManualy=アップグレードが進行中の場合は、しばらく待つこと。そうでない場合は、次のリンクをクリックすること。この同じページが常に表示される場合は、documentsディレクトリのinstall.lockファイルを削除/名前変更する必要がある。
 Loaded=ロード済み
diff --git a/htdocs/langs/ja_JP/interventions.lang b/htdocs/langs/ja_JP/interventions.lang
index 745bd3844d9..07cf1cb44c7 100644
--- a/htdocs/langs/ja_JP/interventions.lang
+++ b/htdocs/langs/ja_JP/interventions.lang
@@ -42,15 +42,15 @@ DraftFichinter=ドラフト出張
 LastModifiedInterventions=最新の%s修正された出張
 FichinterToProcess=処理 ための出張
 TypeContact_fichinter_external_CUSTOMER=フォローアップ顧客との接触
-PrintProductsOnFichinter=タイプ「製品」（サービスだけでなく）の行も出張カードに印刷 
+PrintProductsOnFichinter=タイプ「製品」(サービスだけでなく)の行も出張カードに印刷 
 PrintProductsOnFichinterDetails=注文から生成された出張
 UseServicesDurationOnFichinter=注文から生成された出張にサービス期間を使用 
 UseDurationOnFichinter=出張レコードの期間フィールドを非表示に 
 UseDateWithoutHourOnFichinter=出張レコードの日付フィールドから時間と分を非表示に 
 InterventionStatistics=出張の統計
 NbOfinterventions=出張カードの数
-NumberOfInterventionsByMonth=月ごとの出張カードの数（検証日）
-AmountOfInteventionNotIncludedByDefault=出張の量はデフォルトでは利益に含まれていない（ほとんどの場合、タイムシートは費やされた時間カウント のために使用される）。それらを含めるには、ホーム - 設定 - その他 にて、オプションPROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFITを1で追加。
+NumberOfInterventionsByMonth=月ごとの出張カードの数(検証日)
+AmountOfInteventionNotIncludedByDefault=出張の量はデフォルトでは利益に含まれていない(ほとんどの場合、タイムシートは費やされた時間カウント のために使用される)。それらを含めるには、ホーム - 設定 - その他 にて、オプションPROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFITを1で追加。
 InterId=出張ID
 InterRef=出張参照。
 InterDateCreation=日付作成出張
diff --git a/htdocs/langs/ja_JP/intracommreport.lang b/htdocs/langs/ja_JP/intracommreport.lang
index 43a43167347..5d9bdbc2a79 100644
--- a/htdocs/langs/ja_JP/intracommreport.lang
+++ b/htdocs/langs/ja_JP/intracommreport.lang
@@ -1,10 +1,10 @@
 Module68000Name = Intracomm レポート
-Module68000Desc = Intracomm レポート管理（フランス語のDEB / DES形式のサポート）
+Module68000Desc = Intracomm レポート管理(フランス語のDEB / DES形式のサポート)
 IntracommReportSetup = Intracommreportモジュールのセットアップ
 IntracommReportAbout = Intracomm レポートについて
 
 # Setup
-INTRACOMMREPORT_NUM_AGREMENT=Numérod'agrément（délivréparleCISD de rattachement）
+INTRACOMMREPORT_NUM_AGREMENT=Numérod'agrément(délivréparleCISD de rattachement)
 INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
 INTRACOMMREPORT_ROLE_ACTEUR=Rôlejouéparl'acteur
 INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation surlesの紹介
@@ -23,8 +23,8 @@ NewDeclaration=新規宣言
 Declaration=宣言
 AnalysisPeriod=分析期間
 TypeOfDeclaration=宣言の種類
-DEB=商品交換申告（DEB）
-DES=サービス交換宣言（DES）
+DEB=商品交換申告(DEB)
+DES=サービス交換宣言(DES)
 
 # Export page
 IntracommReportTitle=ProDouane形式のXMLファイルの準備
diff --git a/htdocs/langs/ja_JP/languages.lang b/htdocs/langs/ja_JP/languages.lang
index 99d0e3d3fbb..1a4ab927428 100644
--- a/htdocs/langs/ja_JP/languages.lang
+++ b/htdocs/langs/ja_JP/languages.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
 Language_am_ET=エチオピア語
 Language_ar_AR=アラビア語
-Language_ar_EG=アラビア語（エジプト）
+Language_ar_EG=アラビア語(エジプト)
 Language_ar_SA=アラビア語
 Language_az_AZ=アゼルバイジャン語
 Language_bn_BD=ベンガル語
-Language_bn_IN=ベンガル語（インド）
+Language_bn_IN=ベンガル語(インド)
 Language_bg_BG=ブルガリア語
 Language_bs_BA=ボスニア語
 Language_ca_ES=カタルにゃ語
@@ -21,11 +21,11 @@ Language_en_AU=英語 (オーストラリア)
 Language_en_CA=英語 (カナダ)
 Language_en_GB=英語 (イギリス)
 Language_en_IN=英語 (インド)
-Language_en_NZ=英語（ニュージーランド）
-Language_en_SA=英語（サウジアラビア）
-Language_en_SG=英語（シンガポール）
+Language_en_NZ=英語(ニュージーランド)
+Language_en_SA=英語(サウジアラビア)
+Language_en_SG=英語(シンガポール)
 Language_en_US=英語 (アメリカ)
-Language_en_ZA=英語（南アフリカ）
+Language_en_ZA=英語(南アフリカ)
 Language_es_ES=スペイン語
 Language_es_AR=スペイン語 (アルゼンチン)
 Language_es_BO=スペイン語 (ボリビア)
@@ -33,16 +33,16 @@ Language_es_CL=スペイン語 (チリ)
 Language_es_CO=スペイン語 (コロンビア)
 Language_es_DO=スペイン語 (ドミニカ共和国)
 Language_es_EC=スペイン語 (エクアドル)
-Language_es_GT=スペイン語（グアテマラ）
-Language_es_HN=スペイン語（ホンジュラス）
-Language_es_MX=スペイン語（メキシコ）
+Language_es_GT=スペイン語(グアテマラ)
+Language_es_HN=スペイン語(ホンジュラス)
+Language_es_MX=スペイン語(メキシコ)
 Language_es_PA=スペイン語 (パナマ)
-Language_es_PY=スペイン語（パラグアイ）
-Language_es_PE=スペイン語（ペルー）
-Language_es_PR=スペイン語（プエルトリコ）
-Language_es_US=Spanish (USA)
-Language_es_UY=スペイン語（ウルグアイ）
-Language_es_GT=スペイン語（グアテマラ）
+Language_es_PY=スペイン語(パラグアイ)
+Language_es_PE=スペイン語(ペルー)
+Language_es_PR=スペイン語(プエルトリコ)
+Language_es_US=スペイン語(USA)
+Language_es_UY=スペイン語(ウルグアイ)
+Language_es_GT=スペイン語(グアテマラ)
 Language_es_VE=スペイン語 (ベネズエラ)
 Language_et_EE=エストニア語
 Language_eu_ES=バスク語
@@ -51,22 +51,22 @@ Language_fi_FI=フィンランド語
 Language_fr_BE=フランス語 (ベルギー)
 Language_fr_CA=フランス語 (カナダ)
 Language_fr_CH=フランス語 (スイス)
-Language_fr_CI=フランス語（コートジボワール）
-Language_fr_CM=フランス語（カメルーン）
+Language_fr_CI=フランス語(コートジボワール)
+Language_fr_CM=フランス語(カメルーン)
 Language_fr_FR=フランス語
-Language_fr_GA=フランス語（ガボン）
-Language_fr_NC=フランス（ニューカレドニア）
-Language_fr_SN=フランス語（セネガル）
+Language_fr_GA=フランス語(ガボン)
+Language_fr_NC=フランス(ニューカレドニア)
+Language_fr_SN=フランス語(セネガル)
 Language_fy_NL=フリジア語
 Language_gl_ES=ガリシア語
 Language_he_IL=ヘブライ語の
-Language_hi_IN=ヒンディー語（インド）
+Language_hi_IN=ヒンディー語(インド)
 Language_hr_HR=クロアチア語
 Language_hu_HU=ハンガリー語
 Language_id_ID=インドネシア語
 Language_is_IS=アイスランド語
 Language_it_IT=イタリア語
-Language_it_CH=イタリア語（スイス）
+Language_it_CH=イタリア語(スイス)
 Language_ja_JP=日本語
 Language_ka_GE=ジョージア語
 Language_km_KH=クメール語
@@ -86,7 +86,7 @@ Language_pt_BR=ポルトガル語 (ブラジル)
 Language_pt_PT=ポルトガル語
 Language_ro_RO=ルーマニア語
 Language_ru_RU=ロシア語
-Language_ru_UA=ロシア語（ウクライナ）
+Language_ru_UA=ロシア語(ウクライナ)
 Language_tr_TR=トルコ語
 Language_sl_SI=スロベニア語
 Language_sv_SV=スウエーデん語
@@ -100,6 +100,6 @@ Language_uk_UA=ウクライナ語
 Language_uz_UZ=ウズベク語
 Language_vi_VN=ベトナム語
 Language_zh_CN=中国語
-Language_zh_TW=中国語（繁体字）
-Language_zh_HK=中国語（香港）
+Language_zh_TW=中国語(繁体字)
+Language_zh_HK=中国語(香港)
 Language_bh_MY=マレー語
diff --git a/htdocs/langs/ja_JP/loan.lang b/htdocs/langs/ja_JP/loan.lang
index a0a77be01d9..7b09bf4ef54 100644
--- a/htdocs/langs/ja_JP/loan.lang
+++ b/htdocs/langs/ja_JP/loan.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - loan
 Loan=ローン
 Loans=ローン
-NewLoan=新しいローン
+NewLoan=新規ローン
 ShowLoan=ローンを表示
 PaymentLoan=ローンの支払
 LoanPayment=ローンの支払
diff --git a/htdocs/langs/ja_JP/mailmanspip.lang b/htdocs/langs/ja_JP/mailmanspip.lang
index de0737ba233..73e9bc5462b 100644
--- a/htdocs/langs/ja_JP/mailmanspip.lang
+++ b/htdocs/langs/ja_JP/mailmanspip.lang
@@ -10,7 +10,7 @@ SynchroSpipEnabled=Spipの更新が実行される
 DescADHERENT_MAILMAN_ADMINPW=Mailman管理者パスワード
 DescADHERENT_MAILMAN_URL=MailmanサブスクリプションのURL
 DescADHERENT_MAILMAN_UNSUB_URL=Mailmanのサブスクリプション解除のURL
-DescADHERENT_MAILMAN_LISTS=新規メンバーの自動登録用のリスト(s)（コンマで区切る）
+DescADHERENT_MAILMAN_LISTS=新規メンバーの自動登録用のリスト(s)(コンマで区切る)
 SPIPTitle=SPIPコンテンツ管理システム
 DescADHERENT_SPIP_SERVEUR=SPIPサーバー
 DescADHERENT_SPIP_DB=SPIPデータベース名
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index 0a8693bb1be..ac80df8e0b0 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/mails.lang
@@ -10,7 +10,7 @@ MailTitle=説明
 MailFrom=送信者
 MailErrorsTo=エラーへ
 MailReply=に返信
-MailTo=受信者（単数または複数）
+MailTo=受信者(単数または複数)
 MailToUsers=ユーザ(s)へ
 MailCC=にコピー
 MailToCCUsers=ユーザs(s)にコピーする
@@ -23,7 +23,7 @@ SubjectNotIn=件名にない
 BodyNotIn=体にない
 ShowEMailing=電子メールで表示
 ListOfEMailings=emailingsのリスト
-NewMailing=新しいメール送信
+NewMailing=新規メール送信
 EditMailing=電子メールで編集
 ResetMailing=電子メールで送信する再送
 DeleteMailing=電子メールで送信する削除
@@ -39,20 +39,20 @@ MailingStatusSentPartialy=部分的に送信
 MailingStatusSentCompletely=完全に送信
 MailingStatusError=エラーが発生
 MailingStatusNotSent=送信されない
-MailSuccessfulySent=電子メール（%sから%sへ）の配信が正常に受け入れられた
+MailSuccessfulySent=電子メール(%sから%sへ)の配信が正常に受け入れられた
 MailingSuccessfullyValidated=Eメールは正常に検証された
 MailUnsubcribe=登録を解除する
 MailingStatusNotContact=もう連絡しないこと
 MailingStatusReadAndUnsubscribe=読んで購読を解除する
 ErrorMailRecipientIsEmpty=電子メールの受信者は空 
-WarningNoEMailsAdded=受信者のリストに追加するない新しい電子メール。
+WarningNoEMailsAdded=受信者のリストに追加するない新規電子メール。
 ConfirmValidMailing=このメールを検証してもよいか？
 ConfirmResetMailing=警告、電子メール<b> %s </b>を再初期化することにより、この電子メールを一括メールで再送信できるようになる。これを実行してもよいか？
 ConfirmDeleteMailing=このメールを削除してもよいか？
 NbOfUniqueEMails=固有のメールの数
 NbOfEMails=メールの数
 TotalNbOfDistinctRecipients=異なる受信者の数
-NoTargetYet=受信者が（タブ '受信'に行く）はまだ定義されていない
+NoTargetYet=受信者が(タブ '受信'に行く)はまだ定義されていない
 NoRecipientEmail=%sの受信者メールがない
 RemoveRecipient=受信者を削除する
 YouCanAddYourOwnPredefindedListHere=メールセレクタモジュールを作成するには、htdocsには、/ /モジュール/郵送/ READMEを含む参照すること。
@@ -72,10 +72,10 @@ ActivateCheckReadKey=「開封確認」および「退会」機能に使用さ
 EMailSentToNRecipients=%s受信者に送信される電子メール。
 EMailSentForNElements=%s要素に対して送信された電子メール。
 XTargetsAdded= <b> %s</b>受信者がターゲットリストに追加された
-OnlyPDFattachmentSupported=送信するオブジェクトのPDFドキュメントがすでに生成されている場合は、電子メールに添付される。そうでない場合、電子メールは送信されない（また、このバージョンでは、大量送信の添付ファイルとしてPDFドキュメントのみがサポートされていることに注意すること）。
-AllRecipientSelected=選択された%sレコードの受信者（電子メールがわかっている場合）。
+OnlyPDFattachmentSupported=送信するオブジェクトのPDFドキュメントがすでに生成されている場合は、電子メールに添付される。そうでない場合、電子メールは送信されない(また、このバージョンでは、大量送信の添付ファイルとしてPDFドキュメントのみがサポートされていることに注意すること)。
+AllRecipientSelected=選択された%sレコードの受信者(電子メールがわかっている場合)。
 GroupEmails=グループメール
-OneEmailPerRecipient=受信者ごとに1つの電子メール（デフォルトでは、選択されたレコードごとに1つの電子メール）
+OneEmailPerRecipient=受信者ごとに1つの電子メール(デフォルトでは、選択されたレコードごとに1つの電子メール)
 WarningIfYouCheckOneRecipientPerEmail=警告、このチェックボックスをオンにすると、選択した複数の異なるレコードに対して1つのメールのみが送信されるため、メッセージにレコードのデータを参照する置換変数が含まれている場合、それらを置き換えることはできなくなる。
 ResultOfMailSending=大量のメール送信の結果
 NbSelected=選択した番号
@@ -83,15 +83,16 @@ NbIgnored=無視された数
 NbSent=送信番号
 SentXXXmessages=%sメッセージ(s)が送信された。
 ConfirmUnvalidateEmailing=メール<b>%s </b>をドラフトステータスに変更してもよいか？
-MailingModuleDescContactsWithThirdpartyFilter=顧客フィルターとの接触
+MailingModuleDescContactsWithThirdpartyFilter=顧客フィルタとの接触
 MailingModuleDescContactsByCompanyCategory=サードパーティカテゴリ別の連絡先
 MailingModuleDescContactsByCategory=カテゴリ別の連絡先
 MailingModuleDescContactsByFunction=位置別の連絡先
 MailingModuleDescEmailsFromFile=ファイルからのメール
 MailingModuleDescEmailsFromUser=ユーザが入力したメール
 MailingModuleDescDolibarrUsers=メールを持っているユーザ
-MailingModuleDescThirdPartiesByCategories=サードパーティ（カテゴリ別）
+MailingModuleDescThirdPartiesByCategories=サードパーティ(カテゴリ別)
 SendingFromWebInterfaceIsNotAllowed=Webインターフェイスからの送信は許可されていない。
+EmailCollectorFilterDesc=メールを取得するには、すべてのフィルタが適合している必要がある
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=ファイル内の行%s
@@ -121,7 +122,7 @@ TagCheckMail=メールの開封を追跡する
 TagUnsubscribe=退会リンク
 TagSignature=送信ユーザの署名
 EMailRecipient=受信者のEメール
-TagMailtoEmail=受信者の電子メール（html「mailto：」リンクを含む）
+TagMailtoEmail=受信者の電子メール(html「mailto：」リンクを含む)
 NoEmailSentBadSenderOrRecipientEmail=メールは送信されない。送信者または受信者の電子メールが正しくない。ユーザプロファイルを確認する。
 # Module Notifications
 Notifications=通知
@@ -129,19 +130,19 @@ NotificationsAuto=通知自動。
 NoNotificationsWillBeSent=このイベントタイプと法人では、自動電子メール通知は計画されていない
 ANotificationsWillBeSent=1つの自動通知が電子メールで送信される
 SomeNotificationsWillBeSent=%s自動通知は電子メールで送信される
-AddNewNotification=新しい自動電子メール通知ターゲット/イベントをアクティブ化する
-ListOfActiveNotifications=自動電子メール通知のすべてのアクティブなターゲット/イベントを一覧表示する
+AddNewNotification=新規自動電子メール通知を購読する(ターゲット/イベント)
+ListOfActiveNotifications=自動電子メール通知のすべてのアクティブなサブスクリプション(ターゲット/イベント)を一覧表示する
 ListOfNotificationsDone=送信されたすべての自動電子メール通知を一覧表示する
 MailSendSetupIs=電子メール送信の構成は「%s」に設定されている。このモードは、大量の電子メールを送信するために使用することはできない。
 MailSendSetupIs2=モード'%s'を使うには、まず、管理者アカウントを使用して、メニュー%sホーム - 設定 - メール %sに移動し、パラメーター<strong>'%s '</strong>を変更する。このモードでは、インターネットサービスプロバイダーが提供するSMTPサーバーの設定に入り、大量電子メールの機能を使用できる。
 MailSendSetupIs3=SMTPサーバーの設定方法について質問がある場合は、%sに問い合わせることができる。
-YouCanAlsoUseSupervisorKeyword=キーワード<strong>__SUPERVISOREMAIL__ </strong>を追加して、ユーザのスーパーバイザーに電子メールを送信することもできる（このスーパーバイザーに電子メールが定義されている場合にのみ機能する）。
+YouCanAlsoUseSupervisorKeyword=キーワード<strong>__SUPERVISOREMAIL__ </strong>を追加して、ユーザのスーパーバイザーに電子メールを送信することもできる(このスーパーバイザーに電子メールが定義されている場合にのみ機能する)。
 NbOfTargetedContacts=対象となる連絡先メールの現在の数
 UseFormatFileEmailToTarget=インポートされたファイルの形式は<strong>email; name; firstname; other</strong>である必要がある
 UseFormatInputEmailToTarget=<strong> email; name; firstname; other</strong>の形式で文字列を入力する
-MailAdvTargetRecipients=受信者（高度な選択）
+MailAdvTargetRecipients=受信者(高度な選択)
 AdvTgtTitle=入力フィールドに入力して、ターゲットとするサードパーティまたは連絡先/アドレスを事前に選択する
-AdvTgtSearchTextHelp=ワイルドカードとして%%を使用する。たとえば、<b> jean、joe、jim </b>などのすべてのアイテムを検索するには、<b> j%% </b>と入力し、;を使用することもできる。値の区切り文字として使用し、！を使用する。この値を除いて。たとえば、<b> jean; joe; jim%%;！jimo;！jima%%</b>は、すべてのjean、joe、jimで始まりますが、jimoではなく、jimaで始まるすべてのものではない。
+AdvTgtSearchTextHelp=ワイルドカードとして %% を使用。たとえば、<b>jean, joe, jim</b> のような全アイテムを探すには、 <b>j%%</b> を入力、値の区切り文字として  ;  を使用し、値の除外として ! を使用できる。たとえば  <b>jean;joe;jim%%;!jimo;!jima%%</b> なら、すべての jean, joe と jim で始まる文字列の内で  jimo でないものと jima で始まるものを除外したすべてを意味する。
 AdvTgtSearchIntHelp=間隔を使用してintまたはfloat値を選択する
 AdvTgtMinVal=最小値
 AdvTgtMaxVal=最大値
@@ -156,21 +157,23 @@ RemoveAll=すべて削除する
 ItemsCount=アイテム(s)
 AdvTgtNameTemplate=フィルタ名
 AdvTgtAddContact=基準に従ってメールを追加する
-AdvTgtLoadFilter=ロードフィルター
+AdvTgtLoadFilter=ロードフィルタ
 AdvTgtDeleteFilter=フィルタを削除する
 AdvTgtSaveFilter=フィルタを保存
 AdvTgtCreateFilter=フィルタを作成する
-AdvTgtOrCreateNewFilter=新しいフィルターの名前
+AdvTgtOrCreateNewFilter=新規フィルタの名前
 NoContactWithCategoryFound=カテゴリの連絡先/住所が見つからない
 NoContactLinkedToThirdpartieWithCategoryFound=カテゴリの連絡先/住所が見つからない
 OutGoingEmailSetup=送信メール
 InGoingEmailSetup=受信メール
-OutGoingEmailSetupForEmailing=送信メール（モジュール%sの場合）
+OutGoingEmailSetupForEmailing=送信メール(モジュール%sの場合)
 DefaultOutgoingEmailSetup=グローバルな送信メール設定と同じ構成
 Information=情報
-ContactsWithThirdpartyFilter=サードパーティのフィルターを使用した連絡先
+ContactsWithThirdpartyFilter=サードパーティのフィルタを使用した連絡先
 Unanswered=未回答
 Answered=答えた
-IsNotAnAnswer=回答でない（最初のメール）
+IsNotAnAnswer=回答でない(最初のメール)
 IsAnAnswer=最初のメールの回答 
 RecordCreatedByEmailCollector=電子メールコレクター%sによって電子メール%sから作成されたレコード
+DefaultBlacklistMailingStatus=一括メール送信を拒否するためのデフォルトの連絡先ステータス
+DefaultStatusEmptyMandatory=空だが必須
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 3612332cbff..ef5a5e7ff91 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=このメールタイプには適用可能なテンプレー
 AvailableVariables=適用可能な代替変数s
 NoTranslation=翻訳無し
 Translation=翻訳
+CurrentTimeZone=PHP(サーバー)のタイムゾーン
 EmptySearchString=空文字以外の検索候補を入力
+EnterADateCriteria=日付基準を入力する
 NoRecordFound=発見レコードは無し
 NoRecordDeleted=削除レコードは無し
 NotEnoughDataYet=データが不十分
@@ -83,8 +85,10 @@ FileTransferComplete=ファイルが正常にアップロードされました
 FilesDeleted=ファイルが正常に削除されました
 FileWasNotUploaded=ファイルが添付ファイルが選択されているが、まだアップロードされませんでした。このために &quot;添付ファイル&quot;をクリックしてください。
 NbOfEntries=エントリー番号
-GoToWikiHelpPage=オンラインヘルプを読む（インターネットアクセスが必要）
+GoToWikiHelpPage=オンラインヘルプを読む(インターネットアクセスが必要)
 GoToHelpPage=ヘルプを見る
+DedicatedPageAvailable=現在の画面に関連する専用のヘルプページがある
+HomePage=ホームページ
 RecordSaved=レコード保存
 RecordDeleted=レコード削除
 RecordGenerated=レコード生成
@@ -110,13 +114,13 @@ ReturnCodeLastAccessInError=最新のデータベースアクセス要求エラ
 InformationLastAccessInError=最新のデータベースアクセス要求エラーに関する情報
 DolibarrHasDetectedError=Dolibarrで技術的なエラーを検出
 YouCanSetOptionDolibarrMainProdToZero=詳細については、ログファイルを読み取るか、構成ファイルでオプション$ dolibarr_main_prodを「0」に設定してください。
-InformationToHelpDiagnose=この情報は診断目的に役立ちます（オプション$ dolibarr_main_prodを「1」に設定してそのような通知を削除できます）
+InformationToHelpDiagnose=この情報は診断目的に役立ちます(オプション$ dolibarr_main_prodを「1」に設定してそのような通知を削除できます)
 MoreInformation=もっと知りたい
 TechnicalInformation=技術的情報
 TechnicalID=技術ID
 LineID=行ID
-NotePublic=注（パブリック）
-NotePrivate=（注）（プライベート）
+NotePublic=注(パブリック)
+NotePrivate=(注)(プライベート)
 PrecisionUnitIsLimitedToXDecimals=Dolibarrの設定により、単価の精度は小数点以下<b>%s</b>桁。
 DoTest=テスト
 ToFilter=フィルタ
@@ -218,8 +222,9 @@ Parameter=パラメーター
 Parameters=パラメータ
 Value=値
 PersonalValue=個人的価値
-NewObject=新しい%s
-NewValue=新しい値
+NewObject=新規%s
+NewValue=新規値
+OldValue=古い値%s
 CurrentValue=電流値
 Code=コー​​ド
 Type=タイプ
@@ -258,7 +263,7 @@ Cards=カード
 Card=カード
 Now=現在
 HourStart=開始時間
-Deadline=Deadline
+Deadline=締切
 Date=日付
 DateAndHour=日付と時間
 DateToday=今日の日付
@@ -267,10 +272,10 @@ DateStart=開始日
 DateEnd=終了日
 DateCreation=作成日
 DateCreationShort=クリート。日付
-IPCreation=Creation IP
+IPCreation=作成IP
 DateModification=変更日
 DateModificationShort=MODIF。日付
-IPModification=Modification IP
+IPModification=変更IP
 DateLastModification=最新の変更日
 DateValidation=検証日
 DateClosing=日付を閉じる
@@ -285,7 +290,7 @@ DateProcess=処理日
 DateBuild=日付をビルドレポート
 DatePayment=支払日
 DateApprove=承認日
-DateApprove2=承認日（2回目の承認）
+DateApprove2=承認日(2回目の承認)
 RegistrationDate=登録日
 UserCreation=作成ユーザー
 UserModification=変更ユーザー
@@ -347,33 +352,33 @@ Copy=コピー
 Paste=貼り付ける
 Default=デフォルト
 DefaultValue=デフォルト値
-DefaultValues=デフォルト値/フィルター/ソート
+DefaultValues=デフォルト値/フィルタ/ソート
 Price=価格
-PriceCurrency=価格（通貨）
+PriceCurrency=価格(通貨)
 UnitPrice=単価
-UnitPriceHT=単価（除く）
-UnitPriceHTCurrency=単価（除く）（通貨）
+UnitPriceHT=単価(除く)
+UnitPriceHTCurrency=単価(除く)(通貨)
 UnitPriceTTC=単価
 PriceU=UP
-PriceUHT=UP（純額）
-PriceUHTCurrency=U.P（通貨）
-PriceUTTC=アップ。 （税込）
+PriceUHT=UP(純額)
+PriceUHTCurrency=U.P(通貨)
+PriceUTTC=アップ。 (税込)
 Amount=量
 AmountInvoice=請求額
 AmountInvoiced=請求額
-AmountInvoicedHT=請求額（税抜）
-AmountInvoicedTTC=請求額（税込）
+AmountInvoicedHT=請求額(税抜)
+AmountInvoicedTTC=請求額(税込)
 AmountPayment=支払金額
-AmountHTShort=金額（除く）
-AmountTTCShort=金額（税込）
-AmountHT=金額（税込）
-AmountTTC=金額（税込）
+AmountHTShort=金額(除く)
+AmountTTCShort=金額(税込)
+AmountHT=金額(税込)
+AmountTTC=金額(税込)
 AmountVAT=金額税
 MulticurrencyAlreadyPaid=すでに支払われた元の通貨
 MulticurrencyRemainderToPay=元の通貨で支払いを続ける
 MulticurrencyPaymentAmount=お支払い金額、元の通貨
-MulticurrencyAmountHT=金額（税抜き）、元の通貨
-MulticurrencyAmountTTC=金額（税込み）、元の通貨
+MulticurrencyAmountHT=金額(税抜き)、元の通貨
+MulticurrencyAmountTTC=金額(税込み)、元の通貨
 MulticurrencyAmountVAT=金額税、元の通貨
 MulticurrencySubPrice=サブプライス多通貨の金額
 AmountLT1=税額2
@@ -382,20 +387,20 @@ AmountLT1ES=量RE
 AmountLT2ES=量IRPF
 AmountTotal=合計金額
 AmountAverage=平均額
-PriceQtyMinHT=価格数量最小（税抜）
-PriceQtyMinHTCurrency=価格数量最小（税抜き）（通貨）
+PriceQtyMinHT=価格数量最小(税抜)
+PriceQtyMinHTCurrency=価格数量最小(税抜き)(通貨)
 Percentage=割合
 Total=合計
 SubTotal=小計
-TotalHTShort=合計（除く）
-TotalHT100Short=合計100%%（除く）
-TotalHTShortCurrency=合計（通貨を除く）
-TotalTTCShort=合計（税込）
-TotalHT=合計（税込）
-TotalHTforthispage=このページの合計（税抜き）
+TotalHTShort=合計(除く)
+TotalHT100Short=合計100%%(除く)
+TotalHTShortCurrency=合計(通貨を除く)
+TotalTTCShort=合計(税込)
+TotalHT=合計(税込)
+TotalHTforthispage=このページの合計(税抜き)
 Totalforthispage=このページの合計
-TotalTTC=合計（税込）
-TotalTTCToYourCredit=あなたのクレジットの合計（税込）
+TotalTTC=合計(税込)
+TotalTTCToYourCredit=あなたのクレジットの合計(税込)
 TotalVAT=合計税
 TotalVATIN=合計IGST
 TotalLT1=総税2
@@ -433,6 +438,7 @@ RemainToPay=支払いを続ける
 Module=モジュール/アプリケーション
 Modules=モジュール/アプリケーション
 Option=オプション
+Filters=フィルタ
 List=リスト
 FullList=全リスト
 FullConversation=完全な会話
@@ -506,7 +512,7 @@ Quantity=量
 Qty=個数
 ChangedBy=によって変更され
 ApprovedBy=によって承認された
-ApprovedBy2=承認者（2回目の承認）
+ApprovedBy2=承認者(2回目の承認)
 Approved=承認された
 Refused=拒否
 ReCalculate=再計算
@@ -650,6 +656,7 @@ SupplierPreview=ベンダープレビュー
 ShowCustomerPreview=顧客のプレビューを表示する
 ShowSupplierPreview=ベンダープレビューを表示
 RefCustomer=顧客参照符号
+InternalRef=内部参照
 Currency=通貨
 InfoAdmin=管理者向け情報
 Undo=元に戻す
@@ -671,7 +678,7 @@ SendMail=メールを送る
 Email=Eメール
 NoEMail=まだメールしない
 AlreadyRead=すでに読んだ
-NotRead=読んでいません
+NotRead=未読
 NoMobilePhone=携帯電話はありません
 Owner=所有者
 FollowingConstantsWillBeSubstituted=以下の定数は、対応する値を持つ代替となります。
@@ -705,7 +712,7 @@ NeverReceived=受信しませんでした
 Canceled=キャンセル
 YouCanChangeValuesForThisListFromDictionarySetup=このリストの値は、メニューの[設定]-[辞書]から変更できます。
 YouCanChangeValuesForThisListFrom=このリストの値は、メニュー%sから変更できます。
-YouCanSetDefaultValueInModuleSetup=モジュール設定で新しいレコードを作成するときに使用されるデフォルト値を設定できます
+YouCanSetDefaultValueInModuleSetup=モジュール設定で新規レコードを作成するときに使用されるデフォルト値を設定できます
 Color=カラー
 Documents=リンクされたファイル
 Documents2=ドキュメント
@@ -716,7 +723,7 @@ MenuAWStats=AWStatsは
 MenuMembers=メンバー
 MenuAgendaGoogle=Googleの議題
 MenuTaxesAndSpecialExpenses=税金|特別経費
-ThisLimitIsDefinedInSetup=Dolibarr制限（メニューホームセットアップ·セキュリティ）：%s KB、PHP制限：%s KB
+ThisLimitIsDefinedInSetup=Dolibarr制限(メニューホームセットアップ·セキュリティ)：%s KB、PHP制限：%s KB
 NoFileFound=このディレクトリに保存されない文書ません
 CurrentUserLanguage=現在の言語
 CurrentTheme=現在のテーマ
@@ -732,11 +739,11 @@ DateOfSignature=署名日
 HidePassword=隠されたパスワードを使用してコマンドを表示する
 UnHidePassword=明確なパスワードを使用して実際のコマンドを表示する
 Root=ルート
-RootOfMedias=パブリックメディアのルート（/ medias）
+RootOfMedias=パブリックメディアのルート(/ medias)
 Informations=情報
 Page=ページ
 Notes=注釈
-AddNewLine=新しい行を追加します。
+AddNewLine=新規行を追加します。
 AddFile=ファイルを追加します。
 FreeZone=フリーテキスト製品
 FreeLineOfType=フリーテキストアイテム、タイプ：
@@ -755,7 +762,7 @@ ValidatePayment=支払いを検証する
 CreditOrDebitCard=クレジットカードまたはデビットカード
 FieldsWithAreMandatory=<b>%s</b>のフィールドは必須です
 FieldsWithIsForPublic=<b> %s </b>のフィールドは、メンバーの公開リストに表示されます。これを望まない場合は、「公開」ボックスのチェックを外してください。
-AccordingToGeoIPDatabase=（GeoIP変換による）
+AccordingToGeoIPDatabase=(GeoIP変換による)
 Line=ライン
 NotSupported=サポートされていません
 RequiredField=必須フィールド
@@ -775,7 +782,7 @@ After=後の
 IPAddress=IPアドレス
 Frequency=周波数
 IM=インスタントメッセージ
-NewAttribute=新しい属性
+NewAttribute=新規属性
 AttributeCode=属性コード
 URLPhoto=写真/ロゴのURL
 SetLinkToAnotherThirdParty=別の第三者へのリンク
@@ -823,7 +830,7 @@ Access=アクセス
 SelectAction=アクションを選択
 SelectTargetUser=ターゲットユーザー/従業員を選択します
 HelpCopyToClipboard=Ctrl + Cを使用してクリップボードにコピーします
-SaveUploadedFileWithMask=「<strong>%s</strong>」（それ以外の場合は「%s」）という名前でファイルをサーバーに保存します
+SaveUploadedFileWithMask=「<strong>%s</strong>」(それ以外の場合は「%s」)という名前でファイルをサーバーに保存します
 OriginFileName=元のファイル名
 SetDemandReason=ソースを設定
 SetBankAccount=銀行口座を定義する
@@ -857,7 +864,7 @@ Sincerely=心から
 ConfirmDeleteObject=このオブジェクトを削除してもよろしいですか？
 DeleteLine=行を削除
 ConfirmDeleteLine=この行を削除してもよろしいですか？
-ErrorPDFTkOutputFileNotFound=エラー：ファイルは生成されませんでした。 'pdftk'コマンドが$ PATH環境変数（linux / unixのみ）に含まれるディレクトリーにインストールされていることを確認するか、システム管理者に連絡してください。
+ErrorPDFTkOutputFileNotFound=エラー：ファイルは生成されませんでした。 'pdftk'コマンドが$ PATH環境変数(linux / unixのみ)に含まれるディレクトリーにインストールされていることを確認するか、システム管理者に連絡してください。
 NoPDFAvailableForDocGenAmongChecked=チェックされたレコードの中でドキュメント生成に使用できるPDFがありませんでした
 TooManyRecordForMassAction=マスアクション用に選択されたレコードが多すぎます。アクションは、%sレコードのリストに制限されています。
 NoRecordSelected=レコードが選択されていません
@@ -892,8 +899,8 @@ ViewAccountList=元帳を表示
 ViewSubAccountList=補助科目元帳を表示
 RemoveString=文字列 '%s'を削除します
 SomeTranslationAreUncomplete=提供された言語の一部において、翻訳がほんの部分的だったり誤っていたりなの。自分の言語の訂正を助けたい人は、<a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a> に登録して、改善案を追加してね。
-DirectDownloadLink=直接ダウンロードリンク（公開/外部）
-DirectDownloadInternalLink=直接ダウンロードリンク（ログに記録する必要があり、権限が必要です）
+DirectDownloadLink=直接ダウンロードリンク(公開/外部)
+DirectDownloadInternalLink=直接ダウンロードリンク(ログに記録する必要があり、権限が必要です)
 Download=ダウンロード
 DownloadDocument=ドキュメントをダウンロード
 ActualizeCurrency=為替レートを更新する
@@ -924,7 +931,7 @@ Lead=鉛
 Leads=リード
 ListOpenLeads=オープンリードのリスト
 ListOpenProjects=開いているプロジェクトを一覧表示する
-NewLeadOrProject=新しいリードまたはプロジェクト
+NewLeadOrProject=新規リードまたはプロジェクト
 Rights=パーミッション
 LineNb=行番号
 IncotermLabel=インコタームズ
@@ -998,7 +1005,7 @@ Select2NotFound=結果が見つかりません
 Select2Enter=入る
 Select2MoreCharacter=以上のキャラクター
 Select2MoreCharacters=以上の文字
-Select2MoreCharactersMore= <strong>検索構文：</strong> <br> <kbd> <strong> | </strong> </kbd> <kbd> OR </kbd>（| B）</kbd>と<br> <kbd> <strong> * </strong> </kbd> <kbd>任意の文字</kbd>（* b）の<br> <kbd> <strong> ^ </strong> </kbd> <kbd>スタート</kbd>と（^ AB）<br> <kbd> <strong> $ </strong> </kbd> <kbd>エンド（ ab $）<br>
+Select2MoreCharactersMore= <strong>検索構文：</strong> <br> <kbd> <strong> | </strong> </kbd> <kbd> OR </kbd>(| B)</kbd>と<br> <kbd> <strong> * </strong> </kbd> <kbd>任意の文字</kbd>(* b)の<br> <kbd> <strong> ^ </strong> </kbd> <kbd>スタート</kbd>と(^ AB)<br> <kbd> <strong> $ </strong> </kbd> <kbd>エンド( ab $)<br>
 Select2LoadingMoreResults=より多くの結果を読み込んでいます...
 Select2SearchInProgress=進行中の検索...
 SearchIntoThirdparties=サードパーティ
@@ -1106,4 +1113,10 @@ SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=セキュリティト
 UpToDate=最新の
 OutOfDate=時代遅れ
 EventReminder=イベントリマインダー
-UpdateForAllLines=Update for all lines
+UpdateForAllLines=すべての行を更新
+OnHold=保留
+Civility=敬称
+AffectTag=タグに影響を与える
+ConfirmAffectTag=バルクタグの影響
+ConfirmAffectTagQuestion=選択した%sレコード(s)のタグに影響を与えてもよいか？
+CategTypeNotFound=レコードのタイプのタグタイプが見つからない
diff --git a/htdocs/langs/ja_JP/margins.lang b/htdocs/langs/ja_JP/margins.lang
index e2cda1b797d..ab5f6299a45 100644
--- a/htdocs/langs/ja_JP/margins.lang
+++ b/htdocs/langs/ja_JP/margins.lang
@@ -22,7 +22,7 @@ ProductService=製品やサービス
 AllProducts=すべての製品とサービス
 ChooseProduct/Service=製品またはサービスを選択すること
 ForceBuyingPriceIfNull=定義されていない場合、購入/原価を販売価格に強制する
-ForceBuyingPriceIfNullDetails=購入/原価が定義されておらず、このオプションが「オン」の場合、利益はオンラインでゼロになる（購入/原価=販売価格）。それ以外の場合（「オフ」）、利益は提案されたデフォルトと等しくなる。
+ForceBuyingPriceIfNullDetails=購入/原価が定義されておらず、このオプションが「オン」の場合、利益はオンラインでゼロになる(購入/原価=販売価格)。それ以外の場合(「オフ」)、利益は提案されたデフォルトと等しくなる。
 MARGIN_METHODE_FOR_DISCOUNT=グローバル割引の利益方式
 UseDiscountAsProduct=製品として
 UseDiscountAsService=サービスとして
@@ -30,16 +30,16 @@ UseDiscountOnTotal=小計について
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=グローバル割引を製品、サービスとして扱うか、利益計算の小計としてのみ扱うかを定義する。
 MARGIN_TYPE=利益計算のためにデフォルトで提案された購入/原価
 MargeType1=最高のベンダー価格の利益
-MargeType2=加重平均価格（WAP）の利益
+MargeType2=加重平均価格(WAP)の利益
 MargeType3=原価利益
-MarginTypeDesc=*ベストバイイング価格の利益=販売価格-製品カードで定義されたベストベンダー価格<br> *加重平均価格（WAP）の利益=販売価格-製品加重平均価格（WAP）またはWAPがまだ定義されていない場合のベストベンダー価格<br> *利益onコスト価格=販売価格-コスト価格が定義されていない場合は製品カードまたはWAPで定義されたコスト価格、またはWAPがまだ定義されていない場合は最良のベンダー価格
+MarginTypeDesc=*ベストバイイング価格の利益=販売価格-製品カードで定義されたベストベンダー価格<br> *加重平均価格(WAP)の利益=販売価格-製品加重平均価格(WAP)またはWAPがまだ定義されていない場合のベストベンダー価格<br> *利益onコスト価格=販売価格-コスト価格が定義されていない場合は製品カードまたはWAPで定義されたコスト価格、またはWAPがまだ定義されていない場合は最良のベンダー価格
 CostPrice=原価
 UnitCharges=ユニット料金
 Charges=料金
 AgentContactType=商業代理店の連絡先タイプ
-AgentContactTypeDetails=連絡先/住所ごとの利益レポートに使用される連絡先タイプ（請求書にリンクされている）を定義する。ほとんどの場合、連絡先が請求書で明示的に定義されていない可能性があるため、連絡先の統計の読み取りは信頼できないことに注意すること。
+AgentContactTypeDetails=連絡先/住所ごとの利益レポートに使用される連絡先タイプ(請求書にリンクされている)を定義する。ほとんどの場合、連絡先が請求書で明示的に定義されていない可能性があるため、連絡先の統計の読み取りは信頼できないことに注意すること。
 rateMustBeNumeric=レートは数値でなければなりません
 markRateShouldBeLesserThan100=マーク率は100未満である必要がある
 ShowMarginInfos=利益情報を表示する
 CheckMargins=利益の詳細
-MarginPerSaleRepresentativeWarning=ユーザーあたりの利益のレポートは、サードパーティと営業担当者の間のリンクを使用して、各営業担当者の利益を計算する。一部のサードパーティには専任の営業担当者がいない場合や、一部のサードパーティが複数にリンクされている場合があるため、一部の金額はこのレポートに含まれない場合があり（営業担当者がいない場合）、一部は異なる行に表示される場合がある（営業担当者ごとに） 。
+MarginPerSaleRepresentativeWarning=ユーザーあたりの利益のレポートは、サードパーティと営業担当者の間のリンクを使用して、各営業担当者の利益を計算する。一部のサードパーティには専任の営業担当者がいない場合や、一部のサードパーティが複数にリンクされている場合があるため、一部の金額はこのレポートに含まれない場合があり(営業担当者がいない場合)、一部は異なる行に表示される場合がある(営業担当者ごとに) 。
diff --git a/htdocs/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang
index d449616166c..bbea9f1697c 100644
--- a/htdocs/langs/ja_JP/members.lang
+++ b/htdocs/langs/ja_JP/members.lang
@@ -11,13 +11,13 @@ MembersTickets=メンバチケット
 FundationMembers=Foundationのメンバ
 ListOfValidatedPublicMembers=検証済みのパブリックメンバのリスト
 ErrorThisMemberIsNotPublic=このメンバは、パブリックではない
-ErrorMemberIsAlreadyLinkedToThisThirdParty=別のメンバ（名前<b>：%s、</b>ログイン<b>：%s）</b>は既に取引先製の<b>%s</b>にリンクされている。第三者が唯一のメンバ（およびその逆）にリンクすることはできないので、最初にこのリンクを削除する。
+ErrorMemberIsAlreadyLinkedToThisThirdParty=別のメンバ(名前<b>：%s、</b>ログイン<b>：%s)</b>は既に取引先製の<b>%s</b>にリンクされている。第三者が唯一のメンバ(およびその逆)にリンクすることはできないので、最初にこのリンクを削除する。
 ErrorUserPermissionAllowsToLinksToItselfOnly=セキュリティ上の理由から、あなたはすべてのユーザーが自分のものでないユーザーにメンバをリンクすることができるように編集する権限を付与する必要がある。
 SetLinkToUser=Dolibarrユーザーへのリンク
 SetLinkToThirdParty=Dolibarr第三者へのリンク
 MembersCards=メンバの名刺
 MembersList=メンバのリスト
-MembersListToValid=ドラフトのメンバのリスト（検証する）
+MembersListToValid=ドラフトのメンバのリスト(検証する)
 MembersListValid=有効なメンバのリスト
 MembersListUpToDate=最新のサブスクリプションを持つ有効なメンバのリスト
 MembersListNotUpToDate=サブスクリプションが古くなっている有効なメンバのリスト
@@ -39,9 +39,9 @@ MemberType=メンバ型
 MemberTypeId=メンバの種別ID
 MemberTypeLabel=メンバの種別ラベル
 MembersTypes=メンバの種類
-MemberStatusDraft=ドラフト（検証する必要がある）
+MemberStatusDraft=ドラフト(検証する必要がある)
 MemberStatusDraftShort=ドラフト
-MemberStatusActive=検証（サブスクリプションを待っている）
+MemberStatusActive=検証(サブスクリプションを待っている)
 MemberStatusActiveShort=検証
 MemberStatusActiveLate=サブスクリプションの有効期限が切れた
 MemberStatusActiveLateShort=期限切れの
@@ -51,7 +51,7 @@ MemberStatusResiliated=終了メンバ
 MemberStatusResiliatedShort=終了しました
 MembersStatusToValid=ドラフトのメンバ
 MembersStatusResiliated=終了したメンバ
-MemberStatusNoSubscription=検証済み（サブスクリプションは不要）
+MemberStatusNoSubscription=検証済み(サブスクリプションは不要)
 MemberStatusNoSubscriptionShort=検証
 SubscriptionNotNeeded=サブスクリプションは必要ない
 NewCotisation=新規貢献
@@ -64,7 +64,7 @@ ConfirmDeleteMemberType=このメンバ種別を削除してもよいか？
 MemberTypeDeleted=メンバ種別が削除された
 MemberTypeCanNotBeDeleted=メンバ種別は削除できない
 NewSubscription=新規サブスクリプション
-NewSubscriptionDesc=このフォームで、財団の新規メンバとして、サブスクリプションを記録することができる。あなたが（既にメンバであり）、サブスクリプションを更新したい場合は、電子メール%sではなく財団理事会に連絡すること。
+NewSubscriptionDesc=このフォームで、財団の新規メンバとして、サブスクリプションを記録することができる。あなたが(既にメンバであり)、サブスクリプションを更新したい場合は、電子メール%sではなく財団理事会に連絡すること。
 Subscription=サブスクリプション
 Subscriptions=サブスクリプション
 SubscriptionLate=遅い
@@ -85,7 +85,7 @@ Reenable=再度有効にする
 ResiliateMember=メンバを終了する
 ConfirmResiliateMember=このメンバを終了してもよいか？
 DeleteMember=メンバを削除する
-ConfirmDeleteMember=このメンバを削除してもよいか（メンバを削除すると、すべてのサブスクリプションが削除される）。
+ConfirmDeleteMember=このメンバを削除してもよいか(メンバを削除すると、すべてのサブスクリプションが削除される)。
 DeleteSubscription=サブスクリプションを削除する
 ConfirmDeleteSubscription=このサブスクリプションを削除してもよいか？
 Filehtpasswd=htpasswdファイル
@@ -128,7 +128,7 @@ CardContent=あなたの会員カードの内容
 ThisIsContentOfYourMembershipRequestWasReceived=メンバシップリクエストを受信したことをお知らせする。 <br> <br>
 ThisIsContentOfYourMembershipWasValidated=メンバシップが次の情報で検証されたことをお知らせする：<br> <br>
 ThisIsContentOfYourSubscriptionWasRecorded=新規サブスクリプションが記録されたことをお知らせする。 <br> <br>
-ThisIsContentOfSubscriptionReminderEmail=サブスクリプションの有効期限が近づいているか、すでに有効期限が切れていることをお知らせする（__MEMBER_LAST_SUBSCRIPTION_DATE_END__）。更新していただければ幸いです。 <br> <br>
+ThisIsContentOfSubscriptionReminderEmail=サブスクリプションの有効期限が近づいているか、すでに有効期限が切れていることをお知らせする(__MEMBER_LAST_SUBSCRIPTION_DATE_END__)。更新していただければ幸いです。 <br> <br>
 ThisIsContentOfYourCard=これは私たちがあなたについて持っている情報の要約です。何かが不正確であれば連絡すること。 <br> <br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=ゲストの自動登録の場合に受信する通知メールの件名
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=ゲストの自動登録の場合に受信する通知メールの内容
@@ -142,8 +142,8 @@ DescADHERENT_ETIQUETTE_TYPE=ラベルページのフォーマット
 DescADHERENT_ETIQUETTE_TEXT=メンバのアドレスシートに印刷されたテキスト
 DescADHERENT_CARD_TYPE=カードのページのフォーマット
 DescADHERENT_CARD_HEADER_TEXT=メンバカードの上に印刷されたテキスト
-DescADHERENT_CARD_TEXT=テキストは、（左揃え）メンバカードに印刷
-DescADHERENT_CARD_TEXT_RIGHT=テキストは（右揃え）のメンバカードに印刷
+DescADHERENT_CARD_TEXT=テキストは、(左揃え)メンバカードに印刷
+DescADHERENT_CARD_TEXT_RIGHT=テキストは(右揃え)のメンバカードに印刷
 DescADHERENT_CARD_FOOTER_TEXT=メンバカードの下部に印刷されたテキスト
 ShowTypeCard=種別 &quot;%s&quot;を表示
 HTPasswordExport=htpasswordファイルの生成
@@ -156,9 +156,9 @@ MoreActionBankViaInvoice=請求書と銀行口座での支払いを作成する
 MoreActionInvoiceOnly=なし支払いで請求書を作成する。
 LinkToGeneratedPages=訪問カードを生成
 LinkToGeneratedPagesDesc=この画面では、すべてのメンバまたは特定のメンバのためのビジネスカードを持つPDFファイルを生成することができる。
-DocForAllMembersCards=すべてのメンバ<b>（：%s</b>フォーマット出力の実際の設定）のためのビジネスカードを生成
-DocForOneMemberCards=特定のメンバの名刺を<b>（：%s</b>出力実際に設定するためのフォーマット）を生成
-DocForLabels=アドレスシート<b>（：%s</b>出力の形式は実際の設定）を生成
+DocForAllMembersCards=すべてのメンバ<b>(：%s</b>フォーマット出力の実際の設定)のためのビジネスカードを生成
+DocForOneMemberCards=特定のメンバの名刺を<b>(：%s</b>出力実際に設定するためのフォーマット)を生成
+DocForLabels=アドレスシート<b>(：%s</b>出力の形式は実際の設定)を生成
 SubscriptionPayment=サブスクリプション費用の支払い
 LastSubscriptionDate=最新のサブスクリプション支払いの日付
 LastSubscriptionAmount=最新のサブスクリプションの量
@@ -184,7 +184,7 @@ NewMemberForm=新規メンバフォーム
 SubscriptionsStatistics=サブスクリプションの統計
 NbOfSubscriptions=サブスクリプションの数
 AmountOfSubscriptions=サブスクリプションの量
-TurnoverOrBudget=売上高（法人の場合）または予算（基礎用）
+TurnoverOrBudget=売上高(法人の場合)または予算(基礎用)
 DefaultAmount=サブスクリプションのデフォルトの量
 CanEditAmount=訪問者は、そのサブスクリプションの量を選択/編集することができる
 MEMBER_NEWFORM_PAYONLINE=統合されたオンライン決済のページにジャンプ
@@ -200,7 +200,7 @@ SubscriptionRecorded=サブスクリプションが記録された
 NoEmailSentToMember=メンバにメールが送信されません
 EmailSentToMember=%sでメンバに送信された電子メール
 SendReminderForExpiredSubscriptionTitle=期限切れのサブスクリプションについてメールでリマインダーを送信する
-SendReminderForExpiredSubscription=サブスクリプションの有効期限が近づいたときに、メンバにメールでリマインダーを送信する（パラメーターは、リマインダーを送信するサブスクリプションの終了までの日数。セミコロンで区切った日数のリストにすることができる。 例：'10; 5; 0; -5'）
-MembershipPaid=現在の期間に支払われたメンバシップ（%sまで）
+SendReminderForExpiredSubscription=サブスクリプションの有効期限が近づいたときに、メンバにメールでリマインダーを送信する(パラメーターは、リマインダーを送信するサブスクリプションの終了までの日数。セミコロンで区切った日数のリストにすることができる。 例：'10; 5; 0; -5')
+MembershipPaid=現在の期間に支払われたメンバシップ(%sまで)
 YouMayFindYourInvoiceInThisEmail=このメールに請求書が添付されている場合がある
 XMembersClosed=%sメンバ(s)がクローズした
diff --git a/htdocs/langs/ja_JP/modulebuilder.lang b/htdocs/langs/ja_JP/modulebuilder.lang
index 00c0d9c6851..cd03bfe05a8 100644
--- a/htdocs/langs/ja_JP/modulebuilder.lang
+++ b/htdocs/langs/ja_JP/modulebuilder.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - loan
 ModuleBuilderDesc=このツールは、経験豊富なユーザーまたは開発者のみが使用する必要がある。独自のモジュールを構築または編集するためのユーティリティを提供する。代替の<a href="%s" target="_blank">手動開発のドキュメントは、</a>にある。
-EnterNameOfModuleDesc=作成するモジュール/アプリケーションの名前をスペースなしで入力する。大文字を使用して単語を区切る（例：MyModule、EcommerceForShop、SyncWithMySystem ...）
-EnterNameOfObjectDesc=作成するオブジェクトの名前をスペースなしで入力する。大文字を使用して単語を区切る（例：MyObject、Student、Teacher ...）。 CRUDクラスファイルだけでなく、APIファイル、オブジェクトを一覧表示/追加/編集/削除するページ、およびSQLファイルが生成される。
-ModuleBuilderDesc2=モジュールが生成/編集されるパス（%sに定義された外部モジュールの最初のディレクトリ）：<strong> %s </strong>
+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=新規モジュール
@@ -11,18 +11,18 @@ ModuleKey=モジュールキー
 ObjectKey=オブジェクトキー
 ModuleInitialized=モジュールが初期化された
 FilesForObjectInitialized=初期化された新規オブジェクト '%s'のファイル
-FilesForObjectUpdated=オブジェクト「%s」のファイルが更新された（.sqlファイルおよび.class.phpファイル）
+FilesForObjectUpdated=オブジェクト「%s」のファイルが更新された(.sqlファイルおよび.class.phpファイル)
 ModuleBuilderDescdescription=モジュールを説明するすべての一般情報をここに入力する。
-ModuleBuilderDescspecifications=まだ他のタブに構造化されていないモジュール仕様の詳細説明をここに入力できる。したがって、開発するすべてのルールに簡単にアクセスできる。また、このテキストコンテンツは、生成されたドキュメントに含まれる（最後のタブを参照）。 Markdown形式を使用できるが、Asciidoc形式を使用することをお勧めする（.mdと.asciidocの比較： http://asciidoctor.org/docs/user-manual/#compared-to-markdown ）。
+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=オブジェクトを削除できる。警告：オブジェクトに関連するすべてのコーディングファイル（手動で生成または作成されたもの）は削除される！
+ModuleBuilderDescbuildpackage=ここで、モジュールの「配布準備完了」パッケージファイル(正規化された.zipファイル)と「配布準備完了」ドキュメントファイルを生成できる。ボタンをクリックするだけで、パッケージまたはドキュメントファイルを作成できる。
+EnterNameOfModuleToDeleteDesc=モジュールを削除できる。警告：モジュールのすべてのコーディングファイル(手動で生成または作成されたもの)および構造化されたデータとドキュメントは削除される！
+EnterNameOfObjectToDeleteDesc=オブジェクトを削除できる。警告：オブジェクトに関連するすべてのコーディングファイル(手動で生成または作成されたもの)は削除される！
 DangerZone=危険区域
 BuildPackage=パッケージをビルドする
 BuildPackageDesc=アプリケーションのzipパッケージを生成して、Dolibarrで配布する準備を整えることができる。また、<a href="https://www.dolistore.com"> DoliStore.com</a>のようなマーケットプレイスで配布または販売することもできる。
@@ -40,8 +40,9 @@ PageForCreateEditView=レコードを作成/編集/表示するためのPHPペ
 PageForAgendaTab=イベントタブのPHPページ
 PageForDocumentTab=ドキュメントタブのPHPページ
 PageForNoteTab=メモタブのPHPページ
+PageForContactTab=連絡先タブのPHPページ
 PathToModulePackage=モジュール/アプリケーションパッケージのzipへのパス
-PathToModuleDocumentation=モジュール/アプリケーションドキュメントのファイルへのパス（%s）
+PathToModuleDocumentation=モジュール/アプリケーションドキュメントのファイルへのパス(%s)
 SpaceOrSpecialCharAreNotAllowed=スペースや特殊文字は使用できない。
 FileNotYetGenerated=ファイルはまだ生成されていない
 RegenerateClassAndSql=.classファイルと.sqlファイルの強制更新
@@ -51,7 +52,7 @@ LanguageFile=言語のファイル
 ObjectProperties=オブジェクトのプロパティ
 ConfirmDeleteProperty=プロパティ<strong>%s </strong>を削除してもよいか？これにより、PHPクラスのコードが変更されるが、オブジェクトのテーブル定義から列も削除される。
 NotNull=NULLではない
-NotNullDesc=1 =データベースをNOTNULLに設定する。 -1 = null値を許可し、空（ ''または0）の場合は値をNULLに強制する。
+NotNullDesc=1 =データベースをNOTNULLに設定する。 -1 = null値を許可し、空( ''または0)の場合は値をNULLに強制する。
 SearchAll=「すべて検索」に使用
 DatabaseIndex=データベースインデックス
 FileAlreadyExists=ファイル%sはすでに存在する
@@ -72,7 +73,7 @@ SqlFileExtraFields=補完属性のSQLファイル
 SqlFileKey=キーのSQLファイル
 SqlFileKeyExtraFields=補完的な属性のキーのSQLファイル
 AnObjectAlreadyExistWithThisNameAndDiffCase=この名前と別の大文字小文字のオブジェクトはすでに存在する
-UseAsciiDocFormat=Markdown形式を使用できるが、Asciidoc形式を使用することをお勧めする（.mdと.asciidocの比較： http://asciidoctor.org/docs/user-manual/#compared-to-markdown ）
+UseAsciiDocFormat=Markdown形式を使用できるが、Asciidoc形式を使用することをお勧めする(.mdと.asciidocの比較： http://asciidoctor.org/docs/user-manual/#compared-to-markdown )
 IsAMeasure=尺度は
 DirScanned=スキャンされたディレクトリ
 NoTrigger=トリガーなし
@@ -82,20 +83,20 @@ ListOfMenusEntries=メニューエントリのリスト
 ListOfDictionariesEntries=辞書エントリのリスト
 ListOfPermissionsDefined=定義された権限のリスト
 SeeExamples=こちらの例をご覧ください
-EnabledDesc=このフィールドをアクティブにする条件（例：1または$ conf-> global-> MYMODULE_MYOPTION）
-VisibleDesc=フィールドは表示されているか？ （例：0 =表示されない、1 =リストおよび作成/更新/表示フォームで表示、2 =リストでのみ表示、3 =作成/更新/表示フォームでのみ表示（リストではない）、4 =リストおよび更新/表示フォームでのみ表示（作成しない）、5 =リストおよび表示フォームでのみ表示（作成しない、更新しない）<br> <br>負の値を使用すると、フィールドはデフォルトでリストに表示されないが、表示用に選択できる）。 <br> <br>これは、次のような式にできる。例: <br> preg_match('/public/', $_SERVER['PHP_SELF'])?0:<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:<br>($user->rights->holiday->define_holiday ? 1 : 0)
 DisplayOnPdfDesc=互換性のあるPDFドキュメントでこのフィールドを表示する。「位置」フィールドで位置を管理できる。<br/>現在、既知の互換性のあるPDFモデルは次のとおり  : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>ドキュメントに対して :</strong><br/>0 = 非表示 <br/>1 = 表示<br/>2 = 空でない場合のみ表示<br/><br/><strong>ドキュメント行に対して :</strong><br/>0 = 非表示 <br/>1 = カラム内で表示<br/>3 = 説明欄の後の行説明カラムの中で表示<br/>4 = 空でない場合のみ、説明欄の後の行説明カラムの中で表示
 DisplayOnPdf=PDFで表示
-IsAMeasureDesc=フィールドの値を累積して、合計をリストに入れることはできるか？ （例：1または0）
-SearchAllDesc=クイック検索ツールから検索するためにフィールドが使用されているか？ （例：1または0）
+IsAMeasureDesc=フィールドの値を累積して、合計をリストに入れることはできるか？ (例：1または0)
+SearchAllDesc=クイック検索ツールから検索するためにフィールドが使用されているか？ (例：1または0)
 SpecDefDesc=他のタブでまだ定義されていない、モジュールで提供するすべてのドキュメントをここに入力する。豊富な.asciidoc構文である.md以上を使用できる。
 LanguageDefDesc=このファイルに、各言語ファイルのすべてのキーと翻訳を入力する。
 MenusDefDesc=モジュールが提供するメニューをここで定義する
 DictionariesDefDesc=モジュールが提供する辞書をここで定義する
 PermissionsDefDesc=モジュールによって提供される新規権限をここで定義する
-MenusDefDescTooltip=モジュール/アプリケーションによって提供されるメニューは、モジュール記述子ファイルの配列<strong> $ this-> menus</strong>に定義されている。このファイルを手動で編集するか、埋め込みエディターを使用できる。 <br> <br>注：定義されると（およびモジュールが再アクティブ化されると）、メニューは%sの管理者ユーザーが使用できるメニューエディターにも表示される。
-DictionariesDefDescTooltip=モジュール/アプリケーションによって提供されるディクショナリは、モジュール記述子ファイルの配列<strong> $ this-> dictionaries</strong>に定義されている。このファイルを手動で編集するか、埋め込みエディターを使用できる。 <br> <br>注：定義（およびモジュールの再アクティブ化）が完了すると、%sの管理者ユーザーには辞書もセットアップ領域に表示される。
-PermissionsDefDescTooltip=モジュール/アプリケーションによって提供されるアクセス許可は、配列<strong> $ this-> rights</strong>にモジュール記述子ファイルに定義される。このファイルを手動で編集するか、埋め込みエディターを使用できる。 <br> <br>注：定義されると（およびモジュールが再アクティブ化されると）、アクセス許可はデフォルトのアクセス許可セットアップ%sに表示される。
+MenusDefDescTooltip=モジュール/アプリケーションによって提供されるメニューは、モジュール記述子ファイルの配列<strong> $ this-> menus</strong>に定義されている。このファイルを手動で編集するか、埋め込みエディターを使用できる。 <br> <br>注：定義されると(およびモジュールが再アクティブ化されると)、メニューは%sの管理者ユーザーが使用できるメニューエディターにも表示される。
+DictionariesDefDescTooltip=モジュール/アプリケーションによって提供されるディクショナリは、モジュール記述子ファイルの配列<strong> $ this-> dictionaries</strong>に定義されている。このファイルを手動で編集するか、埋め込みエディターを使用できる。 <br> <br>注：定義(およびモジュールの再アクティブ化)が完了すると、%sの管理者ユーザーには辞書もセットアップ領域に表示される。
+PermissionsDefDescTooltip=モジュール/アプリケーションによって提供されるアクセス許可は、配列<strong> $ this-> rights</strong>にモジュール記述子ファイルに定義される。このファイルを手動で編集するか、埋め込みエディターを使用できる。 <br> <br>注：定義されると(およびモジュールが再アクティブ化されると)、アクセス許可はデフォルトのアクセス許可セットアップ%sに表示される。
 HooksDefDesc=定義する：管理したいフックのコンテキストを <b>module_parts['hooks']</b> プロパティのモジュール記述子の中に。 (コンテキストのリストは、コアコードで '<b>initHooks(</b>' を検索すると見つかる).<br>編集する：フックされた関数のコードを追加するためのフックファイルを。 (フック可能な関数は、コアコードで '<b>executeHooks</b>' を検索すると見つかる).
 TriggerDefDesc=実行されるビジネスイベントごとに実行するコードをトリガーファイルで定義する。
 SeeIDsInUse=インストールで使用されているIDを確認する
@@ -104,8 +105,8 @@ ToolkitForDevelopers=Dolibarr開発者向けのツールキット
 TryToUseTheModuleBuilder=SQLとPHPの知識がある場合は、ネイティブモジュールビルダーウィザードを使用できる。 <br>モジュール<strong>%s </strong>を有効にし、右上のメニューで<span class="fa fa-bug"></span>をクリックしてウィザードを使用する。 <br>警告：これは高度な開発者機能。本番サイトで</b>実験ではなく<b>を実行すること。
 SeeTopRightMenu=右上のメニューの<span class="fa fa-bug"></span>を参照すること
 AddLanguageFile=言語ファイルを追加する
-YouCanUseTranslationKey=ここでは、言語ファイルにある翻訳キーであるキーを使用できる（「言語」タブを参照）。
-DropTableIfEmpty=（空の場合はテーブルを削除する）
+YouCanUseTranslationKey=ここでは、言語ファイルにある翻訳キーであるキーを使用できる(「言語」タブを参照)。
+DropTableIfEmpty=(空の場合はテーブルを破棄する)
 TableDoesNotExists=テーブル%sは存在しない
 TableDropped=テーブル%sが削除された
 InitStructureFromExistingTable=既存のテーブルの構造体配列文字列を作成する
@@ -126,7 +127,6 @@ UseSpecificEditorURL = 特定のエディターURLを使用する
 UseSpecificFamily = 特定の家族を使用する
 UseSpecificAuthor = 特定の作成者を使用する
 UseSpecificVersion = 特定の初期バージョンを使用する
-ModuleMustBeEnabled=モジュール/アプリケーションを最初に有効にする必要がある
 IncludeRefGeneration=オブジェクトの参照は自動的に生成される必要がある
 IncludeRefGenerationHelp=参照の生成を自動的に管理するコードを含める場合は、これをチェックすること
 IncludeDocGeneration=オブジェクトからいくつかのドキュメントを生成したい
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=フィールドの種別:<br>varchar(99), double(24,8), real, t
 AsciiToHtmlConverter=アスキーからHTMLへのコンバーター
 AsciiToPdfConverter=アスキーからPDFへのコンバーター
 TableNotEmptyDropCanceled=テーブルが空ではない。ドロップはキャンセルされた。
+ModuleBuilderNotAllowed=モジュールビルダーは利用できるが、あなたのユーザには許可されていない。
diff --git a/htdocs/langs/ja_JP/mrp.lang b/htdocs/langs/ja_JP/mrp.lang
index d783dd432ac..2e3e4d06df0 100644
--- a/htdocs/langs/ja_JP/mrp.lang
+++ b/htdocs/langs/ja_JP/mrp.lang
@@ -1,7 +1,7 @@
 Mrp=製造指図
 MOs=製造指図
 ManufacturingOrder=製造指図
-MRPDescription=製造および製造指図（MO）を管理するモジュール。
+MRPDescription=製造および製造指図(MO)を管理するモジュール。
 MRPArea=MRPエリア
 MrpSetupPage=モジュールMRPのセットアップ
 MenuBOM=部品表
@@ -40,9 +40,9 @@ DateEndPlannedMo=終了予定日
 KeepEmptyForAsap=空は「できるだけ早く」を意味する
 EstimatedDuration=推定所要時間
 EstimatedDurationDesc=このBOMを使用してこの製品を製造するための推定期間
-ConfirmValidateBom=参照<strong>%s </strong>を使用してBOMを検証してよいか（これを使用して新規製造指図を作成できる）
-ConfirmCloseBom=このBOMをキャンセルしてよいか（これを使用して新規製造指図を作成することはできなくなる）。
-ConfirmReopenBom=このBOMを再度開いてもよいか（これを使用して新規製造指図を作成できる）
+ConfirmValidateBom=参照<strong>%s </strong>を使用してBOMを検証してよいか(これを使用して新規製造指図を作成できる)
+ConfirmCloseBom=このBOMをキャンセルしてよいか(これを使用して新規製造指図を作成することはできなくなる)。
+ConfirmReopenBom=このBOMを再度開いてもよいか(これを使用して新規製造指図を作成できる)
 StatusMOProduced=生産
 QtyFrozen=凍結量
 QuantityFrozen=凍結数量
@@ -57,7 +57,7 @@ ToConsume=消費するには
 ToProduce=生産するには
 QtyAlreadyConsumed=すでに消費された数量
 QtyAlreadyProduced=すでに生産された数量
-QtyRequiredIfNoLoss=損失がない場合は必要な数量（製造効率は100%%）
+QtyRequiredIfNoLoss=損失がない場合は必要な数量(製造効率は100%%)
 ConsumeOrProduce=消費または生産
 ConsumeAndProduceAll=すべてを消費して生産する
 Manufactured=製造完了
@@ -75,6 +75,30 @@ ProductsToConsume=消費する製品
 ProductsToProduce=生産する製品
 UnitCost=単価
 TotalCost=総費用
-BOMTotalCost=消費する各数量と製品のコストに基づいてこのBOMを生成するためのコスト（定義されている場合は原価、定義されている場合は平均加重価格、それ以外の場合は最良の購入価格を使用）
-GoOnTabProductionToProduceFirst=製造指図を閉じるには、最初に製造を開始しておく必要がある（タブ '%s'を参照）。ただし、キャンセルすることはできる。
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
+BOMTotalCost=消費する各数量と製品のコストに基づいてこのBOMを生成するためのコスト(定義されている場合は原価、定義されている場合は平均加重価格、それ以外の場合は最良の購入価格を使用)
+GoOnTabProductionToProduceFirst=製造指図を閉じるには、最初に製造を開始しておく必要がある(タブ '%s'を参照)。ただし、キャンセルすることはできる。
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=キットをBOMまたはMOに使用することはできない
+Workstation=ワークステーション
+Workstations=ワークステーション
+WorkstationsDescription=ワークステーション管理
+WorkstationSetup = ワークステーションのセットアップ
+WorkstationSetupPage = ワークステーションのセットアップページ
+WorkstationAbout = ワークステーションについて
+WorkstationAboutPage = ページについてのワークステーション
+WorkstationList=ワークステーションリスト
+WorkstationCreate=新しいワークステーションを追加する
+ConfirmEnableWorkstation=ワークステーション<b>%s </b>を有効にするか？
+EnableAWorkstation=ワークステーションを有効にする
+ConfirmDisableWorkstation=ワークステーション<b>%s </b>を無効にしてもよいか？
+DisableAWorkstation=ワークステーションを無効にする
+DeleteWorkstation=Supprimer
+NbOperatorsRequired=必要なオペレーターの数
+THMOperatorEstimated=推定オペレーターTHM
+THMMachineEstimated=推定マシンTHM
+WorkstationType=ワークステーションタイプ
+Human=人間
+Machine=機械
+HumanMachine=人間/機械
+WorkstationArea=ワークステーションエリア
+Machines=機械
+THMEstimatedHelp=このレートにより、アイテムの予測コストを定義できます。
diff --git a/htdocs/langs/ja_JP/multicurrency.lang b/htdocs/langs/ja_JP/multicurrency.lang
index b344a12d658..da5c08ced40 100644
--- a/htdocs/langs/ja_JP/multicurrency.lang
+++ b/htdocs/langs/ja_JP/multicurrency.lang
@@ -5,9 +5,9 @@ ErrorAddCurrencyFail=追加済通貨のエラー
 ErrorDeleteCurrencyFail=エラー削除失敗
 multicurrency_syncronize_error=同期エラー：%s
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=最新の既知のレートを使用する代わりに、ドキュメントの日付を使用して通貨レートを見つける
-multicurrency_useOriginTx=オブジェクトが別のオブジェクトから作成される場合、ソースオブジェクトの元のレートを保持する（それ以外の場合は、最新の既知のレートを使用する）
+multicurrency_useOriginTx=オブジェクトが別のオブジェクトから作成される場合、ソースオブジェクトの元のレートを保持する(それ以外の場合は、最新の既知のレートを使用する)
 CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=この機能を使用するには、Webサイト%sでアカウントを作成する必要がある。 <br> <b>APIキー</b>を取得する。 <br>無料のアカウントを使用している場合、<b>ソース通貨</b>（デフォルトではUSD）を変更することはできない。 <br>主通貨がUSDでない場合、アプリケーションは自動的にそれを再計算する。 <br><br> 月に1000回の同期に制限される。
+CurrencyLayerAccount_help_to_synchronize=この機能を使用するには、Webサイト%sでアカウントを作成する必要がある。 <br> <b>APIキー</b>を取得する。 <br>無料のアカウントを使用している場合、<b>ソース通貨</b>(デフォルトではUSD)を変更することはできない。 <br>主通貨がUSDでない場合、アプリケーションは自動的にそれを再計算する。 <br><br> 月に1000回の同期に制限される。
 multicurrency_appId=APIキー
 multicurrency_appCurrencySource=ソース通貨
 multicurrency_alternateCurrencySource=代替ソース通貨
@@ -17,7 +17,7 @@ rate=レート
 MulticurrencyReceived=受取り、元の通貨
 MulticurrencyRemainderToTake=残額、元の通貨
 MulticurrencyPaymentAmount=支払額、元の通貨
-AmountToOthercurrency=金額（受取口座の通貨）
+AmountToOthercurrency=金額(受取口座の通貨)
 CurrencyRateSyncSucceed=為替レートの同期が正常に実行された
 MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=オンライン支払いにはドキュメントの通貨を使用する
 TabTitleMulticurrencyRate=料金表
diff --git a/htdocs/langs/ja_JP/opensurvey.lang b/htdocs/langs/ja_JP/opensurvey.lang
index acc17b1f3df..07cee291af1 100644
--- a/htdocs/langs/ja_JP/opensurvey.lang
+++ b/htdocs/langs/ja_JP/opensurvey.lang
@@ -1,61 +1,61 @@
 # Dolibarr language file - Source file is en_US - opensurvey
 Survey=投票
-Surveys=世論調査
-OrganizeYourMeetingEasily=会議や投票を簡単に整理できます。まず、投票の種類を選択します...
-NewSurvey=新しい世論調査
+Surveys=投票
+OrganizeYourMeetingEasily=会議や投票を簡単に整理できる。まず、投票の種類を選択する...
+NewSurvey=新規投票
 OpenSurveyArea=投票エリア
-AddACommentForPoll=投票にコメントを追加できます...
+AddACommentForPoll=投票にコメントを追加できる...
 AddComment=コメントを追加する
 CreatePoll=投票を作成する
 PollTitle=投票タイトル
 ToReceiveEMailForEachVote=投票ごとにメールを受け取る
 TypeDate=日付を入力
 TypeClassic=タイプスタンダード
-OpenSurveyStep2=休日（灰色）の中から日付を選択します。選択した日は緑色です。以前に選択した日をもう一度クリックすると、選択を解除できます
-RemoveAllDays=すべての日を削除します
+OpenSurveyStep2=休日(灰色)の中から日付を選択する。選択した日は緑色です。以前に選択した日をもう一度クリックすると、選択を解除できる
+RemoveAllDays=すべての日を削除する
 CopyHoursOfFirstDay=初日のコピー時間
-RemoveAllHours=すべての時間を削除します
+RemoveAllHours=すべての時間を削除する
 SelectedDays=選択した日
 TheBestChoice=現在の最良の選択は
 TheBestChoices=現在の最良の選択は
 with=と
-OpenSurveyHowTo=この投票に投票することに同意する場合は、名前を付け、自分に最適な値を選択し、行末のプラスボタンで検証する必要があります。
+OpenSurveyHowTo=この投票に投票することに同意する場合は、名前を付け、自分に最適な値を選択し、行末のプラスボタンで検証する必要がある。
 CommentsOfVoters=有権者のコメント
-ConfirmRemovalOfPoll=この投票（およびすべての投票）を削除してもよろしいですか？
+ConfirmRemovalOfPoll=この投票(およびすべての投票)を削除してもよいか？
 RemovePoll=投票を削除する
 UrlForSurvey=投票に直接アクセスするために通信するURL
-PollOnChoice=投票の複数の選択肢を作成するための投票を作成しています。まず、投票で可能なすべての選択肢を入力します。
+PollOnChoice=投票の複数の選択肢を作成するための投票を作成しています。まず、投票で可能なすべての選択肢を入力する。
 CreateSurveyDate=日付投票を作成する
 CreateSurveyStandard=標準の投票を作成する
 CheckBox=シンプルなチェックボックス
-YesNoList=リスト（空/はい/いいえ）
-PourContreList=リスト（空/賛成/反対）
-AddNewColumn=新しい列を追加する
+YesNoList=リスト(空/はい/いいえ)
+PourContreList=リスト(空/賛成/反対)
+AddNewColumn=新規列を追加する
 TitleChoice=選択ラベル
 ExportSpreadsheet=結果スプレッドシートのエクスポート
 ExpireDate=日付を制限する
 NbOfSurveys=投票数
 NbOfVoters=投票者数
 SurveyResults=結果
-PollAdminDesc=「編集」ボタンを使用して、この投票のすべての投票行を変更できます。 %sを使用して列または行を削除することもできます。 %sを使用して新しい列を追加することもできます。
+PollAdminDesc=「編集」ボタンを使用して、この投票のすべての投票行を変更できる。 %sを使用して列または行を削除することもできる。 %sを使用して新規列を追加することもできる。
 5MoreChoices=さらに5つの選択肢
 Against=に対して
-YouAreInivitedToVote=この投票に投票してください
-VoteNameAlreadyExists=この名前はすでにこの投票に使用されていました
+YouAreInivitedToVote=この投票に投票すること
+VoteNameAlreadyExists=この名前はすでにこの投票に使用されていた
 AddADate=日付を追加する
 AddStartHour=開始時間を追加
 AddEndHour=終了時間を追加する
-votes=投票
-NoCommentYet=この投票へのコメントはまだ投稿されていません
-CanComment=投票者は投票でコメントできます
-CanSeeOthersVote=有権者は他の人の投票を見ることができます
-SelectDayDesc=選択した各日に、次の形式で会議時間を選択するかどうかを選択できます：<br>-空、<br>-「8h」、「8H」、または「8:00」で、会議の開始時間を指定します。 11」、「8h-11h」、「8H-11H」、または「8：00-11：00」は、会議の開始時間と終了時間を示します。 15-11：15 "同じことですが、分単位です。
+votes=投票(s)
+NoCommentYet=この投票へのコメントはまだ投稿されていない
+CanComment=投票者は投票でコメントできる
+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=少なくとも1つの選択肢を入力してください
+ErrorOpenSurveyFillFirstSection=投票作成の最初のセクションに記入していない
+ErrorOpenSurveyOneChoice=少なくとも1つの選択肢を入力すること
 ErrorInsertingComment=コメントの挿入中にエラーが発生しました
-MoreChoices=有権者のためのより多くの選択肢を入力してください
-SurveyExpiredInfo=投票が終了したか、投票の遅延が期限切れになりました。
-EmailSomeoneVoted=%sが行を埋めました。\nあなたはリンクであなたの投票を見つけることができます：\n%s
+MoreChoices=有権者のためのより多くの選択肢を入力すること
+SurveyExpiredInfo=投票が終了したか、投票の遅延が期限切れになった。
+EmailSomeoneVoted=%sが行を埋めました。\nあなたはリンクであなたの投票を見つけることができる：\n%s
 ShowSurvey=アンケートを表示
-UserMustBeSameThanUserUsedToVote=コメントを投稿するには、投票して、投票に使用したのと同じユーザー名を使用する必要があります
+UserMustBeSameThanUserUsedToVote=コメントを投稿するには、投票して、投票に使用したのと同じユーザー名を使用する必要がある
diff --git a/htdocs/langs/ja_JP/orders.lang b/htdocs/langs/ja_JP/orders.lang
index 11c99913cd0..2699436c7ea 100644
--- a/htdocs/langs/ja_JP/orders.lang
+++ b/htdocs/langs/ja_JP/orders.lang
@@ -1,39 +1,39 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=お客様の注文エリア
-SuppliersOrdersArea=Purchase orders area
+SuppliersOrdersArea=注文書エリア
 OrderCard=注文カード
-OrderId=Order Id
-Order=オーダー
-PdfOrderTitle=オーダー
+OrderId=注文ID
+Order=注文
+PdfOrderTitle=注文
 Orders=受注
 OrderLine=注文明細行
 OrderDate=注文日
 OrderDateShort=注文日
 OrderToProcess=プロセスの順序
 NewOrder=新規注文
-NewOrderSupplier=New Purchase Order
+NewOrderSupplier=新規注文書
 ToOrder=順序を作る
 MakeOrder=順序を作る
-SupplierOrder=Purchase order
-SuppliersOrders=Purchase orders
-SuppliersOrdersRunning=Current purchase orders
-CustomerOrder=Sales Order
-CustomersOrders=Sales Orders
-CustomersOrdersRunning=Current sales orders
-CustomersOrdersAndOrdersLines=Sales orders and order details
-OrdersDeliveredToBill=Sales orders delivered to bill
-OrdersToBill=Sales orders delivered
-OrdersInProcess=Sales orders in process
-OrdersToProcess=Sales orders to process
-SuppliersOrdersToProcess=Purchase orders to process
-SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
-AwaitingReception=Awaiting reception
+SupplierOrder=注文書
+SuppliersOrders=注文書
+SuppliersOrdersRunning=現在の注文書
+CustomerOrder=販売注文
+CustomersOrders=受注
+CustomersOrdersRunning=現在の販売注文
+CustomersOrdersAndOrdersLines=販売注文と注文の詳細
+OrdersDeliveredToBill=請求書に配信された販売注文
+OrdersToBill=納品された販売注文
+OrdersInProcess=進行中の販売注文
+OrdersToProcess=処理する受注
+SuppliersOrdersToProcess=処理する注文書
+SuppliersOrdersAwaitingReception=受付待ちの注文書
+AwaitingReception=レセプション待ち
 StatusOrderCanceledShort=キャンセル
-StatusOrderDraftShort=ドラフト
+StatusOrderDraftShort=下書き
 StatusOrderValidatedShort=検証
 StatusOrderSentShort=プロセスの
-StatusOrderSent=Shipment in process
-StatusOrderOnProcessShort=Ordered
+StatusOrderSent=発送中
+StatusOrderOnProcessShort=順序付けられた
 StatusOrderProcessedShort=処理
 StatusOrderDelivered=請求する
 StatusOrderDeliveredShort=請求する
@@ -42,130 +42,131 @@ StatusOrderApprovedShort=承認された
 StatusOrderRefusedShort=拒否
 StatusOrderToProcessShort=処理するには
 StatusOrderReceivedPartiallyShort=部分的に受け
-StatusOrderReceivedAllShort=Products received
+StatusOrderReceivedAllShort=受け取った製品
 StatusOrderCanceled=キャンセル
-StatusOrderDraft=ドラフト（検証する必要があります）
+StatusOrderDraft=下書き(検証する必要がある)
 StatusOrderValidated=検証
-StatusOrderOnProcess=Ordered - Standby reception
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderOnProcess=注文済み-スタンバイ受信
+StatusOrderOnProcessWithValidation=注文済み-スタンバイ受信または検証
 StatusOrderProcessed=処理
 StatusOrderToBill=請求する
 StatusOrderApproved=承認された
 StatusOrderRefused=拒否
 StatusOrderReceivedPartially=部分的に受け
-StatusOrderReceivedAll=All products received
+StatusOrderReceivedAll=受け取ったすべての製品
 ShippingExist=出荷が存在する
 QtyOrdered=数量は、注文された
-ProductQtyInDraft=Product quantity into draft orders
-ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
+ProductQtyInDraft=下書き注文への製品数量
+ProductQtyInDraftOrWaitingApproved=下書き注文または承認済み注文への製品数量、まだ注文されていない
 MenuOrdersToBill=法案に注文
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=請求可能な注文
 ShipProduct=船積
-CreateOrder=順序を作成します。
+CreateOrder=順序を作成する。
 RefuseOrder=順番を拒否
-ApproveOrder=Approve order
-Approve2Order=Approve order (second level)
+ApproveOrder=注文を承認する
+Approve2Order=注文の承認(第2レベル)
 ValidateOrder=順序を検証する
 UnvalidateOrder=順序をUnvalidate
 DeleteOrder=順序を削除する
 CancelOrder=注文を取り消す
-OrderReopened= Order %s re-open
-AddOrder=Create order
-AddPurchaseOrder=Create purchase order
-AddToDraftOrders=Add to draft order
+OrderReopened= %sを再度開くように注文する
+AddOrder=注文を作成する
+AddPurchaseOrder=注文書を作成する
+AddToDraftOrders=下書き注文に追加
 ShowOrder=順序を示す
-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
+OrdersOpened=処理する注文
+NoDraftOrders=下書き注文はない
+NoOrder=注文なし
+NoSupplierOrder=注文書なし
+LastOrders=最新の%s販売注文
+LastCustomerOrders=最新の%s販売注文
+LastSupplierOrders=最新の%s注文書
+LastModifiedOrders=最新の%s変更された注文
 AllOrders=すべての注文
 NbOfOrders=注文数
 OrdersStatistics=注文の統計
-OrdersStatisticsSuppliers=Purchase order statistics
+OrdersStatisticsSuppliers=注文書の統計
 NumberOfOrdersByMonth=月別受注数
-AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
+AmountOfOrdersByMonthHT=月別のご注文金額(税込)
 ListOfOrders=注文の一覧
 CloseOrder=密集隊形
-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=請求書を生成します。
-ClassifyShipped=Classify delivered
-DraftOrders=ドラフト注文
-DraftSuppliersOrders=Draft purchase orders
+ConfirmCloseOrder=この注文を配信済みに設定してもよいか？注文が配信されると、請求に設定できる。
+ConfirmDeleteOrder=この注文を削除してもよいか？
+ConfirmValidateOrder=この注文を<b>%s </b>という名前で検証してもよいか？
+ConfirmUnvalidateOrder=注文<b>%s </b>を下書きステータスに復元してもよいか？
+ConfirmCancelOrder=この注文をキャンセルしてもよいか？
+ConfirmMakeOrder=<b> %s </b>でこの注文をしたことを確認するか？
+GenerateBill=請求書を生成する。
+ClassifyShipped=配信された分類
+DraftOrders=下書き注文
+DraftSuppliersOrders=注文書の下書き
 OnProcessOrders=プロセス受注
-RefOrder=REF。オーダー
-RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for vendor
-RefOrderSupplierShort=Ref. order vendor
+RefOrder=REF。注文
+RefCustomerOrder=参照。顧客の注文
+RefOrderSupplier=参照。ベンダーの注文
+RefOrderSupplierShort=参照。注文ベンダー
 SendOrderByMail=メールで注文を送る
 ActionsOnOrder=ためのイベント
 NoArticleOfTypeProduct=この注文のため、型 '製品'なし発送の記事のない記事ません
-OrderMode=オーダー·メソッド
+OrderMode=注文·メソッド
 AuthorRequest=リクエストの作成者
 UserWithApproveOrderGrant=ユーザーは、 &quot;注文を承認する&quot;権限が付与された。
-PaymentOrderRef=オーダーの%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
+PaymentOrderRef=注文の%sの支払い
+ConfirmCloneOrder=この注文のクローンを作成してもよいか<b>%s </b>？
+DispatchSupplierOrder=注文書の受信%s
+FirstApprovalAlreadyDone=最初の承認はすでに行われている
+SecondApprovalAlreadyDone=2回目の承認はすでに完了している
+SupplierOrderReceivedInDolibarr=注文書%sが%sを受け取りた
+SupplierOrderSubmitedInDolibarr=注文書%sが送信された
+SupplierOrderClassifiedBilled=注文書%sセットの請求
 OtherOrders=他の注文
 ##### Types de contacts #####
-TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
+TypeContact_commande_internal_SALESREPFOLL=代表的なフォローアップ受注
 TypeContact_commande_internal_SHIPPING=代表的なフォローアップ出荷
-TypeContact_commande_external_BILLING=顧客の請求書の連絡先
+TypeContact_commande_external_BILLING=顧客の請求書連絡先
 TypeContact_commande_external_SHIPPING=顧客の出荷お問い合わせ
 TypeContact_commande_external_CUSTOMER=顧客の連絡先のフォローアップの順序
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
+TypeContact_order_supplier_internal_SALESREPFOLL=代表的なフォローアップ発注書
 TypeContact_order_supplier_internal_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=定数COMMANDE_SUPPLIER_ADDONが定義されていません
-Error_COMMANDE_ADDON_NotDefined=定数COMMANDE_ADDONが定義されていません
-Error_OrderNotChecked=No orders to invoice selected
+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=Email
+OrderByEMail=Eメール
 OrderByWWW=オンライン
 OrderByPhone=電話
 # Documents models
-PDFEinsteinDescription=A complete order model 
-PDFEratostheneDescription=A complete order model
+PDFEinsteinDescription=完全な注文モデル(エラトステネステンプレートの古い実装)
+PDFEratostheneDescription=完全な注文モデル
 PDFEdisonDescription=単純な次のモデル
-PDFProformaDescription=A complete Proforma invoice template
-CreateInvoiceForThisCustomer=Bill orders
-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
+PDFProformaDescription=完全な 見積請求書 テンプレート
+CreateInvoiceForThisCustomer=請求書注文
+CreateInvoiceForThisSupplier=請求書注文
+NoOrdersToInvoice=請求可能な注文はない
+CloseProcessedOrdersAutomatically=選択したすべての注文を「処理済み」に分類する。
+OrderCreation=注文の作成
+Ordered=順序付けられた
+OrderCreated=注文が作成された
+OrderFail=注文の作成中にエラーが発生した
+CreateOrders=注文を作成する
+ToBillSeveralOrderSelectCustomer=複数の注文の請求書を作成するには、最初に顧客をクリックしてから、「%s」を選択する。
+OptionToSetOrderBilledNotEnabled=モジュールワークフローのオプションで、請求書検証時に注文を自動的に「請求済み」に設定するオプションが有効になっていないため、請求書が生成された後、注文のステータスを手動で「請求済み」に設定する必要がある。
+IfValidateInvoiceIsNoOrderStayUnbilled=請求書検証が「いいえ」の場合、請求書が検証されるまで、注文はステータス「未請求」のままになる。
+CloseReceivedSupplierOrdersAutomatically=すべての製品を受け取ったら、注文を自動的にステータス「%s」に閉じる。
+SetShippingMode=配送モードを設定する
+WithReceptionFinished=レセプション終了
 #### supplier orders status
 StatusSupplierOrderCanceledShort=キャンセル
-StatusSupplierOrderDraftShort=ドラフト
+StatusSupplierOrderDraftShort=下書き
 StatusSupplierOrderValidatedShort=検証
 StatusSupplierOrderSentShort=プロセスの
-StatusSupplierOrderSent=Shipment in process
-StatusSupplierOrderOnProcessShort=Ordered
+StatusSupplierOrderSent=発送中
+StatusSupplierOrderOnProcessShort=順序付けられた
 StatusSupplierOrderProcessedShort=処理
 StatusSupplierOrderDelivered=請求する
 StatusSupplierOrderDeliveredShort=請求する
@@ -174,15 +175,15 @@ StatusSupplierOrderApprovedShort=承認された
 StatusSupplierOrderRefusedShort=拒否
 StatusSupplierOrderToProcessShort=処理するには
 StatusSupplierOrderReceivedPartiallyShort=部分的に受け
-StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderReceivedAllShort=受け取った製品
 StatusSupplierOrderCanceled=キャンセル
-StatusSupplierOrderDraft=ドラフト（検証する必要があります）
+StatusSupplierOrderDraft=下書き(検証する必要がある)
 StatusSupplierOrderValidated=検証
-StatusSupplierOrderOnProcess=Ordered - Standby reception
-StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusSupplierOrderOnProcess=注文済み-スタンバイ受信
+StatusSupplierOrderOnProcessWithValidation=注文済み-スタンバイ受信または検証
 StatusSupplierOrderProcessed=処理
 StatusSupplierOrderToBill=請求する
 StatusSupplierOrderApproved=承認された
 StatusSupplierOrderRefused=拒否
 StatusSupplierOrderReceivedPartially=部分的に受け
-StatusSupplierOrderReceivedAll=All products received
+StatusSupplierOrderReceivedAll=受け取ったすべての製品
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index d294c7bb2a7..b3fda9e5699 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -1,133 +1,134 @@
 # Dolibarr language file - Source file is en_US - other
 SecurityCode=セキュリティコード
-NumberingShort=N°
+NumberingShort=番号
 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.
+TMenuTools=ツールs
+ToolsDesc=他のメニューエントリに含まれていないすべてのツールがここにグループ化される。 <br>すべてのツールは左側のメニューからアクセスできる。
 Birthday=誕生日
 BirthdayAlertOn=誕生日アラートアクティブ
 BirthdayAlertOff=非アクティブな誕生日アラート
-TransKey=Translation of the key TransKey
-MonthOfInvoice=Month (number 1-12) of invoice date
-TextMonthOfInvoice=Month (text) of invoice date
-PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
-TextPreviousMonthOfInvoice=Previous month (text) of invoice date
-NextMonthOfInvoice=Following month (number 1-12) of invoice date
-TextNextMonthOfInvoice=Following month (text) of invoice date
-PreviousMonth=Previous month
-CurrentMonth=Current month
-ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
-DocFileGeneratedInto=Doc file generated into <b>%s</b>.
-JumpToLogin=Disconnected. Go to login page...
-MessageForm=Message on online payment form
-MessageOK=Message on the return page for a validated payment
-MessageKO=Message on the return page for a canceled payment
-ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
-DeleteAlsoContentRecursively=Check to delete all content recursively
-PoweredBy=Powered by
-YearOfInvoice=Year of invoice date
-PreviousYearOfInvoice=Previous year of invoice date
-NextYearOfInvoice=Following year of invoice date
-DateNextInvoiceBeforeGen=Date of next invoice (before generation)
-DateNextInvoiceAfterGen=Date of next invoice (after generation)
-GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
-OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Only the first selected field has been selected.
-AtLeastOneMeasureIsRequired=At least 1 field for measure is required
-AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
-LatestBlogPosts=Latest Blog Posts
-Notify_ORDER_VALIDATE=Sales order validated
-Notify_ORDER_SENTBYMAIL=Sales order sent by mail
-Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
-Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
-Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
-Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
+TransKey=キーTransKeyの翻訳
+MonthOfInvoice=請求日の月(数字 1-12)
+TextMonthOfInvoice=請求日の月(文字列)
+PreviousMonthOfInvoice=請求日の前月(数字 1-12)
+TextPreviousMonthOfInvoice=請求日の前月(文字列)
+NextMonthOfInvoice=請求日の翌月(数字 1-12)
+TextNextMonthOfInvoice=請求日の翌月(文字列)
+PreviousMonth=前月
+CurrentMonth=今月
+ZipFileGeneratedInto=<b> %s</b>に生成されたZipファイル。
+DocFileGeneratedInto=<b> %s</b>に生成されたドキュメントファイル。
+JumpToLogin=切断された。ログインページに移動...
+MessageForm=オンライン支払いフォームのメッセージ
+MessageOK=確認済みの支払いの返品ページのメッセージ
+MessageKO=キャンセルされた支払いの返品ページのメッセージ
+ContentOfDirectoryIsNotEmpty=このディレクトリの内容は空ではない。
+DeleteAlsoContentRecursively=チェックすると、すべてのコンテンツが再帰的に削除される
+PoweredBy=搭載
+YearOfInvoice=請求日の年
+PreviousYearOfInvoice=請求日の前年
+NextYearOfInvoice=請求日の翌年
+DateNextInvoiceBeforeGen=次の請求書の日付(生成前)
+DateNextInvoiceAfterGen=次の請求書の日付(生成後)
+GraphInBarsAreLimitedToNMeasures=Grapicsは、「バー」モードの%sメジャーに制限されています。代わりに、モード「ライン」が自動的に選択された。
+OnlyOneFieldForXAxisIsPossible=現在、X軸として使用できるフィールドは1つだけ 。最初に選択されたフィールドのみが選択されています。
+AtLeastOneMeasureIsRequired=測定には少なくとも1つのフィールドが必要 
+AtLeastOneXAxisIsRequired=X軸には少なくとも1つのフィールドが必要 
+LatestBlogPosts=最新のブログ投稿
+Notify_ORDER_VALIDATE=検証済みの販売注文
+Notify_ORDER_SENTBYMAIL=メールで送信された販売注文
+Notify_ORDER_SUPPLIER_SENTBYMAIL=電子メールで送信された注文書
+Notify_ORDER_SUPPLIER_VALIDATE=記録された発注書
+Notify_ORDER_SUPPLIER_APPROVE=注文書が承認された
+Notify_ORDER_SUPPLIER_REFUSE=注文書が拒否された
 Notify_PROPAL_VALIDATE=検証済みの顧客の提案
-Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
+Notify_PROPAL_CLOSE_SIGNED=顧客提案は署名された
+Notify_PROPAL_CLOSE_REFUSED=顧客の提案は拒否された
 Notify_PROPAL_SENTBYMAIL=電子メールによって送信された商業提案
 Notify_WITHDRAW_TRANSMIT=伝送撤退
 Notify_WITHDRAW_CREDIT=クレジット撤退
-Notify_WITHDRAW_EMIT=撤退を実行します。
+Notify_WITHDRAW_EMIT=撤退を実行する。
 Notify_COMPANY_CREATE=第三者が作成した
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_COMPANY_SENTBYMAIL=サードパーティのカードから送信されたメール
 Notify_BILL_VALIDATE=顧客への請求書が検証さ
-Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_BILL_UNVALIDATE=顧客の請求書は未検証
 Notify_BILL_PAYED=顧客の請求書は支払済
 Notify_BILL_CANCEL=顧客への請求書が取り消さ
 Notify_BILL_SENTBYMAIL=メールで送信された顧客への請求書
-Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
-Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid
-Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail
-Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
+Notify_BILL_SUPPLIER_VALIDATE=ベンダーの請求書が検証された
+Notify_BILL_SUPPLIER_PAYED=支払われたベンダーの請求書
+Notify_BILL_SUPPLIER_SENTBYMAIL=メールで送信されるベンダーの請求書
+Notify_BILL_SUPPLIER_CANCELED=ベンダーの請求書がキャンセルされた
 Notify_CONTRACT_VALIDATE=検証済みの契約
 Notify_FICHINTER_VALIDATE=介入検証
-Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
-Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
+Notify_FICHINTER_ADD_CONTACT=介入への連絡先を追加
+Notify_FICHINTER_SENTBYMAIL=郵送による介入
 Notify_SHIPPING_VALIDATE=送料は、検証
 Notify_SHIPPING_SENTBYMAIL=電子メールによって送信された商品
 Notify_MEMBER_VALIDATE=メンバー検証
-Notify_MEMBER_MODIFY=Member modified
+Notify_MEMBER_MODIFY=メンバーが変更された
 Notify_MEMBER_SUBSCRIPTION=メンバー購読
-Notify_MEMBER_RESILIATE=Member terminated
+Notify_MEMBER_RESILIATE=メンバーが終了した
 Notify_MEMBER_DELETE=メンバーが削除さ
-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_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=新しいファイル/文書を添付する
+AttachANewFile=新規ファイル/文書を添付する
 LinkedObject=リンクされたオブジェクト
-NbOfActiveNotifications=Number of notifications (no. of recipient emails)
-PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe lines are separated by a carriage return.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(Hello)__<br>This is a <b>test</b> mail sent to __EMAIL__ (the word test must be in bold).<br>The lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to remind you that the invoice  __REF__ seems to have not been paid. A copy of the invoice is attached as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find commercial proposal __REF__ attached \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find price request __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
-PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
-ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
-ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
+NbOfActiveNotifications=通知の数(受信者の電子メールの数)
+PredefinedMailTest=__(こんにちは)__\nこれは__EMAIL__に送信されるテストメール 。\n行はキャリッジリターンで区切られる。\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Hello)__ <br>これは__EMAIL__に送信される<b>テスト</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_TIME__のイベントリマインダー「__EVENT_LABEL __」<br><br>これは自動メッセージ 。返信しないこと。
+DemoDesc=Dolibarrは、いくつかのビジネスモジュールをサポートするコンパクトなERP / CRM 。このシナリオは決して発生しないため、すべてのモジュールを紹介するデモは意味がない(数百が利用可能)。したがって、いくつかのデモプロファイルが利用可能 。
+ChooseYourDemoProfil=ニーズに最適なデモプロファイルを選択すること...
+ChooseYourDemoProfilMore=...または独自のプロファイルを作成する<br>(手動モジュール選択)
 DemoFundation=基礎のメンバーを管理する
 DemoFundation2=基礎のメンバーとの銀行口座を管理する
-DemoCompanyServiceOnly=Company or freelance selling service only
+DemoCompanyServiceOnly=法人またはフリーランスの販売サービスのみ
 DemoCompanyShopWithCashDesk=現金デスクでお店を管理する
-DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
-DemoCompanyManufacturing=Company manufacturing products
-DemoCompanyAll=Company with multiple activities (all main modules)
+DemoCompanyProductAndStocks=POSで製品を販売するショップ
+DemoCompanyManufacturing=製品を製造する法人
+DemoCompanyAll=複数の活動を行う法人(すべてのメインモジュール)
 CreatedBy=%sによって作成された
 ModifiedBy=%sによって変更された
 ValidatedBy=%sによって検証
 ClosedBy=%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=ファイルの%sは削除されました
-DirWasRemoved=ディレクトリの%sは削除されました
-FeatureNotYetAvailable=Feature not yet available in the current version
-FeaturesSupported=Supported features
+CreatedById=作成したユーザーID
+ModifiedById=最新の変更を行ったユーザーID
+ValidatedById=検証したユーザーID
+CanceledById=キャンセルしたユーザーID
+ClosedById=閉じたユーザーID
+CreatedByLogin=作成したユーザーログイン
+ModifiedByLogin=最新の変更を加えたユーザーログイン
+ValidatedByLogin=検証したユーザーログイン
+CanceledByLogin=キャンセルしたユーザーログイン
+ClosedByLogin=閉じたユーザーログイン
+FileWasRemoved=ファイルの%sは削除された
+DirWasRemoved=ディレクトリの%sは削除された
+FeatureNotYetAvailable=現在のバージョンではまだ利用できない機能
+FeaturesSupported=サポートされている機能
 Width=幅
 Height=高さ
 Depth=深さ
@@ -138,17 +139,17 @@ Right=右
 CalculatedWeight=計算された重み
 CalculatedVolume=計算されたボリューム
 Weight=重さ
-WeightUnitton=tonne
-WeightUnitkg=キロ
-WeightUnitg=グラム
-WeightUnitmg=ミリグラム
+WeightUnitton=トン
+WeightUnitkg=kg
+WeightUnitg=g
+WeightUnitmg=mg
 WeightUnitpound=ポンド
 WeightUnitounce=オンス
 Length=長さ
-LengthUnitm=メートル
-LengthUnitdm=DM
-LengthUnitcm=センチメートル
-LengthUnitmm=ミリメートル
+LengthUnitm=m
+LengthUnitdm=dm
+LengthUnitcm=cm
+LengthUnitmm=mm
 Surface=エリア
 SurfaceUnitm2=m²
 SurfaceUnitdm2=dm²
@@ -166,122 +167,124 @@ VolumeUnitinch3=in³
 VolumeUnitounce=オンス
 VolumeUnitlitre=リットル
 VolumeUnitgallon=ガロン
-SizeUnitm=メートル
-SizeUnitdm=DM
-SizeUnitcm=センチメートル
-SizeUnitmm=ミリメートル
-SizeUnitinch=インチの
-SizeUnitfoot=足
-SizeUnitpoint=point
+SizeUnitm=m
+SizeUnitdm=dm
+SizeUnitcm=cm
+SizeUnitmm=mm
+SizeUnitinch=インチ
+SizeUnitfoot=フィート
+SizeUnitpoint=ポイント
 BugTracker=バグトラッカー
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
+SendNewPasswordDesc=このフォームでは、新規パスワードをリクエストできる。それはあなたのメールアドレスに送られる。 <br>メール内の確認リンクをクリックすると、変更が有効になる。 <br>受信トレイを確認すること。
 BackToLoginPage=ログインページに戻る
-AuthenticationDoesNotAllowSendNewPassword=認証モードは<b>%s</b>です。 <br>このモードでは、Dolibarrは知ってもパスワードを変更することはできません。 <br>あなたのパスワードを変更する場合は、システム管理者に問い合わせてください。
-EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
-ProfIdShortDesc=<b>教授イド%sは、</b>サードパーティの国に応じて情報です。 <br>たとえば、国<b>%s</b>のために、それはコード<b>%s</b>です。
+AuthenticationDoesNotAllowSendNewPassword=認証モードは<b>%s</b> 。 <br>このモードでは、Dolibarrは知ってもパスワードを変更することはできません。 <br>あなたのパスワードを変更する場合は、システム管理者に問い合わせてください。
+EnableGDLibraryDesc=このオプションを使用するには、PHPインストールでGDライブラリをインストールまたは有効にする。
+ProfIdShortDesc=<b>教授イド%sは、</b>サードパーティの国に応じて情報 。 <br>たとえば、国<b>%s</b>のために、それはコード<b>%s</b> 。
 DolibarrDemo=Dolibarr ERP / CRMデモ
-StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
-NumberOfProposals=Number of proposals
-NumberOfCustomerOrders=Number of sales orders
-NumberOfCustomerInvoices=Number of customer invoices
-NumberOfSupplierProposals=Number of vendor proposals
-NumberOfSupplierOrders=Number of purchase orders
-NumberOfSupplierInvoices=Number of vendor invoices
-NumberOfContracts=Number of contracts
-NumberOfMos=Number of manufacturing orders
-NumberOfUnitsProposals=Number of units on proposals
-NumberOfUnitsCustomerOrders=Number of units on sales orders
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices
-NumberOfUnitsSupplierProposals=Number of units on vendor proposals
-NumberOfUnitsSupplierOrders=Number of units on purchase orders
-NumberOfUnitsSupplierInvoices=Number of units on vendor invoices
-NumberOfUnitsContracts=Number of units on contracts
-NumberOfUnitsMos=Number of units to produce in manufacturing orders
-EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
+StatsByNumberOfUnits=製品/サービスの数量の合計の統計
+StatsByNumberOfEntities=参照エンティティの数の統計(請求書の数、または注文...)
+NumberOfProposals=提案数
+NumberOfCustomerOrders=受注数
+NumberOfCustomerInvoices=顧客の請求書の数
+NumberOfSupplierProposals=ベンダー提案の数
+NumberOfSupplierOrders=注文書の数
+NumberOfSupplierInvoices=ベンダーの請求書の数
+NumberOfContracts=契約数
+NumberOfMos=製造受注数
+NumberOfUnitsProposals=提案のユニット数
+NumberOfUnitsCustomerOrders=販売注文のユニット数
+NumberOfUnitsCustomerInvoices=顧客の請求書のユニット数
+NumberOfUnitsSupplierProposals=ベンダー提案のユニット数
+NumberOfUnitsSupplierOrders=注文書のユニット数
+NumberOfUnitsSupplierInvoices=ベンダーの請求書のユニット数
+NumberOfUnitsContracts=契約ユニット数
+NumberOfUnitsMos=製造指図で生産するユニットの数
+EMailTextInterventionAddedContact=新規介入%sが割り当てられた。
 EMailTextInterventionValidated=介入%sが検証されています。
-EMailTextInvoiceValidated=Invoice %s has been validated.
-EMailTextInvoicePayed=Invoice %s has been paid.
-EMailTextProposalValidated=Proposal %s has been validated.
-EMailTextProposalClosedSigned=Proposal %s has been closed signed.
-EMailTextOrderValidated=Order %s has been validated.
-EMailTextOrderApproved=Order %s has been approved.
-EMailTextOrderValidatedBy=Order %s has been recorded by %s.
-EMailTextOrderApprovedBy=Order %s has been approved by %s.
-EMailTextOrderRefused=Order %s has been refused.
-EMailTextOrderRefusedBy=Order %s has been refused by %s.
-EMailTextExpeditionValidated=Shipping %s has been validated.
-EMailTextExpenseReportValidated=Expense report %s has been validated.
-EMailTextExpenseReportApproved=Expense report %s has been approved.
-EMailTextHolidayValidated=Leave request %s has been validated.
-EMailTextHolidayApproved=Leave request %s has been approved.
+EMailTextInvoiceValidated=請求書%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=This tool was designed to help you to resize or crop an image. This is the information on the current edited image
+ResizeDesc=新規幅<b>または</b>新規高さを入力する。比率は、サイズ変更時に保持される...
+NewLength=新規幅
+NewHeight=新規高さ
+NewSizeAfterCropping=トリミング後の新規サイズ
+DefineNewAreaToPick=(あなたが反対側の角に達するまで、イメージ上で左クリックをドラッグ)選択するには、画像を新たな領域を定義する。
+CurrentInformationOnImage=このツールは、画像のサイズ変更やトリミングに役立つように設計されています。これは現在編集されている画像に関する情報 
 ImageEditor=イメージエディタ
-YouReceiveMailBecauseOfNotification=あなたのメールアドレスは%sの%sソフトウェアに特定のイベントを通知されるターゲットのリストに追加されているため、このメッセージが表示されます。
-YouReceiveMailBecauseOfNotification2=このイベントは次のとおりです。
-ThisIsListOfModules=これは、このデモ·プロファイル（唯一の最も一般的なモジュールは、このデモに表示されます）によって事前に選択したモジュールのリストです。よりパーソナライズされたデモを持って、これを編集し、 &quot;スタート&quot;をクリックしてください。
+YouReceiveMailBecauseOfNotification=あなたのメールアドレスは%sの%sソフトウェアに特定のイベントを通知されるターゲットのリストに追加されているため、このメッセージが表示される。
+YouReceiveMailBecauseOfNotification2=このイベントは次のとおり 。
+ThisIsListOfModules=これは、このデモ·プロファイル(唯一の最も一般的なモジュールは、このデモに表示される)によって事前に選択したモジュールのリスト 。よりパーソナライズされたデモを持って、これを編集し、 &quot;スタート&quot;をクリックすること。
 UseAdvancedPerms=いくつかのモジュールの高度な権限を使用する
 FileFormat=ファイル形式
-SelectAColor=色を選択してください
+SelectAColor=色を選択すること
 AddFiles=ファイルを追加
 StartUpload=アップロード開始
 CancelUpload=アップロードをキャンセル
 FileIsTooBig=ファイルが大きすぎる
 PleaseBePatient=しばらくお待ちください...
-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
-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
+NewPassword=新規パスワード
+ResetPassword=パスワードを再設定する
+RequestToResetPasswordReceived=パスワードの変更リクエストを受け取りた。
+NewKeyIs=これはログインするための新規キー 
+NewKeyWillBe=ソフトウェアにログインするための新規キーは次のようになる
+ClickHereToGoTo=%sに移動するには、ここをクリックすること
+YouMustClickToChange=ただし、このパスワードの変更を検証するには、最初に次のリンクをクリックする必要がある
+ForgetIfNothing=この変更をリクエストしなかった場合は、このメールを忘れてください。あなたの資格情報は安全に保たれる。
+IfAmountHigherThan=<strong> %s</strong>よりも多い場合
+SourcesRepository=ソースのリポジトリ
+Chart=チャート
+PassEncoding=パスワードエンコーディング
+PermissionsAdd=追加された権限
+PermissionsDelete=権限が削除された
+YourPasswordMustHaveAtLeastXChars=パスワードには、少なくとも<strong> %s</strong>文字が必要 。
+YourPasswordHasBeenReset=パスワードは正常にリセットされた
+ApplicantIpAddress=申請者のIPアドレス
+SMSSentTo=SMSが%sに送信された
+MissingIds=IDがない
+ThirdPartyCreatedByEmailCollector=電子メールMSGID%sから電子メールコレクターによって作成されたサードパーティ
+ContactCreatedByEmailCollector=メールMSGID%sからメールコレクターによって作成された連絡先/アドレス
+ProjectCreatedByEmailCollector=メールMSGID%sからメールコレクターによって作成されたプロジェクト
+TicketCreatedByEmailCollector=メールMSGID%sからメールコレクターによって作成されたチケット
+OpeningHoursFormatDesc=-を使用して、営業時間と営業時間を区切る。 <br>スペースを使用してさまざまな範囲を入力する。 <br>例：8-12 14-18
+PrefixSession=セッションIDのプレフィックス
 
 ##### Export #####
 ExportsArea=輸出地域
 AvailableFormats=利用可能なフォーマット
 LibraryUsed=ライブラリを使用
-LibraryVersion=Library version
+LibraryVersion=ライブラリバージョン
 ExportableDatas=エクスポート可能なデータ
-NoExportableData=いいえ、エクスポートデータがありません（ロード、エクスポートデータ、または欠落権限を持つモジュールなし）
+NoExportableData=いいえ、エクスポートデータがない(ロード、エクスポートデータ、または欠落権限を持つモジュールなし)
 ##### External sites #####
-WebsiteSetup=Setup of module website
-WEBSITE_PAGEURL=URL of page
+WebsiteSetup=モジュールのウェブサイトのセットアップ
+WEBSITE_PAGEURL=ページのURL
 WEBSITE_TITLE=タイトル
 WEBSITE_DESCRIPTION=説明
-WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
-WEBSITE_KEYWORDS=Keywords
-LinesToImport=Lines to import
+WEBSITE_IMAGE=画像
+WEBSITE_IMAGEDesc=画像メディアの相対パス。これはめったに使用されないため、これを空のままにしておくことができる(動的コンテンツで使用して、ブログ投稿のリストにサムネイルを表示できる)。パスがWebサイト名に依存する場合は、パスに__WEBSITE_KEY__を使用する(例：image / __ WEBSITE_KEY __ / stories / myimage.png)。
+WEBSITE_KEYWORDS=キーワード
+LinesToImport=インポートする行
 
-MemoryUsage=Memory usage
-RequestDuration=Duration of request
-ProductsPerPopularity=Products/Services by popularity
-PopuProp=Products/Services by popularity in Proposals
-PopuCom=Products/Services by popularity in Orders
-ProductStatistics=Products/Services Statistics
-NbOfQtyInOrders=Qty in orders
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+MemoryUsage=メモリ使用量
+RequestDuration=リクエストの期間
+ProductsPerPopularity=人気別の製品/サービス
+PopuProp=提案の人気による製品/サービス
+PopuCom=注文の人気別の製品/サービス
+ProductStatistics=製品/サービス統計
+NbOfQtyInOrders=注文数量
+SelectTheTypeOfObjectToAnalyze=分析するオブジェクトのタイプを選択する...
diff --git a/htdocs/langs/ja_JP/paybox.lang b/htdocs/langs/ja_JP/paybox.lang
index d11d36a329f..76f95e52bf4 100644
--- a/htdocs/langs/ja_JP/paybox.lang
+++ b/htdocs/langs/ja_JP/paybox.lang
@@ -1,31 +1,30 @@
 # Dolibarr language file - Source file is en_US - paybox
-PayBoxSetup=PayBoxモジュールのセットアップ
-PayBoxDesc=このモジュールは、上の支払いを可能にするためにページを提供して<a href="http://www.paybox.com" target="_blank">切符売り場</a>の顧客によって。これはフリーの支払いのためにまたは特定のDolibarrオブジェクトの支払いに用いることができる（請求書、発注、...）
-FollowingUrlAreAvailableToMakePayments=以下のURLはDolibarrオブジェクト上で支払いをするために顧客にページを提供するために利用可能です
+PayBoxSetup=PayBoxモジュールの設定
+PayBoxDesc=このモジュールは、上の支払いを可能にするためにページを提供して<a href="http://www.paybox.com" target="_blank">切符売り場</a>の顧客によって。これはフリーの支払いのためにまたは特定のDolibarrオブジェクトの支払いに用いることができる(請求書、発注、...)
+FollowingUrlAreAvailableToMakePayments=以下のURLはDolibarrオブジェクト上で支払いをするために顧客にページを提供するために利用可能 
 PaymentForm=支払い形態
-WelcomeOnPaymentPage=Welcome to our online payment service
+WelcomeOnPaymentPage=オンライン決済サービスへようこそ
 ThisScreenAllowsYouToPay=この画面では、%sにオンライン決済を行うことができます。
-ThisIsInformationOnPayment=これは、実行する支払いに関する情報です。
+ThisIsInformationOnPayment=これは、実行する支払いに関する情報。
 ToComplete=完了する
 YourEMail=入金確認を受信する電子メール
 Creditor=債権者
 PaymentCode=支払いコード
-PayBoxDoPayment=Pay with Paybox
-YouWillBeRedirectedOnPayBox=あなたが入力するクレジットカード情報をセキュリティで保護された切符売り場のページにリダイレクトされます。
+PayBoxDoPayment=Payboxで支払う
+YouWillBeRedirectedOnPayBox=あなたが入力するクレジットカード情報をセキュリティで保護された切符売り場のページにリダイレクトされる。
 Continue=次の
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Payboxによる検証時に支払いが自動的に作成されるように、URL <b> %s</b>を使用してPayboxを設定します。
 YourPaymentHasBeenRecorded=このページでは、あなたの支払が記録されていることを確認します。ありがとうございます。
-YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=お支払いは記録されておらず、取引はキャンセルされています。ありがとうございます。
 AccountParameter=アカウントのパラメータ
 UsageParameter=使用パラメータ
 InformationToFindParameters=あなたの%sアカウント情報を見つけるのを助ける
 PAYBOX_CGI_URL_V2=支払いのために切符売り場CGIモジュールのurl
-VendorName=ベンダーの名前
 CSSUrlForPaymentForm=支払いフォームのCSSスタイルシートのURL
-NewPayboxPaymentReceived=新しいPaybox支払を受け取りました
-NewPayboxPaymentFailed=新しいPaybox支払を試みましたが失敗しました
-PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
+NewPayboxPaymentReceived=新規Paybox支払を受け取った
+NewPayboxPaymentFailed=新規Paybox支払を試みましたが失敗した
+PAYBOX_PAYONLINE_SENDEMAIL=支払い試行後の電子メール通知(成功または失敗)
 PAYBOX_PBX_SITE=PBX SITEの値
 PAYBOX_PBX_RANG=PBX Rangの値
 PAYBOX_PBX_IDENTIFIANT=PBX IDの値
-PAYBOX_HMAC_KEY=HMAC key
+PAYBOX_HMAC_KEY=HMACキー
diff --git a/htdocs/langs/ja_JP/paypal.lang b/htdocs/langs/ja_JP/paypal.lang
index e3b365f3c2d..2e133b207a4 100644
--- a/htdocs/langs/ja_JP/paypal.lang
+++ b/htdocs/langs/ja_JP/paypal.lang
@@ -1,36 +1,36 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=ペイパルモジュールのセットアップ
-PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
-PaypalDoPayment=Pay with PayPal
+PaypalDesc=このモジュールでは、<a href="http://www.paypal.com" target="_blank"> 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
+PAYPAL_SSLVERSION=カールSSLバージョン
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=「統合」支払い(クレジットカード+ PayPal)または「PayPal」のみを提供
+PaypalModeIntegral=統合
+PaypalModeOnlyPaypal=PayPalのみ
+ONLINE_PAYMENT_CSS_URL=オンライン支払いページのCSSスタイルシートのオプションのURL
 ThisIsTransactionId=<b>%s：</b>これは、トランザクションのIDです。
-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_ADD_PAYMENT_URL=メールでドキュメントを送信するときは、PayPalの支払いURLを含めること
+NewOnlinePaymentReceived=受け取った新規オンライン支払い
+NewOnlinePaymentFailed=新規オンライン支払いが試行されたが失敗した
+ONLINE_PAYMENT_SENDEMAIL=各支払い試行後の通知の電子メールアドレス(成功および失敗の場合)
+ReturnURLAfterPayment=支払い後にURLを返す
+ValidationOfOnlinePaymentFailed=オンライン支払いの検証に失敗した
+PaymentSystemConfirmPaymentPageWasCalledButFailed=支払いシステムによって支払い確認ページが呼び出され、エラーが返された
+SetExpressCheckoutAPICallFailed=SetExpressCheckoutAPI呼び出しが失敗した。
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPaymentAPI呼び出しが失敗した。
+DetailedErrorMessage=詳細なエラーメッセージ
+ShortErrorMessage=短いエラーメッセージ
+ErrorCode=エラーコード
+ErrorSeverityCode=エラー重大度コード
+OnlinePaymentSystem=オンライン決済システム
+PaypalLiveEnabled=PayPalの「ライブ」モードが有効になっています(それ以外の場合はテスト/サンドボックスモード)
+PaypalImportPayment=PayPal支払いをインポートする
+PostActionAfterPayment=支払い後にアクションを投稿する
+ARollbackWasPerformedOnPostActions=すべてのPostアクションでロールバックが実行された。必要に応じて、投稿アクションを手動で完了する必要があります。
+ValidationOfPaymentFailed=支払いの検証に失敗した
+CardOwner=カードホルダー
+PayPalBalance=ペイパルクレジット
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index eb217d12ba6..6357a357c87 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -107,8 +107,9 @@ ServiceLimitedDuration=製品は、限られた期間を持つサービスの場
 FillWithLastServiceDates=最後のサービスラインの日付を入力
 MultiPricesAbility=製品/サービスごとに複数の価格セグメント(各顧客は1つの価格セグメントに含まれる)
 MultiPricesNumPrices=価格数
-DefaultPriceType=新しい販売価格を追加するときのデフォルトあたりの価格のベース(税込みと税抜き)
-AssociatedProductsAbility=キット(仮想製品)をアクティブ化
+DefaultPriceType=新規販売価格を追加するときのデフォルトあたりの価格のベース(税込みと税抜き)
+AssociatedProductsAbility=キットを有効にする(いくつかの製品セット)
+VariantsAbility=バリエーションを有効にする(色、サイズなどの製品バリエーション)
 AssociatedProducts=キット
 AssociatedProductsNumber=このキットを構成する製品の数
 ParentProductsNumber=親包装製品の数
@@ -167,8 +168,10 @@ BuyingPrices=購入価格
 CustomerPrices=顧客価格
 SuppliersPrices=仕入先価格
 SuppliersPricesOfProductsOrServices=(製品またはサービスの)仕入先価格
-CustomCode=税関/製品/ HSコード
+CustomCode=税関|商品| HSコード
 CountryOrigin=原産国
+RegionStateOrigin=地域 原産地
+StateOrigin=州|県 原産地
 Nature=製品の性質(素材/完成品)
 NatureOfProductShort=製品の性質
 NatureOfProductDesc=原材料または完成品
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=固定価格を使用する
 PriceByQuantity=数量による異なる価格
 DisablePriceByQty=数量で価格を無効にする
 PriceByQuantityRange=数量範囲
-MultipriceRules=価格セグメントルール
+MultipriceRules=セグメントの自動価格
 UseMultipriceRules=価格セグメントルール(製品モジュールのセットアップで定義)を使用して、最初のセグメントに従って他のすべてのセグメントの価格を自動計算する
 PercentVariationOver=%sに対する%%の変動
 PercentDiscountOver=%sに対する%%割引
@@ -268,7 +271,7 @@ DefinitionOfBarCodeForProductNotComplete=製品%sのバーコードのタイプ
 DefinitionOfBarCodeForThirdpartyNotComplete=サードパーティ%sのバーコードのタイプまたは値の定義が不完全です。
 BarCodeDataForProduct=製品%sのバーコード情報：
 BarCodeDataForThirdparty=サードパーティのバーコード情報%s：
-ResetBarcodeForAllRecords=すべてのレコードのバーコード値を定義する(これにより、新しい値ですでに定義されているバーコード値もリセットされる)
+ResetBarcodeForAllRecords=すべてのレコードのバーコード値を定義する(これにより、新規値ですでに定義されているバーコード値もリセットされる)
 PriceByCustomer=顧客ごとに異なる価格
 PriceCatalogue=製品/サービスごとの単一の販売価格
 PricingRule=販売価格のルール
@@ -356,9 +359,9 @@ ProductCombinations=バリアント
 PropagateVariant=バリアントの伝播
 HideProductCombinations=製品セレクタで製品バリアントを非表示にする
 ProductCombination=バリアント
-NewProductCombination=新しいバリアント
+NewProductCombination=新規バリアント
 EditProductCombination=バリアントの編集
-NewProductCombinations=新しい亜種
+NewProductCombinations=新規亜種
 EditProductCombinations=バリアントの編集
 SelectCombination=組み合わせを選択
 ProductCombinationGenerator=バリアントジェネレータ
@@ -368,10 +371,10 @@ ImpactOnPriceLevel=価格水準への影響%s
 ApplyToAllPriceImpactLevel= すべてのレベルに適用
 ApplyToAllPriceImpactLevelHelp=ここをクリックすると、すべてのレベルで同じ価格の影響を設定できる
 WeightImpact=重量への影響
-NewProductAttribute=新しい属性
-NewProductAttributeValue=新しい属性値
+NewProductAttribute=新規属性
+NewProductAttributeValue=新規属性値
 ErrorCreatingProductAttributeValue=属性値の作成中にエラーが発生した。その参照を持つ既存の値がすでに存在するためである可能性がある
-ProductCombinationGeneratorWarning=続行すると、新しいバリアントを生成前に、以前のバリアントはすべて削除される。既存のものは新しい値で更新される
+ProductCombinationGeneratorWarning=続行すると、新規バリアントを生成前に、以前のバリアントはすべて削除される。既存のものは新規値で更新される
 TooMuchCombinationsWarning=多数のバリアントを生成と、CPU、メモリ使用量が高くなり、Dolibarrがそれらを作成できなくなる可能性がある。オプション「%s」を有効にすると、メモリ使用量を減らすのに役立つ場合がある。
 DoNotRemovePreviousCombinations=以前のバリアントを削除しないこと
 UsePercentageVariations=パーセンテージバリエーションを使用
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index 62bd0dc7d19..1f6b71c6b85 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -8,24 +8,24 @@ ProjectStatus=プロジェクトの状況
 SharedProject=皆
 PrivateProject=プロジェクトの連絡先
 ProjectsImContactFor=私が明示的に連絡を取っているプロジェクト
-AllAllowedProjects=私が読むことができるすべてのプロジェクト（私の+公開）
+AllAllowedProjects=私が読むことができるすべてのプロジェクト(私の+公開)
 AllProjects=すべてのプロジェクト
 MyProjectsDesc=このビューは、連絡先のプロジェクトに限定される
 ProjectsPublicDesc=このビューには、読み取りを許可されているすべてのプロジェクトを紹介します。
 TasksOnProjectsPublicDesc=このビューには、読み取りが許可されているプロジェクトのすべてのタスクが表示される。
 ProjectsPublicTaskDesc=このビューには、読み取りを許可されているすべてのプロジェクトやタスクを示します。
-ProjectsDesc=このビューはすべてのプロジェクトを（あなたのユーザー権限はあなたに全てを表示する権限を付与）を提示します。
-TasksOnProjectsDesc=このビューには、すべてのプロジェクトのすべてのタスクが表示される（ユーザー権限により、すべてを表示する権限が付与される）。
+ProjectsDesc=このビューはすべてのプロジェクトを(あなたのユーザー権限はあなたに全てを表示する権限を付与)を提示します。
+TasksOnProjectsDesc=このビューには、すべてのプロジェクトのすべてのタスクが表示される(ユーザー権限により、すべてを表示する権限が付与される)。
 MyTasksDesc=このビューは、連絡先のプロジェクトまたはタスクに限定される
-OnlyOpenedProject=開いているプロジェクトのみが表示される（ドラフトまたはクローズステータスのプロジェクトは表示されない）。
+OnlyOpenedProject=開いているプロジェクトのみが表示される(ドラフトまたはクローズステータスのプロジェクトは表示されない)。
 ClosedProjectsAreHidden=閉じたプロジェクトは表示されない。
 TasksPublicDesc=このビューには、読み取りを許可されているすべてのプロジェクトやタスクを示します。
-TasksDesc=このビューは、すべてのプロジェクトとタスク（あなたのユーザー権限はあなたに全てを表示する権限を付与）を提示します。
+TasksDesc=このビューは、すべてのプロジェクトとタスク(あなたのユーザー権限はあなたに全てを表示する権限を付与)を提示します。
 AllTaskVisibleButEditIfYouAreAssigned=資格のあるプロジェクトのすべてのタスクが表示されるが、選択したユーザーに割り当てられたタスクの時間のみを入力できる。時間を入力する必要がある場合は、タスクを割り当てる。
 OnlyYourTaskAreVisible=自分に割り当てられたタスクのみが表示される。タスクが表示されておらず、時間を入力する必要がある場合は、自分にタスクを割り当てる。
 ImportDatasetTasks=プロジェクトのタスク
 ProjectCategories=プロジェクトタグ/カテゴリ
-NewProject=新しいプロジェクト
+NewProject=新規プロジェクト
 AddProject=プロジェクトを作成する
 DeleteAProject=プロジェクトを削除します。
 DeleteATask=タスクを削除する
@@ -65,7 +65,7 @@ Task=タスク
 TaskDateStart=タスク開始日
 TaskDateEnd=タスクの終了日
 TaskDescription=タスクの説明
-NewTask=新しいタスク
+NewTask=新規タスク
 AddTask=タスクを作成する
 AddTimeSpent=費やした時間を作成する
 AddHereTimeSpentForDay=この日/タスクに費やした時間をここに追加する
@@ -85,6 +85,7 @@ ProgressCalculated=消費の進捗状況
 WhichIamLinkedTo=私がリンクしている
 WhichIamLinkedToProject=私はプロジェクトにリンクしています
 Time=時間
+TimeConsumed=消費
 ListOfTasks=タスクのリスト
 GoToListOfTimeConsumed=消費時間のリストに移動
 GanttView=ガントビュー
@@ -115,12 +116,12 @@ ChildOfTask=タスクの子
 TaskHasChild=タスクには子がある
 NotOwnerOfProject=この民間プロジェクトの所有者でない
 AffectedTo=に割り当てられた
-CantRemoveProject=このプロジェクトは、他のオブジェクト（請求書、注文など）によって参照されているため、削除できません。タブ「%s」を参照すること。
+CantRemoveProject=このプロジェクトは、他のオブジェクト(請求書、注文など)によって参照されているため、削除できません。タブ「%s」を参照すること。
 ValidateProject=挙を検証する
 ConfirmValidateProject=このプロジェクトを検証してもよいか？
 CloseAProject=プロジェクトを閉じる
 ConfirmCloseAProject=このプロジェクトを終了してもよいか？
-AlsoCloseAProject=また、プロジェクトを閉じます（それでも本番タスクを実行する必要がある場合は、開いたままにする）
+AlsoCloseAProject=また、プロジェクトを閉じます(それでも本番タスクを実行する必要がある場合は、開いたままにする)
 ReOpenAProject=開いているプロジェクト
 ConfirmReOpenAProject=このプロジェクトを再開してもよいか？
 ProjectContact=プロジェクトの連絡先
@@ -138,13 +139,13 @@ NoTasks=このプロジェクトのための作業をしない
 LinkedToAnotherCompany=他の第三者へのリンク
 TaskIsNotAssignedToUser=タスクがユーザーに割り当てられていない。ボタン '<strong> %s </strong>'を使用して、今すぐタスクを割り当てる。
 ErrorTimeSpentIsEmpty=費やした時間は空です
-ThisWillAlsoRemoveTasks=このアクションは、プロジェクトのすべてのタスク（現時点では<b>%s</b>タスク）と過ごした時間のすべての入力を削除します。
-IfNeedToUseOtherObjectKeepEmpty=いくつかのオブジェクト（請求書、注文、...）、別の第三者に属するが、作成するプロジェクトにリンクする必要がある場合は、複数の取引先中のプロジェクトを持っているこの空を保持します。
+ThisWillAlsoRemoveTasks=このアクションは、プロジェクトのすべてのタスク(現時点では<b>%s</b>タスク)と過ごした時間のすべての入力を削除します。
+IfNeedToUseOtherObjectKeepEmpty=いくつかのオブジェクト(請求書、注文、...)、別の第三者に属するが、作成するプロジェクトにリンクする必要がある場合は、複数の取引先中のプロジェクトを持っているこの空を保持します。
 CloneTasks=クローンタスク
 CloneContacts=連絡先のクローン
 CloneNotes=クローンノート
 CloneProjectFiles=プロジェクトに参加したファイルのクローンを作成する
-CloneTaskFiles=ファイルを結合したタスク(s)をクローンする（タスク(s)がクローンされた場合）
+CloneTaskFiles=ファイルを結合したタスク(s)をクローンする(タスク(s)がクローンされた場合)
 CloneMoveDate=今からプロジェクト/タスクの日付を更新するか？
 ConfirmCloneProject=このプロジェクトのクローンを作成してもよいか？
 ProjectReportDate=新規プロジェクトの開始日に応じてタスクの日付を変更する
@@ -205,7 +206,7 @@ AssignTaskToUser=タスクを%sに割り当てる
 SelectTaskToAssign=割り当てるタスクを選択すること...
 AssignTask=割当
 ProjectOverview=概要概要
-ManageTasks=プロジェクトを使用して、タスクを追跡したり、費やした時間を報告したりする（タイムシート）
+ManageTasks=プロジェクトを使用して、タスクを追跡したり、費やした時間を報告したりする(タイムシート)
 ManageOpportunitiesStatus=プロジェクトを使用してリード/機会をフォローする
 ProjectNbProjectByMonth=月ごとに作成されたプロジェクトの数
 ProjectNbTaskByMonth=月ごとに作成されたタスクの数
@@ -233,11 +234,11 @@ OppStatusPENDING=保留中
 OppStatusWON=勝った
 OppStatusLOST=失われた
 Budget=予算
-AllowToLinkFromOtherCompany=他の会社のプロジェクトのリンクを許可する <br><br><u>サポートされる値:</u><br>- 空のままにする: 会社の任意のプロジェクトをリンクできる（デフォルト）<br>- "すべて": 任意のプロジェクトをリンクできる、たとえ他の法人のプロジェクトであっても <br>- カンマ区切りの取引先ID: これらの取引先のすべてのプロジェクトをリンクできる（例：123,4795,53）<br>
+AllowToLinkFromOtherCompany=他の会社のプロジェクトのリンクを許可する <br><br><u>サポートされる値:</u><br>- 空のままにする: 会社の任意のプロジェクトをリンクできる(デフォルト)<br>- "すべて": 任意のプロジェクトをリンクできる、たとえ他の法人のプロジェクトであっても <br>- カンマ区切りの取引先ID: これらの取引先のすべてのプロジェクトをリンクできる(例：123,4795,53)<br>
 LatestProjects=最新の%sプロジェクト
 LatestModifiedProjects=最新の%s変更プロジェクト
 OtherFilteredTasks=その他のフィルタリングされたタスク
-NoAssignedTasks=割り当てられたタスクが見つかりません（上部の選択ボックスから現在のユーザーにプロジェクト/タスクを割り当てて、時間を入力する）
+NoAssignedTasks=割り当てられたタスクが見つかりません(上部の選択ボックスから現在のユーザーにプロジェクト/タスクを割り当てて、時間を入力する)
 ThirdPartyRequiredToGenerateInvoice=プロジェクトに請求できるようにするには、プロジェクトで取引先を定義する必要がある。
 ChooseANotYetAssignedTask=まだ割り当てられていないタスクを選択すること
 # Comments trans
@@ -254,7 +255,7 @@ TimeSpentForInvoice=に費や​​された時間は
 OneLinePerUser=ユーザーごとに1行
 ServiceToUseOnLines=回線で利用するサービス
 InvoiceGeneratedFromTimeSpent=請求書%sは、プロジェクトに費やされた時間から生成された
-ProjectBillTimeDescription=プロジェクトのタスクにタイムシートを入力し、タイムシートから請求書(s)を生成してプロジェクトの顧客に請求する予定があるかどうかを確認する（入力したタイムシートに基づかない請求書を作成する予定があるかどうかは確認しないこと）。注：請求書を生成するには、プロジェクトの"費やした時間"タブに移動し、含める行を選択する。
+ProjectBillTimeDescription=プロジェクトのタスクにタイムシートを入力し、タイムシートから請求書(s)を生成してプロジェクトの顧客に請求する予定があるかどうかを確認する(入力したタイムシートに基づかない請求書を作成する予定があるかどうかは確認しないこと)。注：請求書を生成するには、プロジェクトの"費やした時間"タブに移動し、含める行を選択する。
 ProjectFollowOpportunity=機会を追う
 ProjectFollowTasks=タスクまたは費やした時間をフォローする
 Usage=使用法
@@ -262,7 +263,7 @@ UsageOpportunity=使用法：機会
 UsageTasks=使用法：タスク
 UsageBillTimeShort=使用法：請求時間
 InvoiceToUse=使用する請求書のドラフト
-NewInvoice=新しい請求書
+NewInvoice=新規請求書
 OneLinePerTask=タスクごとに1行
 OneLinePerPeriod=期間ごとに1行
 RefTaskParent=参照符号親タスク
diff --git a/htdocs/langs/ja_JP/propal.lang b/htdocs/langs/ja_JP/propal.lang
index 373ac4a2ce2..16cd30b6bfa 100644
--- a/htdocs/langs/ja_JP/propal.lang
+++ b/htdocs/langs/ja_JP/propal.lang
@@ -1,69 +1,68 @@
 # Dolibarr language file - Source file is en_US - propal
-Proposals=商用の提案
-Proposal=商業的提案
-ProposalShort=提案
-ProposalsDraft=ドラフト商業の提案
-ProposalsOpened=Open commercial proposals
-CommercialProposal=商業的提案
-PdfCommercialProposalTitle=商業的提案
-ProposalCard=提案カード
-NewProp=新しい商業提案
-NewPropal=新たな提案
+Proposals=売買契約提案書
+Proposal=売買契約提案書
+ProposalShort=提案書
+ProposalsDraft=下書き売買契約提案書
+ProposalsOpened=オープンな商業提案書
+CommercialProposal=売買契約提案書
+PdfCommercialProposalTitle=売買契約提案書
+ProposalCard=提案書カード
+NewProp=新規商業提案書
+NewPropal=新たな提案書
 Prospect=見通し
-DeleteProp=商業的提案を削除します。
-ValidateProp=商業的提案を検証する
-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=すべての提案
-SearchAProposal=提案を検索
-NoProposal=No proposal
-ProposalsStatistics=商業的な提案の統計
-NumberOfProposalsByMonth=月ごとに数
-AmountOfProposalsByMonthHT=Amount by month (excl. tax)
-NbOfProposals=商業的提案の数
-ShowPropal=提案を示す
-PropalsDraft=ドラフト
+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=（クローズ）署名されていません
+PropalStatusDraft=下書き(検証する必要がある)
+PropalStatusValidated=(提案書が開いている)を検証
+PropalStatusSigned=(要請求)署名
+PropalStatusNotSigned=(クローズ)署名されていない
 PropalStatusBilled=請求
-PropalStatusDraftShort=ドラフト
-PropalStatusValidatedShort=Validated (open)
+PropalStatusDraftShort=下書き
+PropalStatusValidatedShort=検証済み(オープン)
 PropalStatusClosedShort=閉じた
 PropalStatusSignedShort=署名された
 PropalStatusNotSignedShort=署名されていない
 PropalStatusBilledShort=請求
-PropalsToClose=閉じるには、商用の提案
-PropalsToBill=法案に署名した商業の提案
-ListOfProposals=商業的提案のリスト
-ActionsOnPropal=提案のイベント
-RefProposal=商業的な提案のref
-SendPropalByMail=メールでの商用の提案を送る
+PropalsToClose=閉じるには、売買契約提案書
+PropalsToBill=法案に署名した売買契約提案書
+ListOfProposals=売買契約提案書のリスト
+ActionsOnPropal=提案書のイベント
+RefProposal=商業的な提案書のref
+SendPropalByMail=メールでの売買契約提案書を送る
 DatePropal=提案書の日付
 DateEndPropal=日付の最後の有効性
 ValidityDuration=有効期間
-CloseAs=Set status to
-SetAcceptedRefused=Set accepted/refused
-ErrorPropalNotFound=Propalの%sが見つかりません
-AddToDraftProposals=Add to draft proposal
-NoDraftProposals=No draft proposals
-CopyPropalFrom=既存のプロポーザルをコピーして、商用の提案を作成します。
-CreateEmptyPropal=Create empty commercial proposal or from list of products/services
-DefaultProposalDurationValidity=デフォルトの商業提案の有効期間（日数）
-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=商業的提案や行
-ProposalLine=提案ライン
+SetAcceptedRefused=承認/拒否の設定
+ErrorPropalNotFound=Propalの%sが見つからない
+AddToDraftProposals=提案書案に追加
+NoDraftProposals=提案書案はない
+CopyPropalFrom=既存のプロポーザルをコピーして、売買契約提案書を作成する。
+CreateEmptyPropal=空の売買契約提案書を作成するか、製品/サービスのリストから作成する
+DefaultProposalDurationValidity=デフォルトの商業提案書の有効期間(日数)
+UseCustomerContactAsPropalRecipientIfExist=プロポーザルの受信者アドレスとしてサードパーティのアドレスの代わりに定義されている場合は、タイプ「連絡先フォローアッププロポーザル」の連絡先/アドレスを使用する
+ConfirmClonePropal=売買契約提案書 <b>%s </b>のクローンを作成してもよいか？
+ConfirmReOpenProp=売買契約提案書 <b>%s </b>を開いてよいか？
+ProposalsAndProposalsLines=売買契約提案書や行
+ProposalLine=提案書ライン
 AvailabilityPeriod=可用性の遅延
 SetAvailability=可用性の遅延を設定
 AfterOrder=ご注文後
-OtherProposals=他の提案
+OtherProposals=他の提案書
 ##### Availability #####
 AvailabilityTypeAV_NOW=即時の
 AvailabilityTypeAV_1W=1週間
@@ -71,21 +70,22 @@ AvailabilityTypeAV_2W=2週間
 AvailabilityTypeAV_3W=3週間
 AvailabilityTypeAV_1M=1ヶ月
 ##### Types de contacts #####
-TypeContact_propal_internal_SALESREPFOLL=代表的なフォローアップの提案
+TypeContact_propal_internal_SALESREPFOLL=代表的なフォローアップの提案書
 TypeContact_propal_external_BILLING=顧客の請求書の連絡先
-TypeContact_propal_external_CUSTOMER=顧客の連絡先フォローアップ提案
-TypeContact_propal_external_SHIPPING=Customer contact for delivery
+TypeContact_propal_external_CUSTOMER=顧客の連絡先フォローアップ提案書
+TypeContact_propal_external_SHIPPING=配達のための顧客の連絡先
 # Document models
-DocModelAzurDescription=A complete proposal model (old implementation of Cyan template)
-DocModelCyanDescription=A complete proposal model
-DefaultModelPropalCreate=Default model creation
-DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DocModelAzurDescription=完全な提案書モデル(シアンテンプレートの古い実装)
+DocModelCyanDescription=完全な提案書モデル
+DefaultModelPropalCreate=デフォルトのモデル作成
+DefaultModelPropalToBill=ビジネスプロポーザルを閉じるときのデフォルトテンプレート(請求対象)
+DefaultModelPropalClosed=ビジネスプロポーザルを閉じるときのデフォルトテンプレート(未請求)
 ProposalCustomerSignature=承諾書、会社印、日付、署名
-ProposalsStatisticsSuppliers=Vendor proposals statistics
-CaseFollowedBy=Case followed by
-SignedOnly=Signed only
-IdProposal=提案番号
+ProposalsStatisticsSuppliers=ベンダー提案書統計
+CaseFollowedBy=ケースに続いて
+SignedOnly=署名のみ
+IdProposal=プロポーザルID
 IdProduct=製品番号
-PrParentLine=提案親ライン
-LineBuyPriceHT=購入価格ラインの税控除後の金額
+PrParentLine=提案書親ライン
+LineBuyPriceHT=ラインの購入価格税控除後の金額
+
diff --git a/htdocs/langs/ja_JP/receiptprinter.lang b/htdocs/langs/ja_JP/receiptprinter.lang
index 05f67f731e7..e3d30ac5598 100644
--- a/htdocs/langs/ja_JP/receiptprinter.lang
+++ b/htdocs/langs/ja_JP/receiptprinter.lang
@@ -1,82 +1,82 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
-ReceiptPrinterSetup=Setup of module ReceiptPrinter
-PrinterAdded=Printer %s added
-PrinterUpdated=Printer %s updated
-PrinterDeleted=Printer %s deleted
-TestSentToPrinter=Test Sent To Printer %s
-ReceiptPrinter=Receipt printers
-ReceiptPrinterDesc=Setup of receipt printers
-ReceiptPrinterTemplateDesc=Setup of Templates
-ReceiptPrinterTypeDesc=Description of Receipt Printer's type
-ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
-ListPrinters=List of Printers
-SetupReceiptTemplate=Template Setup
-CONNECTOR_DUMMY=Dummy Printer
-CONNECTOR_NETWORK_PRINT=Network Printer
-CONNECTOR_FILE_PRINT=Local Printer
-CONNECTOR_WINDOWS_PRINT=Local Windows Printer
-CONNECTOR_CUPS_PRINT=Cups Printer
-CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
+ReceiptPrinterSetup=モジュールReceiptPrinterの設定
+PrinterAdded=プリンター%sが追加された
+PrinterUpdated=プリンター%sが更新された
+PrinterDeleted=プリンター%sが削除された
+TestSentToPrinter=プリンターに送信されたテスト%s
+ReceiptPrinter=レシートプリンター
+ReceiptPrinterDesc=レシートプリンターの設定
+ReceiptPrinterTemplateDesc=テンプレートの設定
+ReceiptPrinterTypeDesc=レシートプリンターの種類の説明
+ReceiptPrinterProfileDesc=レシートプリンターのプロファイルの説明
+ListPrinters=プリンタのリスト
+SetupReceiptTemplate=テンプレートの設定
+CONNECTOR_DUMMY=ダミープリンター
+CONNECTOR_NETWORK_PRINT=ネットワークプリンター
+CONNECTOR_FILE_PRINT=ローカルプリンター
+CONNECTOR_WINDOWS_PRINT=ローカルWindowsプリンター
+CONNECTOR_CUPS_PRINT=カッププリンター
+CONNECTOR_DUMMY_HELP=テスト用の偽のプリンタ、何もしない
 CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
 CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
-CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
-PROFILE_DEFAULT=Default Profile
-PROFILE_SIMPLE=Simple Profile
-PROFILE_EPOSTEP=Epos Tep Profile
-PROFILE_P822D=P822D Profile
-PROFILE_STAR=Star Profile
-PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
-PROFILE_SIMPLE_HELP=Simple Profile No Graphics
-PROFILE_EPOSTEP_HELP=Epos Tep Profile
-PROFILE_P822D_HELP=P822D Profile No Graphics
-PROFILE_STAR_HELP=Star Profile
-DOL_LINE_FEED=Skip line
-DOL_ALIGN_LEFT=Left align text
-DOL_ALIGN_CENTER=Center text
-DOL_ALIGN_RIGHT=Right align text
-DOL_USE_FONT_A=Use font A of printer
-DOL_USE_FONT_B=Use font B of printer
-DOL_USE_FONT_C=Use font C of printer
+CONNECTOR_CUPS_PRINT_HELP=CUPSプリンター名、例：HPRT_TP805L
+PROFILE_DEFAULT=デフォルトプロファイル
+PROFILE_SIMPLE=シンプルなプロファイル
+PROFILE_EPOSTEP=EposTepプロファイル
+PROFILE_P822D=P822Dプロファイル
+PROFILE_STAR=スタープロフィール
+PROFILE_DEFAULT_HELP=Epsonプリンターに適したデフォルトプロファイル
+PROFILE_SIMPLE_HELP=シンプルなプロファイルグラフィックなし
+PROFILE_EPOSTEP_HELP=EposTepプロファイル
+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=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
+DOL_PRINT_BARCODE_CUSTOMER_ID=バーコードの顧客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=Invoice lines
-DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
-DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
-DOL_VALUE_CUSTOMER_MAIL=Customer mail
-DOL_VALUE_CUSTOMER_PHONE=Customer phone
-DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
-DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
-DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
-DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
-DOL_VALUE_MYSOC_NAME=Your company name
-VendorLastname=Vendor last name
-VendorFirstname=Vendor first name
-VendorEmail=Vendor email
-DOL_VALUE_CUSTOMER_POINTS=Customer points
-DOL_VALUE_OBJECT_POINTS=Object points
+DOL_PRINT_OBJECT_LINES=請求書の行
+DOL_VALUE_CUSTOMER_FIRSTNAME=顧客の名
+DOL_VALUE_CUSTOMER_LASTNAME=顧客の姓
+DOL_VALUE_CUSTOMER_MAIL=顧客メール
+DOL_VALUE_CUSTOMER_PHONE=顧客フォン
+DOL_VALUE_CUSTOMER_MOBILE=顧客モバイル
+DOL_VALUE_CUSTOMER_SKYPE=顧客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/ja_JP/receptions.lang b/htdocs/langs/ja_JP/receptions.lang
index 2464d8c30f4..e4fdf3eb37a 100644
--- a/htdocs/langs/ja_JP/receptions.lang
+++ b/htdocs/langs/ja_JP/receptions.lang
@@ -15,7 +15,7 @@ StatisticsOfReceptions=受付の統計
 NbOfReceptions=受付数
 NumberOfReceptionsByMonth=月別の受付数
 ReceptionCard=受付カード
-NewReception=新しい受付
+NewReception=新規受付
 CreateReception=受付を作成する
 QtyInOtherReceptions=他の受付の数量
 OtherReceptionsForSameOrder=この注文の他の受付
@@ -23,7 +23,7 @@ ReceptionsAndReceivingForSameOrder=この注文の領収書と領収書
 ReceptionsToValidate=検証する受付
 StatusReceptionCanceled=キャンセル
 StatusReceptionDraft=ドラフト
-StatusReceptionValidated=検証（製品が出荷する、またはすでに出荷されます）
+StatusReceptionValidated=検証(製品が出荷する、またはすでに出荷されます)
 StatusReceptionProcessed=処理
 StatusReceptionDraftShort=ドラフト
 StatusReceptionValidatedShort=検証
@@ -32,11 +32,11 @@ ReceptionSheet=受付シート
 ConfirmDeleteReception=この受付を削除してもよいか？
 ConfirmValidateReception=参照<b>%s </b>を使用して、この受付を検証してもよいか？
 ConfirmCancelReception=この受付をキャンセルしてもよいか？
-StatsOnReceptionsOnlyValidated=受付で実施された統計は検証されただけ。使用される日付は、受付の検証日です（飛行機の配達日は常にわかっているわけではない）。
+StatsOnReceptionsOnlyValidated=受付で実施された統計は検証されただけ。使用される日付は、受付の検証日です(飛行機の配達日は常にわかっているわけではない)。
 SendReceptionByEMail=メールで受付を送信する
 SendReceptionRef=受付の提出%s
 ActionsOnReception=受付のイベント
-ReceptionCreationIsDoneFromOrder=今のところ、新しい受付の作成はオーダーカードから行われる。
+ReceptionCreationIsDoneFromOrder=今のところ、新規受付の作成はオーダーカードから行われる。
 ReceptionLine=受付ライン
 ProductQtyInReceptionAlreadySent=未処理の受注からの製品数量はすでに送信された
 ProductQtyInSuppliersReceptionAlreadyRecevied=すでに受け取ったオープンサプライヤー注文からの製品数量
diff --git a/htdocs/langs/ja_JP/recruitment.lang b/htdocs/langs/ja_JP/recruitment.lang
index 9c7def0a589..bb2081baa02 100644
--- a/htdocs/langs/ja_JP/recruitment.lang
+++ b/htdocs/langs/ja_JP/recruitment.lang
@@ -71,5 +71,6 @@ YourCandidature=あなたの申請
 YourCandidatureAnswerMessage=お申し込みいただきありがとうございます。 <br>..。
 JobClosedTextCandidateFound=求人はクローズされている。ポジションが埋まった。
 JobClosedTextCanceled=求人はクローズされている。
-ExtrafieldsJobPosition=補完的な属性（職位）
-ExtrafieldsCandidatures=補完的な属性（求人応募）
+ExtrafieldsJobPosition=補完的な属性(職位)
+ExtrafieldsCandidatures=補完的な属性(求人応募)
+MakeOffer=申し出する
diff --git a/htdocs/langs/ja_JP/sendings.lang b/htdocs/langs/ja_JP/sendings.lang
index a8ecd193c38..0a58d6837b3 100644
--- a/htdocs/langs/ja_JP/sendings.lang
+++ b/htdocs/langs/ja_JP/sendings.lang
@@ -1,75 +1,76 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=REF。出荷
+RefSending=参照符号 出荷
 Sending=出荷
 Sendings=出荷
-AllSendings=All Shipments
+AllSendings=すべての出荷
 Shipment=出荷
 Shipments=出荷
-ShowSending=Show Shipments
-Receivings=Delivery Receipts
+ShowSending=出荷を表示
+Receivings=配達領収書
 SendingsArea=出荷エリア
 ListOfSendings=出荷のリスト
 SendingMethod=配送方法
-LastSendings=Latest %s shipments
+LastSendings=最新の%s出荷
 StatisticsOfSendings=出荷の統計
 NbOfSendings=出荷数
-NumberOfShipmentsByMonth=Number of shipments by month
-SendingCard=Shipment card
-NewSending=新しい出荷
-CreateShipment=出荷を作成します。
-QtyShipped=個数出荷
-QtyShippedShort=Qty ship.
-QtyPreparedOrShipped=Qty prepared or shipped
+NumberOfShipmentsByMonth=月ごとの出荷数
+SendingCard=出荷カード
+NewSending=新規出荷
+CreateShipment=出荷を作成
+QtyShipped=出荷済数量
+QtyShippedShort=出荷数量
+QtyPreparedOrShipped=準備済または出荷済 数量
 QtyToShip=出荷する数量
-QtyToReceive=Qty to receive
-QtyReceived=個数は、受信した
-QtyInOtherShipments=Qty in other shipments
-KeepToShip=Remain to ship
-KeepToShipShort=Remain
-OtherSendingsForSameOrder=このため、他の出荷
-SendingsAndReceivingForSameOrder=Shipments and receipts for this order
-SendingsToValidate=検証するために出荷
+QtyToReceive=受領する数量
+QtyReceived=受領済数量
+QtyInOtherShipments=他の出荷の数量
+KeepToShip=出荷残
+KeepToShipShort=残
+OtherSendingsForSameOrder=当該注文に対する他の出荷
+SendingsAndReceivingForSameOrder=当該注文の出荷と受領
+SendingsToValidate=検査用に出荷
 StatusSendingCanceled=キャンセル
-StatusSendingDraft=ドラフト
-StatusSendingValidated=検証（製品が出荷する、またはすでに出荷されます）
+StatusSendingCanceledShort=キャンセル
+StatusSendingDraft=下書き
+StatusSendingValidated=検査済(製品で出荷用または出荷済)
 StatusSendingProcessed=処理
-StatusSendingDraftShort=ドラフト
-StatusSendingValidatedShort=検証
+StatusSendingDraftShort=下書き
+StatusSendingValidatedShort=検査
 StatusSendingProcessedShort=処理
-SendingSheet=Shipment sheet
-ConfirmDeleteSending=Are you sure you want to delete this shipment?
-ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
-ConfirmCancelSending=Are you sure you want to cancel this shipment?
+SendingSheet=出荷シート
+ConfirmDeleteSending=この貨物を削除してもよいか？
+ConfirmValidateSending=この出荷を参照<b>%s </b>で検査してもよいか？
+ConfirmCancelSending=この出荷をキャンセルしてもよいか？
 DocumentModelMerou=メロウA5モデル
-WarningNoQtyLeftToSend=警告は、出荷されるのを待っていない製品。
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planned date of delivery
-RefDeliveryReceipt=Ref delivery receipt
-StatusReceipt=Status delivery receipt
-DateReceived=日付の配信は、受信した
-ClassifyReception=Classify reception
-SendShippingByEMail=Send shipment by email
-SendShippingRef=Submission of shipment %s
+WarningNoQtyLeftToSend=警告、出荷待ちの製品はない。
+StatsOnShipmentsOnlyValidated=出荷に関して実施された統計は検査済みです。使用日は出荷の検査日です(飛行機の配達日は常にわかっているわけではない)。
+DateDeliveryPlanned=配達予定日
+RefDeliveryReceipt=参照納品書
+StatusReceipt=ステータス納品書
+DateReceived=配達受領日付
+ClassifyReception=レセプションを分類する
+SendShippingByEMail=メールで出荷する
+SendShippingRef=出荷の提出%s
 ActionsOnShipping=出荷のイベント
 LinkToTrackYourPackage=あなたのパッケージを追跡するためのリンク
-ShipmentCreationIsDoneFromOrder=現時点では、新たな出荷の作成は、注文カードから行われます。
-ShipmentLine=Shipment line
-ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
-ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
+ShipmentCreationIsDoneFromOrder=現時点では、新たな出荷の作成は、注文カードから行われる。
+ShipmentLine=出荷ライン
+ProductQtyInCustomersOrdersRunning=未処理の受注からの製品数量
+ProductQtyInSuppliersOrdersRunning=未処理の発注書からの製品数量
 ProductQtyInShipmentAlreadySent=未処理の受注からの製品数量はすでに送信された
-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.
+ProductQtyInSuppliersShipmentAlreadyRecevied=すでに受け取った未処理の発注書からの製品数量
+NoProductToShipFoundIntoStock=倉庫<b>%s</b>に出荷する製品が見つかりません。在庫を修正するか、戻って別の倉庫を選択すること。
+WeightVolShort=重量/容量
+ValidateOrderFirstBeforeShipment=出荷を行う前に、まず注文を検査する必要がある。
 
 # Sending methods
 # ModelDocument
-DocumentModelTyphon=配信確認のために、より完全なドキュメントモデル（logo. ..）
-DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
-Error_EXPEDITION_ADDON_NUMBER_NotDefined=定数EXPEDITION_ADDON_NUMBERが定義されていません
-SumOfProductVolumes=Sum of product volumes
-SumOfProductWeights=Sum of product weights
+DocumentModelTyphon=配信確認のために、より完全なドキュメントモデル(logo. ..)
+DocumentModelStorm=入庫とフィールド外の互換性のためのより完全なドキュメントモデル(ロゴ...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=定数EXPEDITION_ADDON_NUMBERが定義されていない
+SumOfProductVolumes=製品量の合計
+SumOfProductWeights=製品の重量の合計
 
 # warehouse details
-DetailWarehouseNumber= Warehouse details
-DetailWarehouseFormat= W:%s (Qty: %d)
+DetailWarehouseNumber= 倉庫の詳細
+DetailWarehouseFormat= W：%s(数量：%d)
diff --git a/htdocs/langs/ja_JP/sms.lang b/htdocs/langs/ja_JP/sms.lang
index 70e31818985..d990732438c 100644
--- a/htdocs/langs/ja_JP/sms.lang
+++ b/htdocs/langs/ja_JP/sms.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - sms
 Sms=SMS
-SmsSetup=SMSセットアップ
-SmsDesc=このページでは、SMS機能のグローバルオプションを定義することができます
+SmsSetup=SMSの設定
+SmsDesc=このページでは、SMS機能のグローバルオプションを定義できる
 SmsCard=SMSカード
-AllSms=すべてのSMS campains
+AllSms=すべてのSMSキャンペーン
 SmsTargets=ターゲット
 SmsRecipients=ターゲット
 SmsRecipient=ターゲット
@@ -13,39 +13,39 @@ SmsTo=ターゲット
 SmsTopic=SMSのトピック
 SmsText=メッセージ
 SmsMessage=SMSメッセージ
-ShowSms=ショーのSMS
-ListOfSms=リストSMS campains
-NewSms=新しいSMSキャンペーンし
-EditSms=編集SMS
-ResetSms=新しい送信
-DeleteSms=SMSのキャンペーンしを削除します。
-DeleteASms=SMSのキャンペーンしを削除します。
-PreviewSms=PreviuwのSMS
+ShowSms=SMSを表示
+ListOfSms=SMSキャンペーンを一覧表示する
+NewSms=新規SMSキャンペーン
+EditSms=SMSを編集する
+ResetSms=新規送信
+DeleteSms=SMSキャンペーンを削除する
+DeleteASms=SMSキャンペーンを削除する
+PreviewSms=前のSMS
 PrepareSms=SMSを準備する
 CreateSms=SMSを作成する
-SmsResult=SMSを送信することの結果
-TestSms=テストSMS
+SmsResult=SMS送信の結果
+TestSms=SMSをテストする
 ValidSms=SMSを検証する
 ApproveSms=SMSを承認する
-SmsStatusDraft=ドラフト
+SmsStatusDraft=下書き
 SmsStatusValidated=検証
 SmsStatusApproved=承認された
 SmsStatusSent=送信
 SmsStatusSentPartialy=部分的に送信
 SmsStatusSentCompletely=完全に送信
 SmsStatusError=エラー
-SmsStatusNotSent=送信されません
-SmsSuccessfulySent=正しく送信されたSMS（%sへ%sから）
+SmsStatusNotSent=送信されない
+SmsSuccessfulySent=SMSが正しく送信された(%sから%sへ)
 ErrorSmsRecipientIsEmpty=ターゲットの数が空である
-WarningNoSmsAdded=ターゲットリストに追加する新しい電話番号なし
-ConfirmValidSms=このキャンペーンの検証を確認しますか？
-NbOfUniqueSms=Nbの自由度のユニークな電話番号
-NbOfSms=ホン番号のNbre
+WarningNoSmsAdded=ターゲットリストに追加する新規電話番号なし
+ConfirmValidSms=このキャンペーンの検証を確認するか？
+NbOfUniqueSms=固有の電話番号の数
+NbOfSms=電話番号の数
 ThisIsATestMessage=これはテストメッセージです。
 SendSms=SMSを送信
-SmsInfoCharRemain=残りの文字のNb
-SmsInfoNumero= （フォーマット国際例：33899701761）
-DelayBeforeSending=送信する前に、遅延時間（分）
-SmsNoPossibleSenderFound=有効な送信者はありません。 SMSプロバイダの設定を確認してください。
-SmsNoPossibleRecipientFound=利用可能なターゲットはありません。 SMSプロバイダの設定を確認してください。
-DisableStopIfSupported=Disable STOP message (if supported)
+SmsInfoCharRemain=残りの文字数
+SmsInfoNumero= (国際フォーマット、すなわち：+33899701761)
+DelayBeforeSending=送信する前に、遅延時間(分)
+SmsNoPossibleSenderFound=有効な送信者はない。 SMSプロバイダの設定を確認すること。
+SmsNoPossibleRecipientFound=利用可能なターゲットはない。 SMSプロバイダの設定を確認すること。
+DisableStopIfSupported=STOPメッセージを無効にする(サポートされている場合)
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index e6ac2a3ec17..85fd2d27614 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -2,241 +2,243 @@
 WarehouseCard=倉庫カード
 Warehouse=倉庫
 Warehouses=倉庫
-ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock Location
+ParentWarehouse=親倉庫
+NewWarehouse=新規倉庫/在庫場所
 WarehouseEdit=倉庫を変更する
-MenuNewWarehouse=新倉庫
-WarehouseSource=ソースの倉庫
-WarehouseSourceNotDefined=No warehouse defined,
-AddWarehouse=Create warehouse
-AddOne=Add one
-DefaultWarehouse=Default warehouse
-WarehouseTarget=ターゲット·ウェアハウス
+MenuNewWarehouse=新規倉庫
+WarehouseSource=ソース倉庫
+WarehouseSourceNotDefined=倉庫が定義されていない、
+AddWarehouse=倉庫を作成する
+AddOne=1つ追加する
+DefaultWarehouse=デフォルトの倉庫
+WarehouseTarget=ターゲット倉庫
 ValidateSending=送信削除
 CancelSending=送信キャンセル
 DeleteSending=送信削除
-Stock=株式
-Stocks=ストック
-MissingStocks=Missing stocks
-StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
-StocksByLotSerial=Stocks by lot/serial
-LotSerial=Lots/Serials
-LotSerialList=List of lot/serials
-Movements=動作
-ErrorWarehouseRefRequired=ウェアハウスの参照名を指定する必要があります
+Stock=在庫
+Stocks=在庫
+MissingStocks=在庫がない
+StockAtDate=日付の在庫
+StockAtDateInPast=過去の日付
+StockAtDateInFuture=将来の日付
+StocksByLotSerial=ロット/シリアル別の在庫
+LotSerial=ロット/シリアル
+LotSerialList=ロット/シリアルのリスト
+Movements=移動
+ErrorWarehouseRefRequired=倉庫の参照名を指定する必要がある
 ListOfWarehouses=倉庫のリスト
 ListOfStockMovements=在庫変動のリスト
-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
+ListOfInventories=在庫一覧
+MovementId=移動 ID
+StockMovementForId=移動 ID%d
+ListMouvementStockProject=プロジェクトに関連する在庫移動のリスト
+StocksArea=倉庫エリア
+AllWarehouses=すべての倉庫
+IncludeEmptyDesiredStock=未定義の希望在庫で負の在庫も含める
+IncludeAlsoDraftOrders=ドラフト注文も含める
 Location=場所
 LocationSummary=短い名前の場所
-NumberOfDifferentProducts=Number of different products
+NumberOfDifferentProducts=異なる製品の数
 NumberOfProducts=商品の合計数
-LastMovement=Latest movement
-LastMovements=Latest movements
+LastMovement=最新の動き
+LastMovements=最新の動き
 Units=ユニット
 Unit=ユニット
-StockCorrection=Stock correction
-CorrectStock=正しい株式
-StockTransfer=Stock transfer
-TransferStock=Transfer stock
-MassStockTransferShort=Mass stock transfer
-StockMovement=Stock movement
-StockMovements=Stock movements
+StockCorrection=在庫修正
+CorrectStock=正しい在庫
+StockTransfer=在庫移転
+TransferStock=在庫移転
+MassStockTransferShort=大量在庫移転
+StockMovement=在庫移動
+StockMovements=在庫移動
 NumberOfUnit=ユニット数
-UnitPurchaseValue=Unit purchase price
-StockTooLow=低すぎると株式
-StockLowerThanLimit=Stock lower than alert limit (%s)
+UnitPurchaseValue=購入単価
+StockTooLow=低すぎる在庫
+StockLowerThanLimit=在庫がアラート制限を下回っている(%s)
 EnhancedValue=値
 PMPValue=加重平均価格
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=倉庫の値
-UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
-AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
-RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
-UserDefaultWarehouse=Set a warehouse on Users
-MainDefaultWarehouse=Default warehouse
-MainDefaultWarehouseUser=Use a default warehouse for each user
-MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
-IndependantSubProductStock=Product stock and subproduct stock are independent
-QtyDispatched=数量派遣
-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=ご注文はまだないか、またはこれ以上の在庫倉庫の製品の派遣ができますステータスを持っていません。
-StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
-NoPredefinedProductToDispatch=このオブジェクト用に事前定義された製品がありません。そうは在庫に派遣する必要はありません。
+UserWarehouseAutoCreate=ユーザーの作成時にユーザー倉庫を自動的に作成する
+AllowAddLimitStockByWarehouse=製品ごとの最小在庫と希望在庫の値に加えて、ペアリングごとの最小在庫と希望在庫の値(製品倉庫)も管理する。
+RuleForWarehouse=倉庫のルール
+WarehouseAskWarehouseDuringPropal=販売推進に倉庫を設定する
+WarehouseAskWarehouseDuringOrder=販売注文に倉庫を設定する
+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=Limit for alert
-StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used for a warning as soon as stock is empty.
-PhysicalStock=Physical Stock
+StockLimitShort=アラートの制限
+StockLimit=アラートの在庫制限
+StockLimitDesc=(空)は警告がないことを意味する。 <br> 0は、在庫が空になるとすぐに警告として使用される。
+PhysicalStock=現物在庫
 RealStock=実在庫
-RealStockDesc=Physical/real stock is the stock currently in the warehouses.
-RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
+RealStockDesc=現物/実在庫は、現在倉庫にある在庫 。
+RealStockWillAutomaticallyWhen=実際の在庫は、このルールに従って変更される(在庫モジュールで定義されている)。
 VirtualStock=仮想在庫
-VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+VirtualStockAtDate=日付での仮想在庫
+VirtualStockAtDateDesc=日付より前に行われる予定のすべての保留中の注文が終了すると、仮想在庫が発生する
+VirtualStockDesc=仮想在庫は、すべてのオープン/保留アクション(在庫に影響を与える)が閉じられたときに使用可能な計算された在庫 (発注書の受領、販売注文の出荷、製造注文の作成など)。
 IdWarehouse=イド倉庫
 DescWareHouse=説明倉庫
 LieuWareHouse=ローカリゼーション倉庫
 WarehousesAndProducts=倉庫と製品
-WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
+WarehousesAndProductsBatchDetail=倉庫および製品(ロット/シリアルごとの詳細付き)
 AverageUnitPricePMPShort=加重平均価格
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=製品を在庫に入れるためにサプライヤーに支払わなければならなかった入力平均単価。
 SellPriceMin=販売単価
-EstimatedStockValueSellShort=Value for sell
-EstimatedStockValueSell=Value for sell
-EstimatedStockValueShort=入力株式価値
-EstimatedStockValue=入力株式価値
-DeleteAWarehouse=倉庫を削除します。
-ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
-PersonalStock=個人の株式%s
-ThisWarehouseIsPersonalStock=この倉庫は%s %sの個人的な株式を表す
-SelectWarehouseForStockDecrease=株式の減少のために使用するために倉庫を選択します。
-SelectWarehouseForStockIncrease=在庫の増加に使用する倉庫を選択します。
-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
+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=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 onto "%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=Type 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').
+CurentlyUsingPhysicalStock=現物在庫
+RuleForStockReplenishment=在庫補充のルール
+SelectProductWithNotNullQty=数量がnullではない製品と仕入先を少なくとも1つ選択してください
+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=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>).
-OpenAll=Open for all actions
-OpenInternal=Open only for internal actions
-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
-inventoryTitle=Inventory
-inventoryListTitle=Inventories
-inventoryListEmpty=No inventory in progress
-inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
+MovementCorrectStock=製品%sの在庫修正
+MovementTransferStock=製品%sの別の倉庫への在庫移転
+InventoryCodeShort=Inv./Mov。コード
+NoPendingReceptionOnSupplierOrder=注文書が開いているため、保留中の受付はない
+ThisSerialAlreadyExistWithDifferentDate=ロット/シリアル 番号 (<strong>%s</strong>) は異なる賞味期限または販売期限で ( <strong>%s</strong> が見つかったが、入力したのは <strong>%s</strong>).
+OpenAll=すべてのアクションに対して開く
+OpenInternal=内部アクションのためにのみ開く
+UseDispatchStatus=発注書受付の製品ラインにディスパッチステータス(承認/拒否)を使用する
+OptionMULTIPRICESIsOn=オプション「セグメントごとのいくつかの価格」がオンになっている。これは、製品に複数の販売価格があるため、販売価値を計算できないことを意味する
+ProductStockWarehouseCreated=アラートの在庫制限と希望する最適在庫が正しく作成された
+ProductStockWarehouseUpdated=アラートの在庫制限と希望する最適在庫が正しく更新された
+ProductStockWarehouseDeleted=アラートの在庫制限と希望する最適在庫が正しく削除された
+AddNewProductStockWarehouse=アラートと望ましい最適在庫の新規制限を設定する
+AddStockLocationLine=数量を減らしてから、クリックしてこの製品の別の倉庫を追加する
+InventoryDate=在庫日
+NewInventory=新規在庫
+inventorySetup = 在庫設定
+inventoryCreatePermission=新規在庫を作成する
+inventoryReadPermission=在庫を見る
+inventoryWritePermission=在庫を更新する
+inventoryValidatePermission=在庫を検証する
+inventoryTitle=在庫
+inventoryListTitle=在庫
+inventoryListEmpty=進行中の在庫はない
+inventoryCreateDelete=インベントリの作成/削除
+inventoryCreate=新規作成
 inventoryEdit=編集
 inventoryValidate=検証
 inventoryDraft=ランニング
-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
+inventorySelectWarehouse=倉庫の選択
+inventoryConfirmCreate=作成
+inventoryOfWarehouse=倉庫の在庫：%s
+inventoryErrorQtyAdd=エラー：1つの数量がゼロ未満 
+inventoryMvtStock=在庫別
+inventoryWarningProductAlreadyExists=この製品はすでにリストに含まれている
 SelectCategory=カテゴリフィルタ
-SelectFournisseur=Vendor filter
-inventoryOnDate=Inventory
-INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
-inventoryChangePMPPermission=Allow to change PMP value for a product
-ColumnNewPMP=New unit PMP
-OnlyProdsInStock=Do not add product without stock
-TheoricalQty=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
+SelectFournisseur=仕入先フィルタ
+inventoryOnDate=在庫
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=在庫移動には、(在庫検証の日付ではなく)在庫の日付がある。
+inventoryChangePMPPermission=製品のPMP値の変更を許可する
+ColumnNewPMP=新規ユニットPMP
+OnlyProdsInStock=在庫のない製品は追加しないこと
+TheoricalQty=理論量
+TheoricalValue=理論量
+LastPA=最後のBP
+CurrentPA=現在のBP
+RecordedQty=記録された数量
+RealQty=実数量
+RealValue=真の価値
+RegulatedQty=規制数量
+AddInventoryProduct=製品を在庫に追加する
 AddProduct=加える
-ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action?
-InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
-inventoryDeleteLine=行を削除します
-RegulateStock=Regulate Stock
+ApplyPMP=PMPを適用する
+FlushInventory=在庫をフラッシュする
+ConfirmFlushInventory=このアクションを確認するか？
+InventoryFlushed=在庫がフラッシュされた
+ExitEditMode=終了版
+inventoryDeleteLine=行を削除する
+RegulateStock=在庫を調整する
 ListInventory=リスト
-StockSupportServices=Stock management supports Services
-StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
-ReceiveProducts=Receive items
-StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
-StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
-StockIncrease=Stock increase
-StockDecrease=Stock decrease
-InventoryForASpecificWarehouse=Inventory for a specific warehouse
-InventoryForASpecificProduct=Inventory for a specific product
-StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
-ForceTo=Force to
-AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
-StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
-CurrentStock=Current stock
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|serial barcode)
+StockSupportServices=在庫管理はサービスをサポートする
+StockSupportServicesDesc=デフォルトでは、"製品" 種別 の製品のみを在庫できる。サービスモジュールとこのオプションの両方が有効になっている場合は、"サービス"種別 の製品を在庫することもできる。
+ReceiveProducts=アイテムを受け取る
+StockIncreaseAfterCorrectTransfer=修正/移転による増加
+StockDecreaseAfterCorrectTransfer=修正/移転による減少
+StockIncrease=在庫増加
+StockDecrease=在庫減少
+InventoryForASpecificWarehouse=特定の倉庫の在庫
+InventoryForASpecificProduct=特定の製品の在庫
+StockIsRequiredToChooseWhichLotToUse=使用するロットを選択するには在庫が必要 
+ForceTo=強制する
+AlwaysShowFullArbo=倉庫リンクのポップアップに倉庫の完全なツリーを表示する(警告：これによりパフォーマンスが大幅に低下する可能性がある)
+StockAtDatePastDesc=過去の特定の日付の在庫(実際の在庫)をここで表示できる
+StockAtDateFutureDesc=将来の特定の日付の在庫(仮想在庫)をここで表示できる
+CurrentStock=現在の在庫
+InventoryRealQtyHelp=値を0に設定して、数量をリセットする。<br>フィールドを空のままにするか、行を削除して、変更しないこと。
+UpdateByScaning=スキャンして更新する
+UpdateByScaningProductBarcode=スキャンによる更新(製品バーコード)
+UpdateByScaningLot=スキャンによる更新(ロット|シリアルバーコード)
+DisableStockChangeOfSubProduct=この移動中は、このキットのすべての副産物の在庫変更を無効にする。
diff --git a/htdocs/langs/ja_JP/stripe.lang b/htdocs/langs/ja_JP/stripe.lang
index 90be83666f7..40fc6f89456 100644
--- a/htdocs/langs/ja_JP/stripe.lang
+++ b/htdocs/langs/ja_JP/stripe.lang
@@ -1,72 +1,71 @@
 # 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
+StripeSetup=Stripe モジュールのセットアップ
+StripeDesc=<a href="http://www.stripe.com" target="_blank"> Stripe </a>を介して、クレジット/セビットカードでの支払い用のStripeオンライン支払いページを顧客に提供します。これは、顧客が臨時の支払いを行えるようにするため、または特定のDolibarrオブジェクト(請求書、注文など)に関連する支払いのために使用できる。
+StripeOrCBDoPayment=クレジットカードまたはStripeで支払う
 FollowingUrlAreAvailableToMakePayments=以下のURLはDolibarrオブジェクト上で支払いをするために顧客にページを提供するために利用可能です
 PaymentForm=支払い形態
-WelcomeOnPaymentPage=Welcome to our online payment service
-ThisScreenAllowsYouToPay=この画面では、%sにオンライン決済を行うことができます。
-ThisIsInformationOnPayment=これは、実行する支払いに関する情報です。
+WelcomeOnPaymentPage=オンライン決済サービスへようこそ
+ThisScreenAllowsYouToPay=この画面では、%sにオンライン決済を行うことができる。
+ThisIsInformationOnPayment=これは、実行する支払いに関する情報。
 ToComplete=完了する
 YourEMail=入金確認を受信する電子メール
-STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
+STRIPE_PAYONLINE_SENDEMAIL=支払い試行後の電子メール通知(成功または失敗)
 Creditor=債権者
 PaymentCode=支払いコード
-StripeDoPayment=Pay with Stripe
-YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+StripeDoPayment=Stripeで支払う
+YouWillBeRedirectedOnStripe=クレジットカード情報を入力するために、セキュリティで保護されたStripeページにリダイレクトされる
 Continue=次の
 ToOfferALinkForOnlinePayment=%s支払いのURL
-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.
+ToOfferALinkForOnlinePaymentOnOrder=受注の%sオンライン支払いページを提供するURL
+ToOfferALinkForOnlinePaymentOnInvoice=顧客の請求書に%sオンライン支払いページを提供するためのURL
+ToOfferALinkForOnlinePaymentOnContractLine=契約ラインの%sオンライン支払いページを提供するURL
+ToOfferALinkForOnlinePaymentOnFreeAmount=既存のオブジェクトのない任意の金額の%sオンライン支払いページを提供するURL
+ToOfferALinkForOnlinePaymentOnMemberSubscription=メンバーサブスクリプションの%sオンライン支払いページを提供するURL
+ToOfferALinkForOnlinePaymentOnDonation=寄付の支払いのために%sオンライン支払いページを提供するURL
+YouCanAddTagOnUrl=また、URLパラメーター<b>&tag=<i>value</i></b>をこれらのURLのいずれかに追加して(オブジェクトにリンクされていない支払いにのみ必須)、独自の支払いコメントタグを追加することもできる。 <br>既存のオブジェクトがない支払いのURLの場合、パラメーター<strong>&noidempotency=1</strong>を追加して、同じタグを持つ同じリンクを複数回使用できるようにすることもできる(一部の支払いモードでは、このパラメータがないと、異なるリンクごとに支払いが1に制限される場合がある)
+SetupStripeToHavePaymentCreatedAutomatically=Stripeによって検証されたときに支払いが自動的に作成されるように、URL <b> %s</b>を使用してStripeをセットアップします。
 AccountParameter=アカウントのパラメータ
 UsageParameter=使用パラメータ
 InformationToFindParameters=あなたの%sアカウント情報を見つけるのを助ける
-STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=ベンダーの名前
+STRIPE_CGI_URL_V2=支払い用のStripe CGIモジュールのURL
 CSSUrlForPaymentForm=支払いフォームのCSSスタイルシートのURL
-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
+NewStripePaymentReceived=新規Stripeの支払いを受け取りました
+NewStripePaymentFailed=新規Stripe支払いが試行されましたが、失敗した
+FailedToChargeCard=カードのチャージに失敗した
+STRIPE_TEST_SECRET_KEY=秘密のテストキー
+STRIPE_TEST_PUBLISHABLE_KEY=公開可能なテストキー
+STRIPE_TEST_WEBHOOK_KEY=Webhookテストキー
+STRIPE_LIVE_SECRET_KEY=秘密のライブキー
+STRIPE_LIVE_PUBLISHABLE_KEY=公開可能なライブキー
+STRIPE_LIVE_WEBHOOK_KEY=Webhookライブキー
+ONLINE_PAYMENT_WAREHOUSE=オンライン支払いが行われるときに在庫減少に使用する在庫<br>(TODO請求書のアクションで在庫を減らすオプションが実行され、オンライン支払いがそれ自体で請求書を生成する場合？)
+StripeLiveEnabled=Stripe ライブが有効(それ以外の場合はテスト/サンドボックスモード)
+StripeImportPayment=Stripe 支払いのインポート
+ExampleOfTestCreditCard=テスト用のクレジットカードの例：%s =>有効、%s =>エラーCVC、%s =>期限切れ、%s =>充電に失敗
+StripeGateways=Stripe ゲートウェイ
+OAUTH_STRIPE_TEST_ID=Stripe ConnectクライアントID(ca _...)
+OAUTH_STRIPE_LIVE_ID=Stripe ConnectクライアントID(ca _...)
+BankAccountForBankTransfer=資金支払いのための銀行口座
+StripeAccount=Stripe アカウント
+StripeChargeList=Stripe 料金のリスト
+StripeTransactionList=Stripeトランザクションのリスト
+StripeCustomerId=Stripe の顧客ID
+StripePaymentModes=Stripe 支払いモード
+LocalID=ローカルID
 StripeID=Stripe ID
-NameOnCard=Name on card
-CardNumber=Card Number
-ExpiryDate=Expiry Date
+NameOnCard=カードの名前
+CardNumber=カード番号
+ExpiryDate=有効期限
 CVN=CVN
-DeleteACard=Delete Card
-ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
-CreateCustomerOnStripe=Create customer on Stripe
-CreateCardOnStripe=Create card on Stripe
-ShowInStripe=Show in Stripe
-StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
-StripePayoutList=List of Stripe payouts
-ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
-ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
-PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
-ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+DeleteACard=カードを削除
+ConfirmDeleteCard=このクレジットカードまたはデビットカードを削除してもよいか？
+CreateCustomerOnStripe=Stripeで顧客を作成する
+CreateCardOnStripe=Stripeでカードを作成する
+ShowInStripe=Stripe で表示
+StripeUserAccountForActions=一部のStripeイベントの電子メール通知に使用するユーザーアカウント(Stripeペイアウト)
+StripePayoutList=Stripe ペイアウトのリスト
+ToOfferALinkForTestWebhook=IPNを呼び出すためのStripeWebHookのセットアップへのリンク(テストモード)
+ToOfferALinkForLiveWebhook=IPNを呼び出すためのStripeWebHookのセットアップへのリンク(ライブモード)
+PaymentWillBeRecordedForNextPeriod=支払いは次の期間に記録される。
+ClickHereToTryAgain= <a href="%s">ここをクリックして再試行すること... </a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=強力な顧客認証ルールにより、カードの作成はStripeバックオフィスから行う必要がある。 Stripeの顧客レコードをオンにするには、ここをクリックすること：%s
diff --git a/htdocs/langs/ja_JP/supplier_proposal.lang b/htdocs/langs/ja_JP/supplier_proposal.lang
index ffbda838ccb..2bae204541a 100644
--- a/htdocs/langs/ja_JP/supplier_proposal.lang
+++ b/htdocs/langs/ja_JP/supplier_proposal.lang
@@ -1,54 +1,55 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Vendor commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
-SupplierProposalNew=New price request
-CommRequest=Price request
-CommRequests=Price requests
-SearchRequest=Find a request
-DraftRequests=Draft requests
-SupplierProposalsDraft=Draft vendor proposals
-LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
-SupplierProposalArea=Vendor proposals area
-SupplierProposalShort=Vendor proposal
-SupplierProposals=Vendor proposals
-SupplierProposalsShort=Vendor proposals
-NewAskPrice=New price request
-ShowSupplierProposal=Show price request
-AddSupplierProposal=Create a price request
-SupplierProposalRefFourn=Vendor ref
+SupplierProposal=仕入先の売買契約提案書
+supplier_proposalDESC=サプライヤーへの価格要求を管理する
+SupplierProposalNew=新規価格リクエスト
+CommRequest=価格リクエスト
+CommRequests=価格の要望
+SearchRequest=リクエストを探す
+DraftRequests=ドラフトリクエスト
+SupplierProposalsDraft=ドラフト仕入先提案
+LastModifiedRequests=最新の%s修正価格リクエスト
+RequestsOpened=オープン価格リクエスト
+SupplierProposalArea=仕入先提案エリア
+SupplierProposalShort=仕入先提案
+SupplierProposals=仕入先の提案
+SupplierProposalsShort=仕入先の提案
+AskPrice=価格リクエスト
+NewAskPrice=新規価格リクエスト
+ShowSupplierProposal=価格リクエストを表示
+AddSupplierProposal=価格リクエストを作成する
+SupplierProposalRefFourn=仕入先参照
 SupplierProposalDate=配達日
-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=ドラフト（検証する必要があります）
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposalRefFournNotice=「承認済み」に戻る前に、サプライヤーの参照を把握することを検討すること。
+ConfirmValidateAsk=この価格要求を<b>%s </b>という名前で検証してもよいか？
+DeleteAsk=リクエストの削除
+ValidateAsk=リクエストの検証
+SupplierProposalStatusDraft=ドラフト(検証する必要がある)
+SupplierProposalStatusValidated=検証済み(リクエストはオープン)
 SupplierProposalStatusClosed=閉じた
-SupplierProposalStatusSigned=Accepted
+SupplierProposalStatusSigned=承認済み
 SupplierProposalStatusNotSigned=拒否
 SupplierProposalStatusDraftShort=ドラフト
 SupplierProposalStatusValidatedShort=検証
 SupplierProposalStatusClosedShort=閉じた
-SupplierProposalStatusSignedShort=Accepted
+SupplierProposalStatusSignedShort=承認済み
 SupplierProposalStatusNotSignedShort=拒否
-CopyAskFrom=Create price request by copying existing a request
-CreateEmptyAsk=Create blank request
-ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b>?
-ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b>?
-SendAskByMail=Send price request by mail
-SendAskRef=Sending the price request %s
-SupplierProposalCard=Request card
-ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
-ActionsOnSupplierProposal=Events on price request
-DocModelAuroreDescription=A complete request model (logo...)
-CommercialAsk=Price request
-DefaultModelSupplierProposalCreate=Default model creation
-DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
-DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of vendor proposal requests
-ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
-SupplierProposalsToClose=Vendor proposals to close
-SupplierProposalsToProcess=Vendor proposals to process
-LastSupplierProposals=Latest %s price requests
-AllPriceRequests=All requests
+CopyAskFrom=既存のリクエストをコピーして価格リクエストを作成する
+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=すべてのリクエスト
diff --git a/htdocs/langs/ja_JP/suppliers.lang b/htdocs/langs/ja_JP/suppliers.lang
index ce2aea9527f..09fd760b180 100644
--- a/htdocs/langs/ja_JP/suppliers.lang
+++ b/htdocs/langs/ja_JP/suppliers.lang
@@ -1,48 +1,48 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=仕入先s
-SuppliersInvoice=ベンダー請求書
-ShowSupplierInvoice=Show Vendor Invoice
-NewSupplier=New vendor
+SuppliersInvoice=仕入先請求書
+ShowSupplierInvoice=仕入先の請求書を表示する
+NewSupplier=新規仕入先
 History=歴史
-ListOfSuppliers=List of vendors
-ShowSupplier=Show vendor
+ListOfSuppliers=仕入先のリスト
+ShowSupplier=仕入先を表示
 OrderDate=注文日
-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
+BuyingPriceMin=最高の購入価格
+BuyingPriceMinShort=最高の購入価格
+TotalBuyingPriceMinShort=サブ製品の購入価格の合計
+TotalSellingPriceMinShort=サブ製品の販売価格の合計
+SomeSubProductHaveNoPrices=一部のサブ製品には価格が定義されていない
+AddSupplierPrice=購入価格を追加
+ChangeSupplierPrice=購入価格の変更
 SupplierPrices=仕入先価格
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
-NoRecordedSuppliers=No vendor recorded
-SupplierPayment=ベンダーの支払
-SuppliersArea=Vendor area
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=この仕入先リファレンスは、すでに製品に関連付けられています：%s
+NoRecordedSuppliers=仕入先は記録されていない
+SupplierPayment=仕入先の支払
+SuppliersArea=仕入先エリア
 RefSupplierShort=仕入先参照符号
 Availability=可用性
-ExportDataset_fournisseur_1=Vendor invoices and invoice details
-ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order details
+ExportDataset_fournisseur_1=仕入先の請求書と請求書の詳細
+ExportDataset_fournisseur_2=仕入先の請求書と支払い
+ExportDataset_fournisseur_3=注文書と注文の詳細
 ApproveThisOrder=この注文を承認
-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
+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/ja_JP/ticket.lang b/htdocs/langs/ja_JP/ticket.lang
index 8fdb14dc6e0..9b6e686cb03 100644
--- a/htdocs/langs/ja_JP/ticket.lang
+++ b/htdocs/langs/ja_JP/ticket.lang
@@ -25,7 +25,7 @@ Permission56001=チケットを見る
 Permission56002=チケットを変更する
 Permission56003=チケットを削除する
 Permission56004=チケットを管理する
-Permission56005=すべてのサードパーティのチケットを参照すること（外部ユーザーには有効ではなく、常に依存しているサードパーティに限定される）
+Permission56005=すべてのサードパーティのチケットを参照すること(外部ユーザーには有効ではなく、常に依存しているサードパーティに限定される)
 
 TicketDictType=チケット-タイプ
 TicketDictCategory=チケット-グループ
@@ -58,7 +58,6 @@ OriginEmail=メールソース
 Notify_TICKET_SENTBYMAIL=メールでチケットメッセージを送信する
 
 # Status
-NotRead=読んでいない
 Read=読む
 Assigned=割り当て済み
 InProgress=進行中
@@ -96,7 +95,7 @@ TicketsEmailMustExist=チケットを作成するには、既存のメールア
 TicketsEmailMustExistHelp=パブリックインターフェイスでは、新規チケットを作成するために、電子メールアドレスがデータベースにすでに入力されている必要がある。
 PublicInterface=パブリックインターフェイス
 TicketUrlPublicInterfaceLabelAdmin=パブリックインターフェイスの代替URL
-TicketUrlPublicInterfaceHelpAdmin=Webサーバーのエイリアスを定義して、別のURLでパブリックインターフェイスを利用できるようにすることができる（サーバーはこの新規URLのプロキシとして機能する必要がある）
+TicketUrlPublicInterfaceHelpAdmin=Webサーバーのエイリアスを定義して、別のURLでパブリックインターフェイスを利用できるようにすることができる(サーバーはこの新規URLのプロキシとして機能する必要がある)
 TicketPublicInterfaceTextHomeLabelAdmin=パブリックインターフェイスのウェルカムテキスト
 TicketPublicInterfaceTextHome=サポートチケットを作成するか、その識別子追跡チケットから既存のものを表示できる。
 TicketPublicInterfaceTextHomeHelpAdmin=ここで定義されたテキストは、パブリックインターフェイスのホームページに表示される。
@@ -116,19 +115,20 @@ TicketsShowModuleLogoHelp=このオプションを有効にすると、パブリ
 TicketsShowCompanyLogo=パブリックインターフェイスに法人のロゴを表示する
 TicketsShowCompanyLogoHelp=このオプションを有効にすると、パブリックインターフェイスのページで主要法人のロゴが非表示になる。
 TicketsEmailAlsoSendToMainAddress=メインのメールアドレスにも通知を送信する
-TicketsEmailAlsoSendToMainAddressHelp=このオプションを有効にすると、「通知メールの送信元」アドレスにメールが送信される（以下の設定を参照）。
-TicketsLimitViewAssignedOnly=現在のユーザーに割り当てられたチケットに表示を制限する（外部ユーザーには無効で、常に依存しているサードパーティに制限される）
+TicketsEmailAlsoSendToMainAddressHelp=このオプションを有効にすると、「通知メールの送信元」アドレスにメールが送信される(以下の設定を参照)。
+TicketsLimitViewAssignedOnly=現在のユーザーに割り当てられたチケットに表示を制限する(外部ユーザーには無効で、常に依存しているサードパーティに制限される)
 TicketsLimitViewAssignedOnlyHelp=現在のユーザーに割り当てられているチケットのみが表示される。チケット管理権を持つユーザーには適用されない。
 TicketsActivatePublicInterface=パブリックインターフェイスをアクティブ化する
 TicketsActivatePublicInterfaceHelp=パブリックインターフェイスにより、すべての訪問者がチケットを作成できる。
 TicketsAutoAssignTicket=チケットを作成したユーザーを自動的に割り当てる
 TicketsAutoAssignTicketHelp=チケットを作成するときに、ユーザーを自動的にチケットに割り当てることができる。
 TicketNumberingModules=チケット番号付けモジュール
+TicketsModelModule=チケットのドキュメントテンプレート
 TicketNotifyTiersAtCreation=作成時にサードパーティに通知する
 TicketsDisableCustomerEmail=パブリックインターフェイスからチケットを作成するときは、常にメールを無効にすること
 TicketsPublicNotificationNewMessage=新規メッセージが追加されたときにメール(s)を送信する
-TicketsPublicNotificationNewMessageHelp=新規メッセージがパブリックインターフェイスから追加されたときに電子メール(s)を送信する（割り当てられたユーザーまたは通知電子メールを（更新）および/または通知電子メールに）
-TicketPublicNotificationNewMessageDefaultEmail=通知メール（更新）
+TicketsPublicNotificationNewMessageHelp=新規メッセージがパブリックインターフェイスから追加されたときに電子メール(s)を送信する(割り当てられたユーザーまたは通知電子メールを(更新)および/または通知電子メールに)
+TicketPublicNotificationNewMessageDefaultEmail=通知メール(更新)
 TicketPublicNotificationNewMessageDefaultEmailHelp=チケットにユーザーが割り当てられていない場合、またはユーザーに電子メールがない場合は、このアドレスに新規メッセージ通知を電子メールで送信する。
 #
 # Index & list page
@@ -177,7 +177,7 @@ TicketMessageSuccessfullyAdded=メッセージが正常に追加された
 TicketMessagesList=メッセージリスト
 NoMsgForThisTicket=このチケットのメッセージはない
 Properties=分類
-LatestNewTickets=最新の%s最新のチケット（未読）
+LatestNewTickets=最新の%s最新のチケット(未読)
 TicketSeverity=重大度
 ShowTicket=チケットを見る
 RelatedTickets=関連チケット
@@ -231,7 +231,6 @@ TicketLogStatusChanged=ステータスが変更された：%sから%s
 TicketNotNotifyTiersAtCreate=作成時に法人に通知しない
 Unread=未読
 TicketNotCreatedFromPublicInterface=利用不可。チケットはパブリックインターフェイスから作成されなかった。
-PublicInterfaceNotEnabled=パブリックインターフェイスが有効になっていない
 ErrorTicketRefRequired=チケット参照名が必要
 
 #
@@ -254,7 +253,7 @@ TicketPublicDesc=サポートチケットを作成したり、既存のIDから
 YourTicketSuccessfullySaved=チケットが正常に保存された！
 MesgInfosPublicTicketCreatedWithTrackId=ID%sおよびRef%sで新規チケットが作成された。
 PleaseRememberThisId=後で尋ねる可能性のある追跡番号を保管すること。
-TicketNewEmailSubject=チケット作成の確認-Ref%s（パブリックチケットID %s）
+TicketNewEmailSubject=チケット作成の確認-Ref%s(パブリックチケットID %s)
 TicketNewEmailSubjectCustomer=新規サポートチケット
 TicketNewEmailBody=これは、新規チケットを登録したことを確認するための自動メール。
 TicketNewEmailBodyCustomer=これは、新規チケットがアカウントに作成されたことを確認するための自動メール。
@@ -273,7 +272,7 @@ Subject=科目
 ViewTicket=チケットを見る
 ViewMyTicketList=チケットリストを見る
 ErrorEmailMustExistToCreateTicket=エラー：データベースにメールアドレスが見つからない
-TicketNewEmailSubjectAdmin=新規チケットが作成された-Ref%s（パブリックチケットID %s）
+TicketNewEmailSubjectAdmin=新規チケットが作成された-Ref%s(パブリックチケットID %s)
 TicketNewEmailBodyAdmin= <p>チケットはID＃%sで作成された。情報を参照すること：</p>
 SeeThisTicketIntomanagementInterface=管理インターフェースでチケットを見る
 TicketPublicInterfaceForbidden=チケットのパブリックインターフェイスが有効になっていない
diff --git a/htdocs/langs/ja_JP/trips.lang b/htdocs/langs/ja_JP/trips.lang
index 9ec51fa3ea2..aa7bffd91bd 100644
--- a/htdocs/langs/ja_JP/trips.lang
+++ b/htdocs/langs/ja_JP/trips.lang
@@ -1,151 +1,151 @@
 # 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
+ShowExpenseReport=経費報告書を表示する
+Trips=経費報告書
+TripsAndExpenses=経費報告書
+TripsAndExpensesStatistics=経費報告書の統計
+TripCard=経費通知表
+AddTrip=経費報告書を作成する
+ListOfTrips=経費報告書のリスト
 ListOfFees=手数料のリスト
-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=量またはキロ
-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 inform for validation.
-TripSociete=Information company
-TripNDF=Informations expense report
-PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
-ExpenseReportLine=Expense report line
+TypeFees=料金の種類
+ShowTrip=経費報告書を表示する
+NewTrip=新規経費報告書
+LastExpenseReports=最新の%s経費報告書
+AllExpenseReports=すべての経費報告書
+CompanyVisited=訪問した法人/組織
+FeesKilometersOrAmout=金額またはキロメートル
+DeleteTrip=経費報告書を削除する
+ConfirmDeleteTrip=この経費報告書を削除してもよいか？
+ListTripsAndExpenses=経費報告書のリスト
+ListToApprove=承認待ち
+ExpensesArea=経費報告エリア
+ClassifyRefunded=分類「返金済み」
+ExpenseReportWaitingForApproval=新規経費報告書が承認のために提出された
+ExpenseReportWaitingForApprovalMessage=新規経費報告書が提出され、承認を待っている。 <br>-ユーザ：%s <br>-期間：%s <br>検証するにはここをクリック：%s
+ExpenseReportWaitingForReApproval=再承認のために経費報告書が提出された
+ExpenseReportWaitingForReApprovalMessage=経費報告書が提出され、再承認を待っている。 <br> %s、この理由で経費報告書の承認を拒否した：%s。 <br>新規バージョンが提案され、承認を待っている。 <br>-ユーザ：%s <br>-期間：%s <br>検証するにはここをクリック：%s
+ExpenseReportApproved=経費報告書が承認された
+ExpenseReportApprovedMessage=経費報告書%sが承認された。 <br>-ユーザ：%s <br>-承認者：%s <br>ここをクリックして経費報告書を表示する：%s
+ExpenseReportRefused=経費報告書は拒否された
+ExpenseReportRefusedMessage=経費報告書%sは拒否された。 <br>-ユーザ：%s <br>-拒否者：%s <br>-拒否の動機：%s <br>ここをクリックして経費報告書:%s を表示
+ExpenseReportCanceled=経費報告がキャンセルされた
+ExpenseReportCanceledMessage=経費報告書%sはキャンセルされた。 <br>-ユーザ：%s <br>-キャンセル者：%s <br>-キャンセルの動機：%s <br>ここをクリックして経費報告書: %s を表示
+ExpenseReportPaid=経費報告書が支払われた
+ExpenseReportPaidMessage=経費報告書%sが支払われた。 <br>-ユーザ：%s <br>-支払い者：%s <br>ここをクリックして経費報告書を表示する：%s
+TripId=ID経費レポート
+AnyOtherInThisListCanValidate=検証のために通知する人。
+TripSociete=情報法人
+TripNDF=情報経費報告書
+PDFStandardExpenseReports=経費報告書のPDFドキュメントを生成するための標準テンプレート
+ExpenseReportLine=経費報告行
 TF_OTHER=その他
-TF_TRIP=Transportation
+TF_TRIP=交通
 TF_LUNCH=ランチ
-TF_METRO=Metro
-TF_TRAIN=Train
-TF_BUS=Bus
+TF_METRO=メトロ
+TF_TRAIN=列車
+TF_BUS=バス
 TF_CAR=自動車
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
-TF_HOTEL=Hotel
-TF_TAXI=Taxi
-EX_KME=Mileage costs
-EX_FUE=Fuel CV
-EX_HOT=Hotel
-EX_PAR=Parking CV
-EX_TOL=Toll CV
-EX_TAX=Various Taxes
-EX_IND=Indemnity transportation subscription
-EX_SUM=Maintenance supply
-EX_SUO=Office supplies
-EX_CAR=Car rental
-EX_DOC=Documentation
-EX_CUR=Customers receiving
-EX_OTR=Other receiving
-EX_POS=Postage
-EX_CAM=CV maintenance and repair
-EX_EMM=Employees meal
-EX_GUM=Guests meal
-EX_BRE=Breakfast
-EX_FUE_VP=Fuel PV
-EX_TOL_VP=Toll PV
-EX_PAR_VP=Parking PV
-EX_CAM_VP=PV maintenance and repair
-DefaultCategoryCar=Default transportation mode
-DefaultRangeNumber=Default range number
-UploadANewFileNow=Upload a new document now
-Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
-ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-AucuneLigne=There is no expense report declared yet
-ModePaiement=Payment mode
-VALIDATOR=User responsible for approval
-VALIDOR=Approved by
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Paid by
-REFUSEUR=Denied by
-CANCEL_USER=Deleted by
+TF_PEAGE=通行料金
+TF_ESSENCE=燃料
+TF_HOTEL=ホテル
+TF_TAXI=タクシー
+EX_KME=マイレージ費用
+EX_FUE=燃料CV
+EX_HOT=ホテル
+EX_PAR=駐車場履歴書
+EX_TOL=料金履歴書
+EX_TAX=さまざまな税金
+EX_IND=補償輸送サブスクリプション
+EX_SUM=メンテナンス用品
+EX_SUO=事務用品
+EX_CAR=レンタカー
+EX_DOC=ドキュメンテーション
+EX_CUR=受け取っている顧客
+EX_OTR=その他の受け取り
+EX_POS=送料
+EX_CAM=CVのメンテナンスと修理
+EX_EMM=従業員の食事
+EX_GUM=ゲストの食事
+EX_BRE=朝食
+EX_FUE_VP=燃料PV
+EX_TOL_VP=有料PV
+EX_PAR_VP=駐車場PV
+EX_CAM_VP=PVのメンテナンスと修理
+DefaultCategoryCar=デフォルトの輸送モード
+DefaultRangeNumber=デフォルトの範囲番号
+UploadANewFileNow=今すぐ新規ドキュメントをアップロードする
+Error_EXPENSEREPORT_ADDON_NotDefined=エラー、経費報告書の番号付け参照のルールがモジュール「経費報告書」の設定に定義されていなかった
+ErrorDoubleDeclaration=同様の日付範囲で別の経費報告書を宣言した。
+AucuneLigne=経費報告書はまだ宣言されていない
+ModePaiement=支払いモード
+VALIDATOR=承認を担当するユーザ
+VALIDOR=によって承認された
+AUTHOR=によって記録された
+AUTHORPAIEMENT=によって支払われた
+REFUSEUR=によって拒否された
+CANCEL_USER=によって削除された
 MOTIF_REFUS=理由
 MOTIF_CANCEL=理由
-DATE_REFUS=Deny date
+DATE_REFUS=拒否日
 DATE_SAVE=検証日
-DATE_CANCEL=Cancelation date
+DATE_CANCEL=キャンセル日
 DATE_PAIEMENT=支払期日
 BROUILLONNER=再開 
-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 create or update any rules of calculation. This part will be used when user will create a new expense report
+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=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
+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=Limite amount
-ExpenseReportRestrictive=Restrictive
-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
-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
-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
+ExpenseReportLimitAmount=制限量
+ExpenseReportRestrictive=制限的
+AllExpenseReport=あらゆる種類の経費報告書
+OnExpense=経費ライン
+ExpenseReportRuleSave=経費報告ルールが保存された
+ExpenseReportRuleErrorOnSave=エラー：%s
+RangeNum=範囲%d
+ExpenseReportConstraintViolationError=制約違反ID [%s]：%sは%s%sよりも優れている
+byEX_DAY=日ごと(%sへの制限)
+byEX_MON=月ごと(%sへの制限)
+byEX_YEA=年ごと(%sへの制限)
+byEX_EXP=行ごと(%sへの制限)
+ExpenseReportConstraintViolationWarning=制約違反ID [%s]：%sは%s%sよりも優れている
+nolimitbyEX_DAY=日ごと(制限なし)
+nolimitbyEX_MON=月ごと(制限なし)
+nolimitbyEX_YEA=年ごと(制限なし)
+nolimitbyEX_EXP=行ごと(制限なし)
+CarCategory=車両カテゴリー
+ExpenseRangeOffset=オフセット量：%s
+RangeIk=走行距離範囲
+AttachTheNewLineToTheDocument=アップロードされたドキュメントに行を添付する
diff --git a/htdocs/langs/ja_JP/users.lang b/htdocs/langs/ja_JP/users.lang
index 93d45a5a4d9..a4e6141c8a5 100644
--- a/htdocs/langs/ja_JP/users.lang
+++ b/htdocs/langs/ja_JP/users.lang
@@ -35,7 +35,7 @@ SuperAdministrator=スーパー管理者
 SuperAdministratorDesc=グローバル管理者
 AdministratorDesc=管理者
 DefaultRights=デフォルト権限
-DefaultRightsDesc=ここで、<u>デフォルト</u>権限を定義する。これは、<u>新規</u>ユーザに自動的に付与される（既存のユーザの権限を変更するには、ユーザカードに移動する）。
+DefaultRightsDesc=ここで、<u>デフォルト</u>権限を定義する。これは、<u>新規</u>ユーザに自動的に付与される(既存のユーザの権限を変更するには、ユーザカードに移動する)。
 DolibarrUsers=Dolibarrユーザ
 LastName=姓
 FirstName=最初の名前
@@ -71,13 +71,13 @@ InternalUser=内部ユーザ
 ExportDataset_user_1=ユーザとそのプロパティ
 DomainUser=ドメインユーザ%s
 Reactivate=再アクティブ化
-CreateInternalUserDesc=このフォームを使用すると、法人/組織に内部ユーザを作成できる。外部ユーザ（顧客、仕入先など）を作成するには、その取引先の連絡先カードから Dolibarrユーザの作成 ボタンを使用する。
-InternalExternalDesc=<b>内部</b>ユーザは、法人/組織の一部であるユーザ。 <br> <b>外部</b>ユーザは、顧客、仕入先、またはその他（取引先の外部ユーザの作成は、取引先の連絡先レコードから実行できる）。 <br> <br>どちらの場合も、権限はDolibarrの権限を定義し、外部ユーザも内部ユーザとは異なるメニューマネージャーを持つことができる（ ホーム - 設定 - 表示 を参照）
+CreateInternalUserDesc=このフォームを使用すると、法人/組織に内部ユーザを作成できる。外部ユーザ(顧客、仕入先など)を作成するには、その取引先の連絡先カードから Dolibarrユーザの作成 ボタンを使用する。
+InternalExternalDesc=<b>内部</b>ユーザは、法人/組織の一部であるユーザ。 <br> <b>外部</b>ユーザは、顧客、仕入先、またはその他(取引先の外部ユーザの作成は、取引先の連絡先レコードから実行できる)。 <br> <br>どちらの場合も、権限はDolibarrの権限を定義し、外部ユーザも内部ユーザとは異なるメニューマネージャーを持つことができる( ホーム - 設定 - 表示 を参照)
 PermissionInheritedFromAGroup=ユーザのグループのいずれかから継承されたので、許可が付与される。
 Inherited=継承された
 UserWillBe=作成されたユーザは
-UserWillBeInternalUser=（特定の第三者にリンクされていないため）作成したユーザは、内部ユーザになる
-UserWillBeExternalUser=作成したユーザ（特に取引先にリンクされているため）、外部のユーザになる
+UserWillBeInternalUser=(特定の第三者にリンクされていないため)作成したユーザは、内部ユーザになる
+UserWillBeExternalUser=作成したユーザ(特に取引先にリンクされているため)、外部のユーザになる
 IdPhoneCaller=イドの電話発信
 NewUserCreated=ユーザの%s作成
 NewUserPassword=%s用パスワードの変更
@@ -104,7 +104,7 @@ HierarchicView=階層ビュー
 UseTypeFieldToChange=フィールドタイプを使用して変更
 OpenIDURL=OpenID URL
 LoginUsingOpenID=OpenIDを使用してログインする
-WeeklyHours=労働時間（週あたり）
+WeeklyHours=労働時間(週あたり)
 ExpectedWorkedHours=週あたりの予想労働時間
 ColorUser=ユーザの色
 DisabledInMonoUserMode=メンテナンスモードでは無効
diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
index 2553493c60a..8be0c5e5529 100644
--- a/htdocs/langs/ja_JP/website.lang
+++ b/htdocs/langs/ja_JP/website.lang
@@ -2,24 +2,24 @@
 Shortname=コー​​ド
 WebsiteSetupDesc=使用したいウェブサイトをここに作成する。次に、メニューのWebサイトに移動して編集する。
 DeleteWebsite=ウェブサイトを削除
-ConfirmDeleteWebsite=このWebサイトを削除してもよいか？そのすべてのページとコンテンツも削除される。アップロードされたファイル（メディアディレクトリ、ECMモジュールなど）は残る。
+ConfirmDeleteWebsite=このWebサイトを削除してもよいか？そのすべてのページとコンテンツも削除される。アップロードされたファイル(メディアディレクトリ、ECMモジュールなど)は残る。
 WEBSITE_TYPE_CONTAINER=ページ/コンテナのタイプ
 WEBSITE_PAGE_EXAMPLE=例として使用するWebページ
 WEBSITE_PAGENAME=ページ名/エイリアス
 WEBSITE_ALIASALT=代替ページ名/エイリアス
-WEBSITE_ALIASALTDesc=他の名前/エイリアスのリストをここで使用して、この他の名前/エイリアスを使用してページにアクセスできるようにする（たとえば、古いリンク/名前のバックリンクを機能させるためにエイリアスの名前を変更した後の古い名前）。構文は次のとおり。<br>alternativename1、alternativename2、..。
+WEBSITE_ALIASALTDesc=他の名前/エイリアスのリストをここで使用して、この他の名前/エイリアスを使用してページにアクセスできるようにする(たとえば、古いリンク/名前のバックリンクを機能させるためにエイリアスの名前を変更した後の古い名前)。構文は次のとおり。<br>alternativename1、alternativename2、..。
 WEBSITE_CSS_URL=外部CSSファイルのURL
-WEBSITE_CSS_INLINE=CSSファイルの内容（すべてのページに共通）
-WEBSITE_JS_INLINE=Javascriptファイルの内容（すべてのページに共通）
-WEBSITE_HTML_HEADER=HTMLヘッダーの下部に追加（すべてのページに共通）
-WEBSITE_ROBOT=ロボットファイル（robots.txt）
+WEBSITE_CSS_INLINE=CSSファイルの内容(すべてのページに共通)
+WEBSITE_JS_INLINE=Javascriptファイルの内容(すべてのページに共通)
+WEBSITE_HTML_HEADER=HTMLヘッダーの下部に追加(すべてのページに共通)
+WEBSITE_ROBOT=ロボットファイル(robots.txt)
 WEBSITE_HTACCESS=ウェブサイトの.htaccessファイル
 WEBSITE_MANIFEST_JSON=ウェブサイトmanifest.jsonファイル
 WEBSITE_README=README.mdファイル
 WEBSITE_KEYWORDSDesc=値を区切るにはコンマを使用する
 EnterHereLicenseInformation=ここにメタデータまたはライセンス情報を入力して、README.mdファイルに入力する。ウェブサイトをテンプレートとして配布する場合、ファイルは誘惑パッケージに含まれる。
-HtmlHeaderPage=HTMLヘッダー（このページにのみ固有）
-PageNameAliasHelp=ページの名前またはエイリアス。 <br>このエイリアスは、WebサイトがWebサーバーの仮想ホスト（Apacke、Nginxなど）から実行されるときにSEOURLを偽造するためにも使用される。このエイリアスを編集するには、ボタン「<strong>%s</strong>」を使用する。
+HtmlHeaderPage=HTMLヘッダー(このページにのみ固有)
+PageNameAliasHelp=ページの名前またはエイリアス。 <br>このエイリアスは、WebサイトがWebサーバーの仮想ホスト(Apacke、Nginxなど)から実行されるときにSEOURLを偽造するためにも使用される。このエイリアスを編集するには、ボタン「<strong>%s</strong>」を使用する。
 EditTheWebSiteForACommonHeader=注：すべてのページにパーソナライズされたヘッダーを定義する場合は、ページ/コンテナーではなくサイトレベルでヘッダーを編集する。
 MediaFiles=メディアライブラリ
 EditCss=Webサイトのプロパティを編集する
@@ -30,7 +30,6 @@ EditInLine=インライン編集
 AddWebsite=ウェブサイトを追加
 Webpage=Webページ/コンテナ
 AddPage=ページ/コンテナを追加
-HomePage=ホームページ
 PageContainer=ページ
 PreviewOfSiteNotYetAvailable=あなたのウェブサイトのプレビュー<strong>%s</strong>はまだ利用できません。最初に「<strong>完全なWebサイトテンプレート</strong>」をインポートするか、「<strong>ページ/コンテナ</strong>」を追加する必要がある。
 RequestedPageHasNoContentYet=ID %sの要求されたページにまだコンテンツがないか、キャッシュファイル.tpl.phpが削除された。これを解決するには、ページのコンテンツを編集すること。
@@ -38,8 +37,8 @@ SiteDeleted=Webサイト '%s'が削除された
 PageContent=ページ/コンテネア
 PageDeleted=ウェブサイト%sのページ/ Contenair'%s 'が削除された
 PageAdded=ページ/ Contenair'%s 'が追加された
-ViewSiteInNewTab=新しいタブでサイトを表示
-ViewPageInNewTab=新しいタブでページを表示
+ViewSiteInNewTab=新規タブでサイトを表示
+ViewPageInNewTab=新規タブでページを表示
 SetAsHomePage=ホームページに設定する
 RealURL=実際のURL
 ViewWebsiteInProduction=ホームURLを使用してWebサイトを表示する
@@ -51,23 +50,23 @@ CheckVirtualHostPerms=また、仮想ホストが<br> <strong> %s</strong>への
 ReadPerm=読む
 WritePerm=書く
 TestDeployOnWeb=Webでのテスト/デプロイ
-PreviewSiteServedByWebServer=<u>新しいタブで %s をプレビュー。</u><br><br>  %s は、外部Webサーバ (Apache, Nginx, IIS など) から提供される。 以下のディレクトリを指定するには、当該サーバをインストールして設定する必要あり:<br><strong>%s</strong><br>URL は外部サーバ:<br><strong>%s</strong> による
-PreviewSiteServedByDolibarr= <u>新しいタブで%sをプレビューする。 </u> <br> <br> %sはDolibarrサーバーによって提供されるため、追加のWebサーバー（Apache、Nginx、IISなど）をインストールする必要はない。 <br>不便なのは、ページのURLがユーザーフレンドリーではなく、Dolibarrのパスで始まること。 URL <br> Dolibarrによって提供：<br> <strong> %s </strong> <br> <br>ディレクトリ<br> <strong> %s </strong> <br>上のポイントは、この仮想サーバーの名前を入力するWebサーバー上の仮想ホストを作成し、このウェブサイトを提供するために、独自の外部Webサーバーを使用するには他のプレビューボタンをクリックする。
+PreviewSiteServedByWebServer=<u>新規タブで %s をプレビュー。</u><br><br>  %s は、外部Webサーバ (Apache, Nginx, IIS など) から提供される。 以下のディレクトリを指定するには、当該サーバをインストールして設定する必要あり:<br><strong>%s</strong><br>URL は外部サーバ:<br><strong>%s</strong> による
+PreviewSiteServedByDolibarr= <u>新規タブで%sをプレビューする。 </u> <br> <br> %sはDolibarrサーバーによって提供されるため、追加のWebサーバー(Apache、Nginx、IISなど)をインストールする必要はない。 <br>不便なのは、ページのURLがユーザーフレンドリーではなく、Dolibarrのパスで始まること。 URL <br> Dolibarrによって提供：<br> <strong> %s </strong> <br> <br>ディレクトリ<br> <strong> %s </strong> <br>上のポイントは、この仮想サーバーの名前を入力するWebサーバー上の仮想ホストを作成し、このウェブサイトを提供するために、独自の外部Webサーバーを使用するには他のプレビューボタンをクリックする。
 VirtualHostUrlNotDefined=外部Webサーバーによって提供される仮想ホストのURLが定義されていない
 NoPageYet=まだページはない
-YouCanCreatePageOrImportTemplate=新しいページを作成するか、完全なWebサイトテンプレートをインポートできる
+YouCanCreatePageOrImportTemplate=新規ページを作成するか、完全なWebサイトテンプレートをインポートできる
 SyntaxHelp=特定の構文のヒントに関するヘルプ
 YouCanEditHtmlSourceckeditor=エディタの "ソース" ボタンを使用して、HTMLソースコードを編集できる。
-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>
+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> で利用可能。
 ClonePage=クローンページ/コンテナ
 CloneSite=クローンサイト
 SiteAdded=ウェブサイトを追加
-ConfirmClonePage=新しいページのコード/エイリアスを入力し、それが複製されたページの翻訳であるかどうかを入力すること。
-PageIsANewTranslation=新しいページは現在のページの翻訳ですか？
-LanguageMustNotBeSameThanClonedPage=ページを翻訳として複製する。新しいページの言語は、ソースページの言語とは異なっている必要がある。
+ConfirmClonePage=新規ページのコード/エイリアスを入力し、それが複製されたページの翻訳であるかどうかを入力すること。
+PageIsANewTranslation=新規ページは現在のページの翻訳ですか？
+LanguageMustNotBeSameThanClonedPage=ページを翻訳として複製する。新規ページの言語は、ソースページの言語とは異なっている必要がある。
 ParentPageId=親ページID
 WebsiteId=ウェブサイトID
 CreateByFetchingExternalPage=外部URLからページをフェッチしてページ/コンテナを作成する...
@@ -84,12 +83,12 @@ AddWebsiteAccount=Webサイトアカウントを作成する
 BackToListForThirdParty=サードパーティのリストに戻る
 DisableSiteFirst=最初にウェブサイトを無効にする
 MyContainerTitle=私のウェブサイトのタイトル
-AnotherContainer=これは、別のページ/コンテナのコンテンツを含める方法です（埋め込まれたサブコンテナが存在しない可能性があるため、動的コードを有効にすると、ここでエラーが発生する可能性がある）
+AnotherContainer=これは、別のページ/コンテナのコンテンツを含める方法です(埋め込まれたサブコンテナが存在しない可能性があるため、動的コードを有効にすると、ここでエラーが発生する可能性がある)
 SorryWebsiteIsCurrentlyOffLine=申し訳ないが、このウェブサイトは現在オフライン。後で戻ってきてください...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Webサイトのアカウントテーブルを有効にする
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=テーブルを有効にして、各Webサイト/サードパーティのWebサイトアカウント（ログイン/パス）を保存する
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=テーブルを有効にして、各Webサイト/サードパーティのWebサイトアカウント(ログイン/パス)を保存する
 YouMustDefineTheHomePage=最初にデフォルトのホームページを定義する必要がある
-OnlyEditionOfSourceForGrabbedContentFuture=警告：外部WebページをインポートしてWebページを作成することは、経験豊富なユーザーのために予約されています。ソースページの複雑さによっては、インポートの結果が元のページと異なる場合がある。また、ソースページが一般的なCSSスタイルまたは競合するJavaScriptを使用している場合、このページで作業するときにWebサイトエディターの外観や機能が損なわれる可能性がある。この方法はページを作成するためのより迅速な方法ですが、最初から、または提案されたページテンプレートから新しいページを作成することをお勧めする。 <br>取得した外部ページで使用すると、インラインエディタが正しく機能しない場合があることにも注意すること。
+OnlyEditionOfSourceForGrabbedContentFuture=警告：外部WebページをインポートしてWebページを作成することは、経験豊富なユーザーのために予約されています。ソースページの複雑さによっては、インポートの結果が元のページと異なる場合がある。また、ソースページが一般的なCSSスタイルまたは競合するJavaScriptを使用している場合、このページで作業するときにWebサイトエディターの外観や機能が損なわれる可能性がある。この方法はページを作成するためのより迅速な方法ですが、最初から、または提案されたページテンプレートから新規ページを作成することをお勧めする。 <br>取得した外部ページで使用すると、インラインエディタが正しく機能しない場合があることにも注意すること。
 OnlyEditionOfSourceForGrabbedContent=コンテンツが外部サイトから取得された場合は、HTMLソースのエディションのみが可能。
 GrabImagesInto=cssとページにある画像も取得する。
 ImagesShouldBeSavedInto=画像はディレクトリに保存する必要がある
@@ -101,20 +100,20 @@ EmptyPage=空のページ
 ExternalURLMustStartWithHttp=外部URLは http:// または https:// で始まる必要がある
 ZipOfWebsitePackageToImport=ウェブサイトテンプレートパッケージのZipファイルをアップロードする
 ZipOfWebsitePackageToLoad=または利用可能な埋め込みWebサイトテンプレートパッケージを選択する
-ShowSubcontainers=動的コンテンツを含める
+ShowSubcontainers=動的コンテンツを表示する
 InternalURLOfPage=ページの内部URL
 ThisPageIsTranslationOf=このページ/コンテナはの翻訳です
 ThisPageHasTranslationPages=このページ/コンテナには翻訳がある
 NoWebSiteCreateOneFirst=ウェブサイトはまだ作成されていない。最初に作成する。
 GoTo=に移動
-DynamicPHPCodeContainsAForbiddenInstruction=動的コンテンツとしてデフォルトで禁止されているPHP命令 '<strong> %s </strong>'を含む動的PHPコードを追加する（許可されるコマンドのリストを増やすには、非表示のオプションWEBSITE_PHP_ALLOW_xxxを参照すること）。
+DynamicPHPCodeContainsAForbiddenInstruction=動的コンテンツとしてデフォルトで禁止されているPHP命令 '<strong> %s </strong>'を含む動的PHPコードを追加する(許可されるコマンドのリストを増やすには、非表示のオプションWEBSITE_PHP_ALLOW_xxxを参照すること)。
 NotAllowedToAddDynamicContent=WebサイトでPHP動的コンテンツを追加または編集する権限がない。許可を求めるか、コードを変更せずにphpタグに入れること。
 ReplaceWebsiteContent=Webサイトのコンテンツを検索または置換する
 DeleteAlsoJs=このウェブサイトに固有のすべてのJavaScriptファイルも削除するか？
 DeleteAlsoMedias=このウェブサイトに固有のすべてのメディアファイルも削除するか？
 MyWebsitePages=私のウェブサイトのページ
 SearchReplaceInto=検索|に置き換える
-ReplaceString=新しい文字列
+ReplaceString=新規文字列
 CSSContentTooltipHelp=ここにCSSコンテンツを入力する。アプリケーションのCSSとの競合を避けるために、すべての定義に .bodywebsite クラスを前置することが必須。例:<br><br>#mycssselector, input.myclass:hover { ... }<br>は、以下のようにする。<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>注記: もし大きなファイルでこの前置が無いものがあれば、 'lessc' を使用して .bodywebsite の前置をすべての場所に追加する変換ができる。
 LinkAndScriptsHereAreNotLoadedInEditor=警告：このコンテンツは、サーバーからサイトにアクセスした場合にのみ出力される。編集モードでは使用されないため、編集モードでもJavaScriptファイルをロードする必要がある場合は、タグ「scriptsrc = ...」をページに追加するだけ。
 Dynamiccontent=動的コンテンツを含むページのサンプル
@@ -124,7 +123,7 @@ ShowSubContainersOnOff=「動的コンテンツ」を実行するモードは%s
 GlobalCSSorJS=WebサイトのグローバルCSS / JS /ヘッダーファイル
 BackToHomePage=ホームページに戻る...
 TranslationLinks=翻訳リンク
-YouTryToAccessToAFileThatIsNotAWebsitePage=利用できないページにアクセスしようとしました。 <br>（ref = %s、type = %s、status = %s）
+YouTryToAccessToAFileThatIsNotAWebsitePage=利用できないページにアクセスしようとしました。 <br>(ref = %s、type = %s、status = %s)
 UseTextBetween5And70Chars=SEOを適切に実践するには、5〜70文字のテキストを使用する
 MainLanguage=主な言語
 OtherLanguages=他の言語
@@ -136,4 +135,5 @@ RSSFeed=RSSフィード
 RSSFeedDesc=このURLを使用して、タイプ「blogpost」の最新記事のRSSフィードを取得できる。
 PagesRegenerated=%sページ(s)/コンテナ(s)が再生成された
 RegenerateWebsiteContent=Webサイトのキャッシュファイルを再生成する
-AllowedInFrames=Allowed in Frames
+AllowedInFrames=フレームで許可
+DefineListOfAltLanguagesInWebsiteProperties=使用可能なすべての言語のリストをWebサイトのプロパティに定義する。
diff --git a/htdocs/langs/ja_JP/withdrawals.lang b/htdocs/langs/ja_JP/withdrawals.lang
index a4f6da68897..96b9b5e37e1 100644
--- a/htdocs/langs/ja_JP/withdrawals.lang
+++ b/htdocs/langs/ja_JP/withdrawals.lang
@@ -1,148 +1,152 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Payments by Direct debit orders
-SuppliersStandingOrdersArea=Payments by Credit transfer
-StandingOrdersPayment=Direct debit payment orders
-StandingOrderPayment=Direct debit payment order
-NewStandingOrder=New direct debit order
-NewPaymentByBankTransfer=New payment by credit transfer
+CustomersStandingOrdersArea=口座振替による支払
+SuppliersStandingOrdersArea=クレジット振込による支払
+StandingOrdersPayment=口座振替の支払注文
+StandingOrderPayment=口座振替の支払注文
+NewStandingOrder=新規口座振替の注文
+NewPaymentByBankTransfer=クレジット振込による新規支払
 StandingOrderToProcess=処理するには
-PaymentByBankTransferReceipts=Credit transfer orders
-PaymentByBankTransferLines=Credit transfer order lines
-WithdrawalsReceipts=Direct debit orders
-WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer orders
-BankTransferReceipt=Credit transfer order
-LatestBankTransferReceipts=Latest %s credit transfer orders
-LastWithdrawalReceipts=Latest %s direct debit files
-WithdrawalsLine=Direct debit order line
-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=撤回する金額
-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
+PaymentByBankTransferReceipts=クレジット転送注文
+PaymentByBankTransferLines=クレジット転送オーダーライン
+WithdrawalsReceipts=口座振替の注文
+WithdrawalReceipt=口座振替の注文
+BankTransferReceipts=クレジット転送注文
+BankTransferReceipt=クレジット転送注文
+LatestBankTransferReceipts=最新の%sクレジット転送注文
+LastWithdrawalReceipts=最新の%s口座振替ファイル
+WithdrawalsLine=口座振替注文ライン
+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=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
-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>.
+LastWithdrawalReceipt=最新の%s口座振替の領収書
+MakeWithdrawRequest=口座振替の支払リクエストを行う
+MakeBankTransferOrder=クレジット振込をリクエストする
+WithdrawRequestsDone=%s口座振替の支払要求が記録された
+BankTransferRequestsDone=%sクレジット転送リクエストが記録済
+ThirdPartyBankCode=サードパーティの銀行コード
+NoInvoiceCouldBeWithdrawed=正常に引き落とされた請求書はない。請求書が有効なIBANを持つ会社のものであり、IBANにモード<strong> %s </strong>のUMR(一意の委任参照)があることを確認すること。
 ClassCredited=入金分類
-ClassCreditedConfirm=あなたの銀行口座に入金、この撤退の領収書を分類してもよろしいですか？
+ClassCreditedConfirm=あなたの銀行口座に入金、この引落しの領収書を分類してもよいか？
 TransData=日付伝送
 TransMetod=方式伝送
 Send=送信
 Lines=行
 StandingOrderReject=拒否を発行
-WithdrawsRefused=Direct debit refused
-WithdrawalRefused=撤退は拒否されました
-CreditTransfersRefused=Credit transfers refused
-WithdrawalRefusedConfirm=あなたは社会のために撤退拒否を入力してもよろしいです
+WithdrawsRefused=口座振替は拒否された
+WithdrawalRefused=引落しは拒否された
+CreditTransfersRefused=クレジット転送が拒否された
+WithdrawalRefusedConfirm=協会に対する引落し拒否を入力してもよいか
 RefusedData=拒絶反応の日付
 RefusedReason=拒否理由
 RefusedInvoicing=拒絶反応を請求
-NoInvoiceRefused=拒絶反応を充電しないでください
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
-StatusDebitCredit=Status debit/credit
+NoInvoiceRefused=拒絶反応を充電しないこと
+InvoiceRefused=請求書が拒否された(拒否を顧客に請求する)
+StatusDebitCredit=ステータスの借方/貸方
 StatusWaiting=待っている
 StatusTrans=送信
-StatusDebited=Debited
+StatusDebited=借方記入
 StatusCredited=クレジット
 StatusPaid=有料
 StatusRefused=拒否
 StatusMotif0=特定されていない
 StatusMotif1=提供insuffisante
 StatusMotif2=ティラージュconteste
-StatusMotif3=No direct debit payment order
-StatusMotif4=Sales Order
+StatusMotif3=口座振替の注文はない
+StatusMotif4=販売注文
 StatusMotif5=inexploitable RIB
 StatusMotif6=バランスせずにアカウント
 StatusMotif7=裁判
 StatusMotif8=他の理由
-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)
+CreateForSepaFRST=口座振替ファイルの作成(SEPA FRST)
+CreateForSepaRCUR=口座振替ファイルの作成(SEPA RCUR)
+CreateAll=口座振替ファイルの作成(すべて)
+CreateFileForPaymentByBankTransfer=クレジット転送用のファイルを作成する
+CreateSepaFileForPaymentByBankTransfer=クレジット転送ファイル(SEPA)の作成
 CreateGuichet=唯一のオフィス
 CreateBanque=唯一の銀行
 OrderWaiting=治療を待っている
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
+NotifyTransmision=注文の記録ファイル送信
+NotifyCredit=注文のクレジットを記録する
 NumeroNationalEmetter=国立トランスミッタ数
 WithBankUsingRIB=RIBを使用した銀行口座
 WithBankUsingBANBIC=IBAN / BIC / SWIFTを使用した銀行口座
-BankToReceiveWithdraw=Receiving Bank Account
-BankToPayCreditTransfer=Bank Account used as source of payments
+BankToReceiveWithdraw=銀行口座の受け取り
+BankToPayCreditTransfer=支払元として使用される銀行口座
 CreditDate=クレジットで
-WithdrawalFileNotCapable=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
+WithdrawalFileNotCapable=お住まいの国の引き出しレシートファイルを生成できない%s(お住まいの国はサポートされていない)
+ShowWithdraw=口座振替の注文を表示
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=ただし、請求書にまだ処理されていない口座振替の支払注文が少なくとも1つある場合、事前の引き出し管理を可能にするために支払済みとして設定されない。
+DoStandingOrdersBeforePayments=このタブでは、口座振替の支払注文をリクエストできる。完了したら、メニューの 銀行 -> 口座振替による支払 に移動して、口座振替の注文を生成および管理する。口座振替の注文が締め切られると、請求書の支払は自動的に記録され、残りの支払がゼロの場合は請求書が締め切られる。
+DoCreditTransferBeforePayments=このタブでは、クレジット振込の注文をリクエストできる。完了したら、メニュー 銀行 -> クレジット転送による支払 に移動して、クレジット転送オーダーを生成および管理する。クレジット振込注文がクローズされると、請求書の支払が自動的に記録され、残りの支払がゼロの場合、請求書はクローズされる。
+WithdrawalFile=デビット注文ファイル
+CreditTransferFile=クレジット転送ファイル
+SetToStatusSent=ステータス「ファイル送信済み」に設定
+ThisWillAlsoAddPaymentOnInvoice=これはまた、請求書に支払を記録し、支払の残りがnullの場合、それらを「支払済み」として分類する
+StatisticsByLineStatus=回線のステータスによる統計
 RUM=UMR
-DateRUM=Mandate signature date
-RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Amount of Direct debit request:
-BankTransferAmount=Amount of Credit Transfer request:
-WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
-SepaMandate=SEPA Direct Debit Mandate
-SepaMandateShort=SEPA Mandate
-PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
-SEPALegalText=By signing this mandate form, you authorize (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. 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
+DateRUM=署名日を委任する
+RUMLong=独自のマンデートリファレンス
+RUMWillBeGenerated=空の場合、銀行口座情報が保存されると、UMR(Unique Mandate Reference)が生成される。
+WithdrawMode=口座振替モード(FRSTまたはRECUR)
+WithdrawRequestAmount=口座振替リクエストの金額：
+BankTransferAmount=クレジット送金リクエストの金額：
+WithdrawRequestErrorNilAmount=空の金額の口座振替リクエストを作成できない。
+SepaMandate=SEPA口座振替の委任
+SepaMandateShort=SEPAマンデート
+PleaseReturnMandate=この委任フォームを電子メールで%sに、または郵送でに返送すること。
+SEPALegalText=この委任フォームに署名することにより、(A)%sが銀行に口座から引き落とすように指示を送信し、(B)%sからの指示に従って銀行が口座から引き落とすように承認する。あなたの権利の一部として、あなたはあなたの銀行とのあなたの合意の条件の下であなたの銀行からの払い戻しを受ける権利がある。アカウントから引き落とされた日から8週間以内に払い戻しを請求する必要がある。上記の義務に関するあなたの権利は、あなたがあなたの銀行から入手できる残高明細で説明される。
+CreditorIdentifier=債権者識別子
+CreditorName=債権者名
+SEPAFillForm=(B)*のマークが付いているすべてのフィールドに入力すること
+SEPAFormYourName=あなたの名前
+SEPAFormYourBAN=あなたの銀行口座名(IBAN)
+SEPAFormYourBIC=銀行識別コード(BIC)
+SEPAFrstOrRecur=支払方法
+ModeRECUR=定期支払
+ModeFRST=一回限りの支払
+PleaseCheckOne=1つだけ確認すること
+CreditTransferOrderCreated=クレジット転送オーダー%sが作成された
+DirectDebitOrderCreated=口座振替注文%sが作成された
+AmountRequested=要求された金額
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
-ExecutionDate=Execution date
-CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
-END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
-USTRD="Unstructured" SEPA XML tag
-ADDDAYS=Add days to Execution Date
-NoDefaultIBANFound=No default IBAN found for this third party
+ExecutionDate=実行日
+CreateForSepa=口座振替ファイルを作成する
+ICS=口座振替の貸方識別子 CI
+ICSTransfer=銀行振込の貸方識別子 CI
+END_TO_END=「EndToEndId」SEPAXMLタグ-トランザクションごとに割り当てられた一意のID
+USTRD=「非構造化」SEPAXMLタグ
+ADDDAYS=実行日に日数を追加
+NoDefaultIBANFound=このサードパーティのデフォルトのIBANは見つからなかった
 ### Notifications
-InfoCreditSubject=Payment of direct debit payment order %s by the bank
-InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of direct debit payment order %s to bank
-InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
+InfoCreditSubject=銀行による口座振替注文%sの支払
+InfoCreditMessage=口座振替の支払注文%sは銀行によって支払われた<br>支払のデータ：%s
+InfoTransSubject=銀行への口座振替注文%sの送信
+InfoTransMessage=口座振替の支払注文%sは、%s%sによって銀行に送信された。 <br> <br>
 InfoTransData=金額：%s <br> Metode：%s <br>日付：%s
-InfoRejectSubject=Direct debit payment order refused
-InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
+InfoRejectSubject=口座振替の注文が拒否された
+InfoRejectMessage=こんにちは、<br><br>法人 %s に関連する請求書%sの口座振替の注文で、金額が%sのものは、銀行によって拒否された。 <br> <br>-<br> %s
 ModeWarning=リアルモードのオプションが設定されていない、我々は、このシミュレーションの後に停止
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorCompanyHasDuplicateDefaultBAN=ID %s の法人には、複数のデフォルトの銀行口座がある。どちらを使用するかを知る方法はない。
+ErrorICSmissing=銀行口座%sにICSがない
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=口座振替の合計金額が行の合計と異なる
diff --git a/htdocs/langs/ja_JP/workflow.lang b/htdocs/langs/ja_JP/workflow.lang
index ab06c374860..cf1f12eb09f 100644
--- a/htdocs/langs/ja_JP/workflow.lang
+++ b/htdocs/langs/ja_JP/workflow.lang
@@ -1,23 +1,25 @@
 # Dolibarr language file - Source file is en_US - workflow
-WorkflowSetup=ワークフローモジュールのセットアップ
-WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
-ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+WorkflowSetup=ワークフローモジュールの設定
+WorkflowDesc=このモジュールは、いくつかの自動アクションを提供する。デフォルトでは、ワークフローは開いている(必要な順序で実行できる)が、ここでいくつかの自動アクションをアクティブ化できる。
+ThereIsNoWorkflowToModify=アクティブ化されたモジュールで使用できるワークフローの変更はない。
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=売買契約提案書が署名された後、自動的に販売注文を作成する(新規注文は提案と同じ金額になる)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=売買契約提案書書に署名した後、顧客の請求書を自動的に作成する(新規請求書は提案書と同じ金額になる)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=契約が検証された後、顧客の請求書を自動的に作成する
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=受注がクローズされた後、顧客の請求書を自動的に作成する(新規請求書は注文と同じ金額になる)
 # 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_BILLED_PROPAL=販売注文が請求済みに設定されている場合(および注文の金額が署名されたリンクされた提案の合計金額と同じ場合)、リンクされたソース提案を請求済みとして分類する。
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=リンクされたソースプロポーザルを、顧客の請求書が検証されたときに請求済みとして分類する(また、請求書の金額が署名されたリンクされたプロポーザルの合計金額と同じである場合)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=顧客の請求書が検証されたときに請求済みとしてリンクされたソース販売注文を分類する(請求書の金額がリンクされた注文の合計金額と同じである場合)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=顧客の請求書が支払い済みに設定されている場合(および請求書の金額がリンクされた注文の合計金額と同じである場合)、リンクされたソース販売注文を請求済みとして分類する。
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=リンクされたソース販売注文を、出荷が検証されたときに出荷されたものとして分類する(また、すべての出荷によって出荷された数量が更新する注文と同じである場合)
 # Autoclassify purchase order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=リンクされたソースベンダーの提案を、ベンダーの請求書が検証されたときに請求済みとして分類する(また、請求書の金額がリンクされた提案の合計金額と同じである場合)。
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=ベンダーの請求書が検証されたときに請求済みとしてリンクされたソース発注書を分類する(請求書の金額がリンクされた注文の合計金額と同じである場合)
+descWORKFLOW_BILL_ON_RECEPTION=リンクされたサプライヤの注文が検証されたときに、受信を「請求済み」に分類する
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
-AutomaticCreation=Automatic creation
-AutomaticClassification=Automatic classification
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=チケットが閉じられたら、チケットにリンクされているすべての介入を閉じる
+AutomaticCreation=自動作成
+AutomaticClassification=自動分類
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=顧客の請求書が検証されたときに、リンクされたソース出荷をクローズとして分類する
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
index 3211a0b62df..9e084932477 100644
--- a/htdocs/langs/ka_GE/accountancy.lang
+++ b/htdocs/langs/ka_GE/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index f1c41a3b62b..f9a6468d94a 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -56,6 +56,8 @@ 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.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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.
@@ -256,6 +257,7 @@ 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.
@@ -375,7 +377,7 @@ 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:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+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
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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
+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 the language of the third party
+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
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+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
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/ka_GE/banks.lang b/htdocs/langs/ka_GE/banks.lang
index 9500a5b8b2e..81a23238550 100644
--- a/htdocs/langs/ka_GE/banks.lang
+++ b/htdocs/langs/ka_GE/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/ka_GE/blockedlog.lang b/htdocs/langs/ka_GE/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/ka_GE/blockedlog.lang
+++ b/htdocs/langs/ka_GE/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/ka_GE/boxes.lang b/htdocs/langs/ka_GE/boxes.lang
index d6fd298a3a7..9a751483fb1 100644
--- a/htdocs/langs/ka_GE/boxes.lang
+++ b/htdocs/langs/ka_GE/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+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.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/ka_GE/cashdesk.lang b/htdocs/langs/ka_GE/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/ka_GE/cashdesk.lang
+++ b/htdocs/langs/ka_GE/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+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
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/ka_GE/categories.lang b/htdocs/langs/ka_GE/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/ka_GE/categories.lang
+++ b/htdocs/langs/ka_GE/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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
diff --git a/htdocs/langs/ka_GE/companies.lang b/htdocs/langs/ka_GE/companies.lang
index dadff6a7894..8dc815b522e 100644
--- a/htdocs/langs/ka_GE/companies.lang
+++ b/htdocs/langs/ka_GE/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/ka_GE/compta.lang b/htdocs/langs/ka_GE/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/ka_GE/compta.lang
+++ b/htdocs/langs/ka_GE/compta.lang
@@ -111,7 +111,7 @@ 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 ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/ka_GE/cron.lang b/htdocs/langs/ka_GE/cron.lang
index d2da7ded67e..2ebdda1e685 100644
--- a/htdocs/langs/ka_GE/cron.lang
+++ b/htdocs/langs/ka_GE/cron.lang
@@ -6,14 +6,15 @@ 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
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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 environement you can use Scheduled task tools 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
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+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
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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
@@ -76,8 +78,14 @@ 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+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/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 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.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/ka_GE/exports.lang b/htdocs/langs/ka_GE/exports.lang
index 2dcf4317e00..a0eb7161ef2 100644
--- a/htdocs/langs/ka_GE/exports.lang
+++ b/htdocs/langs/ka_GE/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 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.
@@ -131,3 +133,4 @@ 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/ka_GE/mails.lang b/htdocs/langs/ka_GE/mails.lang
index 1235eef3b27..2d02c5ddcf9 100644
--- a/htdocs/langs/ka_GE/mails.lang
+++ b/htdocs/langs/ka_GE/mails.lang
@@ -92,6 +92,7 @@ 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
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index 96c68cdcfa3..f8ba6f4073c 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -28,7 +28,9 @@ 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
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Value
 PersonalValue=Personal value
 NewObject=New %s
 NewValue=New value
+OldValue=Old value %s
 CurrentValue=Current value
 Code=Code
 Type=Type
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ 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
@@ -671,7 +678,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/ka_GE/modulebuilder.lang b/htdocs/langs/ka_GE/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/ka_GE/modulebuilder.lang
+++ b/htdocs/langs/ka_GE/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/ka_GE/mrp.lang b/htdocs/langs/ka_GE/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/ka_GE/mrp.lang
+++ b/htdocs/langs/ka_GE/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang
index 54c0572d453..7a895bb1ca5 100644
--- a/htdocs/langs/ka_GE/other.lang
+++ b/htdocs/langs/ka_GE/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index 97db059594f..9ecc11ed93d 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -108,7 +108,8 @@ 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=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index baf0ecde17f..05aa1f5a560 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -76,15 +76,16 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/ka_GE/recruitment.lang b/htdocs/langs/ka_GE/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/ka_GE/recruitment.lang
+++ b/htdocs/langs/ka_GE/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/ka_GE/sendings.lang b/htdocs/langs/ka_GE/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/ka_GE/sendings.lang
+++ b/htdocs/langs/ka_GE/sendings.lang
@@ -30,6 +30,7 @@ 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
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/ka_GE/stocks.lang b/htdocs/langs/ka_GE/stocks.lang
index 660443bcded..a1f55010139 100644
--- a/htdocs/langs/ka_GE/stocks.lang
+++ b/htdocs/langs/ka_GE/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/ka_GE/ticket.lang b/htdocs/langs/ka_GE/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/ka_GE/ticket.lang
+++ b/htdocs/langs/ka_GE/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/ka_GE/website.lang b/htdocs/langs/ka_GE/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/ka_GE/website.lang
+++ b/htdocs/langs/ka_GE/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/ka_GE/withdrawals.lang b/htdocs/langs/ka_GE/withdrawals.lang
index 114a8d9dd6c..059b3451c11 100644
--- a/htdocs/langs/ka_GE/withdrawals.lang
+++ b/htdocs/langs/ka_GE/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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/ka_GE/workflow.lang b/htdocs/langs/ka_GE/workflow.lang
index 299be277e1d..494a0424a75 100644
--- a/htdocs/langs/ka_GE/workflow.lang
+++ b/htdocs/langs/ka_GE/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/km_KH/accountancy.lang b/htdocs/langs/km_KH/accountancy.lang
index 3211a0b62df..9e084932477 100644
--- a/htdocs/langs/km_KH/accountancy.lang
+++ b/htdocs/langs/km_KH/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/km_KH/admin.lang b/htdocs/langs/km_KH/admin.lang
index f1c41a3b62b..f9a6468d94a 100644
--- a/htdocs/langs/km_KH/admin.lang
+++ b/htdocs/langs/km_KH/admin.lang
@@ -56,6 +56,8 @@ 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.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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.
@@ -256,6 +257,7 @@ 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.
@@ -375,7 +377,7 @@ 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:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+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
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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
+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 the language of the third party
+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
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+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
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/km_KH/banks.lang b/htdocs/langs/km_KH/banks.lang
index 9500a5b8b2e..81a23238550 100644
--- a/htdocs/langs/km_KH/banks.lang
+++ b/htdocs/langs/km_KH/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/km_KH/blockedlog.lang b/htdocs/langs/km_KH/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/km_KH/blockedlog.lang
+++ b/htdocs/langs/km_KH/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/km_KH/boxes.lang b/htdocs/langs/km_KH/boxes.lang
index d6fd298a3a7..9a751483fb1 100644
--- a/htdocs/langs/km_KH/boxes.lang
+++ b/htdocs/langs/km_KH/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+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.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/km_KH/cashdesk.lang b/htdocs/langs/km_KH/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/km_KH/cashdesk.lang
+++ b/htdocs/langs/km_KH/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+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
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/km_KH/categories.lang b/htdocs/langs/km_KH/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/km_KH/categories.lang
+++ b/htdocs/langs/km_KH/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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
diff --git a/htdocs/langs/km_KH/companies.lang b/htdocs/langs/km_KH/companies.lang
index dadff6a7894..8dc815b522e 100644
--- a/htdocs/langs/km_KH/companies.lang
+++ b/htdocs/langs/km_KH/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/km_KH/compta.lang b/htdocs/langs/km_KH/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/km_KH/compta.lang
+++ b/htdocs/langs/km_KH/compta.lang
@@ -111,7 +111,7 @@ 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 ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/km_KH/cron.lang b/htdocs/langs/km_KH/cron.lang
index 1de1251831a..2ebdda1e685 100644
--- a/htdocs/langs/km_KH/cron.lang
+++ b/htdocs/langs/km_KH/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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
@@ -46,6 +47,7 @@ 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
@@ -56,7 +58,7 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
@@ -82,3 +84,8 @@ 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/km_KH/errors.lang b/htdocs/langs/km_KH/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/km_KH/errors.lang
+++ b/htdocs/langs/km_KH/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 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.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/km_KH/exports.lang b/htdocs/langs/km_KH/exports.lang
index 3549e3f8b23..a0eb7161ef2 100644
--- a/htdocs/langs/km_KH/exports.lang
+++ b/htdocs/langs/km_KH/exports.lang
@@ -133,3 +133,4 @@ 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/km_KH/mails.lang b/htdocs/langs/km_KH/mails.lang
index 1235eef3b27..2d02c5ddcf9 100644
--- a/htdocs/langs/km_KH/mails.lang
+++ b/htdocs/langs/km_KH/mails.lang
@@ -92,6 +92,7 @@ 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
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/km_KH/main.lang b/htdocs/langs/km_KH/main.lang
index 68378c28883..af9d6ca0889 100644
--- a/htdocs/langs/km_KH/main.lang
+++ b/htdocs/langs/km_KH/main.lang
@@ -28,7 +28,9 @@ 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
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Value
 PersonalValue=Personal value
 NewObject=New %s
 NewValue=New value
+OldValue=Old value %s
 CurrentValue=Current value
 Code=Code
 Type=Type
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ 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
@@ -671,7 +678,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/km_KH/modulebuilder.lang b/htdocs/langs/km_KH/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/km_KH/modulebuilder.lang
+++ b/htdocs/langs/km_KH/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/km_KH/mrp.lang b/htdocs/langs/km_KH/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/km_KH/mrp.lang
+++ b/htdocs/langs/km_KH/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/km_KH/other.lang b/htdocs/langs/km_KH/other.lang
index 54c0572d453..7a895bb1ca5 100644
--- a/htdocs/langs/km_KH/other.lang
+++ b/htdocs/langs/km_KH/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/km_KH/products.lang b/htdocs/langs/km_KH/products.lang
index 97db059594f..9ecc11ed93d 100644
--- a/htdocs/langs/km_KH/products.lang
+++ b/htdocs/langs/km_KH/products.lang
@@ -108,7 +108,8 @@ 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=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/km_KH/projects.lang b/htdocs/langs/km_KH/projects.lang
index baf0ecde17f..05aa1f5a560 100644
--- a/htdocs/langs/km_KH/projects.lang
+++ b/htdocs/langs/km_KH/projects.lang
@@ -76,15 +76,16 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/km_KH/recruitment.lang b/htdocs/langs/km_KH/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/km_KH/recruitment.lang
+++ b/htdocs/langs/km_KH/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/km_KH/sendings.lang b/htdocs/langs/km_KH/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/km_KH/sendings.lang
+++ b/htdocs/langs/km_KH/sendings.lang
@@ -30,6 +30,7 @@ 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
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/km_KH/stocks.lang b/htdocs/langs/km_KH/stocks.lang
index 660443bcded..a1f55010139 100644
--- a/htdocs/langs/km_KH/stocks.lang
+++ b/htdocs/langs/km_KH/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/km_KH/ticket.lang b/htdocs/langs/km_KH/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/km_KH/ticket.lang
+++ b/htdocs/langs/km_KH/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/km_KH/website.lang b/htdocs/langs/km_KH/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/km_KH/website.lang
+++ b/htdocs/langs/km_KH/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/km_KH/withdrawals.lang b/htdocs/langs/km_KH/withdrawals.lang
index 114a8d9dd6c..059b3451c11 100644
--- a/htdocs/langs/km_KH/withdrawals.lang
+++ b/htdocs/langs/km_KH/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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/km_KH/workflow.lang b/htdocs/langs/km_KH/workflow.lang
index 299be277e1d..494a0424a75 100644
--- a/htdocs/langs/km_KH/workflow.lang
+++ b/htdocs/langs/km_KH/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
index 3211a0b62df..9e084932477 100644
--- a/htdocs/langs/kn_IN/accountancy.lang
+++ b/htdocs/langs/kn_IN/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index 77951271212..5322b65bb8f 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -56,6 +56,8 @@ 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.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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.
@@ -256,6 +257,7 @@ 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.
@@ -375,7 +377,7 @@ 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:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+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
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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
+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 the language of the third party
+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
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+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
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/kn_IN/banks.lang b/htdocs/langs/kn_IN/banks.lang
index b1816234c5a..c3c0461c34d 100644
--- a/htdocs/langs/kn_IN/banks.lang
+++ b/htdocs/langs/kn_IN/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/kn_IN/blockedlog.lang b/htdocs/langs/kn_IN/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/kn_IN/blockedlog.lang
+++ b/htdocs/langs/kn_IN/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/kn_IN/boxes.lang b/htdocs/langs/kn_IN/boxes.lang
index d6fd298a3a7..9a751483fb1 100644
--- a/htdocs/langs/kn_IN/boxes.lang
+++ b/htdocs/langs/kn_IN/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+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.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/kn_IN/cashdesk.lang b/htdocs/langs/kn_IN/cashdesk.lang
index caa77612db5..a70407c989f 100644
--- a/htdocs/langs/kn_IN/cashdesk.lang
+++ b/htdocs/langs/kn_IN/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+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
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/kn_IN/categories.lang b/htdocs/langs/kn_IN/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/kn_IN/categories.lang
+++ b/htdocs/langs/kn_IN/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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
diff --git a/htdocs/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang
index 5a13d292ec1..63f3c11bf02 100644
--- a/htdocs/langs/kn_IN/companies.lang
+++ b/htdocs/langs/kn_IN/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=ಸಂಭವನೀಯ
diff --git a/htdocs/langs/kn_IN/compta.lang b/htdocs/langs/kn_IN/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/kn_IN/compta.lang
+++ b/htdocs/langs/kn_IN/compta.lang
@@ -111,7 +111,7 @@ 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 ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/kn_IN/cron.lang b/htdocs/langs/kn_IN/cron.lang
index b05c7782037..4b73818c3aa 100644
--- a/htdocs/langs/kn_IN/cron.lang
+++ b/htdocs/langs/kn_IN/cron.lang
@@ -6,14 +6,15 @@ 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
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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 environement you can use Scheduled task tools 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
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+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
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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
@@ -76,8 +78,14 @@ 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+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/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 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.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/kn_IN/exports.lang b/htdocs/langs/kn_IN/exports.lang
index 2dcf4317e00..a0eb7161ef2 100644
--- a/htdocs/langs/kn_IN/exports.lang
+++ b/htdocs/langs/kn_IN/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 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.
@@ -131,3 +133,4 @@ 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/kn_IN/mails.lang b/htdocs/langs/kn_IN/mails.lang
index 1235eef3b27..2d02c5ddcf9 100644
--- a/htdocs/langs/kn_IN/mails.lang
+++ b/htdocs/langs/kn_IN/mails.lang
@@ -92,6 +92,7 @@ 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
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index 9635417e322..28a3acd9245 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -28,7 +28,9 @@ 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
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Value
 PersonalValue=Personal value
 NewObject=New %s
 NewValue=New value
+OldValue=Old value %s
 CurrentValue=Current value
 Code=Code
 Type=Type
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ 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
@@ -671,7 +678,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/kn_IN/modulebuilder.lang b/htdocs/langs/kn_IN/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/kn_IN/modulebuilder.lang
+++ b/htdocs/langs/kn_IN/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/kn_IN/mrp.lang b/htdocs/langs/kn_IN/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/kn_IN/mrp.lang
+++ b/htdocs/langs/kn_IN/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang
index 66bda179f9b..4ba716c6a71 100644
--- a/htdocs/langs/kn_IN/other.lang
+++ b/htdocs/langs/kn_IN/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index a4e8e169446..b4ed2eaee15 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -108,7 +108,8 @@ 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=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index baf0ecde17f..05aa1f5a560 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -76,15 +76,16 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/kn_IN/recruitment.lang b/htdocs/langs/kn_IN/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/kn_IN/recruitment.lang
+++ b/htdocs/langs/kn_IN/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/kn_IN/sendings.lang b/htdocs/langs/kn_IN/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/kn_IN/sendings.lang
+++ b/htdocs/langs/kn_IN/sendings.lang
@@ -30,6 +30,7 @@ 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
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/kn_IN/stocks.lang b/htdocs/langs/kn_IN/stocks.lang
index 660443bcded..a1f55010139 100644
--- a/htdocs/langs/kn_IN/stocks.lang
+++ b/htdocs/langs/kn_IN/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/kn_IN/ticket.lang b/htdocs/langs/kn_IN/ticket.lang
index 1608bcb38d7..70bcd0c2f87 100644
--- a/htdocs/langs/kn_IN/ticket.lang
+++ b/htdocs/langs/kn_IN/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=ಇತರ
 TicketSeverityShortLOW=ಕಡಿಮೆ
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=ಹೆಚ್ಚು
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/kn_IN/website.lang b/htdocs/langs/kn_IN/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/kn_IN/website.lang
+++ b/htdocs/langs/kn_IN/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/kn_IN/withdrawals.lang b/htdocs/langs/kn_IN/withdrawals.lang
index 114a8d9dd6c..059b3451c11 100644
--- a/htdocs/langs/kn_IN/withdrawals.lang
+++ b/htdocs/langs/kn_IN/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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/kn_IN/workflow.lang b/htdocs/langs/kn_IN/workflow.lang
index 299be277e1d..494a0424a75 100644
--- a/htdocs/langs/kn_IN/workflow.lang
+++ b/htdocs/langs/kn_IN/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index 2202ceafd92..b0285ae6cf3 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=날짜
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 41c75987caf..6962ec7c3b3 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -56,6 +56,8 @@ GUISetup=화면
 SetupArea=설정
 UploadNewTemplate=Upload new template(s)
 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.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=공간
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 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=Syslog 모듈(데이타 손실 위험 없음) <b>%s</b>에 의해 정읜된 돌리바 로그파일
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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=지금 제거하기
 PurgeNothingToDelete=삭제할 디렉토리나 파일이 없음
@@ -256,6 +257,7 @@ 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.
@@ -375,7 +377,7 @@ 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:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+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
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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
+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 the language of the third party
+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
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+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
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/ko_KR/banks.lang b/htdocs/langs/ko_KR/banks.lang
index cbe0734591b..b62d0312322 100644
--- a/htdocs/langs/ko_KR/banks.lang
+++ b/htdocs/langs/ko_KR/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/ko_KR/blockedlog.lang b/htdocs/langs/ko_KR/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/ko_KR/blockedlog.lang
+++ b/htdocs/langs/ko_KR/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/ko_KR/boxes.lang b/htdocs/langs/ko_KR/boxes.lang
index f070f401eb4..9c95a128986 100644
--- a/htdocs/langs/ko_KR/boxes.lang
+++ b/htdocs/langs/ko_KR/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=최근 %s 수정 된 기부
 BoxTitleLastModifiedExpenses=최근 %s 수정 된 비용 보고서
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=글로벌 활동 (송장, 제안서, 주문)
 BoxGoodCustomers=좋은 고객
 BoxTitleGoodCustomers=%s 좋은 고객
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=최근 새로 고침 날짜
 NoRecordedBookmarks=북마크가 정의되지 않았습니다.
@@ -92,8 +95,8 @@ LastXMonthRolling=최근 %s 월 롤링
 ChooseBoxToAdd=대시 보드에 위젯 추가
 BoxAdded=위젯이 대시 보드에 추가되었습니다.
 BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/ko_KR/cashdesk.lang b/htdocs/langs/ko_KR/cashdesk.lang
index 266158be744..16169671a2d 100644
--- a/htdocs/langs/ko_KR/cashdesk.lang
+++ b/htdocs/langs/ko_KR/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+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
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/ko_KR/categories.lang b/htdocs/langs/ko_KR/categories.lang
index 79bfe18f625..e10c2c97c83 100644
--- a/htdocs/langs/ko_KR/categories.lang
+++ b/htdocs/langs/ko_KR/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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
diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang
index 4e623422f6e..ae5af71d69f 100644
--- a/htdocs/langs/ko_KR/companies.lang
+++ b/htdocs/langs/ko_KR/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=확인할 수 없습니다. 수표 서비스는 회원 국가에서 제공하지 않습니다 (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=가능성
diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang
index 0761985d4aa..199ba3514ef 100644
--- a/htdocs/langs/ko_KR/compta.lang
+++ b/htdocs/langs/ko_KR/compta.lang
@@ -111,7 +111,7 @@ 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 ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/ko_KR/cron.lang b/htdocs/langs/ko_KR/cron.lang
index 8180e289d27..bbf04428a8c 100644
--- a/htdocs/langs/ko_KR/cron.lang
+++ b/htdocs/langs/ko_KR/cron.lang
@@ -6,14 +6,15 @@ 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
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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 environement you can use Scheduled task tools 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
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=우선 순위
 CronLabel=라벨
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+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
@@ -56,16 +58,16 @@ CronNote=적요
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=사용 안함
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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=부터
@@ -76,8 +78,14 @@ 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+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/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 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.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/ko_KR/exports.lang b/htdocs/langs/ko_KR/exports.lang
index 203054138bd..fda64411c9f 100644
--- a/htdocs/langs/ko_KR/exports.lang
+++ b/htdocs/langs/ko_KR/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 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.
@@ -131,3 +133,4 @@ 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/ko_KR/mails.lang b/htdocs/langs/ko_KR/mails.lang
index 14c7f27948a..2d8bd79cbf8 100644
--- a/htdocs/langs/ko_KR/mails.lang
+++ b/htdocs/langs/ko_KR/mails.lang
@@ -92,6 +92,7 @@ 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
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index cd328ee454a..82a305bbc21 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=사용 가능한 대체 변수
 NoTranslation=번역 없음
 Translation=Translation
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=레코드를 찾을 수 없습니다
 NoRecordDeleted=레코드가 삭제되지 않았습니다.
 NotEnoughDataYet=데이터가 충분하지 않습니다.
@@ -85,6 +87,8 @@ FileWasNotUploaded=첨부할 파일을 선택했지만 바로 업로드할 수
 NbOfEntries=No. of entries
 GoToWikiHelpPage=온라인 도움말 읽기 (인터넷 액세스 필요)
 GoToHelpPage=도움말 읽기
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=저장 레코드
 RecordDeleted=삭제 레코드
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=값
 PersonalValue=개인 값
 NewObject=신규 %s
 NewValue=새 값
+OldValue=Old value %s
 CurrentValue=현재 값
 Code=코드
 Type=유형
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=모듈 / 응용 프로그램
 Modules=모듈 / 응용 프로그램
 Option=옵션
+Filters=Filters
 List=목록
 FullList=전체 목록
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ SupplierPreview=Vendor preview
 ShowCustomerPreview=고객 미리보기 표시
 ShowSupplierPreview=Show vendor preview
 RefCustomer=참조고객
+InternalRef=Internal ref.
 Currency=통화
 InfoAdmin=관리자를위한 정보
 Undo=원래대로
@@ -671,7 +678,7 @@ SendMail=Send email
 Email=이메일
 NoEMail=이메일 없음
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=휴대 전화 없음
 Owner=소유자
 FollowingConstantsWillBeSubstituted=다음 상수는 해당 값으로 바뀝니다.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/ko_KR/modulebuilder.lang b/htdocs/langs/ko_KR/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/ko_KR/modulebuilder.lang
+++ b/htdocs/langs/ko_KR/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/ko_KR/mrp.lang b/htdocs/langs/ko_KR/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/ko_KR/mrp.lang
+++ b/htdocs/langs/ko_KR/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang
index a39cc328af3..0b663c08491 100644
--- a/htdocs/langs/ko_KR/other.lang
+++ b/htdocs/langs/ko_KR/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index 09ec43625fa..390f2b13e95 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -108,7 +108,8 @@ 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=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index f9e32599c26..d4b5dc5134b 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -76,15 +76,16 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/ko_KR/recruitment.lang b/htdocs/langs/ko_KR/recruitment.lang
index 8fa737f47ff..7514f8319ca 100644
--- a/htdocs/langs/ko_KR/recruitment.lang
+++ b/htdocs/langs/ko_KR/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/ko_KR/sendings.lang b/htdocs/langs/ko_KR/sendings.lang
index b6045614152..50cc2143119 100644
--- a/htdocs/langs/ko_KR/sendings.lang
+++ b/htdocs/langs/ko_KR/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=취소 된
+StatusSendingCanceledShort=취소 됨
 StatusSendingDraft=초안
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang
index 7fbad957f4d..3e6cd88b1b2 100644
--- a/htdocs/langs/ko_KR/stocks.lang
+++ b/htdocs/langs/ko_KR/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/ko_KR/ticket.lang b/htdocs/langs/ko_KR/ticket.lang
index 39194e55eea..dbcd6edb987 100644
--- a/htdocs/langs/ko_KR/ticket.lang
+++ b/htdocs/langs/ko_KR/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=기타
 TicketSeverityShortLOW=낮음
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=높음
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/ko_KR/website.lang b/htdocs/langs/ko_KR/website.lang
index a3167ada553..1136b43873a 100644
--- a/htdocs/langs/ko_KR/website.lang
+++ b/htdocs/langs/ko_KR/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/ko_KR/withdrawals.lang b/htdocs/langs/ko_KR/withdrawals.lang
index a5301dbdf26..eef5a3b1a94 100644
--- a/htdocs/langs/ko_KR/withdrawals.lang
+++ b/htdocs/langs/ko_KR/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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/ko_KR/workflow.lang b/htdocs/langs/ko_KR/workflow.lang
index 299be277e1d..494a0424a75 100644
--- a/htdocs/langs/ko_KR/workflow.lang
+++ b/htdocs/langs/ko_KR/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index a0451ff066b..cfd6f41fbc9 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=ວັນທີ
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index a651fd86d34..fe18cd7ac67 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -56,6 +56,8 @@ 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.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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.
@@ -256,6 +257,7 @@ 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.
@@ -375,7 +377,7 @@ 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:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+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
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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
+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 the language of the third party
+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
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+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
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang
index 116b97d3f81..4259ed5cc2d 100644
--- a/htdocs/langs/lo_LA/banks.lang
+++ b/htdocs/langs/lo_LA/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/lo_LA/blockedlog.lang b/htdocs/langs/lo_LA/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/lo_LA/blockedlog.lang
+++ b/htdocs/langs/lo_LA/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/lo_LA/boxes.lang b/htdocs/langs/lo_LA/boxes.lang
index d6fd298a3a7..9a751483fb1 100644
--- a/htdocs/langs/lo_LA/boxes.lang
+++ b/htdocs/langs/lo_LA/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+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.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/lo_LA/cashdesk.lang b/htdocs/langs/lo_LA/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/lo_LA/cashdesk.lang
+++ b/htdocs/langs/lo_LA/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+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
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/lo_LA/categories.lang b/htdocs/langs/lo_LA/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/lo_LA/categories.lang
+++ b/htdocs/langs/lo_LA/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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
diff --git a/htdocs/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang
index 4e8b86a7c57..a4225bc1cfb 100644
--- a/htdocs/langs/lo_LA/companies.lang
+++ b/htdocs/langs/lo_LA/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/lo_LA/compta.lang b/htdocs/langs/lo_LA/compta.lang
index 29c2f72f5bf..a84839cd09a 100644
--- a/htdocs/langs/lo_LA/compta.lang
+++ b/htdocs/langs/lo_LA/compta.lang
@@ -111,7 +111,7 @@ 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 ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/lo_LA/cron.lang b/htdocs/langs/lo_LA/cron.lang
index c4d35d1595a..86ecd876e5a 100644
--- a/htdocs/langs/lo_LA/cron.lang
+++ b/htdocs/langs/lo_LA/cron.lang
@@ -6,14 +6,15 @@ 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
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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 environement you can use Scheduled task tools 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
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+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
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=ປິດການນຳໃຊ້
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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
@@ -76,8 +78,14 @@ 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+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/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 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.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/lo_LA/exports.lang b/htdocs/langs/lo_LA/exports.lang
index 2dcf4317e00..a0eb7161ef2 100644
--- a/htdocs/langs/lo_LA/exports.lang
+++ b/htdocs/langs/lo_LA/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 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.
@@ -131,3 +133,4 @@ 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/lo_LA/mails.lang b/htdocs/langs/lo_LA/mails.lang
index 1235eef3b27..2d02c5ddcf9 100644
--- a/htdocs/langs/lo_LA/mails.lang
+++ b/htdocs/langs/lo_LA/mails.lang
@@ -92,6 +92,7 @@ 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
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index 026cbbb5ad7..de3709bef9f 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -28,7 +28,9 @@ 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
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Value
 PersonalValue=Personal value
 NewObject=New %s
 NewValue=New value
+OldValue=Old value %s
 CurrentValue=Current value
 Code=Code
 Type=Type
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=ລາຍການ
 FullList=Full list
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ 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
@@ -671,7 +678,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/lo_LA/modulebuilder.lang b/htdocs/langs/lo_LA/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/lo_LA/modulebuilder.lang
+++ b/htdocs/langs/lo_LA/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/lo_LA/mrp.lang b/htdocs/langs/lo_LA/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/lo_LA/mrp.lang
+++ b/htdocs/langs/lo_LA/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang
index 30dcda87f53..9bc54506b86 100644
--- a/htdocs/langs/lo_LA/other.lang
+++ b/htdocs/langs/lo_LA/other.lang
@@ -5,8 +5,6 @@ Tools=ເຄື່ອງມື
 TMenuTools=ເຄື່ອງມື
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index fb58c2e259c..0398a6604ac 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -108,7 +108,8 @@ 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=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index bfe42b3a2d0..3dfd70c6444 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -76,15 +76,16 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/lo_LA/recruitment.lang b/htdocs/langs/lo_LA/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/lo_LA/recruitment.lang
+++ b/htdocs/langs/lo_LA/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/lo_LA/sendings.lang b/htdocs/langs/lo_LA/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/lo_LA/sendings.lang
+++ b/htdocs/langs/lo_LA/sendings.lang
@@ -30,6 +30,7 @@ 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
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/lo_LA/stocks.lang b/htdocs/langs/lo_LA/stocks.lang
index 74d3d0a7efe..6397b23e96b 100644
--- a/htdocs/langs/lo_LA/stocks.lang
+++ b/htdocs/langs/lo_LA/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/lo_LA/ticket.lang b/htdocs/langs/lo_LA/ticket.lang
index 6c1dc94704a..b2bea2dcbcd 100644
--- a/htdocs/langs/lo_LA/ticket.lang
+++ b/htdocs/langs/lo_LA/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/lo_LA/website.lang b/htdocs/langs/lo_LA/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/lo_LA/website.lang
+++ b/htdocs/langs/lo_LA/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/lo_LA/withdrawals.lang b/htdocs/langs/lo_LA/withdrawals.lang
index 114a8d9dd6c..059b3451c11 100644
--- a/htdocs/langs/lo_LA/withdrawals.lang
+++ b/htdocs/langs/lo_LA/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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/lo_LA/workflow.lang b/htdocs/langs/lo_LA/workflow.lang
index 299be277e1d..494a0424a75 100644
--- a/htdocs/langs/lo_LA/workflow.lang
+++ b/htdocs/langs/lo_LA/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index 006e60db613..30578cf5a3c 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=Ši paslauga
 ThisProduct=Ši prekė
 DefaultForService=Numatyta paslauga
 DefaultForProduct=Numatyta prekė
+ProductForThisThirdparty=Product for this thirdparty
+ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Pasiūlyti negalima
 AccountancySetupDoneFromAccountancyMenu=Dauguma apskaitos nustatymo atliekama iš meniu %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Pagrindinė apskaitos sąskaita klientams, kurie nenustatyti sąrankos metu
 MainAccountForSuppliersNotDefined=Pagrindinė apskaitos sąskaita tiekėjams, kurie nenustatyti sąrankos metu
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Data
 Docref=Nuoroda
 LabelAccount=Sąskaitos etiketė
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Žurnalas
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index ea55fbcdc54..72b82a109b5 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Atvaizdavimas
 SetupArea=Nustatymai
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Failo-testo įkėlimo forma (pagal nustatymus)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Pastaba: Patvirtinimas yra efektyvus tik, kai modulis <b>%s</b> yra aktyvus
 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.
@@ -85,7 +87,6 @@ ShowPreview=Rodyti apžiūrą
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Apžiūra negalima
 ThemeCurrentlyActive=Tema yra veikli
-CurrentTimeZone=Laiko juostos PHP (serveris)
 MySQLTimeZone=TimeZone MySQL (duomenų bazės)
 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=Erdvė
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Išvalyti
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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=Išvalyti dabar
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Privilegijuoti partneriai
 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>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=OpenDocument šablonų katalogų sąrašas
 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=Pavyzdys: <br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Norėdami sužinoti, kaip sukurti savo odt dokumentų šablonus, prieš išsaugant juos šiuose kataloguose, paskaityti Wiki dokumentus:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Vardo/Pavardės pozicija
@@ -406,7 +408,7 @@ UrlGenerationParameters=URL apsaugos parametrai
 SecurityTokenIsUnique=Kiekvienam URL naudokite unikalų apsaugos rakto parametrą
 EnterRefToBuildUrl=Įveskite nuorodą objektui %s
 GetSecuredUrl=Gauti apskaičiuotą URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Senas PVM tarifas
 NewVATRates=Naujas PVM tarifas
 PriceBaseTypeToChange=Modifikuoti kainas su apibrėžta bazinės vertės nuoroda
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Paraštės
-Module59000Desc=Paraščių valdymo modulis
+Module59000Desc=Module to follow margins
 Module60000Name=Komisiniai
 Module60000Desc=Komisinių valdymo modulis
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Paieškos optimizavimas
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ ServiceSetup=Paslaugų modulio nuostatos
 ProductServiceSetup=Produktų ir paslaugų modulių nuostatos
 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
+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 the language of the third party
+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=Brūkšninio kodo tipas produktams pagal nutylėjimą
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Naujas meniu
 MenuHandler=Meniu prižiūrėtojas
 MenuModule=Pirminis modulis
-HideUnauthorizedMenu= Paslėpti neleidžiamus meniu (pilki)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=ID meniu
 DetailMenuHandler=Meniu prižiūrėtojas gali rodyti naują meniu
 DetailMenuModule=Modulio pavadinimas, jei meniu įrašas gaunamas iš modulio
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Pašto kodas
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/lt_LT/banks.lang b/htdocs/langs/lt_LT/banks.lang
index 48e08a11c34..2b529a086e7 100644
--- a/htdocs/langs/lt_LT/banks.lang
+++ b/htdocs/langs/lt_LT/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/lt_LT/blockedlog.lang b/htdocs/langs/lt_LT/blockedlog.lang
index 0bb5b261bc1..f86bbba591f 100644
--- a/htdocs/langs/lt_LT/blockedlog.lang
+++ b/htdocs/langs/lt_LT/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/lt_LT/boxes.lang b/htdocs/langs/lt_LT/boxes.lang
index bed53614fc0..897ee6b984c 100644
--- a/htdocs/langs/lt_LT/boxes.lang
+++ b/htdocs/langs/lt_LT/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Visuminė veikla (sąskaitos-faktūros, pasiūlymai, užsakymai)
 BoxGoodCustomers=Geri klientai
 BoxTitleGoodCustomers=%s geri klientai
+BoxScheduledJobs=Suplanuoti darbai
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=Nėra apibrėžtų žymeklių
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Apskaita
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/lt_LT/cashdesk.lang b/htdocs/langs/lt_LT/cashdesk.lang
index 00c067dd151..d9b9c68951e 100644
--- a/htdocs/langs/lt_LT/cashdesk.lang
+++ b/htdocs/langs/lt_LT/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Sąskaitų-faktūrų skaičius
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/lt_LT/categories.lang b/htdocs/langs/lt_LT/categories.lang
index eab51c93f5a..345dd6c3781 100644
--- a/htdocs/langs/lt_LT/categories.lang
+++ b/htdocs/langs/lt_LT/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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=Papildomi atributai
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang
index e121fe74fd6..5094a5a14dc 100644
--- a/htdocs/langs/lt_LT/companies.lang
+++ b/htdocs/langs/lt_LT/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Tikrinimas negalimas. Tikrinimo paslauga nėra teikiama valstybės narės (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potencialas
diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang
index ba0519c1662..a0c6fe59908 100644
--- a/htdocs/langs/lt_LT/compta.lang
+++ b/htdocs/langs/lt_LT/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Rodyti PVM mokėjimą
 TotalToPay=Iš viso mokėti
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Režimas <b>%sPVM nuo įsipareigojimų apskaitos%s</b>.
 CalcModeVATEngagement=Režimas <b>%sPVM nuo pajamų-išlaidų%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Pajamų ir išlaidų balansas, metinė suvestinė
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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=- 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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Ataskaita pagal trečiosios šalies IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/lt_LT/cron.lang b/htdocs/langs/lt_LT/cron.lang
index d7557437a6d..2433b64aa50 100644
--- a/htdocs/langs/lt_LT/cron.lang
+++ b/htdocs/langs/lt_LT/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = sukurti / atnaujinti planinį darbą
 Permission23103 = Panaikinti planinį darbą
 Permission23104 = Vykdyti planinį darbą
 # Admin
-CronSetup= Numatytos užduoties valdymo nustatymas
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Arba patikrinti ir pradėti spec. darbą
+CronSetup=Numatytos užduoties valdymo nustatymas
+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=Apsaugos raktas URL pradėti cron darbus
 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 environement you can use Scheduled task tools 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
@@ -42,10 +43,11 @@ CronModule=Modulis
 CronNoJobs=Nėra registruotų darbų
 CronPriority=Prioritetas
 CronLabel=Etiketė
-CronNbRun=Pradėti skaičių
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Kiekvienas
 JobFinished=Darbas pradėtas ir baigtas
+Scheduled=Scheduled
 #Page card
 CronAdd= Pridėti darbus
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Komentaras
 CronFieldMandatory=Laukai %s yra privalomi
 CronErrEndDateStartDt=Pabaigos data negali būti ankstesnė už pradžios datą
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Įjungti
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Išjungti
 CronTaskInactive=Šis darbas yra išjungtas
 CronId=ID
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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=Sistemos komandinė eilutė vykdymui
 CronCreateJob=Create new Scheduled Job
 CronFrom=Nuo
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Apvalkalo komanda
 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+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/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index e22aa414772..ee2fb18e9e6 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Nėra klaidos, mes įsipareigojame
 # Errors
 ErrorButCommitIsDone=Aptiktos klaidos, bet mes patvirtiname nepaisant to
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=URL %s yra neteisingas
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Prisijungimas %s jau egzistuoja
 ErrorGroupAlreadyExists=Grupė %s jau egzistuoja
 ErrorRecordNotFound=Įrašo nerasta
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Kai kurie privalomi laukai nėra užpildyti.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Nepavyko sukurti aplanko. Įsitikinkite, kad web serverio vartotojas turi teisę rašyti į Dolibarr dokumentų aplanką. Jei parametras <b>safe_mode</b> yra įjungtas šio PHP, patikrinkite, ar Dolibarr PHP failai priklauso web serverio vartotojui (ar jų grupei).
 ErrorNoMailDefinedForThisUser=Šiam klientui neapibrėžtas paštas
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Šiai funkcijai turi būti aktyvuotas Javascript, kad galėtumėte dirbti. Pakeiskite tai meniu Nustatymai-Ekranas.
 ErrorTopMenuMustHaveAParentWithId0=Meniu tipas "Pagrindinis" negali turėti patronuojančio meniu. Įrašyti 0 patronuojančiame meniu arba pasirinkti meniu tipą "Kairysis".
 ErrorLeftMenuMustHaveAParentId=Meniu tipas "Kairysis" turi turėti patronuojantį ID.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Profilio vardas jau egzistuoja šiam eksporto rinkini
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP derinimas nėra pilnas
 ErrorLDAPMakeManualTest=.ldif failas buvo sukurtas aplanke: %s. Pabandykite įkelti jį rankiniu būdu per komandinę eilutę, kad gauti daugiau informacijos apie klaidas
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Nuoroda, naudojama sukūrimui, jau egzistuoja.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/lt_LT/exports.lang b/htdocs/langs/lt_LT/exports.lang
index 37f6167789c..b42cd43974d 100644
--- a/htdocs/langs/lt_LT/exports.lang
+++ b/htdocs/langs/lt_LT/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Lauko pavadinimas
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Biblioteka
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Žingsnis
 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.
@@ -131,3 +133,4 @@ 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/lt_LT/mails.lang b/htdocs/langs/lt_LT/mails.lang
index 485609c9c59..6028b9b5dac 100644
--- a/htdocs/langs/lt_LT/mails.lang
+++ b/htdocs/langs/lt_LT/mails.lang
@@ -92,6 +92,7 @@ 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=Failo eilutė %s
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Pranešimai
-NoNotificationsWillBeSent=Nėra numatytų e-pašto pranešimų šiam įvykiui ir įmonei
-ANotificationsWillBeSent=1 pranešimas bus išsiųstas e-paštu
-SomeNotificationsWillBeSent=%s pranešimai bus siunčiami e-paštu
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=Visų išsiųstų e-pašto pranešimų sąrašas
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informacija
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 5b05397b5d2..20eab7ac66c 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=Nėra vertimo
 Translation=Vertimas
+CurrentTimeZone=Laiko juostos PHP (serveris)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Įrašų nerasta
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Įrašas išsaugotas
 RecordDeleted=Įrašas ištrintas
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Reikšmė
 PersonalValue=Asmeninė reikšmė
 NewObject=New %s
 NewValue=Nauja reikšmė
+OldValue=Old value %s
 CurrentValue=Dabartinė reikšmė
 Code=Kodas
 Type=Tipas
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Opcija
+Filters=Filters
 List=Sąrašas
 FullList=Pilnas sąrašas
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ SupplierPreview=Vendor preview
 ShowCustomerPreview=Rodyti Kliento peržiūrą
 ShowSupplierPreview=Show vendor preview
 RefCustomer=Kliento nuoroda
+InternalRef=Internal ref.
 Currency=Valiuta
 InfoAdmin=Informacija administratoriams
 Undo=Anuliuoti
@@ -671,7 +678,7 @@ SendMail=Siųsti e-laišką
 Email=El. paštas
 NoEMail=E-laiškų nėra
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=Nėra mobilaus telefono
 Owner=Savininkas
 FollowingConstantsWillBeSubstituted=Šios konstantos bus pakeistos atitinkamomis reikšmėmis
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=Laikomas
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/lt_LT/modulebuilder.lang b/htdocs/langs/lt_LT/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/lt_LT/modulebuilder.lang
+++ b/htdocs/langs/lt_LT/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/lt_LT/mrp.lang b/htdocs/langs/lt_LT/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/lt_LT/mrp.lang
+++ b/htdocs/langs/lt_LT/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang
index 7e6a654fefa..3a40679f01b 100644
--- a/htdocs/langs/lt_LT/other.lang
+++ b/htdocs/langs/lt_LT/other.lang
@@ -5,8 +5,6 @@ Tools=Įrankiai
 TMenuTools=Įrankiai
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Gimimo diena
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=Gimtadienio perspėjimas aktyvus
 BirthdayAlertOff=Gimtadienio perspėjimas neaktyvus
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Prikabintų failų/dokumentų skaičius
 TotalSizeOfAttachedFiles=Iš viso prikabintų failų/dokumentų dydis
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Dešinė
 CalculatedWeight=Apskaičiuotas svoris
 CalculatedVolume=Apskaičiuotas tūris
 Weight=Svoris
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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=Importavimo duomenų rinkinys
 DolibarrNotification=Automatinis pranešimas
 ResizeDesc=Įveskite naują plotį <b>arba</b> naują aukštį. Santykis bus išlaikomas keičiant dydį ...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Eksporto sritis
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 31a8d69bc7d..f3905beb77a 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Kainų skaičius
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Kilmės šalis
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Naudokite fiksuotą kainą
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Kiekio diapazonas
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index 32e8539171e..81e5adaaefc 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -76,15 +76,16 @@ MyActivities=Mano užduotys/veikla
 MyProjects=Mano projektai
 MyProjectsArea=My projects Area
 DurationEffective=Efektyvi trukmė
-ProgressDeclared=Paskelbta pažanga
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Apskaičiuota pažanga
+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=Laikas
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/lt_LT/recruitment.lang b/htdocs/langs/lt_LT/recruitment.lang
index 90e03cf6b72..c67390a9865 100644
--- a/htdocs/langs/lt_LT/recruitment.lang
+++ b/htdocs/langs/lt_LT/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/lt_LT/sendings.lang b/htdocs/langs/lt_LT/sendings.lang
index 74260916fb8..085e7a6c2db 100644
--- a/htdocs/langs/lt_LT/sendings.lang
+++ b/htdocs/langs/lt_LT/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Kiti vežimai, skirti šiam užsakymui
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Vežimai patvirtinimui
 StatusSendingCanceled=Atšauktas
+StatusSendingCanceledShort=Atšauktas
 StatusSendingDraft=Projektas
 StatusSendingValidated=Patvirtinta (produktai siuntimui arba jau išsiųsti)
 StatusSendingProcessed=Apdorotas
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Labiau išsamus dokumento modelis pristatymo kvitui (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstanta EXPEDITION_ADDON_NUMBER nėra apibrėžta
 SumOfProductVolumes=Produkcijos apimties suma
 SumOfProductWeights=Produktų svorių suma
diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang
index 6956b3b8acd..bcb4de636b7 100644
--- a/htdocs/langs/lt_LT/stocks.lang
+++ b/htdocs/langs/lt_LT/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Sandėlių vertė
 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/lt_LT/ticket.lang b/htdocs/langs/lt_LT/ticket.lang
index 7f3e3f99310..0dbbd874bab 100644
--- a/htdocs/langs/lt_LT/ticket.lang
+++ b/htdocs/langs/lt_LT/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Kiti
 TicketSeverityShortLOW=Žemas
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Aukštas
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Skaityti
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/lt_LT/website.lang b/htdocs/langs/lt_LT/website.lang
index df77c21ae55..6a589a71fd8 100644
--- a/htdocs/langs/lt_LT/website.lang
+++ b/htdocs/langs/lt_LT/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Puslapis
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/lt_LT/withdrawals.lang b/htdocs/langs/lt_LT/withdrawals.lang
index 11ebeb3ab99..a81864a269e 100644
--- a/htdocs/langs/lt_LT/withdrawals.lang
+++ b/htdocs/langs/lt_LT/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Priskirti įskaitytas (credited)
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Opcija realiam režimui nebuvo nustatyta, sustabdyta po šios simuliacijos
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/lt_LT/workflow.lang b/htdocs/langs/lt_LT/workflow.lang
index 0f340b1be9a..dfb6dc3193f 100644
--- a/htdocs/langs/lt_LT/workflow.lang
+++ b/htdocs/langs/lt_LT/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index 9d43d7bcd9a..9825eac154e 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=Šis pakalpojums
 ThisProduct=Šis produkts
 DefaultForService=Noklusējums pakalpojumam
 DefaultForProduct=Noklusējums produktam
+ProductForThisThirdparty=Product for this thirdparty
+ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Nevar ieteikt
 AccountancySetupDoneFromAccountancyMenu=Lielākā daļa grāmatvedības iestatīšanas tiek veikta no izvēlnes %s
 ConfigAccountingExpert=Moduļa uzskaites konfigurācija (dubultā ieraksts)
@@ -48,6 +50,7 @@ CountriesExceptMe=Visas valstis, izņemot %s
 AccountantFiles=Eksportēt pirmdokumentus
 ExportAccountingSourceDocHelp=Izmantojot šo rīku, varat eksportēt avota notikumus (sarakstu un PDF failus), kas tika izmantoti grāmatvedības ģenerēšanai. Lai eksportētu žurnālus, izmantojiet izvēlnes ierakstu %s - %s.
 VueByAccountAccounting=Skatīt pēc grāmatvedības konta
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Galvenais grāmatvedības konts klientiem, kas nav definēti iestatījumos
 MainAccountForSuppliersNotDefined=Galvenais grāmatvedības konts piegādātājiem, kas nav definēti iestatījumos
@@ -144,7 +147,7 @@ NotVentilatedinAccount=Nav saistošs grāmatvedības kontam
 XLineSuccessfullyBinded=%s produkti/pakalpojumi, kas veiksmīgi piesaistīti grāmatvedības kontam
 XLineFailedToBeBinded=%s produkti/pakalpojumi nav saistīti ar nevienu grāmatvedības kontu
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Saistīto elementu skaits, kas redzams lapā (maksimāli ieteicams: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Sāciet lappuses "Saistīšanu darīt" šķirošanu ar jaunākajiem elementiem
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Sāciet lappuses "Saistīšana pabeigta" šķirošanu ar jaunākajiem elementiem
 
@@ -198,7 +201,8 @@ Docdate=Datums
 Docref=Atsauce
 LabelAccount=Konta nosaukums
 LabelOperation=Etiķetes darbība
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Burtu kods
 Lettering=Burti
 Codejournal=Žurnāls
@@ -206,7 +210,8 @@ JournalLabel=Žurnāla etiķete
 NumPiece=Gabala numurs
 TransactionNumShort=Num. darījums
 AccountingCategory=Personalizētas grupas
-GroupByAccountAccounting=Grupēt pēc grāmatvedības konta
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Šeit jūs varat definēt dažas grāmatvedības kontu grupas. Tie tiks izmantoti personificētiem grāmatvedības pārskatiem.
 ByAccounts=Pēc kontiem
 ByPredefinedAccountGroups=Iepriekš definētās grupas
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Maksājums nav saistīts ar kādu produktu / pakalpoj
 OpeningBalance=Sākuma bilance
 ShowOpeningBalance=Rādīt sākuma atlikumu
 HideOpeningBalance=Slēpt sākuma atlikumu
-ShowSubtotalByGroup=Rādīt starpsummu pa grupām
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Kontu grupa
 PcgtypeDesc=Kontu grupa tiek izmantota kā iepriekš definēti “filtra” un “grupēšanas” kritēriji dažiem grāmatvedības pārskatiem. Piemēram, “IENĀKUMS” vai “IZDEVUMI” tiek izmantoti kā produktu uzskaites kontu grupas, lai izveidotu izdevumu / ienākumu pārskatu.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Konsultējieties šeit ar izdevumu pārskatu rindiņu sa
 DescVentilExpenseReportMore=Ja jūs izveidojat grāmatvedības kontu uz izdevumu pārskata rindiņu veida, programma varēs visu saistību starp jūsu rēķina pārskatu rindiņām un jūsu kontu diagrammas grāmatvedības kontu veikt tikai ar vienu klikšķi, izmantojot pogu <strong> "%s" </strong>. Ja kontam nav iestatīta maksu vārdnīca vai ja jums joprojām ir dažas rindiņas, kurām nav saistības ar kādu kontu, izvēlnē "<strong> %s </ strong>" būs jāveic manuāla piesaistīšana.
 DescVentilDoneExpenseReport=Konsultējieties šeit ar izdevumu pārskatu rindu sarakstu un to maksu grāmatvedības kontu
 
+Closure=Annual closure
 DescClosure=Šeit apskatiet neapstiprināto kustību skaitu mēnesī, un fiskālie gadi jau ir atvērti
 OverviewOfMovementsNotValidated=1. solis / Nepārvērtēts kustību pārskats. (Nepieciešams, lai slēgtu fiskālo gadu)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 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
-SelectMonthAndValidate=Izvēlieties mēnesi un apstipriniet kustības
 
 ValidateHistory=Piesaistiet automātiski
 AutomaticBindingDone=Automātiskā piesaistīšana pabeigta
@@ -293,6 +300,7 @@ Accounted=Uzskaitīts virsgrāmatā
 NotYetAccounted=Vēl nav uzskaitīti virsgrāmatā
 ShowTutorial=Rādīt apmācību
 NotReconciled=Nesaskaņots
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Iesiešanas iespējas
@@ -337,6 +345,7 @@ Modelcsv_LDCompta10=Eksports LD Compta (v10 un jaunākiem)
 Modelcsv_openconcerto=Eksportēt OpenConcerto (tests)
 Modelcsv_configurable=Eksportēt CSV konfigurējamu
 Modelcsv_FEC=Eksporta FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Eksports uz Sage 50 Šveici
 Modelcsv_winfic=Eksportēt Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index d4c3cc29788..88ecbad779e 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Attēlojums
 SetupArea=Iestatījumi
 UploadNewTemplate=Augšupielādēt jaunu veidni (-es)
 FormToTestFileUploadForm=Forma, lai pārbaudītu failu augšupielādi (pēc uiestatītajiem parametriem)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Piezīme: jā, ir efektīva tikai tad, ja modulis <b>%s</b> ir iespējots
 RemoveLock=Ja ir, noņemiet/pārdēvējiet failu <b>%s</b>, lai varētu izmantot atjaunināšanas/instalēšanas rīku.
 RestoreLock=Atjaunojiet failu <b>%s</b> tikai ar lasīšanas atļauju, lai atspējotu jebkādu turpmāku atjaunināšanas/instalēšanas rīka izmantošanu.
@@ -85,7 +87,6 @@ ShowPreview=Rādīt priekšskatījumu
 ShowHideDetails=Rādīt - slēpt informāciju
 PreviewNotAvailable=Priekšskatījums nav pieejams
 ThemeCurrentlyActive=aktīvā tēma
-CurrentTimeZone=Laika josla PHP (servera)
 MySQLTimeZone=Laika zona MySql (datubāze)
 TZHasNoEffect=Datus uzglabā un nodod atpakaļ datubāzes serverim tā, it kā tie tiktu turēti kā iesniegtā virkne. Laika josla ir spēkā tikai tad, ja tiek izmantota funkcija UNIX_TIMESTAMP (kuru nedrīkst izmantot Dolibarr, tāpēc datubāzei TZ nedrīkst būt nekādas ietekmes, pat ja tas ir mainīts pēc datu ievadīšanas).
 Space=Telpa
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Šī sadaļa nodrošina administrēšanas funkcijas. Izmanto
 Purge=Tīrīt
 PurgeAreaDesc=Šī lapa ļauj izdzēst visus Dolibarr ģenerētos vai glabātos failus (pagaidu faili vai visi faili <b> %s </b> direktorijā). Šīs funkcijas izmantošana parasti nav nepieciešama. Tas tiek nodrošināts kā risinājums lietotājiem, kuru Dolibarr uztur pakalpojumu sniedzējs, kas nepiedāvā atļaujas, lai dzēstu tīmekļa servera ģenerētos failus.
 PurgeDeleteLogFile=Dzēsiet žurnāla failus, tostarp <b>%s</b>, kas definēti Syslog modulim (nav datu pazaudēšanas riska).
-PurgeDeleteTemporaryFiles=Dzēst visus pagaidu failus (nav datu zaudēšanas riska). Piezīme. Dzēšana tiek veikta tikai tad, ja pagaidu katalogs tika izveidots pirms 24 stundām.
-PurgeDeleteTemporaryFilesShort=Dzēst pagaidu failus
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 PurgeDeleteAllFilesInDocumentsDir=Dzēsiet visus failus direktorijā: <b> %s </b>. <br> Tas izdzēsīs visus radītos dokumentus, kas saistīti ar elementiem (trešajām personām, rēķiniem utt.), ECM modulī augšupielādētiem failiem, datu bāzes rezerves izgāztuvēm un pagaidu failus.
 PurgeRunNow=Tīrīt tagad
 PurgeNothingToDelete=Nav mapes vai failu, kurus jādzēš.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Ieteicamie partneri
 OtherResources=Citi resursi
 ExternalResources=Ārējie resursi
 SocialNetworks=Sociālie tīkli
+SocialNetworkId=Social Network 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>
 HelpCenterDesc1=Šeit ir daži resursi, lai iegūtu Dolibarr palīdzību un atbalstu.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Piemēri ar pašreizējo konfigurāciju
 ListOfDirectories=Saraksts OpenDocument veidnes katalogi
 ListOfDirectoriesForModelGenODT=Saraksts ar direktorijām, kurās ir veidnes faili ar OpenDocument formātu. <br> <br> Ievietojiet šeit pilnu direktoriju ceļu. <br> Pievienojiet karodziņu atpakaļ starp eah direktoriju. <br> Lai pievienotu GED moduļa direktoriju, pievienojiet šeit <b > DOL_DATA_ROOT / ecm / yourdirectoryname </b>. <br> <br> Faili šajos katalogos beidzas ar <b> .odt </b> vai <b> .ods </b>.
 NumberOfModelFilesFound=ODT / ODS veidņu failu skaits, kas atrodams šajos katalogos
-ExampleOfDirectoriesForModelGen=Piemēri sintaksei: <br> c:\\mydir<br>/Home/ mydir<br> DOL_DATA_ROOT/ECM/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Lai uzzinātu, kā izveidot odt dokumentu veidnes, pirms saglabājot tos šajās mapēs, lasīt wiki dokumentāciju:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Vārda/Uzvārda atrašanās vieta
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametri, lai nodrošinātu drošas saites
 SecurityTokenIsUnique=Izmantojiet unikālu securekey parametru katram URL
 EnterRefToBuildUrl=Ievadiet atsauci objektam %s
 GetSecuredUrl=Saņemt aprēķināto URL
-ButtonHideUnauthorized=Slēpt pogas lietotājiem, kas nav administratori, par neatļautām darbībām, nevis rādīt pelēkas atspējotas pogas
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Vecā PVN likme
 NewVATRates=Jaunā PVN likme
 PriceBaseTypeToChange=Pārveidot par cenām ar bāzes atsauces vērtību, kas definēta tālāk
@@ -668,7 +670,7 @@ Module54000Desc=Tiešā druka (neatverot dokumentus), izmantojot Cups IPP saskar
 Module55000Name=Aptauja vai balsojums
 Module55000Desc=Izveidot tiešsaistes aptaujas, aptaujas vai balsis (piemēram, Doodle, Studs, RDVz utt.)
 Module59000Name=Malas
-Module59000Desc=Moduli, lai pārvaldītu peļņu
+Module59000Desc=Module to follow margins
 Module60000Name=Komisijas
 Module60000Desc=Modulis lai pārvaldītu komisijas
 Module62000Name=Inkoterms
@@ -1306,7 +1308,7 @@ YouUseBestDriver=Jūs izmantojat draiveri %s, kas ir labākais šobrīd pieejams
 YouDoNotUseBestDriver=Jūs izmantojat draiveri %s, bet ieteicams ir %s.
 NbOfObjectIsLowerThanNoPb=Jums datu bāzē ir tikai %s %s. Tam nav nepieciešama īpaša optimizācija.
 SearchOptim=Meklēšanas optimizācija
-YouHaveXObjectUseSearchOptim=Jums datu bāzē ir %s %s. Jums konstante %s jāpievieno vienumam mapē Mājas iestatīšana-Cits. Ierobežojiet meklēšanu līdz virkņu sākumam, kas datu bāzei ļauj izmantot indeksus, un jums vajadzētu saņemt tūlītēju atbildi.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=Jums datu bāzē ir %s %s, un konstante %s mapē Mājas iestatīšana ir iestatīta uz 1.
 BrowserIsOK=Jūs izmantojat tīmekļa pārlūku %s. Šī pārlūkprogramma ir droša un ātrdarbīgs.
 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.
@@ -1596,8 +1598,13 @@ ServiceSetup=Pakalpojumu moduļa uzstādīšana
 ProductServiceSetup=Produktu un pakalpojumu moduļu uzstādīšana
 NumberOfProductShowInSelect=Maksimālais produktu skaits, kas jāparāda kombinētajos atlases sarakstos (0 = bez ierobežojuma)
 ViewProductDescInFormAbility=Rādīt produktu aprakstus veidlapās (citādi tiek rādīts rīkjoslas uznirstošajā logā)
+DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
+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=Attēlot produktu aprakstus trešās puses valodā
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 UseSearchToSelectProductTooltip=Arī tad, ja jums ir liels produktu skaits (> 100 000), varat palielināt ātrumu, iestatot iestatījumu -> Cits iestatījumu konstante PRODUCT_DONOTSEARCH_ANYWHERE uz 1. Tad meklēšana būs tikai virknes sākums.
 UseSearchToSelectProduct=Pagaidiet, kamēr nospiedīsiet taustiņu, pirms ievietojat produktu kombinēto sarakstu saturu (tas var palielināt veiktspēju, ja jums ir daudz produktu, taču tas ir mazāk ērts).
 SetDefaultBarcodeTypeProducts=Noklusējuma svītrkoda veids izmantojams produktiem
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalizētas izvēlnes, kas nav saistītas ar augs
 NewMenu=Jauna izvēlne
 MenuHandler=Izvēlnes apstrādātājs
 MenuModule=Avota modulis
-HideUnauthorizedMenu= Slēpt neatļautās izvēlnes (pelēkas)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id izvēlne
 DetailMenuHandler=Izvēlne administrators, kur rādīt jaunu izvēlni
 DetailMenuModule=Moduļa nosaukums, ja izvēlnes ierakstam nāk no moduļa
@@ -1983,11 +1990,12 @@ EMailHost=E-pasta IMAP serveris
 MailboxSourceDirectory=Pastkastes avota katalogs
 MailboxTargetDirectory=Pastkastes mērķa direktorija
 EmailcollectorOperations=Darbi, ko veic savācējs
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Maksimālais savākto e-pasta ziņojumu skaits
 CollectNow=Savākt tagad
 ConfirmCloneEmailCollector=Vai tiešām vēlaties klonēt e-pasta kolekcionāru %s?
-DateLastCollectResult=Datums, kad saņemts pēdējais savākšanas mēģinājums
-DateLastcollectResultOk=Pēdējais datums savāc veiksmīgi
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Jaunākais rezultāts
 EmailCollectorConfirmCollectTitle=E-pasts apkopo apstiprinājumu
 EmailCollectorConfirmCollect=Vai vēlaties savākt šīs kolekcijas kolekciju tagad?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Ziņojums no sarunas, kuru aizsāka pirmais e-pasts, kas nosū
 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
 WithoutDolTrackingIDInMsgId=Ziņojums NAV nosūtīts no Dolibarr
-CreateCandidature=Izveidojiet kandidatūru
+CreateCandidature=Create job application
 FormatZip=Pasta indekss
 MainMenuCode=Izvēlnes ievades kods (mainmenu)
 ECMAutoTree=Rādīt automātisko ECM koku
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Valsts (ja tā ir konkrēta valsts)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
index cf070821b46..0bf310b3a54 100644
--- a/htdocs/langs/lv_LV/banks.lang
+++ b/htdocs/langs/lv_LV/banks.lang
@@ -173,10 +173,11 @@ SEPAMandate=SEPA mandāts
 YourSEPAMandate=Jūsu SEPA mandāts
 FindYourSEPAMandate=Tas ir jūsu SEPA mandāts, lai pilnvarotu mūsu uzņēmumu veikt tiešā debeta pasūtījumu savai bankai. Atgriezt to parakstu (skenēt parakstīto dokumentu) vai nosūtīt pa pastu uz
 AutoReportLastAccountStatement=Veicot saskaņošanu, automātiski aizpildiet lauka “bankas izraksta numurs” ar pēdējo izraksta numuru
-CashControl=POS naudas žogs
-NewCashFence=Jauns naudas žogs
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Krāsojiet kustības
 BankColorizeMovementDesc=Ja šī funkcija ir iespējota, jūs varat izvēlēties īpašu fona krāsu debeta vai kredīta pārvietošanai
 BankColorizeMovementName1=Debeta kustības fona krāsa
 BankColorizeMovementName2=Kredīta aprites fona krāsa
 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
diff --git a/htdocs/langs/lv_LV/blockedlog.lang b/htdocs/langs/lv_LV/blockedlog.lang
index 237dac224bc..3318d1d334c 100644
--- a/htdocs/langs/lv_LV/blockedlog.lang
+++ b/htdocs/langs/lv_LV/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Nepārveidojami žurnāli
 ShowAllFingerPrintsMightBeTooLong=Rādīt visus arhivētos žurnālus (var būt daudz)
 ShowAllFingerPrintsErrorsMightBeTooLong=Rādīt visus nederīgos arhīva žurnālus (var būt garš)
 DownloadBlockChain=Lejupielādējiet pirkstu nospiedumus
-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=Arhivēts žurnāla ieraksts nav derīgs. Tas nozīmē, ka kāds (hakeris?) Ir mainījis dažus šī ieraksta datus pēc tā ierakstīšanas vai ir izdzēsis iepriekšējo arhivēto ierakstu (pārbaudiet, vai pastāv līnija ar iepriekšējo #).
 OkCheckFingerprintValidity=Arhivēts žurnāla ieraksts ir derīgs. Dati par šo līniju netika mainīti un ieraksts seko iepriekšējam.
 OkCheckFingerprintValidityButChainIsKo=Arhivētais žurnāls šķiet derīgs salīdzinājumā ar iepriekšējo, bet ķēde agrāk tika bojāta.
 AddedByAuthority=Uzglabāti tālvadības iestādē
@@ -35,7 +35,7 @@ logDON_DELETE=Ziedojuma loģiska dzēšana
 logMEMBER_SUBSCRIPTION_CREATE=Dalībnieka abonements izveidots
 logMEMBER_SUBSCRIPTION_MODIFY=Dalībnieku abonēšana ir labota
 logMEMBER_SUBSCRIPTION_DELETE=Locekļu abonēšanas loģiskā dzēšana
-logCASHCONTROL_VALIDATE=Naudas žogu ierakstīšana
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Klientu rēķinu lejupielāde
 BlockedLogBillPreview=Klienta rēķina priekšskatījums
 BlockedlogInfoDialog=Žurnāla detaļas
diff --git a/htdocs/langs/lv_LV/boxes.lang b/htdocs/langs/lv_LV/boxes.lang
index 88d7803c340..ff805fefef0 100644
--- a/htdocs/langs/lv_LV/boxes.lang
+++ b/htdocs/langs/lv_LV/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Jaunākie %s labotie ziedojumi
 BoxTitleLastModifiedExpenses=Jaunākie %s modificētie izdevumu pārskati
 BoxTitleLatestModifiedBoms=Jaunākās %s modificētās BOM
 BoxTitleLatestModifiedMos=Jaunākie %s modificētie ražošanas pasūtījumi
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global darbība (pavadzīmes, priekšlikumi, rīkojumi)
 BoxGoodCustomers=Labi klienti
 BoxTitleGoodCustomers=%s Labi klienti
+BoxScheduledJobs=Plānoti darbi
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Neizdevās atsvaidzināt RSS plūsmu. Pēdējoreiz veiksmīgi atsvaidzināšanas datums: %s
 LastRefreshDate=Jaunākais atsvaidzināšanas datums
 NoRecordedBookmarks=Nav definētas grāmatzīmes.
@@ -92,8 +95,8 @@ LastXMonthRolling=Jaunākais %s mēnesis ritošais
 ChooseBoxToAdd=Pievienojiet logrīku savam informācijas panelim
 BoxAdded=Jūsu vadības panelī ir pievienots logrīks
 BoxTitleUserBirthdaysOfMonth=Šī mēneša dzimšanas dienas (lietotāji)
-BoxLastManualEntries=Pēdējie manuālie ieraksti grāmatvedībā
-BoxTitleLastManualEntries=%s jaunākie manuālie ieraksti
+BoxLastManualEntries=Latest record in accountancy entered manually or without source document
+BoxTitleLastManualEntries=%s latest record entered manually or without source document
 NoRecordedManualEntries=Grāmatvedībā nav manuālu ierakstu
 BoxSuspenseAccount=Grāmatvedības operācija ar pagaidu kontu
 BoxTitleSuspenseAccount=Nepiešķirto līniju skaits
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Apturēšanas konts nav definēts
 BoxLastCustomerShipments=Pēdējo klientu sūtījumi
 BoxTitleLastCustomerShipments=Jaunākie %s klientu sūtījumi
 NoRecordedShipments=Nav reģistrēts klienta sūtījums
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Grāmatvedība
+ValidatedProjects=Apstiprināti projekti
diff --git a/htdocs/langs/lv_LV/cashdesk.lang b/htdocs/langs/lv_LV/cashdesk.lang
index 773bfdf4601..fddd50d2bac 100644
--- a/htdocs/langs/lv_LV/cashdesk.lang
+++ b/htdocs/langs/lv_LV/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Kājene
 AmountAtEndOfPeriod=Summa perioda beigās (diena, mēnesis vai gads)
 TheoricalAmount=Teorētiskā summa
 RealAmount=Reālā summa
-CashFence=Naudas žogs
-CashFenceDone=Naudas žogs veikts par periodu
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Rēķinu skaits
 Paymentnumpad=Padeves veids maksājuma ievadīšanai
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numerācijas modulis tirdzniecības vietu tirdzniec
 CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> tagu izmanto, lai pievienotu termināļa numuru
 TakeposGroupSameProduct=Grupējiet tās pašas produktu līnijas
 StartAParallelSale=Sāciet jaunu paralēlu izpārdošanu
-ControlCashOpening=Kontrolējiet kases atvēršanu kasē
-CloseCashFence=Aizveriet naudas žogu
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Skaidras naudas pārskats
 MainPrinterToUse=Galvenais izmantojamais printeris
 OrderPrinterToUse=Pasūtiet printeri izmantošanai
@@ -121,4 +122,5 @@ GiftReceiptButton=Pievienojiet pogu Dāvanu kvīts
 GiftReceipt=Dāvanu kvīts
 ModuleReceiptPrinterMustBeEnabled=Vispirms jābūt iespējotam moduļa saņemšanas printerim
 AllowDelayedPayment=Atļaut kavētu maksājumu
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+PrintPaymentMethodOnReceipts=Izdrukājiet maksājuma veidu uz biļetēm |
+WeighingScale=Svari
diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang
index db3681c7335..bde3733eac6 100644
--- a/htdocs/langs/lv_LV/categories.lang
+++ b/htdocs/langs/lv_LV/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projektu tagi / kategoriju apgabals
 UsersCategoriesArea=Lietotāju tagu / kategoriju apgabals
 SubCats=Apakšsadaļas
 CatList=Atslēgvārdu/sadaļu saraksts
+CatListAll=List of tags/categories (all types)
 NewCategory=Jauna etiķete/sadaļa
 ModifCat=Labot etiķeti/sadaļu
 CatCreated=Etiķete/sadaļa izveidota
@@ -65,16 +66,22 @@ UsersCategoriesShort=Lietotāju atzīmes / kategorijas
 StockCategoriesShort=Noliktavas tagi / kategorijas
 ThisCategoryHasNoItems=Šajā kategorijā nav nevienas preces.
 CategId=Tag /sadaļas ID
-CatSupList=Piegādātāju tagu / kategoriju saraksts
-CatCusList=Klientu / perspektīvu tagu / kategoriju saraksts
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Produktu tagu / kategoriju saraksts
 CatMemberList=Dalībnieku tagu / kategoriju saraksts
-CatContactList=List of contact tags/categories
-CatSupLinks=Saites starp piegādātājiem un tagiem / sadaļām
+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=Saiknes starp klientiem / perspektīvām un tagiem / kategorijām
 CatContactsLinks=Saiknes starp kontaktiem / adresēm un tagiem / kategorijām
 CatProdLinks=Saiknes starp produktiem / pakalpojumiem un tagiem / kategorijām
-CatProJectLinks=Saiknes starp projektiem un tagiem / kategorijām
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Noņemt no tagiem / kategorijas
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tagu / kategoriju iestatīšana
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index 21c55893303..6790975f63a 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Pārbaudiet Kopienas iekšējo PVN identifikācijas nu
 VATIntraManualCheck=Jūs varat manuāli pārbaudīt arī Eiropas Komisijas vietnē <a href="%s" target="_blank">%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=Juridiskās personas veids
+JuridicalStatus=Business entity type
 Workforce=Darbaspēks
 Staff=Darbinieki
 ProspectLevelShort=Potenciāls
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index a4add9768be..ad769c0e9d3 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -111,7 +111,7 @@ Refund=Atmaksa
 SocialContributionsPayments=Sociālo/fiskālo nodokļu maksājumi
 ShowVatPayment=Rādīt PVN maksājumu
 TotalToPay=Summa
-BalanceVisibilityDependsOnSortAndFilters=Bilance ir redzama šajā sarakstā tikai tad, ja tabula ir sakārtota uz augšu %s un tiek filtrēta 1 bankas kontam.
+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=Klienta grāmatvedības kods
 SupplierAccountancyCode=Pārdevēja grāmatvedības kods
 CustomerAccountancyCodeShort=Klienta. konta. kods
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Vai tiešām vēlaties dzēst šo sociālo / fis
 ExportDataset_tax_1=Sociālie un fiskālie nodokļi un maksājumi
 CalcModeVATDebt=Mode <b>%sVAT par saistību accounting%s.</b>
 CalcModeVATEngagement=Mode <b>%sVAT par ienākumu-expense%sS.</b>
-CalcModeDebt=Zināma reģistrēto rēķinu analīze, pat ja tie vēl nav uzskaitīti virsgrāmatā.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Zināma reģistrēto maksājumu analīze, pat ja tie vēl nav uzskaitīti Ledger.
 CalcModeBookkeeping=Grāmatvedības grāmatiņas žurnālā publicēto datu analīze.
 CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Ienākumu un izdevumu bilance, gada kopsavilkums
 AnnualByCompanies=Ieņēmumu un izdevumu līdzsvars pēc iepriekš definētām kontu grupām
 AnnualByCompaniesDueDebtMode=Ieņēmumu un izdevumu bilance, detalizēti pēc iepriekš definētām grupām, režīms <b> %sClaims-Debts%s </b> norādīja <b> Saistību grāmatvedība </b>.
 AnnualByCompaniesInputOutputMode=Ieņēmumu un izdevumu līdzsvars, detalizēti pēc iepriekš definētām grupām, režīms <b> %sIncomes-Expenses%s </b> norādīja <b> naudas līdzekļu uzskaiti </b>.
-SeeReportInInputOutputMode=Skatīt %s maksājumu analīzi %s, lai aprēķinātu veiktos faktiskos maksājumus, pat ja tie vēl nav uzskaitīti Virsgrāmatā.
-SeeReportInDueDebtMode=Skatīt %srēķinu analīzi %s, lai aprēķiniem izmantotu zināmos reģistrētos rēķinus, pat ja tie vēl nav uzskaitīti Virsgrāmatā.
-SeeReportInBookkeepingMode=Lai skatītu <b> Grāmatvedības grāmatvedības tabulu </ b>, skatiet <b> %sBookBooking report%s </ 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=- Uzrādītas summas ir ar visiem ieskaitot nodokļus
 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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Tas rāda jūsu grāmatvedībā ierakstu ar g
 SeePageForSetup=Lai iestatītu, skatiet sadaļu <a href="%s"> %s </a>
 DepositsAreNotIncluded=- Sākuma rēķini nav iekļauti
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=2. nodokļu pārskats pa mēnešiem
+LT2ReportByMonth=Nodokļu 3 pārskats pa mēnešiem
 LT1ReportByCustomers=Trešo personu nodokļu pārskats 2
 LT2ReportByCustomers=Ziņojiet par trešās personas nodokli 3
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Ziņojumā, ko trešās puses IRPF
 VATReport=Pārdošanas nodokļa atskaite
 VATReportByPeriods=Pārdošanas nodokļu pārskats pa periodiem
+VATReportByMonth=Pārdošanas nodokļa pārskats pa mēnešiem
 VATReportByRates=Pārdošanas nodokļu pārskats pēc likmēm
 VATReportByThirdParties=Trešo personu pārdošanas nodokļa pārskats
 VATReportByCustomers=Pārdošanas nodokļa pārskats pēc klienta
diff --git a/htdocs/langs/lv_LV/cron.lang b/htdocs/langs/lv_LV/cron.lang
index 4cca272f272..864165259f3 100644
--- a/htdocs/langs/lv_LV/cron.lang
+++ b/htdocs/langs/lv_LV/cron.lang
@@ -7,8 +7,8 @@ Permission23103 = Dzēst plānoto darbu
 Permission23104 = Izpildīt plānoto darbu
 # Admin
 CronSetup=Plānoto darbu iestatīšana
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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=Drošības atslēga URL uzsākt cron darbavietas
 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
@@ -84,3 +84,8 @@ MakeLocalDatabaseDumpShort=Lokālās datu bāzes dublēšana
 MakeLocalDatabaseDump=Izveidojiet vietējo datubāzes dump. Parametri ir: kompresija ("gz" vai "bz" vai "neviens"), dublēšanas veids ("mysql", "pgsql", "auto"), 1, "auto" vai faila nosaukums,
 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=Datu tīrītājs un anonimizators
+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/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index 033f9ff15e9..60299570880 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -8,6 +8,7 @@ ErrorBadEMail=E-pasts %s ir nepareizs
 ErrorBadMXDomain=E-pasts %s nepareizs (domēnam nav derīga MX ieraksta)
 ErrorBadUrl=Url %s ir nepareizs
 ErrorBadValueForParamNotAString=Jūsu parametra nepareiza vērtība. Tas parasti parādās, ja trūkst tulkojuma.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Lietotājs %s jau pastāv.
 ErrorGroupAlreadyExists=Grupa %s jau pastāv.
 ErrorRecordNotFound=Ierakstīt nav atrasts.
@@ -49,6 +50,7 @@ ErrorFieldsRequired=Daži nepieciešamie lauki netika aizpildīti.
 ErrorSubjectIsRequired=E-pasta tēma ir nepieciešama
 ErrorFailedToCreateDir=Neizdevās izveidot direktoriju. Pārbaudiet, vai Web servera lietotājam ir tiesības rakstīt uz Dolibarr dokumentus direktorijā. Ja parametrs <b>safe_mode</b> ir iespējots uz šo PHP, pārbaudiet, Dolibarr php faili pieder web servera lietotājam (vai grupa).
 ErrorNoMailDefinedForThisUser=Nav definēts e-pasts šim lietotājam
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Šai funkcijai ir nepieciešams aktivizēt javascript. Mainīt to var iestatījumi - attēlojums.
 ErrorTopMenuMustHaveAParentWithId0=Tipa &quot;Top&quot; izvēlnē nevar būt mātes ēdienkarti. Put ar 0 mātes izvēlnes vai izvēlēties izvēlni tips &quot;pa kreisi&quot;.
 ErrorLeftMenuMustHaveAParentId=Tipa 'Kreiso' izvēlne jābūt vecākiem id.
@@ -76,7 +78,7 @@ ErrorExportDuplicateProfil=Šāds profila nosaukums jau eksistē šim eksportam.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP saskaņošana nav pilnīga.
 ErrorLDAPMakeManualTest=. LDIF fails ir radīts direktorija %s. Mēģināt ielādēt manuāli no komandrindas, lai būtu vairāk informācijas par kļūdām.
 ErrorCantSaveADoneUserWithZeroPercentage=Nevar saglabāt darbību ar statusu, kas nav startēts, ja arī aizpildīts lauks "done by".
-ErrorRefAlreadyExists=Ref izmantot izveidot jau pastāv.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Lūdzu, ievadiet bankas izraksta nosaukumu, kurā ieraksts jāpaziņo (formāts GGGGMM vai GGGGMMDD).
 ErrorRecordHasChildren=Neizdevās dzēst ierakstu, jo tajā ir daži bērnu ieraksti.
 ErrorRecordHasAtLeastOneChildOfType=Objektam ir vismaz viens bērns no tipa %s
@@ -246,6 +248,14 @@ ErrorProductDoesNotNeedBatchNumber=Kļūda, produkts '<b> %s </b>' nepieņem par
 ErrorFailedToReadObject=Kļūda, neizdevās nolasīt <b> tipa objektu. %s
 ErrorParameterMustBeEnabledToAllwoThisFeature=Kļūda, parametram <b> %s </b> jābūt iespējotam <b> conf / conf.php <b>, lai iekšējais darba plānotājs varētu izmantot komandrindas saskarni
 ErrorLoginDateValidity=Kļūda, šī pieteikšanās ir ārpus derīguma datumu diapazona
+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
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Jūsu PHP parametrs upload_max_filesize (%s) ir augstāks nekā PHP parametrs post_max_size (%s). Šī nav konsekventa iestatīšana.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -276,3 +286,4 @@ WarningSomeBankTransactionByChequeWereRemovedAfter=Daži bankas darījumi tika n
 WarningFailedToAddFileIntoDatabaseIndex=Brīdinājums, neizdevās pievienot faila ierakstu ECM datu bāzes rādītāju tabulā
 WarningTheHiddenOptionIsOn=Brīdinājums: slēpta opcija <b> %s </b> ir ieslēgta.
 WarningCreateSubAccounts=Brīdinājums: jūs nevarat izveidot tieši apakškontu, jums ir jāizveido trešā puse vai lietotājs un jāpiešķir viņiem grāmatvedības kods, lai tos atrastu šajā sarakstā
+WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
diff --git a/htdocs/langs/lv_LV/exports.lang b/htdocs/langs/lv_LV/exports.lang
index 8f3f62628ff..c7732d16a4b 100644
--- a/htdocs/langs/lv_LV/exports.lang
+++ b/htdocs/langs/lv_LV/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Atslēga (sleja), ko izmantot esošo datu <b> atjaunināšan
 NbInsert=Ievietoto līniju skaits: %s
 NbUpdate=Atjaunināto līniju skaits: %s
 MultipleRecordFoundWithTheseFilters=Ar šiem filtriem tika atrasti vairāki ieraksti: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index 24e05670a05..0b05dd5c665 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Lietotāja ievadītie e-pasti
 MailingModuleDescDolibarrUsers=Lietotāji ar e-pastu
 MailingModuleDescThirdPartiesByCategories=Trešās personas (pēc sadaļām)
 SendingFromWebInterfaceIsNotAllowed=Sūtīšana no tīmekļa saskarnes nav atļauta.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Līnija %s failā
@@ -129,8 +130,8 @@ NotificationsAuto=Paziņojumi Automātiski.
 NoNotificationsWillBeSent=Šim notikuma veidam un uzņēmumam nav plānoti automātiski e-pasta paziņojumi
 ANotificationsWillBeSent=1 automātisks paziņojums tiks nosūtīts pa e-pastu
 SomeNotificationsWillBeSent=%s automātiskie paziņojumi tiks nosūtīti pa e-pastu
-AddNewNotification=Aktivizējiet jaunu automātisko e-pasta paziņojumu mērķi / notikumu
-ListOfActiveNotifications=Uzskaitiet visus aktīvos mērķus / notikumus automātiskai e-pasta paziņošanai
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
 ListOfNotificationsDone=Uzskaitiet visus nosūtītos automātiskos e-pasta paziņojumus
 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.
@@ -141,7 +142,7 @@ UseFormatFileEmailToTarget=Importētajam failam jābūt formatētam <strong>e-pa
 UseFormatInputEmailToTarget=Ievadiet virkni ar formātu <strong>e-pasts;nosaukums;vārds;cits</strong>
 MailAdvTargetRecipients=Saņēmēji (papildu izvēle)
 AdvTgtTitle=Aizpildiet ievades laukus, lai iepriekš atlasītu mērķauditoriju trešajām personām vai kontaktpersonām / adresēm
-AdvTgtSearchTextHelp=Izmantojiet %% kā aizstājējzīmes. Piemēram, lai atrastu visu objektu, piemēram, <b> jean, joe, jim </ b>, jūs varat ievadīt <b> j%% </ b>, kuru varat arī izmantot; kā atdalītājs par vērtību, un izmantot! izņemot šo vērtību. Piemēram, <b> jean; joe; jim%%;! Jimo;! Jima% </ b> tiks mērķētas uz visiem jean, joe, sākt ar jim, bet ne jimo, un ne visu, kas sākas ar jima
+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=Izmantojiet intervālu, lai izvēlētos int vai float vērtību
 AdvTgtMinVal=Minimālā vērtība
 AdvTgtMaxVal=Maksimālā vērtība
@@ -174,3 +175,5 @@ Answered=Atbildēts
 IsNotAnAnswer=Nav atbildes (sākotnējais e-pasts)
 IsAnAnswer=Vai ir atbilde uz sākotnējo e-pastu
 RecordCreatedByEmailCollector=Ierakstu izveidojis e-pasta savācējs %s no e-pasta %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 3f1950cb761..9e137712141 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Šim e-pasta veidam nav pieejamas veidnes
 AvailableVariables=Pieejamie aizstāšanas mainīgie
 NoTranslation=Nav iztulkots
 Translation=Tulkošana
+CurrentTimeZone=Laika josla PHP (servera)
 EmptySearchString=Ievadiet meklēšanas kritērijus
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Nav atrasti ieraksti
 NoRecordDeleted=Neviens ieraksts nav dzēsts
 NotEnoughDataYet=Nepietiek datu
@@ -85,6 +87,8 @@ 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=There is a dedicated help page related to your current screen
+HomePage=Mājas lapa
 RecordSaved=Ieraksts saglabāts
 RecordDeleted=Ieraksts dzēsts
 RecordGenerated=Ieraksts izveidots
@@ -220,6 +224,7 @@ Value=Vērtība
 PersonalValue=Personīgā vērtība
 NewObject=Jauns %s
 NewValue=Jaunā vērtība
+OldValue=Old value %s
 CurrentValue=Pašreizējā vērtība
 Code=Kods
 Type=Tips
@@ -433,6 +438,7 @@ RemainToPay=Vēl jāsamaksā
 Module=Module/Application
 Modules=Moduļi/lietojumprogrammas
 Option=Iespējas
+Filters=Filters
 List=Saraksts
 FullList=Pilns saraksts
 FullConversation=Pilna saruna
@@ -650,6 +656,7 @@ SupplierPreview=Pārdevēja priekšskatījums
 ShowCustomerPreview=Rādīt klientu priekšskatījumu
 ShowSupplierPreview=Rādīt pārdevēja priekšskatījumu
 RefCustomer=Ref. klienta
+InternalRef=Internal ref.
 Currency=Valūta
 InfoAdmin=Informācija administratoriem
 Undo=Atcelt
@@ -671,7 +678,7 @@ SendMail=Sūtīt e-pastu
 Email=E-pasts
 NoEMail=Nav e-pasta
 AlreadyRead=Jau izlasīts
-NotRead=Nav lasīts
+NotRead=Nelasīts
 NoMobilePhone=Nav mob. tel.
 Owner=Īpašnieks
 FollowingConstantsWillBeSubstituted=Šādas konstantes tiks aizstāts ar atbilstošo vērtību.
@@ -1107,3 +1114,9 @@ UpToDate=Aktuāls
 OutOfDate=Novecojis
 EventReminder=Atgādinājums par notikumu
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/lv_LV/modulebuilder.lang b/htdocs/langs/lv_LV/modulebuilder.lang
index 4d3e949e746..04eba6b459c 100644
--- a/htdocs/langs/lv_LV/modulebuilder.lang
+++ b/htdocs/langs/lv_LV/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP lapa, lai izveidotu / rediģētu / skatītu ierakstu
 PageForAgendaTab=PHP lappuse notikumu cilnē
 PageForDocumentTab=PHP lapas cilnei
 PageForNoteTab=PHP lapa piezīmju cilnē
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Ceļš uz moduļa / pieteikuma pakotnes rāvienu
 PathToModuleDocumentation=Ceļš uz moduļa / lietojumprogrammas dokumentācijas failu (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces vai speciālās rakstzīmes nav atļautas.
@@ -77,7 +78,7 @@ IsAMeasure=Vai pasākums
 DirScanned=Direktorija skenēta
 NoTrigger=Nav sprūda
 NoWidget=Nav logrīku
-GoToApiExplorer=Iet uz API pētnieku
+GoToApiExplorer=API pētnieks
 ListOfMenusEntries=Izvēlnes ierakstu saraksts
 ListOfDictionariesEntries=Vārdnīcu ierakstu saraksts
 ListOfPermissionsDefined=Noteikto atļauju saraksts
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Ja jums ir zināšanas par SQL un PHP, jūs varat izman
 SeeTopRightMenu=Augšējā labajā izvēlnē skatiet <span class="fa fa-bug"></span>
 AddLanguageFile=Pievienot valodas failu
 YouCanUseTranslationKey=Šeit varat izmantot atslēgu, kas ir tulkošanas atslēga, kas tiek atrasta valodas failā (sk. Cilni "Valodas").
-DropTableIfEmpty=(Dzēst tabulu, ja tukša)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=Tabula %s neeksistē
 TableDropped=Tabula %s dzēsta
 InitStructureFromExistingTable=Veidojiet esošās tabulas struktūras masīva virkni
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Izmantojiet konkrētu redaktora URL
 UseSpecificFamily = Izmantojiet noteiktu ģimeni
 UseSpecificAuthor = Izmantojiet noteiktu autoru
 UseSpecificVersion = Izmantojiet konkrētu sākotnējo versiju
-ModuleMustBeEnabled=Vispirms jāaktivizē modulis / programma
 IncludeRefGeneration=Objekta atsauce jāģenerē automātiski
 IncludeRefGenerationHelp=Atzīmējiet šo, ja vēlaties iekļaut kodu, lai automātiski pārvaldītu atsauces ģenerēšanu
 IncludeDocGeneration=Es gribu no objekta ģenerēt dažus dokumentus
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Lauku tips: <br> varchar (99), double (24,8), real, text, html,
 AsciiToHtmlConverter=Ascii uz HTML pārveidotāju
 AsciiToPdfConverter=Ascii uz PDF pārveidotāju
 TableNotEmptyDropCanceled=Tabula nav tukša. Dzēšana tika atcelta.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/lv_LV/mrp.lang b/htdocs/langs/lv_LV/mrp.lang
index bf03d346a2e..e56abf7d542 100644
--- a/htdocs/langs/lv_LV/mrp.lang
+++ b/htdocs/langs/lv_LV/mrp.lang
@@ -78,3 +78,27 @@ TotalCost=Kopējās izmaksas
 BOMTotalCost=Šīs BOM izgatavošanas izmaksas, pamatojoties uz katra patērētā daudzuma un produkta izmaksām (izmantojiet pašizmaksu, ja tā ir noteikta, cita - vidējā svērtā cena, ja ir noteikta, citur - labākā pirkuma cena).
 GoOnTabProductionToProduceFirst=Vispirms jums ir jāsāk ražošana, lai aizvērtu ražošanas pasūtījumu (sk. Cilni '%s'). Bet jūs varat to atcelt.
 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index 74075151ce5..73b65a6e40b 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -5,8 +5,6 @@ Tools=Darbarīki
 TMenuTools=Rīki
 ToolsDesc=Visi instrumenti, kas nav iekļauti citos izvēlnes ierakstos, tiek sagrupēti šeit. <br> Visiem rīkiem var piekļūt, izmantojot kreiso izvēlni.
 Birthday=Dzimšanas diena
-BirthdayDate=Dzimšanas diena
-DateToBirth=Dzimšanas datums
 BirthdayAlertOn=dzimšanas dienas brīdinājums aktīvs
 BirthdayAlertOff=dzimšanas dienas brīdinājums neaktīvs
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Rēķina datuma iepriekšējais mēnesis (no 1-12)
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Pēc mēneša (no 1-12) rēķina datums
 TextNextMonthOfInvoice=Pēc mēneša (teksts) rēķina datums
+PreviousMonth=Iepriekšējais mēnesis
+CurrentMonth=Tekošais mēnesis
 ZipFileGeneratedInto=Zip fails, kas ģenerēts <b> %s </b>.
 DocFileGeneratedInto=Doc fails ir izveidots <b> %s </b>.
 JumpToLogin=Atvienots. Iet uz pieteikšanās lapu ...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Izdevumu pārskats apstiprināts (nepieciešams a
 Notify_EXPENSE_REPORT_APPROVE=Izdevumu pārskats ir apstiprināts
 Notify_HOLIDAY_VALIDATE=Atteikt pieprasījumu apstiprināt (nepieciešams apstiprinājums)
 Notify_HOLIDAY_APPROVE=Atvaļinājuma pieprasījums apstiprināts
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Skaits pievienotos failus / dokumentus
 TotalSizeOfAttachedFiles=Kopējais apjoms pievienotos failus / dokumentus
@@ -99,6 +100,7 @@ PredefinedMailContentSendShipping=__(Labdien)__\n\nLūdzu, nosūtiet sūtījumu
 PredefinedMailContentSendFichInter=__(Labdien)__\n\nLūdzu, skatiet interviju __REF__\n\n\n__ (Ar cieņu) __\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Jūs varat noklikšķināt uz zemāk esošās saites, lai veiktu maksājumu, ja tas vēl nav izdarīts.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Labdien)__\n\n\n__ (Ar cieņu) __\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Notikuma atgādinājums "__EVENT_LABEL__" __EVENT_DATE__ plkst. __EVENT_TIME__ <br> <br> Šis ir automātisks ziņojums, lūdzu, neatbildiet.
 DemoDesc=Dolibarr ir kompakts ERP / CRM, kas atbalsta vairākus biznesa moduļus. Demonstrācija, kas demonstrē visus moduļus, nav jēga, jo šis scenārijs nekad nenotiek (pieejami vairāki simti). Tātad, ir pieejami vairāki demo profili.
 ChooseYourDemoProfil=Izvēlies demo profilu, kas vislabāk atbilst jūsu vajadzībām ...
 ChooseYourDemoProfilMore=... vai izveidojiet savu profilu <br> (manuālā moduļa izvēle)
@@ -214,6 +216,7 @@ EMailTextExpenseReportValidated=Izdevumu pārskats %s ir pārbaudīts.
 EMailTextExpenseReportApproved=Izdevumu pārskats %s ir apstiprināts.
 EMailTextHolidayValidated=Atstāt pieprasījumu %s ir apstiprināta.
 EMailTextHolidayApproved=Atstāt pieprasījumu %s ir apstiprināts.
+EMailTextActionAdded=The action %s has been added to the Agenda.
 ImportedWithSet=Ievešanas datu kopu
 DolibarrNotification=Automātiska paziņošana
 ResizeDesc=Ievadiet jaunu platumu <b>vai</b> jaunu augstumu. Attiecība būs jātur laikā izmēru maiņas ...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Kontaktpersona / adrese, ko izveidojis e-pasta ko
 ProjectCreatedByEmailCollector=Projekts, ko izveidojis e-pasta savācējs no e-pasta MSGID %s
 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
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Eksportēšanas sadaļa
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index 80aa1c66905..575c475d3b8 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Aizpildiet pēdējos pakalpojumu līnijas datumus
 MultiPricesAbility=Vairāki cenu segmenti katram produktam / pakalpojumam (katrs klients atrodas vienā cenu segmentā)
 MultiPricesNumPrices=Cenu skaits
 DefaultPriceType=Cenu bāze par saistību neizpildi (ar nodokli bez nodokļa), pievienojot jaunas pārdošanas cenas
-AssociatedProductsAbility=Komplektu aktivizēšana (virtuālie produkti)
+AssociatedProductsAbility=Enable Kits (set of several products)
+VariantsAbility=Enable Variants (variations of products, for example color, size)
 AssociatedProducts=Komplekti
 AssociatedProductsNumber=Produktu skaits, kas veido šo komplektu
 ParentProductsNumber=Number of parent packaging product
@@ -167,8 +168,10 @@ BuyingPrices=Iepirkšanas cenas
 CustomerPrices=Klienta cenas
 SuppliersPrices=Pārdevēja cenas
 SuppliersPricesOfProductsOrServices=Pārdevēja cenas (produktiem vai pakalpojumiem)
-CustomCode=Muita / Prece / HS kods
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Izcelsmes valsts
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Produkta veids (materiāls / gatavs)
 NatureOfProductShort=Produkta veids
 NatureOfProductDesc=Izejviela vai gatavais produkts
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Izmantot fiksētu cenu
 PriceByQuantity=Dažādas cenas apjomam
 DisablePriceByQty=Atspējot cenas pēc daudzuma
 PriceByQuantityRange=Daudzuma diapazons
-MultipriceRules=Cenu segmenta noteikumi
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Izmantojiet cenu segmenta noteikumus (definēti produktu moduļa iestatījumos), lai automātiski aprēķinātu visu pārējo segmentu cenas saskaņā ar pirmo segmentu
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index 28e163375b4..d33723cf2ac 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -76,15 +76,16 @@ MyActivities=Mani uzdevumi / aktivitātes
 MyProjects=Mani projekti
 MyProjectsArea=Manu projektu sadaļa
 DurationEffective=Efektīvais ilgums
-ProgressDeclared=Deklarētais progress
+ProgressDeclared=Deklarētais reālais progress
 TaskProgressSummary=Uzdevuma virzība
 CurentlyOpenedTasks=Saudzīgi atvērti uzdevumi
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=Deklarētā progresija ir mazāka par %s nekā aprēķinātā progresija
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Deklarētais progress ir vairāk %s nekā aprēķinātā progresija
-ProgressCalculated=Aprēķinātais progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=Deklarētais reālais progress ir mazāks par %s nekā patēriņa progress
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Deklarētais reālais progress ir vairāk %s nekā patēriņa progress
+ProgressCalculated=Progress patēriņa jomā
 WhichIamLinkedTo=ar kuru esmu saistīts
 WhichIamLinkedToProject=kuru esmu piesaistījis projektam
 Time=Laiks
+TimeConsumed=Consumed
 ListOfTasks=Uzdevumu saraksts
 GoToListOfTimeConsumed=Pāriet uz patērētā laika sarakstu
 GanttView=Ganta skats
diff --git a/htdocs/langs/lv_LV/recruitment.lang b/htdocs/langs/lv_LV/recruitment.lang
index a06859e2516..dc5848592fc 100644
--- a/htdocs/langs/lv_LV/recruitment.lang
+++ b/htdocs/langs/lv_LV/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/lv_LV/sendings.lang b/htdocs/langs/lv_LV/sendings.lang
index f43aacf6d6c..4822bca650a 100644
--- a/htdocs/langs/lv_LV/sendings.lang
+++ b/htdocs/langs/lv_LV/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Citas sūtījumiem uz šo rīkojumu
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Sūtījumi apstiprināšanai,
 StatusSendingCanceled=Atcelts
+StatusSendingCanceledShort=Atcelts
 StatusSendingDraft=Uzmetums
 StatusSendingValidated=Apstiprinātas (produkti, uz kuģi vai jau nosūtīti)
 StatusSendingProcessed=Apstrādāts
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Vispirms jums ir jāapstiprina pasūtījums, la
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Vairāk pilnīgu dokumentu modelis piegādes ieņēmumiem (logo. ..)
+DocumentModelStorm=Pilnīgāks dokumentu paraugs piegādes kvīšu un ekstrahēto lauku saderībai (logotips ...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Pastāvīga EXPEDITION_ADDON_NUMBER nav noteikts
 SumOfProductVolumes=Produkta apjomu summa
 SumOfProductWeights=Summēt produkta svaru
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index 6c2b008b488..91412191b93 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Noliktavas vērtība
 UserWarehouseAutoCreate=Lietotāja noliktavas izveide, izveidojot lietotāju
 AllowAddLimitStockByWarehouse=Pārvaldiet arī minimālā un vēlamā krājuma vērtību pārī (produkta noliktava), papildus minimālā un vēlamā krājuma vērtībai vienam produktam
 RuleForWarehouse=Noteikumi noliktavām
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Iestatiet noliktavu pārdošanas pasūtījumiem
 UserDefaultWarehouse=Iestatiet noliktavu lietotājiem
 MainDefaultWarehouse=Noklusētā noliktava
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Iestatiet vērtību 0, lai atiestatītu daudzumu <br>. Sagl
 UpdateByScaning=Atjauniniet, skenējot
 UpdateByScaningProductBarcode=Atjaunināšana, skenējot (produkta svītrkods)
 UpdateByScaningLot=Atjaunināt, skenējot (partija | sērijas svītrkods)
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/lv_LV/ticket.lang b/htdocs/langs/lv_LV/ticket.lang
index b1947dfcce0..43c18d15509 100644
--- a/htdocs/langs/lv_LV/ticket.lang
+++ b/htdocs/langs/lv_LV/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Pieteikumu veids
 TicketDictCategory=Pieteikumu - grupas
 TicketDictSeverity=Pieteikuma svarīgums
 TicketDictResolution=Biļete - izšķirtspēja
-TicketTypeShortBUGSOFT=Dysfontionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Tirdzniecības jautājums
 
+TicketTypeShortCOM=Tirdzniecības jautājums
 TicketTypeShortHELP=Funkcionālās palīdzības pieprasījums
 TicketTypeShortISSUE=Izdošana, kļūda vai problēma
 TicketTypeShortREQUEST=Mainīt vai uzlabot pieprasījumu
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Cits
 TicketSeverityShortLOW=Zems
 TicketSeverityShortNORMAL=Normāls
 TicketSeverityShortHIGH=Augsts
-TicketSeverityShortBLOCKING=Kritiski/bloķēšana
+TicketSeverityShortBLOCKING=Kritisks, bloķējošs
 
 ErrorBadEmailAddress=Lauks "%s" ir nepareizs
 MenuTicketMyAssign=Mani pieteikumi
@@ -60,7 +58,6 @@ OriginEmail=E-pasta avots
 Notify_TICKET_SENTBYMAIL=Sūtīt biļeti pa e-pastu
 
 # Status
-NotRead=Nav lasāms
 Read=Lasīt
 Assigned=Piešķirts
 InProgress=Procesā
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Publiskā saskarne ļauj apmeklētājiem izve
 TicketsAutoAssignTicket=Automātiski piešķirt lietotāju, kas izveidojis biļeti
 TicketsAutoAssignTicketHelp=Veidojot biļeti, lietotājs var automātiski piešķirt biļeti.
 TicketNumberingModules=Čeku numerācijas modulis
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Paziņot trešajai pusei radīšanas laikā
 TicketsDisableCustomerEmail=Vienmēr atspējojiet e-pasta ziņojumus, ja biļete tiek veidota no publiskās saskarnes
 TicketsPublicNotificationNewMessage=Sūtiet e-pastu (s), kad tiek pievienots jauns ziņojums
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Statuss mainīts: %s līdz %s
 TicketNotNotifyTiersAtCreate=Neinformēt uzņēmumu par radīšanu
 Unread=Nelasīts
 TicketNotCreatedFromPublicInterface=Nav pieejams. Biļete netika izveidota no publiskās saskarnes.
-PublicInterfaceNotEnabled=Publiskā saskarne nebija iespējota
 ErrorTicketRefRequired=Nepieciešams biļetes atsauces nosaukums
 
 #
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index 45c5b91487f..42971c9e293 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -30,7 +30,6 @@ EditInLine=Rediģēt inline
 AddWebsite=Pievienot vietni
 Webpage=Web lapa / konteiners
 AddPage=Pievienot lapu / konteineru
-HomePage=Mājas lapa
 PageContainer=Lappuse
 PreviewOfSiteNotYetAvailable=Jūsu vietnes <strong> %s </strong>priekšskatījums vēl nav pieejams. Vispirms jums ir <strong> Jāimportē pilnu vietnes veidni</strong> vai vienkārši <strong>Pievienot lapu/konteineru</strong>".
 RequestedPageHasNoContentYet=Pieprasītā lapa ar id %s vēl nav ievietota, vai kešatmiņas fails .tpl.php tika noņemts. Rediģējiet lapas saturu, lai to atrisinātu.
@@ -101,7 +100,7 @@ EmptyPage=Tukša lapa
 ExternalURLMustStartWithHttp=Ārējam URL ir jāsākas ar http: // vai https: //
 ZipOfWebsitePackageToImport=Augšupielādējiet vietnes veidņu pakotnes ZIP failu
 ZipOfWebsitePackageToLoad=vai izvēlieties pieejamo iegultās vietnes veidņu paketi
-ShowSubcontainers=Iekļaut dinamisko saturu
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Lapas iekšējais URL
 ThisPageIsTranslationOf=Šī lapa / konteiners ir tulkojums
 ThisPageHasTranslationPages=Šajā lapā / konteinerā ir tulkojums
@@ -137,3 +136,4 @@ RSSFeedDesc=Izmantojot šo URL, varat iegūt RSS plūsmu no jaunākajiem rakstie
 PagesRegenerated=reģenerēta %s lapa (s) / konteiners (-i)
 RegenerateWebsiteContent=Atjaunojiet tīmekļa vietnes kešatmiņas failus
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
index b041cca3eff..f547e315cce 100644
--- a/htdocs/langs/lv_LV/withdrawals.lang
+++ b/htdocs/langs/lv_LV/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Jaunākie %s tiešā debeta ieņēmumi
 MakeWithdrawRequest=Izveidojiet tiešā debeta maksājumu pieprasījumu
 MakeBankTransferOrder=Veiciet kredīta pārveduma pieprasījumu
 WithdrawRequestsDone=%s reģistrēti tiešā debeta maksājumu pieprasījumi
+BankTransferRequestsDone=%s credit transfer requests recorded
 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>.
 ClassCredited=Klasificēt kreditēts
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA vispirms
 ExecutionDate=Izpildes datums
 CreateForSepa=Izveidojiet tiešā debeta failu
-ICS=Kreditora identifikators CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - katram darījumam piešķirts unikāls ID
 USTRD="Nestrukturēts" SEPA XML tag
 ADDDAYS=Pievienojiet dienas izpildes datumam
@@ -146,3 +148,5 @@ InfoRejectSubject=Tiešais debeta maksājuma uzdevums ir noraidīts
 InfoRejectMessage=Labdien, <br> <br> banka noraidījusi rēķina %s tiešā debeta maksājuma uzdevumu saistībā ar uzņēmumu %s ar summu %s. <br> <br> - <br> %s
 ModeWarning=Iespēja reālā režīmā nav noteikts, mēs pārtraucam pēc šīs simulācijas
 ErrorCompanyHasDuplicateDefaultBAN=Uzņēmumam ar ID %s ir vairāk nekā viens noklusējuma bankas konts. Nevar uzzināt, kuru izmantot.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/lv_LV/workflow.lang b/htdocs/langs/lv_LV/workflow.lang
index 2e7aff69db9..460cdffc0d3 100644
--- a/htdocs/langs/lv_LV/workflow.lang
+++ b/htdocs/langs/lv_LV/workflow.lang
@@ -16,8 +16,10 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Klasificējiet saistīto avota pār
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Saistīto avotu pārdevēju priekšlikuma klasifikācija tiek apmaksāta, kad tiek apstiprināts piegādātāja rēķins (un ja rēķina summa ir tāda pati kā saistītā piedāvājuma kopējā summa)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Klasificēt saistīto avotu pirkuma pasūtījumu, par kuru jāmaksā, kad tiek apstiprināts piegādātāja rēķins (un ja rēķina summa ir tāda pati kā saistītā pasūtījuma summa)
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+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=Close all interventions linked to the ticket when a ticket is closed
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Kad biļete ir slēgta, aizveriet visas ar biļeti saistītās darbības
 AutomaticCreation=Automātiska veidošana
 AutomaticClassification=Automātiskā klasifikācija
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index 01016a2fb76..9940d0fea92 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=Оваа услуга
 ThisProduct=Овој производ
 DefaultForService=Стандардно за услугата
 DefaultForProduct=Стандардно за производот
+ProductForThisThirdparty=Product for this thirdparty
+ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Без предлози
 AccountancySetupDoneFromAccountancyMenu=Повеќето поставување на сметководството е направено од менито %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -48,6 +50,7 @@ CountriesExceptMe=Сите земји освен %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Главна сметководствена сметка за клиенти што не се дефинирани во сетапот
 MainAccountForSuppliersNotDefined=Главна сметководствена сметка за трговците кои не се дефинирани во сетапот
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index 04f993c0811..b6770cce1bb 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -56,6 +56,8 @@ 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.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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.
@@ -256,6 +257,7 @@ 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.
@@ -375,7 +377,7 @@ 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:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+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
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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
+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 the language of the third party
+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
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+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
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/mk_MK/banks.lang b/htdocs/langs/mk_MK/banks.lang
index 7ed471f3c64..17caf495566 100644
--- a/htdocs/langs/mk_MK/banks.lang
+++ b/htdocs/langs/mk_MK/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/mk_MK/blockedlog.lang b/htdocs/langs/mk_MK/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/mk_MK/blockedlog.lang
+++ b/htdocs/langs/mk_MK/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/mk_MK/boxes.lang b/htdocs/langs/mk_MK/boxes.lang
index 98e75053287..36416e0f36c 100644
--- a/htdocs/langs/mk_MK/boxes.lang
+++ b/htdocs/langs/mk_MK/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Најнови %s изменети донации
 BoxTitleLastModifiedExpenses=Најнови %s изменети извештаи за трошоци
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Глобална активност (фактури, понуди, нарачки)
 BoxGoodCustomers=Добри клиенти
 BoxTitleGoodCustomers=%s Добри клиенти
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Неуспешно RSS обновување. Последен успешен датум на обновување: %s
 LastRefreshDate=Најнов датум на обновување
 NoRecordedBookmarks=Нема дефинирани обележувачи.
@@ -92,8 +95,8 @@ LastXMonthRolling=The latest %s month rolling
 ChooseBoxToAdd=Додади виџет на контролниот панел
 BoxAdded=Виџетот е додаден на контролниот панел
 BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Сметководство
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/mk_MK/cashdesk.lang b/htdocs/langs/mk_MK/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/mk_MK/cashdesk.lang
+++ b/htdocs/langs/mk_MK/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+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
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/mk_MK/categories.lang b/htdocs/langs/mk_MK/categories.lang
index 84e5796763e..52327db3510 100644
--- a/htdocs/langs/mk_MK/categories.lang
+++ b/htdocs/langs/mk_MK/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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
diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang
index ca5cbff55f1..2d27d1b69a4 100644
--- a/htdocs/langs/mk_MK/companies.lang
+++ b/htdocs/langs/mk_MK/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Вработените
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/mk_MK/compta.lang
+++ b/htdocs/langs/mk_MK/compta.lang
@@ -111,7 +111,7 @@ 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 ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/mk_MK/cron.lang b/htdocs/langs/mk_MK/cron.lang
index a4c2e9ca7de..016dca81e7a 100644
--- a/htdocs/langs/mk_MK/cron.lang
+++ b/htdocs/langs/mk_MK/cron.lang
@@ -6,14 +6,15 @@ 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
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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 environement you can use Scheduled task tools 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
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+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
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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
@@ -76,8 +78,14 @@ 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+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/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 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.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/mk_MK/exports.lang b/htdocs/langs/mk_MK/exports.lang
index 2dcf4317e00..a0eb7161ef2 100644
--- a/htdocs/langs/mk_MK/exports.lang
+++ b/htdocs/langs/mk_MK/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 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.
@@ -131,3 +133,4 @@ 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/mk_MK/mails.lang b/htdocs/langs/mk_MK/mails.lang
index 4d668952b76..3d72192f7ce 100644
--- a/htdocs/langs/mk_MK/mails.lang
+++ b/htdocs/langs/mk_MK/mails.lang
@@ -92,6 +92,7 @@ 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
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 12eb210b51c..5f2722a96ff 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -28,7 +28,9 @@ 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
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Value
 PersonalValue=Personal value
 NewObject=New %s
 NewValue=New value
+OldValue=Old value %s
 CurrentValue=Current value
 Code=Code
 Type=Type
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ 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
@@ -671,7 +678,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Сопственик
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/mk_MK/modulebuilder.lang b/htdocs/langs/mk_MK/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/mk_MK/modulebuilder.lang
+++ b/htdocs/langs/mk_MK/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/mk_MK/mrp.lang b/htdocs/langs/mk_MK/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/mk_MK/mrp.lang
+++ b/htdocs/langs/mk_MK/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang
index 54c0572d453..7a895bb1ca5 100644
--- a/htdocs/langs/mk_MK/other.lang
+++ b/htdocs/langs/mk_MK/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index bf555405861..6deddbe7334 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -108,7 +108,8 @@ 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=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index baf0ecde17f..05aa1f5a560 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -76,15 +76,16 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/mk_MK/recruitment.lang b/htdocs/langs/mk_MK/recruitment.lang
index 85e1d55300b..c8838fc60b3 100644
--- a/htdocs/langs/mk_MK/recruitment.lang
+++ b/htdocs/langs/mk_MK/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/mk_MK/sendings.lang b/htdocs/langs/mk_MK/sendings.lang
index 4f7e1453e7f..e21b52f73f1 100644
--- a/htdocs/langs/mk_MK/sendings.lang
+++ b/htdocs/langs/mk_MK/sendings.lang
@@ -30,6 +30,7 @@ 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
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang
index 1de1066fb67..2b36b21b77a 100644
--- a/htdocs/langs/mk_MK/stocks.lang
+++ b/htdocs/langs/mk_MK/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/mk_MK/ticket.lang b/htdocs/langs/mk_MK/ticket.lang
index 1353f492ef1..8b74414e186 100644
--- a/htdocs/langs/mk_MK/ticket.lang
+++ b/htdocs/langs/mk_MK/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/mk_MK/website.lang b/htdocs/langs/mk_MK/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/mk_MK/website.lang
+++ b/htdocs/langs/mk_MK/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/mk_MK/withdrawals.lang b/htdocs/langs/mk_MK/withdrawals.lang
index 114a8d9dd6c..059b3451c11 100644
--- a/htdocs/langs/mk_MK/withdrawals.lang
+++ b/htdocs/langs/mk_MK/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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/mk_MK/workflow.lang b/htdocs/langs/mk_MK/workflow.lang
index 299be277e1d..494a0424a75 100644
--- a/htdocs/langs/mk_MK/workflow.lang
+++ b/htdocs/langs/mk_MK/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/mn_MN/accountancy.lang b/htdocs/langs/mn_MN/accountancy.lang
index 3211a0b62df..9e084932477 100644
--- a/htdocs/langs/mn_MN/accountancy.lang
+++ b/htdocs/langs/mn_MN/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index f1c41a3b62b..f9a6468d94a 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -56,6 +56,8 @@ 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.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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.
@@ -256,6 +257,7 @@ 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.
@@ -375,7 +377,7 @@ 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:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+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
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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
+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 the language of the third party
+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
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+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
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/mn_MN/banks.lang b/htdocs/langs/mn_MN/banks.lang
index 9500a5b8b2e..81a23238550 100644
--- a/htdocs/langs/mn_MN/banks.lang
+++ b/htdocs/langs/mn_MN/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/mn_MN/blockedlog.lang b/htdocs/langs/mn_MN/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/mn_MN/blockedlog.lang
+++ b/htdocs/langs/mn_MN/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/mn_MN/boxes.lang b/htdocs/langs/mn_MN/boxes.lang
index d6fd298a3a7..9a751483fb1 100644
--- a/htdocs/langs/mn_MN/boxes.lang
+++ b/htdocs/langs/mn_MN/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+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.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/mn_MN/cashdesk.lang b/htdocs/langs/mn_MN/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/mn_MN/cashdesk.lang
+++ b/htdocs/langs/mn_MN/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+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
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/mn_MN/categories.lang b/htdocs/langs/mn_MN/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/mn_MN/categories.lang
+++ b/htdocs/langs/mn_MN/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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
diff --git a/htdocs/langs/mn_MN/companies.lang b/htdocs/langs/mn_MN/companies.lang
index dadff6a7894..8dc815b522e 100644
--- a/htdocs/langs/mn_MN/companies.lang
+++ b/htdocs/langs/mn_MN/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/mn_MN/compta.lang b/htdocs/langs/mn_MN/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/mn_MN/compta.lang
+++ b/htdocs/langs/mn_MN/compta.lang
@@ -111,7 +111,7 @@ 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 ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/mn_MN/cron.lang b/htdocs/langs/mn_MN/cron.lang
index d2da7ded67e..2ebdda1e685 100644
--- a/htdocs/langs/mn_MN/cron.lang
+++ b/htdocs/langs/mn_MN/cron.lang
@@ -6,14 +6,15 @@ 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
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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 environement you can use Scheduled task tools 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
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+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
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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
@@ -76,8 +78,14 @@ 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+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/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/mn_MN/errors.lang
+++ b/htdocs/langs/mn_MN/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 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.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/mn_MN/exports.lang b/htdocs/langs/mn_MN/exports.lang
index 2dcf4317e00..a0eb7161ef2 100644
--- a/htdocs/langs/mn_MN/exports.lang
+++ b/htdocs/langs/mn_MN/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 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.
@@ -131,3 +133,4 @@ 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/mn_MN/mails.lang b/htdocs/langs/mn_MN/mails.lang
index 1235eef3b27..2d02c5ddcf9 100644
--- a/htdocs/langs/mn_MN/mails.lang
+++ b/htdocs/langs/mn_MN/mails.lang
@@ -92,6 +92,7 @@ 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
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang
index e22785650ad..5cf9981a8a0 100644
--- a/htdocs/langs/mn_MN/main.lang
+++ b/htdocs/langs/mn_MN/main.lang
@@ -28,7 +28,9 @@ 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
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Value
 PersonalValue=Personal value
 NewObject=New %s
 NewValue=New value
+OldValue=Old value %s
 CurrentValue=Current value
 Code=Code
 Type=Type
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ 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
@@ -671,7 +678,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/mn_MN/modulebuilder.lang b/htdocs/langs/mn_MN/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/mn_MN/modulebuilder.lang
+++ b/htdocs/langs/mn_MN/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/mn_MN/mrp.lang b/htdocs/langs/mn_MN/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/mn_MN/mrp.lang
+++ b/htdocs/langs/mn_MN/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/mn_MN/other.lang b/htdocs/langs/mn_MN/other.lang
index 54c0572d453..7a895bb1ca5 100644
--- a/htdocs/langs/mn_MN/other.lang
+++ b/htdocs/langs/mn_MN/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/mn_MN/products.lang b/htdocs/langs/mn_MN/products.lang
index 97db059594f..9ecc11ed93d 100644
--- a/htdocs/langs/mn_MN/products.lang
+++ b/htdocs/langs/mn_MN/products.lang
@@ -108,7 +108,8 @@ 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=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/mn_MN/projects.lang b/htdocs/langs/mn_MN/projects.lang
index baf0ecde17f..05aa1f5a560 100644
--- a/htdocs/langs/mn_MN/projects.lang
+++ b/htdocs/langs/mn_MN/projects.lang
@@ -76,15 +76,16 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/mn_MN/recruitment.lang b/htdocs/langs/mn_MN/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/mn_MN/recruitment.lang
+++ b/htdocs/langs/mn_MN/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/mn_MN/sendings.lang b/htdocs/langs/mn_MN/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/mn_MN/sendings.lang
+++ b/htdocs/langs/mn_MN/sendings.lang
@@ -30,6 +30,7 @@ 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
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/mn_MN/stocks.lang b/htdocs/langs/mn_MN/stocks.lang
index 660443bcded..a1f55010139 100644
--- a/htdocs/langs/mn_MN/stocks.lang
+++ b/htdocs/langs/mn_MN/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/mn_MN/ticket.lang b/htdocs/langs/mn_MN/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/mn_MN/ticket.lang
+++ b/htdocs/langs/mn_MN/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/mn_MN/website.lang b/htdocs/langs/mn_MN/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/mn_MN/website.lang
+++ b/htdocs/langs/mn_MN/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/mn_MN/withdrawals.lang b/htdocs/langs/mn_MN/withdrawals.lang
index 114a8d9dd6c..059b3451c11 100644
--- a/htdocs/langs/mn_MN/withdrawals.lang
+++ b/htdocs/langs/mn_MN/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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/mn_MN/workflow.lang b/htdocs/langs/mn_MN/workflow.lang
index 299be277e1d..494a0424a75 100644
--- a/htdocs/langs/mn_MN/workflow.lang
+++ b/htdocs/langs/mn_MN/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index cdf26c85c07..bc97267e787 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=Denne tjenesten
 ThisProduct=Denne varen
 DefaultForService=Standard for tjeneste
 DefaultForProduct=Standard for vare
+ProductForThisThirdparty=Vare for denne tredjeparten
+ServiceForThisThirdparty=Tjeneste for denne tredjeparten
 CantSuggest=Kan ikke foreslå
 AccountancySetupDoneFromAccountancyMenu=Mesteparten av regnskapet settes opp fra menyen %s
 ConfigAccountingExpert=Konfigurasjon av modulen regnskap (dobbel oppføring)
@@ -25,7 +27,7 @@ JournalFinancial=Finasielle journaler
 BackToChartofaccounts=Returner kontotabell
 Chartofaccounts=Diagram over kontoer
 ChartOfSubaccounts=Oversikt over individuelle kontoer
-ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
+ChartOfIndividualAccountsOfSubsidiaryLedger=Diagram over individuelle kontoer til sub-hovedboken
 CurrentDedicatedAccountingAccount=Nåværende dedikert konto
 AssignDedicatedAccountingAccount=Ny konto å tildele
 InvoiceLabel=Fakturaetikett
@@ -46,8 +48,9 @@ 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 and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
-VueByAccountAccounting=View by accounting account
+ExportAccountingSourceDocHelp=Med dette verktøyet kan du eksportere kildehendelsene (liste og PDF-filer) som ble brukt til å generere regnskapet. For å eksportere journalene, bruk menyoppføringen %s - %s.
+VueByAccountAccounting=Vis etter regnskapskonto
+VueBySubAccountAccounting=Vis etter regnskaps-subkonto
 
 MainAccountForCustomersNotDefined=Hoved regnskapskonto for kunder som ikke er definert i oppsettet
 MainAccountForSuppliersNotDefined=Hovedregnskapskonto for leverandører som ikke er definert i oppsettet
@@ -93,8 +96,8 @@ SubledgerAccount=Konto i sub-hovedbok
 SubledgerAccountLabel=Kontoetikett i sub-hovedbok
 ShowAccountingAccount=Vis regnskapskonto
 ShowAccountingJournal=Vis regnskapsjournal
-ShowAccountingAccountInLedger=Show accounting account in ledger
-ShowAccountingAccountInJournals=Show accounting account in journals
+ShowAccountingAccountInLedger=Vis regnskapskonto i hovedbok
+ShowAccountingAccountInJournals=Vis regnskapskonto i journaler
 AccountAccountingSuggest=Foreslått regnskapskonto
 MenuDefaultAccounts=Standard kontoer
 MenuBankAccounts=Bankkonti
@@ -118,7 +121,7 @@ UpdateMvts=Endre en transaksjon
 ValidTransaction=Valider transaksjonen
 WriteBookKeeping=Registrer transaksjoner i regnskap
 Bookkeeping=Hovedbok
-BookkeepingSubAccount=Subledger
+BookkeepingSubAccount=Sub-Hovedbok
 AccountBalance=Kontobalanse
 ObjectsRef=Kildeobjekt ref
 CAHTF=Samlet leverandørkjøp før skatt
@@ -144,7 +147,7 @@ NotVentilatedinAccount=Ikke bundet til regnskapskontoen
 XLineSuccessfullyBinded=%s varer/tjenester bundet til en regnskapskonto
 XLineFailedToBeBinded=%s varer/tjenester ble ikke bundet til en regnskapskonto
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Antall elementer å binde vist pr. side (maksimum anbefalt er 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maksimalt antall linjer på listen og bindingsiden (anbefalt: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begynn sortering av siden "Bindinger å utføre" etter de nyeste først
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begynn sortering av siden "Bindinger utført" etter de nyeste først
 
@@ -156,8 +159,8 @@ ACCOUNTING_MANAGE_ZERO=Tillat å administrere forskjellig antall nuller på slut
 BANK_DISABLE_DIRECT_INPUT=Deaktiver direkteregistrering av transaksjoner på bankkonto
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktiver eksportutkast i journal
 ACCOUNTANCY_COMBO_FOR_AUX=Aktiver kombinasjonsliste for datterkonto (kan være treg hvis du har mange tredjeparter)
-ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
+ACCOUNTING_DATE_START_BINDING=Definer en dato for å starte binding og overføring i regnskap. Etter denne datoen vil ikke transaksjonene bli overført til regnskap.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Velg regnskapsvisning som standard ved overføring av regnskap
 
 ACCOUNTING_SELL_JOURNAL=Salgsjournal
 ACCOUNTING_PURCHASE_JOURNAL=Innkjøpsjournal
@@ -177,7 +180,7 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Regnskapskonto for vent
 DONATION_ACCOUNTINGACCOUNT=Regnskapskonto for registrering av donasjoner
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Regnskapskonto for å registrere abonnementer
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Regnskapskonto som standard for å registrere kundeinnskudd
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Regnskapskonto som standard for de kjøpte varene (brukt hvis ikke definert i produktarket)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Regnskapskonto som standard for kjøpte produkter i EU (brukt hvis ikke definert i produktarket)
@@ -198,7 +201,8 @@ Docdate=Dato
 Docref=Referanse
 LabelAccount=Kontoetikett
 LabelOperation=Etikettoperasjon
-Sens=som betyr
+Sens=Retning
+AccountingDirectionHelp=For en regnskapskonto til en kunde, bruk Kreditt for å registrere en betaling du mottok <br> For en regnskapskonto for en leverandør, bruk Debet for å registrere en betaling du foretar
 LetteringCode=Korrespondansekode
 Lettering=Korrespondanse
 Codejournal=Journal
@@ -206,23 +210,24 @@ JournalLabel=Journaletikett
 NumPiece=Del nummer
 TransactionNumShort=Transaksjonsnummer
 AccountingCategory=Personlige grupper
-GroupByAccountAccounting=Grupper etter regnskapskonto
+GroupByAccountAccounting=Gruppere etter hovedbokskonto
+GroupBySubAccountAccounting=Gruppere etter sub-hovedbokskonto
 AccountingAccountGroupsDesc=Her kan du definere noen grupper regnskapskonti. De vil bli brukt til personlige regnskapsrapporter.
 ByAccounts=Etter kontoer
 ByPredefinedAccountGroups=Etter forhåndsdefinerte grupper
 ByPersonalizedAccountGroups=Etter personlige grupper
 ByYear=Etter år
 NotMatch=Ikke valgt
-DeleteMvt=Delete some operation lines from accounting
+DeleteMvt=Slett noen operasjonslinjer fra regnskapet
 DelMonth=Måned å slette
 DelYear=År som skal slettes
 DelJournal=Journal som skal slettes
-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=Dette vil slette alle operasjonslinjene i regnskapet for året/måneden og/eller for en bestemt journal (minst ett kriterium kreves). Du må bruke funksjonen '%s' for å hente den slettede posten tilbake til hovedboken.
+ConfirmDeleteMvtPartial=Dette vil slette transaksjonen fra regnskapet (alle operasjonslinjer relatert til den samme transaksjonen vil bli slettet)
 FinanceJournal=Finansjournal
 ExpenseReportsJournal=Journal for utgiftsrapporter
 DescFinanceJournal=Finansjournal med alle typer betalinger etter bankkonto
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
+DescJournalOnlyBindedVisible=Dette er en oversikt over poster som er bundet til en regnskapskonto og kan registreres i journaler og hovedbok.
 VATAccountNotDefined=MVA-konto er ikke definert
 ThirdpartyAccountNotDefined=Konto for tredjepart er ikke definert
 ProductAccountNotDefined=Konto for vare er ikke definert
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Betaling ikke knyttet til noen vare/tjeneste
 OpeningBalance=Inngående balanse
 ShowOpeningBalance=Vis åpningsbalanse
 HideOpeningBalance=Skjul åpningsbalansen
-ShowSubtotalByGroup=Vis subtotal etter gruppe
+ShowSubtotalByGroup=Vis subtotal etter nivå
 
 Pcgtype=Kontogruppe
 PcgtypeDesc=Kontogruppe brukes som forhåndsdefinerte 'filter' og 'gruppering' kriterier for noen regnskapsrapporter. For eksempel blir 'INNTEKT' eller 'UTGIFT' brukt som grupper for regnskapsføring av varer for å lage utgifts-/inntektsrapporten.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Liste over utgiftsrapport-linjer bundet (eller ikke) til
 DescVentilExpenseReportMore=Hvis du setter opp regnskapskonto med type utgiftsrapport-linjer, vil programmet være i stand til å gjøre alle bindinger mellom utgiftsrapport-linjer og regnskapskontoer med et klikk på knappen <strong>"%s"</strong>. Hvis du fortsatt har noen linjer som ikke er bundet til en konto, må du foreta en manuell binding fra menyen "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Liste over utgiftsrapport-linjer og tilhørende gebyr-regnskapskonto
 
+Closure=Årsavslutning
 DescClosure=Kontroller antall bevegelser per måned som ikke er validert og regnskapsår som allerede er åpne
 OverviewOfMovementsNotValidated=Trinn 1 / Oversikt over bevegelser som ikke er validert. (Nødvendig for å avslutte et regnskapsår)
+AllMovementsWereRecordedAsValidated=Alle bevegelser ble registrert som validert
+NotAllMovementsCouldBeRecordedAsValidated=Ikke alle bevegelser kunne registreres som validert
 ValidateMovements=Valider bevegelser
 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
-SelectMonthAndValidate=Velg måned og valider bevegelser
 
 ValidateHistory=Bind automatisk
 AutomaticBindingDone=Automatisk binding utført
@@ -293,9 +300,10 @@ Accounted=Regnskapsført i hovedbok
 NotYetAccounted=Ikke regnskapsført i hovedboken enda
 ShowTutorial=Vis veiledning
 NotReconciled=Ikke sammenslått
+WarningRecordWithoutSubledgerAreExcluded=Advarsel, alle operasjoner uten definert sub-hovedbokskonto er filtrert og ekskludert fra denne visningen
 
 ## Admin
-BindingOptions=Binding options
+BindingOptions=Bindingsalternativer
 ApplyMassCategories=Masseinnlegging av kategorier
 AddAccountFromBookKeepingWithNoCategories=Tilgjengelig konto er ennå ikke i en personlig gruppe
 CategoryDeleted=Kategori for regnskapskontoen er blitt slettet
@@ -315,9 +323,9 @@ ErrorAccountingJournalIsAlreadyUse=Denne journalen er allerede i bruk
 AccountingAccountForSalesTaxAreDefinedInto=Merk: Regnskapskonto for MVA er definert i menyen <b>%s</b> - <b>%s </b>
 NumberOfAccountancyEntries=Antall oppføringer
 NumberOfAccountancyMovements=Antall bevegelser
-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=Deaktiver binding og overføring til regnskap ved salg (kundefakturaer blir ikke tatt med i regnskapet)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Deaktiver binding og overføring til regnskap ved kjøp (leverandørfakturaer blir ikke tatt med i regnskapet)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Deaktiver binding og overføring til regnskap på utgiftsrapporter (utgiftsrapporter blir ikke tatt med i regnskapet)
 
 ## Export
 ExportDraftJournal=Eksporter utkastjournal
@@ -337,9 +345,10 @@ Modelcsv_LDCompta10=Eksporter for LD Compta (v10 og høyere)
 Modelcsv_openconcerto=Eksport for OpenConcerto (Test)
 Modelcsv_configurable=Eksport CSV Konfigurerbar
 Modelcsv_FEC=Eksporter FEC
+Modelcsv_FEC2=Eksporter FEC (med datogenerering/dokument omvendt)
 Modelcsv_Sage50_Swiss=Eksport for Sage 50 Switzerland
 Modelcsv_winfic=Eksporter Winfic - eWinfic - WinSis Compta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv3=Eksport for Gestinum (v3)
 Modelcsv_Gestinumv5Export for Gestinum (v5)
 ChartofaccountsId=Kontoplan ID
 
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 9f6a787ed34..a839e55d031 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -37,8 +37,8 @@ UnlockNewSessions=Fjern forbindelseslås
 YourSession=Din økt
 Sessions=Brukers økter
 WebUserGroup=Webserver bruker/gruppe
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
+PermissionsOnFilesInWebRoot=Tillatelser for filer i rotkatalogen på web
+PermissionsOnFile=Tillatelser på fil %s
 NoSessionFound=Din PHP-konfigurasjon ser ut til å ikke tillate oppføring av aktive økter. Mappen som brukes til å lagre økter (<b> %s </b>) kan være beskyttet (for eksempel av operativsystemer eller ved hjelp av PHP-direktivet open_basedir).
 DBStoringCharset=Databasetegnsett for lagring av data
 DBSortingCharset=Databasetegnsett for sortering av data
@@ -56,6 +56,8 @@ GUISetup=Visning
 SetupArea=Oppsett
 UploadNewTemplate=Last opp ny mal(er)
 FormToTestFileUploadForm=Skjema for å teste opplasting (i henhold til oppsett)
+ModuleMustBeEnabled=Modulen/applikasjonen <b> %s </b> må være aktivert
+ModuleIsEnabled=Modulen/applikasjonen <b> %s </b> er aktivert
 IfModuleEnabled=Merk: Ja er bare effektiv hvis modulen <b>%s</b> er aktivert
 RemoveLock=Fjern/endre navn på filen <b>%s</b> hvis den eksisterer, for å tillate bruk av oppdaterings-/installeringsverktøyet.
 RestoreLock=Gjenopprett filen <b>%s</b> med kun leserettigheter, for å deaktivere bruk av oppdateringsverktøyet.
@@ -73,7 +75,7 @@ DisableJavascriptNote=Merk: For test eller feilsøking. For optimalisering for b
 UseSearchToSelectCompanyTooltip=Hvis du har et stort antall tredjeparter (> 100 000), kan du øke hastigheten ved å sette konstant COMPANY_DONOTSEARCH_ANYWHERE til 1 i Oppsett-> Annet. Søket vil da være begrenset til starten av strengen.
 UseSearchToSelectContactTooltip=Hvis du har et stort antall tredjeparter (> 100 000), kan du øke hastigheten ved å sette konstant CONTACT_DONOTSEARCH_ANYWHERE til 1 i Oppsett-> Annet. Søket vil da være begrenset til starten av strengen.
 DelaiedFullListToSelectCompany=Vent med å trykke på en tast før innholdet av tredjepart-kombinasjonslisten er lastet.<br>Dette kan øke ytelsen hvis du har mange tredjeparter
-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=Vent til en tast er trykket før innholdet i kontaktlisten lastes. <br> Dette kan øke ytelsen hvis du har et stort antall kontakter, men det er mindre praktisk.
 NumberOfKeyToSearch=Antall tegn for å starte søk: %s
 NumberOfBytes=Antall bytes
 SearchString=Søkestreng
@@ -82,10 +84,9 @@ AllowToSelectProjectFromOtherCompany=På elementer av en tredjepart, kan du velg
 JavascriptDisabled=JavaScript er deaktivert
 UsePreviewTabs=Bruk faner for forhåndsvisning
 ShowPreview=Forhåndsvisning
-ShowHideDetails=Show-Hide details
+ShowHideDetails=Vis-skjul detaljer
 PreviewNotAvailable=Forhåndsvisning ikke tilgjengelig
 ThemeCurrentlyActive=Gjeldende tema
-CurrentTimeZone=Tidssone for PHP (server)
 MySQLTimeZone=Tidssone MySql (database)
 TZHasNoEffect=Datoer lagres og returneres av databaseserver som innsendt streng. Tidssonen har kun effekt ved bruk av UNIX_TIMESTAMP funksjon (som ikke bør brukes av Dolibarr, slik database TZ ikke skal ha noen effekt, selv om den ble endret etter at data ble lagt inn).
 Space=Mellomrom
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Dette området viser administrasjonsfunksjoner. Bruk menyen
 Purge=Utrenskning
 PurgeAreaDesc=Denne siden lar deg slette alle filer som er generert eller lagret av Dolibarr (midlertidige filer eller alle filer i katalogen <b> %s </b>). Bruk av denne funksjonen er normalt ikke nødvendig. Den leveres som en løsning for brukere hvis Dolibarr er vert for en leverandør som ikke tilbyr tillatelser for å slette filer generert av webserveren.
 PurgeDeleteLogFile=Slett loggfiler, inkludert <b>%s</b> definert for Syslog-modulen (ingen risiko for å miste data)
-PurgeDeleteTemporaryFiles=Slett alle midlertidige filer (ingen risiko for å miste data). Merk: Slettingen gjøres bare hvis temp-katalogen ble opprettet for over 24 timer siden.
-PurgeDeleteTemporaryFilesShort=Slett temporære filer
+PurgeDeleteTemporaryFiles=Slett alle loggfiler og midlertidige filer (ingen risiko for å miste data). Merk: Sletting av midlertidige filer gjøres bare hvis temp-katalogen ble opprettet for mer enn 24 timer siden.
+PurgeDeleteTemporaryFilesShort=Slett loggfiler og midlertidige filer
 PurgeDeleteAllFilesInDocumentsDir=Slett alle filer i katalogen: <b> %s </b>. <br> Dette vil slette alle genererte dokumenter relatert til elementer (tredjeparter, fakturaer etc ...), filer lastet opp i ECM-modulen, database backup dumper og midlertidig filer.
 PurgeRunNow=Start utrenskning
 PurgeNothingToDelete=Ingen mapper eller filer å slette.
@@ -222,7 +223,7 @@ Nouveauté=Nyhet
 AchatTelechargement=Kjøp/Last ned
 GoModuleSetupArea=For å distribuere/installere en ny modul, gå til området for Moduloppsett på <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, den offisielle markedsplassen for eksterne moduler til Dolibarr ERP/CRM 
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
+DoliPartnersDesc=Liste over selskaper som tilbyr spesialutviklede moduler eller funksjoner. <br> Merk: Siden Dolibarr er et program med åpen kildekode, bør <i> alle </i> med erfaring i PHP-programmering kunne utvikle en modul.
 WebSiteDesc=Eksterne nettsteder for flere tilleggs- (ikke-kjerne) moduler ...
 DevelopYourModuleDesc=Noen løsninger for å utvikle din egen modul...
 URL=URL
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Foretrukne Partnere
 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>
 HelpCenterDesc1=Her er noen ressurser for å få hjelp og støtte med Dolibarr.
@@ -292,7 +294,7 @@ MAIN_MAIL_SMTPS_ID=SMTP-ID (hvis sending av server krever godkjenning)
 MAIN_MAIL_SMTPS_PW=SMTP-passord (hvis sending av server krever godkjenning)
 MAIN_MAIL_EMAIL_TLS=Bruk TLS (SSL) kryptering
 MAIN_MAIL_EMAIL_STARTTLS=Bruk TLS (STARTTL) kryptering
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autoriser selvsignerte sertifikater
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Bruk DKIM til å generere epostsignatur
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for bruk med DKIM
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Navn på DKIM-velger
@@ -304,9 +306,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Standard avsender-epost for manuell sending (Bruker-e
 UserEmail=Bruker-epost
 CompanyEmail=Firma epost
 FeatureNotAvailableOnLinux=Funksjonen er ikke tilgjengelig på Unix/Linux. Test sendmail lokalt.
-FixOnTransifex=Fix the translation on the online translation platform of project
+FixOnTransifex=Rett oversettelsen på prosjektets online oversettelsesplattform
 SubmitTranslation=Hvis oversettelsen for dette språket ikke er fullført, eller du finner feil, kan du rette opp dette ved å redigere filer i katalogen <b>langs/%s</b> og sende inn endringen til www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
+SubmitTranslationENUS=Hvis oversettelsen for dette språket ikke er komplett eller du finner feil, kan du rette dette ved å redigere filer i katalogen <b> langs/%s </b> og sende endrede filer til dolibarr.org/forum, eller, hvis du er en utvikler, med en PR på github .com / Dolibarr / dolibarr
 ModuleSetup=Modulinnstillinger
 ModulesSetup=Moduler/Applikasjonsoppsett
 ModuleFamilyBase=System
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Eksempler med gjeldende konfigurasjon
 ListOfDirectories=Liste over OpenDocument-mapper med maler
 ListOfDirectoriesForModelGenODT=Liste over kataloger som inneholder mal-filer med Opendocument format.<br><br>Sett inn hele banen til kataloger her.<br>Legg til et linjeskift mellom hver katalog.<br>For å legge til en katalog av GED modulen, legg til <b>DOL_DATA_ROOT/ECM/dittkatalognavn her</b>. <br><br>Filer i disse katalogene må slutte med <b>.odt</b> eller <b>.ods</b>.
 NumberOfModelFilesFound=Antall ODT/ODS-malfiler som finnes i disse katalogene
-ExampleOfDirectoriesForModelGen=Eksempler på syntaks:<br>c:\\mydir<br>/Home/mydir<br>DOL_DATA_ROOT/ECM/ecmdir
+ExampleOfDirectoriesForModelGen=Eksempler på syntaks: <br> c:\\myapp\\mydocumentdir\\mysubdir <br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>For å lære hvordan du oppretter ODT dokumentmaler, og før du lagrer dem, les wiki-dokumentasjon:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Plassering av fornavn/etternavn
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametre for å sikre nettadresser
 SecurityTokenIsUnique=Bruk en unik securekey parameter for hver webadresse
 EnterRefToBuildUrl=Oppgi referanse for objekt %s
 GetSecuredUrl=Få beregnet URL
-ButtonHideUnauthorized=Skjul knapper for brukere uten administratorrettigheter i stedet for å vise dem som grå
+ButtonHideUnauthorized=Skjul uautoriserte handlingsknapper også for interne brukere (bare gråaktig ellers)
 OldVATRates=Gammel MVA-sats
 NewVATRates=Ny MVA-sats
 PriceBaseTypeToChange=Endre på prisene med base referanseverdi definert på
@@ -435,14 +437,14 @@ ExtrafieldCheckBox=Sjekkbokser
 ExtrafieldCheckBoxFromList=Avkrysningsbokser fra tabell
 ExtrafieldLink=Lenke til et objekt
 ComputedFormula=Beregnet felt
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=Du kan legge inn en formel her ved hjelp av andre egenskaper for objekt eller hvilken som helst PHP-koding for å få en dynamisk beregnet verdi. Du kan bruke alle PHP-kompatible formler, inkludert "?" tilstandsoperatør, og følgende globale objekt: <strong> $db, $conf, $langs, $mysoc, $user, $object </strong>. <br> <strong> ADVARSEL </strong>: Bare noen egenskaper for $-objekt kan være tilgjengelige. Hvis du trenger egenskaper som ikke er lastet, er det bare å hente objektet i formelen som i det andre eksemplet. <br> Ved å bruke et beregnet felt betyr det at du ikke kan skrive inn noen verdi fra grensesnittet. Og, hvis det er en syntaksfeil, kan det hende formelen ikke returnerer noe. <br> <br> Eksempel på formel: <br> $object-> id < 10 ? round($object->id / 2, 2): ($object-> id + 2 * $user-> id) * (int) substr($mysoc-> zip, 1, 2 ) <br> <br> Eksempel på å laste inn objekt <br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br> <br> Et annet eksempel på formel for å tvinge objektets belastning og dets overordnede objekt: <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Overordnet prosjekt ikke funnet'
 Computedpersistent=Lagre beregnede felt
 ComputedpersistentDesc=Beregnede ekstrafelt vil bli lagret i databasen, men verdien blir bare omregnet når objektet til dette feltet endres. Hvis det beregnede feltet avhenger av andre objekter eller globale data, kan denne verdien være feil!
 ExtrafieldParamHelpPassword=Hvis dette feltet er tomt, vil denne verdien bli lagret uten kryptering (feltet må bare skjules med stjerne på skjermen). <br> Angi 'auto' for å bruke standard krypteringsregel for å lagre passordet i databasen (da vil verdiavlesning være bare hash, uten noen måte å hente opprinnelig verdi på)
 ExtrafieldParamHelpselect=Liste over verdier må være linjer med formatet nøkkel,verdi (hvor nøkkelen ikke kan være '0')<br><br>for eksempel:<br>1,verdi1<br>2,verdi2<br>kode3,verdi3<br>...<br><br>For å få listen avhengig av en annen komplementær attributtliste:<br>1,verdi1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>: parent_key<br><br>For å få listen avhengig av en annen liste:<br>1,verdi1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Liste over verdier må være linjer med formatet nøkkel,verdi (hvor nøkkelen ikke kan være '0')<br><br>for eksempel:<br>1,verdi1 <br>2,verdi2<br>3,verdi3<br> ...
 ExtrafieldParamHelpradio=Liste over verdier må være linjer med formatet nøkkel,verdi (hvor nøkkelen ikke kan være '0')<br><br>for eksempel:<br>1,verdi1 <br>2,verdi2<br>3,verdi3<br> ...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=Liste over verdier kommer fra en tabell <br> Syntaks: table_name:label_field:id_field::filter<br> Eksempel: c_typent:libelle:id::filter<br><br> - id_field er nødvendigvis en primær nøkkel<br> Filter kan være en enkel test (f.eks active=1) for å vise bare aktiv verdi <br> Du kan også bruke $ID$ i filteret som er gjeldende id for gjeldende objekt <br> For å bruke en SELECT i filteret, bruk nøkkelordet $SEL$ for å omgå anti-injeksjonsbeskyttelse. <br> Hvis du vil filtrere på ekstrafelt, bruk syntaks ekstra.fieldcode=... (hvor feltkode er koden til extrafield) <br> <br> For å ha listen avhengig av en annen utfyllende attributtliste: <br>c_typent:libelle:id:options_12<i> parent_list_code </i>|parent_column:filter <br><br> For å ha listen avhengig av en annen liste: <br> c_typent:libelle:id:<br>parent_list_code<br>|parent_column:filter\n 
 ExtrafieldParamHelpchkbxlst=Liste over verdier kommer fra en tabell <br> Syntaks: table_name:label_field:id_field::filter <br> Eksempel: c_typent:libelle:id::filter<br><br> filter kan være en enkel test (f.eks. Aktiv=1 ) for å vise bare aktiv verdi<br>Du kan også bruke $ID$ i filter, som er gjeldende ID for nåværende objekt<br>For å utføre en SELECT i filter, bruk $SEL$<br>Hvis du vil filtrere på ekstrafeltbruk bruk syntaks extra.fieldcode=... (der feltkoden er koden til ekstrafelt)<br><br>For å få listen avhengig av en annen komplementær attributtliste:<br>c_typent:libelle:id:options_<i>parent_list_code </i> |parent_column:filter<br><br>For å få listen avhengig av en annen liste:<br>c_typent:libelle:id:<i>parent_list_code</i> |parent_column:filter
 ExtrafieldParamHelplink=Parametere må være ObjectName:Classpath <br> Syntaks: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Hold tomt for en enkel separator <br> Sett dette til 1 for en kollaps-separator (åpnes som standard for ny økt, da beholdes status for hver brukerøkt) <br> Sett dette til 2 for en kollaps-separator (kollapset som standard for ny økt, da holdes status foran hver brukerøkt)
@@ -482,13 +484,13 @@ ModuleCompanyCodeCustomerDigitaria=%s etterfulgt av det avkortede kundenavnet me
 ModuleCompanyCodeSupplierDigitaria=%s etterfulgt av det avkortede leverandørnavnet med antall tegn: %s for leverandørens regnskapskode.
 Use3StepsApproval=Som standard må innkjøpsordrer opprettes og godkjennes av 2 forskjellige brukere (ett trinn/bruker for å opprette og ett trinn/bruker for å godkjenne. Merk at hvis brukeren har både tillatelse til å opprette og godkjenne, vil ett trinn/ bruker vil være nok). Du kan bruke dette alternativet for å innføre et tredje trinn/bruker godkjenning, hvis beløpet er høyere enn en spesifisert verdi (så vil 3 trinn være nødvendig: 1=validering, 2=første godkjenning og 3=andre godkjenning dersom beløpet er høyt nok). <br> Sett denne tom en godkjenning (2 trinn) er nok, sett den til en svært lav verdi (0,1) hvis det alltid kreves en andre godkjenning (3 trinn).
 UseDoubleApproval=Bruk 3-trinns godkjennelse når beløpet (eks. MVA) er høyere enn...
-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=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
+WarningPHPMail=ADVARSEL: Oppsettet for å sende e-post fra applikasjonen bruker standard generisk oppsett. Det er ofte bedre å konfigurere utgående epost for å bruke epostserveren til tjenesteleverandøren i stedet for standardoppsettet av flere grunner:
+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=Hvis metoden 'PHP Mail' virkelig er metoden du vil bruke, kan du fjerne denne advarselen ved å legge til konstanten MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP 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 you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=Hvis domenenavnet i avsenderens epostadresse er beskyttet av en SPF-post (spør deg om domenenavnet registrert), må du legge til følgende IP-er i SPF-posten for DNS for domenet ditt: <strong> %s </strong>.
 ClickToShowDescription=Klikk for å vise beskrivelse
 DependsOn=Denne modulen trenger modulen(ene)
 RequiredBy=Denne modulen er påkrevd av modul(ene)
@@ -554,9 +556,9 @@ Module54Desc=Forvaltning av kontrakter (tjenester eller tilbakevendende abonneme
 Module55Name=Strekkoder
 Module55Desc=Behandling av strekkoder
 Module56Name=Betaling med kredittoverføring
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+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
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
+Module57Desc=Håndtering av ordrer med direktedebet. Den inkluderer generering av SEPA-filer for europeiske land.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integrasjon
 Module60Name=Klistremerker
@@ -662,13 +664,13 @@ Module50200Desc=Gi kunderne en PayPal-betalingssideside (PayPal-konto eller kred
 Module50300Name=Stripe
 Module50300Desc=Tilbyr kunder en Stripe online betalingsside (kreditt/debetkort). Dette kan brukes til å la kundene dine foreta ad-hoc-betalinger eller betalinger knyttet til et bestemt Dolibarr-objekt (faktura, bestilling osv.)
 Module50400Name=Regnskap (dobbeltoppføring)
-Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Regnskapsadministrasjon (dobbeltoppføringer, støtter hovedbok - og sub-hovedbøker). Eksporter hovedboken til flere andre regnskapsprogrammer.
 Module54000Name=PrintIPP
 Module54000Desc=Direkteutskrift (uten å åpne dokumentet)ved hjelp av CUPS IPP inteface (Skriveren må være synlig for serveren, og CUPS må være installert på serveren)
 Module55000Name=Meningsmåling, undersøkelse eller avstemming
 Module55000Desc=Opprett online undersøkelser eller avstemminger (som Doodle, Studs, RDVz etc ...)
 Module59000Name=Marginer
-Module59000Desc=Modul for å administrere marginer
+Module59000Desc=Modul for å følge marginer
 Module60000Name=Provisjoner
 Module60000Desc=Modul for å administrere provisjoner
 Module62000Name=Incotermer
@@ -703,9 +705,9 @@ Permission61=Vis intervensjoner
 Permission62=Opprett/endre intervensjoner
 Permission64=Slett intervensjoner
 Permission67=Eksporter intervensjoner
-Permission68=Send interventions by email
+Permission68=Send intervensjoner på e-post
 Permission69=Valider intervensjoner
-Permission70=Invalidate interventions
+Permission70=Ugyldiggjør intervensjoner
 Permission71=Vis medlemmer
 Permission72=Opprett/endre medlemmer
 Permission74=Slett medlemmer
@@ -728,7 +730,7 @@ Permission95=Les rapporter
 Permission101=Vis forsendelser
 Permission102=Opprett/endre forsendelser
 Permission104=Valider forsendelser
-Permission105=Send sendings by email
+Permission105=Send forsendelser på e-post
 Permission106=Eksporter forsendelser
 Permission109=Slett forsendelser
 Permission111=Vis kontoutdrag
@@ -836,10 +838,10 @@ Permission402=Opprett/endre rabatter
 Permission403=Valider rabatter
 Permission404=Slett rabatter
 Permission430=Bruk Debug Bar
-Permission511=Read payments of salaries (yours and subordinates)
+Permission511=Les lønnsutbetalinger (dine og underordnedes)
 Permission512=Opprett/endre betaling av lønn
 Permission514=Slett utbetalinger av lønn
-Permission517=Read payments of salaries of everybody
+Permission517=Les alles lønnsutbetalinger
 Permission519=Eksporter lønn
 Permission520=Les lån
 Permission522=Opprett/endre lån
@@ -851,19 +853,19 @@ Permission532=Opprett/endre tjenester
 Permission534=Slett tjenester
 Permission536=Administrer skjulte tjenester
 Permission538=Eksporter tjenester
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
-Permission601=Read stickers
-Permission602=Create/modify stickers
-Permission609=Delete stickers
+Permission561=Les betalingsordrer ved kredittoverføring
+Permission562=Opprett/endre betalingsordre ved kredittoverføring
+Permission563=Send/overfør betalingsordre ved kredittoverføring
+Permission564=Registrer debet/avvisning av kredittoverføring
+Permission601=Les klistremerker
+Permission602=Opprett/modifiser klistremerker
+Permission609=Slett klistremerker
 Permission650=Les BOM (Bills of Materials)
 Permission651=Opprett/oppdater BOM
 Permission652=Slett BOM
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission660=Les produksjonsordre (MO)
+Permission661=Opprett/endreproduksjonsordre (MO)
+Permission662=Slett produksjonsordre (MO)
 Permission701=Vis donasjoner
 Permission702=Opprett/endre donasjoner
 Permission703=Slett donasjoner
@@ -873,8 +875,8 @@ Permission773=Slett utgiftsrapport
 Permission774=Les alle utgiftsrapporter (alle brukere)
 Permission775=Godkjenn utgiftsrapport
 Permission776=Betal utgift
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=Les utgiftsrapporter fra alle
+Permission778=Lag/endre utgiftsrapporter for alle
 Permission779=Eksporter utgiftsrapporter
 Permission1001=Vis beholdning
 Permission1002=Opprett/endre lager
@@ -899,9 +901,9 @@ Permission1185=Godkjen innkjøpsordre
 Permission1186=Utfør innkjøpsordre
 Permission1187=Bekreft mottak av innkjøpsordre
 Permission1188=Slett innkjøpsordre
-Permission1189=Check/Uncheck a purchase order reception
+Permission1189=Merk av/fjern merket for mottak av innkjøpsordre
 Permission1190=Godkjenn (andre godkjenning) innkjøpsordre
-Permission1191=Export supplier orders and their attributes
+Permission1191=Eksporter leverandørordre og deres attributter
 Permission1201=Resultat av en eksport
 Permission1202=Opprett/endre eksport
 Permission1231=Les leverandørfakturaer
@@ -915,8 +917,8 @@ Permission1251=Kjør masseimport av eksterne data til database (datalast)
 Permission1321=Eksportere kundefakturaer, attributter og betalinger
 Permission1322=Gjenåpne en betalt regning
 Permission1421=Eksporter salgsordre og attributter
-Permission1521=Read documents
-Permission1522=Delete documents
+Permission1521=Les dokumenter
+Permission1522=Slett dokumenter
 Permission2401=Les handlinger (hendelser eller oppgaver) knyttet til brukerkonto (hvis eier av en hendelse eller bare er tilordnet)
 Permission2402=Opprette/endre handlinger (hendelser eller oppgaver) knyttet til brukerkontoen (hvis eier av hendelsen)
 Permission2403=Slett handlinger (hendelser eller oppgaver) knyttet til brukerkontoen (hvis eier av hendelsen)
@@ -931,7 +933,7 @@ Permission2515=Oppsett av  dokumentmapper
 Permission2801=Bruk FTP-klient i lesemodus (bla gjennom og laste ned)
 Permission2802=Bruk FTP-klient i skrivemodus (slette eller laste opp filer)
 Permission3200=Les arkiverte hendelser og fingeravtrykk
-Permission3301=Generate new modules
+Permission3301=Generer nye moduler
 Permission4001=Se ansatte
 Permission4002=Opprett ansatte
 Permission4003=Slett ansatte
@@ -952,12 +954,12 @@ Permission23002=Opprett/endre planlagt oppgave
 Permission23003=Slett planlagt oppgave
 Permission23004=Utfør planlagt oppgave
 Permission50101=Bruk salgssted (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
+Permission50151=Bruk salgssted (TakePOS)
 Permission50201=Les transaksjoner
 Permission50202=Importer transaksjoner
-Permission50330=Read objects of Zapier
-Permission50331=Create/Update objects of Zapier
-Permission50332=Delete objects of Zapier
+Permission50330=Les Zapier-objekter
+Permission50331=Opprett/oppdater Zapier-objekter
+Permission50332=Slett Zapier-objekter
 Permission50401=Tilknytt varer og fakturaer til regnskapskontoer
 Permission50411=Les operasjoner i hovedbok
 Permission50412=Skriv/rediger operasjoner i hovedbok
@@ -991,11 +993,11 @@ Permission941602=Opprett og endre kvitteringer
 Permission941603=Valider kvitteringer
 Permission941604=Send kvitteringer på e-post
 Permission941605=Eksporter kvitteringer
-Permission941606=Delete receipts
+Permission941606=Slett kvitteringer
 DictionaryCompanyType=Tredjepartstyper
 DictionaryCompanyJuridicalType=Tredjeparts juridiske enheter
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
+DictionaryProspectLevel=Prospekt potensialnivå for selskaper
+DictionaryProspectContactLevel=Prospekt potensialnivå for kontakter
 DictionaryCanton=Stater/provinser
 DictionaryRegion=Region
 DictionaryCountry=Land
@@ -1026,12 +1028,12 @@ DictionaryUnits=Enheter
 DictionaryMeasuringUnits=Måleenheter
 DictionarySocialNetworks=Sosiale nettverk
 DictionaryProspectStatus=Prospektstatus for selskaper
-DictionaryProspectContactStatus=Prospect status for contacts
+DictionaryProspectContactStatus=Prospektstatus for kontakter
 DictionaryHolidayTypes=Typer permisjon
 DictionaryOpportunityStatus=Lead status for prosjekt/lead
 DictionaryExpenseTaxCat=Utgiftsrapport - Transportkategorier
 DictionaryExpenseTaxRange=Utgiftsrapport - Rangert etter transportkategori
-DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryTransportMode=Intracomm rapport - Transportmodus
 TypeOfUnit=Type enhet
 SetupSaved=Innstillinger lagret
 SetupNotSaved=Oppsettet er ikke lagret
@@ -1068,9 +1070,9 @@ LocalTax2IsUsedDescES=Standard RE-sats når du oppretter prospekter, fakturaer,
 LocalTax2IsNotUsedDescES=Som standard er den foreslåtte IRPF er 0. Slutt på regelen.
 LocalTax2IsUsedExampleES=I Spania, for frilansere og selvstendige som leverer tjenester, og bedrifter som har valgt moduler for skattesystem.
 LocalTax2IsNotUsedExampleES=I Spania er de bedrifter som ikke er ikke skattepliktige
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
+RevenueStampDesc="Avgiftsstempelet" eller "inntektsstempelet" er en fast avgift du betaler per faktura (det avhenger ikke av fakturabeløpet). Det kan også være en prosentskatt, men å bruke den andre eller tredje typen skatt er bedre for prosentskatt, ettersom avgiftsstempler ikke gir noen rapportering. Bare få land bruker denne typen avgifter.
 UseRevenueStamp=Bruk et avgiftsstempel
-UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+UseRevenueStampExample=Verdien av avgiftstempelet er definert som standard i oppsettet av ordbøker (%s - %s - %s)
 CalcLocaltax=Rapport over lokale avgifter 
 CalcLocaltax1=Salg - Innkjøp
 CalcLocaltax1Desc=Lokale skatter-rapporter kalkuleres med forskjellen mellom kjøp og salg
@@ -1078,12 +1080,12 @@ CalcLocaltax2=Innkjøp
 CalcLocaltax2Desc=Lokale skatter-rapportene viser totalt kjøp
 CalcLocaltax3=Salg
 CalcLocaltax3Desc=Lokale skatter-rapportene viser totalt salg
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+NoLocalTaxXForThisCountry=I henhold til avgiftsoppsettet (Se %s - %s - %s), trenger ikke landet ditt å bruke en slik type skatt
 LabelUsedByDefault=Etiketten som brukes som standard hvis ingen oversettelse kan bli funnet for kode
 LabelOnDocuments=Etiketten på dokumenter
 LabelOrTranslationKey=Etikett eller oversettelsessnøkkel
 ValueOfConstantKey=Verdien av en konfigurasjonskonstant
-ConstantIsOn=Option %s is on
+ConstantIsOn=Alternativ %s er på
 NbOfDays=Antall dager
 AtEndOfMonth=Ved månedsslutt
 CurrentNext=Nåværende/Neste
@@ -1170,8 +1172,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Utgiftsrapporter for godkjenning
 Delays_MAIN_DELAY_HOLIDAYS=Legg igjen forespørsler for godkjenning
 SetupDescription1=Før du begynner å bruke Dolibarr, må noen innledende parametere defineres og moduler aktiveres/konfigureres.
 SetupDescription2=Følgende to seksjoner er obligatoriske (de to første oppføringene i oppsettmenyen):
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
+SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Grunnleggende parametere som brukes til å tilpasse standardoppførselen til applikasjonen din (for eksempel landrelaterte funksjoner).
+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.
 LogEvents=Hendelser relatert til sikkerhet
 Audit=Revisjon
@@ -1182,7 +1184,7 @@ InfoWebServer=Om Webserver
 InfoDatabase=Om Database
 InfoPHP=Om PHP
 InfoPerf=Om ytelse
-InfoSecurity=About Security
+InfoSecurity=Om sikkerhet
 BrowserName=Navn på nettleser
 BrowserOS=Nettleserens operativsystem
 ListOfSecurityEvents=Oversikt over sikkerhetshendelser i Dolibarr
@@ -1191,7 +1193,7 @@ LogEventDesc=Aktiver logging av bestemte sikkerhetshendelser. Administratorer n
 AreaForAdminOnly=Oppsettparametere kan bare angis av <b> administratorbrukere </b>.
 SystemInfoDesc=Systeminformasjon er diverse teknisk informasjon som kun vises i skrivebeskyttet modus, og som kun er synlig for administratorer.
 SystemAreaForAdminOnly=Dette området er kun tilgjengelig for administratorbrukere. Dolibarr brukerrettigheter kan ikke endre denne begrensningen.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
+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=Parametre som påvirker utseende og oppførsel av Dolibarr kan endres her.
@@ -1199,7 +1201,7 @@ AvailableModules=Tilgjengelige apper/moduler
 ToActivateModule=Gå til innstillinger for å aktivere moduler.
 SessionTimeOut=Tidsgrense for økter
 SessionExplanation=Dette tallet garanterer at økten aldri utløper før denne forsinkelsen, hvis økten kjøres med intern PHP-session cleaner (og ingenting annet). Intern PHP session cleaner garanterer ikke at økten utløper like etter denne forsinkelsen. Det utløper etter denne forsinkelsen, og når session cleaner er ferdig,  hver <b>%s/%s</b> tilgang, men bare under tilgang fra andre økter <br>. Merk: på noen servere med en ekstern session cleaner(cron under debian, ubuntu ...), kan øktene bli ødelagt etter en periode definert av et eksternt oppsett, uansett verdien som er angitt her.
-SessionsPurgedByExternalSystem=Sessions on this server seems to be cleaned by an external mechanism (cron under debian, ubuntu ...), probably every <b>%s</b> seconds (= value of parameter <b>session.gc_maxlifetime</b>), so changing the value here has no effect. You must ask the server administrator to change session delay.
+SessionsPurgedByExternalSystem=Økter på denne serveren ser ut til å bli renset av en ekstern mekanisme (cron under debian, ubuntu ...), sannsynligvis hvert <b>%s</b> sekund (= verdien av parameteren <b> session.gc_maxlifetime </b>. Du må be serveradministratoren om å endre øktforsinkelse.
 TriggersAvailable=Tilgjengelige utløsere
 TriggersDesc=Utløsere (triggers) er filer som vil påvirke Dolibarrs virkemåte og arbeidsflyt når de kopieres inn i mappen <b>htdocs/core/triggers</b>. De aktiverer nye handlinger, aktivert av Dolibarrhendelser (ny tredjepart, opprette faktura ...).
 TriggerDisabledByName=Utløserne i denne filen er slått av med endelsen <b>-NORUN</b> i navnet.
@@ -1233,7 +1235,7 @@ RestoreDesc2=Gjenopprett sikkerhetskopifilen (f.eks. Zip-fil) i mappen "dokument
 RestoreDesc3=Gjenopprett databasestrukturen og dataene fra en sikkerhetskopierings-dumpfil i databasen til den nye Dolibarr-installasjonen eller i databasen til nåværende installasjonen (<b> %s </b>). Advarsel, når gjenopprettingen er fullført, må du bruke et login/passord, som eksisterte fra backup tid/installasjon for å koble til igjen. <br> For å gjenopprette en sikkerhetskopiert database til gjeldende installasjon, kan du følge denne assistenten.
 RestoreMySQL=MySQL import
 ForcedToByAModule=Denne regelen er tvunget til å <b>%s</b> av en aktivert modul
-ValueIsForcedBySystem=This value is forced by the system. You can't change it.
+ValueIsForcedBySystem=Denne verdien bestemmes av systemet. Du kan ikke endre det.
 PreviousDumpFiles=Eksisterende sikkerhetskopier
 PreviousArchiveFiles=Eksisterende arkivfiler
 WeekStartOnDay=Første dag i uken
@@ -1294,8 +1296,8 @@ WarningAtLeastKeyOrTranslationRequired=Et søkekriterie er nødvendig for nøkke
 NewTranslationStringToShow=Ny oversettelsesstreng som skal vises
 OriginalValueWas=Den originale oversettelsen er overskrevet. Original verdi var:<br><br>%s
 TransKeyWithoutOriginalValue=Du tvang en ny oversettelse for oversettelsesnøkkelen '<strong> %s</strong>' som ikke finnes i noen språkfiler
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Aktiverte moduler
+TotalNumberOfActivatedModules=Aktiverte moduler: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Du må minst aktivere en modul
 ClassNotFoundIntoPathWarning=Klasse %s ikke funnet i PHP banen
 YesInSummer=Ja i sommer
@@ -1306,7 +1308,7 @@ YouUseBestDriver=Du bruker driver %s som er den beste driveren som er tilgjengel
 YouDoNotUseBestDriver=Du bruker driveren %s. Driver %s anbefales.
 NbOfObjectIsLowerThanNoPb=Du har bare %s %s i databasen. Dette krever ingen spesiell optimalisering.
 SearchOptim=Forbedre søket
-YouHaveXObjectUseSearchOptim=Du har %s %s i databasen. Du bør legge til konstanten %s til 1 i Hjem-Oppsett-Annet. Begrens søket til begynnelsen av strenger som gjør det mulig for databasen å bruke indekser, og du bør få et øyeblikkelig svar.
+YouHaveXObjectUseSearchOptim=Du har %s %s i databasen. Du kan legge til konstanten %s til 1 i Hjem-Oppsett-Annet. Begrens søket til begynnelsen av strenger, slik at det blir lettere for databasen å bruke indekser, og du  får raskere svar.
 YouHaveXObjectAndSearchOptimOn=Du har %s %s i databasen og konstant %s er satt til 1 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.
@@ -1314,7 +1316,7 @@ 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".
 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 ".
-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".
+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
 FillThisOnlyIfRequired=Eksempel: +2 (brukes kun hvis du opplever problemer med tidssone offset)
@@ -1322,7 +1324,7 @@ GetBarCode=Hent strekkode
 NumberingModules=Nummereringsmodeller
 DocumentModules=Dokumentmodeller
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Returner et passord generert i henhold til intern Dolibarr-algoritme: %s tegn som inneholder både tall og små bokstaver.
 PasswordGenerationNone=Ikke foreslå å generere passord. Passord må legges inn manuelt.
 PasswordGenerationPerso=Returner et passord i følge din personlige konfigurasjon
 SetupPerso=I følge din konfigurasjon
@@ -1332,7 +1334,7 @@ RuleForGeneratedPasswords=Regler for å generere og validere passord
 DisableForgetPasswordLinkOnLogonPage=Ikke vis koblingen "Glemt passord" på innloggingssiden
 UsersSetup=Oppsett av brukermodulen
 UserMailRequired=E-postadresse kreves for å opprette en ny bruker
-UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
+UserHideInactive=Skjul inaktive brukere fra alle kombinasjonslister over brukere (anbefales ikke: dette kan bety at du ikke vil kunne filtrere eller søke på gamle brukere på enkelte sider)
 UsersDocModules=Dokumentmaler for dokumenter generert fra brukerpost
 GroupsDocModules=Dokumentmaler for dokumenter generert fra en gruppeoppføring
 ##### HRM setup #####
@@ -1393,7 +1395,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 sale order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Foreslått betalingsmodus på salgsordre som standard hvis ikke definert i ordren
 OrdersSetup=Salgsordreoppsett
 OrdersNumberingModules=Nummereringsmodul for ordre
 OrdersModelModule=Ordremaler
@@ -1421,7 +1423,7 @@ 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
 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=Document templates for documents generated from member record
+MembersDocModules=Dokumentmaler for dokumenter generert fra medlemsregister
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Globale parametre
@@ -1564,9 +1566,9 @@ LDAPDescValues=Eksempelverdier er designet for <b>OpenLDAP</b> med følgende las
 ForANonAnonymousAccess=For autentisert tilgang (f.eks skrivetilgang)
 PerfDolibarr=Ytelse oppsett/optimaliseringsrapport
 YouMayFindPerfAdviceHere=Denne siden gir noen kontroller eller råd relatert til ytelse.
-NotInstalled=Not installed.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
+NotInstalled=Ikke installert.
+NotSlowedDownByThis=Ikke bremset av dette.
+NotRiskOfLeakWithThis=Ikke fare for lekkasje med dette.
 ApplicativeCache=Applikasjons-cache
 MemcachedNotAvailable=Ingen applikativ cache funnet. Du kan forbedre ytelsen ved å installere en cache-server Memcached og en modul som kan bruke denne cache-serveren. <br> Mer informasjon her <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Merk: Mange webhosting-leverandører har ikke en slik cache-server.
 MemcachedModuleAvailableButNotSetup=Modulen memcache er funnet, men oppsett er ikke komplett
@@ -1596,8 +1598,13 @@ 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=Vis produktbeskrivelser i skjemaer (ellers vist i en verktøytips-popup)
+DoNotAddProductDescAtAddLines=Ikke legg til varebeskrivelse (fra varekort) på send inn tilleggslinjer på skjemaer
+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.
+DoNotUseDescriptionOfProdut=Varebeskrivelse vil aldri bli inkludert i beskrivelsen på dokumentlinjer
 MergePropalProductCard=I "Vedlagte filer"-fanen i "Varer og tjenester" kan du aktivere en opsjon for å flette PDF-varedokument til tilbud PDF-azur hvis varen/tjenesten er i tilbudet
-ViewProductDescInThirdpartyLanguageAbility=Vis produktbeskrivelser på språket til tredjepart
+ViewProductDescInThirdpartyLanguageAbility=Vis varebeskrivelser i skjemaer på tredjeparts språk (ellers på brukerens språk)
 UseSearchToSelectProductTooltip=Hvis du har mange varer (>100 000), kan du øke hastigeten ved å sette konstanten PRODUCT_DONOTSEARCH_ANYWHERE til 1 i Oppsett->Annet. Søket vil da begrenses til starten av søkestrengen
 UseSearchToSelectProduct=Vent til du trykker på en tast før du laster inn innholdet i produkt-kombinationslisten (dette kan øke ytelsen hvis du har et stort antall produkter, men det er mindre praktisk)
 SetDefaultBarcodeTypeProducts=Standard strekkodetype for varer
@@ -1614,7 +1621,7 @@ SyslogLevel=Nivå
 SyslogFilename=Filnavn og bane
 YouCanUseDOL_DATA_ROOT=Du kan bruke DOL_DATA_ROOT / dolibarr.log som loggfil i Dolibarr "dokumenter"-mappen. Du kan angi en annen bane for å lagre denne filen.
 ErrorUnknownSyslogConstant=Konstant %s er ikke en kjent syslog-konstant
-OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
+OnlyWindowsLOG_USER=I Windows støttes bare LOG_USER-funksjonen
 CompressSyslogs=Komprimering og sikkerhetskopiering av feilsøkingsloggfiler (generert av modulen Log for debug)
 SyslogFileNumberOfSaves=Antall sikkerhetskopilogger som skal beholdes
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Konfigurer planlagt jobb for å angi logg backupfrekvens
@@ -1672,7 +1679,7 @@ AdvancedEditor=Avansert editor
 ActivateFCKeditor=Aktiver avansert editor for:
 FCKeditorForCompany=WYSIWIG opprettelse/endring av elementbeskrivelse og notater (untatt varer og tjenester)
 FCKeditorForProduct=WYSIWIG opprettelse/endring av vare-/tjenestebeskrivelse og notater
-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>
+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
 FCKeditorForMail=WYSIWIG opprettelse/redigering for all post (unntatt Verktøy ->eMailing)
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personlige menyer som ikke er lenket til en toppmeny
 NewMenu=Ny meny
 MenuHandler=Menybehandler
 MenuModule=Kildemodul
-HideUnauthorizedMenu= Skjul uautoriserte menyer (grå)
+HideUnauthorizedMenu=Skjul uautoriserte menyer også for interne brukere (bare gråtonet ellers)
 DetailId=Meny-ID
 DetailMenuHandler=Menyhåndterer skulle vise en ny meny
 DetailMenuModule=Modulnavn hvis menyoppføringen kom  fra en modul
@@ -1737,16 +1744,16 @@ AGENDA_USE_EVENT_TYPE=Bruk hendelsestyper (administrert i menyoppsett -> Ordbøk
 AGENDA_USE_EVENT_TYPE_DEFAULT=Angi denne standardverdien automatisk for type hendelse i skjema for hendelsesoppretting
 AGENDA_DEFAULT_FILTER_TYPE=Still inn denne typen hendelse automatisk i søkefilter i agendavisning
 AGENDA_DEFAULT_FILTER_STATUS=Angi denne status automatisk for hendelser i søkefilter i agendavisning
-AGENDA_DEFAULT_VIEW=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=Hvilken visning vil du åpne som standard når du velger menyen Agenda
+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=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 task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL=Aktiver påminnelse om hendelse <b> via epost </b> (påminnelsesalternativ/forsinkelse kan defineres for hver hendelse).
+AGENDA_REMINDER_EMAIL_NOTE=Merk: Frekvensen av oppgaven %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=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=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=Bruk denne metoden hvis brukerne har en softphone eller et programvaregrensesnitt installert på samme datamaskin som nettleseren, og kalles når du klikker på en link i nettleseren din som starter med "tel:". Hvis du trenger en full server-løsning (uten behov for lokal installasjon av programvare), må du sette denne på "Nei" og fylle neste felt.
 ##### Point Of Sale (CashDesk) #####
@@ -1867,7 +1874,7 @@ TopMenuDisableImages=Skjul bilder i toppmeny
 LeftMenuBackgroundColor=Bakgrunnsfarge for venstre meny
 BackgroundTableTitleColor=Bakgrunnsfarge for tittellinje i tabellen
 BackgroundTableTitleTextColor=Tekstfarge for tabellens tittellinje
-BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableTitleTextlinkColor=Tekstfarge for tabellens tittellink
 BackgroundTableLineOddColor=Bakgrunnsfarge for oddetalls-tabellinjer
 BackgroundTableLineEvenColor=Bakgrunnsfarge for partalls-tabellinjer
 MinimumNoticePeriod=Frist for beskjed (Feriesøknaden må sendes inn før denne fristen)
@@ -1876,7 +1883,7 @@ EnterAnyCode=Dette feltet inneholder en referanse til identifikasjon av linje. B
 Enter0or1=Skriv inn 0 eller 1
 UnicodeCurrency=Her legger du inn en liste med Ascii-verdier, som representerer et valutasymbol. For eksempel: $ = [36], Brasilsk real R$ = [82,36], € = [8364]
 ColorFormat=RGB-fargen er i HEX-format, for eksempel: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+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=Salgs-skattesats
 RecuperableOnly=Ja for MVA"Ikke oppfattet, men gjenopprettelig" dedikert til noen steder i Frankrike. Hold verdien til "Nei" i alle andre tilfeller.
@@ -1917,7 +1924,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s er tilgjengelig. Versj
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s er tilgjengelig. Versjon %s er en vedlikeholdsversjon, så den inneholder bare feilrettinger. Vi anbefaler alle brukere å oppgradere til denne versjonen. En vedlikeholdsløsning introduserer ikke nye funksjoner eller endringer i databasen. Du kan laste den ned fra nedlastingsområdet på https://www.dolibarr.org portal (underkatalog Stable versions). Du kan lese <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> for fullstendig liste over endringer.
 MultiPriceRuleDesc=Når alternativet "Flere prisnivået pr. vare/tjeneste" er på, kan du definere forskjellige priser (ett pr prisnivå) for hvert produkt. For å spare tid, kan du lage en regel som gir pris for hvert nivå autokalkulert i forhold til prisen på første nivå, slik at du bare legger inn en pris for hvert produkt. Denne siden er laget for å spare tid og kan være nyttig hvis prisene for hvert nivå står i forhold til første nivå. Du kan ignorere denne siden i de fleste tilfeller.
 ModelModulesProduct=Maler for produkt-dokumenter
-WarehouseModelModules=Templates for documents of warehouses
+WarehouseModelModules=Maler for varehusdokumenter
 ToGenerateCodeDefineAutomaticRuleFirst=For å kunne generere koder automatisk, må du først definere et program for å automatisk definere strekkodenummeret.
 SeeSubstitutionVars=Relaterte gjentakende fakturaer
 SeeChangeLog=Se Endringslogg-fil (kun på engelsk)
@@ -1983,10 +1990,11 @@ EMailHost=Vert for e-post IMAP-server
 MailboxSourceDirectory=Postkasse kildemappe
 MailboxTargetDirectory=Postkasse målmappe
 EmailcollectorOperations=Operasjoner som skal utføres av samler
+EmailcollectorOperationsDesc=Operasjoner utføres i rekkefølge fra topp til bunn
 MaxEmailCollectPerCollect=Maks antall e-postmeldinger pr. innsamling
 CollectNow=Samle nå
 ConfirmCloneEmailCollector=Er du sikker på at du vil klone e-postsamleren %s?
-DateLastCollectResult=Dato for sist forsøk på samling
+DateLastCollectResult=Dato for siste forsøk på samling
 DateLastcollectResultOk=Dato for siste vellykkede samling
 LastResult=Siste resultat
 EmailCollectorConfirmCollectTitle=E-post-samling bekreftelse
@@ -1996,20 +2004,20 @@ 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=Create ticket (and link to third party if it was loaded by a previous operation)
+CreateTicketAndThirdParty=Opprett billett (og lenke til tredjepart hvis den ble lastet inn av en tidligere operasjon)
 CodeLastResult=Siste resultatkode
 NbOfEmailsInInbox=Antall e-poster i kildemappen
 LoadThirdPartyFromName=Legg inn tredjepartsøk på %s (bare innlasting)
 LoadThirdPartyFromNameOrCreate=Legg inn tredjepartsøk på %s (opprett hvis ikke funnet)
 WithDolTrackingID=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=Message sent from Dolibarr
-WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Opprett kandidatur
+WithDolTrackingIDInMsgId=Melding sendt fra Dolibarr
+WithoutDolTrackingIDInMsgId=Melding IKKE sendt fra Dolibarr
+CreateCandidature=Opprett jobbsøknad
 FormatZip=Postnummer
 MainMenuCode=Meny-oppføringskode (hovedmeny)
 ECMAutoTree=Vis ECM-tre automatisk 
-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=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.
 OpeningHours=Åpningstider
 OpeningHoursDesc=Skriv inn de vanlige åpningstidene for bedriften din.
 ResourceSetup=Konfigurasjon av ressursmodulen
@@ -2041,17 +2049,17 @@ 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
-IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
-AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+IfYouAreOnAProductionSetThis=Hvis du er i et produksjonsmiljø, bør du sette denne egenskapen til %s.
+AntivirusEnabledOnUpload=Antivirus aktivert på opplastede filer
 EXPORTS_SHARE_MODELS=Eksportmodellene er delt med alle
 ExportSetup=Oppsett av modul Eksport
 ImportSetup=Oppsett av importmodul
 InstanceUniqueID=Unik ID for forekomsten
 SmallerThan=Mindre enn
 LargerThan=Større enn
-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=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=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
+EmailCollectorTargetDir=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=Du kan bruke denne handlingen til å bruke e-postinnholdet til å finne og laste inn en eksisterende tredjepart i databasen din. Den funnet (eller opprettede) tredjeparten vil bli brukt til å følge handlinger som trenger det. I parameterfeltet kan du bruke for eksempel 'EXTRACT:BODY:Name:\\s([^\\s]*)' hvis du vil trekke ut navnet på tredjeparten fra en streng 'Name: name to find' funnet i teksten.
 EndPointFor=Sluttpunkt for %s: %s
 DeleteEmailCollector=Slett e-postsamler
@@ -2066,20 +2074,24 @@ 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_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_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.
 FafaIconSocialNetworksDesc=Skriv inn koden til et FontAwesome-ikon. Hvis du ikke vet hva som er FontAwesome, kan du bruke den generelle verdien fa-adresseboken.
 FeatureNotAvailableWithReceptionModule=Funksjonen er ikke tilgjengelig når modulen Mottak er aktivert
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
+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
 MeasuringUnitTypeDesc=Bruk en verdi som "størrelse", "overflate", "volum", "vekt", "tid"
 MeasuringScaleDesc=Skalaen er antall steder du må flytte kommaet for å samsvare med standard referansenhet. For enhetstypen "tid" er det antall sekunder. Verdier mellom 80 og 99 er reserverte verdier.
 TemplateAdded=Mal lagt til
 TemplateUpdated=Mal oppdatert
 TemplateDeleted=Mal slettet
-MailToSendEventPush=Event reminder email
-SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+MailToSendEventPush=Epospåminnelse om hendelse
+SwitchThisForABetterSecurity=Det anbefales å bytte denne verdien til %s for mer sikkerhet
 DictionaryProductNature= Varens art
 CountryIfSpecificToOneCountry=Land (hvis spesifikt for et gitt land)
-YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
-ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+YouMayFindSecurityAdviceHere=Du kan finne sikkerhetsrådgivning her
+ModuleActivatedMayExposeInformation=Denne modulen 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
diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang
index 755d782a5e0..6cbce1b00b5 100644
--- a/htdocs/langs/nb_NO/agenda.lang
+++ b/htdocs/langs/nb_NO/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Antall hendelser
 ListOfActions=Oversikt over hendelser
 EventReports=Hendelsesrapporter
 Location=Lokasjon
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Arrangement tildelt en eller flere brukere i gruppen
 EventOnFullDay=Hendelse over hele dagen(e)
 MenuToDoActions=Alle åpne handlinger
 MenuDoneActions=Alle avsluttede handlinger
@@ -86,8 +86,8 @@ ProposalDeleted=Tilbud slettet
 OrderDeleted=Ordre slettet
 InvoiceDeleted=Faktura slettet
 DraftInvoiceDeleted=Fakturautkast slettet
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_DELETEInDolibarr=Contact %s deleted
+CONTACT_CREATEInDolibarr=Kontakt %s opprettet
+CONTACT_DELETEInDolibarr=Kontakt %s slettet
 PRODUCT_CREATEInDolibarr=Vare%s opprettet
 PRODUCT_MODIFYInDolibarr=Vare %s endret
 PRODUCT_DELETEInDolibarr=Vare %s slettet
@@ -152,6 +152,7 @@ ActionType=Hendelsestype
 DateActionBegin=Startdato for hendelse
 ConfirmCloneEvent=Er du sikker på at du vil klone hendelsen <b>%s</b>?
 RepeatEvent=Gjenta hendelse
+OnceOnly=Kun en gang
 EveryWeek=Hver uke
 EveryMonth=Hver måned
 DayOfMonth=Dag i måned
@@ -160,9 +161,9 @@ DateStartPlusOne=Startdato + 1 time
 SetAllEventsToTodo=Sett alle hendelser til ToDo
 SetAllEventsToInProgress=Sett alle begivenheter til Pågår
 SetAllEventsToFinished=Sett alle hendelser til Ferdig
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+ReminderTime=Varslingsperiode før hendelsen
+TimeType=Varighetstype
+ReminderType=Tilbakekallingstype
+AddReminder=Opprett et automatisk varsel for denne hendelsen
+ErrorReminderActionCommCreation=Feil ved oppretting av varselet for denne hendelsen
+BrowserPush=Varsling om nettleser-popup
diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
index 4717bd50c69..3830db8bba9 100644
--- a/htdocs/langs/nb_NO/banks.lang
+++ b/htdocs/langs/nb_NO/banks.lang
@@ -173,10 +173,11 @@ SEPAMandate=SEPA mandat
 YourSEPAMandate=Ditt SEPA-mandat
 FindYourSEPAMandate=Dette er ditt SEPA-mandat for å autorisere vårt firma til å utføre direktedebitering til din bank. Send det i retur signert (skanning av det signerte dokumentet) eller send det via post til
 AutoReportLastAccountStatement=Fyll feltet 'Antall bankoppgaver' automatisk med siste setningsnummer når du avstemmer
-CashControl=POS cash fence
-NewCashFence=Ny cash fence
+CashControl=POS kassekontroll
+NewCashFence=Ny kasseavslutning
 BankColorizeMovement=Fargelegg bevegelser
 BankColorizeMovementDesc=Hvis denne funksjonen er aktivert, kan du velge spesifikk bakgrunnsfarge for debet- eller kredittbevegelser
 BankColorizeMovementName1=Bakgrunnsfarge for debetbevegelse
 BankColorizeMovementName2=Bakgrunnsfarge for kredittbevegelse
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
+IfYouDontReconcileDisableProperty=Hvis du ikke foretar bankavstemninger på noen bankkontoer, deaktiverer du egenskapen"%s" for å fjerne denne advarselen.
+NoBankAccountDefined=Ingen bankkonto definert
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 140ab547c4d..4e1c65ac58f 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -212,10 +212,10 @@ AmountOfBillsByMonthHT=Sum fakturaer pr. mnd (eks. MVA)
 UseSituationInvoices=Tillat delfaktura
 UseSituationInvoicesCreditNote=Tillat delfaktura kreditnota
 Retainedwarranty=Tilbakehold
-AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
+AllowedInvoiceForRetainedWarranty=Garantibeløp kan brukes på følgende typer fakturaer
 RetainedwarrantyDefaultPercent=Tilbakehold standardprosent
-RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
-RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
+RetainedwarrantyOnlyForSituation=Gjør "garantibeløp" tilgjengelig kun for delfakturaer
+RetainedwarrantyOnlyForSituationFinal=På delfakturaer brukes det globale "garantibeløpet" bare på den avsluttende fakturaen
 ToPayOn=Å betale på %s
 toPayOn=å betale på %s
 RetainedWarranty=Tilbakehold
@@ -578,5 +578,5 @@ CustomersInvoicesArea=Kunde-faktureringsområde
 SupplierInvoicesArea=Leverandør faktureringsområde
 FacParentLine=Faktura forelderlinje
 SituationTotalRayToRest=Rest å betale eks. mva
-PDFSituationTitle=Situation n° %d
+PDFSituationTitle=Delfaktura nr. %d
 SituationTotalProgress=Total progresjon%d %%
diff --git a/htdocs/langs/nb_NO/blockedlog.lang b/htdocs/langs/nb_NO/blockedlog.lang
index 1f7280e6ab8..554c86e4f39 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=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=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).
 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
@@ -35,7 +35,7 @@ logDON_DELETE=Donasjon logisk sletting
 logMEMBER_SUBSCRIPTION_CREATE=Medlemskap opprettet
 logMEMBER_SUBSCRIPTION_MODIFY=Medlemsskap endret
 logMEMBER_SUBSCRIPTION_DELETE=Medlemskap logisk sletting
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Loggfør for kassaavslutning
 BlockedLogBillDownload=Kundefaktura nedlasting
 BlockedLogBillPreview=Kundefaktura forhåndsvisning
 BlockedlogInfoDialog=Loggdetaljer
diff --git a/htdocs/langs/nb_NO/boxes.lang b/htdocs/langs/nb_NO/boxes.lang
index 494febc0a2f..7f5f1011b58 100644
--- a/htdocs/langs/nb_NO/boxes.lang
+++ b/htdocs/langs/nb_NO/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Siste %s endrede donasjoner
 BoxTitleLastModifiedExpenses=Siste %s endrede utgiftsrapporter
 BoxTitleLatestModifiedBoms=Siste %s modifiserte BOM-er
 BoxTitleLatestModifiedMos=Siste %s endrede produksjonsordre
+BoxTitleLastOutstandingBillReached=Kunder med maksimalt utestående overskredet
 BoxGlobalActivity=Global aktivitet (fakturaer, tilbud, ordrer)
 BoxGoodCustomers=Gode kunder
 BoxTitleGoodCustomers=%s gode kunder
+BoxScheduledJobs=Planlagte jobber
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Kunne ikke oppdatere RSS-flux. Siste vellykkede oppdateringsdato: %s
 LastRefreshDate=Siste oppdateringsdato
 NoRecordedBookmarks=Ingen bokmerker definert. Trykk <a href="%s">her</a> for å legge til bokmerker.
@@ -83,8 +86,8 @@ BoxTitleLatestModifiedSupplierOrders=Leverandørordre: siste %s endret
 BoxTitleLastModifiedCustomerBills=Kundefakturaer: siste %s endret
 BoxTitleLastModifiedCustomerOrders=Salgsordre: siste %s endret
 BoxTitleLastModifiedPropals=Siste %s endrede tilbud
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Siste %s endrede jobber
+BoxTitleLatestModifiedCandidatures=Siste %s endrede kandidaturer
 ForCustomersInvoices=Kundefakturaer
 ForCustomersOrders=Kundeordrer
 ForProposals=Tilbud
@@ -92,8 +95,8 @@ LastXMonthRolling=De siste %s måneders omsetning
 ChooseBoxToAdd=Legg widget til i kontrollpanelet
 BoxAdded=Widget ble lagt til i kontrollpanelet ditt
 BoxTitleUserBirthdaysOfMonth=Fødselsdager denne måneden (brukere)
-BoxLastManualEntries=Siste manuelle oppføringer i regnskap
-BoxTitleLastManualEntries=%s siste manuelle oppføringer
+BoxLastManualEntries=Siste post i regnskapsføring angitt manuelt eller uten kildedokument
+BoxTitleLastManualEntries=%s siste post skrevet inn manuelt eller uten kildedokument
 NoRecordedManualEntries=Ingen manuelle poster registrert i regnskap
 BoxSuspenseAccount=Tell regnskapsføring med spenningskonto
 BoxTitleSuspenseAccount=Antall ikke tildelte linjer
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Spenningskonto er ikke definert
 BoxLastCustomerShipments=Siste kundeforsendelser
 BoxTitleLastCustomerShipments=Siste %s kundeforsendelser
 NoRecordedShipments=Ingen registrert kundesending
+BoxCustomersOutstandingBillReached=Kunder med utestående grense nådd
 # Pages
 AccountancyHome=Regnskap
+ValidatedProjects=Validerte prosjekter
diff --git a/htdocs/langs/nb_NO/cashdesk.lang b/htdocs/langs/nb_NO/cashdesk.lang
index de0728f2754..3ec944ed126 100644
--- a/htdocs/langs/nb_NO/cashdesk.lang
+++ b/htdocs/langs/nb_NO/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Bunntekst
 AmountAtEndOfPeriod=Beløp ved periodens slutt (dag, måned eller år)
 TheoricalAmount=Teoretisk beløp
 RealAmount=Virkelig beløp
-CashFence=Cash fence
-CashFenceDone=Kontantoppgjør ferdig for perioden
+CashFence=Kasseavslutning
+CashFenceDone=Kasseavslutning utført for perioden
 NbOfInvoices=Ant. fakturaer
 Paymentnumpad=Tastaturtype for å legge inn betaling
 Numberspad=Nummertastatur
@@ -77,7 +77,7 @@ POSModule=POS-modul
 BasicPhoneLayout=Bruk grunnleggende oppsett for telefoner
 SetupOfTerminalNotComplete=Installasjonen av terminal %s er ikke fullført
 DirectPayment=Direktebetaling
-DirectPaymentButton=Add a "Direct cash payment" button
+DirectPaymentButton=Legg til en "Direkte kontantbetaling" -knapp
 InvoiceIsAlreadyValidated=Faktura er allerede validert
 NoLinesToBill=Ingen linjer å fakturere
 CustomReceipt=Tilpasset kvittering
@@ -94,31 +94,33 @@ TakeposConnectorMethodDescription=Ekstern modul med ekstra funksjoner. Mulighet
 PrintMethod=Utskriftsmetode
 ReceiptPrinterMethodDescription=Metode med mange parametere. Full tilpassbar med maler. Kan ikke skrive ut fra skyen.
 ByTerminal=Med terminal
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
-CashDeskRefNumberingModules=Numbering module for POS sales
+TakeposNumpadUsePaymentIcon=Bruk ikon i stedet for tekst på betalingsknappene på nummertastaturet
+CashDeskRefNumberingModules=Nummereringsmodul for POS-salg
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b>-tag brukes til å legge til terminalnummeret
 TakeposGroupSameProduct=Grupper samme produktlinjer
 StartAParallelSale=Start et nytt parallellsalg
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Salget startet %s
+ControlCashOpening=Kassekontroll popup når du åpner POS
+CloseCashFence=Lukk kassekontroll
 CashReport=Kontantrapport
 MainPrinterToUse=Hovedskriver som skal brukes
 OrderPrinterToUse=Odreskriver som skal brukes
 MainTemplateToUse=Hovedmal som skal brukes
 OrderTemplateToUse=Ordremal som skal brukes
 BarRestaurant=Bar Restaurant
-AutoOrder=Order by the customer himself
+AutoOrder=Bestilling av kunden selv
 RestaurantMenu=Meny
 CustomerMenu=Kundemeny
 ScanToMenu=Skann QR-koden for å se menyen
 ScanToOrder=Skann QR-koden for å bestille
-Appearance=Appearance
-HideCategoryImages=Hide Category Images
-HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines 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
+Appearance=Utseende
+HideCategoryImages=Skjul kategoribilder
+HideProductImages=Skjul varebilder
+NumberOfLinesToShow=Antall linjer med bilder som skal vises
+DefineTablePlan=Definer tabellplan
+GiftReceiptButton=Legg til en "Gavekvittering" -knapp
+GiftReceipt=Gavekvittering
+ModuleReceiptPrinterMustBeEnabled=Modulen Kvitteringsskriver må ha blitt aktivert først
+AllowDelayedPayment=Tillat forsinket betaling
+PrintPaymentMethodOnReceipts=Skriv ut betalingsmåte på billetter/kvitteringer
+WeighingScale=Vektskala
diff --git a/htdocs/langs/nb_NO/categories.lang b/htdocs/langs/nb_NO/categories.lang
index b5d42ea3eba..fcce83f42ff 100644
--- a/htdocs/langs/nb_NO/categories.lang
+++ b/htdocs/langs/nb_NO/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Prosjekters merker/kategori-område
 UsersCategoriesArea=Område for brukertagger/-kategorier
 SubCats=Underkategorier
 CatList=Liste over merker/kategorier
+CatListAll=Liste over etiketter/kategorier (alle typer)
 NewCategory=Nytt merke/kategori
 ModifCat=Endre merke/kategori
 CatCreated=Merke/kategori opprettet
@@ -65,24 +66,30 @@ UsersCategoriesShort=Brukere tagger/kategorier
 StockCategoriesShort=Lager etiketter/kategorier
 ThisCategoryHasNoItems=Denne kategorien inneholder ingen artikler.
 CategId=Merke/kategori-ID
-CatSupList=Liste over selgerkoder/-kategorier
-CatCusList=Liste over kunde/prospekt merker/kategorier
+ParentCategory=Overordnet etikett/kategori
+ParentCategoryLabel=Merke for overordnet etikett/kategori
+CatSupList=Liste over leverandøretiketter/kategorier
+CatCusList=Liste over kunders/prospekters etiketter/kategorier
 CatProdList=Liste over vare-merker/kategorier
 CatMemberList=Liste over medlems-merker/kategorier
-CatContactList=Liste over kontakt-merker/kategorier
-CatSupLinks=Lenker mellom leverandører og merker/kategorier
+CatContactList=Liste over kontaktersr etiketter/kategorier
+CatProjectsList=Liste over prosjekters etiketter/kategorier
+CatUsersList=Liste over brukeres etiketter/kategorier
+CatSupLinks=Koblinger mellom leverandører og etiketter/kategorier
 CatCusLinks=Lenker mellom kunder/prospekter og merker/kategorier
 CatContactsLinks=Koblinger mellom kontakter/adresser og koder/kategorier
 CatProdLinks=Lenker mellom varer/tjenester og merker/kategorier
-CatProJectLinks=Lenker mellom prosjekter og merker/kategorier
+CatMembersLinks=Lenker mellom medlemmer og merker/kategorier
+CatProjectsLinks=Lenker mellom prosjekter og merker/kategorier
+CatUsersLinks=Koblinger mellom brukere og etiketter/kategorier
 DeleteFromCat=Fjern fra merker/kategorier
 ExtraFieldsCategories=Komplementære attributter
 CategoriesSetup=Oppsett av merker/kategorier
 CategorieRecursiv=Automatisk lenke til overordnet merke/kategori
 CategorieRecursivHelp=Hvis alternativet er på, når du legger til et produkt i en underkategori, vil produktet også bli lagt til i overordnet kategori.
 AddProductServiceIntoCategory=Legg til følgende vare/tjeneste
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
+AddCustomerIntoCategory=Tilordne kategori til kunde
+AddSupplierIntoCategory=Tilordne kategori til leverandør
 ShowCategory=Vis merke/kategori
 ByDefaultInList=Som standard i liste
 ChooseCategory=Velg kategori
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index 8a54b565605..d3302eb55c9 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-IdNr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=EORI-nummer
 ProfId6AT=-
 ProfId1AU=Prof ID 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof ID 1 (Profesjonelt nummer)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=EORI-nummer
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -148,7 +148,7 @@ ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof ID 1 (Føderalt nummer)
 ProfId4CH=Prof ID 2 (Commercial Record number)
-ProfId5CH=EORI number
+ProfId5CH=EORI-nummer
 ProfId6CH=-
 ProfId1CL=Prof ID 1 (RUT)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof ID 1 (USt.-IdNr)
 ProfId2DE=Prof ID 2 (USt.-Nr)
 ProfId3DE=Prof ID 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=EORI-nummer
 ProfId6DE=-
 ProfId1ES=Prof ID 1 (CIF / NIF)
 ProfId2ES=Prof ID 2 (personnummer)
 ProfId3ES=Prof ID 3 (CNAE)
 ProfId4ES=Prof ID 4 (Collegiate nummer)
-ProfId5ES=EORI number
+ProfId5ES=EORI-nummer
 ProfId6ES=-
 ProfId1FR=Prof ID 1 (SIREN)
 ProfId2FR=Prof ID 2 (SIRET)
 ProfId3FR=Prof ID 3 (NAF, gammel APE)
 ProfId4FR=Prof ID 4 (RCS/RM)
-ProfId5FR=EORI number
+ProfId5FR=EORI-nummer
 ProfId6FR=-
 ProfId1GB=Prof Id 1 (Registreringsnummer)
 ProfId2GB=-
@@ -202,18 +202,18 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=EORI-nummer
 ProfId1LU=Prof. ID 1 (R.C.S Luxembourg)
 ProfId2LU=Prof. ID (Forretningslisens)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=EORI-nummer
 ProfId6LU=-
 ProfId1MA=Prof ID 1 (RC)
 ProfId2MA=Prof ID 2 (patent)
 ProfId3MA=Prof ID 3 (IF)
 ProfId4MA=Prof ID 4 (CNSS)
-ProfId5MA=Id prof. 5 (I.C.E.)
+ProfId5MA=Profesjonell ID 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof ID 1 (RFC).
 ProfId2MX=Prof ID 2 (R.. P. IMSS)
@@ -225,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=EORI number
+ProfId5NL=EORI-nummer
 ProfId6NL=-
 ProfId1PT=Prof ID 1 (NIPC)
 ProfId2PT=Prof ID 2 (Personnummer)
 ProfId3PT=Prof ID 3 (Commercial Record number)
 ProfId4PT=Prof ID 4 (Conservatory)
-ProfId5PT=EORI number
+ProfId5PT=EORI-nummer
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +255,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=EORI-nummer
 ProfId6RO=-
 ProfId1RU=Prof ID 1 (OGRN)
 ProfId2RU=Prof ID 2 (INN)
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Sjekk internasjonal MVA-ID på EU-kommisjonens nettste
 VATIntraManualCheck=Du kan også sjekke manuelt på den Europeiske kommisjonens nettside <a href="%s" target="_blank"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Sjekk er ikke tilgjengelig. Tjenesten er ikke tilgjengelig for landet (%s).
 NorProspectNorCustomer=Ikke prospekt, eller kunde
-JuridicalStatus=Juridisk enhetstype
+JuridicalStatus=Forretningsenhetstype
 Workforce=Arbeidsstyrke
 Staff=Ansatte
 ProspectLevelShort=Potensiell
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index 41a36d6b33f..81f72a4f4d7 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -111,7 +111,7 @@ Refund=Refusjon
 SocialContributionsPayments=Skatter- og avgiftsbetalinger
 ShowVatPayment=Vis MVA betaling
 TotalToPay=Sum å betale
-BalanceVisibilityDependsOnSortAndFilters=Balanse er synlig i denne listen bare hvis tabellen er sortert stigende etter %s og filtrert for en bankkonto
+BalanceVisibilityDependsOnSortAndFilters=Balanse er bare synlig i denne listen hvis tabellen er sortert på %s og filtrert på 1 bankkonto (uten andre filtre)
 CustomerAccountancyCode=Kunde-regnskapskode
 SupplierAccountancyCode=Leverandørens regnskapskode
 CustomerAccountancyCodeShort=Kundens regnskapskode
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Er du sikker på at du vil slette denne skatten/
 ExportDataset_tax_1=Skatte- og avgiftsbetalinger
 CalcModeVATDebt=Modus <b>%sMVA ved commitment regnskap%s</b>.
 CalcModeVATEngagement=Modus <b>%sMVA på inntekt-utgifter%s</b>.
-CalcModeDebt=Analyse av kjente registrerte fakturaer selv om de ennå ikke er regnskapsført i hovedbok.
+CalcModeDebt=Analyse av kjente dokumenter, selv om de ennå ikke er regnskapsført i hovedbok.
 CalcModeEngagement=Analyse av kjente registrerte innbetalinger, selv om de ennå ikke er regnskapsført i Lhovedbokenedger.
 CalcModeBookkeeping=Analyse av data journalisert i hovedbokens tabell 
 CalcModeLT1= Modus <b>%sRE på kundefakturaer - leverandørfakturaer%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Inn/ut balanse. Årlig oppsummering
 AnnualByCompanies=Inntekts - og utgiftsbalanse, etter forhåndsdefinerte grupper av kontoer
 AnnualByCompaniesDueDebtMode=Balanse over inntekt og utgifter, detalj av forhåndsdefinerte grupper, modus<b>%sKredit-Debet%s</b> viser<b>Forpliktelsesregnskap </b>.
 AnnualByCompaniesInputOutputMode=Inntekts- og utgiftsbalanse, detalj ved forhåndsdefinerte grupper, modus <b> %sInntekter-Utgifter%s</b> viser<b>kontantregnskap</b>.
-SeeReportInInputOutputMode=Se %sanalyse av betalinger%s for en beregning av faktiske utbetalinger gjort selv om de ennå ikke er regnskapsført i hovedboken.
-SeeReportInDueDebtMode=Se %sanalyse av fakturaer%s for en beregning basert på kjente registrerte fakturaer, selv om de ennå ikke er regnskapsført i hovedboken.
-SeeReportInBookkeepingMode=Se <b> %sRegnskapsrapport%s </b> for en beregning på <b> Hovedbokstabell </b>
+SeeReportInInputOutputMode=Se <b> %sanalyse av betalinger%s </b> for en beregning basert på <b> registrerte betalinger </b> gjort selv om de ennå ikke er bokført i hovedbok
+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
diff --git a/htdocs/langs/nb_NO/cron.lang b/htdocs/langs/nb_NO/cron.lang
index 22d6c9ff273..74ea3057151 100644
--- a/htdocs/langs/nb_NO/cron.lang
+++ b/htdocs/langs/nb_NO/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Opprett/endre planlagt jobb
 Permission23103 = Slett planlagt jobb
 Permission23104 = Utfør planlagt jobb
 # Admin
-CronSetup= Administrasjon av planlagte oppgaver
-URLToLaunchCronJobs=URL for å sjekke og kjøre kvalifiserte cron-jobber
-OrToLaunchASpecificJob=eller for å sjekke og kjøre en spesifikk jobb
+CronSetup=Administrasjon av planlagte oppgaver
+URLToLaunchCronJobs=URL for å sjekke og starte kvalifiserte cron-jobber fra en nettleser
+OrToLaunchASpecificJob=Eller for å sjekke og starte en bestemt jobb fra en nettleser
 KeyForCronAccess=Sikkerhetsnøkkel for URL for å starte cronjobber
 FileToLaunchCronJobs=Kommandolinje for å sjekke og starte kvalifiserte cron-jobber
 CronExplainHowToRunUnix=I Unix-miljøer bør du bruke følgende crontab-oppføring for å kjøre kommandolinje hvert 5. minutt
-CronExplainHowToRunWin=I Microsoft(tm) Windows-miljø kan du bruke planlagte oppgaver-verktøyet for å kjøre kommandolinje hvert 5. minutt
+CronExplainHowToRunWin=I Microsoft Windows-miljø kan du bruke Planlagt oppgaveverktøy til å kjøre kommandolinjen hvert 5. minutt
 CronMethodDoesNotExists=Klasse %s inneholder ingen metode %s
+CronMethodNotAllowed=Metode %s av klasse %s er i svartelisten over forbudte metoder
 CronJobDefDesc=Cronjobbprofiler er definert i modulbeskrivelsesfilen. Når modulen er aktivert, er de lastet og tilgjengelig slik at du kan administrere jobbene fra administrasjonsmenyen %s.
 CronJobProfiles=Liste over forhåndsdefinerte cronjobbprofiler
 # Menu
@@ -42,10 +43,11 @@ CronModule=Modul
 CronNoJobs=Ingen registrerte jobber
 CronPriority=Prioritet
 CronLabel=Etikett
-CronNbRun=Antall starter
-CronMaxRun=Max number launch
+CronNbRun=Antall kjøringer
+CronMaxRun=Maksimum antall kjøringer
 CronEach=Alle
 JobFinished=Jobb startet og fullført
+Scheduled=Planlagt
 #Page card
 CronAdd= Legg til jobber
 CronEvery=Kjør jobb hver
@@ -56,16 +58,16 @@ CronNote=Kommentar
 CronFieldMandatory=Feltene %s er obligatoriske
 CronErrEndDateStartDt=Sluttdato kan ikke være før startdato
 StatusAtInstall=Status for modulinstallasjon
-CronStatusActiveBtn=Aktiver
+CronStatusActiveBtn=Tidsplan
 CronStatusInactiveBtn=Deaktiver
 CronTaskInactive=Denne jobben er deaktivert
 CronId=ID
 CronClassFile=Filnavn med klasse
-CronModuleHelp=Navn på Dolibarr-modulkatalogen (virker også med ekstern Dolibarr-modul). <BR> For eksempel å anrope hente-metoden for Dolibarr Product objektet/htdocs/<u>product</u>/class/product.class.php, er verdien for modulen<br><i> produkt </i>
-CronClassFileHelp=Den relative banen og filnavnet som skal lastes (banen er i forhold til webserverens rotkatalog). <BR> For eksempel å anrope hente-metoden for Dolibarr Product objekt htdocs/product/class/<u> product.class.php</u>, er verdien for klassefilnavnet<br><i> produkt/class/product.class.php</i>
-CronObjectHelp=Objektnavnet som skal lastes inn. <BR> For eksempel å anrope hente-metoden for Dolibarr Produkt-objektet /htdocs/product/class/product.class.php, er verdien for klassefilnavnet <br> <i> Product </i>
-CronMethodHelp=Objektmetoden som skal kjøres. <BR> For eksempel å anrope hente-metoden for Dolibarr Product objektet /htdocs/product/class/product.class.php, er verdien for metoden <br> <i> hent </i>
-CronArgsHelp=Metodeargumenter. <BR> For eksempel å anrope hente-metoden for Dolibarr Product objektet /htdocs/product/class/product.class.php, kan verdien for parametre være <br><i> 0, ProductRef </i>
+CronModuleHelp=Navn på Dolibarr-modulkatalog (også arbeid med ekstern Dolibarr-modul). <BR> For eksempel å kalle hentmetoden for Dolibarr Produkt objektet /htdocs/<u>product</u>/class/product.class.php, er verdien for modulen <br><i> produkt </i>
+CronClassFileHelp=Den relative banen og filnavnet som skal lastes (banen er i forhold til webserverens rotkatalog). <BR> For eksempel for å kalle hentmetoden for Dolibarr Produkt-objekt htdocs/product/class/ <u> product.class.php </u>, er verdien for klassen filnavn <br><i> produkt/klasse/product.class.php</i>
+CronObjectHelp=Objektnavnet som skal lastes inn. <BR> For eksempel for å kalle hentmetoden for Dolibarr Product-objektet /htdocs/product/class/product.class.php, er verdien for klassefilenavnet <br> <i> Produkt </i>
+CronMethodHelp=Objektmetoden å kjøre. <BR> For eksempel å kalle hentmetoden for Dolibarr Product-objektet /htdocs/product/class/product.class.php, er verdien for metoden <br> <i> hent </i>
+CronArgsHelp=Metoden argumenter. <BR> For eksempel for å kalle hentemetoden for Dolibarr Product-objektet /htdocs/product/class/product.class.php, kan verdien for paramters være<br> <i> 0, ProductRef </i>
 CronCommandHelp=System kommandolinje som skal kjøres
 CronCreateJob=Opprett ny planlagt jobb
 CronFrom=Fra
@@ -76,8 +78,14 @@ CronType_method=Anropsmetode for en PHP-klasse
 CronType_command=Shell kommando
 CronCannotLoadClass=Kan ikke laste klassefil %s (for å bruke klasse %s)
 CronCannotLoadObject=Klassefil %s ble lastet, men objektet %s ble ikke funnet i den
-UseMenuModuleToolsToAddCronJobs=Gå til menyen "Hjem - Administrative verktøy - Planlagte jobber" for å se og endre planlagte jobber
+UseMenuModuleToolsToAddCronJobs=Gå til menyen " <a href="%s">Hjem - Administratorverktøy - Planlagte jobber</a>" for å se og redigere planlagte jobber.
 JobDisabled=Jobb deaktivert
 MakeLocalDatabaseDumpShort=Backup av lokal database
-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
+MakeLocalDatabaseDump=Opprett en lokal database dump. Parametrene er: komprimering ('gz' eller 'bz' eller 'ingen'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' eller filnavn for å bygge, antall backupfiler som skal beholdes
 WarningCronDelayed=NB, for ytelsesformål, uansett neste utførelsesdato for aktiverte jobber, kan jobbene dine forsinkes til maksimalt %s timer før de kjøres.
+DATAPOLICYJob=Datarenser og anonymiserer
+JobXMustBeEnabled=Jobb %s må være aktivert
+# Cron Boxes
+LastExecutedScheduledJob=Sist utførte planlagte jobb
+NextScheduledJobExecute=Neste planlagte jobb som skal utføres
+NumberScheduledJobError=Antall planlagte jobber med feil
diff --git a/htdocs/langs/nb_NO/deliveries.lang b/htdocs/langs/nb_NO/deliveries.lang
index a6d522cecfc..97f8ad9cdac 100644
--- a/htdocs/langs/nb_NO/deliveries.lang
+++ b/htdocs/langs/nb_NO/deliveries.lang
@@ -2,7 +2,7 @@
 Delivery=Levering
 DeliveryRef=Leveranse ref.
 DeliveryCard=Kvitteringskort
-DeliveryOrder=Delivery receipt
+DeliveryOrder=Leveringsbekreftelse
 DeliveryDate=Leveringsdato
 CreateDeliveryOrder=Generer leveringskvittering
 DeliveryStateSaved=Leveringsstatus lagret
@@ -27,5 +27,6 @@ Recipient=Mottaker
 ErrorStockIsNotEnough=Ikke nok på lager
 Shippable=Kan sendes
 NonShippable=Kan ikke sendes
+ShowShippableStatus=Vis status sendingsklar
 ShowReceiving=Vis leveringskvittering
 NonExistentOrder=Ikkeeksisterende ordre
diff --git a/htdocs/langs/nb_NO/ecm.lang b/htdocs/langs/nb_NO/ecm.lang
index 90e2fb21512..4e037c091f6 100644
--- a/htdocs/langs/nb_NO/ecm.lang
+++ b/htdocs/langs/nb_NO/ecm.lang
@@ -23,7 +23,7 @@ ECMSearchByKeywords=Søk på nøkkelord
 ECMSearchByEntity=Søk på objekt
 ECMSectionOfDocuments=Mapper med dokumenter
 ECMTypeAuto=Automatisk
-ECMDocsBy=Documents linked to %s
+ECMDocsBy=Dokumenter knyttet til %s
 ECMNoDirectoryYet=Ingen mapper opprettet
 ShowECMSection=Vis mappe
 DeleteSection=Fjern mappe
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 38fa5f550a7..798e6598202 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -8,6 +8,7 @@ ErrorBadEMail=E-post %s er feil
 ErrorBadMXDomain=E-post %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.
 ErrorRecordNotFound=Posten ble ikke funnet.
@@ -49,6 +50,7 @@ ErrorFieldsRequired=Noen påkrevde felt er ikke fylt ut.
 ErrorSubjectIsRequired=Epost-emnet er påkrevd
 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
 ErrorFeatureNeedJavascript=Denne funksjonen krever javascript for å virke. Endre dette i Oppsett - Visning.
 ErrorTopMenuMustHaveAParentWithId0=En meny av typen 'Topp' kan ikke ha noen foreldremeny. Skriv 0 i foreldremeny eller velg menytypen 'Venstre'.
 ErrorLeftMenuMustHaveAParentId=En meny av typen 'Venstre' må ha foreldre-ID.
@@ -76,7 +78,7 @@ ErrorExportDuplicateProfil=Profilnavnet til dette eksport-oppsettet finnes aller
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP oppsett er ikke komplett.
 ErrorLDAPMakeManualTest=En .ldif fil er opprettet i mappen %s. Prøv å lese den manuelt for å se mer informasjon om feil.
 ErrorCantSaveADoneUserWithZeroPercentage=Kan ikke lagre en handling med "status ikke startet" hvis feltet "ferdig innen" også er fylt ut.
-ErrorRefAlreadyExists=Ref bruket til oppretting finnes allerede.
+ErrorRefAlreadyExists=Referanse <b> %s </b> eksisterer allerede.
 ErrorPleaseTypeBankTransactionReportName=Vennligst skriv inn kontoutskriftsnavnet der oppføringen skal rapporteres (Format YYYYMM eller YYYYMMDD)
 ErrorRecordHasChildren=Kunne ikke slette posten fordi den har noen under-oppføringer.
 ErrorRecordHasAtLeastOneChildOfType=Objektet har minst under-objekt av typen %s
@@ -246,6 +248,14 @@ ErrorProductDoesNotNeedBatchNumber=Feil, vare'<b> %s </b>' godtar ikke lot/serie
 ErrorFailedToReadObject=Feil, kunne ikke lese objektet av typen <b> %s </b>
 ErrorParameterMustBeEnabledToAllwoThisFeature=Feil, parameter <b> %s </b> må være aktivert i <b> conf/conf.php <b> for å tillate bruk av kommandolinjegrensesnitt av den interne jobbplanleggeren
 ErrorLoginDateValidity=Feil, denne påloggingen er utenfor gyldig datoområde
+ErrorValueLength=Lengden på feltet '<b> %s </b>' må være høyere enn '<b> %s </b>'
+ErrorReservedKeyword=Ordet '<b> %s </b>' er et reservert nøkkelord
+ErrorNotAvailableWithThisDistribution=Ikke tilgjengelig i denne distribusjonen
+ErrorPublicInterfaceNotEnabled=Offentlig grensesnitt var ikke aktivert
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Språket til den nye siden må defineres hvis den er angitt som oversettelse av en annen side
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Språket på den nye siden må ikke være kildespråket hvis det er angitt som oversettelse av en annen side
+ErrorAParameterIsRequiredForThisOperation=En parameter er obligatorisk for denne operasjonen
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP-parameteren upload_max_filesize (%s) er høyere enn PHP-parameteren post_max_size (%s). Dette er ikke et konsistent oppsett.
 WarningPasswordSetWithNoAccount=Et passord ble satt for dette medlemmet, men ingen brukerkonto ble opprettet. Det fører til at passordet ikke kan benyttes for å logge inn på Dolibarr. Det kan brukes av en ekstern modul/grensesnitt, men hvis du ikke trenger å definere noen innlogging eller passord for et medlem, kan du deaktivere alternativet "opprett en pålogging for hvert medlem" fra medlemsmodul-oppsettet. Hvis du trenger å administrere en pålogging, men ikke trenger noe passord, kan du holde dette feltet tomt for å unngå denne advarselen. Merk: E-post kan også brukes som en pålogging dersom medlemmet er knyttet til en bruker.
@@ -276,3 +286,4 @@ WarningSomeBankTransactionByChequeWereRemovedAfter=Noen banktransaksjoner ble fj
 WarningFailedToAddFileIntoDatabaseIndex=Advarsel, kunne ikke legge til filoppføring i ECM-databasens indekstabell
 WarningTheHiddenOptionIsOn=Advarsel, det skjulte alternativet <b> %s </b> er på.
 WarningCreateSubAccounts=Advarsel, du kan ikke opprette en underkonto direkte, du må opprette en tredjepart eller en bruker og tildele dem en regnskapskode for å finne dem i denne listen
+WarningAvailableOnlyForHTTPSServers=Bare tilgjengelig hvis du bruker HTTPS-sikret tilkobling.
diff --git a/htdocs/langs/nb_NO/exports.lang b/htdocs/langs/nb_NO/exports.lang
index 3bf7bff58ef..e4e5740d9ee 100644
--- a/htdocs/langs/nb_NO/exports.lang
+++ b/htdocs/langs/nb_NO/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Felt tittel
 NowClickToGenerateToBuildExportFile=Velg filformatet i kombinasjonsboksen og klikk på "Generer" for å bygge eksportfilen ...
 AvailableFormats=Tilgjengelige formater
 LibraryShort=Bibliotek
+ExportCsvSeparator=Csv-karakterseparator
+ImportCsvSeparator=Csv-karakterseparator
 Step=Trinn
 FormatedImport=Importassistent
 FormatedImportDesc1=Denne modulen lar deg oppdatere eksisterende data eller legge til nye objekter i databasen fra en fil, ved hjelp av en assistent.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Nøkkel (kolonne) som skal brukes til <b> oppdatering av </b
 NbInsert=Antall innsatte linjer: %s
 NbUpdate=Antall oppdaterte linjer: %s
 MultipleRecordFoundWithTheseFilters=Flere poster er blitt funnet med disse filtrene: %s
+StocksWithBatch=Beholdning og plassering (varehus) av produkter med lot/serienummer
diff --git a/htdocs/langs/nb_NO/intracommreport.lang b/htdocs/langs/nb_NO/intracommreport.lang
index 09e18b987c2..83bcc175538 100644
--- a/htdocs/langs/nb_NO/intracommreport.lang
+++ b/htdocs/langs/nb_NO/intracommreport.lang
@@ -4,12 +4,12 @@ IntracommReportSetup = Oppsett av iIntracommrapport
 IntracommReportAbout = Om intracommreport
 
 # Setup
-INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_NUM_AGREMENT=Godkjenningsnummer (utstedt av vedleggets CISD)
 INTRACOMMREPORT_TYPE_ACTEUR=Aktørtype
 INTRACOMMREPORT_ROLE_ACTEUR=Aktørrolle
-INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
-INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
-INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Forpliktelsesnivå ved introduksjoner
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Forpliktelsesnivå på forsendelser
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Servicekategori av typen "Porto"
 
 INTRACOMMREPORT_NUM_DECLARATION=Deklarantnummer
 
@@ -31,7 +31,7 @@ IntracommReportTitle=Klargjøring av en XML-fil i ProDouane-format
 
 # List
 IntracommReportList=Liste over genererte deklarasjoner
-IntracommReportNumber=Numero of declaration
+IntracommReportNumber=Antall erklæringer
 IntracommReportPeriod=Analyseperiode
 IntracommReportTypeDeclaration=Type deklarasjon
 IntracommReportDownload=last ned XML-fil
diff --git a/htdocs/langs/nb_NO/languages.lang b/htdocs/langs/nb_NO/languages.lang
index 96839b3311b..9abffa71b5b 100644
--- a/htdocs/langs/nb_NO/languages.lang
+++ b/htdocs/langs/nb_NO/languages.lang
@@ -40,7 +40,7 @@ Language_es_PA=Spansk (Panama)
 Language_es_PY=Spansk (Paraguay)
 Language_es_PE=Spansk (Peru)
 Language_es_PR=Spansk (Puerto Rico)
-Language_es_US=Spanish (USA)
+Language_es_US=Spansk (USA)
 Language_es_UY=Spansk (Uruguay)
 Language_es_GT=Spansk (Guatemala)
 Language_es_VE=Spansk (Venezuela)
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index 5d1b285f2bb..9251f3d2386 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=E-postmeldinger innlagt av bruker
 MailingModuleDescDolibarrUsers=Brukere med e-post
 MailingModuleDescThirdPartiesByCategories=Tredjeparter (etter kategorier)
 SendingFromWebInterfaceIsNotAllowed=Det er ikke tillatt å sende fra webgrensesnitt.
+EmailCollectorFilterDesc=Alle filtre må samsvare for at en e-post skal hentes inn
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Antall linjer i filen: %s
@@ -129,8 +130,8 @@ NotificationsAuto=Påminnelser Auto.
 NoNotificationsWillBeSent=Ingen automatiske e-postvarsler er planlagt for denne hendelsestypen og selskap
 ANotificationsWillBeSent=Én automatisk varsling vil bli sendt via e-post
 SomeNotificationsWillBeSent=%s automatiske varsler vil bli sendt via e-post
-AddNewNotification=Aktiver et nytt automatisk mål/hendelse for e-postvarsling
-ListOfActiveNotifications=Liste over alle aktive mål/hendelser for automatisk e-postvarsling
+AddNewNotification=Abonner på et nytt automatisk e-postvarsel (mål/hendelse)
+ListOfActiveNotifications=Liste opp alle aktive abonnementer (mål/hendelser) for automatisk e-postvarsling
 ListOfNotificationsDone=Liste over alle automatiske e-postvarsler som er sendt
 MailSendSetupIs=E-postutsendelser er  blitt satt opp til '%s'. Denne modusen kan ikke brukes ved masseutsendelser
 MailSendSetupIs2=Logg på som administrator, gå til menyen %sHjem - Oppsett - E-post%s for å endre parameter <strong>'%s'</strong> for å bruke '%s' modus. I denne modusen for du tilgang til oppsett av SMTP-server og muligheten til å bruke masseutsendelser.
@@ -141,7 +142,7 @@ UseFormatFileEmailToTarget=Importert fil må følge formatet <strong>epost;navn;
 UseFormatInputEmailToTarget=Tast inn en streng med format <strong>epost;navn;fornavn;annet</strong>
 MailAdvTargetRecipients=Mottakere (avansert utvalg)
 AdvTgtTitle=Fyll inn felt for å forhåndsvelge tredjeparter eller kontakter/adresser som skal velges
-AdvTgtSearchTextHelp=Bruk %% som jokertegn. For eksempel for å finne alle element som <b> jan, jon, jimmy </b>, kan du skrive inn <b> j%% </b>. Du kan også bruke; som separator for verdi, og bruk ! for unntatt denne verdien. For eksempel vil <b> jan; jon; jim%%;! Jimo;! Jima% </b> målrette alle jan, jon, starter med jim men ikke jimo og ikke alt som starter med jima
+AdvTgtSearchTextHelp=Bruk %% som jokertegn. For eksempel for å finne alt som <b> jean, joe, jim </b>, kan du legge inn <b> j%% </b>, du kan også bruke ; som skilletegn for verdi, og bruk ! for å ekskludere denne verdien. For eksempel <b> jean; joe; jim%%;!Jimo;!Jima%% </b> vil målrette mot alle jean, joe, starter med jim, men ikke jimo og ikke alt som starter med jima
 AdvTgtSearchIntHelp=Bruk intervall for å velge heltall eller desimaltall
 AdvTgtMinVal=Minimumsverdi
 AdvTgtMaxVal=Maksimumsverdi
@@ -174,3 +175,5 @@ Answered=Besvarte
 IsNotAnAnswer=Er ikke svar (første e-post)
 IsAnAnswer=Er et svar på en første e-post
 RecordCreatedByEmailCollector=Post opprettet av Email Collector %s fra e-post %s
+DefaultBlacklistMailingStatus=Standard kontaktstatus for avslag på masse-e-post
+DefaultStatusEmptyMandatory=Tom, men obligatorisk
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 8def7e71e28..15410c383e2 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Ingen mal tilgjengelig for denne e-posttypen
 AvailableVariables=Tilgjengelige erstatningsverdier
 NoTranslation=Ingen oversettelse
 Translation=Oversettelse
+CurrentTimeZone=Tidssone for PHP (server)
 EmptySearchString=Angi ikke-tomme søkekriterier
+EnterADateCriteria=Skriv inn datokriterier
 NoRecordFound=Ingen post funnet
 NoRecordDeleted=Ingen poster slettet
 NotEnoughDataYet=Ikke nok data
@@ -85,6 +87,8 @@ 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
+HomePage=Hjemmeside
 RecordSaved=Posten er lagret
 RecordDeleted=Oppføring slettet
 RecordGenerated=Post generert
@@ -197,7 +201,7 @@ ReOpen=Gjenåpne
 Upload=Last opp
 ToLink=Lenke
 Select=Velg
-SelectAll=Select all
+SelectAll=Velg alt
 Choose=Velg
 Resize=Endre størrelse
 ResizeOrCrop=Endre størrelse eller beskjær
@@ -220,6 +224,7 @@ Value=Verdi
 PersonalValue=Personlig verdi
 NewObject=Ny %s
 NewValue=Ny verdi
+OldValue=Gammel verdi %s
 CurrentValue=Gjeldende verdi
 Code=Kode
 Type=Type
@@ -258,7 +263,7 @@ Cards=Kort
 Card=Kort
 Now=Nå
 HourStart=Start time
-Deadline=Deadline
+Deadline=Frist
 Date=Dato
 DateAndHour=Dato og tid
 DateToday=Dagens dato
@@ -267,10 +272,10 @@ DateStart=Startdato
 DateEnd=Sluttdato
 DateCreation=Opprettet den
 DateCreationShort=Oppr. dato
-IPCreation=Creation IP
+IPCreation=Opprettelses-IP
 DateModification=Endret den
 DateModificationShort=Mod. dato
-IPModification=Modification IP
+IPModification=Modifikasjons-IP
 DateLastModification=Siste endringsdato
 DateValidation=Validert den
 DateClosing=Lukket den
@@ -433,6 +438,7 @@ RemainToPay=Gjenstår å betale
 Module=Modul/Applikasjon
 Modules=Moduler/Applikasjoner
 Option=Opsjon
+Filters=Filtre
 List=Liste
 FullList=Full liste
 FullConversation=Full samtale
@@ -650,6 +656,7 @@ SupplierPreview=Leverandør forhåndsvisning
 ShowCustomerPreview=Vis kundeforhåndsvisning
 ShowSupplierPreview=Vis leverandør forhåndsvisning
 RefCustomer=Kundereferanse
+InternalRef=Intern ref.
 Currency=Valuta
 InfoAdmin=Informasjon for administratorer
 Undo=Angre
@@ -671,7 +678,7 @@ SendMail=Send e-post
 Email=E-post
 NoEMail=Ingen e-post
 AlreadyRead=Allerede lest
-NotRead=Ikke lest
+NotRead=Ulest
 NoMobilePhone=Ingen mobiltelefon
 Owner=Eier
 FollowingConstantsWillBeSubstituted=Følgende konstanter vil bli erstattet med korresponderende verdi.
@@ -1106,4 +1113,10 @@ SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Sikkerhetstoken har ut
 UpToDate=Oppdatert
 OutOfDate=Utdatert
 EventReminder=Påminnelse om hendelse
-UpdateForAllLines=Update for all lines
+UpdateForAllLines=Oppdatering for alle linjer
+OnHold=Venter
+Civility=Tiltale
+AffectTag=Påvirk merke
+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
diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
index 8cebd358f8a..38f06382279 100644
--- a/htdocs/langs/nb_NO/members.lang
+++ b/htdocs/langs/nb_NO/members.lang
@@ -80,7 +80,7 @@ DeleteType=Slett
 VoteAllowed=Stemming tillatt
 Physical=Fysisk
 Moral=Moralsk
-MorAndPhy=Moral and Physical
+MorAndPhy=Moralsk og fysisk
 Reenable=Reaktiverer
 ResiliateMember=Terminer et medlem
 ConfirmResiliateMember=Er du sikker på at du vil terminere dette medlemmet?
@@ -177,7 +177,7 @@ MenuMembersStats=Statistikk
 LastMemberDate=Siste medlemsdato
 LatestSubscriptionDate=Siste abonnementsdato
 MemberNature=Medlemskapets art
-MembersNature=Nature of members
+MembersNature=Medlemmenes art
 Public=Informasjon er offentlig
 NewMemberbyWeb=Nytt medlem lagt til. Venter på godkjenning
 NewMemberForm=Skjema for nytt medlem 
diff --git a/htdocs/langs/nb_NO/modulebuilder.lang b/htdocs/langs/nb_NO/modulebuilder.lang
index d68c5733f57..24ffaf2f737 100644
--- a/htdocs/langs/nb_NO/modulebuilder.lang
+++ b/htdocs/langs/nb_NO/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP-side for å lage/redigere/vise en post
 PageForAgendaTab=PHP-side for hendelsesfanen
 PageForDocumentTab=PHP-side for dokumentfan
 PageForNoteTab=PHP-side for notatfane
+PageForContactTab=PHP-side for kontaktfanen
 PathToModulePackage=Sti til zip-fil av modul/applikasjonspakke
 PathToModuleDocumentation=Sti til fil med modul/applikasjonsdokumentasjon (%s)
 SpaceOrSpecialCharAreNotAllowed=Mellomrom eller spesialtegn er ikke tillatt.
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Hvis du har kunnskap i SQL og PHP, kan du prøve å bru
 SeeTopRightMenu=Se <span class="fa fa-bug"></span> i øverste høyre meny
 AddLanguageFile=Legg til språkfil
 YouCanUseTranslationKey=Her kan du bruke en nøkkel som er oversettelsesnøkkelen funnet i språkfilen (se kategorien "Språk")
-DropTableIfEmpty=(Slett tabell hvis tom)
+DropTableIfEmpty=(Fjern tabellen hvis den er tom)
 TableDoesNotExists=Tabellen %s finnes ikke
 TableDropped=Tabell %s slettet
 InitStructureFromExistingTable=Bygg struktur-matrisestrengen fra en eksisterende tabell
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Bruk en bestemt editor-URL
 UseSpecificFamily = Bruk en bestemt familie
 UseSpecificAuthor = Bruk en bestemt forfatter
 UseSpecificVersion = Bruk en bestemt innledende versjon
-ModuleMustBeEnabled=Modulen/applikasjonen må først aktiveres
 IncludeRefGeneration=Referansen til objektet må genereres automatisk
 IncludeRefGenerationHelp=Merk av for dette hvis du vil inkludere kode for å administrere genereringen av referansen automatisk
 IncludeDocGeneration=Jeg vil generere noen dokumenter fra objektet
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type felt: <br> varchar (99), dobbel (24,8), ekte, tekst, html,
 AsciiToHtmlConverter=Ascii til HTML konverter
 AsciiToPdfConverter=Ascii til PDF konverter
 TableNotEmptyDropCanceled=Tabellen er ikke tom. Drop har blitt kansellert.
+ModuleBuilderNotAllowed=Modulbyggeren er tilgjengelig, men ikke tillatt for brukeren din.
diff --git a/htdocs/langs/nb_NO/mrp.lang b/htdocs/langs/nb_NO/mrp.lang
index b3a5a2c1cd2..befe91b18d4 100644
--- a/htdocs/langs/nb_NO/mrp.lang
+++ b/htdocs/langs/nb_NO/mrp.lang
@@ -77,4 +77,28 @@ UnitCost=Enhetskostnad
 TotalCost=Totalkostnad
 BOMTotalCost=Kostnaden for å produsere denne stykklisten basert på kostnadene for hver mengde og vare som skal konsumeres (bruk kostpris hvis definert, ellers gjennomsnittlig vektet pris hvis definert, ellers den beste kjøpesummen)
 GoOnTabProductionToProduceFirst=Du må først ha startet produksjonen for å lukke en produksjonsordre (se fanen '%s'). Men du kan kansellere den.
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Et sett kan ikke brukes i en BOM eller en MO
+Workstation=Arbeidsstasjon
+Workstations=Arbeidsstasjoner
+WorkstationsDescription=Håndtering av arbeidsstasjoner
+WorkstationSetup = Oppsett av arbeidsstasjoner
+WorkstationSetupPage = Oppsettside for arbeidsstasjoner
+WorkstationAbout = Om arbeidsstasjon
+WorkstationAboutPage = Side om arbeidsstasjoner 
+WorkstationList=Arbeidsstasjonsliste
+WorkstationCreate=Legg til ny arbeidsstasjon
+ConfirmEnableWorkstation=Er du sikker på at du vil aktivere arbeidsstasjonen <b> %s </b>?
+EnableAWorkstation=Aktiver en arbeidsstasjon
+ConfirmDisableWorkstation=Er du sikker på at du vil deaktivere arbeidsstasjonen <b> %s </b>?
+DisableAWorkstation=Deaktiver en arbeidsstasjon
+DeleteWorkstation=Slett
+NbOperatorsRequired=Antall operatører som kreves
+THMOperatorEstimated=Anslått operatør THM
+THMMachineEstimated=Anslått maskin THM
+WorkstationType=Arbeidsstasjonstype
+Human=Menneskelig
+Machine=Maskin
+HumanMachine=Menneske/maskin
+WorkstationArea=Arbeidsstasjonsområde
+Machines=Maskiner
+THMEstimatedHelp=Denne verdien gjør det mulig å definere en prognosekostnad for varen
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index 975342e63b0..5f24b072d78 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Utgiftsrapport validert(godkjenning kreves)
 Notify_EXPENSE_REPORT_APPROVE=Utgiftsrapport godkjent
 Notify_HOLIDAY_VALIDATE=Permisjonsforespørselen er validert (godkjenning kreves)
 Notify_HOLIDAY_APPROVE=Permisjonsforespørsel godkjent
+Notify_ACTION_CREATE=Lagt til handling i Agenda
 SeeModuleSetup=Se oppsett av modul %s
 NbOfAttachedFiles=Antall vedlagte filer/dokumenter
 TotalSizeOfAttachedFiles=Total størrelse på vedlagte filer/dokumenter
@@ -215,6 +216,7 @@ EMailTextExpenseReportValidated=Utgiftsrapport %s er validert.
 EMailTextExpenseReportApproved=Utgiftsrapport %s er godkjent.
 EMailTextHolidayValidated=Permisjonsforespørsel %s er validert.
 EMailTextHolidayApproved=Permisjonsforespørsel %s er godkjent.
+EMailTextActionAdded=Handlingen %s er lagt til i agendaen.
 ImportedWithSet=Datasett for import
 DolibarrNotification=Automatisk varsling
 ResizeDesc=Skriv inn ny bredde <b>eller</b> ny høyde. BxH forhold vil bli beholdt .
@@ -259,6 +261,7 @@ ContactCreatedByEmailCollector=Kontakt/adresse opprettet av e-post samler fra e-
 ProjectCreatedByEmailCollector=Prosjekt opprettet av e-post samler fra e-post MSGID %s
 TicketCreatedByEmailCollector=Supportseddel opprettet av e-post samler fra e-post MSGID %s
 OpeningHoursFormatDesc=Bruk en bindestrek for å skille åpning og stengetid. <br> Bruk et mellomrom for å angi forskjellige områder. <br> Eksempel: 8-12 14-18
+PrefixSession=Prefiks for økt-ID
 
 ##### Export #####
 ExportsArea=Eksportområde
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index f4a0610c847..de0d515bf59 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -104,11 +104,12 @@ SetDefaultBarcodeType=Angi strekkodetype
 BarcodeValue=Strekkodeverdi
 NoteNotVisibleOnBill=Notat (vises ikke på fakturaer, tilbud...)
 ServiceLimitedDuration=Hvis varen er en tjeneste med begrenset varighet:
-FillWithLastServiceDates=Fill with last service line dates
+FillWithLastServiceDates=Fyll ut med siste tjenestelinjedatoer
 MultiPricesAbility=Flere prissegmenter for hver vare/tjeneste (hver kunde er i et segment)
 MultiPricesNumPrices=Pris antall
 DefaultPriceType=Basis av priser per standard (med versus uten avgift) når nye salgspriser legges til
-AssociatedProductsAbility=Aktiver sett (virtuelle varer)
+AssociatedProductsAbility=Aktiver sett (sett bestående av flere varer)
+VariantsAbility=Aktiver Varianter (varianter av produkter, for eksempel farge, størrelse)
 AssociatedProducts=Sett
 AssociatedProductsNumber=Antall produkter som består av dette settet
 ParentProductsNumber=Antall foreldre-komponentvarer
@@ -167,8 +168,10 @@ BuyingPrices=Innkjøpspris
 CustomerPrices=Kundepriser
 SuppliersPrices=Leverandørpriser
 SuppliersPricesOfProductsOrServices=Leverandørpriser (av varer eller tjenester)
-CustomCode=Toll / vare / HS-kode
+CustomCode=Toll | Råvare | HS-kode
 CountryOrigin=Opprinnelsesland
+RegionStateOrigin=Region opprinnelse
+StateOrigin=Stat | Provins opprinnelse
 Nature=Produktets art (materiale/ferdig)
 NatureOfProductShort=Varens art
 NatureOfProductDesc=Råvare eller ferdig vare
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Bruk den faste prisen
 PriceByQuantity=Prisen varierer med mengde
 DisablePriceByQty=Deaktiver mengderabatt
 PriceByQuantityRange=Kvantumssatser
-MultipriceRules=Prissegment-regler
+MultipriceRules=Automatiske priser for segment
 UseMultipriceRules=Bruk prissegmentregler (definert i varemoduloppsett) for å automatisk beregne priser på alle andre segmenter i henhold til første segment
 PercentVariationOver=%% variasjon over %s
 PercentDiscountOver=%% rabatt på %s
@@ -287,7 +290,7 @@ PriceExpressionEditorHelp5=Tilgjengelige globale verdier:
 PriceMode=Prismodus
 PriceNumeric=Nummer
 DefaultPrice=Standardpris
-DefaultPriceLog=Log of previous default prices
+DefaultPriceLog=Logg over tidligere standardpriser
 ComposedProductIncDecStock=Øk/minsk beholdning ved overordnet endring
 ComposedProduct=Sub-varer
 MinSupplierPrice=Laveste innkjøpspris
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 962ec3ea1b5..d0c4f24d93e 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -85,6 +85,7 @@ ProgressCalculated=Progresjon på forbruk
 WhichIamLinkedTo=som jeg er knyttet til
 WhichIamLinkedToProject=som jeg er knyttet til prosjektet
 Time=Tid
+TimeConsumed=Forbrukt
 ListOfTasks=Oppgaveliste
 GoToListOfTimeConsumed=Gå til liste for tidsbruk
 GanttView=Gantt visning
@@ -213,7 +214,7 @@ ProjectOppAmountOfProjectsByMonth=Beløp i leads pr. måned
 ProjectWeightedOppAmountOfProjectsByMonth=Vektet beløp i leads pr. måned
 ProjectOpenedProjectByOppStatus=Åpne prosjekt|potensielle kunder etter status
 ProjectsStatistics=Statistikk over prosjekter eller potensielle kunder
-TasksStatistics=Statistics on tasks of projects or leads
+TasksStatistics=Statistikk over oppgaver til prosjekter eller potensielle kunder
 TaskAssignedToEnterTime=Oppgave tildelt. Tidsbruk kan legges til
 IdTaskTime=Oppgave-tid ID
 YouCanCompleteRef=Hvis du vil fullføre referansen med en suffiks, anbefales det å legge til et tegn for å skille det, slik at den automatiske nummereringen fortsatt fungerer riktig for neste prosjekt. For eksempel %s-MYSUFFIX
diff --git a/htdocs/langs/nb_NO/recruitment.lang b/htdocs/langs/nb_NO/recruitment.lang
index 4171ab7a120..a74389d13ff 100644
--- a/htdocs/langs/nb_NO/recruitment.lang
+++ b/htdocs/langs/nb_NO/recruitment.lang
@@ -47,29 +47,30 @@ ResponsibleOfRecruitement=Ansvarlig for rekruttering
 IfJobIsLocatedAtAPartner=Hvis jobben ligger på et partnersted
 PositionToBeFilled=Stilling
 PositionsToBeFilled=Stillinger
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+ListOfPositionsToBeFilled=Liste over stillinger
+NewPositionToBeFilled=Nye stillinger
 
-JobOfferToBeFilled=Job position to be filled
+JobOfferToBeFilled=Jobbstilling som skal besettes
 ThisIsInformationOnJobPosition=Informasjon om stillingen som skal besettes
 ContactForRecruitment=Kontakt for rekruttering
 EmailRecruiter=E-postrekruttering
 ToUseAGenericEmail=For å bruke en generisk e-post. Hvis ikke definert, vil e-posten til rekrutteringsansvarlig bli brukt
-NewCandidature=New application
-ListOfCandidatures=List of applications
+NewCandidature=Ny applikasjon
+ListOfCandidatures=Liste over applikasjoner
 RequestedRemuneration=Ønsket godtgjørelse
 ProposedRemuneration=Tilbudt godtgjørelse
 ContractProposed=Kontraktforslag
 ContractSigned=Kontrakt signert
-ContractRefused=Contract refused
-RecruitmentCandidature=Application
+ContractRefused=Kontrakten avvist
+RecruitmentCandidature=Applikasjon
 JobPositions=Stillinger
-RecruitmentCandidatures=Applications
+RecruitmentCandidatures=Applikasjoner
 InterviewToDo=Intervju som skal gjennomføres
-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)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+AnswerCandidature=Søknadssvar
+YourCandidature=Din søknad
+YourCandidatureAnswerMessage=Takk for søknaden. <br> ...
+JobClosedTextCandidateFound=Stillingen er stengt. Stillingen er besatt.
+JobClosedTextCanceled=Stillingen er stengt.
+ExtrafieldsJobPosition=Utfyllende attributter (stillinger)
+ExtrafieldsCandidatures=Utfyllende attributter (jobbsøknader)
+MakeOffer=Gi et tilbud
diff --git a/htdocs/langs/nb_NO/sendings.lang b/htdocs/langs/nb_NO/sendings.lang
index 714838ddeac..166b31d739a 100644
--- a/htdocs/langs/nb_NO/sendings.lang
+++ b/htdocs/langs/nb_NO/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Andre leveringer på denne ordren
 SendingsAndReceivingForSameOrder=Forsendelser og kvitteringer for denne ordren
 SendingsToValidate=Leveringer til validering
 StatusSendingCanceled=Kansellert
+StatusSendingCanceledShort=Kansellert
 StatusSendingDraft=Kladd
 StatusSendingValidated=Validert (klar til levering eller allerede levert)
 StatusSendingProcessed=Behandlet
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Du må validere ordren før du kan utføre fors
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Mer fullstendig dokumentmodell for leveringskvitteringer (logo. ..)
+DocumentModelStorm=Mer komplett dokumentmodell for leveringskvitteringer og ekstrafeltkompatibilitet (logo ...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstant EXPEDITION_ADDON_NUMBER ikke definert
 SumOfProductVolumes=Sum varevolum
 SumOfProductWeights=Sum varevekt
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index 58d833ada6c..11a434e3082 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -17,10 +17,10 @@ CancelSending=Avbryt levering
 DeleteSending=Slett levering
 Stock=Lagerbeholdning
 Stocks=Lagerbeholdning
-MissingStocks=Missing stocks
-StockAtDate=Stocks at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+MissingStocks=Manglende varer
+StockAtDate=Varebeholdning på dato
+StockAtDateInPast=Tidligere dato
+StockAtDateInFuture=Senere dato
 StocksByLotSerial=Lager etter LOT/serienummer
 LotSerial=Lot/serienummer
 LotSerialList=Liste over lot/serienummer
@@ -34,7 +34,7 @@ StockMovementForId=Bevegelse ID %d
 ListMouvementStockProject=Liste over varebevegelser tilknyttet prosjekt
 StocksArea=Område for lager
 AllWarehouses=Alle lager
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
+IncludeEmptyDesiredStock=Inkluder også negativ beholdning med udefinert ønsket beholdning
 IncludeAlsoDraftOrders=Inkluder også ordrekladd
 Location=Lokasjon
 LocationSummary=Kort navn på lokasjon
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Lagerverdi
 UserWarehouseAutoCreate=Opprett et brukerlager automatisk når du oppretter en bruker
 AllowAddLimitStockByWarehouse=Administrer verdi for minimum og ønsket lager per sammenkobling (varelager) i tillegg til verdien for minimum og ønsket lager pr. vare
 RuleForWarehouse=Regel for lagre
+WarehouseAskWarehouseDuringPropal=Sett et varehus på tilbud
 WarehouseAskWarehouseDuringOrder=Sett et lager på salgsordrer
 UserDefaultWarehouse=Sett et lager på brukere
 MainDefaultWarehouse=Standard lager
@@ -95,16 +96,16 @@ RealStock=Virkelig beholdning
 RealStockDesc=Fysisk/reelt lager er beholdningen du for øyeblikket har i dine interne lagre.
 RealStockWillAutomaticallyWhen=Virkelig beholdning vil bli endret i henhold til denne regelen (som definert i Lager-modulen):
 VirtualStock=Virtuell beholdning
-VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+VirtualStockAtDate=Virtuell beholdning på dato
+VirtualStockAtDateDesc=Virtuell beholdning når alle planlagte ordrer før datoen, er fullført
+VirtualStockDesc=Virtuell lagerbeholdning er den beregnede beholdningen som er tilgjengelig når alle åpne/ventende handlinger (som påvirker varer) er lukket (mottatte innkjøpsordrer, leverte salgsordrer, utførte produksjonsordrer osv.)
 IdWarehouse=Lager-ID
 DescWareHouse=Beskrivelse av lager
 LieuWareHouse=Lagerlokasjon
 WarehousesAndProducts=Lager og varer
 WarehousesAndProductsBatchDetail=Lager og varer (med detaljer pr. lot/serienummer)
 AverageUnitPricePMPShort=Vektet gjennomsnittspris
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=Gjennomsnittlig enhetspris betalt til leverandører for å få varen på lager.
 SellPriceMin=Utsalgspris
 EstimatedStockValueSellShort=Verdi å selge
 EstimatedStockValueSell=Verdi å selge
@@ -122,9 +123,9 @@ DesiredStockDesc=Denne lagerbeholdningen vil være den verdien som brukes til å
 StockToBuy=For bestilling
 Replenishment=Påfylling av varer
 ReplenishmentOrders=Påfyllingsordre
-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=I henhold til økning/reduksjon av varer, kan fysisk vare og virtuell vare (fysisk vare + åpne ordrer) variere
+UseRealStockByDefault=Bruk reell varebeholdning i stedet for virtuell, for påfyllingsfunksjon
+ReplenishmentCalculation=Beløpet på ordren vil være (ønsket mengde - reelt lager) i stedet for (ønsket antall - virtuelt lager)
 UseVirtualStock=Bruk teoretisk lagerbeholdning
 UsePhysicalStock=Bruk fysisk varebeholdning
 CurentSelectionMode=Gjeldende valgmodus
@@ -133,7 +134,7 @@ CurentlyUsingPhysicalStock=Fysisk varebeholdning
 RuleForStockReplenishment=Regler for lågerpåfylling
 SelectProductWithNotNullQty=Velg minst en vare med et antall, ikke null, og en leverandør
 AlertOnly= Kun varsler
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
+IncludeProductWithUndefinedAlerts = Inkluder også negativ beholdning for varer uten ønsket mengde definert, for å gjenopprette dem til 0
 WarehouseForStockDecrease=Lageret <b>%s</b> vil bli brukt til reduksjon av varebeholdning
 WarehouseForStockIncrease=Lageret <b>%s</b> vil bli brukt til økning av varebeholdning
 ForThisWarehouse=For dette lageret
@@ -144,7 +145,7 @@ Replenishments=Lagerpåfyllinger
 NbOfProductBeforePeriod=Beholdning av varen %s før valgte periode (< %s)
 NbOfProductAfterPeriod=Beholdning av varen %s før etter periode (< %s)
 MassMovement=Massebevegelse
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Velg et kilde-varehus og et mål-varehus, en vare og et antall, og klikk deretter "%s". Når dette er gjort for alle nødvendige bevegelser, klikker du på "%s".
 RecordMovement=Postoverføring
 ReceivingForSameOrder=Kvitteringer for denne ordren
 StockMovementRecorded=Registrerte varebevegelser
@@ -233,10 +234,11 @@ InventoryForASpecificProduct=Varetelling for en spesifikk vare
 StockIsRequiredToChooseWhichLotToUse=Det kreves lagerbeholdning for å velge hvilken lot du vil bruke
 ForceTo=Tving til
 AlwaysShowFullArbo=Vis hele lagertreet med popup av lagerkoblinger (Advarsel: Dette kan redusere ytelsen dramatisk)
-StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
-CurrentStock=Current stock
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|serial barcode)
+StockAtDatePastDesc=Her kan du se varen (reell beholdning) på en tidligere dato
+StockAtDateFutureDesc=Her kan du se varen (virtuell beholdning) på en gitt dato i fremtiden
+CurrentStock=Nåværende varebeholdning
+InventoryRealQtyHelp=Sett verdi til 0 for å tilbakestille antall <br> Hold feltet tomt, eller fjern linjen, for å holde uendret
+UpdateByScaning=Oppdater ved å skanne
+UpdateByScaningProductBarcode=Oppdater ved skanning (varestrekkode)
+UpdateByScaningLot=Oppdater ved skanning (LOT/seriell strekkode)
+DisableStockChangeOfSubProduct=Deaktiver lagerendringen for alle delvaren til dette settet under denne bevegelsen.
diff --git a/htdocs/langs/nb_NO/suppliers.lang b/htdocs/langs/nb_NO/suppliers.lang
index 6dc0db586bf..c7ade0f65bb 100644
--- a/htdocs/langs/nb_NO/suppliers.lang
+++ b/htdocs/langs/nb_NO/suppliers.lang
@@ -38,7 +38,7 @@ MenuOrdersSupplierToBill=Innkjøpsordre til faktura
 NbDaysToDelivery=Leveringsforsinkelse (dager)
 DescNbDaysToDelivery=Den lengste leveringsforsinkelsen til produktene i denne ordre
 SupplierReputation=Leverandørens rykte
-ReferenceReputation=Reference reputation
+ReferenceReputation=Referanse omdømme
 DoNotOrderThisProductToThisSupplier=Ikke bestill
 NotTheGoodQualitySupplier=Lav kvalitet
 ReputationForThisProduct=Rykte
diff --git a/htdocs/langs/nb_NO/ticket.lang b/htdocs/langs/nb_NO/ticket.lang
index ed590491d7c..63f1717d97e 100644
--- a/htdocs/langs/nb_NO/ticket.lang
+++ b/htdocs/langs/nb_NO/ticket.lang
@@ -58,7 +58,6 @@ OriginEmail=Epostkilde
 Notify_TICKET_SENTBYMAIL=Send billettmelding via e-post
 
 # Status
-NotRead=Ikke lest
 Read=Les
 Assigned=Tildelt
 InProgress=Pågår
@@ -124,12 +123,13 @@ TicketsActivatePublicInterfaceHelp=Offentlig grensesnitt gjør det mulig for all
 TicketsAutoAssignTicket=Tilordne automatisk brukeren som opprettet supportseddelen
 TicketsAutoAssignTicketHelp=Når du lager en supportseddel, kan brukeren automatisk tildeles billetten.
 TicketNumberingModules=Supportseddel nummereringsmodul
+TicketsModelModule=Dokumentmaler for billetter
 TicketNotifyTiersAtCreation=Varsle tredjepart ved opprettelse
 TicketsDisableCustomerEmail=Slå alltid av e-post når en billett er opprettet fra det offentlige grensesnittet
 TicketsPublicNotificationNewMessage=Send e-post(er) når en ny melding legges til
-TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
+TicketsPublicNotificationNewMessageHelp=Send epost(er) når en ny melding legges til fra det offentlige grensesnittet (til tildelt bruker eller varslings-eposten til (oppdatering) og/eller varslings-eposten til)
 TicketPublicNotificationNewMessageDefaultEmail=E-postvarsler til (oppdatere)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send epost med ny melding til denne adressen hvis billetten ikke er tildelt en bruker eller brukeren ikke har epost.
 #
 # Index & list page
 #
@@ -202,7 +202,7 @@ TicketMessageMailIntroText=Hei, <br> Et nytt svar ble sendt på en billett som d
 TicketMessageMailIntroHelpAdmin=Denne teksten blir satt inn før teksten til svaret på en supportseddel.
 TicketMessageMailSignature=Signatur
 TicketMessageMailSignatureHelp=Denne teksten er bare lagt til i slutten av eposten og vil ikke bli lagret.
-TicketMessageMailSignatureText= <p> Med vennlig hilsen </p> <p> - </p>
+TicketMessageMailSignatureText=<p> Med vennlig hilsen </p> <p> - </p>
 TicketMessageMailSignatureLabelAdmin=Signatur på svar-epost
 TicketMessageMailSignatureHelpAdmin=Denne teksten vil bli satt inn etter svarmeldingen.
 TicketMessageHelp=Kun denne teksten blir lagret i meldingslisten på supportseddelen.
@@ -231,7 +231,6 @@ TicketLogStatusChanged=Status endret: %s til %s
 TicketNotNotifyTiersAtCreate=Ikke gi beskjed til firmaet ved opprettelse
 Unread=Ulest
 TicketNotCreatedFromPublicInterface=Ikke tilgjengelig. Billett ble ikke opprettet fra offentlig grensesnitt.
-PublicInterfaceNotEnabled=Offentlig grensesnitt var ikke aktivert
 ErrorTicketRefRequired=Billettreferansenavn kreves
 
 #
diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang
index a80a383be93..9cdf3dc0695 100644
--- a/htdocs/langs/nb_NO/website.lang
+++ b/htdocs/langs/nb_NO/website.lang
@@ -30,7 +30,6 @@ EditInLine=Rediger inline
 AddWebsite=Legg til nettside
 Webpage=Nettsted/container
 AddPage=Legg til side/container
-HomePage=Hjemmeside
 PageContainer=Side
 PreviewOfSiteNotYetAvailable=Forhåndsvisning av nettstedet ditt <strong> %s </strong> ennå ikke tilgjengelig. Du må først '<strong> Importer en full nettsidemal </strong>' eller bare '<strong> Legg til en side/container </strong>'.
 RequestedPageHasNoContentYet=Forespurt side med id %s har ikke noe innhold enda, eller cachefilen .tpl.php ble fjernet. Rediger innhold på siden for å løse dette.
@@ -58,7 +57,7 @@ NoPageYet=Ingen sider ennå
 YouCanCreatePageOrImportTemplate=Du kan opprette en ny side eller importere en full nettsidemal
 SyntaxHelp=Hjelp med spesifikke syntakstips
 YouCanEditHtmlSourceckeditor=Du kan redigere HTML kildekode ved hjelp av "Kilde" -knappen i redigeringsprogrammet.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Du kan inkludere PHP kode i denne kilden ved hjelp av tags <strong>&lt;?php ?&gt;</strong>. Følgende globale variabler er tilgjengelige: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> Du kan også inkludere innhold fra en annen side/container med følgende syntaks:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> Du kan omdirigere til en annen side/container med følgende syntaks (NB: ikke legg ut noe innhold før en omdirigering):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> For å opprette en kobling til en annen side, bruk syntaksen:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> For å inkludere en <strong>nedlastningslink</strong> til en fil i <strong>dokumenter</strong> mappen, bruk <strong>document.php</strong> pakkeren:<br>Eksempel, for en fil i documents/ecm (need to be loggedmå logges, er syntaksen:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For en fil i documents/medias (åpen mappe for offentlig tilgang), er syntaksen:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For en fil delt via en delingskobling (åpen tilgang ved bruk av deling av filens hash-nøkkel), er syntaksen:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> For å inkludere et <strong>bilde</strong> lagret i <strong>dokumenter</strong> mappen, bruk <strong>viewimage.php</strong> pakkeren:<br>Eksempel, for et bilde i documents/medias (åpen mappe for offentlig tilgang), er syntaksen:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource2=For et bilde som deles med en delekobling (åpen tilgang ved hjelp av delings-hash-nøkkelen til filen), er syntaksen: <br> <strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSourceMore= <br> Flere eksempler på HTML eller dynamisk kode tilgjengelig på <a href="%s" target="_blank"> wiki-dokumentasjonen </a> <br>.
@@ -101,7 +100,7 @@ EmptyPage=Tom side
 ExternalURLMustStartWithHttp=Ekstern nettadresse må starte med http:// eller https://
 ZipOfWebsitePackageToImport=Last opp zip-filen til malpakken til nettstedet
 ZipOfWebsitePackageToLoad=eller velg en tilgjengelig innebygd nettsted-malpakke
-ShowSubcontainers=Inkluder dynamisk innhold
+ShowSubcontainers=Vis dynamisk innhold
 InternalURLOfPage=Intern URL til siden
 ThisPageIsTranslationOf=Denne siden/containeren er en oversettelse av
 ThisPageHasTranslationPages=Denne siden/containeren har oversettelse
@@ -136,4 +135,5 @@ RSSFeed=RSS nyhetsstrøm
 RSSFeedDesc=Du kan få en RSS-feed med de nyeste artiklene med typen 'blogpost' ved hjelp av denne URL-en
 PagesRegenerated=%s side(r)/container(e) regenerert
 RegenerateWebsiteContent=Regenerer cache-filer på nettstedet
-AllowedInFrames=Allowed in Frames
+AllowedInFrames=Tillatt i frames
+DefineListOfAltLanguagesInWebsiteProperties=Definer liste over alle tilgjengelige språk i nettstedsegenskaper.
diff --git a/htdocs/langs/nb_NO/withdrawals.lang b/htdocs/langs/nb_NO/withdrawals.lang
index 50f65e74855..a0e78bf86e7 100644
--- a/htdocs/langs/nb_NO/withdrawals.lang
+++ b/htdocs/langs/nb_NO/withdrawals.lang
@@ -1,36 +1,36 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Payments by Direct debit orders
+CustomersStandingOrdersArea=Betalinger med direktedebetsordrer
 SuppliersStandingOrdersArea=Betalinger med kredittoverføring
 StandingOrdersPayment=Direktedebet betalingsordre
 StandingOrderPayment=Direktedebet betalingsordre
 NewStandingOrder=Ny direktedebetsordre
-NewPaymentByBankTransfer=New payment by credit transfer
+NewPaymentByBankTransfer=Ny betaling med kreditoverføring
 StandingOrderToProcess=Til behandling
-PaymentByBankTransferReceipts=Credit transfer orders
-PaymentByBankTransferLines=Credit transfer order lines
+PaymentByBankTransferReceipts=Kredittoverføringsordrer
+PaymentByBankTransferLines=Kredittoverføring ordrelinjer
 WithdrawalsReceipts=Direktedebetsordre
 WithdrawalReceipt=Direktedebiter ordre
-BankTransferReceipts=Credit transfer orders
+BankTransferReceipts=Kredittoverføringsordrer
 BankTransferReceipt=Kredittoverføringsordre
-LatestBankTransferReceipts=Latest %s credit transfer orders
+LatestBankTransferReceipts=Siste %s kredittoverføringsordrer
 LastWithdrawalReceipts=Siste %s direktedebetslinjer
-WithdrawalsLine=Direct debit order line
-CreditTransferLine=Credit transfer line
+WithdrawalsLine=Ordrelinje for direktedebet
+CreditTransferLine=Kredittoverføringslinje
 WithdrawalsLines=Direktedebiter ordrelinjer
-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
+CreditTransferLines=Kredittoverføringslinjer
+RequestStandingOrderToTreat=Forespørsler om utførelse av direktedebet betalingsordre
+RequestStandingOrderTreated=Forespørsel om utførte direktedebet betalingsordre
+RequestPaymentsByBankTransferToTreat=Forespørsler om behandling av kreditoverføring
 RequestPaymentsByBankTransferTreated=Forespørsler om kredittoverføring behandlet
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Ennå ikke mulig. Tilbaketrekkings-status må være satt til 'kreditert' før fjerning fra spesifikke linjer.
-NbOfInvoiceToWithdraw=No. of qualified customer invoices with waiting direct debit order
+NbOfInvoiceToWithdraw=Antall kvalifiserte kundefakturaer med ventende direktedebet
 NbOfInvoiceToWithdrawWithInfo=Antall kundefakturaer med direktedebetsordre som har definert bankkontoinformasjon
 NbOfInvoiceToPayByBankTransfer=Antall kvalifiserte leverandørfakturaer som venter på betaling med kredittoverføring
-SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit transfer
+SupplierInvoiceWaitingWithdraw=Leverandørfaktura som venter på betaling med kreditoverføring
 InvoiceWaitingWithdraw=Faktura som venter på direktedebet
-InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
+InvoiceWaitingPaymentByBankTransfer=Faktura venter på kreditoverføring
 AmountToWithdraw=Beløp å tilbakekalle
-NoInvoiceToWithdraw=No invoice open for '%s' is waiting. Go on tab '%s' on invoice card to make a request.
+NoInvoiceToWithdraw=Ingen faktura åpen for '%s' venter. Gå til fanen '%s' på fakturakortet for å gjøre en forespørsel.
 NoSupplierInvoiceToWithdraw=Ingen leverandørfaktura med åpne 'Direkte kredittforespørsler' venter. Gå til fanen '%s' på fakturakortet for å sende en forespørsel.
 ResponsibleUser=Brukeransvarlig
 WithdrawalsSetup=Oppsett av direktedebetsbetalinger
@@ -40,8 +40,9 @@ CreditTransferStatistics=Kredittoverføringsstatistikk
 Rejects=Avvisninger
 LastWithdrawalReceipt=Siste %s direktedebetskvitteringer
 MakeWithdrawRequest=Foreta en direktedebet betalingsforespørsel
-MakeBankTransferOrder=Make a credit transfer request
+MakeBankTransferOrder=Opprett en forespørsel om kreditoverføring
 WithdrawRequestsDone=%s direktedebet-betalingforespørsler registrert
+BankTransferRequestsDone=%s forespørsler om kreditoverføring registrert
 ThirdPartyBankCode=Tredjeparts bankkode
 NoInvoiceCouldBeWithdrawed=Ingen faktura debitert. Kontroller at fakturaer mot selskaper med gyldig standard BAN, og at BAN har en RUM-modus <strong> %s </strong>.
 ClassCredited=Klassifiser som kreditert
@@ -53,7 +54,7 @@ Lines=Linjer
 StandingOrderReject=Utsted en avvisning
 WithdrawsRefused=Direktedebet avvist
 WithdrawalRefused=Tilbakekalling avvist
-CreditTransfersRefused=Credit transfers refused
+CreditTransfersRefused=Kredittoverføringer avvist
 WithdrawalRefusedConfirm=Er du sikker på at du vil avvise en tilbakekallings-forespørsel for medlemmet?
 RefusedData=Dato for avvisning
 RefusedReason=Årsak til avslag
@@ -63,7 +64,7 @@ InvoiceRefused=Faktura avvist (Kunden skal belastes for avvisningen)
 StatusDebitCredit=Status debet/kreditt
 StatusWaiting=Venter
 StatusTrans=Sendt
-StatusDebited=Debited
+StatusDebited=Debiterte
 StatusCredited=Kreditert
 StatusPaid=Betalt
 StatusRefused=Nektet
@@ -79,13 +80,13 @@ StatusMotif8=Annen grunn
 CreateForSepaFRST=Opprett direktedebetsfil (SEPA FRST)
 CreateForSepaRCUR=Opprett direktedebitfil (SEPA RCUR)
 CreateAll=Opprett direktedebetfil (alle)
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
+CreateFileForPaymentByBankTransfer=Opprett fil for kreditoverføring
 CreateSepaFileForPaymentByBankTransfer=Opprett kreditoverføringsfil (SEPA)
 CreateGuichet=Bare kontor
 CreateBanque=Bare bank
 OrderWaiting=Venter på behandling
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
+NotifyTransmision=Registrer filoverføring av ordre
+NotifyCredit=Registrer kreditt av ordren
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bankkontoer som bruker RIB
 WithBankUsingBANBIC=For bankkontoer som bruker IBAN/BIC/SWIFT
@@ -96,11 +97,11 @@ WithdrawalFileNotCapable=Kan ikke ikke generere kvitteringsfil for tilbaketrekki
 ShowWithdraw=Vis direkte debitordre
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Men, hvis fakturaen har minst én avbestillingsordre som ikke er behandlet ennå, blir den ikke satt som betalt for å tillate tidligere håndtering av tilbaketrekninger.
 DoStandingOrdersBeforePayments=Denne fanen lar deg be om en betalingsordre med direkte belastning. Når du er ferdig, kan du gå til menyen Bank-> Betaling med direkte belastning for å generere og administrere direkte belastning. Når ordre med direkte belastning blir stengt, blir betaling på fakturaer automatisk registrert, og fakturaer stengt hvis resten til betaling er null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Debit order file
-CreditTransferFile=Credit transfer file
+DoCreditTransferBeforePayments=Denne fanen lar deg be om en kreditoverføringsordre. Når du er ferdig, går du inn i menyen Bank-> Betaling ved overføring for å generere og administrere overføringsordren. Når kredittoverføringsordren er lukket, vil betaling på fakturaer automatisk bli registrert, og fakturaer stengt hvis resten av utestående er null.
+WithdrawalFile=Debetordrefil
+CreditTransferFile=Kredittoverføringsfil
 SetToStatusSent=Sett status til "Fil Sendt"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
+ThisWillAlsoAddPaymentOnInvoice=Dette vil også registrere betalinger på fakturaer og vil klassifisere dem som "Betalt" hvis gjenværende betaling er null
 StatisticsByLineStatus=Statistikk etter linjestatus
 RUM=UMR
 DateRUM=Mandats signaturdato
@@ -108,7 +109,7 @@ RUMLong=Unik Mandat Referanse
 RUMWillBeGenerated=Hvis tomt, vil UMR (Unique Mandate Reference) bli generert når bankkontoinformasjon er lagret
 WithdrawMode=Direktedebetsmodus (FRST eller RECUR)
 WithdrawRequestAmount=Antall direktedebet-betalingforespørsler
-BankTransferAmount=Amount of Credit Transfer request:
+BankTransferAmount=Beløp i forespørsler om kredittoverføring:
 WithdrawRequestErrorNilAmount=Kan ikke opprette en tom direktedebet-betalingforespørsel
 SepaMandate=SEPA Direktedebet mandat
 SepaMandateShort=SEPA-Mandat
@@ -124,18 +125,19 @@ SEPAFrstOrRecur=Betalingstype
 ModeRECUR=Gjentakende betaling
 ModeFRST=Engangsbetaling
 PleaseCheckOne=Vennligs kryss av kun en
-CreditTransferOrderCreated=Credit transfer order %s created
+CreditTransferOrderCreated=Kredittoverføringsordre %s opprettet
 DirectDebitOrderCreated=Direktedebet-ordre %s opprettet
 AmountRequested=Beløp forespurt
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Utførelsesdato
 CreateForSepa=Lag direkte debitfil
-ICS=Kreditoridentifikator CI
+ICS=Kreditoridentifikator CI for direkte belastning
+ICSTransfer=Kreditoridentifikator CI for bankoverføring
 END_TO_END="EndToEndId" SEPA XML-tag - Unik ID tildelt per transaksjon
 USTRD="Ustrukturert" SEPA XML-tag
 ADDDAYS=Legg til dager til utførelsesdato
-NoDefaultIBANFound=No default IBAN found for this third party
+NoDefaultIBANFound=Ingen standard IBAN funnet for denne tredjeparten
 ### Notifications
 InfoCreditSubject=Betaling av direktedebets-betalingsordre %s utført av banken
 InfoCreditMessage=Direktedebet betalingsordre %s er blitt betalt av banken<br>Betalingsdata: %s
@@ -145,4 +147,6 @@ InfoTransData=Beløp: %s <br> Metode: %s <br> Dato: %s
 InfoRejectSubject=Direktedebet betalingsordre avvist
 InfoRejectMessage=Hei,<br><br>direktedebet betalingsordre av faktura %s tilhørende firma %s, med beløpet %s er blitt avvist av banken.<br><br>--<br>%s
 ModeWarning=Opsjon for reell-modus ble ikke satt, så vi stopper etter denne simuleringen
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+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
diff --git a/htdocs/langs/nb_NO/workflow.lang b/htdocs/langs/nb_NO/workflow.lang
index 1c08b5b0b78..92fa39bdda2 100644
--- a/htdocs/langs/nb_NO/workflow.lang
+++ b/htdocs/langs/nb_NO/workflow.lang
@@ -16,8 +16,10 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Klassifiser koblet kilde-kundeordre
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Klassifiser tilsluttede kildeleverandørtilbud som fakturert når leverandørfaktura er validert (og hvis fakturabeløp er det samme som totalbeløp på koblede tilbud)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Klassifiser kildekjøpsordre (kjøpsordre) som fakturert når leverandørfakturaen er validert (og hvis fakturabeløp er det samme som totalbeløp på koblede ordre)
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+descWORKFLOW_BILL_ON_RECEPTION=Klassifiser mottak til "fakturert" når en koblet leverandørbestilling er validert
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Lukk alle intervensjoner knyttet til billetten når en billett er lukket
 AutomaticCreation=Automatisk opprettelse
 AutomaticClassification=Automatisk klassifisering
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Klassifiser koblet kildesending som lukket når kundefaktura er validert
diff --git a/htdocs/langs/ne_NP/accountancy.lang b/htdocs/langs/ne_NP/accountancy.lang
index 3211a0b62df..9e084932477 100644
--- a/htdocs/langs/ne_NP/accountancy.lang
+++ b/htdocs/langs/ne_NP/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/ne_NP/admin.lang b/htdocs/langs/ne_NP/admin.lang
index f1c41a3b62b..f9a6468d94a 100644
--- a/htdocs/langs/ne_NP/admin.lang
+++ b/htdocs/langs/ne_NP/admin.lang
@@ -56,6 +56,8 @@ 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.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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.
@@ -256,6 +257,7 @@ 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.
@@ -375,7 +377,7 @@ 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:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+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
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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
+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 the language of the third party
+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
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+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
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/ne_NP/banks.lang b/htdocs/langs/ne_NP/banks.lang
index 9500a5b8b2e..81a23238550 100644
--- a/htdocs/langs/ne_NP/banks.lang
+++ b/htdocs/langs/ne_NP/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/ne_NP/blockedlog.lang b/htdocs/langs/ne_NP/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/ne_NP/blockedlog.lang
+++ b/htdocs/langs/ne_NP/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/ne_NP/boxes.lang b/htdocs/langs/ne_NP/boxes.lang
index d6fd298a3a7..9a751483fb1 100644
--- a/htdocs/langs/ne_NP/boxes.lang
+++ b/htdocs/langs/ne_NP/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+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.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/ne_NP/cashdesk.lang b/htdocs/langs/ne_NP/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/ne_NP/cashdesk.lang
+++ b/htdocs/langs/ne_NP/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+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
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/ne_NP/categories.lang b/htdocs/langs/ne_NP/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/ne_NP/categories.lang
+++ b/htdocs/langs/ne_NP/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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
diff --git a/htdocs/langs/ne_NP/companies.lang b/htdocs/langs/ne_NP/companies.lang
index dadff6a7894..8dc815b522e 100644
--- a/htdocs/langs/ne_NP/companies.lang
+++ b/htdocs/langs/ne_NP/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/ne_NP/compta.lang b/htdocs/langs/ne_NP/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/ne_NP/compta.lang
+++ b/htdocs/langs/ne_NP/compta.lang
@@ -111,7 +111,7 @@ 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 ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/ne_NP/cron.lang b/htdocs/langs/ne_NP/cron.lang
index 1de1251831a..2ebdda1e685 100644
--- a/htdocs/langs/ne_NP/cron.lang
+++ b/htdocs/langs/ne_NP/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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
@@ -46,6 +47,7 @@ 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
@@ -56,7 +58,7 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
@@ -82,3 +84,8 @@ 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/ne_NP/errors.lang b/htdocs/langs/ne_NP/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/ne_NP/errors.lang
+++ b/htdocs/langs/ne_NP/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 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.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/ne_NP/exports.lang b/htdocs/langs/ne_NP/exports.lang
index 3549e3f8b23..a0eb7161ef2 100644
--- a/htdocs/langs/ne_NP/exports.lang
+++ b/htdocs/langs/ne_NP/exports.lang
@@ -133,3 +133,4 @@ 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/ne_NP/mails.lang b/htdocs/langs/ne_NP/mails.lang
index 1235eef3b27..2d02c5ddcf9 100644
--- a/htdocs/langs/ne_NP/mails.lang
+++ b/htdocs/langs/ne_NP/mails.lang
@@ -92,6 +92,7 @@ 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
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/ne_NP/main.lang b/htdocs/langs/ne_NP/main.lang
index 96c68cdcfa3..f8ba6f4073c 100644
--- a/htdocs/langs/ne_NP/main.lang
+++ b/htdocs/langs/ne_NP/main.lang
@@ -28,7 +28,9 @@ 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
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Value
 PersonalValue=Personal value
 NewObject=New %s
 NewValue=New value
+OldValue=Old value %s
 CurrentValue=Current value
 Code=Code
 Type=Type
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ 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
@@ -671,7 +678,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/ne_NP/modulebuilder.lang b/htdocs/langs/ne_NP/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/ne_NP/modulebuilder.lang
+++ b/htdocs/langs/ne_NP/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/ne_NP/mrp.lang b/htdocs/langs/ne_NP/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/ne_NP/mrp.lang
+++ b/htdocs/langs/ne_NP/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/ne_NP/other.lang b/htdocs/langs/ne_NP/other.lang
index 54c0572d453..7a895bb1ca5 100644
--- a/htdocs/langs/ne_NP/other.lang
+++ b/htdocs/langs/ne_NP/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/ne_NP/products.lang b/htdocs/langs/ne_NP/products.lang
index 97db059594f..9ecc11ed93d 100644
--- a/htdocs/langs/ne_NP/products.lang
+++ b/htdocs/langs/ne_NP/products.lang
@@ -108,7 +108,8 @@ 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=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/ne_NP/projects.lang b/htdocs/langs/ne_NP/projects.lang
index baf0ecde17f..05aa1f5a560 100644
--- a/htdocs/langs/ne_NP/projects.lang
+++ b/htdocs/langs/ne_NP/projects.lang
@@ -76,15 +76,16 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/ne_NP/recruitment.lang b/htdocs/langs/ne_NP/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/ne_NP/recruitment.lang
+++ b/htdocs/langs/ne_NP/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/ne_NP/sendings.lang b/htdocs/langs/ne_NP/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/ne_NP/sendings.lang
+++ b/htdocs/langs/ne_NP/sendings.lang
@@ -30,6 +30,7 @@ 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
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/ne_NP/stocks.lang b/htdocs/langs/ne_NP/stocks.lang
index 660443bcded..a1f55010139 100644
--- a/htdocs/langs/ne_NP/stocks.lang
+++ b/htdocs/langs/ne_NP/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/ne_NP/ticket.lang b/htdocs/langs/ne_NP/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/ne_NP/ticket.lang
+++ b/htdocs/langs/ne_NP/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/ne_NP/website.lang b/htdocs/langs/ne_NP/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/ne_NP/website.lang
+++ b/htdocs/langs/ne_NP/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/ne_NP/withdrawals.lang b/htdocs/langs/ne_NP/withdrawals.lang
index 114a8d9dd6c..059b3451c11 100644
--- a/htdocs/langs/ne_NP/withdrawals.lang
+++ b/htdocs/langs/ne_NP/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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/ne_NP/workflow.lang b/htdocs/langs/ne_NP/workflow.lang
index 299be277e1d..494a0424a75 100644
--- a/htdocs/langs/ne_NP/workflow.lang
+++ b/htdocs/langs/ne_NP/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/nl_BE/accountancy.lang b/htdocs/langs/nl_BE/accountancy.lang
index 080da3b8334..b778d524492 100644
--- a/htdocs/langs/nl_BE/accountancy.lang
+++ b/htdocs/langs/nl_BE/accountancy.lang
@@ -20,6 +20,7 @@ UpdateMvts=Wijzigen van een transactie
 Processing=Verwerken
 EndProcessing=Verwerking beëindigd
 Lineofinvoice=Factuur lijn
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 Docdate=Datum
 Docref=Artikelcode
 TotalVente=Totaal omzet voor belastingen
diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang
index f1308c0cdfe..9e36971311b 100644
--- a/htdocs/langs/nl_BE/admin.lang
+++ b/htdocs/langs/nl_BE/admin.lang
@@ -11,6 +11,7 @@ RemoteSignature=Remote distant handtekening (betrouwbaarder)
 FilesAdded=Bestanden toegevoegd
 AvailableOnlyOnPackagedVersions=Het lokale bestand voor integriteitscontrole is alleen beschikbaar als de toepassing is geïnstalleerd vanuit een officieel pakket
 XmlNotFound=Xml-integriteitsbestand van toepassing niet gevonden
+SessionId=Sessie-ID
 SessionSavePath=Sessie opslaglocatie
 ConfirmPurgeSessions=Ben je zeker dat je alle sessies wil wissen? De connectie van elke gebruiker zal worden verbroken (uitgezonderd jezelf).
 NoSessionListWithThisHandler=Save session handler geconfigureerd in uw PHP staat niet toe dat alle lopende sessies worden getoond.
@@ -28,23 +29,29 @@ UploadNewTemplate=Upload nieuwe template(s)
 RestoreLock=Herstel het bestand <b>%s</b> , met enkel leesrechten, om verder gebruik van de Update / Install-tool uit te schakelen.
 SecurityFilesDesc=Definieer opties met betrekking tot beveiliging voor het uploaden van bestanden.
 DictionarySetup=Woordenboek setup
-Dictionary=Woordenboeken
+ErrorReservedTypeSystemSystemAuto=De waarde 'system' en 'systemauto' als type zijn voorbehouden voor het systeem.  Je kan 'user' als waarde gebruiken om je eigen gegevens-record toe te voegen.
 DisableJavascript=Schakel JavaScript en Ajax-functies uit.
 DelaiedFullListToSelectCompany=Wacht tot een toets wordt ingedrukt voordat u de inhoud van de combinatielijst van derden laadt. <br> Dit kan de prestaties verbeteren als u een groot aantal derden hebt, maar het is minder handig.
 SearchString=Zoekopdracht
+NotAvailableWhenAjaxDisabled=Niet beschikbaar wanneer AJAX functionaliteit uitgeschakeld is
 AllowToSelectProjectFromOtherCompany=Op een document van een derde partij, kunt u een project kiezen dat is gekoppeld aan een andere derde partij
 UsePreviewTabs=Gebruik voorbeelweergavetabbladen
 ShowPreview=Toon voorbeelweergave
-CurrentTimeZone=Huidige Tijdszone
 TZHasNoEffect=Datums worden opgeslagen en geretourneerd door de databaseserver alsof ze worden bewaard als verzonden string. De tijdzone heeft alleen effect bij het gebruik van de UNIX_TIMESTAMP-functie (die niet door Dolibarr mag worden gebruikt, dus database TZ zou geen effect mogen hebben, zelfs als deze wordt gewijzigd nadat gegevens zijn ingevoerd).
 NextValueForDeposit=Volgende waarde (aanbetaling)
+ComptaSetup=Instellingen van de boekhoudkundige module
 UserSetup=Gebruikersbeheerinstellingen
 MultiCurrencySetup=Instellingen voor meerdere valuta
+DetailPosition=Sorteren aantal te definiëren menupositie
 AllMenus=Alle
 NotConfigured=Module/Applicatie is niet geconfigureerd
 OtherSetup=Overige instellingen
+CurrentValueSeparatorThousand=Duizend scheidingsteken
 LocalisationDolibarrParameters=Lokalisatieparameters
+ClientTZ=Tijdzone van de klant (gebruiker)
+ClientHour=Tijd bij de klant (gebruiker)
 PHPTZ=Tijdzone binnen de PHP server
+DaylingSavingTime=Zomertijd (gebruiker)
 CurrentHour=Huidige tijd op server
 CurrentSessionTimeOut=Huidige sessietimeout
 YouCanEditPHPTZ=Om een andere PHP-tijdzone in te stellen (niet vereist), kunt u proberen een .htaccess-bestand toe te voegen met een regel als deze "SetEnv TZ Europe/Paris"
@@ -63,20 +70,25 @@ PurgeNothingToDelete=Geen map of bestanden om te verwijderen.
 PurgeNDirectoriesFailed=Verwijderen van <b>%s-</b> bestanden of mappen is mislukt.
 PurgeAuditEvents=Verwijder alle gebeurtenisen
 ConfirmPurgeAuditEvents=Ben je zeker dat je alle veiligheidsgebeurtenissen wil verwijderen? Alle veiligheidslogboeken zullen worden verwijderd, en geen andere bestanden worden verwijderd
+RunCommandSummary=Backup geïnitieerd met het volgende commando
+BackupResult=Resultaat backup
+BackupFileSuccessfullyCreated=Backupbestand succesvol gegenereerd
 NoBackupFileAvailable=Geen backupbestanden beschikbaar.
 ToBuildBackupFileClickHere=Om een backupbestand te maken, klik <a href="%s">hier</a>.
+ImportMySqlDesc=Om een MySQL-back-upbestand te importeren, kunt u phpMyAdmin gebruiken via uw hosting of de opdracht mysql gebruiken vanaf de opdrachtregel. <br> Bijvoorbeeld:
+ImportPostgreSqlDesc=Om een backupbestand te importeren, dient u het 'pg_restore' commando vanaf de opdrachtregel uit te voeren:
 CommandsToDisableForeignKeysForImportWarning=Verplicht als je je sql neerslag later wil gebruiken
 ExportUseMySQLQuickParameterHelp=De parameter '--quick' helpt het RAM-verbruik voor grote tabellen te beperken.
 MySqlExportParameters=MySQL exporteer instellingen
 ExportStructure=Struktuur
 NameColumn=Kollomennaam
+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.
 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
 SeeInMarkerPlace=Zie Marktplaats
-Nouveauté=Nieuwigheid
 GoModuleSetupArea=Ga naar het gedeelte Module-instellingen om een nieuwe module te implementeren / installeren: <a href="%s">%s</a> .
 DoliStoreDesc=DoliStore, de officiële markt voor externe Dolibarr ERP / CRM modules
 WebSiteDesc=Externe websites voor meer add-on (niet-basis) modules ...
@@ -88,6 +100,7 @@ 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
@@ -111,6 +124,8 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (als verzendende server authenticatie vereist)
 MAIN_MAIL_SMTPS_PW=SMTP-wachtwoord (als verzendende server verificatie vereist)
 MAIN_MAIL_EMAIL_TLS=Gebruik TLS (SSL) -versleuteling
 MAIN_MAIL_EMAIL_STARTTLS=Gebruik TLS (STARTTLS) -versleuteling
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Gebruik DKIM om een e-mailhandtekening te genereren
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=E-maildomein voor gebruik met dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Naam van dkim-selector
 MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Privésleutel voor dkim-ondertekening
 MAIN_DISABLE_ALL_SMS=Schakel alle sms-berichten uit (voor testdoeleinden of demo's)
@@ -118,9 +133,13 @@ MAIN_MAIL_SMS_FROM=Standaard telefoonnummer van afzender voor sms-verzending
 MAIN_MAIL_DEFAULT_FROMTYPE=Standaard afzender-e-mailadres voor handmatig verzenden (e-mailadres gebruiker of professionele e-mail)
 UserEmail=Email gebruiker
 CompanyEmail=Professionele e-mail
+ModuleSetup=Module-instellingen
 ModulesSetup=Instellingen voor Modules / Applicaties
 ModuleFamilyProducts=Productbeheer (PM)
 ModuleFamilyHr=Personeelszaken (HR)
+ModuleFamilyProjects=Projecten / Samenwerkingen
+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>
@@ -129,15 +148,23 @@ NotExistsDirect=De alternatieve hoofdmap is niet gedefinieerd voor een bestaande
 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>
 InfDirExample=<br> <strong>Verklaar</strong> het dan in het bestand <strong>conf.php</strong> <br> $ Dolibarr_main_url_root_alt='/custom' <br> $ Dolibarr_main_document_root_alt='/pad/of/Dolibarr/htdocs/custom' <br> Als deze regels worden becommentarieerd met "#", schakelt u ze gewoon uit door het teken "#" te verwijderen.
 LastStableVersion=Nieuwste stabiele versie
+LastActivationIP=Laatste activerings-IP
 GenericMaskCodes2=<b>{cccc}</b> de clientcode van n tekens <br> <b>{cccc000}</b> de <b>klantcode</b> op n tekens wordt gevolgd door een teller voor de klant. Deze teller die aan de klant is toegewezen, wordt tegelijkertijd opnieuw ingesteld als de globale teller. <br> <b>{tttt}</b> De code van het type van een derde partij op n tekens (zie menu Home - Instellingen - Woordenboek - Typen derde partijen). Als u deze tag toevoegt, verschilt de teller voor elk type derde partij. <br>
 GenericMaskCodes4a=<u>Voorbeeld op de 99e %s van de derde partij TheCompany, met datum 31-01-2007:</u> <br>
 GenericMaskCodes5=<b>ABC {jj} {mm} - {000000}</b> geeft <b>ABC0701-000099</b> <br> <b>{0000 + 100 @ 1} -ZZZ / {dd} / XXX</b> geeft <b>0199-ZZZ / 31 / XXX</b> <br> <b>IN {jj} {mm} - {0000} - {t}</b> geeft <b>IN0701-0099-A</b> als het type bedrijf 'Responsable Inscripto' is met code voor het type dat 'A_RI' is
+UMask=Umask parameter voor nieuwe bestanden op een Unix- / Linux- / BSD-bestandssysteem.
+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 cacheexport in secondes (0 of leeg voor geen cache)
+DisableLinkToHelpCenter=Verberg de link "<b>ondersteuning of hulp nodig</b>" op de inlogpagina
 DisableLinkToHelp=Link naar online help "<b>%s</b>" <b>verbergen</b>
 AddCRIfTooLong=Er is geen automatische tekst terugloop, tekst die te lang is, wordt niet weergegeven op documenten. Voeg indien nodig regeleinden in het tekstgebied toe.
 ConfirmPurge=Weet u zeker dat u deze zuivering wilt uitvoeren? <br> Hiermee worden al uw gegevensbestanden permanent verwijderd zonder dat u ze kunt herstellen (ECM-bestanden, bijgevoegde bestanden ...).
 LanguageFile=Bestandstaal
+ListOfDirectories=Lijst van OpenDocument sjablonenmappen
 ListOfDirectoriesForModelGenODT=Lijst met mappen die sjablonenbestanden met OpenDocument-indeling bevatten. <br><br> Plaats hier het volledige pad van mappen. <br> Voeg een regelterugloop toe tussen elke directory. <br> Voeg hier een map van de GED-module toe <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b> . <br><br> Bestanden in die mappen moeten eindigen op <b>.odt</b> of <b>.ods</b>.
 NumberOfModelFilesFound=Aantal ODT / ODS-sjabloonbestanden gevonden in deze mappen
+FollowingSubstitutionKeysCanBeUsed=Door het plaatsen van de volgende velden in het sjabloon krijgt u een vervanging met de aangepaste waarde bij het genereren van het document:
 DescWeather=De volgende afbeeldingen worden op het dashboard weergegeven wanneer het aantal late acties de volgende waarden bereikt:
 ConnectionTimeout=Time-out verbinding
 ModuleMustBeEnabledFirst=Module <b>%s</b> moet eerst worden ingeschakeld als u deze functie nodig hebt.
@@ -148,8 +175,12 @@ HideDescOnPDF=Productbeschrijving verbergen
 HideRefOnPDF=Verberg ref. producten
 HideDetailsOnPDF=Verberg details van productlijnen
 PlaceCustomerAddressToIsoLocation=Gebruik de Franse standaardpositie (La Poste) voor de positie van het klantadres
+UrlGenerationParameters=Parameters om URL beveiligen
+SecurityTokenIsUnique=Gebruik een unieke securekey parameter voor elke URL
 GetSecuredUrl=Get berekend URL
-ButtonHideUnauthorized=Knoppen verbergen voor niet-beheerders voor ongeautoriseerde acties in plaats van grijze uitgeschakelde knoppen te tonen
+OldVATRates=Oud BTW tarief
+NewVATRates=Nieuw BTW tarief
+PriceBaseTypeToChange=Wijzig op prijzen waarop een base reference waarde gedefiniëerd is
 MassConvert=Start bulkconversie
 Boolean=Boolean (één selectievakje)
 ExtrafieldUrl =url
diff --git a/htdocs/langs/nl_BE/banks.lang b/htdocs/langs/nl_BE/banks.lang
index 69a470c6db3..6a27c2a6715 100644
--- a/htdocs/langs/nl_BE/banks.lang
+++ b/htdocs/langs/nl_BE/banks.lang
@@ -1,5 +1,14 @@
 # Dolibarr language file - Source file is en_US - banks
+ShowAllTimeBalance=Toon saldo sinds begin
+LabelBankCashAccount=label van bank of kas
 TransferTo=Aan
+CheckTransmitter=Overboeker
 BankChecksToReceipt=Te innen cheques
 BankChecksToReceiptShort=Te innen cheques
+InputReceiptNumber=Kies het bankafschrift in verband met de bemiddeling. Gebruik een sorteerbaar numerieke waarde: YYYYMM of YYYYMMDD
+EventualyAddCategory=Tenslotte een categorie opgeven waarin de gegevens bewaard kunnen worden
+ThenCheckLinesAndConciliate=Duid dan de lijnen aan van het bankafschrift en klik
+DeleteARib=Verwijderen BAN gegeven
+RejectCheck=Teruggekeerde cheque
 RejectCheckDate=Datum de cheque was teruggekeerd
+CheckRejected=Teruggekeerde cheque
diff --git a/htdocs/langs/nl_BE/cashdesk.lang b/htdocs/langs/nl_BE/cashdesk.lang
index a64cdb82256..9019947e4b7 100644
--- a/htdocs/langs/nl_BE/cashdesk.lang
+++ b/htdocs/langs/nl_BE/cashdesk.lang
@@ -7,3 +7,4 @@ BankToPay=Betalingsaccount
 ShowCompany=Toon bedrijf
 ShowStock=Toon magazijn
 DolibarrReceiptPrinter=Dolibarr Ontvangsten Printer
+Receipt=Ontvangst
diff --git a/htdocs/langs/nl_BE/categories.lang b/htdocs/langs/nl_BE/categories.lang
index cc68f1795a9..9d86adc7acd 100644
--- a/htdocs/langs/nl_BE/categories.lang
+++ b/htdocs/langs/nl_BE/categories.lang
@@ -46,14 +46,11 @@ ContactCategoriesShort=Contacten tags/categorieën
 AccountsCategoriesShort=Accounts tags/categorieën
 ProjectsCategoriesShort=Projecten tags/categorieën
 CategId=Tag/categorie id
-CatCusList=Lijst van de klant/prospect tags/categorieën
 CatProdList=Lijst van producten tags/categorieën
 CatMemberList=Lijst van leden tags/categorieën
-CatContactList=Lijst van contact tags/categorieën
-CatSupLinks=Koppelingen tussen leveranciers en tags/categorieën
 CatCusLinks=Koppelingen tussen klanten/prospects en tags/categorieën
 CatProdLinks=Koppelingen tussen producten/diensten en tags/categorieën
-CatProJectLinks=Koppelingen tussen projecten en tags/categorieën
+CatProjectsLinks=Koppelingen tussen projecten en tags/categorieën
 CategoriesSetup=Tags/categorieën instellingen
 CategorieRecursiv=Automatische koppeling met bovenliggende tag/categorie
 ShowCategory=Toon tag / categorie
diff --git a/htdocs/langs/nl_BE/exports.lang b/htdocs/langs/nl_BE/exports.lang
new file mode 100644
index 00000000000..757f616a372
--- /dev/null
+++ b/htdocs/langs/nl_BE/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+ExportStringFilter=%% laat het vervangen toe van één of meer tekens in de tekst
diff --git a/htdocs/langs/nl_BE/externalsite.lang b/htdocs/langs/nl_BE/externalsite.lang
new file mode 100644
index 00000000000..9fdddaacccf
--- /dev/null
+++ b/htdocs/langs/nl_BE/externalsite.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - externalsite
+ExternalSiteSetup=Setup link naar externe website
+ExternalSiteURL=Externe Site URL
+ExternalSiteModuleNotComplete=Module ExternalSite werd niet correct geconfigureerd.
diff --git a/htdocs/langs/nl_BE/mails.lang b/htdocs/langs/nl_BE/mails.lang
index c4133e0bebe..776b4ed9b2e 100644
--- a/htdocs/langs/nl_BE/mails.lang
+++ b/htdocs/langs/nl_BE/mails.lang
@@ -1,4 +1,30 @@
 # Dolibarr language file - Source file is en_US - mails
+AllEMailings=Alle EMailings
 MailCard=EMailings kaart
+MailCC=Kopiëren naar
+MailCCC=Gecachde kopie aan
+MailMessage=E-mailinhoud
+ShowEMailing=Toon EMailing
+ListOfEMailings=EMailingenlijst
+NewMailing=Nieuwe EMailing
+EditMailing=Bewerk EMailing
+ResetMailing=EMailing opnieuw verzenden
+DeleteMailing=Verwijder EMailing
+DeleteAMailing=Verwijder een EMailing
+PreviewMailing=Voorbeeldweergave EMailing
+CreateMailing=Creëer EMailing
+ValidMailing=Geldige EMailing
+MailingSuccessfullyValidated=Emailing succesvol gevalideerd
+MailingStatusNotContact=Niet meer contacten
+WarningNoEMailsAdded=Geen nieuw E-mailadres aan de lijst van ontvangers toe te voegen.
+YouCanAddYourOwnPredefindedListHere=Om uw e-mailselectormodule te creëren, zie htdocs/core/modules/mailings/README.
+XTargetsAdded=<b>%s</b> ontvangers toegevoegd in bestemming-lijst
+MailingArea=EMailingsoverzicht
+TargetsStatistics=Geaddresseerdenstatistieken
+MailNoChangePossible=Ontvangers voor gevalideerde EMailings kunnen niet worden gewijzigd
 SearchAMailing=Zoek een E-mailing
 SendMailing=Verzend E-mailing
+TargetsReset=Lijst legen
+ToClearAllRecipientsClickHere=Klik hier om de lijst met ontvangers van deze EMailing te legen
+NbOfEMailingsReceived=Bulk Emailings ontvangen
+NbOfEMailingsSend=Mailings verstuurd
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index e91ff7bd44a..293c494d51e 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -19,6 +19,7 @@ FormatDateHourShort=%d-%m-%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
+CurrentTimeZone=Huidige Tijdszone
 NoRecordFound=Geen record gevonden
 ErrorCanNotCreateDir=Kan dir %s niet maken
 ErrorCanNotReadDir=Kan dir %s niet lezen
@@ -75,6 +76,7 @@ Category=Tag / categorie
 to=aan
 To=aan
 ApprovedBy2=Goedgekeurd door (tweede goedkeuring)
+NotRead=Ongelezen
 Offered=Beschikbaar
 SetLinkToAnotherThirdParty=Link naar een derde partij
 SelectAction=Selecteer actie
@@ -91,3 +93,4 @@ Select2SearchInProgress=Zoeken is aan de gang...
 SearchIntoProductsOrServices=Producten of diensten
 SearchIntoCustomerInvoices=Klant facturen
 SearchIntoExpenseReports=Uitgaven rapporten
+OnHold=Tijdelijk geblokkeerd
diff --git a/htdocs/langs/nl_BE/mrp.lang b/htdocs/langs/nl_BE/mrp.lang
new file mode 100644
index 00000000000..a8ff138755b
--- /dev/null
+++ b/htdocs/langs/nl_BE/mrp.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/nl_BE/products.lang b/htdocs/langs/nl_BE/products.lang
index 788278f0576..5448b609364 100644
--- a/htdocs/langs/nl_BE/products.lang
+++ b/htdocs/langs/nl_BE/products.lang
@@ -6,6 +6,5 @@ NotOnSell=Niet meer beschikbaar
 ProductStatusNotOnSell=Niet meer verkrijgbaar
 ProductStatusOnSellShort=Te koop
 ListOfStockMovements=Voorradenlijst
-CustomCode=Customs / Commodity / HS code
 ProductSellByQuarterHT=Bruto omzetcijfer per trimester
 ServiceSellByQuarterHT=Bruto omzetcijfer per trimester
diff --git a/htdocs/langs/nl_BE/sendings.lang b/htdocs/langs/nl_BE/sendings.lang
index c29f8d65119..d6acc920084 100644
--- a/htdocs/langs/nl_BE/sendings.lang
+++ b/htdocs/langs/nl_BE/sendings.lang
@@ -3,6 +3,7 @@ ShowSending=Toon Verzendingen
 Receivings=Ontvangstbevestingen
 LastSendings=Laatste %s verzendingen
 QtyPreparedOrShipped=Aantal voorbereid of verzonden
+QtyToShip=Aantal te verzenden
 QtyInOtherShipments=Aantal in andere verzendingen
 SendingsAndReceivingForSameOrder=Verzendingen en ontvangstbevestigingen van deze bestelling
 ConfirmDeleteSending=Weet u zeker dat u deze verzending wilt verwijderen?
diff --git a/htdocs/langs/nl_BE/ticket.lang b/htdocs/langs/nl_BE/ticket.lang
index 5fdcb01d6ba..943c019bd35 100644
--- a/htdocs/langs/nl_BE/ticket.lang
+++ b/htdocs/langs/nl_BE/ticket.lang
@@ -8,7 +8,6 @@ TicketDictSeverity=Ticket - Gradaties
 TicketTypeShortISSUE=Probleem, bug of probleem
 TicketTypeShortREQUEST=Verander- of verbeteringsverzoek
 TicketTypeShortOTHER=Ander
-TicketSeverityShortBLOCKING=Kritisch / Blokkerend
 ErrorBadEmailAddress=Veld '%s' onjuist
 MenuTicketMyAssignNonClosed=Mijn open tickets
 TypeContact_ticket_external_SUPPORTCLI=Klantcontact / incident volgen
diff --git a/htdocs/langs/nl_BE/withdrawals.lang b/htdocs/langs/nl_BE/withdrawals.lang
new file mode 100644
index 00000000000..facdefc082f
--- /dev/null
+++ b/htdocs/langs/nl_BE/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+ICS=Creditor Identifier CI for direct debit
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index c6449f8ac34..13032515f54 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=Deze dienst
 ThisProduct=Dit product
 DefaultForService=Standaard bij dienst
 DefaultForProduct=Standaard bij product
+ProductForThisThirdparty=Product for this thirdparty
+ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Geen voorstel
 AccountancySetupDoneFromAccountancyMenu=Meeste instellingen boekhouding worden gedaan vanuit menu %s
 ConfigAccountingExpert=Configuratie van boekhoud-module (dubbel boekhouden)
@@ -48,6 +50,7 @@ CountriesExceptMe=Alle landen behalve %s
 AccountantFiles=Bron-documenten exporteren
 ExportAccountingSourceDocHelp=Met deze tool kunt u de lijsten en pdf bestanden exporteren die werden gebruikt om uw boekhouding te genereren. Gebruik het menu-item %s - %s om uw dagboeken te exporteren.
 VueByAccountAccounting=Overzicht per grootboekrekening
+VueBySubAccountAccounting=Overzicht op volgorde subrekening
 
 MainAccountForCustomersNotDefined=De standaard grootboekrekening voor klanten is niet vastgelegd bij de instellingen
 MainAccountForSuppliersNotDefined=Hoofdrekening voor leveranciers die niet zijn gedefinieerd in de configuratie
@@ -144,7 +147,7 @@ NotVentilatedinAccount=Niet gekoppeld aan grootboekrekening
 XLineSuccessfullyBinded=%s producten/diensten met succes gekoppeld aan een grootboekrekening
 XLineFailedToBeBinded=%s producten/diensten zijn niet gekoppeld aan een grootboekrekening
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Aantal verbonden elementen per pagina (voorstel: max. 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximumaantal regels op lijst en bindpagina (aanbevolen: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin met het sorteren van de pagina nog te koppelen met de laatste boekingen
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin met het sorteren van de pagina koppelen voltooid met de laatste boekingen
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Werking label
-Sens=D/C
+Sens=Richting
+AccountingDirectionHelp=Voor een tegenrekening van een klant, gebruik Credit om een betaling vast te leggen die u hebt ontvangen <br> Gebruik een tegenrekening van een leverancier Debet om een betaling vast te leggen die u hebt gedaan
 LetteringCode=Aflettercode
 Lettering=Afletteren
 Codejournal=Journaal
@@ -206,7 +210,8 @@ JournalLabel=Journaal label
 NumPiece=Boekingstuk
 TransactionNumShort=Transactienummer
 AccountingCategory=Gepersonaliseerde groepen
-GroupByAccountAccounting=Groeperen per grootboekrekening
+GroupByAccountAccounting=Groeperen op grootboekrekening
+GroupBySubAccountAccounting=Groepeer op subgrootboekrekening
 AccountingAccountGroupsDesc=Hier kunt u enkele grootboekrekening-groepen definiëren. Deze worden gebruikt voor gepersonaliseerde boekhoudrapporten.
 ByAccounts=Op grootboekrekening
 ByPredefinedAccountGroups=Op voorgedefinieerde groepen
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Betaling niet gekoppeld aan een product / dienst
 OpeningBalance=Beginbalans
 ShowOpeningBalance=Toon beginbalans
 HideOpeningBalance=Verberg beginbalans
-ShowSubtotalByGroup=Totaal per groep
+ShowSubtotalByGroup=Toon subtotaal op niveau
 
 Pcgtype=Rekening hoofdgroep
 PcgtypeDesc=Cluster grootboekrekeningen welke gebruikt worden als vooraf gedefinieerde 'filter'- en' groepeer'-criteria voor sommige boekhoudrapporten. 'INKOMEN' of 'UITGAVEN' worden bijvoorbeeld gebruikt als groepen voor boekhoudrekeningen van producten om het kosten- / inkomstenrapport samen te stellen.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Hier kunt u de lijst raadplegen van kostenregels om te k
 DescVentilExpenseReportMore=Als u een account instelt op het type onkostendeclaratieregels, kan de toepassing alle bindingen maken tussen uw declaratieregels en de boekhoudrekening van uw rekeningschema, met één klik met de knop <strong> "%s" </ strong>. Als het account niet is ingesteld op het tarievenwoordenboek of als u nog steeds regels hebt die niet aan een account zijn gekoppeld, moet u een manuele binding maken via het menu "<strong> %s </ strong>".
 DescVentilDoneExpenseReport=Hier kunt u de lijst raadplegen van kostenregels met hun tegenrekening
 
+Closure=Jaarafsluiting
 DescClosure=Raadpleeg hier het aantal bewegingen per maand die niet zijn gevalideerd en fiscale jaren die al open zijn
 OverviewOfMovementsNotValidated=Stap 1 / Overzicht van bewegingen niet gevalideerd. (Noodzakelijk om een boekjaar af te sluiten)
+AllMovementsWereRecordedAsValidated=Alle boekingen zijn geregistreerd als gevalideerd
+NotAllMovementsCouldBeRecordedAsValidated=Niet alle boekingen konden als gevalideerd worden geregistreerd
 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
-SelectMonthAndValidate=Selecteer een maand en valideer bewerkingen
 
 ValidateHistory=Automatisch boeken
 AutomaticBindingDone=Automatisch koppelen voltooid
@@ -293,6 +300,7 @@ Accounted=Geboekt in grootboek
 NotYetAccounted=Nog niet doorgeboekt in boekhouding
 ShowTutorial=Handleiding weergeven
 NotReconciled=Niet afgestemd
+WarningRecordWithoutSubledgerAreExcluded=Pas op, alle bewerkingen zonder gedefinieerde subgrootboekrekening worden gefilterd en uitgesloten van deze weergave
 
 ## Admin
 BindingOptions=Koppelmogelijkheden
@@ -337,10 +345,11 @@ Modelcsv_LDCompta10=Exporteren voor LD Compta (v10 en hoger)
 Modelcsv_openconcerto=Exporteren voor OpenConcerto (test)
 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 Winfic - eWinfic - WinSis Compta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5Export for Gestinum (v5)
+Modelcsv_Gestinumv3=Exporteren voor Gestinum (v3)
+Modelcsv_Gestinumv5Export voor Gestinum (v5)
 ChartofaccountsId=Rekeningschema Id
 
 ## Tools - Init accounting account on product / service
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index 99c50f85f22..7459ec2257a 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -9,10 +9,10 @@ VersionExperimental=Experimenteel
 VersionDevelopment=Ontwikkeling
 VersionUnknown=Onbekend
 VersionRecommanded=Aanbevolen
-FileCheck=Bestands integriteit controles
-FileCheckDesc=Met deze tool kunt u de integriteit van bestanden en de installatie van uw applicatie controleren door elk bestand met het officiële bestand te vergelijken. De waarde van sommige setup-constanten kan ook worden gecontroleerd. U kunt deze tool gebruiken om te bepalen of bestanden zijn gewijzigd (bijvoorbeeld door een hacker).
-FileIntegrityIsStrictlyConformedWithReference=Bestandsintegriteit is sterk conform de referentiebestanden.
-FileIntegrityIsOkButFilesWereAdded=Integriteitscontrole is geslaagd, echter zijn er nieuwe bestanden toegevoegd.
+FileCheck=Bestandsintegriteit controles
+FileCheckDesc=Met deze tool kunt u de integriteit van bestanden en de installatie van uw applicatie controleren door elk bestand met het officiële bestand te vergelijken. De waarde van sommige set-up constanten kan ook worden gecontroleerd. U kunt deze tool gebruiken om te bepalen of bestanden zijn gewijzigd (bijvoorbeeld door een hacker).
+FileIntegrityIsStrictlyConformedWithReference=De integriteit van bestanden is strikt in overeenstemming met de referentie.
+FileIntegrityIsOkButFilesWereAdded=Integriteitscontrole is geslaagd, er zijn echter nieuwe bestanden toegevoegd.
 FileIntegritySomeFilesWereRemovedOrModified=Controle op integriteit van de bestanden is mislukt. Sommige bestanden zijn gewijzigd, verwijderd of toegevoegd.
 GlobalChecksum=Globaal controlegetal
 MakeIntegrityAnalysisFrom=Maak integriteitsanalyse van toepassingsbestanden van
@@ -24,27 +24,27 @@ FilesModified=Gewijzigde bestanden
 FilesAdded=Toegevoegde bestanden
 FileCheckDolibarr=Controleer de integriteit van applicatiebestanden
 AvailableOnlyOnPackagedVersions=Het lokale bestand voor integriteitscontrole is alleen beschikbaar wanneer de toepassing wordt geïnstalleerd vanuit een officieel pakket
-XmlNotFound=Xml-integriteitsbestand van de toepassing is niet gevonden
-SessionId=Sessie-ID
+XmlNotFound=XML integriteitsbestand van de toepassing is niet gevonden
+SessionId=Sessie ID
 SessionSaveHandler=Wijze van sessieopslag
 SessionSavePath=Sessie opslag locatie
 PurgeSessions=Verwijderen van sessies
 ConfirmPurgeSessions=Wilt u werkelijk alle sessies sluiten? Dit zal elke gebruikerssessie afbreken (behalve die van uzelf).
 NoSessionListWithThisHandler=Save session handler geconfigureerd in uw PHP staat niet toe dat alle lopende sessies worden vermeld.
 LockNewSessions=Blokkeer nieuwe sessies
-ConfirmLockNewSessions=Weet je zeker dat je elke nieuwe Dolibarr-verbinding wilt beperken tot jezelf? Alleen gebruiker <b>%s</b> kan daarna verbinding maken.
+ConfirmLockNewSessions=Weet je zeker dat je elke nieuwe Dolibarr verbinding wilt beperken tot jezelf? Alleen gebruiker <b>%s</b> kan daarna verbinding maken.
 UnlockNewSessions=Verwijder sessieblokkering
 YourSession=Uw sessie
-Sessions=Gebruikersessies
+Sessions=Gebruikerssessies
 WebUserGroup=Webserver gebruiker / groep
 PermissionsOnFilesInWebRoot=Machtigingen voor bestanden in de hoofdmap van het web
 PermissionsOnFile=Rechten op bestand %s
-NoSessionFound=Uw PHP-configuratie lijkt geen lijst van actieve sessies toe te staan. De map die wordt gebruikt om sessies op te slaan ( <b>%s</b> ) kan worden beschermd (bijvoorbeeld door OS-machtigingen of door PHP-richtlijn open_basedir).
+NoSessionFound=Uw PHP-configuratie lijkt geen lijst van actieve sessies toe te staan. De map die wordt gebruikt om sessies op te slaan ( <b>%s</b> ) kan worden beschermd (bijvoorbeeld door OS machtigingen of door PHP richtlijn open_basedir).
 DBStoringCharset=Database karakterset voor het opslaan van gegevens
 DBSortingCharset=Database karakterset voor het sorteren van gegevens
-HostCharset=Host-tekenset
-ClientCharset=Cliënt tekenset
-ClientSortingCharset=Cliënt vergelijking
+HostCharset=Host karakterset
+ClientCharset=Cliënt karakterset
+ClientSortingCharset=Cliënt collatie
 WarningModuleNotActive=<b>Module %s</b> dient te worden ingeschakeld
 WarningOnlyPermissionOfActivatedModules=Hier worden alleen de rechten van geactiveerde modules weergegeven. U kunt andere modules activeren  in het menu Home > Instellingen > Modules
 DolibarrSetup=Installatie of update van Dolibarr
@@ -56,6 +56,8 @@ GUISetup=Weergave
 SetupArea=Instellingen
 UploadNewTemplate=Nieuwe template(s) uploaden
 FormToTestFileUploadForm=Formulier waarmee bestandsupload kan worden getest (afhankelijk van de gekozen opties)
+ModuleMustBeEnabled=Module / applicatie <b>%s</b> moet ingeschakeld zijn
+ModuleIsEnabled=Module / applicatie <b>%s</b> is ingeschakeld
 IfModuleEnabled=Opmerking: Ja, is alleen effectief als module <b>%s</b> is geactiveerd
 RemoveLock=Verwijder / hernoem het bestand <b>%s</b> als het bestaat, om het gebruik van de update / installatie-tool toe te staan.
 RestoreLock=Herstel het bestand <b>%s</b> , met alleen leesrechten, om verder gebruik van de update / installatie-tool uit te schakelen.
@@ -64,9 +66,9 @@ SecurityFilesDesc=Definieer hier de opties met betrekking tot beveiliging bij he
 ErrorModuleRequirePHPVersion=Fout, deze module vereist PHP versie %s of hoger.
 ErrorModuleRequireDolibarrVersion=Fout, deze module vereist Dolibarr versie %s of hoger.
 ErrorDecimalLargerThanAreForbidden=Fout, een nauwkeurigheid van meer dan <b>%s</b> wordt niet ondersteund.
-DictionarySetup=Veldwaarde instellingen
-Dictionary=Veld waarden
-ErrorReservedTypeSystemSystemAuto=De waarde 'system' en 'systemauto' als type zijn voorbehouden voor het systeem.  Je kan 'user' als waarde gebruiken om je eigen gegevens-record toe te voegen.
+DictionarySetup=Woordenboek instellingen
+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=Opmerking: voor test- of foutopsporingsdoeleinden. Voor optimalisatie voor blinden of tekstbrowsers, kunt u ervoor kiezen om de instellingen op het profiel van de gebruiker te gebruiken
@@ -76,17 +78,16 @@ DelaiedFullListToSelectCompany=Wacht tot een toets wordt ingedrukt voordat inhou
 DelaiedFullListToSelectContact=Wacht tot een toets wordt ingedrukt voordat de inhoud van de combo-lijst met contactpersonen wordt geladen. <br> Dit kan de prestaties verbeteren als u een groot aantal contacten heeft, maar het is minder handig.
 NumberOfKeyToSearch=Aantal tekens om de zoekopdracht te activeren: %s
 NumberOfBytes=Aantal bytes
-SearchString=Zoekstring
-NotAvailableWhenAjaxDisabled=Niet beschikbaar wanneer AJAX functionaliteit uitgeschakeld is
-AllowToSelectProjectFromOtherCompany=Bij een document van een relatiej, kan een project worden gekozen dat is gekoppeld aan een relatie
+SearchString=Zoekreeks
+NotAvailableWhenAjaxDisabled=Niet beschikbaar wanneer AJAX functionaliteit is uitgeschakeld
+AllowToSelectProjectFromOtherCompany=Bij een document van een relatie, kan een project worden gekozen dat  gekoppeld is aan een andere relatie
 JavascriptDisabled=JavaScript uitgeschakeld
-UsePreviewTabs=Gebruik voorbeeld tabbladen
+UsePreviewTabs=Gebruik voorbeeldtabbladen
 ShowPreview=Toon voorbeeldweergave
 ShowHideDetails=Toon of verberg details
 PreviewNotAvailable=Voorbeeldweergave niet beschikbaar
 ThemeCurrentlyActive=Huidige thema
-CurrentTimeZone=Huidige tijdzone (server)
-MySQLTimeZone=Huidige tijdzone (database)
+MySQLTimeZone=Huidige tijdzone MySQL (database)
 TZHasNoEffect=Datums worden opgeslagen en geretourneerd door de databaseserver alsof ze werden bewaard als ingeleverde reeks. De tijdzone heeft alleen effect wanneer de UNIX_TIMESTAMP-functie wordt gebruikt (die niet door Dolibarr zou moeten worden gebruikt, dus database-TZ zou geen effect moeten hebben, zelfs als deze werd gewijzigd nadat gegevens waren ingevoerd).
 Space=Ruimte
 Table=Tabel
@@ -106,13 +107,13 @@ AntiVirusCommand=Het volledige pad naar het antiviruscommando
 AntiVirusCommandExample=Voorbeeld voor ClamAv Daemon (vereist clamav-daemon): / usr / bin / clamdscan<br>Voorbeeld voor ClamWin (erg langzaam): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= Aanvullende parameters op de opdrachtregel
 AntiVirusParamExample=Voorbeeld voor ClamAv Daemon: --fdpass<br>Voorbeeld voor ClamWin: --database = "C: \\ Program Files (x86) \\ ClamWin \\ lib"
-ComptaSetup=Instellingen van de boekhoudkundige module
+ComptaSetup=Instellingen van de boekhoud module
 UserSetup=Gebruikersbeheer instellingen
-MultiCurrencySetup=Setup meerdere valuta's
+MultiCurrencySetup=Set-up meerdere valuta's
 MenuLimits=Limieten en nauwkeurigheid
 MenuIdParent=ID van het bovenliggende menu
 DetailMenuIdParent=ID van het bovenliggend menu (0 voor een hoogste menu)
-DetailPosition=Sorteren aantal te definiëren menupositie
+DetailPosition=Sorteer nummer dat de volgorde van menupositie bepaalt
 AllMenus=Alles
 NotConfigured=Module/applicatie niet geconfigureerd
 Active=Actief
@@ -120,20 +121,20 @@ SetupShort=Instellingen
 OtherOptions=Overige opties
 OtherSetup=Andere instellingen
 CurrentValueSeparatorDecimal=Decimaal scheidingsteken
-CurrentValueSeparatorThousand=Duizend scheidingsteken
+CurrentValueSeparatorThousand=Duizendtal scheidingsteken
 Destination=Bestemming
 IdModule=Module ID
 IdPermissions=Rechten ID
 LanguageBrowserParameter=Instelling %s
-LocalisationDolibarrParameters=Localisatie-instellingen
-ClientTZ=Tijdzone van de klant (gebruiker)
-ClientHour=Tijd bij de klant (gebruiker)
+LocalisationDolibarrParameters=Lokalisatie instellingen
+ClientTZ=Tijdzone van de gebruiker
+ClientHour=Tijd bij de gebruiker
 OSTZ=Server OS tijdzone
 PHPTZ=Tijdzone PHP server
-DaylingSavingTime=Zomertijd (gebruiker)
-CurrentHour=Huidige tijd (server)
-CurrentSessionTimeOut=Huidige sessie timeout
-YouCanEditPHPTZ=Om een ​​andere PHP-tijdzone in te stellen (niet verplicht), kunt u proberen een .htaccess-bestand toe te voegen met de volgende regel: "SetEnv TZ Europe / Paris"
+DaylingSavingTime=Zomertijd
+CurrentHour=PHP tijd (server)
+CurrentSessionTimeOut=Huidige sessie time-out
+YouCanEditPHPTZ=Om een ​​andere PHP tijdzone in te stellen (niet verplicht), kunt u proberen een .htaccess bestand toe te voegen met de volgende regel: "SetEnv TZ Europe / Paris"
 HoursOnThisPageAreOnServerTZ=Waarschuwing, in tegenstelling tot andere schermen, bevinden de uren op deze pagina zich niet in uw lokale tijdzone, maar in de tijdzone van de server.
 Box=Widget
 Boxes=Widgets
@@ -142,7 +143,7 @@ AllWidgetsWereEnabled=Alle beschikbare widgets zijn geactiveerd
 PositionByDefault=Standaard volgorde
 Position=Positie
 MenusDesc=Menu-managers bepalen de inhoud van de twee menubalken in (horizontaal en verticaal).
-MenusEditorDesc=Met behulp van de menu-editor kunt u gepersonaliseerde items in menu's instellen. Gebruik deze functionaliteit zorgvuldig om te vermijden dat Dolibarr instabiel wordt en menu-items permanent onbereikbaar worden.<br>Sommige modules voegen items toe in de menu's (in de meeste gevallen in het menu <b>Alle</b>). Als u sommige van deze items abusievelijk verwijderd, dan kunt u ze herstellen door de module eerst uit te schakelen en daarna opnieuw in te schakelen.
+MenusEditorDesc=Met behulp van de menu-editor kunt u gepersonaliseerde items in menu's instellen. Gebruik deze functionaliteit zorgvuldig om te vermijden dat Dolibarr instabiel wordt en menu-items permanent onbereikbaar worden.<br>Sommige modules voegen items toe in de menu's (in de meeste gevallen in het menu <b>Alle</b>). Wanneer u sommige van deze items abusievelijk verwijdert, dan kunt u ze herstellen door de module eerst uit te schakelen en daarna weer opnieuw in te schakelen.
 MenuForUsers=Gebruikersmenu
 LangFile=.lang bestand
 Language_en_US_es_MX_etc=Taal (en_US, es_MX, ...)
@@ -153,9 +154,9 @@ SystemToolsAreaDesc=Dit gebied biedt beheerfuncties. Gebruik het menu om de gewe
 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 tijdelijke bestanden (geen risico op gegevensverlies). Opmerking: verwijdering vindt alleen plaats als de tijdelijke map 24 uur geleden is gemaakt.
-PurgeDeleteTemporaryFilesShort=Verwijder tijdelijke bestanden
-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.
+PurgeDeleteTemporaryFiles=Verwijder alle log- en tijdelijke bestanden (geen risico op gegevensverlies). Opmerking: tijdelijke bestanden worden alleen verwijderd als de tijdelijke map meer dan 24 uur geleden is gemaakt.
+PurgeDeleteTemporaryFilesShort=Verwijder logboek en tijdelijke bestanden
+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.
 PurgeNDirectoriesDeleted=<b>%s</b> bestanden of mappen verwijderd.
@@ -163,18 +164,18 @@ PurgeNDirectoriesFailed=Kan <b>%s</b>bestanden of mappen niet verwijderen.
 PurgeAuditEvents=Verwijder alle beveiligingsgerelateerde gebeurtenissen
 ConfirmPurgeAuditEvents=Weet u zeker dat u alle beveiligingsgerelateerde gebeurtenissen wilt verwijderen? Alle beveiligingsgerelateerde logbestanden zullen worden verwijderd. Er zullen geen andere gegevens worden verwijderd.
 GenerateBackup=Genereer backup
-Backup=Backup
+Backup=Back-up
 Restore=Herstellen
-RunCommandSummary=Backup geïnitieerd met het volgende commando
-BackupResult=Resultaat backup
-BackupFileSuccessfullyCreated=Backupbestand succesvol gegenereerd
+RunCommandSummary=Back-up geïnitieerd met het volgende commando
+BackupResult=Resultaat back-up
+BackupFileSuccessfullyCreated=Back-upbestand succesvol gegenereerd
 YouCanDownloadBackupFile=Het gegenereerde bestand kan nu worden gedownload
 NoBackupFileAvailable=Geen back-up bestanden beschikbaar.
 ExportMethod=Exporteer methode
 ImportMethod=Importeer methode
 ToBuildBackupFileClickHere=Om een back-up bestand te maken, klik <a href="%s">hier</a>.
-ImportMySqlDesc=Om een MySQL-back-upbestand te importeren, kunt u phpMyAdmin gebruiken via uw hosting of de opdracht mysql gebruiken vanaf de opdrachtregel. <br> Bijvoorbeeld:
-ImportPostgreSqlDesc=Om een backupbestand te importeren, dient u het 'pg_restore' commando vanaf de opdrachtregel uit te voeren:
+ImportMySqlDesc=Om een MySQL back-upbestand te importeren, kunt u phpMyAdmin gebruiken via uw hosting of de opdracht mysql gebruiken vanaf de opdrachtregel. <br> Bijvoorbeeld:
+ImportPostgreSqlDesc=Om een back-upbestand te importeren, dient u het 'pg_restore' commando vanaf de opdrachtregel uit te voeren:
 ImportMySqlCommand=%s %s < mijnbackupbestand.sql
 ImportPostgreSqlCommand=%s %s mijnbackupbestand.sql
 FileNameToGenerate=Bestandsnaam voor back-up:
@@ -194,7 +195,7 @@ AddDropTable=Voeg 'DROP TABLE' commando toe
 ExportStructure=Structuur
 NameColumn=Naam kolommen
 ExtendedInsert=Uitgebreide (extended) INSERT
-NoLockBeforeInsert=Geen lock-opdrachten rond INSERT
+NoLockBeforeInsert=Geen lock opdrachten rond INSERT
 DelayedInsert=Vertraagde (delayed) INSERT
 EncodeBinariesInHexa=Codeer binaire data in hexadecimalen
 IgnoreDuplicateRecords=Negeer fouten van dubbele tabelregels (INSERT negeren)
@@ -218,11 +219,11 @@ CompatibleAfterUpdate=Deze module vereist een update van uw Dolibarr %s (Min %s
 SeeInMarkerPlace=Bekijk in winkel
 SeeSetupOfModule=Zie setup van module%s
 Updated=Bijgewerkt
-Nouveauté=Nieuwsitems
+Nouveauté=Nieuwigheid
 AchatTelechargement=Kopen / Downloaden
 GoModuleSetupArea=Ga naar het gedeelte Module-instellingen om een nieuwe module te implementeren/installeren: <a href="%s">%s</a> .
 DoliStoreDesc=DoliStore, de officiële markt voor externe Dolibarr ERP / CRM modules.
-DoliPartnersDesc=Lijst met bedrijven die op maat ontwikkelde modules of functies leveren. <br>Opmerking: aangezien Dolibarr een open source-applicatie is, moet <i>iedereen</i> die ervaring heeft met PHP-programmering een module moeten kunnen ontwikkelen.
+DoliPartnersDesc=Lijst met bedrijven die op maat ontwikkelde modules of functies leveren. <br>Opmerking: aangezien Dolibarr een open source-applicatie is, moet <i>iedereen</i> die ervaring heeft met PHP-programmering een module kunnen ontwikkelen.
 WebSiteDesc=Externe websites voor meer add-on (niet-core) modules ...
 DevelopYourModuleDesc=Enkele oplossingen om uw eigen module te ontwikkelen ...
 URL=URL
@@ -246,17 +247,18 @@ ProtectAndEncryptPdfFilesDesc=Bescherming van PDF files, deze kunnen nog gelezen
 Feature=Functionaliteit
 DolibarrLicense=Licentie
 Developpers=Ontwikkelaars / mensen die bijgedragen hebben
-OfficialWebSite=Officiële Dolibarr-website
+OfficialWebSite=Officiële Dolibarr website
 OfficialWebSiteLocal=Lokale website (%s)
 OfficialWiki=Dolibarr documentatie / Wiki
 OfficialDemo=Online demonstratie van Dolibarr
 OfficialMarketPlace=Officiële markt voor externe modules / addons
 OfficialWebHostingService=Verwezen web hosting diensten (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
+ReferencedPreferredPartners=Voorkeur Partners
 OtherResources=Andere middelen
 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>
+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>
 HelpCenterDesc1=Hier enkele bronnen voor hulp en ondersteuning met Dolibarr.
 HelpCenterDesc2=Enkele bronnen zijn alleen beschikbaar in het <b>Engels</b>.
@@ -277,8 +279,8 @@ EMailsSetup=E-mail instellingen
 EMailsDesc=Op deze pagina kunt u parameters of opties instellen voor het verzenden van e-mail.
 EmailSenderProfiles=Verzender e-mails profielen
 EMailsSenderProfileDesc=U kunt deze sectie leeg houden. Als u hier enkele e-mails invoert, worden deze toegevoegd aan de lijst met mogelijke afzenders in de combobox wanneer u een nieuwe e-mail schrijft.
-MAIN_MAIL_SMTP_PORT=SMTP / SMTPS-poort (standaardwaarde in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS-host (standaardwaarde in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_PORT=SMTP / SMTPS-poort (standaard waarde in php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS-host (standaard waarde in php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS-poort (niet gedefinieerd in PHP op Unix-achtige systemen)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (niet gedefinieerd in PHP op Unix-achtige systemen)
 MAIN_MAIL_EMAIL_FROM=E-mail afzender voor automatische e-mails (standaardwaarde in php.ini: <b>%s</b>)
@@ -289,17 +291,17 @@ MAIN_MAIL_FORCE_SENDTO=Stuur alle e-mails naar (in plaats van echte ontvangers,
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Stel e-mails van werknemers (indien gedefinieerd) voor in de lijst met vooraf gedefinieerde ontvangers bij het schrijven van een nieuwe e-mail
 MAIN_MAIL_SENDMODE=E-mail verzendmethode
 MAIN_MAIL_SMTPS_ID=SMTP ID (als het verzenden vanaf de server authenticatie vereist)
-MAIN_MAIL_SMTPS_PW=SMTP-wachtwoord (als het verzenden vanaf de server authenticatie vereist)
+MAIN_MAIL_SMTPS_PW=SMTP wachtwoord (als het verzenden vanaf de server authenticatie vereist)
 MAIN_MAIL_EMAIL_TLS=Gebruik TLS (SSL) encryptie
 MAIN_MAIL_EMAIL_STARTTLS=Gebruik TLS (STARTTLS) -codering
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
-MAIN_MAIL_EMAIL_DKIM_ENABLED=Gebruik DKIM om een e-mailhandtekening te genereren
-MAIN_MAIL_EMAIL_DKIM_DOMAIN=E-maildomein voor gebruik met dkim
-MAIN_MAIL_EMAIL_DKIM_SELECTOR=Naam van dkim selector
-MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Persoonlijke sleutel voor dkim-ondertekening
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autoriseer zelfondertekende certificaten
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Gebruik DKIM om een e-mail handtekening te genereren
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=E-maildomein voor gebruik met DKIM
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Naam van DKIM selector
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Persoonlijke sleutel voor DKIM ondertekening
 MAIN_DISABLE_ALL_SMS=Schakel alle sms-verzending uit (voor testdoeleinden of demo's)
 MAIN_SMS_SENDMODE=Methode te gebruiken om SMS te verzenden
-MAIN_MAIL_SMS_FROM=Standaard afzender telefoonnummer voor SMS-verzending
+MAIN_MAIL_SMS_FROM=Standaard afzender telefoonnummer voor SMS verzending
 MAIN_MAIL_DEFAULT_FROMTYPE=Standaard afzender e-mail voor handmatig verzenden (gebruikers e-mail of bedrijf e-mail)
 UserEmail=E-mailadres gebruiker
 CompanyEmail=E-mailadres bedrijf
@@ -307,46 +309,46 @@ FeatureNotAvailableOnLinux=Functionaliteit niet beschikbaar op Unix-achtige syst
 FixOnTransifex=Verbeter de vertaling op het online vertaalplatform van het project
 SubmitTranslation=Als de vertaling voor deze taal niet compleet is of als u fouten vindt, kunt u dit corrigeren door bestanden in directory <b>langs / %s te bewerken</b> en uw wijziging in te dienen op www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=Als de vertaling voor deze taal niet compleet is of als je fouten tegenkomt, kun je dit corrigeren door bestanden te bewerken in de directory <b> langs / %s </b> en aangepaste bestanden in te dienen op dolibarr.org/forum of, als je een ontwikkelaar bent, met een PR op github .com / Dolibarr / dolibarr
-ModuleSetup=Module-instellingen
+ModuleSetup=Module instellingen
 ModulesSetup=Instellingen van modules & applicatie
 ModuleFamilyBase=Systeem
 ModuleFamilyCrm=Customer Relationship Management (CRM)
 ModuleFamilySrm=Vendor Relationship Management (VRM)
 ModuleFamilyProducts=Product Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projecten / Samenwerkingen
+ModuleFamilyProjects=Projecten / Samenwerking
 ModuleFamilyOther=Ander
-ModuleFamilyTechnic=Hulpmiddelen voor multi-modules
+ModuleFamilyTechnic=Hulpmiddelen voor multi modules
 ModuleFamilyExperimental=Experimentele modules
 ModuleFamilyFinancial=Financiële Modules (Boekhouding / Bedrijfsfinanciën)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Websites en andere frontale toepassing
+ModuleFamilyPortal=Websites en andere toepassingen met gebruikersinterface
 ModuleFamilyInterface=Interfaces met externe systemen
 MenuHandlers=Menuverwerkers
 MenuAdmin=Menu wijzigen
 DoNotUseInProduction=Niet in productie gebruiken
 ThisIsProcessToFollow=Upgradeprocedure:
-ThisIsAlternativeProcessToFollow=Dit is een alternatieve setup om handmatig te verwerken:
+ThisIsAlternativeProcessToFollow=Dit is een alternatieve set-up om handmatig te verwerken:
 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 verpakte bestanden 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>.
+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>
+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>
-InfDirExample=<br>Leg dit vast in het bestand <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>Als deze lijnen zijn inactief gemaakt met een "#" teken, verwijder dit teken dan om ze te activeren.
-YouCanSubmitFile=U kunt het .zip-bestand van het modulepakket vanaf hier uploaden:
+InfDirExample=<br>Leg dit vast in het bestand <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>Als deze regels inactief zijn gemaakt met een "#" teken, verwijder dit teken dan om ze te activeren.
+YouCanSubmitFile=U kunt het .zip bestand van het modulepakket vanaf hier uploaden:
 CurrentVersion=Huidige versie van Dolibarr
 CallUpdatePage=Blader naar de pagina die de databasestructuur en gegevens bijwerkt: %s.
 LastStableVersion=Laatste stabiele versie
 LastActivationDate=Laatste activeringsdatum
 LastActivationAuthor=Laatste activeringsauteur
-LastActivationIP=Laatste activerings-IP
+LastActivationIP=Laatste activering IP-adres
 UpdateServerOffline=Updateserver offline
 WithCounter=Beheer een teller
 GenericMaskCodes=U kunt elk gewenst maskernummer invoeren. In dit masker, kunnen de volgende tags worden gebruikt:<br><b>{000000}</b> correspondeert met een nummer welke vermeerderd zal worden op elke %s. Voer zoveel nullen in als de gewenste lengte van de teller. De teller wordt aangevuld met nullen vanaf links zodat er zoveel nullen zijn als in het masker.<br><b>{000000+000}</b> hetzelfde als voorgaand maar een offset corresponderend met het nummer aan de rechterkant van het + teken is toegevoegd startend op de eerste %s. <br><b>{000000@x}</b> hetzelfde als voorgaande maar de teller wordt gereset naar nul, wanneer maand x is bereikt (x tussen 1 en 12). Als deze optie is gebruikt en x is 2 of hoger, dan is de volgorde {yy}{mm} of {yyyy}{mm} ook vereist. <br><b>{dd}</b> dag (01 t/m 31).<br><b>{mm}</b> maand (01 t/m 12).<br><b>{yy}</b>, <b>{yyyy}</b> of <b>{y}</b> jaat over 2, 4 of 1 nummer(s). <br>
-GenericMaskCodes2=<b>{cccc}</b>de clientcode op n tekens<br> <b>{cccc000}</b> de cliëntcode op n tekens wordt gevolgd door een teller die is toegewezen aan de klant. Deze teller voor de klant wordt op hetzelfde moment gereset als de globale teller.<br><b> {tttt}</b> De code van het type van derden op n tekens (zie menu Home - Setup - Woordenboek - Soorten derden) . Als u deze label toevoegt, is de teller anders voor elk type derde partij.<br>
+GenericMaskCodes2=<b>{cccc}</b>de cliëntcode op n tekens<br> <b>{cccc000}</b> de cliëntcode op n tekens wordt gevolgd door een teller die is toegewezen aan de klant. Deze teller voor de klant wordt op hetzelfde moment gereset als de globale teller.<br><b> {tttt}</b> De code van het type van derden op n tekens (zie menu Home - Set-up - Woordenboek - Soorten derden) . Als u deze label toevoegt, is de teller anders voor elk type derde partij.<br>
 GenericMaskCodes3=Alle andere karakters in het masker zullen intact blijven.<br>Spaties zijn niet toegestaan.<br>
 GenericMaskCodes4a=<u>Voorbeeld op de 99e %s van relaties TheCompany, met datum 2007-01-31: </u><br>
 GenericMaskCodes4b=<u>Voorbeeld van een Klant gecreëerd op 2007-03-01:</u><br>
@@ -360,23 +362,23 @@ DoTestSend=Test verzenden
 DoTestSendHTML=Test het verzenden van HTML
 ErrorCantUseRazIfNoYearInMask=Fout, kan optie @ niet gebruiken om teller te resetten als sequence {yy} or {yyyy}  niet in het masker.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Fout, kan optie @ niet gebruiken wanneer de volgorde {jj}{mm} of {jjjj}{mm} niet is opgenomen in het masker.
-UMask=Umask parameter voor nieuwe bestanden op een Unix- / Linux- / BSD-bestandssysteem.
-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 cacheexport in secondes (0 of leeg voor geen cache)
-DisableLinkToHelpCenter=Verberg de link "<b>ondersteuning of hulp nodig</b>" op de inlogpagina
+UMask=Umask parameter voor nieuwe bestanden op een Unix- / Linux- / BSD bestandssysteem.
+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=Verberg de link "<b>Ondersteuning of hulp nodig</b>" op de inlogpagina
 DisableLinkToHelp=Verberg de link naar online hulp "<b>%s</b>"
-AddCRIfTooLong=Er is geen automatische tekstterugloop, 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 zuivering wilt uitvoeren? <br> Hiermee worden al uw gegevensbestanden permanent verwijderd zonder dat ze worden teruggezet (ECM-bestanden, bijgevoegde bestanden ...).
+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
 LanguageFilesCachedIntoShmopSharedMemory=Bestanden .lang in het gedeelde geheugen
 LanguageFile=Taalbestand
 ExamplesWithCurrentSetup=Voorbeelden met huidige configuratie
-ListOfDirectories=Lijst van OpenDocument sjablonenmappen
-ListOfDirectoriesForModelGenODT=Lijst van de directorie's die de templates bevatten in OpenDocument formaat.<br><br>Plaats hier het volledige pad van de directorie.<br>Voeg een nieuwe lijn tussen elke directorie.<br>Om een directorie van de GED module bij te voegen, voeg hier <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b> toe.<br><br>Bestanden in deze directorie's moeten eindigen op <b>.odt</b> of <b>.ods</b>.
-NumberOfModelFilesFound=Aantal  gevonden ODT/ODS-sjabloonbestanden
-ExampleOfDirectoriesForModelGen=Voorbeelden van de syntaxis: <br>c:\\mijndir<br>/home/mijndir<br>DOL_DATA_ROOT/ECM/ecmdir
-FollowingSubstitutionKeysCanBeUsed=Door het plaatsen van de volgende velden in het sjabloon krijgt u een vervanging met de aangepaste waarde bij het genereren van het document:
+ListOfDirectories=Lijst van OpenDocument sjabloonmappen
+ListOfDirectoriesForModelGenODT=Lijst van de directory's die de templates bevatten in OpenDocument formaat.<br><br>Plaats hier het volledige pad van de directory.<br>Voeg een nieuwe lijn tussen elke directory.<br>Om een directory van de GED module bij te voegen, voeg hier <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b> toe.<br><br>Bestanden in deze directory's moeten eindigen op <b>.odt</b> of <b>.ods</b>.
+NumberOfModelFilesFound=Aantal  gevonden ODT/ODS sjabloonbestanden
+ExampleOfDirectoriesForModelGen=Syntax-voorbeeld: <br> c: \\ myapp \\ mydocumentdir \\ mysubdir <br> / home / myapp / mydocumentdir / mysubdir <br> DOL_DATA_ROOT / ecm / ecmdir
+FollowingSubstitutionKeysCanBeUsed=Lees de Wiki documentatie om te weten hoe u uw odt documentsjablonen moet maken voordat u ze in die mappen opslaat
 FullListOnOnlineDocumentation=De complete lijst met beschikbare velden is te vinden in de gebruikersdocumentatie op de Wiki van Dolibar: http://wiki.dolibarr.org.
 FirstnameNamePosition=Positie van voornaam / achternaam
 DescWeather=De volgende afbeeldingen worden op het dashboard weergegeven wanneer het aantal late acties de volgende waarden bereiken:
@@ -389,28 +391,28 @@ ResponseTimeout=Time-out antwoord
 SmsTestMessage=Testbericht van __PHONEFROM__ naar __PHONETO__
 ModuleMustBeEnabledFirst=Module <b>%s</b> moet eerst worden ingeschakeld als je deze functie wilt gebruiken.
 SecurityToken=Sleutel tot URL beveiligen
-NoSmsEngine=Geen SMS-afzende-rbeheerder beschikbaar. Een SMS-afzenderbeheer is niet geïnstalleerd met de standaarddistributie omdat deze afhankelijk zijn van een externe leverancier, maar u kunt er enkele vinden op %s
+NoSmsEngine=Geen SMS afzender beheerder beschikbaar. Een SMS afzender beheerder is niet geïnstalleerd met de standaarddistributie omdat deze afhankelijk zijn van een externe leverancier, maar u kunt er enkele vinden op %s
 PDF=PDF
 PDFDesc=Algemene opties voor het genereren van PDF's
 PDFAddressForging=Regels voor adres sectie
-HideAnyVATInformationOnPDF=Verberg alle informatie met betrekking tot omzetbelasting / BTW
-PDFRulesForSalesTax=Regels voor omzet-belasting/btw
+HideAnyVATInformationOnPDF=Verberg alle informatie met betrekking tot omzetbelasting / Btw
+PDFRulesForSalesTax=Regels voor omzet-belasting/Btw
 PDFLocaltax=Regels voor %s
-HideLocalTaxOnPDF=Verberg het %s-tarief in de kolom Verkoopbelasting / btw
+HideLocalTaxOnPDF=Verberg het %s-tarief in de kolom Verkoopbelasting / Btw
 HideDescOnPDF=Verberg productomschrijving
 HideRefOnPDF=Verberg productreferentie
 HideDetailsOnPDF=Verberg productdetails
 PlaceCustomerAddressToIsoLocation=Gebruik de Franse standaardpositie (La Poste) als positie van het klant-adres
 Library=Bibliotheek
-UrlGenerationParameters=Parameters om URL beveiligen
-SecurityTokenIsUnique=Gebruik een unieke securekey parameter voor elke URL
+UrlGenerationParameters=Parameters om URL's te beveiligen
+SecurityTokenIsUnique=Gebruik een unieke secure key parameter voor elke URL
 EnterRefToBuildUrl=Geef referentie voor object %s
-GetSecuredUrl=Get berekende URL
-ButtonHideUnauthorized=Verberg de knoppen voor niet-beheerders bij ongeoorloofde acties in plaats van grijs gekleurde, uitgeschakelde knoppen
-OldVATRates=Oud BTW tarief
-NewVATRates=Nieuw BTW tarief
-PriceBaseTypeToChange=Wijzig op prijzen waarop een base reference waarde gedefiniëerd is
-MassConvert=Start conversie
+GetSecuredUrl=Verkrijg berekende URL
+ButtonHideUnauthorized=Verberg ongeautoriseerde actieknoppen ook voor interne gebruikers (anders alleen grijs)
+OldVATRates=Oud Btw tarief
+NewVATRates=Nieuw Btw tarief
+PriceBaseTypeToChange=Wijzig op prijzen waarop een basis referentie waarde gedefinieerd is
+MassConvert=Start bulk conversie
 PriceFormatInCurrentLanguage=Prijsindeling in huidige taal
 String=String
 String1Line=String (1 regel)
@@ -420,7 +422,7 @@ HtmlText=HTML-tekst
 Int=Integer
 Float=Float
 DateAndTime=Datum en uur
-Unique=Unique
+Unique=Uniek
 Boolean=Boolean (één checkbox)
 ExtrafieldPhone = Telefoon
 ExtrafieldPrice = Prijs
@@ -435,16 +437,16 @@ ExtrafieldCheckBox=Checkboxen
 ExtrafieldCheckBoxFromList=Checkboxen uit tabel
 ExtrafieldLink=Link naar een object
 ComputedFormula=Berekend veld
-ComputedFormulaDesc=U kunt hier een formule invoeren met andere eigenschappen van het object of een PHP-codering om een dynamisch berekende waarde te krijgen. U kunt alle PHP-compatibele formules gebruiken, inclusief de "?" condition operator en volgend globaal object: <strong> $ db, $ conf, $ langs, $ mysoc, $ user, $ object </strong>. <br> <strong> WAARSCHUWING </strong>: Mogelijk zijn slechts enkele eigenschappen van $ object beschikbaar. Als je eigenschappen nodig hebt die niet zijn geladen, haal dan gewoon het object in je formule zoals in het tweede voorbeeld. <br> Als u een berekend veld gebruikt, betekent dit dat u geen enkele waarde uit de interface kunt invoeren. Als er een syntaxisfout is, retourneert de formule mogelijk ook niets. <br> <br> Voorbeeld van formule: <br> $ object-> id < 10 ? round($object-> id / 2, 2): ($ object-> id + 2 * $ user-> id) * (int) substr ($ mysoc-> zip, 1, 2 ) <br> <br> Voorbeeld om object <br> (($ $ reloadedobj = new Societe ($ db)) && ($ reloadedobj-> fetchNoCompute ($ obj-> id? $ obj-> id> ($ obj-> id: ($ obj-)) te herladen > rowid: $ object-> id))> 0))? $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1' <br> <br> Ander voorbeeld van formule om het laden van een object en het bovenliggende object te forceren: <br> (($ reloadedbj0) )) && ($ reloadedobj-> fetchNoCompute ($ object-> id)> 0) && ($ secondloadedobj = nieuw project ($ db)) && ($ secondloadedobj-> fetchNoCompute ($ reloadedobj-> fk_project)> 0))? $ secondloadedobj-> ref: 'Parent project not found'
+ComputedFormulaDesc=U kunt hier een formule invoeren met andere eigenschappen van het object of een PHP-codering om een dynamisch berekende waarde te krijgen. U kunt alle PHP compatibele formules gebruiken, inclusief de "?" condition operator en volgend globaal object: <strong> $ db, $ conf, $ langs, $ mysoc, $ user, $ object </strong>. <br> <strong> WAARSCHUWING </strong>: Mogelijk zijn slechts enkele eigenschappen van $ object beschikbaar. Als je eigenschappen nodig hebt die niet zijn geladen, haal dan gewoon het object in je formule zoals in het tweede voorbeeld. <br> Als u een berekend veld gebruikt, betekent dit dat u geen enkele waarde uit de interface kunt invoeren. Als er een syntaxisfout is, retourneert de formule mogelijk ook niets. <br> <br> Voorbeeld van formule: <br> $ object-> id < 10 ? round($object-> id / 2, 2): ($ object-> id + 2 * $ user-> id) * (int) substr ($ mysoc-> zip, 1, 2 ) <br> <br> Voorbeeld om object <br> (($ $ reloadedobj = new Societe ($ db)) && ($ reloadedobj-> fetchNoCompute ($ obj-> id? $ obj-> id> ($ obj-> id: ($ obj-)) te herladen > rowid: $ object-> id))> 0))? $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1' <br> <br> Ander voorbeeld van formule om het laden van een object en het bovenliggende object te forceren: <br> (($ reloadedbj0) )) && ($ reloadedobj-> fetchNoCompute ($ object-> id)> 0) && ($ secondloadedobj = nieuw project ($ db)) && ($ secondloadedobj-> fetchNoCompute ($ reloadedobj-> fk_project)> 0))? $ secondloadedobj-> ref: 'Parent project not found'
 Computedpersistent=Berekend veld opslaan
 ComputedpersistentDesc=Berekende extra velden worden opgeslagen in de database, maar de waarde wordt alleen opnieuw berekend als het object van dit veld wordt gewijzigd. Als het berekende veld afhankelijk is van andere objecten of algemene gegevens, kan deze waarde onjuist zijn !!
 ExtrafieldParamHelpPassword=Dit veld leeg laten betekent dat deze waarde zonder codering wordt opgeslagen (veld mag alleen worden verborgen met een ster op het scherm). <br> Stel 'auto' in om de standaard coderingsregel te gebruiken om het wachtwoord in de database op te slaan (waarde lezen is dan alleen de hash, geen manier om de oorspronkelijke waarde op te halen)
-ExtrafieldParamHelpselect=Waardenlijst moet regels zijn met opmaaksleutel, waarde (waar sleutel niet '0' kan zijn) <br><br> bijvoorbeeld: <br> 1, waarde1 <br> 2, value2 <br> code3, waarde3 <br> ... <br><br> Om de lijst afhankelijk van een andere aanvullende attributenlijst te krijgen: <br> 1, waarde1 | options_ <i>parent_list_code</i> : parent_key <br> 2, <i>value2</i> | options_ <i>parent_list_code</i> : parent_key <br><br> Om de lijst afhankelijk van een andere lijst te krijgen: <br> 1, waarde1 | <i>parent_list_code</i> : parent_key <br> 2, waarde2 | <i>parent_list_code</i> : parent_key
-ExtrafieldParamHelpcheckbox=Waardenlijst moet regels zijn met opmaaksleutel, waarde (waar sleutel niet '0' kan zijn) <br><br> bijvoorbeeld: <br> 1, waarde1 <br> 2, value2 <br> 3, waarde3 <br> ...
-ExtrafieldParamHelpradio=Waardenlijst moet regels zijn met opmaaksleutel, waarde (waar sleutel niet '0' kan zijn) <br><br> bijvoorbeeld: <br> 1, waarde1 <br> 2, value2 <br> 3, waarde3 <br> ...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpselect=Lijst met waarden moeten regels zijn met opmaaksleutel, waarde (waar sleutel niet '0' kan zijn) <br><br> bijvoorbeeld: <br> 1, waarde1 <br> 2, value2 <br> code3, waarde3 <br> ... <br><br> Om de lijst afhankelijk van een andere aanvullende attributenlijst te krijgen: <br> 1, waarde1 | options_ <i>parent_list_code</i> : parent_key <br> 2, <i>value2</i> | options_ <i>parent_list_code</i> : parent_key <br><br> Om de lijst afhankelijk van een andere lijst te krijgen: <br> 1, waarde1 | <i>parent_list_code</i> : parent_key <br> 2, waarde2 | <i>parent_list_code</i> : parent_key
+ExtrafieldParamHelpcheckbox=Lijst met waarden moeten regels zijn met opmaaksleutel, waarde (waar sleutel niet '0' kan zijn) <br><br> bijvoorbeeld: <br> 1, waarde1 <br> 2, value2 <br> 3, waarde3 <br> ...
+ExtrafieldParamHelpradio=Lijst met waarden moeten regels zijn met opmaaksleutel, waarde (waar sleutel niet '0' kan zijn) <br><br> bijvoorbeeld: <br> 1, waarde1 <br> 2, value2 <br> 3, waarde3 <br> ...
+ExtrafieldParamHelpsellist=Lijst met waarden komen van een tabel<br>Syntax: table_name:label_field:id_field::filter<br>Bijvoorbeeld: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Lijst met waarden komt uit een tabel <br> Syntaxis: tabelnaam: labelveld: id_veld :: filter <br> Voorbeeld: c_typent: libelle: id :: filter <br><br> filter kan een eenvoudige test zijn (bijv. actief = 1) om alleen de actieve waarde weer te geven <br> U kunt ook $ ID $ gebruiken in filter waarvan de huidige id van het huidige object is <br> Gebruik $ SEL $ om een SELECT in filter te doen <br> Als u op extra velden wilt filteren, gebruikt u syntaxis extra.fieldcode = ... (waarbij veldcode de code van extraveld is) <br><br> Om de lijst afhankelijk van een andere aanvullende attributenlijst te krijgen: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: filter <br><br> Om de lijst afhankelijk van een andere lijst te krijgen: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
+ExtrafieldParamHelplink=Parameters moeten Objectnaam: Classpath<br> Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Blijf leeg voor een eenvoudig scheidingsteken <br> Stel dit in op 1 voor een samenvouwend scheidingsteken (standaard geopend voor nieuwe sessie, dan wordt de status behouden voor elke gebruikerssessie) <br> Stel dit in op 2 voor een samenvouwend scheidingsteken (standaard samengevouwen voor nieuwe sessie, dan wordt de status behouden voor elke gebruikerssessie)
 LibraryToBuildPDF=Gebruikte library voor generen PDF
 LocalTaxDesc=Sommige landen kunnen twee of drie belastingen toepassen op elke factuurregel. Als dit het geval is, kiest u het type voor de tweede en derde belasting en het tarief. Mogelijk type zijn: <br> 1: lokale belasting van toepassing op producten en diensten zonder btw (lokale belasting wordt berekend op bedrag zonder btw) <br> 2: lokale belasting van toepassing op producten en diensten inclusief btw (lokale belasting wordt berekend op bedrag + hoofdbelasting) <br> 3: lokale belasting van toepassing op producten zonder btw (lokale belasting wordt berekend op bedrag zonder btw) <br> 4: lokale belasting van toepassing op producten inclusief btw (lokale belasting wordt berekend op bedrag + hoofd btw) <br> 5: lokale belasting van toepassing op diensten zonder btw (lokale belasting wordt berekend op bedrag zonder btw) <br> 6: lokale belasting van toepassing op diensten inclusief btw (lokale belasting wordt berekend op bedrag + belasting)
@@ -554,9 +556,9 @@ Module54Desc=Beheer van contracten (diensten of terugkerende abonnementen)
 Module55Name=Streepjescodes
 Module55Desc=Streepjescodesbeheer
 Module56Name=Betaling via overschrijving
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module56Desc=Beheer van de betaling van leveranciers door middel van overboekingsopdrachten. Het omvat het genereren van SEPA-bestanden voor Europese landen.
 Module57Name=Betalingen via automatische incasso
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
+Module57Desc=Beheer van incasso-opdrachten. Het omvat het genereren van SEPA-bestanden voor Europese landen.
 Module58Name=ClickToDial
 Module58Desc=Integratie van een 'ClickToDial' systeem (Asterisk, etc)
 Module60Name=stickers
@@ -662,13 +664,13 @@ Module50200Desc=Bied klanten een PayPal-online betaalpagina (PayPal-account of c
 Module50300Name=Stripe
 Module50300Desc=Bied klanten een Stripe online betaalpagina (credit / debit cards). Dit kan worden gebruikt om uw klanten toe te staan ad-hocbetalingen te doen of betalingen gerelateerd aan een specifiek Dolibarr-object (factuur, bestelling, enz ...)
 Module50400Name=Boekhouding (dubbele invoer)
-Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Boekhoudkundig beheer (dubbele boekingen, ondersteuning van algemene en dochterondernemingen). Exporteer het grootboek in verschillende andere boekhoudsoftware-indelingen.
 Module54000Name=PrintIPP
 Module54000Desc=Direct afdrukken (zonder de documenten te openen) met behulp van Cups IPP-interface (printer moet zichtbaar zijn vanaf de server en CUPS moet op de server zijn geïnstalleerd).
 Module55000Name=Poll, Onderzoek of Stemmen
 Module55000Desc=Maak online polls, enquêtes of stemmen (zoals Doodle, Studs, RDVz enz ...)
 Module59000Name=Marges
-Module59000Desc=Module om de marges te beheren
+Module59000Desc=Module to follow margins
 Module60000Name=Commissies
 Module60000Desc=Module om commissies te beheren
 Module62000Name=Incoterms
@@ -854,16 +856,16 @@ Permission538=Diensten exporteren
 Permission561=Inlezen betalingsopdrachten via overschrijving
 Permission562=Betaalopdracht aanmaken/wijzigen via overschrijving
 Permission563=Betaalopdracht verzenden
-Permission564=Record Debits/Rejections of credit transfer
+Permission564=Vastleggen verwerkingen/weigeringen van overboekingen
 Permission601=Lees stickers
 Permission602=Stickers maken/wijzigen
 Permission609=Verwijder etiketten
 Permission650=Lees stuklijsten
 Permission651=Materiaalrekeningen maken / bijwerken
 Permission652=Materiaalrekeningen verwijderen
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission660=Lees productieorder (MO)
+Permission661=Aanmaken/bijwerken productieorder (MO)
+Permission662=Verwijder productieorder (MO)
 Permission701=Bekijk donaties
 Permission702=Creëren / wijzigen donaties
 Permission703=Verwijderen donaties
@@ -873,8 +875,8 @@ Permission773=Verwijderen onkostennota's
 Permission774=Lees alle onkostennota's (ook voor de gebruiker niet ondergeschikten)
 Permission775=Goedkeuren onkostennota's
 Permission776=Betalen onkostennota's
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=Lees onkostendeclaraties van iedereen
+Permission778=Aanmaken/wijzigen onkostendeclaraties van iedereen
 Permission779=Export onkostennota's
 Permission1001=Bekijk voorraden
 Permission1002=Toevoegen/wijzigen van een magazijn
@@ -899,9 +901,9 @@ Permission1185=Aankooporders goedkeuren
 Permission1186=Verwerk inkooporders
 Permission1187=Bevestig de ontvangst van inkooporders
 Permission1188=Bestellingen verwijderen
-Permission1189=Check/Uncheck a purchase order reception
+Permission1189=Vink de ontvangst van een inkooporder aan / uit
 Permission1190=Goedkeuren (tweede goedkeuring) inkooporders
-Permission1191=Export supplier orders and their attributes
+Permission1191=Exporteer bestellingen van leveranciers en hun attributen
 Permission1201=Geef het resultaat van een uitvoervergunning
 Permission1202=Creëren/wijzigen een uitvoervergunning
 Permission1231=Lees leveranciersfacturen
@@ -955,8 +957,8 @@ Permission50101=Gebruik kassaonderdeel (SimplePOS)
 Permission50151=Gebruik verkooppunt (TakePOS)
 Permission50201=Lees transacties
 Permission50202=Importeer transacties
-Permission50330=Read objects of Zapier
-Permission50331=Create/Update objects of Zapier
+Permission50330=Lees objecten van Zapier
+Permission50331=Maak/update objecten van Zapier
 Permission50332=Verwijder objecten van Zapier
 Permission50401=Bind producten en facturen met boekhoudrekeningen
 Permission50411=Bewerkingen lezen in grootboek
@@ -986,15 +988,15 @@ Permission67000=Printen kassabon toestaan
 Permission68001=Lees intracomm rapport
 Permission68002=Intracomm-rapport maken/wijzigen
 Permission68004=Intracomm-rapport verwijderen
-Permission941601=Read receipts
+Permission941601=Bonnen inlezen
 Permission941602=Bonnen aanmaken en wijzigen
-Permission941603=Validate receipts
-Permission941604=Send receipts by email
-Permission941605=Export receipts
-Permission941606=Delete receipts
+Permission941603=Bonnen valideren
+Permission941604=Verzend bonnen per e-mail
+Permission941605=Bonnen exporteren
+Permission941606=Verwijder bonnen
 DictionaryCompanyType=Relatietype
 DictionaryCompanyJuridicalType=Externe rechtspersonen
-DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectLevel=Potentieel niveau voor bedrijven
 DictionaryProspectContactLevel=Prospect potentieel niveau voor contacten
 DictionaryCanton=Staten / Provincies
 DictionaryRegion=Regio
@@ -1025,14 +1027,14 @@ DictionaryEMailTemplates=E-mailsjablonen
 DictionaryUnits=Eenheden
 DictionaryMeasuringUnits=Meeteenheden
 DictionarySocialNetworks=Sociale netwerken
-DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectStatus=Prospectstatus van bedrijven
 DictionaryProspectContactStatus=Prospect-status voor contacten
 DictionaryHolidayTypes=Soorten verlof
 DictionaryOpportunityStatus=Leadstatus voor project / lead
 DictionaryExpenseTaxCat=Onkostenoverzicht - Vervoerscategorieën
 DictionaryExpenseTaxRange=Onkostenoverzicht - bereik per transportcategorie
-DictionaryTransportMode=Intracomm report - Transport mode
-TypeOfUnit=Type of unit
+DictionaryTransportMode=Intracomm rapport - Transportmodus
+TypeOfUnit=Type eenheid
 SetupSaved=Instellingen opgeslagen
 SetupNotSaved=Installatie niet opgeslagen
 BackToModuleList=Terug naar modulelijst
@@ -1083,7 +1085,7 @@ LabelUsedByDefault=Standaard te gebruiken label indien er geen vertaling kan wor
 LabelOnDocuments=Etiket op documenten
 LabelOrTranslationKey=Label- of vertaalsleutel
 ValueOfConstantKey=Waarde van een configuratieconstante
-ConstantIsOn=Option %s is on
+ConstantIsOn=Optie %s is ingeschakeld
 NbOfDays=Aantal dagen
 AtEndOfMonth=Aan het einde van de maand
 CurrentNext=Huidige/volgende
@@ -1128,7 +1130,7 @@ LoginPage=Inlogpagina
 BackgroundImageLogin=Achtergrond afbeelding
 PermanentLeftSearchForm=Permanent zoekformulier in linker menu
 DefaultLanguage=Standaard taal
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
+EnableMultilangInterface=Schakel meertalige ondersteuning in voor klant- of leveranciersrelaties
 EnableShowLogo=Toon het bedrijfslogo in het menu
 CompanyInfo=Bedrijf/Organisatie
 CompanyIds=Bedrijfs-/organisatie-identiteiten
@@ -1182,7 +1184,7 @@ InfoWebServer=Over Web Server
 InfoDatabase=Over Database
 InfoPHP=Over PHP
 InfoPerf=Over Prestaties
-InfoSecurity=About Security
+InfoSecurity=Over beveiliging
 BrowserName=Browser naam
 BrowserOS=Browser OS
 ListOfSecurityEvents=Lijst van Dolibarr veiligheidgebeurtenisen
@@ -1233,7 +1235,7 @@ RestoreDesc2=Herstel het back-upbestand (zip-bestand bijvoorbeeld) van de map &q
 RestoreDesc3=Herstel de databasestructuur en gegevens van een back-up dumpbestand in de database van de nieuwe Dolibarr-installatie of in de database van deze huidige installatie ( <b>%s</b> ). Waarschuwing, zodra het herstel is voltooid, moet u een login / wachtwoord gebruiken dat bestond uit de back-uptijd / installatie om opnieuw verbinding te maken. <br> Om een back-updatabase te herstellen in deze huidige installatie, kunt u deze assistent volgen.
 RestoreMySQL=MySQL import
 ForcedToByAModule=Geforceerd tot <b>%s</b> door een geactiveerde module
-ValueIsForcedBySystem=This value is forced by the system. You can't change it.
+ValueIsForcedBySystem=Vaste waarde door het systeem. U kunt deze niet aanpassen.
 PreviousDumpFiles=Bestaande back-upbestanden
 PreviousArchiveFiles=Bestaande archiefbestanden
 WeekStartOnDay=Eerste dag van de week
@@ -1306,7 +1308,7 @@ YouUseBestDriver=U gebruikt stuurprogramma %s, het beste stuurprogramma dat mome
 YouDoNotUseBestDriver=U gebruikt stuurprogramma %s maar stuurprogramma %s wordt aanbevolen.
 NbOfObjectIsLowerThanNoPb=U hebt alleen %s %s in de database. Dit vereist geen specifieke optimalisatie.
 SearchOptim=Zoekmachine optimalisatie
-YouHaveXObjectUseSearchOptim=U hebt %s %s in de database. U moet de constante %s toevoegen aan 1 in Home-Setup-Other. Beperk de zoekopdracht tot het begin van tekenreeksen, waardoor de database indexen kan gebruiken en u onmiddellijk antwoord moet krijgen.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=U hebt %s %s in de database en constante %s is ingesteld op 1 in Home-Setup-Other.
 BrowserIsOK=U gebruikt de webbrowser %s. Deze browser is geschikt voor beveiliging en prestaties.
 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.
@@ -1314,7 +1316,7 @@ 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".
 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;.
-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".
+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
 FillThisOnlyIfRequired=Voorbeeld: +2 (alleen invullen als tijdzone offset problemen worden ervaren)
@@ -1322,7 +1324,7 @@ GetBarCode=Haal barcode
 NumberingModules=Nummeringsmodellen
 DocumentModules=Documentmodellen
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Retourneer een wachtwoord dat is gegenereerd volgens het interne Dolibarr-algoritme: %s-tekens met gedeelde cijfers en tekens in kleine letters.
 PasswordGenerationNone=Stel geen gegenereerd wachtwoord voor. Wachtwoord moet handmatig worden ingevoerd.
 PasswordGenerationPerso=Retourneer een wachtwoord volgens uw persoonlijk gedefinieerde configuratie.
 SetupPerso=Volgens uw configuratie
@@ -1421,7 +1423,7 @@ AdherentMailRequired=E-mail vereist om een nieuw lid te maken
 MemberSendInformationByMailByDefault=Vinkvakje om een bevestigingse-mail te sturen naar leden (validatie van nieuwe abonnementen). Staat standaard aan.
 VisitorCanChooseItsPaymentMode=Bezoeker kan kiezen uit beschikbare betalingsmodi
 MEMBER_REMINDER_EMAIL=Automatische herinnering <b>per e-mail</b> inschakelen voor verlopen abonnementen. Opmerking: Module <strong>%s</strong> moet zijn ingeschakeld en correct zijn ingesteld om herinneringen te verzenden.
-MembersDocModules=Document templates for documents generated from member record
+MembersDocModules=Documentsjablonen voor documenten die zijn gegenereerd op basis van een ledenrecord
 ##### LDAP setup #####
 LDAPSetup=LDAP-instellingen
 LDAPGlobalParameters=Algemene instellingen
@@ -1565,8 +1567,8 @@ ForANonAnonymousAccess=Voor een geautoriseerde verbinding (bijvoorbeeld om over
 PerfDolibarr=Prestaties setup / optimaliseren rapport
 YouMayFindPerfAdviceHere=Deze pagina biedt enkele controles of advies met betrekking tot prestaties.
 NotInstalled=Niet geïnstalleerd.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
+NotSlowedDownByThis=Hierdoor niet vertraagd.
+NotRiskOfLeakWithThis=Hiermee geen risico op lekken.
 ApplicativeCache=Applicatieve cache
 MemcachedNotAvailable=Geen applicatieve cache gevonden. U kunt de prestaties verbeteren door een cacheserver Memcached te installeren en een module die deze cacheserver kan gebruiken. <br> Meer informatie hier <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a> . <br> Merk op dat veel webhostingproviders dergelijke cacheserver niet bieden.
 MemcachedModuleAvailableButNotSetup=Module in memcache voor applicatieve cache gevonden, maar installatie van module is niet voltooid.
@@ -1596,8 +1598,13 @@ 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=Productbeschrijvingen weergeven in formulieren (anders weergegeven in een pop-up met knopinfo)
+DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
+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=Activeer op het tabblad Bijgevoegde bestanden product / dienst een optie om product PDF-document samen te voegen met voorstel PDF azur als product / dienst in het voorstel staat
-ViewProductDescInThirdpartyLanguageAbility=Geef productbeschrijvingen weer in de taal van de derde partij
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 UseSearchToSelectProductTooltip=Als u een groot aantal producten (>100.000) hebt, kunt u de snelheid verhogen door constant PRODUCT_DONOTSEARCH_ANYWHERE in te stellen op 1 in Setup-> Other. Het zoeken is dan beperkt tot het begin van de reeks.
 UseSearchToSelectProduct=Wacht tot je op een toets drukt voordat je de inhoud van de productcombo-lijst laadt (dit kan de prestaties verbeteren als je een groot aantal producten hebt, maar het is minder handig)
 SetDefaultBarcodeTypeProducts=Standaard streepjescodetype voor produkten
@@ -1614,9 +1621,9 @@ SyslogLevel=Level
 SyslogFilename=Bestandsnaam en -pad
 YouCanUseDOL_DATA_ROOT=U kunt DOL_DATA_ROOT/dolibarr.log gebruiken voor een logbestand in de Dolibarr "documenten"-map. U kunt ook een ander pad gebruiken om dit bestand op te slaan.
 ErrorUnknownSyslogConstant=Constante %s is geen bekende 'syslog' constante
-OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
+OnlyWindowsLOG_USER=Op Windows wordt alleen de LOG_USER-faciliteit ondersteund
 CompressSyslogs=Compressie en back-up van foutopsporingslogbestanden (gegenereerd door module Log voor foutopsporing)
-SyslogFileNumberOfSaves=Number of backup logs to keep
+SyslogFileNumberOfSaves=Aantal back-uplogboeken dat moet worden bewaard
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configureer de geplande taak opschonen om de frequentie van de logboekback-up in te stellen
 ##### Donations #####
 DonationsSetup=Donatiemoduleinstellingen
@@ -1672,7 +1679,7 @@ AdvancedEditor=Geavanceerde editor
 ActivateFCKeditor=Activeer FCKeditor voor:
 FCKeditorForCompany=WYSIWIG creatie / bewerking van bedrijfsomschrijving en notities
 FCKeditorForProduct=WYSIWIG creatie / bewerking van product- / dienstomschrijving en notities
-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>
+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
 FCKeditorForMail=WYSIWIG creatie / bewerking voor alle e-mail (behalve Gereedschap-> E-mailing)
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Gepersonaliseerde menu&#39;s niet gekoppeld aan een h
 NewMenu=Nieuw menu
 MenuHandler=Menuverwerker
 MenuModule=Bronmodule
-HideUnauthorizedMenu= Verberg ongeautoriseerde menu's (grijs)
+HideUnauthorizedMenu=Verberg ongeautoriseerde menu's ook voor interne gebruikers (anders alleen grijs)
 DetailId=Menu ID
 DetailMenuHandler=Menuverwerker waar het nieuwe menu getoond moet worden
 DetailMenuModule=Modulenaam als menu-item van een module afkomstig is
@@ -1737,11 +1744,11 @@ AGENDA_USE_EVENT_TYPE=Gebruik gebeurtenistypen (beheerd in menu Setup -&gt; Woor
 AGENDA_USE_EVENT_TYPE_DEFAULT=Stel deze standaardwaarde automatisch in voor het type evenement in het formulier voor het maken van een evenement
 AGENDA_DEFAULT_FILTER_TYPE=Stel dit type evenement automatisch in het zoekfilter van de agendaweergave in
 AGENDA_DEFAULT_FILTER_STATUS=Stel deze status automatisch in voor evenementen in het zoekfilter van de agendaweergave
-AGENDA_DEFAULT_VIEW=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=Welke weergave wil je standaard openen als je menu Agenda selecteert
+AGENDA_REMINDER_BROWSER=Schakel gebeurtenisherinnering <b> in de browser van de gebruiker </b> in (wanneer de herinneringsdatum wordt bereikt, wordt een pop-up weergegeven door de browser. Elke gebruiker kan dergelijke meldingen uitschakelen via de instellingen van de browser).
 AGENDA_REMINDER_BROWSER_SOUND=Schakel geluidsmelding in
-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 task %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL=Schakel gebeurtenisherinnering <b> per e-mail in </b> (herinneringsoptie / vertraging kan voor elke gebeurtenis worden gedefinieerd).
+AGENDA_REMINDER_EMAIL_NOTE=Opmerking: De frequentie van de taak %s moet voldoende zijn om er zeker van te zijn dat de herinnering op het juiste moment wordt verzonden.
 AGENDA_SHOW_LINKED_OBJECT=Gekoppeld object weergeven in agendaweergave
 ##### Clicktodial #####
 ClickToDialSetup='Click-To-Dial' moduleinstellingen
@@ -1876,7 +1883,7 @@ EnterAnyCode=Dit veld bevat een referentie om de lijn te identificeren. Voer een
 Enter0or1=Voer 0 of 1 in
 UnicodeCurrency=Voer hier tussen accolades in, lijst met byte-nummers die het valutasymbool vertegenwoordigen. Bijvoorbeeld: voer voor $ [36] in - voor Brazilië real R $ [82,36] - voer voor € [8364] in
 ColorFormat=De RGB-kleur heeft het HEX-formaat, bijvoorbeeld: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+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=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.
@@ -1917,7 +1924,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP &amp; CRM %s is beschikbaar. Ve
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP &amp; CRM %s is beschikbaar. Versie %s is een onderhoudsversie, dus bevat alleen bugfixes. We raden alle gebruikers aan om naar deze versie te upgraden. Een onderhoudsrelease introduceert geen nieuwe functies of wijzigingen in de database. U kunt het downloaden van het downloadgedeelte van de https://www.dolibarr.org portal (submap Stabiele versies). U kunt de <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> lezen voor een volledige lijst met wijzigingen.
 MultiPriceRuleDesc=Wanneer de optie &quot;Meerdere prijsniveaus per product / service&quot; is ingeschakeld, kunt u verschillende prijzen (één per prijsniveau) voor elk product definiëren. Om u tijd te besparen, kunt u hier een regel invoeren om een prijs voor elk niveau automatisch te berekenen op basis van de prijs van het eerste niveau, dus u hoeft alleen een prijs voor het eerste niveau voor elk product in te voeren. Deze pagina is ontworpen om u tijd te besparen, maar is alleen nuttig als uw prijzen voor elk niveau relatief zijn aan het eerste niveau. U kunt deze pagina in de meeste gevallen negeren.
 ModelModulesProduct=Sjablonen voor productdocumenten
-WarehouseModelModules=Templates for documents of warehouses
+WarehouseModelModules=Sjablonen voor magazijndocumenten
 ToGenerateCodeDefineAutomaticRuleFirst=Om codes automatisch te kunnen genereren, moet u eerst een manager definiëren om het barcodenummer automatisch te definiëren.
 SeeSubstitutionVars=Zie * opmerking voor een lijst met mogelijke substitutievariabelen
 SeeChangeLog=Zie ChangeLog bestand (alleen in het Engels)
@@ -1983,11 +1990,12 @@ EMailHost=Host van e-mail IMAP-server
 MailboxSourceDirectory=Brondirectory van mailbox
 MailboxTargetDirectory=Doeldirectory voor mailbox
 EmailcollectorOperations=Operaties te doen door verzamelaar
+EmailcollectorOperationsDesc=Bewerkingen worden op volgorde begin tot eind uitgevoerd
 MaxEmailCollectPerCollect=Max aantal verzamelde e-mails per verzameling
 CollectNow=Verzamel nu
 ConfirmCloneEmailCollector=Weet je zeker dat je de e-mailverzamelaar %s wilt klonen?
-DateLastCollectResult=Laatste datum geprobeerd te verzamelen
-DateLastcollectResultOk=Datum laatste verzamelen succesvol
+DateLastCollectResult=Datum laatste poging van verzamelen
+DateLastcollectResultOk=Datum van laatste succesvolle verzamelen
 LastResult=Laatste resultaat
 EmailCollectorConfirmCollectTitle=E-mail verzamelbevestiging
 EmailCollectorConfirmCollect=Wil je de collectie voor deze verzamelaar nu runnen?
@@ -1996,16 +2004,16 @@ 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=Create ticket (and link to third party if it was loaded by a previous operation)
+CreateTicketAndThirdParty=Maak een ticket aan (en link naar een relatie als het door een eerdere bewerking is geladen)
 CodeLastResult=Laatste resultaatcode
 NbOfEmailsInInbox=Aantal e-mails in bronmap
 LoadThirdPartyFromName=Zoeken van derden laden op %s (alleen laden)
 LoadThirdPartyFromNameOrCreate=Zoeken van derden laden op %s (maken indien niet gevonden)
-WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
-WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
-WithDolTrackingIDInMsgId=Message sent from Dolibarr
-WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+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
+WithoutDolTrackingIDInMsgId=Bericht NIET verzonden vanuit Dolibarr
+CreateCandidature=Maak een sollicitatie
 FormatZip=Zip
 MainMenuCode=Menu toegangscode (hoofdmenu)
 ECMAutoTree=Toon automatische ECM-structuur
@@ -2019,7 +2027,7 @@ DisabledResourceLinkContact=Schakel functie uit om een ​​bron te koppelen aa
 EnableResourceUsedInEventCheck=Schakel de functie in om te controleren of een bron in een gebeurtenis wordt gebruikt
 ConfirmUnactivation=Bevestig de module-reset
 OnMobileOnly=Alleen op klein scherm (smartphone)
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
+DisableProspectCustomerType=Schakel het derde type 'Prospect + klant' uit (de derde moet dus 'Prospect' of 'Klant' zijn, maar kan niet beide zijn)
 MAIN_OPTIMIZEFORTEXTBROWSER=Vereenvoudig de interface voor blinden
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Schakel deze optie in als u een blinde persoon bent of als u de toepassing gebruikt vanuit een tekstbrowser zoals Lynx of Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Wijzig de kleur van de interface voor kleurenblinde persoon
@@ -2041,15 +2049,15 @@ UseDebugBar=Gebruik de foutopsporingsbalk
 DEBUGBAR_LOGS_LINES_NUMBER=Aantal laatste logboekregels dat in de console moet worden bewaard
 WarningValueHigherSlowsDramaticalyOutput=Waarschuwing, hogere waarden vertragen de uitvoer dramatisch
 ModuleActivated=Module %s is geactiveerd en vertraagt de interface
-IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
-AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+IfYouAreOnAProductionSetThis=Als u zich in een productieomgeving bevindt, moet u deze eigenschap instellen op %s.
+AntivirusEnabledOnUpload=Antivirus ingeschakeld op geüploade bestanden
 EXPORTS_SHARE_MODELS=Exportmodellen zijn met iedereen te delen
 ExportSetup=Installatie van exportmodule
 ImportSetup=Instellen van module Import
 InstanceUniqueID=Uniek ID van de instantie
 SmallerThan=Kleiner dan
 LargerThan=Groter dan
-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=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 relatie in uw database te zoeken en te laden. De gevonden (of gecreëerde) relatie zal worden gebruikt voor het volgen van acties die het nodig hebben. In het parameterveld kunt u bijvoorbeeld 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)' gebruiken als u de naam van de relatie wilt extraheren uit een string 'Name: name to find' gevonden in de bron.
@@ -2076,10 +2084,14 @@ MeasuringScaleDesc=De schaal is het aantal plaatsen dat u nodig heeft om het dec
 TemplateAdded=Sjabloon toegevoegd
 TemplateUpdated=Sjabloon bijgewerkt
 TemplateDeleted=Sjabloon verwijderd
-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 module may expose sensitive data. If you don't need it, disable it.
-ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+MailToSendEventPush=E-mail ter herinnering voor een evenement
+SwitchThisForABetterSecurity=Het wijzigen van deze waarde naar %s wordt aanbevolen voor meer beveiliging
+DictionaryProductNature= Aard van het product
+CountryIfSpecificToOneCountry=Land (indien specifiek voor een bepaald land)
+YouMayFindSecurityAdviceHere=Mogelijk vindt u hier beveiligingsadvies
+ModuleActivatedMayExposeInformation=Deze module kan gevoelige gegevens blootleggen. Schakel het uit als u het niet nodig heeft.
+ModuleActivatedDoNotUseInProduction=Een module ontworpen voor de ontwikkeling is ingeschakeld. Schakel het niet in bij een productieomgeving.
+CombinationsSeparator=Scheidingsteken voor productcombinaties
+SeeLinkToOnlineDocumentation=Zie link naar online documentatie in het bovenste menu voor voorbeelden
+SHOW_SUBPRODUCT_REF_IN_PDF=Als de functie "%s" van module <b>%s</b> wordt gebruikt, toon dan de details van subproducten van een kit op PDF.
+AskThisIDToYourBank=Neem contact op met uw bank om deze ID te krijgen
diff --git a/htdocs/langs/nl_NL/agenda.lang b/htdocs/langs/nl_NL/agenda.lang
index 83cf46b9711..4c6bbdab045 100644
--- a/htdocs/langs/nl_NL/agenda.lang
+++ b/htdocs/langs/nl_NL/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Aantal gebeurtenissen
 ListOfActions=Gebeurtenissenlijst
 EventReports=Overzicht gebeurtenissen
 Location=Locatie
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=Gebeurtenis toegewezen aan elke gebruiker in de groep
 EventOnFullDay=Gebeurtenis volledige dag
 MenuToDoActions=Alle openstaande acties
 MenuDoneActions=Alle beëindigde acties
@@ -63,7 +63,7 @@ ShipmentClassifyClosedInDolibarr=Verzending %s geclassificeerd als gefactureerd
 ShipmentUnClassifyCloseddInDolibarr=Zending %s geclassificeerd, opnieuw openen
 ShipmentBackToDraftInDolibarr=Zending %s ga terug naar conceptstatus
 ShipmentDeletedInDolibarr=Verzending %s verwijderd
-ReceptionValidatedInDolibarr=Reception %s validated
+ReceptionValidatedInDolibarr=Ontvangst %s gevalideerd
 OrderCreatedInDolibarr=Bestelling %s aangemaakt
 OrderValidatedInDolibarr=Opdracht %s gevalideerd
 OrderDeliveredInDolibarr=Bestelling %s is geleverd
@@ -86,8 +86,8 @@ ProposalDeleted=Voorstel verwijderd
 OrderDeleted=Bestelling verwijderd
 InvoiceDeleted=Factuur verwijderd
 DraftInvoiceDeleted=Conceptfactuur verwijderd
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_DELETEInDolibarr=Contact %s deleted
+CONTACT_CREATEInDolibarr=Contact %s gemaakt
+CONTACT_DELETEInDolibarr=Contact %s verwijderd
 PRODUCT_CREATEInDolibarr=Product %s aangemaakt
 PRODUCT_MODIFYInDolibarr=Product %s aangepast
 PRODUCT_DELETEInDolibarr=Product %s verwijderd
@@ -152,6 +152,7 @@ ActionType=Taak type
 DateActionBegin=Begindatum
 ConfirmCloneEvent=Weet u zeker dat u gebeurtenis <b> %s </b> wilt klonen?
 RepeatEvent=Herhaal gebeurtenis/taak
+OnceOnly=Eenmalig
 EveryWeek=Elke week
 EveryMonth=Elke maand
 DayOfMonth=Dag van de maand
@@ -160,9 +161,9 @@ DateStartPlusOne=Begindatum + 1 uur
 SetAllEventsToTodo=Zet alle evenementen op te doen
 SetAllEventsToInProgress=Stel alle evenementen in proces
 SetAllEventsToFinished=Stel alle evenementen in op voltooid
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+ReminderTime=Herinneringsperiode voor het evenement
+TimeType=Duur
+ReminderType=Terugbellen
+AddReminder=Maak een automatische herinneringsmelding voor deze afspraak
+ErrorReminderActionCommCreation=Fout bij het maken van de herinneringsmelding voor deze afspraak
+BrowserPush=Browser pop-up melding
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index 2bdc1c80373..5350f4939a7 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -7,7 +7,7 @@ BankName=Banknaam
 FinancialAccount=Rekening
 BankAccount=Bankrekening
 BankAccounts=Bankrekeningen
-BankAccountsAndGateways=Bankrekeningen | gateways
+BankAccountsAndGateways=Bankrekeningen | Gateways
 ShowAccount=Toon rekening
 AccountRef=Financiële rekening referentie
 AccountLabel=Financiële rekening label
@@ -25,19 +25,19 @@ InitialBankBalance=Beginbalans
 EndBankBalance=Eindbalans
 CurrentBalance=Huidig saldo
 FutureBalance=Toekomstig saldo
-ShowAllTimeBalance=Toon saldo sinds begin
+ShowAllTimeBalance=Toon saldo vanaf begin
 AllTime=Vanaf het begin
 Reconciliation=Overeenstemming
 RIB=Bankrekeningnummer
-IBAN=IBAN-nummer
-BIC=BIC/SWIFT-code
+IBAN=IBAN nummer
+BIC=BIC/SWIFT code
 SwiftValid=BIC / SWIFT geldig
-SwiftVNotalid=BIC / SWIFT is niet geldig
+SwiftVNotalid=BIC / SWIFT code onjuist
 IbanValid=IBAN geldig
-IbanNotValid=IBAN is niet geldig
-StandingOrders=Incasso-opdrachten
-StandingOrder=Incasso-opdracht
-PaymentByDirectDebit=Automatische incasso
+IbanNotValid=IBAN onjuist
+StandingOrders=Incasso opdrachten
+StandingOrder=Automatische incasso
+PaymentByDirectDebit=Betaling via automatische incasso
 PaymentByBankTransfers=Betalingen via overschrijving
 PaymentByBankTransfer=Betaling via overschrijving
 AccountStatement=Rekeningafschrift
@@ -55,7 +55,7 @@ NewBankAccount=Nieuwe rekening
 NewFinancialAccount=Nieuwe financiële rekening
 MenuNewFinancialAccount=Nieuwe financiële rekening
 EditFinancialAccount=Wijzig rekening
-LabelBankCashAccount=label van bank of kas
+LabelBankCashAccount=Label van bank of kas
 AccountType=Rekeningtype
 BankType0=Spaarrekening
 BankType1=Betaalrekening
@@ -63,9 +63,9 @@ BankType2=Kasrekening
 AccountsArea=Rekeningenoverzicht
 AccountCard=Rekeningdetailkaart
 DeleteAccount=Rekening verwijderen
-ConfirmDeleteAccount=Weet u deze dat u dit account wilt verwijderen?
+ConfirmDeleteAccount=Weet u zeker dat u deze rekening wilt verwijderen?
 Account=Rekening
-BankTransactionByCategories=Bankregels op categorie
+BankTransactionByCategories=Bankboekingen per categorie
 BankTransactionForCategory=Bankboekingen voor categorie <b>%s</b>
 RemoveFromRubrique=Verwijder link met categorie
 RemoveFromRubriqueConfirm=Weet u zeker dat u de link tussen het item en de categorie wilt wissen?
@@ -75,7 +75,7 @@ BankTransactions=Bankmutaties
 BankTransaction=Bankmutatie
 ListTransactions=Mutatieoverzicht
 ListTransactionsByCategory=Mutaties per categorie
-TransactionsToConciliate=Items af te stemmen
+TransactionsToConciliate=Af te stemmen transacties
 TransactionsToConciliateShort=Af te stemmen
 Conciliable=Kunnen worden afgestemd
 Conciliate=Afstemmen
@@ -83,7 +83,7 @@ Conciliation=Afstemming
 SaveStatementOnly=Afschrift alleen opslaan
 ReconciliationLate=Later afstemmen
 IncludeClosedAccount=Inclusief opgeheven rekeningen
-OnlyOpenedAccount=Alleen open accounts
+OnlyOpenedAccount=Alleen open rekeningen
 AccountToCredit=Te crediteren rekening
 AccountToDebit=Te debiteren rekening
 DisableConciliation=Afstemming van deze rekening uitschakelen
@@ -93,36 +93,36 @@ StatusAccountOpened=Open
 StatusAccountClosed=Opgeheven
 AccountIdShort=Aantal
 LineRecord=Transactie
-AddBankRecord=Item toevoegen
-AddBankRecordLong=Item handmatig toevoegen
+AddBankRecord=Transactie toevoegen
+AddBankRecordLong=Transactie handmatig toevoegen
 Conciliated=Afgestemd
 ConciliatedBy=Afgestemd door
 DateConciliating=Afgestemd op
-BankLineConciliated=Boeking afgestemd met afschrift
+BankLineConciliated=Boeking afgestemd met bankafschrift
 Reconciled=Afgestemd
 NotReconciled=Niet afgestemd
 CustomerInvoicePayment=Afnemersbetaling
-SupplierInvoicePayment=Betaling van de leverancier
+SupplierInvoicePayment=Leveranciersbetaling
 SubscriptionPayment=Betaling van abonnement
 WithdrawalPayment=Debet betalingsopdracht
 SocialContributionPayment=Sociale/fiscale belastingbetaling
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
+BankTransfer=Overschrijving
+BankTransfers=Overschrijvingen
 MenuBankInternalTransfer=Interne overboeking
 TransferDesc=Overdracht van de ene rekening naar de andere. Dolibarr zal twee records schrijven (een debet in de bronaccount en een tegoed in het doelaccount). Hetzelfde bedrag (behalve aanduiding), label en datum worden gebruikt voor deze transactie)
 TransferFrom=Van
 TransferTo=T/m
 TransferFromToDone=Een overboeking van <b>%s</b> naar <b>%s</b> van <b>%s</b> is geregistreerd.
-CheckTransmitter=Overboeker
+CheckTransmitter=Verzender
 ValidateCheckReceipt=Betaling met cheque goedkeuren?
 ConfirmValidateCheckReceipt=Weet u zeker dat u deze cheque wilt valideren? Hierna is het niet meer mogelijk dit te wijzigen.
-DeleteCheckReceipt=Dit chequebewijs verwijderen?
+DeleteCheckReceipt=Deze cheque ontvangst verwijderen?
 ConfirmDeleteCheckReceipt=Weet u zeker dat u deze betaling via cheque wilt verwijderen?
 BankChecks=Bankcheque
 BankChecksToReceipt=Cheques in afwachting van storting
 BankChecksToReceiptShort=Cheques in afwachting van storting
 ShowCheckReceipt=Toon controleren stortingsbewijs
-NumberOfCheques=Checknr.
+NumberOfCheques=Check nr.
 DeleteTransaction=Ingave verwijderen
 ConfirmDeleteTransaction=Weet u zeker dat u deze boeking wilt verwijderen?
 ThisWillAlsoDeleteBankRecord=Hiermee wordt ook de boeking in de bank verwijderd
@@ -143,40 +143,41 @@ BackToAccount=Terug naar rekening
 ShowAllAccounts=Toon alle rekeningen
 FutureTransaction=Toekomstige transactie. Nog niet mogelijk af te stemmen
 SelectChequeTransactionAndGenerate=Selecteer/ filter cheques om op te nemen in de chequebetaling en klik op "Aanmaken"
-InputReceiptNumber=Kies het bankafschrift in verband met de bemiddeling. Gebruik een sorteerbaar numerieke waarde: YYYYMM of YYYYMMDD
-EventualyAddCategory=Tenslotte een categorie opgeven waarin de gegevens bewaard kunnen worden
+InputReceiptNumber=Kies het bankafschrift in verband met de bemiddeling. Gebruik een sorteerbare numerieke waarde: YYYYMM of YYYYMMDD
+EventualyAddCategory=Geef tenslotte een categorie op waarin de gegevens bewaard kunnen worden
 ToConciliate=Afstemmen?
-ThenCheckLinesAndConciliate=Duid dan de lijnen aan van het bankafschrift en klik
+ThenCheckLinesAndConciliate=Controleer vervolgens de regels op het bankafschrift en klik
 DefaultRIB=Standaard BAN
 AllRIB=Alle BAN
 LabelRIB=BAN label
 NoBANRecord=Geen BAN gegeven
-DeleteARib=Verwijderen BAN gegeven
-ConfirmDeleteRib=Weet u zeker dat u dit BAN-record wilt verwijderen?
-RejectCheck=Teruggekeerde cheque
-ConfirmRejectCheck=Weet u zeker dat u deze controle wilt markeren als afgewezen?
-RejectCheckDate=Teruggave datum cheque
-CheckRejected=Teruggekeerde cheque
+DeleteARib=Verwijderen BAN record
+ConfirmDeleteRib=Weet u zeker dat u dit BAN record wilt verwijderen?
+RejectCheck=Geretourneerde cheque
+ConfirmRejectCheck=Weet u zeker dat u deze cheque wilt markeren als afgewezen?
+RejectCheckDate=Datum dat cheque is geretourneerd
+CheckRejected=Geretourneerde cheque
 CheckRejectedAndInvoicesReopened=Cheque geretourneerd en facturen worden opnieuw geopend
 BankAccountModelModule=Documentsjablonen voor bankrekeningen
-DocumentModelSepaMandate=Sjabloon van SEPA-mandaat. Alleen bruikbaar voor Europese landen in de Europese Unie.
-DocumentModelBan=Sjabloon om een pagina met BAN-informatie af te drukken.
+DocumentModelSepaMandate=Sjabloon van SEPA mandaat. Alleen bruikbaar voor Europese landen in de Europese Unie.
+DocumentModelBan=Sjabloon om een pagina met BAN informatie af te drukken.
 NewVariousPayment=Nieuwe overige betaling
 VariousPayment=Overige betaling
 VariousPayments=Diverse betalingen
 ShowVariousPayment=Laat overige betaling zien
 AddVariousPayment=Overige betaling toevoegen
-VariousPaymentId=Miscellaneous payment ID
-VariousPaymentLabel=Miscellaneous payment label
-ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
-SEPAMandate=SEPA-mandaat
-YourSEPAMandate=Uw SEPA-mandaat
-FindYourSEPAMandate=Met deze SEPA-machtiging geeft u ons bedrijf toestemming een opdracht ter incasso te sturen naar uw bank. Retourneer het ondertekend (scan van het ondertekende document) of stuur het per e-mail naar
-AutoReportLastAccountStatement=Vul bij het automatisch afstemmen het veld 'aantal bankafschriften' in met het laatste afschriftnummer.
-CashControl=POS kasopmaak
-NewCashFence=Kasopmaak
+VariousPaymentId=Diverse betalings-ID
+VariousPaymentLabel=Diversen betaalomschrijving
+ConfirmCloneVariousPayment=Bevestig maken kopie van een diverse betaling
+SEPAMandate=SEPA mandaat
+YourSEPAMandate=Uw SEPA mandaat
+FindYourSEPAMandate=Met deze SEPA machtiging geeft u ons bedrijf toestemming een opdracht ter incasso te sturen naar uw bank. Retourneer het ondertekend (scan van het ondertekende document) of stuur het per e-mail naar
+AutoReportLastAccountStatement=Vul bij het automatisch afstemmen het veld 'aantal bankafschriften' in met het laatste afschrift nummer.
+CashControl=POS kassa controle
+NewCashFence=Nieuwe kassa sluiting
 BankColorizeMovement=Inkleuren mutaties
 BankColorizeMovementDesc=Als deze functie is ingeschakeld, kunt u een specifieke achtergrondkleur kiezen voor debet- of creditmutaties
 BankColorizeMovementName1=Achtergrondkleur voor debetmutatie
 BankColorizeMovementName2=Achtergrondkleur voor creditmutatie
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
+IfYouDontReconcileDisableProperty=Als u op sommige bankrekeningen geen bankafstemmingen uitvoert, schakelt u de eigenschap "%s" uit om deze waarschuwing te verwijderen.
+NoBankAccountDefined=No bank account defined
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index 20d977e1cf6..845323b0228 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -441,8 +441,8 @@ BankAccountNumberKey=checksum
 Residence=Adres
 IBANNumber=IBAN-rekeningnummer
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=IBAN van klant
+SupplierIBAN=IBAN van leverancier
 BIC=BIC / SWIFT
 BICNumber=BIC/SWIFT-code
 ExtraInfos=Extra info
@@ -576,7 +576,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Leverancierfactuur verwijderd
 UnitPriceXQtyLessDiscount=Eenheidsprijs x Aantal - Korting
 CustomersInvoicesArea=Factureringsgebied voor klanten
 SupplierInvoicesArea=Factureringsgebied leverancier
-FacParentLine=Invoice Line Parent
-SituationTotalRayToRest=Remainder to pay without taxe
-PDFSituationTitle=Situation n° %d
-SituationTotalProgress=Total progress %d %%
+FacParentLine=Hoofd factuurregel 
+SituationTotalRayToRest=Netto restant te betalen
+PDFSituationTitle=Situatie n ° %d
+SituationTotalProgress=Totale voortgang %d %%
diff --git a/htdocs/langs/nl_NL/blockedlog.lang b/htdocs/langs/nl_NL/blockedlog.lang
index f455e80d1d6..1507f2b3991 100644
--- a/htdocs/langs/nl_NL/blockedlog.lang
+++ b/htdocs/langs/nl_NL/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donatie logische verwijdering
 logMEMBER_SUBSCRIPTION_CREATE=Lid abonnement gemaakt
 logMEMBER_SUBSCRIPTION_MODIFY=Lid abonnement gewijzigd
 logMEMBER_SUBSCRIPTION_DELETE=Lid abonnement logische verwijdering
-logCASHCONTROL_VALIDATE=Contant geïnd
+logCASHCONTROL_VALIDATE=Kassa afsluiten
 BlockedLogBillDownload=Klant factuur downloaden
 BlockedLogBillPreview=Voorbeeld van klant factuur
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/nl_NL/boxes.lang b/htdocs/langs/nl_NL/boxes.lang
index 71c851c2c3b..49eff98a42e 100644
--- a/htdocs/langs/nl_NL/boxes.lang
+++ b/htdocs/langs/nl_NL/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Laatste %s aangepaste donaties
 BoxTitleLastModifiedExpenses=Laatste gewijzigde %s onkostendeclaraties
 BoxTitleLatestModifiedBoms=Laatste %s gemodificeerde stuklijsten
 BoxTitleLatestModifiedMos=Laatste %s gewijzigde productieorders
+BoxTitleLastOutstandingBillReached=Klanten met meer dan maximaal toegestaan krediet
 BoxGlobalActivity=Globale activiteit (facturen, offertes, bestellingen)
 BoxGoodCustomers=Goede klanten
 BoxTitleGoodCustomers=%s Goede klanten
+BoxScheduledJobs=Geplande taken
+BoxTitleFunnelOfProspection=Lood trechter
 FailedToRefreshDataInfoNotUpToDate=Vernieuwen van RSS-flux is mislukt. Laatste succesvolle vernieuwingsdatum: %s
 LastRefreshDate=Laatste bijwerkingsdatum
 NoRecordedBookmarks=Geen weblinks ingesteld. Klik <a href="%s">weblinks</a> aan om deze toe te voegen.
@@ -83,8 +86,8 @@ BoxTitleLatestModifiedSupplierOrders=Orders van leveranciers: laatste %s gewijzi
 BoxTitleLastModifiedCustomerBills=Klantfacturen: laatste %s gewijzigd
 BoxTitleLastModifiedCustomerOrders=Klantorders: laatste %s gewijzigd
 BoxTitleLastModifiedPropals=Laatste %s aangepaste offertes
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=Laatste %s gewijzigde taken
+BoxTitleLatestModifiedCandidatures=Laatste %s gewijzigde kandidaturen
 ForCustomersInvoices=Afnemersfacturen
 ForCustomersOrders=Klantenbestellingen
 ForProposals=Zakelijke voorstellen / Offertes
@@ -92,8 +95,8 @@ LastXMonthRolling=De laatste %s maand overschrijdende
 ChooseBoxToAdd=Voeg widget toe aan uw dashboard
 BoxAdded=Widget is toegevoegd in je dashboard
 BoxTitleUserBirthdaysOfMonth=Verjaardagen van deze maand (gebruikers)
-BoxLastManualEntries=Laatste handmatige invoer in accountancy
-BoxTitleLastManualEntries=%s laatste handmatige invoer
+BoxLastManualEntries=Latest record in accountancy entered manually or without source document
+BoxTitleLastManualEntries=%s latest record entered manually or without source document
 NoRecordedManualEntries=Geen handmatige invoer opgenomen in boekhouding
 BoxSuspenseAccount=Tel boekhoudkundige bewerking met tussenrekening
 BoxTitleSuspenseAccount=Aantal niet-toegewezen lijnen
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Suspense-account is niet gedefinieerd
 BoxLastCustomerShipments=Laatste klantzendingen
 BoxTitleLastCustomerShipments=Laatste %s klantverzendingen
 NoRecordedShipments=Geen geregistreerde klantverzending
+BoxCustomersOutstandingBillReached=Klanten met bereikt limiet
 # Pages
 AccountancyHome=Boekhouden
+ValidatedProjects=Gevalideerde projecten
diff --git a/htdocs/langs/nl_NL/cashdesk.lang b/htdocs/langs/nl_NL/cashdesk.lang
index 18a7e03de51..24bff1481e4 100644
--- a/htdocs/langs/nl_NL/cashdesk.lang
+++ b/htdocs/langs/nl_NL/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Voetnoot
 AmountAtEndOfPeriod=Bedrag aan het einde van de periode (dag, maand of jaar)
 TheoricalAmount=Theoretisch bedrag
 RealAmount=Aanwezig bedrag
-CashFence=Cash hek
-CashFenceDone=Kas te ontvangen voor de periode
+CashFence=Kassa sluiten
+CashFenceDone=Kassa gesloten voor de periode
 NbOfInvoices=Aantal facturen
 Paymentnumpad=Soort betaling om de betaling in te voeren
 Numberspad=Cijferblok
@@ -94,13 +94,14 @@ TakeposConnectorMethodDescription=Externe module met extra functies. Mogelijkhei
 PrintMethod=Afdrukmethode
 ReceiptPrinterMethodDescription=Krachtige methode met veel parameters. Volledig aanpasbaar met sjablonen. Kan niet afdrukken vanuit de cloud.
 ByTerminal=Per terminal
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
+TakeposNumpadUsePaymentIcon=Gebruik pictogram in plaats van tekst op betalingsknoppen van numpad
 CashDeskRefNumberingModules=Nummeringsmodule voor POS-verkoop
 CashDeskGenericMaskCodes6 =  <br><b>{TN}</b> tag wordt gebruikt om het terminalnummer toe te voegen
 TakeposGroupSameProduct=Groepeer dezelfde productlijnen
 StartAParallelSale=Start een nieuwe parallelle verkoop
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Sluit de kassa
+SaleStartedAt=Verkoop begon op %s
+ControlCashOpening=Controle contant geld pop-up bij het openen van POS
+CloseCashFence=Sluit de kassa-bediening
 CashReport=Kassa verslag
 MainPrinterToUse=Hoofdprinter om te gebruiken
 OrderPrinterToUse=Bestel printer om te gebruiken
@@ -115,11 +116,11 @@ ScanToOrder=Scan de QR code om te bestellen
 Appearance=Weergave
 HideCategoryImages=Verberg categorie afbeeldingen
 HideProductImages=Verberg productafbeeldingen
-NumberOfLinesToShow=Number of lines of images to show
-DefineTablePlan=Define tables plan
-GiftReceiptButton=Add a "Gift receipt" button
-GiftReceipt=Gift receipt
-ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
-AllowDelayedPayment=Allow delayed payment
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+NumberOfLinesToShow=Aantal regels met afbeeldingen dat moet worden weergegeven
+DefineTablePlan=Definieer tafelschikking
+GiftReceiptButton=Voeg een knop "Cadeaubon" toe
+GiftReceipt=Cadeaubon
+ModuleReceiptPrinterMustBeEnabled=Module Bonprinter moet eerst zijn ingeschakeld
+AllowDelayedPayment=Laat uitgestelde betaling toe
+PrintPaymentMethodOnReceipts=Betaalmethode afdrukken op tickets | bonnen
 WeighingScale=Weegschaal
diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang
index c4008fe1ce5..1f1c51d1027 100644
--- a/htdocs/langs/nl_NL/categories.lang
+++ b/htdocs/langs/nl_NL/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Labels/categorieën projecten
 UsersCategoriesArea=Gebruikers tags / categorieën gebied
 SubCats=Sub-categorieën
 CatList=Lijst van kenmerken/categorieën
+CatListAll=Lijst met groepen /categorieën (alle typen)
 NewCategory=Nieuw label/categorie
 ModifCat=Wijzigen label/categorie
 CatCreated=Label/categorie gecreëerd
@@ -65,28 +66,34 @@ UsersCategoriesShort=Gebruikers tags / categorieën
 StockCategoriesShort=Magazijn-tags / categorieën
 ThisCategoryHasNoItems=Deze categorie bevat geen items.
 CategId=Label/categorie id
-CatSupList=Lijst met leverancierslabels/categorieën
-CatCusList=Lijst van de klant/prospect kenmerken/categorieën
+ParentCategory=Bovenliggende groep/categorie
+ParentCategoryLabel=Label van bovenliggende groep/categorie
+CatSupList=Lijst met leveranciers groepen/ categorieën
+CatCusList=Lijst met klant groepen/categorieën
 CatProdList=Lijst van product kenmerken/categorieën
 CatMemberList=Lijst leden kenmerken/categorieën
-CatContactList=Lijst met contactpersoon labels/-categorieën
-CatSupLinks=Koppelingen tussen leveranciers en kenmerken/categorieën
+CatContactList=Lijst met groepen/categorieën voor contacten
+CatProjectsList=Lijst met projectgroepen/-categorieën
+CatUsersList=Lijst met groepen/categorieën van gebruikers
+CatSupLinks=Koppelingen tussen leveranciers en groepen/categorieën
 CatCusLinks=Koppelingen tussen klanten/prospects en labels/categorieën
 CatContactsLinks=Koppelingen tussen contacten / adressen en tags / categorieën
 CatProdLinks=Koppelingen tussen producten/diensten en labels/categorieën
-CatProJectLinks=Koppelingen tussen projecten en labels/categorieën
+CatMembersLinks=Koppelingen tussen leden en tags / categorieën
+CatProjectsLinks=Koppelingen tussen projecten en labels/categorieën
+CatUsersLinks=Koppelingen tussen gebruikers en groepen/categorieën
 DeleteFromCat=Verwijderen uit labels/categorie
 ExtraFieldsCategories=Complementaire kenmerken
 CategoriesSetup=Labels/categorieën instelling
 CategorieRecursiv= Automatische koppeling met bovenliggende label/categorie
 CategorieRecursivHelp=Als de optie is ingeschakeld, wordt het product ook toegevoegd aan de bovenliggende categorie wanneer u een product toevoegt aan een subcategorie.
 AddProductServiceIntoCategory=Voeg het volgende product/dienst toe
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
+AddCustomerIntoCategory=Wijs categorie toe aan klant
+AddSupplierIntoCategory=Wijs categorie toe aan leverancier
 ShowCategory=Toon label/categorie
 ByDefaultInList=Standaard in de lijst
 ChooseCategory=Kies categorie
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
-WebsitePagesCategoriesArea=Page-Container Categories
+StocksCategoriesArea=Categorieën voor magazijnen
+ActionCommCategoriesArea=Categorieën voor gebeurtenissen
+WebsitePagesCategoriesArea= Categorieën voor Page-Container
 UseOrOperatorForCategories=Gebruik of operator voor categorieën
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index 2b4e7b136b4..c310afcbe4b 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -124,7 +124,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-nummer
 ProfId6AT=-
 ProfId1AU=Prof. id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof. id 1 (Professioneel nummer)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=EORI-nummer
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Belastingsnummer staat)
@@ -144,11 +144,11 @@ ProfId3BR=IM (Belastingsnummer stad)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=UID-Nummer
+ProfId1CH=UID-nummer
 ProfId2CH=-
 ProfId3CH=Prof id 1 (Federale nummer)
 ProfId4CH=Handelsregisternummer
-ProfId5CH=EORI number
+ProfId5CH=EORI-nummer
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (RUT)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof. id 1 (USt.-IdNr)
 ProfId2DE=Prof. id 2 (USt.-Nr)
 ProfId3DE=Prof. Id 3 (Handelsregisternummer)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=EORI-nummer
 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=EORI number
+ProfId5ES=EORI-nummer
 ProfId6ES=-
 ProfId1FR=Prof. id 1 (SIREN)
 ProfId2FR=Prof. id 2 (SIRET)
 ProfId3FR=Prof. Id 3 (NAF, oude APE)
 ProfId4FR=Prof. id 4 (RCS / RM)
-ProfId5FR=EORI number
+ProfId5FR=EORI-nummer
 ProfId6FR=-
 ProfId1GB=Prof. id 1 (Registratienummer)
 ProfId2GB=-
@@ -202,12 +202,12 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=EORI-nummer
 ProfId1LU=Id. prof. 1 (R.C.S. Luxemburg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=EORI-nummer
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
@@ -225,13 +225,13 @@ ProfId1NL=KVK nummer
 ProfId2NL==
 ProfId3NL==
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=EORI number
+ProfId5NL=EORI-nummer
 ProfId6NL=-
 ProfId1PT=Prof. id 1 (NIPC)
 ProfId2PT=Prof. id 2 (Social security number)
 ProfId3PT=Prof. Id 3 (Commercial Record aantal)
 ProfId4PT=Prof. id 4 (Conservatorium)
-ProfId5PT=EORI number
+ProfId5PT=EORI-nummer
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +255,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=EORI-nummer
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -358,8 +358,8 @@ VATIntraCheckableOnEUSite=Controleer het intracommunautaire btw-nummer op de web
 VATIntraManualCheck=U kunt het ook handmatig controleren op de website van de Europese Commissie <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Controle niet mogelijk. Controleerdienst wordt niet verleend door lidstaat (%s).
 NorProspectNorCustomer=Geen prospect, noch klant
-JuridicalStatus=Type juridische entiteit
-Workforce=Workforce
+JuridicalStatus=Soort bedrijf
+Workforce=Personeelsbestand
 Staff=Werknemers
 ProspectLevelShort=Potentieel
 ProspectLevel=Prospectpotentieel
@@ -462,8 +462,8 @@ PaymentTermsSupplier=Betalingstermijn - Leverancier
 PaymentTypeBoth=Betaalwijze - Klant en leverancier
 MulticurrencyUsed=Gebruik meerdere valuta
 MulticurrencyCurrency=Valuta
-InEEC=Europe (EEC)
-RestOfEurope=Rest of Europe (EEC)
-OutOfEurope=Out of Europe (EEC)
-CurrentOutstandingBillLate=Current outstanding bill late
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
+InEEC=Europa (EEG)
+RestOfEurope=Rest van Europa (EEG)
+OutOfEurope=Buiten Europa (EEG)
+CurrentOutstandingBillLate=Openstaande factuur met vervallen betaaldatum
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Wees voorzichtig, afhankelijk van uw productprijsinstellingen, moet u van relatie veranderen voordat u een product aan POS toevoegt.
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index c811965f35d..79d8621996a 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -69,7 +69,7 @@ SocialContribution=Sociale of fiscale heffingen/belasting
 SocialContributions=Sociale of fiscale heffingen/belastingen
 SocialContributionsDeductibles=Aftrekbare sociale/fiscale lasten/belastingen
 SocialContributionsNondeductibles=Niet aftrekbare sociale/fiscale lasten/belastingen
-DateOfSocialContribution=Date of social or fiscal tax
+DateOfSocialContribution=Datum van sociale of fiscale belasting
 LabelContrib=Labelbijdrage
 TypeContrib=Type bijdrage
 MenuSpecialExpenses=Speciale uitgaven
@@ -111,9 +111,9 @@ Refund=Terugbetaling
 SocialContributionsPayments=Betaling Sociale/fiscale lasten
 ShowVatPayment=Toon BTW-betaling
 TotalToPay=Totaal te voldoen
-BalanceVisibilityDependsOnSortAndFilters=Saldo is alleen zichtbaar in deze lijst als de tabel oplopend is gesorteerd op %s en is gefilterd op 1 bankrekening
+BalanceVisibilityDependsOnSortAndFilters=Saldo is alleen zichtbaar in deze lijst als de tabel is gesorteerd op %s en gefilterd op 1 bankrekening (zonder andere filters)
 CustomerAccountancyCode=Debiteurenrekening
-SupplierAccountancyCode=Leveranciersboekhoudingscode
+SupplierAccountancyCode=Boekcode leverancier
 CustomerAccountancyCodeShort=Klant account. code
 SupplierAccountancyCodeShort=Lev. account. code
 AccountNumber=Rekeningnummer
@@ -140,8 +140,8 @@ ConfirmDeleteSocialContribution=Weet u zeker dat u deze sociale- of fiscale bela
 ExportDataset_tax_1=Sociale- en fiscale belastingen en betalingen
 CalcModeVATDebt=Mode <b>%sBTW op verbintenissenboekhouding %s.</b>
 CalcModeVATEngagement=Mode <b>%sBTW op de inkomens-uitgaven %s.</b>
-CalcModeDebt=Analyse van bekende geregistreerde facturen, zelfs als deze nog niet in het grootboek zijn opgenomen.
-CalcModeEngagement=Analyse van bekende geregistreerde betalingen, zelfs als deze nog niet in Ledger zijn geregistreerd.
+CalcModeDebt=Analyse van bekende geregistreerde documenten, zelfs als ze nog niet in het grootboek zijn geboekt.
+CalcModeEngagement=Analyse van bekende geregistreerde betalingen welke nog niet zijn doorgeboekt in de boekhouding.
 CalcModeBookkeeping=Analyse van gegevens gejournaliseerd in de boekhoudboekentabel.
 CalcModeLT1= <b>Modus %s RE op klant- leveranciers facturen %s</b>
 CalcModeLT1Debt=Modus <b>%sRE op klantfacturen%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balans van inkomsten en uitgaven, jaarlijks overzic
 AnnualByCompanies=Saldo van baten en lasten, per vooraf gedefinieerde rekeninggroepen
 AnnualByCompaniesDueDebtMode=Evenwicht tussen baten en lasten, gedetailleerd per vooraf gedefinieerde groepen, modus <b>%sClaims-Debts%s</b> zei <b>Commitment accounting</b> .
 AnnualByCompaniesInputOutputMode=Saldo van baten en lasten, detail door vooraf gedefinieerde groepen, mode <b>%sIncomes-Expenses%s</b> zei <b>cash accounting.</b>
-SeeReportInInputOutputMode=Zie %sanalyse van betalingen%s voor een berekening van werkelijke betalingen, zelfs als deze nog niet in Ledger zijn geregistreerd.
-SeeReportInDueDebtMode=Zie %sanalyse van facturen%s voor een berekening op basis van bekende geregistreerde facturen, zelfs als deze nog niet in Ledger zijn geregistreerd.
-SeeReportInBookkeepingMode=Zie <b>%s Boekhoudverslag%s</b> voor een berekening op de <b>boekhoudboekentabel</b>
+SeeReportInInputOutputMode=Zie <b>%s analyse van betalingen%s </b>voor een berekening op basis van<b>geregistreerde betalingen</b>gedaan, zelfs als ze nog niet het grootboek zijn opgenomen
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Het toont record in uw grootboek met boekhoud
 SeePageForSetup=Zie menu <a href="%s">%s</a> voor instellingen
 DepositsAreNotIncluded=- Vooruitbetalingsfacturen zijn niet inbegrepen
 DepositsAreIncluded=- Facturen met vooruitbetaling zijn inbegrepen
+LT1ReportByMonth=BTW 2-rapport per maand
+LT2ReportByMonth=BTW 3 rapport per maand
 LT1ReportByCustomers=Belasting 2 rapporteren door relatie
 LT2ReportByCustomers=Belasting 3 rapporteren door derden
 LT1ReportByCustomersES=Rapport door derde partij RE
 LT2ReportByCustomersES=Verslag van derden IRPF
 VATReport=Verkoop belasting rapportage
 VATReportByPeriods=Verkoopbelastingrapport per periode
+VATReportByMonth=BTW-overzicht per maand
 VATReportByRates=BTW overzicht per tarief
 VATReportByThirdParties=Verkoopbelastingrapport door relatie
 VATReportByCustomers=BTW-overzicht per klant
diff --git a/htdocs/langs/nl_NL/contracts.lang b/htdocs/langs/nl_NL/contracts.lang
index 9cbf6c3b23e..835a44f62a1 100644
--- a/htdocs/langs/nl_NL/contracts.lang
+++ b/htdocs/langs/nl_NL/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Actieve diensten
 MenuExpiredServices=Verlopen diensten
 MenuClosedServices=Gesloten diensten
 NewContract=Nieuw contract
-NewContractSubscription=New contract or subscription
+NewContractSubscription=Nieuw contract of abonnement
 AddContract=Nieuw contract
 DeleteAContract=Verwijder een contract
 ActivateAllOnContract=Activeer alle services
@@ -99,6 +99,6 @@ TypeContact_contrat_internal_SALESREPFOLL=Vertegenwoordiger opvolging contract
 TypeContact_contrat_external_BILLING=Afnemersfactuurcontactpersoon
 TypeContact_contrat_external_CUSTOMER=Contactpersoon die follow-up doet voor deze afnemer
 TypeContact_contrat_external_SALESREPSIGN=Ondertekening contract contactpersoon
-HideClosedServiceByDefault=Hide closed services by default
-ShowClosedServices=Show Closed Services
-HideClosedServices=Hide Closed Services
+HideClosedServiceByDefault=Verberg gesloten services als default
+ShowClosedServices=Toon gesloten services
+HideClosedServices=Verberg gesloten services
diff --git a/htdocs/langs/nl_NL/cron.lang b/htdocs/langs/nl_NL/cron.lang
index 235ff89766f..a44efab9516 100644
--- a/htdocs/langs/nl_NL/cron.lang
+++ b/htdocs/langs/nl_NL/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Verwijder geplande taak
 Permission23104 = Voer geplande taak uit
 # Admin
 CronSetup=Beheer taakplanning
-URLToLaunchCronJobs=URL om gekwalificeerde cron-taken te controleren en te starten
-OrToLaunchASpecificJob=Of om een specifieke taak te controleren en te starten
+URLToLaunchCronJobs=URL om gekwalificeerde cron-taken vanuit een browser te controleren en te starten
+OrToLaunchASpecificJob=Of om een specifieke taak vanuit een browser te controleren en te starten
 KeyForCronAccess=Beveiligingssleutel voor URL om cron-taken te starten
 FileToLaunchCronJobs=Opdrachtregel om gekwalificeerde cron-taken te controleren en te starten
 CronExplainHowToRunUnix=In een Unix-omgeving moet u het volgende crontab-item gebruiken om de opdrachtregel elke 5 minuten uit te voeren
 CronExplainHowToRunWin=In een Microsoft (tm) Windows-omgeving kunt u de geplande taakhulpmiddelen gebruiken om de opdrachtregel elke 5 minuten uit te voeren
 CronMethodDoesNotExists=Class%sbevat geen methode%s
+CronMethodNotAllowed=Methode %s van class %s staat op de zwarte lijst met verboden methoden
 CronJobDefDesc=Cron-taakprofielen worden gedefinieerd in het modulebeschrijvingsbestand. Wanneer de module is geactiveerd, zijn ze geladen en beschikbaar, zodat u de taken kunt beheren vanuit het menu admin tools %s.
 CronJobProfiles=Lijst met vooraf gedefinieerde cron-functieprofielen
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Aantal lanceringen
 CronMaxRun=Maximaal aantal lanceringen
 CronEach=Elke
 JobFinished=Taak gestart en be-eindigd
+Scheduled=Gepland
 #Page card
 CronAdd= Taak toevoegen
 CronEvery=Alle taken uitvoeren
@@ -56,7 +58,7 @@ CronNote=Reactie
 CronFieldMandatory=Velden %s zijn verplicht
 CronErrEndDateStartDt=Einddatum kan niet vóór startdatum liggen
 StatusAtInstall=Status bij module-installatie
-CronStatusActiveBtn=Activeren
+CronStatusActiveBtn=Schema
 CronStatusInactiveBtn=Deactiveren
 CronTaskInactive=Deze taak is uitgeschakeld
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Back-up van lokale database
 MakeLocalDatabaseDump=Maak een lokale database dump. Parameters zijn: compressie ('gz' of 'bz' of 'none'), back-uptype ('mysql', 'pgsql', 'auto'), 1, 'auto' of te creëren bestandsnaam, aantal te bewaren back-upbestanden
 WarningCronDelayed=Opgelet, voor prestatiedoeleinden, ongeacht de volgende datum van uitvoering van ingeschakelde taken, kunnen uw taken worden vertraagd tot maximaal %s uur voordat ze worden uitgevoerd.
 DATAPOLICYJob=Gegevens opschonen en anonimiseren
+JobXMustBeEnabled=Taak %s moet zijn ingeschakeld
+# Cron Boxes
+LastExecutedScheduledJob=Laatst uitgevoerde geplande taak
+NextScheduledJobExecute=Volgende geplande taak om uit te voeren
+NumberScheduledJobError=Aantal foutieve geplande taken
diff --git a/htdocs/langs/nl_NL/deliveries.lang b/htdocs/langs/nl_NL/deliveries.lang
index 8a8382da107..329c2b74ad0 100644
--- a/htdocs/langs/nl_NL/deliveries.lang
+++ b/htdocs/langs/nl_NL/deliveries.lang
@@ -27,5 +27,6 @@ Recipient=Ontvanger
 ErrorStockIsNotEnough=Er is niet genoeg voorraad
 Shippable=Zendklaar
 NonShippable=Niet verzendbaar
+ShowShippableStatus=Toon verzendstatus
 ShowReceiving=Toon afleverbon
 NonExistentOrder=Niet bestaande order
diff --git a/htdocs/langs/nl_NL/ecm.lang b/htdocs/langs/nl_NL/ecm.lang
index 0fe01fa5726..b0b224d1835 100644
--- a/htdocs/langs/nl_NL/ecm.lang
+++ b/htdocs/langs/nl_NL/ecm.lang
@@ -23,7 +23,7 @@ ECMSearchByKeywords=Zoeken op trefwoorden
 ECMSearchByEntity=Zoek op object
 ECMSectionOfDocuments=Mappen van documenten
 ECMTypeAuto=Automatisch
-ECMDocsBy=Documents linked to %s
+ECMDocsBy=Documenten gekoppeld aan %s
 ECMNoDirectoryYet=Geen map aangemaakt
 ShowECMSection=Toon map
 DeleteSection=Verwijder map
@@ -38,6 +38,6 @@ ReSyncListOfDir=Hersynchroniseer de lijst met mappen
 HashOfFileContent=Hash van bestandsinhoud
 NoDirectoriesFound=Geen mappen gevonden
 FileNotYetIndexedInDatabase=Bestand nog niet geïndexeerd in database (probeer deze opnieuw te uploaden)
-ExtraFieldsEcmFiles=Extrafields Ecm Files
-ExtraFieldsEcmDirectories=Extrafields Ecm Directories
-ECMSetup=ECM Setup
+ExtraFieldsEcmFiles=Extrafields Ecm-bestanden
+ExtraFieldsEcmDirectories=Extrafields Ecm-mappen
+ECMSetup=ECM-instellingen
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index d9b7214e8d9..e829cd22faf 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Geen fout, wij bevestigen
 # Errors
 ErrorButCommitIsDone=Fouten gevonden maar we valideren toch
 ErrorBadEMail=E-mail %s is verkeerd
+ErrorBadMXDomain=E-mail %s lijkt verkeerd (domein heeft geen geldige MX-record)
 ErrorBadUrl=Ongeldige Url %s
 ErrorBadValueForParamNotAString=Slechte parameterwaarde. Wordt over het algemeen gegenereerd als de vertaling ontbreekt.
+ErrorRefAlreadyExists=Referentie <b>%s</b> bestaat al.
 ErrorLoginAlreadyExists=Inlog %s bestaat reeds.
 ErrorGroupAlreadyExists=Groep %s bestaat reeds.
 ErrorRecordNotFound=Tabelregel niet gevonden.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Enkele verplichte velden zijn niet ingevuld.
 ErrorSubjectIsRequired=Het e-mail onderwerp is verplicht
 ErrorFailedToCreateDir=Creëren van een map mislukt. Controleer of de Webservergebruiker toestemming heeft om te schrijven in Dolibarr documentenmap. Wanneer de parameter <b>safe_mode</b> is ingeschakeld in PHP, controleer dan dat de Dolibarr php bestanden eigendom zijn van de de webserve gebruiker (of groep).
 ErrorNoMailDefinedForThisUser=Geen e-mailadres ingesteld voor deze gebruiker
+ErrorSetupOfEmailsNotComplete=Het instellen van e-mails is niet voltooid
 ErrorFeatureNeedJavascript=Voor deze functie moet Javascript geactiveerd zijn. Verander dit in het Instellingen - scherm.
 ErrorTopMenuMustHaveAParentWithId0=Een menu van het type 'Top' kan niet beschikken over een bovenliggend menu. Stel 0 in in het 'Top' menu of kies een menu van het type  'Left'.
 ErrorLeftMenuMustHaveAParentId=Een menu van het type 'Left' moeten een id van een bovenliggend menu hebben.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Deze profile naam bestaat al voor deze export set.
 ErrorLDAPSetupNotComplete=De Dolibarr-LDAP installatie is niet compleet.
 ErrorLDAPMakeManualTest=Een .ldif bestand is gegenereerd in de map %s. Probeer het handmatig te laden vanuit een opdrachtregel om meer informatie over fouten te verkrijgen.
 ErrorCantSaveADoneUserWithZeroPercentage=Kan een actie met "status niet gestart" niet opslaan als het veld "gedaan door" ook is ingevuld.
-ErrorRefAlreadyExists=De referentie gebruikt voor het maken bestaat al
+ErrorRefAlreadyExists=Referentie <b>%s</b> bestaat al.
 ErrorPleaseTypeBankTransactionReportName=Voer de naam van het bankafschrift in waar de boeking moet worden gerapporteerd (formaat YYYYMM of YYYYMMDD)
 ErrorRecordHasChildren=Kan record niet verwijderen omdat het enkele onderliggende records heeft.
 ErrorRecordHasAtLeastOneChildOfType=Object heeft ten minste één kind van het type %s
@@ -120,7 +123,7 @@ ErrorLoginHasNoEmail=Deze gebruiker heeft geen e-mail adres. Proces afgebroken.
 ErrorBadValueForCode=Onjuist waardetypen voor code. Probeer het opnieuw met een nieuwe waarde
 ErrorBothFieldCantBeNegative=Velden %s %s en kan niet beide negatief
 ErrorFieldCantBeNegativeOnInvoice=Veld <strong> %s </strong> mag niet negatief zijn voor dit type factuur. Als u een kortingsregel moet toevoegen, maakt u eerst de korting (uit veld '%s' op de kaart van een derde partij) en past u deze toe op de factuur.
-ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
+ErrorLinesCantBeNegativeForOneVATRate=Totaal aantal regels (na aftrek van belastingen) kan niet negatief zijn voor een bepaald btw-tarief dat niet nul is (negatief totaal gevonden voor btw-tarief <b>%s</b>%%).
 ErrorLinesCantBeNegativeOnDeposits=Lijnen kunnen niet negatief zijn in een storting. U zult problemen ondervinden wanneer u de aanbetaling in de eindfactuur moet verbruiken als u dit doet.
 ErrorQtyForCustomerInvoiceCantBeNegative=Aantal voor regel in klantfacturen kan niet negatief zijn
 ErrorWebServerUserHasNotPermission=User account <b>%s</b> gebruikt om web-server uit te voeren heeft geen toestemming voor die
@@ -136,8 +139,8 @@ ErrorNewValueCantMatchOldValue=Nieuwe waarde kan niet gelijk is aan de oude
 ErrorFailedToValidatePasswordReset=Mislukt om wachtwoord opnieuw te initialiseren. Misschien werd de her-init al gedaan (deze link kan slechts een keer worden). Zo niet, probeer dan het her-init proces opnieuw te starten.
 ErrorToConnectToMysqlCheckInstance=Verbinding maken met database mislukt. Controleer of de databaseserver actief is (bijvoorbeeld, met mysql / mariadb, kunt u het starten vanaf de opdrachtregel met 'sudo service mysql start').
 ErrorFailedToAddContact=Mislukt om contact toe te voegen
-ErrorDateMustBeBeforeToday=The date must be lower than today
-ErrorDateMustBeInFuture=The date must be greater than today
+ErrorDateMustBeBeforeToday=De datum moet eerder zijn dan vandaag
+ErrorDateMustBeInFuture=De datum moet later zijn dan vandaag
 ErrorPaymentModeDefinedToWithoutSetup=Er is een betalingsmodus ingesteld om %s te typen, maar het instellen van de module Factuur is niet voltooid om te definiëren welke informatie moet worden weergegeven voor deze betalingsmodus.
 ErrorPHPNeedModule=Fout, op uw PHP moet module <b>%s zijn</b> geïnstalleerd om deze functie te gebruiken.
 ErrorOpenIDSetupNotComplete=U stelt het Dolibarr-configuratiebestand in om OpenID-authenticatie toe te staan, maar de URL van de OpenID-service is niet gedefinieerd als een constante %s
@@ -185,7 +188,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Onjuiste definitie van menureeks
 ErrorSavingChanges=Er is een fout opgetreden bij het opslaan van de wijzigingen
 ErrorWarehouseRequiredIntoShipmentLine=Magazijn is vereist op de lijn om te verzenden
 ErrorFileMustHaveFormat=Bestand moet het formaat %s hebben
-ErrorFilenameCantStartWithDot=Filename can't start with a '.'
+ErrorFilenameCantStartWithDot=Bestandsnaam mag niet beginnen met een '.'
 ErrorSupplierCountryIsNotDefined=Land voor deze leverancier is niet gedefinieerd. Corrigeer dit eerst.
 ErrorsThirdpartyMerge=Kan de twee records niet samenvoegen. Verzoek geannuleerd.
 ErrorStockIsNotEnoughToAddProductOnOrder=De voorraad is niet voldoende om het product %s toe te voegen aan een nieuwe bestelling.
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=U moet kiezen of het artikel een
 ErrorDiscountLargerThanRemainToPaySplitItBefore=De korting die u probeert toe te passen is groter dan u nog moet betalen. Verdeel de korting eerder in 2 kleinere kortingen.
 ErrorFileNotFoundWithSharedLink=Bestand is niet gevonden. Mogelijk is de gedeelde sleutel gewijzigd of is het bestand onlangs verwijderd.
 ErrorProductBarCodeAlreadyExists=De productstreepjescode %s bestaat al op een andere productreferentie.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Merk ook op dat het gebruik van een virtueel product voor het automatisch verhogen / verlagen van subproducten niet mogelijk is wanneer ten minste één subproduct (of subproduct van subproducten) een serie- / partijnummer nodig heeft.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Merk ook op dat het gebruik van kits voor het automatisch verhogen / verlagen van subproducten niet mogelijk is wanneer ten minste één subproduct (of subproduct van subproducten) een serie-/lotnummer nodig heeft.
 ErrorDescRequiredForFreeProductLines=Beschrijving is verplicht voor lijnen met gratis product
 ErrorAPageWithThisNameOrAliasAlreadyExists=De pagina / container <strong>%s</strong> heeft dezelfde naam of alternatieve alias die u probeert te gebruiken
 ErrorDuringChartLoad=Fout bij het laden van een rekeningschema. Als enkele accounts niet werden geladen, kunt u ze nog steeds handmatig invoeren.
@@ -240,9 +243,19 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Geen voorraad voor dit lot
 ErrorOnlyOneFieldForGroupByIsPossible=Slechts 1 veld voor de 'Groepeer op' is mogelijk (andere worden weggegooid)
 ErrorTooManyDifferentValueForSelectedGroupBy=Te veel verschillende waarden gevonden (meer dan <b> %s </b>) voor het veld '<b> %s </b>', dus we kunnen het niet gebruiken voor afbeeldingen als '. Het veld 'Goepeer op' is verwijderd. Misschien wil je het gebruiken als een X-as?
 ErrorReplaceStringEmpty=Fout, de tekenreeks waarin moet worden vervangen, is leeg
-ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
-ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
-ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorProductNeedBatchNumber=Fout, product '<b>%s</b>' heeft een lot/serienummer nodig
+ErrorProductDoesNotNeedBatchNumber=Fout, product '<b>%s</b>' accepteert geen lot- /serienummer
+ErrorFailedToReadObject=Fout, kan object van het type<b>%s</b> niet lezen
+ErrorParameterMustBeEnabledToAllwoThisFeature=Fout, parameter <b>%s</b> moet zijn ingeschakeld in<b>conf / conf.php<b>om het gebruik van de opdrachtregelinterface door de interne taakplanner mogelijk te maken
+ErrorLoginDateValidity=Fout, deze login valt buiten de geldigheidsperiode
+ErrorValueLength=Lengte van veld '<b>%s</b>' moet hoger zijn dan '<b>%s</b>'
+ErrorReservedKeyword=Het woord '<b>%s</b>' is een gereserveerd trefwoord
+ErrorNotAvailableWithThisDistribution=Niet beschikbaar in deze distributie
+ErrorPublicInterfaceNotEnabled=Publieke interface was niet ingeschakeld
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=De taal van een nieuwe pagina moet worden gedefinieerd als deze is ingesteld als een vertaling van een andere pagina
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=De taal van de nieuwe pagina mag niet de brontaal zijn als deze is ingesteld als vertaling van een andere pagina
+ErrorAParameterIsRequiredForThisOperation=Een parameter is verplicht voor deze bewerking
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Uw PHP-parameter upload_max_filesize (%s) is hoger dan PHP-parameter post_max_size (%s). Dit is geen consistente opstelling.
 WarningPasswordSetWithNoAccount=Er is een wachtwoord ingesteld voor dit lid. Er is echter geen gebruikersaccount gemaakt. Dus dit wachtwoord is opgeslagen maar kan niet worden gebruikt om in te loggen bij Dolibarr. Het kan worden gebruikt door een externe module / interface, maar als u geen gebruikersnaam of wachtwoord voor een lid hoeft aan te maken, kunt u de optie "Beheer een login voor elk lid" in de module-setup van Member uitschakelen. Als u een login moet beheren maar geen wachtwoord nodig heeft, kunt u dit veld leeg houden om deze waarschuwing te voorkomen. Opmerking: e-mail kan ook worden gebruikt als login als het lid aan een gebruiker is gekoppeld.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Uw login is gewijzigd. Om veiligheidsrede
 WarningAnEntryAlreadyExistForTransKey=Er bestaat al een vermelding voor de vertaalsleutel voor deze taal
 WarningNumberOfRecipientIsRestrictedInMassAction=Waarschuwing, het aantal verschillende ontvangers is beperkt tot <b>%s</b> wanneer u de massa-acties op lijsten gebruikt
 WarningDateOfLineMustBeInExpenseReportRange=Waarschuwing, de datum van de regel valt niet binnen het bereik van het onkostenoverzicht
+WarningProjectDraft=Het project bevindt zich nog in de conceptmodus. Vergeet niet om het te valideren als u van plan bent taken te gebruiken.
 WarningProjectClosed=Project is afgesloten. U moet het eerst opnieuw openen.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Sommige banktransacties werden verwijderd nadat het ontvangstbewijs inclusief deze was gegenereerd. Het aantal cheques en het totaal van de ontvangst kan dus verschillen van het aantal en het totaal in de lijst.
-WarningFailedToAddFileIntoDatabaseIndex=Pasop., Kan geen bestandsinvoer toevoegen aan de ECM-database-indextabel
+WarningFailedToAddFileIntoDatabaseIndex=Pas op, het toevoegen van bestandsinvoer aan de ECM-database-indextabel is mislukt
+WarningTheHiddenOptionIsOn=Pas op, de verborgen optie <b>%s</b> is ingeschakeld.
+WarningCreateSubAccounts=Waarschuwing, u kunt niet rechtstreeks een subaccount aanmaken, u moet een derde partij of een gebruiker aanmaken en hen een boekhoudcode toewijzen om ze in deze lijst te vinden
+WarningAvailableOnlyForHTTPSServers=Alleen beschikbaar als u een beveiligde HTTPS-verbinding gebruikt.
diff --git a/htdocs/langs/nl_NL/exports.lang b/htdocs/langs/nl_NL/exports.lang
index af7fa1643d8..5ea7b305541 100644
--- a/htdocs/langs/nl_NL/exports.lang
+++ b/htdocs/langs/nl_NL/exports.lang
@@ -110,7 +110,7 @@ CsvOptions=CSV-formaatopties
 Separator=Veldscheider
 Enclosure=Stringscheidingsteken
 SpecialCode=Speciale code
-ExportStringFilter=%% laat het vervangen toe van één of meer tekens in de tekst
+ExportStringFilter=Gebruik%% voor het vervangen van één of meer tekens in de tekst
 ExportDateFilter=JJJJ, JJJJMM, JJJJMMDD: filters per jaar/maand/dag <br> JJJJ + JJJJ, JJJJMM + JJJJMM, JJJJMMDD + JJJJMMDD: filters over een periode van jaren/maanden/dagen <br> > JJJJ, >JJJJMM, >JJJJMMDD: filters op alle volgende jaren/maanden/dagen <br><JJJJ, <JJJJMM, <JJJJMMDD: filters op alle voorgaande jaren/maanden/dagen
 ExportNumericFilter=NNNNN filters met één waarde <br> NNNNN + NNNNN filters over een bereik van waarden <br>< NNNNN filters met lagere waarden <br>> NNNNN filters met hogere waarden
 ImportFromLine=Importeren vanaf regelnummer
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Sleutel (kolom) om te gebruiken voor het <b>bijwerken van</b
 NbInsert=Aantal ingevoegde regels: %s
 NbUpdate=Aantal bijgewerkte regels: %s
 MultipleRecordFoundWithTheseFilters=Meerdere records zijn gevonden met deze filters: %s
+StocksWithBatch=Voorraden en locatie (magazijn) van producten met batch- / serienummer
diff --git a/htdocs/langs/nl_NL/externalsite.lang b/htdocs/langs/nl_NL/externalsite.lang
index e3cb3ba9869..1a4033fb34b 100644
--- a/htdocs/langs/nl_NL/externalsite.lang
+++ b/htdocs/langs/nl_NL/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Setup link naar externe website
-ExternalSiteURL=Externe Site URL
-ExternalSiteModuleNotComplete=Module ExternalSite werd niet correct geconfigureerd.
+ExternalSiteSetup=Instellingen voor de link naar een externe website
+ExternalSiteURL=Externe website URL
+ExternalSiteModuleNotComplete=Module Externe Site werd niet correct geconfigureerd.
 ExampleMyMenuEntry=Mijn menu-item
diff --git a/htdocs/langs/nl_NL/ftp.lang b/htdocs/langs/nl_NL/ftp.lang
index 14fbe8e04d9..6d3bee48b51 100644
--- a/htdocs/langs/nl_NL/ftp.lang
+++ b/htdocs/langs/nl_NL/ftp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Instellen van de FTP-client module
-NewFTPClient=Nieuwe FTP-client
-FTPArea=FTP gedeelte
-FTPAreaDesc=Dit scherm toont een weergave van een FTP-server.
-SetupOfFTPClientModuleNotComplete=De installatie van de FTP-cliëntmodule lijkt onvolledig te zijn
-FTPFeatureNotSupportedByYourPHP=Uw PHP-installatie ondersteunt niet de juiste FTP-functies
-FailedToConnectToFTPServer=Kon geen verbinding maken met de server (FTP-server: %s, poort: %s)
-FailedToConnectToFTPServerWithCredentials=Inloggen op FTP met ingestelde gebruikernaam / wachtwoord mislukt
+FTPClientSetup=FTP of SFTP Client module setup
+NewFTPClient=Nieuwe FTP/SFTP connectie instellen
+FTPArea=FTP/SFTP omgeving
+FTPAreaDesc=Dit scherm geeft een voorbeeld van een FTP of SFTP server weer
+SetupOfFTPClientModuleNotComplete=De setup van de FTP- of SFTP-clientmodule lijkt niet volledig
+FTPFeatureNotSupportedByYourPHP=Uw PHP ondersteunt geen FTP- of SFTP-functies
+FailedToConnectToFTPServer=Kan geen verbinding maken met server (server%s, poort%s)
+FailedToConnectToFTPServerWithCredentials=Inloggen op server met gedefinieerde login / wachtwoord is mislukt
 FTPFailedToRemoveFile=Bestand <b>%s</b> kon niet verwijderd worden.
 FTPFailedToRemoveDir=Kan map <b>%s</b> niet verwijderen: controleer de machtigingen en of de map leeg is.
 FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Kies een FTP-site in het menu ...
+ChooseAFTPEntryIntoMenu=Kies een FTP / SFTP-site uit het menu ...
 FailedToGetFile=%sBestanden niet ontvangen
diff --git a/htdocs/langs/nl_NL/hrm.lang b/htdocs/langs/nl_NL/hrm.lang
index 00b91ece0f6..479157a79aa 100644
--- a/htdocs/langs/nl_NL/hrm.lang
+++ b/htdocs/langs/nl_NL/hrm.lang
@@ -1,19 +1,19 @@
 # Dolibarr language file - en_US - hrm
 # Admin
-HRM_EMAIL_EXTERNAL_SERVICE=E-mail om externe HRM services te verhinderen.
-Establishments=Bedrijven
-Establishment=Bedrijf
-NewEstablishment=Nieuw bedrijf
-DeleteEstablishment=Verwijder bedrijf
+HRM_EMAIL_EXTERNAL_SERVICE=E-mail om externe HRM service te verhinderen.
+Establishments=Vestigingen
+Establishment=Vestiging
+NewEstablishment=Nieuwe Vestiging
+DeleteEstablishment=Verwijder vestiging
 ConfirmDeleteEstablishment=Weet u zeker dat u deze vestiging wilt verwijderen?
-OpenEtablishment=Open bedrijf
-CloseEtablishment=Sluit bedrijf
+OpenEtablishment=Open vestiging
+CloseEtablishment=Sluit vestiging
 # Dictionary
 DictionaryPublicHolidays=HRM - Feestdagen
 DictionaryDepartment=HRM - Afdelingslijst
-DictionaryFunction=HRM - Functies
+DictionaryFunction=HRM - Vacatures
 # Module
 Employees=Werknemers
 Employee=Werknemer
 NewEmployee=Nieuwe werknemer
-ListOfEmployees=List of employees
+ListOfEmployees=Werknemers lijst
diff --git a/htdocs/langs/nl_NL/interventions.lang b/htdocs/langs/nl_NL/interventions.lang
index ca03ab08ba8..b984fa9206f 100644
--- a/htdocs/langs/nl_NL/interventions.lang
+++ b/htdocs/langs/nl_NL/interventions.lang
@@ -1,18 +1,18 @@
 # Dolibarr language file - Source file is en_US - interventions
 Intervention=Interventie
 Interventions=Interventies
-InterventionCard=Interventiedetails
+InterventionCard=Interventie details
 NewIntervention=Nieuwe interventie
-AddIntervention=Nieuwe interventie
+AddIntervention=Creëer interventie
 ChangeIntoRepeatableIntervention=Schakel over naar herhaalbare interventie
 ListOfInterventions=Interventielijst
 ActionsOnFicheInter=Acties bij interventie
 LastInterventions=Laatste %s interventies
 AllInterventions=Alle interventies
 CreateDraftIntervention=Creëer conceptinterventie
-InterventionContact=Interventiecontactpersoon
+InterventionContact=Interventie contactpersoon
 DeleteIntervention=Interventie verwijderen
-ValidateIntervention=Inteverntie valideren
+ValidateIntervention=Interventie valideren
 ModifyIntervention=Interventie aanpassen
 DeleteInterventionLine=Interventieregel verwijderen
 ConfirmDeleteIntervention=Weet u zeker dat u deze interventie wilt verwijderen?
@@ -22,13 +22,13 @@ ConfirmDeleteInterventionLine=Weet u zeker dat u deze interventieregel wilt verw
 ConfirmCloneIntervention=Weet je zeker dat je deze interventie wilt klonen?
 NameAndSignatureOfInternalContact=Naam en handtekening van de tussenkomende partij:
 NameAndSignatureOfExternalContact=Naam en handtekening van klant:
-DocumentModelStandard=Standaard modeldocument voor interventies
-InterventionCardsAndInterventionLines=Inteventiebladen en -regels
+DocumentModelStandard=Standaard model document voor interventies
+InterventionCardsAndInterventionLines=Interventies en interventie -regels
 InterventionClassifyBilled=Classificeer "gefactureerd"
 InterventionClassifyUnBilled=Classificeer "Nog niet gefactureerd"
 InterventionClassifyDone=Classificeer "Klaar"
 StatusInterInvoiced=Gefactureerd
-SendInterventionRef=Indiening van de interventie %s
+SendInterventionRef=Inzending van de interventie %s
 SendInterventionByMail=Stuur interventie per e-mail
 InterventionCreatedInDolibarr=Interventie %s gecreëerd
 InterventionValidatedInDolibarr=Interventie %s gevalideerd
@@ -38,10 +38,10 @@ InterventionClassifiedUnbilledInDolibarr=Interventie %s als nog niet gefactureer
 InterventionSentByEMail=Interventie %s verzonden per e-mail
 InterventionDeletedInDolibarr=Interventie %s verwijderd
 InterventionsArea=Interventies onderdeel
-DraftFichinter=Concept-interventies
+DraftFichinter=Concept interventies
 LastModifiedInterventions=Laatste %s aangepaste interventies
 FichinterToProcess=Interventies om te verwerken
-TypeContact_fichinter_external_CUSTOMER=Nabehandeling afnemerscontact
+TypeContact_fichinter_external_CUSTOMER=Opvolgen klantcontact
 PrintProductsOnFichinter=Print ook regels van het type "product" (niet alleen diensten) op de interventiekaart
 PrintProductsOnFichinterDetails=Interventies gegenereerd op basis van bestellingen
 UseServicesDurationOnFichinter=Gebruik de duur van de services voor interventies die zijn gegenereerd op basis van bestellingen
@@ -51,16 +51,18 @@ InterventionStatistics=Interventie statistieken
 NbOfinterventions=Aantal interventiekaarten
 NumberOfInterventionsByMonth=Aantal interventiekaarten per maand (datum van validatie)
 AmountOfInteventionNotIncludedByDefault=Het bedrag voor interventie is niet standaard opgenomen in de winst (in de meeste gevallen worden de urenstaten gebruikt om de bestede tijd te tellen). Voeg optie PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT toe aan 1 in home-setup-diversen om ze op te nemen.
-InterId=Interventie-ID
+InterId=Interventie ID
 InterRef=Interventie ref.
 InterDateCreation=Aanmaakdatum interventie
 InterDuration=Interventieduur
 InterStatus=Interventiestatus
 InterNote=Opmerking interventie
-InterLine=Lijn van interventie
-InterLineId=Regel ID-interventie
+InterLine=Lijn/regel van interventie
+InterLineId=Regel ID interventie
 InterLineDate=Datum regel interventie
 InterLineDuration=Duur regel interventie
 InterLineDesc=Opmerking regel interventie
 RepeatableIntervention=Sjabloon voor interventie
 ToCreateAPredefinedIntervention=Als u een vooraf gedefinieerde of terugkerende interventie wilt maken, maakt u een gemeenschappelijke interventie en converteert u deze naar een interventiesjabloon
+Reopen=Heropenen
+ConfirmReopenIntervention=Weet u zeker dat u de interventie <b>%s</b> weer wilt openen?
diff --git a/htdocs/langs/nl_NL/intracommreport.lang b/htdocs/langs/nl_NL/intracommreport.lang
index e30b5fe8ff2..f7a16dc291f 100644
--- a/htdocs/langs/nl_NL/intracommreport.lang
+++ b/htdocs/langs/nl_NL/intracommreport.lang
@@ -31,10 +31,10 @@ IntracommReportTitle=Voorbereiding van een XML-bestand in ProDouane formaat
 
 # List
 IntracommReportList=Lijst met gegenereerde aangiften
-IntracommReportNumber=Numero of declaration
-IntracommReportPeriod=Period of nalysis
+IntracommReportNumber=Nummer van aangifte
+IntracommReportPeriod=Analyseperiode
 IntracommReportTypeDeclaration=Type aangifte
-IntracommReportDownload=download XML file
+IntracommReportDownload=download XML-bestand
 
 # Invoice
 IntracommReportTransportMode=Transport methode
diff --git a/htdocs/langs/nl_NL/languages.lang b/htdocs/langs/nl_NL/languages.lang
index e6b9fa70658..4d1ee5150ff 100644
--- a/htdocs/langs/nl_NL/languages.lang
+++ b/htdocs/langs/nl_NL/languages.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_am_ET=Ethiopian
+Language_am_ET=Ethiopisch
 Language_ar_AR=Arabisch
 Language_ar_EG=Arabisch (Egyptisch)
 Language_ar_SA=Arabisch
-Language_az_AZ=Azerbaijani
+Language_az_AZ=Azerbeidzjaans
 Language_bn_BD=Bengaals
-Language_bn_IN=Bengali (India)
+Language_bn_IN=Bengaals (India)
 Language_bg_BG=Bulgaars
 Language_bs_BA=Bosnisch
 Language_ca_ES=Catalaans
@@ -40,7 +40,7 @@ Language_es_PA=Spaans (Panama)
 Language_es_PY=Spaans (Paraguay)
 Language_es_PE=Spaans (Peru)
 Language_es_PR=Spaans (Puerto Rico)
-Language_es_US=Spanish (USA)
+Language_es_US=Spaans (VS)
 Language_es_UY=Spaans (Uruguay)
 Language_es_GT=Spaans (Guatemala)
 Language_es_VE=Spaans (Venezuela)
@@ -54,11 +54,11 @@ Language_fr_CH=Frans (Zwitserland)
 Language_fr_CI=Frans (Ivoorkust)
 Language_fr_CM=Frans (Kameroen)
 Language_fr_FR=Frans (Frankrijk)
-Language_fr_GA=French (Gabon)
+Language_fr_GA=Frans (Gabon)
 Language_fr_NC=Frans (Nieuw-Caledonië)
 Language_fr_SN=Frans (Senegal)
 Language_fy_NL=Frisian
-Language_gl_ES=Galician
+Language_gl_ES=Galicisch
 Language_he_IL=Hebreeuws
 Language_hi_IN=Hindi (India)
 Language_hr_HR=Kroatisch
@@ -78,7 +78,7 @@ Language_lv_LV=Lets
 Language_mk_MK=Macedonisch
 Language_mn_MN=Mongools
 Language_nb_NO=Noors (Bokmål)
-Language_ne_NP=Nepali
+Language_ne_NP=Nepalees
 Language_nl_BE=Nederlands (België)
 Language_nl_NL=Nederlands
 Language_pl_PL=Pools
diff --git a/htdocs/langs/nl_NL/loan.lang b/htdocs/langs/nl_NL/loan.lang
index 82892fa1a0f..82c7adbae4e 100644
--- a/htdocs/langs/nl_NL/loan.lang
+++ b/htdocs/langs/nl_NL/loan.lang
@@ -23,9 +23,9 @@ AddLoan=Aanmaken lening
 FinancialCommitment=Financiële verplichting
 InterestAmount=Rente
 CapitalRemain=Saldo kapitaal
-TermPaidAllreadyPaid = This term is allready paid
-CantUseScheduleWithLoanStartedToPaid = Can't use scheduler for a loan with payment started
-CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule
+TermPaidAllreadyPaid = Deze termijn is al betaald
+CantUseScheduleWithLoanStartedToPaid = Kan planner niet gebruiken voor een lening waarvan de betaling is gestart
+CantModifyInterestIfScheduleIsUsed = U kunt de rente niet wijzigen indien u een schema gebruikt
 # Admin
 ConfigLoan=Configuratie van de module lening
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Standaard grootboekrekening kapitaal
diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang
index 0d1eca7a0ff..84dbbc2a4a2 100644
--- a/htdocs/langs/nl_NL/mails.lang
+++ b/htdocs/langs/nl_NL/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=E-mails door gebruiker opgemaakt
 MailingModuleDescDolibarrUsers=Gebruikers met e-mails
 MailingModuleDescThirdPartiesByCategories=Derden (op categorieën)
 SendingFromWebInterfaceIsNotAllowed=Verzenden vanuit de web interface is niet toegestaan.
+EmailCollectorFilterDesc=Alle filters moeten overeenkomen om een e-mail te kunnen verzamelen
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Regel %s in bestand
@@ -129,8 +130,8 @@ NotificationsAuto=Automatisch meldingen
 NoNotificationsWillBeSent=Er staan geen e-mail kennisgevingen gepland voor dit type evenement en bedrijf
 ANotificationsWillBeSent=1 automatische notificatie zal worden verstuurd per e-mail
 SomeNotificationsWillBeSent=%s automatische notificatie zal per e-mail worden verstuurd
-AddNewNotification=Activeer een nieuw doel / evenement voor e-mailmeldingen
-ListOfActiveNotifications=Lijst met alle actieve doelen / evenementen voor e-mail melding
+AddNewNotification=Abonneer u op een nieuwe automatische e-mailmelding (doel/gebeurtenis)
+ListOfActiveNotifications=Lijst van alle actieve abonnementen (doelen/evenementen) voor automatische e-mailmelding
 ListOfNotificationsDone=Lijst met alle automatisch verstuurde e-mail kennisgevingen
 MailSendSetupIs=Configuratie van e-mailverzending is ingesteld op '%s'. Deze modus kan niet worden gebruikt om bulk e-mails te verzenden.
 MailSendSetupIs2=Ga eerst met een beheerdersaccount naar menu %s Home - Set-up - E-mails%s om de parameter <strong>'%s'</strong> te wijzigen om de modus '%s' te gebruiken. Met deze modus kunt u de installatie van de SMTP-server van uw internetprovider openen en de functie Bulk e-mails gebruiken.
@@ -141,7 +142,7 @@ UseFormatFileEmailToTarget=Het geïmporteerde bestand moet de indeling <strong>e
 UseFormatInputEmailToTarget=Voer een string in met het formaat <strong>e-mail; naam; voornaam; andere</strong>
 MailAdvTargetRecipients=Ontvangers (geavanceerde selectie)
 AdvTgtTitle=Vul invoervelden in om de derde partijen of contacten / adressen voor te selecteren
-AdvTgtSearchTextHelp=Gebruik %% als jokertekens. Om bijvoorbeeld alle items zoals <b>jean, joe, jim te vinden</b> , kun je <b>j%% invoeren</b> , je kunt ook  ; gebruiken als scheidingsteken voor waarde en gebruik ! voor behalve deze waarde. Voorbeeld <b>jean; joe; jim%%;! Jimo;! Jima%</b> richt zich op alle jean, joe, start met jim maar niet jimo en niet alles wat met jima begint
+AdvTgtSearchTextHelp=Gebruik %% als joker-teken. Om bijvoorbeeld alle items zoals <b>jean, joe, jim</b> te vinden, kun je <b> j%%</b> invoeren Je kunt ook een ; gebruiken als scheidingsteken voor de waarde, en gebruik ! alleen hiervoor. Voorbeeld<b>jean;joe;jim%%;!Jimo;!Jima%%</b> zal alle jean, joe, beginnen met jim maar niet met jimo en niet alles dat begint met jima
 AdvTgtSearchIntHelp=Gebruik interval om de waarde int of float te selecteren
 AdvTgtMinVal=Minimum waarde
 AdvTgtMaxVal=Maximum waarde
@@ -174,3 +175,5 @@ Answered=Beantwoord
 IsNotAnAnswer=Is geen antwoord (initiële e-mail)
 IsAnAnswer=Is een antwoord van een initiële e-mail
 RecordCreatedByEmailCollector=Record aangemaakt door de E-mail Collector %s van e-mail %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 34b50571fb7..e55cb6e1942 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Geen sjabloon beschikbaar voor dit e-mailtype
 AvailableVariables=Beschikbare substitutievariabelen
 NoTranslation=Geen vertaling
 Translation=Vertaling
+CurrentTimeZone=Huidige tijdzone (server)
 EmptySearchString=Voer geen lege zoekcriteria in
+EnterADateCriteria=Voer een datumcriterium in
 NoRecordFound=Geen item gevonden
 NoRecordDeleted=Geen record verwijderd
 NotEnoughDataYet=Niet genoeg data
@@ -85,6 +87,8 @@ 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
+HomePage=Startpagina
 RecordSaved=Item opgeslagen
 RecordDeleted=Item verwijderd
 RecordGenerated=Record gegenereerd
@@ -197,7 +201,7 @@ ReOpen=Heropenen
 Upload=Uploaden
 ToLink=Link
 Select=Selecteer
-SelectAll=Select all
+SelectAll=Selecteer alles
 Choose=Kies
 Resize=Schalen
 ResizeOrCrop=Formaat wijzigen of bijsnijden
@@ -220,6 +224,7 @@ Value=Waarde
 PersonalValue=Persoonlijke waarde
 NewObject=Nieuw %s
 NewValue=Nieuwe waarde
+OldValue=Old value %s
 CurrentValue=Huidige waarde
 Code=Code
 Type=Type
@@ -267,10 +272,10 @@ DateStart=Begindatum
 DateEnd=Einddatum
 DateCreation=Aanmaakdatum
 DateCreationShort=Aanmaakdatum
-IPCreation=Creation IP
+IPCreation=Creatie IP
 DateModification=Wijzigingsdatum
 DateModificationShort=Wijzigingsdatum
-IPModification=Modification IP
+IPModification=Wijziging IP
 DateLastModification=Laatste wijzigingsdatum
 DateValidation=Validatiedatum
 DateClosing=Sluitingsdatum
@@ -324,7 +329,7 @@ Morning=Ochtend
 Afternoon=Namiddag
 Quadri=Trimester
 MonthOfDay=Maand van de dag
-DaysOfWeek=Days of week
+DaysOfWeek=Dagen van de week
 HourShort=U
 MinuteShort=mn
 Rate=Tarief
@@ -362,7 +367,7 @@ Amount=Hoeveelheid
 AmountInvoice=Factuurbedrag
 AmountInvoiced=Gefactureerd bedrag
 AmountInvoicedHT=Gefactureerd bedrag (excl. BTW)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoicedTTC=Gefactureerd bedrag (incl. BTW)
 AmountPayment=Betalingsbedrag
 AmountHTShort=Bedrag (excl.)
 AmountTTCShort=Bedrag met BTW
@@ -375,7 +380,7 @@ MulticurrencyPaymentAmount=Betalingsbedrag, originele valuta
 MulticurrencyAmountHT=Bedrag (excl. BTW), oorspronkelijke valuta
 MulticurrencyAmountTTC=Bedrag (incl. BTW), oorspronkelijke valuta
 MulticurrencyAmountVAT=BTW bedrag, oorspronkelijke valuta
-MulticurrencySubPrice=Amount sub price multi currency
+MulticurrencySubPrice=Bedrag subprijs in meerdere valuta
 AmountLT1=Bedrag tax 2
 AmountLT2=Bedrag tax 3
 AmountLT1ES=Bedrag RE
@@ -433,6 +438,7 @@ RemainToPay=Restant te betalen
 Module=Module/Applicatie
 Modules=Modules / Applicaties
 Option=Optie
+Filters=Filters
 List=Lijstoverzicht
 FullList=Volledig overzicht
 FullConversation=Volledig gesprek
@@ -494,7 +500,7 @@ By=Door
 From=Van
 FromDate=Van
 FromLocation=Van
-at=at
+at=Bij
 to=t/m
 To=t/m
 and=en
@@ -517,7 +523,7 @@ Draft=Concept
 Drafts=Concepten
 StatusInterInvoiced=gefactureerd
 Validated=Gevalideerd
-ValidatedToProduce=Validated (To produce)
+ValidatedToProduce=Gevalideerd (om te produceren)
 Opened=Open
 OpenAll=Open (alles)
 ClosedAll=Gesloten (alles)
@@ -650,6 +656,7 @@ SupplierPreview=Voorbeeld van leverancier
 ShowCustomerPreview=Toon afnemersvoorbeeldweergave
 ShowSupplierPreview=Laat voorbeeld leverancier zien
 RefCustomer=Referentie afnemer
+InternalRef=Internal ref.
 Currency=Valuta
 InfoAdmin=Informatie voor beheerders
 Undo=Ongedaan maken
@@ -698,7 +705,7 @@ Method=Methode
 Receive=Ontvangen
 CompleteOrNoMoreReceptionExpected=Voltooid of niets meer verwacht
 ExpectedValue=Verwachte waarde
-ExpectedQty=Expected Qty
+ExpectedQty=Verwacht aantal
 PartialWoman=Gedeeltelijke
 TotalWoman=Totaal
 NeverReceived=Nooit ontvangen
@@ -715,7 +722,7 @@ MenuECM=Documenten
 MenuAWStats=AWStats
 MenuMembers=Leden
 MenuAgendaGoogle=Google-agenda
-MenuTaxesAndSpecialExpenses=Taxes | Special expenses
+MenuTaxesAndSpecialExpenses=Belastingen | Bijzondere kosten
 ThisLimitIsDefinedInSetup=Dolibarr limiet (Menu Home-Instellingen-Beveiliging): %s Kb, PHP grens: %s Kb
 NoFileFound=Geen documenten die zijn opgeslagen in deze map
 CurrentUserLanguage=Huidige taal
@@ -738,7 +745,7 @@ Page=Pagina
 Notes=Notitie
 AddNewLine=Voeg nieuwe regel toe
 AddFile=Voeg bestand toe
-FreeZone=Free-text product
+FreeZone=Product met vrije tekst
 FreeLineOfType=Vrije omschrijving, type:
 CloneMainAttributes=Kloon het object met de belangrijkste kenmerken
 ReGeneratePDF=PDF opnieuw genereren
@@ -888,8 +895,8 @@ Miscellaneous=Diversen
 Calendar=Kalender
 GroupBy=Groeperen op ...
 ViewFlatList=Weergeven als lijst
-ViewAccountList=View ledger
-ViewSubAccountList=View subaccount ledger
+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.
 DirectDownloadLink=Directe download link (openbaar/extern)
@@ -958,39 +965,39 @@ ShortThursday=Do
 ShortFriday=Vr
 ShortSaturday=Za
 ShortSunday=Zo
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
-sixteen=sixteen
-seventeen=seventeen
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
-million=million
-billion=billion
-trillion=trillion
-quadrillion=quadrillion
+one=één
+two=twee
+three=drie
+four=vier
+five=vijf
+six=zes
+seven=zeven
+eight=acht
+nine=negen
+ten=tien
+eleven=elf
+twelve=twaalf
+thirteen=dertien
+fourteen=veertien
+fifteen=vijftien
+sixteen=zestien
+seventeen=zeventien
+eighteen=achttien
+nineteen=negentien
+twenty=twintig
+thirty=dertig
+forty=veertig
+fifty=vijftig
+sixty=zestig
+seventy=zeventig
+eighty=tachtig
+ninety=negentig
+hundred=honderd
+thousand=duizend
+million=miljoen
+billion=miljard
+trillion=biljoen
+quadrillion=biljard
 SelectMailModel=Selecteer een e-mail template
 SetRef=Stel ref in
 Select2ResultFoundUseArrows=Resultaten gevonden. Gebruik de pijlen om te selecteren.
@@ -1021,7 +1028,7 @@ SearchIntoCustomerShipments=Klantzendingen
 SearchIntoExpenseReports=Onkostennota's 
 SearchIntoLeaves=Vertrekken
 SearchIntoTickets=Tickets
-SearchIntoCustomerPayments=Customer payments
+SearchIntoCustomerPayments=Betalingen door klanten
 SearchIntoVendorPayments=Leveranciersbetalingen
 SearchIntoMiscPayments=Diverse betalingen
 CommentLink=Opmerkingen
@@ -1092,18 +1099,24 @@ NotUsedForThisCustomer=Niet gebruikt voor deze klant
 AmountMustBePositive=Bedrag moet positief zijn
 ByStatus=Op status
 InformationMessage=Informatie
-Used=Used
-ASAP=As Soon As Possible
-CREATEInDolibarr=Record %s created
-MODIFYInDolibarr=Record %s modified
-DELETEInDolibarr=Record %s deleted
-VALIDATEInDolibarr=Record %s validated
-APPROVEDInDolibarr=Record %s approved
-DefaultMailModel=Default Mail Model
-PublicVendorName=Public name of vendor
+Used=Gebruikt
+ASAP=Zo spoedig mogelijk
+CREATEInDolibarr=Record %s aangemaakt
+MODIFYInDolibarr=Record %s gewijzigd
+DELETEInDolibarr=Record %s verwijderd
+VALIDATEInDolibarr=Record %s gevalideerd
+APPROVEDInDolibarr=Record %s goedgekeurd
+DefaultMailModel=Standaard mailmodel
+PublicVendorName=Openbare naam van de leverancier
 DateOfBirth=Geboortedatum
-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
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Beveiligingstoken is verlopen, dus actie is geannuleerd. Probeer het a.u.b. opnieuw.
+UpToDate=Bijgewerkt
+OutOfDate=Verouderd
+EventReminder=Herinnering voor evenement
+UpdateForAllLines=Update voor alle lijnen
+OnHold=In de wacht
+Civility=Civility
+AffectTag=Heeft invloed op de tag
+ConfirmAffectTag=invloed op bulk-tag
+ConfirmAffectTagQuestion=Weet u zeker dat u tags wilt beïnvloeden voor de %s geselecteerde record (s)?
+CategTypeNotFound=Geen tag-soort gevonden voor type records
diff --git a/htdocs/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang
index 405b9331dba..ee9c303d352 100644
--- a/htdocs/langs/nl_NL/members.lang
+++ b/htdocs/langs/nl_NL/members.lang
@@ -19,8 +19,8 @@ MembersCards=Visitekaarten van leden
 MembersList=Ledenlijst
 MembersListToValid=Lijst van conceptleden (te valideren)
 MembersListValid=Lijst van geldige leden
-MembersListUpToDate=List of valid members with up-to-date subscription
-MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListUpToDate=Geldige leden met een up-to-date abonnement
+MembersListNotUpToDate=Geldige leden met een verouderd abonnement
 MembersListResiliated=Lijst verwijderde leden
 MembersListQualified=Lijst van gekwalificeerde leden
 MenuMembersToValidate=Conceptleden
@@ -32,7 +32,7 @@ DateSubscription=Inschrijvingsdatum
 DateEndSubscription=Einddatum abonnement
 EndSubscription=Einde abonnement
 SubscriptionId=Inschrijvings-ID
-WithoutSubscription=Without subscription
+WithoutSubscription=Zonder abonnement
 MemberId=Lid ID
 NewMember=Nieuw lid
 MemberType=Type lid
@@ -80,7 +80,7 @@ DeleteType=Verwijderen
 VoteAllowed=Stemming toegestaan
 Physical=Fysiek
 Moral=Moreel
-MorAndPhy=Moral and Physical
+MorAndPhy=Moreel en fysiek
 Reenable=Opnieuw inschakelen
 ResiliateMember=Verwijder een lid
 ConfirmResiliateMember=Weet je zeker dat je dit lidmaatschap wilt beëindigen?
@@ -116,7 +116,7 @@ SendingEmailOnMemberValidation=E-mail verzenden bij validatie van nieuwe leden
 SendingEmailOnNewSubscription=E-mail verzenden bij nieuw abonnement
 SendingReminderForExpiredSubscription=Herinnering verzenden voor verlopen abonnementen
 SendingEmailOnCancelation=Verzenden van e-mail bij annulering
-SendingReminderActionComm=Sending reminder for agenda event
+SendingReminderActionComm=Herinnering verzenden voor agenda-evenement
 # Topic of email templates
 YourMembershipRequestWasReceived=Je lidmaatschap is ontvangen.
 YourMembershipWasValidated=Uw lidmaatschap is gevalideerd
@@ -167,7 +167,7 @@ MembersStatisticsByState=Leden statistieken per staat / provincie
 MembersStatisticsByTown=Leden van de statistieken per gemeente
 MembersStatisticsByRegion=Leden statistieken per regio
 NbOfMembers=Aantal leden
-NbOfActiveMembers=Number of current active members
+NbOfActiveMembers=Aantal huidige actieve leden
 NoValidatedMemberYet=Geen gevalideerde leden gevonden
 MembersByCountryDesc=Dit scherm tonen statistieken over de leden door de landen. Grafisch is echter afhankelijk van Google online grafiek service en is alleen beschikbaar als een internet verbinding is werkt.
 MembersByStateDesc=Dit scherm tonen statistieken over de leden door de staat / provincies / kanton.
@@ -177,7 +177,7 @@ MenuMembersStats=Statistiek
 LastMemberDate=Laatste liddatum
 LatestSubscriptionDate=Laatste abonnementsdatum
 MemberNature=Aard van het lid
-MembersNature=Nature of members
+MembersNature=Aard van de leden
 Public=Informatie zijn openbaar (no = prive)
 NewMemberbyWeb=Nieuw lid toegevoegd. In afwachting van goedkeuring
 NewMemberForm=Nieuw lid formulier
diff --git a/htdocs/langs/nl_NL/modulebuilder.lang b/htdocs/langs/nl_NL/modulebuilder.lang
index 1b4a871f69f..767bee4b08a 100644
--- a/htdocs/langs/nl_NL/modulebuilder.lang
+++ b/htdocs/langs/nl_NL/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP-pagina om een ​​record te maken / bewerken / bekij
 PageForAgendaTab=PHP-pagina voor evenemententabblad
 PageForDocumentTab=PHP-pagina voor documenttabblad
 PageForNoteTab=PHP-pagina voor notitietabblad
+PageForContactTab=PHP-pagina voor tabblad contact
 PathToModulePackage=Pad naar zip van module / applicatiepakket
 PathToModuleDocumentation=Pad naar bestand van module / applicatiedocumentatie (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaties of speciale tekens zijn niet toegestaan.
@@ -77,7 +78,7 @@ IsAMeasure=Is een maat
 DirScanned=Directory gescand
 NoTrigger=Geen trigger
 NoWidget=Geen widget
-GoToApiExplorer=Ga naar API explorer
+GoToApiExplorer=API-verkenner
 ListOfMenusEntries=Lijst met menu-items
 ListOfDictionariesEntries=Lijst met woordenboekingangen
 ListOfPermissionsDefined=Lijst met gedefinieerde machtigingen
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Als u kennis van SQL en PHP hebt, kunt u de wizard voor
 SeeTopRightMenu=Zien <span class="fa fa-bug"></span> in het menu rechtsboven
 AddLanguageFile=Taalbestand toevoegen
 YouCanUseTranslationKey=U kunt hier een sleutel gebruiken die de vertaalsleutel is die in het taalbestand is gevonden (zie tabblad "Talen")
-DropTableIfEmpty=(Verwijder tabel indien leeg)
+DropTableIfEmpty=(Vernietig de tabel als deze leeg is)
 TableDoesNotExists=Tabel %s bestaat niet
 TableDropped=Tabel %s verwijderd
 InitStructureFromExistingTable=Bouw de reeks structuurstructuren van een bestaande tabel
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Gebruik een specifieke editor-URL
 UseSpecificFamily = Gebruik een specifieke familie
 UseSpecificAuthor = Gebruik een specifieke auteur
 UseSpecificVersion = Gebruik een specifieke eerste versie
-ModuleMustBeEnabled=De module / toepassing moet eerst worden ingeschakeld
 IncludeRefGeneration=De referentie van het object moet automatisch worden gegenereerd
 IncludeRefGenerationHelp=Vink dit aan als u code wilt opnemen om het genereren van de referentie automatisch te beheren
 IncludeDocGeneration=Ik wil enkele documenten genereren van het object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type velden: <br> varchar (99), dubbel (24,8), real, tekst, htm
 AsciiToHtmlConverter=Ascii naar HTML converter
 AsciiToPdfConverter=Ascii naar PDF converter
 TableNotEmptyDropCanceled=Tabel is niet leeg. Drop is geannuleerd.
+ModuleBuilderNotAllowed=De modulebouwer is beschikbaar maar niet toegestaan voor uw gebruiker.
diff --git a/htdocs/langs/nl_NL/mrp.lang b/htdocs/langs/nl_NL/mrp.lang
index d6ad354427d..ec0e4244c19 100644
--- a/htdocs/langs/nl_NL/mrp.lang
+++ b/htdocs/langs/nl_NL/mrp.lang
@@ -1,6 +1,6 @@
 Mrp=Productieorders
-MOs=Manufacturing orders
-ManufacturingOrder=Manufacturing Order
+MOs=Productieopdrachten
+ManufacturingOrder=Productieorder
 MRPDescription=Module om productie- en productieorders (PO) te beheren.
 MRPArea=MRP-gebied
 MrpSetupPage=Installatie van module MRP
@@ -76,5 +76,29 @@ ProductsToProduce=Te produceren producten
 UnitCost=De kosten per eenheid
 TotalCost=Totale prijs
 BOMTotalCost=De kosten voor het produceren van deze stuklijst op basis van de kosten van elke hoeveelheid en elk te consumeren product (gebruik kostprijs indien gedefinieerd, anders gemiddelde gewogen prijs indien gedefinieerd, anders de beste aankoopprijs)
-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
+GoOnTabProductionToProduceFirst=U moet eerst de productie hebben gestart om een Productieorder te sluiten (zie tabblad '%s'). Maar u kunt het annuleren.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Een kit kan niet worden gebruikt in een stuklijst of een MO
+Workstation=Workstation
+Workstations=Workstations
+WorkstationsDescription=Workstations management
+WorkstationSetup = Workstations setup
+WorkstationSetupPage = Workstations setup page
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/nl_NL/multicurrency.lang b/htdocs/langs/nl_NL/multicurrency.lang
index 342ced55f1b..dcf54838389 100644
--- a/htdocs/langs/nl_NL/multicurrency.lang
+++ b/htdocs/langs/nl_NL/multicurrency.lang
@@ -20,3 +20,19 @@ MulticurrencyPaymentAmount=Betalingsbedrag, originele valuta
 AmountToOthercurrency=Bedrag in (in valuta van ontvangende account)
 CurrencyRateSyncSucceed=Synchronisatie van valutakoersen is geslaagd
 MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Gebruik de valuta van het document voor online betalingen
+TabTitleMulticurrencyRate=Koerslijst
+ListCurrencyRate=Lijst met wisselkoersen voor de valuta
+CreateRate=Koers aanmaken
+FormCreateRate=Aanmaken koers
+FormUpdateRate=Aanpassen koers
+successRateCreate=Koers voor valuta %s is toegevoegd aan de database
+ConfirmDeleteLineRate=Weet u zeker dat u de %s-koers voor valuta %s op %s-datum wilt verwijderen?
+DeleteLineRate=Opschonen koers
+successRateDelete=Koers verwijderd
+errorRateDelete=Fout bij het verwijderen van de koers
+successUpdateRate=Wijziging aangebracht
+ErrorUpdateRate=Fout bij het wijzigen van de koers
+Codemulticurrency=valuta code
+UpdateRate=wijzig de koers
+CancelUpdate=annuleren
+NoEmptyRate=Het koersveld mag niet leeg zijn
diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang
index 63befed613c..9ec42fd206a 100644
--- a/htdocs/langs/nl_NL/orders.lang
+++ b/htdocs/langs/nl_NL/orders.lang
@@ -87,7 +87,7 @@ NbOfOrders=Aantal opdrachten
 OrdersStatistics=Opdrachtenstatistieken
 OrdersStatisticsSuppliers=Inkooporder statistieken
 NumberOfOrdersByMonth=Aantal opdrachten per maand
-AmountOfOrdersByMonthHT=Aantal bestellingen per maand (excl. BTW)
+AmountOfOrdersByMonthHT=Totaalbedrag bestellingen per maand (excl. BTW)
 ListOfOrders=Opdrachtenlijst
 CloseOrder=Opdracht sluiten
 ConfirmCloseOrder=Weet u zeker dat u deze bestelling wilt instellen op afgeleverd? Zodra een bestelling is afgeleverd, kan deze worden ingesteld op gefactureerd.
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index d6bbceb831c..3b019f24cb7 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -5,8 +5,6 @@ Tools=Gereedschap
 TMenuTools=Gereedschap
 ToolsDesc=Alle tools die niet in andere menu-items zijn opgenomen, zijn hier gegroepeerd. <br> Alle tools zijn toegankelijk via het linkermenu.
 Birthday=Verjaardag
-BirthdayDate=Geboorte datum
-DateToBirth=Geboortedatum
 BirthdayAlertOn=Verjaardagskennisgeving actief
 BirthdayAlertOff=Verjaardagskennisgeving inactief
 TransKey=Vertaling van de sleutel TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Vorige maand (nummer 1-12) van factuurdatum
 TextPreviousMonthOfInvoice=Voorgaande maand (tekst) van factuurdatum.
 NextMonthOfInvoice=Volgende maand (nummer 1-12) van factuurdatum
 TextNextMonthOfInvoice=Volgende maand (tekst) van factuurdatum
+PreviousMonth=Vorige maand
+CurrentMonth=Deze maand
 ZipFileGeneratedInto=ZIP bestand aangemaakt in <b>%s</b>.
 DocFileGeneratedInto=Doc-bestand aangemaakt in <b>%s</b>.
 JumpToLogin=Verbinding verbroken. Ga naar het loginscherm...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Onkosten rapport gevalideerd (goedkeuring vereist
 Notify_EXPENSE_REPORT_APPROVE=Onkosten rapport goedgekeurd
 Notify_HOLIDAY_VALIDATE=Verlofaanvraag gevalideerd (goedkeuring vereist)
 Notify_HOLIDAY_APPROVE=Verzoek goedgekeurd laten
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=Zie setup van module %s
 NbOfAttachedFiles=Aantal bijgevoegde bestanden / documenten
 TotalSizeOfAttachedFiles=Totale omvang van de bijgevoegde bestanden / documenten
@@ -99,6 +100,7 @@ PredefinedMailContentSendShipping=__ (Hallo) __ Vind verzending __REF__ bijgevoe
 PredefinedMailContentSendFichInter=__ (Hallo) __ Zoek interventie __REF__ bijgevoegd __ (Met vriendelijke groet) __ __USER_SIGNATURE__
 PredefinedMailContentLink=Indien u nog niet heeft betaald kunt u op de onderstaande link klikken. %s
 PredefinedMailContentGeneric=__ (Hallo) __ __ (Met vriendelijke groet) __ __USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Herinnering "__EVENT_LABEL__" op __EVENT_DATE__ om __EVENT_TIME__ <br> <br> Dit is een automatisch bericht, gelieve niet te antwoorden.
 DemoDesc=Dolibarr is een compacte ERP / CRM die verschillende bedrijfsmodules ondersteunt. Een demo met alle modules heeft geen zin omdat dit scenario zich nooit voordoet (enkele honderden beschikbaar). Er zijn dus verschillende demoprofielen beschikbaar.
 ChooseYourDemoProfil=Kies het demoprofiel dat het beste bij u past ...
 ChooseYourDemoProfilMore=... of bouw je eigen profiel <br> (handmatige moduleselectie)
@@ -214,6 +216,7 @@ EMailTextExpenseReportValidated=Onkostendeclaratie %s is gevalideerd.
 EMailTextExpenseReportApproved=Onkostendeclaratie %s is goedgekeurd.
 EMailTextHolidayValidated=Verlofaanvraag %s is gevalideerd.
 EMailTextHolidayApproved=Verlofaanvraag %s is goedgekeurd.
+EMailTextActionAdded=The action %s has been added to the Agenda.
 ImportedWithSet=Invoer dataset
 DolibarrNotification=Automatische kennisgeving
 ResizeDesc=Voer een nieuwe breedte <b>of</b> nieuwe hoogte in. Verhoudingen zullen intact blijven tijdens het schalen
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact / adres gecreëerd door e-mailverzamelaar
 ProjectCreatedByEmailCollector=Project gemaakt door e-mailverzamelaar uit e-mail MSGID %s
 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
+PrefixSession=Voorloper sessie-ID
 
 ##### Export #####
 ExportsArea=Uitvoeroverzicht
@@ -278,9 +282,9 @@ LinesToImport=Regels om te importeren
 
 MemoryUsage=Geheugengebruik
 RequestDuration=Duur van het verzoek
-ProductsPerPopularity=Products/Services by popularity
+ProductsPerPopularity=Producten/diensten op populariteit
 PopuProp=Producten / diensten op populariteit in voorstellen
 PopuCom=Producten / services op populariteit in Orders
 ProductStatistics=Producten / diensten Statistieken
 NbOfQtyInOrders=Aantal in bestellingen
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=Selecteer het type object dat u wilt analyseren ...
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index 27d14439fea..0e20bb8eea2 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -104,24 +104,25 @@ SetDefaultBarcodeType=Stel type streepjescode in
 BarcodeValue=Waarde streepjescode
 NoteNotVisibleOnBill=Notitie (niet zichtbaar op facturen, offertes, etc)
 ServiceLimitedDuration=Als product een dienst is met een beperkte houdbaarheid:
-FillWithLastServiceDates=Fill with last service line dates
+FillWithLastServiceDates=Vul de data van de laatste servicelijn in
 MultiPricesAbility=Meerdere prijssegmenten per product / dienst (elke klant bevindt zich in één prijssegment)
 MultiPricesNumPrices=Aantal prijzen
 DefaultPriceType=Basisprijzen per standaard (met versus zonder belasting) bij het toevoegen van nieuwe verkoopprijzen
-AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProductsAbility=Enable Kits (set of several products)
+VariantsAbility=Varianten inschakelen (variaties van producten, bijvoorbeeld kleur, maat)
 AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this kit
+AssociatedProductsNumber=Aantal producten waaruit deze kit bestaat
 ParentProductsNumber=Aantal ouder pakket producten
 ParentProducts=Gerelateerde producten
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
+IfZeroItIsNotAVirtualProduct=Indien 0, is dit product geen kit
+IfZeroItIsNotUsedByVirtualProduct=Indien 0, wordt dit product door geen enkele kit gebruikt
 KeywordFilter=Trefwoord filter
 CategoryFilter=Categorie filter
 ProductToAddSearch=Zoek product om toe te voegen
 NoMatchFound=Geen resultaten gevonden
 ListOfProductsServices=Producten/diensten lijst
-ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of kits with this product as a component
+ProductAssociationList=Lijst met producten/diensten die onderdeel zijn van deze kit
+ProductParentList=Lijst van kits met dit product als onderdeel
 ErrorAssociationIsFatherOfThis=Een van de geselecteerde product is de ouder van het huidige product
 DeleteProduct=Verwijderen een product / dienst
 ConfirmDeleteProduct=Weet u zeker dat u dit product / deze dienst wilt verwijderen?
@@ -167,11 +168,13 @@ BuyingPrices=Inkoop prijzen
 CustomerPrices=Consumenten prijzen
 SuppliersPrices=Prijzen van leveranciers
 SuppliersPricesOfProductsOrServices=Leverancierprijzen (van producten of services)
-CustomCode=Douane / Commodity / HS-code
+CustomCode=Douane | Goederen | HS-code
 CountryOrigin=Land van herkomst
+RegionStateOrigin=Regio oorsprong
+StateOrigin=Staat | Provincie oorsprong
 Nature=Aard van het product (materiaal / afgewerkt)
-NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or finished product
+NatureOfProductShort=Aard van het product
+NatureOfProductDesc=Grondstof of afgewerkt product
 ShortLabel=Kort label
 Unit=Eenheid
 p=u.
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Gebruik vaste prijs
 PriceByQuantity=Verschillende prijzen per hoeveelheid
 DisablePriceByQty=Prijs per hoeveelheid uitschakelen
 PriceByQuantityRange=Aantal bereik
-MultipriceRules=Regels voor prijssegmenten
+MultipriceRules=Automatische prijzen voor segment
 UseMultipriceRules=Gebruik regels voor prijssegmenten (gedefinieerd in de configuratie van de productmodule) om automatisch de prijzen van alle andere segmenten te berekenen op basis van het eerste segment
 PercentVariationOver=%% variatie over %s
 PercentDiscountOver=%% korting op meer dan %s
@@ -287,7 +290,7 @@ PriceExpressionEditorHelp5=Beschikbare globale waarden:
 PriceMode=Prijs-modus
 PriceNumeric=Nummer
 DefaultPrice=Standaard prijs
-DefaultPriceLog=Log of previous default prices
+DefaultPriceLog=Logboek van eerdere standaardprijzen
 ComposedProductIncDecStock=Verhogen/verlagen voorraad bij de ouder verandering
 ComposedProduct=Producten voor kinderen
 MinSupplierPrice=Minimum aankoopprijs
@@ -340,7 +343,7 @@ UseProductFournDesc=Voeg een functie toe om de beschrijvingen van producten te d
 ProductSupplierDescription=Leveranciersbeschrijving voor het product
 UseProductSupplierPackaging=Gebruik verpakkingen op leveranciersprijzen (herbereken hoeveelheden volgens verpakking ingesteld op leveranciersprijs bij toevoegen / bijwerken van regel in leveranciersdocumenten)
 PackagingForThisProduct=Verpakking
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
+PackagingForThisProductDesc=Bij een leveranciersbestelling bestelt u automatisch deze hoeveelheid (of een veelvoud van deze hoeveelheid). Mag niet minder zijn dan de minimumaankoophoeveelheid
 QtyRecalculatedWithPackaging=De hoeveelheid van de lijn werd herberekend volgens de verpakking van de leverancier
 
 #Attributes
@@ -364,9 +367,9 @@ SelectCombination=Selecteer combinatie
 ProductCombinationGenerator=Variatie generator
 Features=Kenmerken
 PriceImpact=Gevolgen voor prijs
-ImpactOnPriceLevel=Impact on price level %s
-ApplyToAllPriceImpactLevel= Apply to all levels
-ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
+ImpactOnPriceLevel=Impact op prijsniveau %s
+ApplyToAllPriceImpactLevel= Toepassen op alle niveaus
+ApplyToAllPriceImpactLevelHelp=Door hier te klikken, stelt u dezelfde prijsimpact in op alle niveaus
 WeightImpact=Gevolgen voor gewicht
 NewProductAttribute=Nieuwe attribuut
 NewProductAttributeValue=Waarde nieuw attribuut
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index d7c0b9b1ba6..f0262ca798c 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -7,7 +7,7 @@ ProjectsArea=Project omgeving
 ProjectStatus=Project status
 SharedProject=Iedereen
 PrivateProject=Projectcontacten
-ProjectsImContactFor=Projects for which I am explicitly a contact
+ProjectsImContactFor=Projecten waarvoor ik expliciet contactpersoon ben
 AllAllowedProjects=Alle projecten die ik kan lezen (mine + public)
 AllProjects=Alle projecten
 MyProjectsDesc=Deze weergave is beperkt tot projecten waarvan u een contactpersoon bent
@@ -79,12 +79,13 @@ DurationEffective=Effectieve duur
 ProgressDeclared=Aangekondigd echte vooruitgang
 TaskProgressSummary=Taakvoortgang
 CurentlyOpenedTasks=Momenteel openstaande taken
-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=De aangegeven werkelijke vooruitgang is minder %s dan de voortgang op consumptie
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=De aangegeven echte vooruitgang is meer %s dan de vooruitgang op het gebied van consumptie
+ProgressCalculated=Vooruitgang in consumptie
 WhichIamLinkedTo=waaraan ik gekoppeld ben
 WhichIamLinkedToProject=die ik ben gekoppeld aan het project
 Time=Tijd
+TimeConsumed=Consumed
 ListOfTasks=Lijst met taken
 GoToListOfTimeConsumed=Ga naar de lijst met tijd die is verbruikt
 GanttView=Gantt-weergave
@@ -211,9 +212,9 @@ ProjectNbProjectByMonth=Aantal gemaakte projecten per maand
 ProjectNbTaskByMonth=Aantal gemaakte taken per maand
 ProjectOppAmountOfProjectsByMonth=Aantal leads per maand
 ProjectWeightedOppAmountOfProjectsByMonth=Gewogen aantal leads per maand
-ProjectOpenedProjectByOppStatus=Open project|lead by lead status
-ProjectsStatistics=Statistics on projects or leads
-TasksStatistics=Statistics on tasks of projects or leads
+ProjectOpenedProjectByOppStatus=Open project | geleid door lead-status
+ProjectsStatistics=Statistieken over projecten of leads
+TasksStatistics=Statistieken over taken van projecten of leads
 TaskAssignedToEnterTime=Taak toegewezen. Tijd invoeren voor deze taak moet mogelijk zijn.
 IdTaskTime=Id taak tijd
 YouCanCompleteRef=Als je de ref met een achtervoegsel wilt voltooien, wordt aanbevolen om een - -teken toe te voegen om het te scheiden, zodat de automatische nummering nog steeds correct werkt voor volgende projecten. Bijvoorbeeld %s-MYSUFFIX
diff --git a/htdocs/langs/nl_NL/propal.lang b/htdocs/langs/nl_NL/propal.lang
index c2efc292ccf..ed9e284c461 100644
--- a/htdocs/langs/nl_NL/propal.lang
+++ b/htdocs/langs/nl_NL/propal.lang
@@ -83,9 +83,9 @@ DefaultModelPropalClosed=Standaard sjabloon bij het sluiten van een zakelijk voo
 ProposalCustomerSignature=Schriftelijke aanvaarding , stempel , datum en handtekening
 ProposalsStatisticsSuppliers=Leveranciersoffertes statistieken 
 CaseFollowedBy=Geval gevolgd door
-SignedOnly=Signed only
-IdProposal=Proposal ID
-IdProduct=Product ID
-PrParentLine=Proposal Parent Line
-LineBuyPriceHT=Buy Price Amount net of tax for line
+SignedOnly=Alleen gesigneerd
+IdProposal=Offerte-ID
+IdProduct=Product-ID
+PrParentLine=Voorstel bovenliggende lijn
+LineBuyPriceHT=Koopprijs bedrag exclusief BTW voor regel
 
diff --git a/htdocs/langs/nl_NL/receiptprinter.lang b/htdocs/langs/nl_NL/receiptprinter.lang
index 0da7647a6c9..f0598541b6b 100644
--- a/htdocs/langs/nl_NL/receiptprinter.lang
+++ b/htdocs/langs/nl_NL/receiptprinter.lang
@@ -54,7 +54,7 @@ DOL_DOUBLE_WIDTH=Dubbele breedte
 DOL_DEFAULT_HEIGHT_WIDTH=Standaard hoogte en breedte
 DOL_UNDERLINE=Activeer onderstrepen
 DOL_UNDERLINE_DISABLED=Deactiveer onderstrepen
-DOL_BEEP=Beed geluid
+DOL_BEEP=Geluid
 DOL_PRINT_TEXT=Afdrukken tekst
 DateInvoiceWithTime=Factuur datum en tijd
 YearInvoice=Factuur jaar
@@ -77,6 +77,6 @@ DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Saldo klant account
 DOL_VALUE_MYSOC_NAME=Uw bedrijfsnaam
 VendorLastname=Achternaam leverancier
 VendorFirstname=Voornaam leverancier
-VendorEmail=Vendor email
+VendorEmail=E-mailadres van leverancier
 DOL_VALUE_CUSTOMER_POINTS=Klantpunten
 DOL_VALUE_OBJECT_POINTS=Objectpunten
diff --git a/htdocs/langs/nl_NL/recruitment.lang b/htdocs/langs/nl_NL/recruitment.lang
index dbf7e374eba..4ad441ecff0 100644
--- a/htdocs/langs/nl_NL/recruitment.lang
+++ b/htdocs/langs/nl_NL/recruitment.lang
@@ -29,8 +29,8 @@ RecruitmentSetup = Werving instellingen
 Settings = Instellingen
 RecruitmentSetupPage = Stel hier de hoofdopties voor de recruitment module in
 RecruitmentArea=Werving gebied
-PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
-EnablePublicRecruitmentPages=Enable public pages of open jobs
+PublicInterfaceRecruitmentDesc=Openbare pagina's met vacatures zijn openbare URL's om openstaande vacatures weer te geven en te beantwoorden. Er is een verschillende link voor elke openstaande vacature, te vinden op elk vacatureblad.
+EnablePublicRecruitmentPages=Schakel openbare pagina's van open vacatures in
 
 #
 # About page
@@ -47,29 +47,30 @@ ResponsibleOfRecruitement=Verantwoordelijk voor werving
 IfJobIsLocatedAtAPartner=Als baan zich op een partnerlocatie bevindt
 PositionToBeFilled=Functie
 PositionsToBeFilled=Vacature
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+ListOfPositionsToBeFilled=Lijst met vacatures
+NewPositionToBeFilled=Nieuwe vacatures
 
-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
+JobOfferToBeFilled=Functie die moet worden vervuld
+ThisIsInformationOnJobPosition=Informatie over de te vervullen vacature
+ContactForRecruitment=Contactpersoon voor werving
+EmailRecruiter=E-mail de recruiter
+ToUseAGenericEmail=Om een generiek e-mailadres te gebruiken. Indien niet gedefinieerd, wordt het e-mailadres van de rekruteringsverantwoordelijke gebruikt
+NewCandidature=Nieuwe applicatie
+ListOfCandidatures=Lijst met applicaties
+RequestedRemuneration=Gevraagde vergoeding
+ProposedRemuneration=Voorgestelde vergoeding
 ContractProposed=Contractvoorstel gedaan
 ContractSigned=Contract getekend
-ContractRefused=Contract refused
-RecruitmentCandidature=Application
+ContractRefused=Contract geweigerd
+RecruitmentCandidature=Toepassing
 JobPositions=Vacature
-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)
-ExtrafieldsCandidatures=Complementary attributes (job applications)
+RecruitmentCandidatures=Toepassingen
+InterviewToDo=Te maken interview
+AnswerCandidature=Toepassing antwoord
+YourCandidature=Jouw toepassing
+YourCandidatureAnswerMessage=Bedankt voor je aanmelding. <br> ...
+JobClosedTextCandidateFound=De vacature is gesloten. De functie is vervuld.
+JobClosedTextCanceled=De vacature is gesloten.
+ExtrafieldsJobPosition=Complementaire attributen (functieposities)
+ExtrafieldsCandidatures=Aanvullende attributen (sollicitaties)
+MakeOffer=Doe een aanbod
diff --git a/htdocs/langs/nl_NL/salaries.lang b/htdocs/langs/nl_NL/salaries.lang
index 7e29f0ff949..5f91fe4db8b 100644
--- a/htdocs/langs/nl_NL/salaries.lang
+++ b/htdocs/langs/nl_NL/salaries.lang
@@ -1,21 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Grootboekrekening voor medewerker derde partij
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=De specifieke account die op de gebruikerskaart is gedefinieerd, wordt alleen voor de boekhouding van subgrootboek gebruikt. Deze wordt gebruikt voor grootboek en als standaardwaarde voor subgrootboek-boekhouding als specifieke gebruikersaccount voor de account op gebruiker niet is gedefinieerd.
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=De boekhoudrekening die in het gebruikersbestand is gedefinieerd, wordt alleen gebruikt voor aanvullende boekhouding. Deze wordt gebruikt voor het grootboek en als standaardwaarde voor aanvullende boekhouding als de speciale rekening van de gebruiker niet is gedefinieerd.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Standaard grootboekrekening voor salaris betalingen
 Salary=Salaris
 Salaries=Salarissen
 NewSalaryPayment=Nieuwe salarisbetaling
 AddSalaryPayment=Salarisbetaling toevoegen
 SalaryPayment=Salarisbetaling
-SalariesPayments=Salarissen betalingen
+SalariesPayments=Salarisbetalingen
 ShowSalaryPayment=Toon salarisbetaling
 THM=Gemiddeld uurtarief
 TJM=Gemiddeld dagtarief
 CurrentSalary=Huidig salaris
-THMDescription=Deze waarde kan worden gebruikt om de kosten te berekenen van de tijd die wordt besteed aan een project dat door gebruikers is ingevoerd als het moduleproject wordt gebruikt
+THMDescription=Deze waarde kan worden gebruikt om de kosten te berekenen van de tijd die wordt besteed aan een project dat door gebruikers is ingevoerd als de module Project wordt gebruikt
 TJMDescription=Deze waarde is momenteel alleen ter informatie en wordt niet gebruikt voor enige berekening
-LastSalaries=Laatste %s salaris betalingen
+LastSalaries=Laatste %s salarisbetalingen
 AllSalaries=Alle salarisbetalingen
-SalariesStatistics=Salarisstatistieken
+SalariesStatistics=Salaris statistieken
 # Export
-SalariesAndPayments=Lonen en betalingen
+SalariesAndPayments=Salarissen en betalingen
diff --git a/htdocs/langs/nl_NL/sendings.lang b/htdocs/langs/nl_NL/sendings.lang
index 2c3d237a2db..b16b9726c7d 100644
--- a/htdocs/langs/nl_NL/sendings.lang
+++ b/htdocs/langs/nl_NL/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Andere verzendingen voor deze opdracht
 SendingsAndReceivingForSameOrder=Verzendingen en ontvangsten voor deze bestelling
 SendingsToValidate=Te valideren verzendingen
 StatusSendingCanceled=Geannuleerd
+StatusSendingCanceledShort=Geannuleerd
 StatusSendingDraft=Concept
 StatusSendingValidated=Gevalideerd (producten te verzenden of reeds verzonden)
 StatusSendingProcessed=Verwerkt
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=U moet eerst de bestelling valideren voordat u
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Completer leveringsbewijs documentmodel (logo, etc)
+DocumentModelStorm=Compleet documentmodel voor ontvangstbewijzen en compatibiliteit met extrafields (logo ...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER niet gedefinieerd
 SumOfProductVolumes=Som van alle productvolumes
 SumOfProductWeights=Som van product-gewichten
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index 1a21ab2c3b2..db940c6cf37 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Verwijder verzending
 Stock=Voorraad
 Stocks=Voorraden
 MissingStocks=Ontbrekende voorraad
-StockAtDate=Stocks at date
+StockAtDate=Voorraden op datum
 StockAtDateInPast=Datum uit het verleden
 StockAtDateInFuture=Toekomstige datum
 StocksByLotSerial=Voorraad volgorde op lot/serienummer
@@ -34,7 +34,7 @@ StockMovementForId=Verplaatsing ID %d
 ListMouvementStockProject=Lijst met voorraad verplaatsingen die aan het project zijn gekoppeld
 StocksArea=Magazijnen
 AllWarehouses=Alle magazijnen
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
+IncludeEmptyDesiredStock=Voeg ook een negatieve voorraad toe met een ongedefinieerde gewenste voorraad
 IncludeAlsoDraftOrders=Neem ook conceptorders op
 Location=Locatie
 LocationSummary=Korte naam locatie
@@ -62,11 +62,12 @@ EnhancedValueOfWarehouses=Voorraadwaardering
 UserWarehouseAutoCreate=Creëer automatisch een gebruikersmagazijn wanneer u een gebruiker aanmaakt
 AllowAddLimitStockByWarehouse=Beheer ook de waarde voor minimale en gewenste voorraad per paar (productmagazijn) naast de waarde voor minimale en gewenste voorraad per product
 RuleForWarehouse=Voorwaarden magazijnen
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Stel een magazijn in op Verkooporders
 UserDefaultWarehouse=Stel een magazijn in op gebruikers
 MainDefaultWarehouse=Standaardmagazijn
 MainDefaultWarehouseUser=Gebruik standaard magazijn voor elke gebruiker
-MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
+MainDefaultWarehouseUserDesc=Door deze optie te activeren, wordt tijdens het aanmaken van een product het magazijn dat aan het product is toegewezen op deze bepaald. Als er geen magazijn is gedefinieerd voor de gebruiker, wordt het standaardmagazijn gedefinieerd.
 IndependantSubProductStock=Product voorraad en subproduct voorraad zijn onafhankelijk
 QtyDispatched=Hoeveelheid verzonden
 QtyDispatchedShort=Aantal verzonden
@@ -95,16 +96,16 @@ RealStock=Werkelijke voorraad
 RealStockDesc=Fysieke/echte voorraad is de voorraad die momenteel in de magazijnen aanwezig is.
 RealStockWillAutomaticallyWhen=De werkelijke voorraad wordt aangepast volgens deze regel (zoals gedefinieerd in de module Voorraad):
 VirtualStock=Virtuele voorraad
-VirtualStockAtDate=Virtual stock at date
-VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+VirtualStockAtDate=Virtuele voorraad op datum
+VirtualStockAtDateDesc=Virtuele voorraad zodra alle lopende bestellingen die volgens de planning vóór de datum moeten worden gedaan, zijn voltooid
+VirtualStockDesc=Virtuele voorraad is de berekende voorraad die beschikbaar is zodra alle openstaande / lopende acties (die van invloed zijn op voorraden) zijn gesloten (inkooporders ontvangen, verkooporders verzonden, productieorders geproduceerd, enz.)
 IdWarehouse=Magazijn-ID
 DescWareHouse=Beschrijving magazijn
 LieuWareHouse=Localisatie magazijn
 WarehousesAndProducts=Magazijn en producten
 WarehousesAndProductsBatchDetail=Magazijnen en producten (met detail per lot/serieenummer)
 AverageUnitPricePMPShort=Waardering (PMP)
-AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
+AverageUnitPricePMPDesc=De input gemiddelde eenheidsprijs die we aan leveranciers moesten betalen om het product in onze voorraad te krijgen.
 SellPriceMin=Verkopen Prijs per Eenheid
 EstimatedStockValueSellShort=Verkoopwaarde
 EstimatedStockValueSell=Verkoopwaarde
@@ -122,9 +123,9 @@ DesiredStockDesc=Dit voorraadbedrag is de waarde die wordt gebruikt om de voorra
 StockToBuy=Te bestellen
 Replenishment=Bevoorrading
 ReplenishmentOrders=Bevoorradingsorder
-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=Afhankelijk van de opties voor het verhogen / verlagen van de voorraad, kunnen fysieke voorraad en virtuele voorraad (fysieke voorraad + openstaande bestellingen) verschillen
+UseRealStockByDefault=Gebruik echte voorraad in plaats van virtuele voorraad voor de aanvullingsfunctie
+ReplenishmentCalculation=Het te bestellen bedrag is (gewenste hoeveelheid - echte voorraad) in plaats van (gewenste hoeveelheid - virtuele voorraad)
 UseVirtualStock=Gebruik virtuele voorraad
 UsePhysicalStock=Gebruik fysieke voorraad
 CurentSelectionMode=Huidige selectiemodus
@@ -133,7 +134,7 @@ CurentlyUsingPhysicalStock=Fysieke voorraad
 RuleForStockReplenishment=Regels voor bevoorrading
 SelectProductWithNotNullQty=Selecteer ten minste één product met een aantal niet nul en een leverancier
 AlertOnly= Enkel waarschuwingen
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
+IncludeProductWithUndefinedAlerts = Neem ook een negatieve voorraad op voor producten waarvoor geen gewenste hoeveelheid is gedefinieerd, om deze op 0 te zetten
 WarehouseForStockDecrease=De voorraad van magazijn <b>%s</b> zal verminderd worden
 WarehouseForStockIncrease=De voorraad van magazijn <b>%s</b> zal verhoogd worden
 ForThisWarehouse=Voor dit magazijn
@@ -144,7 +145,7 @@ Replenishments=Bevoorradingen
 NbOfProductBeforePeriod=Aantal op voorraad van product %s voor de gekozen periode (<%s)
 NbOfProductAfterPeriod=Aantal op voorraad van product %s na de gekozen periode (<%s)
 MassMovement=Volledige verplaatsing
-SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Selecteer een bronmagazijn en een doelmagazijn, een product en een hoeveelheid en klik op "%s". Zodra dit is gedaan voor alle vereiste bewegingen, klikt u op "%s".
 RecordMovement=Vastleggen verplaatsing
 ReceivingForSameOrder=Ontvangsten voor deze bestelling
 StockMovementRecorded=Geregistreerde voorraadbewegingen
@@ -231,12 +232,13 @@ StockDecrease=Voorraad afnemen
 InventoryForASpecificWarehouse=Voorraad voor een specifiek magazijn
 InventoryForASpecificProduct=Voorraad voor een specifiek product
 StockIsRequiredToChooseWhichLotToUse=Voorraad is vereist om te kiezen welk lot te gebruiken
-ForceTo=Dwingen tot
+ForceTo=Toevoegen aan
 AlwaysShowFullArbo=Volledige boomstructuur van magazijn weergeven op pop-up van magazijnkoppelingen (Waarschuwing: dit kan de prestaties drastisch verminderen)
-StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+StockAtDatePastDesc=U kunt hier de echte voorraad op een bepaalde datum in het verleden bekijken
+StockAtDateFutureDesc=U kunt hier de virtuele voorraad op een bepaalde datum in de toekomst bekijken
 CurrentStock=Huidige voorraad
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Update by scaning
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|serial barcode)
+InventoryRealQtyHelp=Stel de waarde in op 0 om het aantal te resetten<br>Veld leeg laten of regel verwijderen om ongewijzigd te houden
+UpdateByScaning=Update door te scannen
+UpdateByScaningProductBarcode=Update door scan (product barcode)
+UpdateByScaningLot=Update door scan (partij/serie barcode)
+DisableStockChangeOfSubProduct=De-activeer tijdens deze bewerking de voorraad voor alle subproducten van deze kit.
diff --git a/htdocs/langs/nl_NL/suppliers.lang b/htdocs/langs/nl_NL/suppliers.lang
index bff19a2422c..dd087ffdb83 100644
--- a/htdocs/langs/nl_NL/suppliers.lang
+++ b/htdocs/langs/nl_NL/suppliers.lang
@@ -38,11 +38,11 @@ MenuOrdersSupplierToBill=Te factureren inkooporders
 NbDaysToDelivery=Levertijd (dagen)
 DescNbDaysToDelivery=De langste leveringstermijn van de producten van deze bestelling
 SupplierReputation=Reputatie van de leverancier
-ReferenceReputation=Reference reputation
+ReferenceReputation=Referentie reputatie
 DoNotOrderThisProductToThisSupplier=Niet bestellen
 NotTheGoodQualitySupplier=Lage kwaliteit
 ReputationForThisProduct=Reputatie
 BuyerName=Afnemer
 AllProductServicePrices=Prijzen alle producten/diensten
-AllProductReferencesOfSupplier=All references of vendor
+AllProductReferencesOfSupplier=Alle referenties van leverancier
 BuyingPriceNumShort=Prijzen van leveranciers
diff --git a/htdocs/langs/nl_NL/ticket.lang b/htdocs/langs/nl_NL/ticket.lang
index 9af5045058e..51f8fe3a18c 100644
--- a/htdocs/langs/nl_NL/ticket.lang
+++ b/htdocs/langs/nl_NL/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Types
 TicketDictCategory=Groepen
 TicketDictSeverity=Prioriteit
 TicketDictResolution=Ticket - resolutie
-TicketTypeShortBUGSOFT=Foutmelding
-TicketTypeShortBUGHARD=Storing hardware
-TicketTypeShortCOM=Commerciële vraag
 
+TicketTypeShortCOM=Commerciële vraag
 TicketTypeShortHELP=Verzoek om functionele hulp
 TicketTypeShortISSUE=Probleem of bug
 TicketTypeShortREQUEST=Verander-  of verbeteringsverzoek
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Overig
 TicketSeverityShortLOW=Laag
 TicketSeverityShortNORMAL=Normaal
 TicketSeverityShortHIGH=Hoog
-TicketSeverityShortBLOCKING=Kritiek/Bokkerend
+TicketSeverityShortBLOCKING=Kritiek, blokkerend
 
 ErrorBadEmailAddress=Veld '%s' foutief
 MenuTicketMyAssign=Mijn tickets
@@ -60,7 +58,6 @@ OriginEmail=E-mail bron
 Notify_TICKET_SENTBYMAIL=Verzend ticketbericht per e-mail
 
 # Status
-NotRead=Niet gelezen
 Read=Gelezen
 Assigned=Toegekend
 InProgress=Reeds bezig
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Met de openbare interface kunnen bezoekers ti
 TicketsAutoAssignTicket=Wijs automatisch de gebruiker toe die het ticket heeft aangemaakt
 TicketsAutoAssignTicketHelp=Bij het maken van een ticket kan de gebruiker automatisch aan het ticket worden toegewezen.
 TicketNumberingModules=Nummering module voor tickets
+TicketsModelModule=Documentsjablonen voor tickets
 TicketNotifyTiersAtCreation=Breng relatie op de hoogte bij het aanmaken
 TicketsDisableCustomerEmail=Schakel e-mails altijd uit wanneer een ticket wordt gemaakt vanuit de openbare interface
 TicketsPublicNotificationNewMessage=Stuur e-mail (s) wanneer een nieuw bericht is toegevoegd
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status gewijzigd: %s in %s
 TicketNotNotifyTiersAtCreate=Geen bedrijf melden bij aanmaken
 Unread=Niet gelezen
 TicketNotCreatedFromPublicInterface=Niet beschikbaar. Ticket is niet gemaakt vanuit de openbare interface.
-PublicInterfaceNotEnabled=Publieke interface was niet ingeschakeld
 ErrorTicketRefRequired=Naam van ticket is vereist
 
 #
diff --git a/htdocs/langs/nl_NL/trips.lang b/htdocs/langs/nl_NL/trips.lang
index 642842482c6..8d07d7709ad 100644
--- a/htdocs/langs/nl_NL/trips.lang
+++ b/htdocs/langs/nl_NL/trips.lang
@@ -110,7 +110,7 @@ ExpenseReportPayment=Onkostendeclaratie
 ExpenseReportsToApprove=Onkostendeclaraties te accorderen
 ExpenseReportsToPay=Declaraties te betalen
 ConfirmCloneExpenseReport=Weet u zeker dat u dit onkostenrapport wilt klonen?
-ExpenseReportsIk=Onkostendeclaratie kilometrage index
+ExpenseReportsIk=Configuratie van kilometervergoedingen
 ExpenseReportsRules=Regels voor onkostendeclaraties
 ExpenseReportIkDesc=U kunt de berekening van de kilometerkosten wijzigen per categorie en bereik die eerder zijn gedefinieerd. <b>d</b> is de afstand in kilometers
 ExpenseReportRulesDesc=U kunt berekeningsregels maken of bijwerken. Dit onderdeel wordt gebruikt wanneer de gebruiker een nieuw onkostenrapport maakt
@@ -145,7 +145,7 @@ nolimitbyEX_DAY=per dag (geen beperking)
 nolimitbyEX_MON=per maand (geen beperking)
 nolimitbyEX_YEA=per jaar (geen beperking)
 nolimitbyEX_EXP=per regel (geen beperking)
-CarCategory=Auto categorie
+CarCategory=Voertuig categorie
 ExpenseRangeOffset=Offset-bedrag: %s
 RangeIk=Afstand in km.
 AttachTheNewLineToTheDocument=Koppel de regel aan een geüpload document
diff --git a/htdocs/langs/nl_NL/users.lang b/htdocs/langs/nl_NL/users.lang
index 20ea6e8fba2..d22bd138009 100644
--- a/htdocs/langs/nl_NL/users.lang
+++ b/htdocs/langs/nl_NL/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Verwijderen uit groep
 PasswordChangedAndSentTo=Wachtwoord veranderd en verstuurd naar <b>%s</b>.
 PasswordChangeRequest=Wachtwoord aanpassing verzoek voor <b>%s</b>
 PasswordChangeRequestSent=Verzoek om wachtwoord te wijzigen van <b>%s</b> verstuurt naar <b>%s</b>.
+IfLoginExistPasswordRequestSent=Bij een geldig account is er een e-mail gestuurd om het wachtwoord opnieuw in te stellen.
+IfEmailExistPasswordRequestSent=Bij een geldig account is er een e-mail verzonden om het wachtwoord opnieuw in te stellen.
 ConfirmPasswordReset=Bevestig wachtwoord reset
 MenuUsersAndGroups=Gebruikers & groepen
 LastGroupsCreated=Laatste %s groepen aangemaakt
@@ -73,6 +75,7 @@ CreateInternalUserDesc=Met dit formulier kunt u een interne gebruiker in uw bedr
 InternalExternalDesc=Een <b> interne </b>-gebruiker is een gebruiker die deel uitmaakt van uw bedrijf / organisatie. <br> Een externe <b> externe </b>-gebruiker is een klant, leverancier of andere (het aanmaken van een externe gebruiker voor een derde partij kan worden gedaan vanuit het contactrecord van de derde partij). <br> <br> In beide gevallen definieert de machtiging rechten op Dolibarr, ook kan de externe gebruiker een andere menumanager hebben dan de interne gebruiker (zie Home - Setup - Display)
 PermissionInheritedFromAGroup=Toestemming verleend, omdat geërfd van een bepaalde gebruikersgroep.
 Inherited=Overgeërfd
+UserWillBe=De aangemaakte gebruiker zal zijn
 UserWillBeInternalUser=Gemaakt gebruiker een interne gebruiker te zijn (want niet gekoppeld aan een bepaalde derde partij)
 UserWillBeExternalUser=Gemaakt gebruiker zal een externe gebruiker (omdat gekoppeld aan een bepaalde derde partij)
 IdPhoneCaller=Beller ID (telefoon)
@@ -108,13 +111,15 @@ DisabledInMonoUserMode=Uitgeschakeld in onderhoudsmodus
 UserAccountancyCode=Gebruiker accounting code
 UserLogoff=Gebruiker uitgelogd
 UserLogged=Gebruiker gelogd
-DateOfEmployment=Employment date
-DateEmployment=Startdatum dienstverband
+DateOfEmployment=Datum indiensttreding
+DateEmployment=Werkgelegenheid
+DateEmploymentstart=Startdatum dienstverband
 DateEmploymentEnd=Einddatum dienstverband
+RangeOfLoginValidity=Datumbereik van inloggeldigheid
 CantDisableYourself=U kunt uw eigen gebruikersrecord niet uitschakelen
 ForceUserExpenseValidator=Validatierapport valideren
 ForceUserHolidayValidator=Forceer verlofaanvraag validator
 ValidatorIsSupervisorByDefault=Standaard is de validator de supervisor van de gebruiker. Blijf leeg om dit gedrag te behouden.
 UserPersonalEmail=Persoonlijke e-mail
 UserPersonalMobile=Persoonlijke mobiele telefoon
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+WarningNotLangOfInterface=Pas op, dit is de hoofdtaal die de gebruiker spreekt, niet de taal van de interface die hij wil zien. Ga naar het tabblad %s om de de taal van de interface, die voor deze gebruiker zichtbaar is, te wijzigen
diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
index 855e09828b2..a2424762f54 100644
--- a/htdocs/langs/nl_NL/website.lang
+++ b/htdocs/langs/nl_NL/website.lang
@@ -30,7 +30,6 @@ EditInLine=Inline bewerken
 AddWebsite=Website toevoegen
 Webpage=Webpagina/container
 AddPage=Voeg pagina/container toe
-HomePage=Startpagina
 PageContainer=Pagina
 PreviewOfSiteNotYetAvailable=Voorbeeld van uw website <strong>%s</strong> is nog niet beschikbaar. U moet eerst '<strong>Een volledige websitesjabloon importeren</strong>' of alleen '<strong>Een pagina / container toevoegen</strong>'.
 RequestedPageHasNoContentYet=Gevraagde pagina met id %s heeft nog geen inhoud of cachebestand .tpl.php is verwijderd. Bewerk de inhoud van de pagina om dit op te lossen.
@@ -101,7 +100,7 @@ EmptyPage=Lege pagina
 ExternalURLMustStartWithHttp=Externe URL moet beginnen met http: // of https: //
 ZipOfWebsitePackageToImport=Upload het zipbestand van het website-sjabloonpakket
 ZipOfWebsitePackageToLoad=of Kies een beschikbaar ingesloten websitesjabloonpakket
-ShowSubcontainers=Neem dynamische inhoud op
+ShowSubcontainers=Toon dynamische inhoud
 InternalURLOfPage=Interne URL van pagina
 ThisPageIsTranslationOf=Deze pagina / container is een vertaling van
 ThisPageHasTranslationPages=Deze pagina / container heeft vertaling
@@ -135,5 +134,6 @@ ReplacementDoneInXPages=Vervanging gedaan in %s pagina's of containers
 RSSFeed=RSS-feeds
 RSSFeedDesc=U kunt via deze URL een RSS-feed krijgen van de nieuwste artikelen met het type 'blogpost'
 PagesRegenerated=%s pagina ('s) / container (s) her-aangemaakt
-RegenerateWebsiteContent=Regenerate web site cache files
-AllowedInFrames=Allowed in Frames
+RegenerateWebsiteContent=Genereer cachebestanden van websites opnieuw
+AllowedInFrames=Toegestaan in frames
+DefineListOfAltLanguagesInWebsiteProperties=Definieer een lijst van alle beschikbare talen in website-eigenschappen.
diff --git a/htdocs/langs/nl_NL/withdrawals.lang b/htdocs/langs/nl_NL/withdrawals.lang
index fe5dc16fe25..d2aabfb1334 100644
--- a/htdocs/langs/nl_NL/withdrawals.lang
+++ b/htdocs/langs/nl_NL/withdrawals.lang
@@ -11,7 +11,7 @@ PaymentByBankTransferLines=Overschrijvingsorderregels
 WithdrawalsReceipts=Incasso-opdrachten
 WithdrawalReceipt=Incasso-opdracht
 BankTransferReceipts=Overboekingsopdrachten
-BankTransferReceipt=Credit transfer order
+BankTransferReceipt=Betalingsopdracht
 LatestBankTransferReceipts=Laatste %s overboekingsopdrachten
 LastWithdrawalReceipts=Laatste %s incassobestanden
 WithdrawalsLine=Incasso-orderregel
@@ -40,8 +40,9 @@ CreditTransferStatistics=Overboeking statistieken
 Rejects=Verworpen
 LastWithdrawalReceipt=Laatste %s ontvangen incasso's
 MakeWithdrawRequest=Automatische incasso aanmaken
-MakeBankTransferOrder=Make a credit transfer request
+MakeBankTransferOrder=Maak een verzoek tot overboeking
 WithdrawRequestsDone=%s Betalingsverzoeken voor automatische incasso geregistreerd
+BankTransferRequestsDone=%s overboekingsverzoeken geregistreerd
 ThirdPartyBankCode=Bankcode van derden
 NoInvoiceCouldBeWithdrawed=Geen factuur afgeschreven. Controleer of de facturen betrekking hebben op bedrijven met een geldige IBAN en dat IBAN een UMR (Unique Mandate Reference) met modus <strong>%s heeft</strong> .
 ClassCredited=Classificeer creditering
@@ -63,7 +64,7 @@ InvoiceRefused=Factuur geweigerd (de afwijzing door belasten aan de klant)
 StatusDebitCredit=Status debet / credit
 StatusWaiting=Wachtend
 StatusTrans=Verzonden
-StatusDebited=Debited
+StatusDebited=Afgeschreven
 StatusCredited=Gecrediteerd
 StatusPaid=Betaald
 StatusRefused=Geweigerd
@@ -79,13 +80,13 @@ StatusMotif8=Andere reden
 CreateForSepaFRST=Maak een domiciliëringsbestand (SEPA FRST)
 CreateForSepaRCUR=Maak een domiciliëringsbestand (SEPA RCUR)
 CreateAll=Maak een domiciliëringsbestand (alles)
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
+CreateFileForPaymentByBankTransfer=Maak bestand aan met overboekingen
 CreateSepaFileForPaymentByBankTransfer=Maak een overboekingsbestand (SEPA) aan
 CreateGuichet=Alleen kantoor
 CreateBanque=Alleen de bank
 OrderWaiting=Wachtend op behandeling
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
+NotifyTransmision=Registreer bestandsoverdracht van bestelling
+NotifyCredit=Vastleggen credit order
 NumeroNationalEmetter=Nationale zender nummer
 WithBankUsingRIB=Voor bankrekeningen die gebruik maken van RIB
 WithBankUsingBANBIC=Voor bankrekeningen die gebruik maken van IBAN / BIC / SWIFT
@@ -95,10 +96,10 @@ CreditDate=Crediteer op
 WithdrawalFileNotCapable=Kan geen ontvangstbewijsbestand voor uw land genereren %s (uw land wordt niet ondersteund)
 ShowWithdraw=Incasso-opdracht weergeven
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Als de factuur echter ten minste één betalingsopdracht voor automatische incasso bevat die nog niet is verwerkt, wordt deze niet ingesteld als betaald om voorafgaand opnamebeheer mogelijk te maken.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->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
+DoStandingOrdersBeforePayments=Op dit tabblad kunt u een betalingsopdracht voor automatische incasso aanvragen. Als u klaar bent, gaat u naar het menu Bank-> Betaling via automatische incasso om de incasso-opdracht te genereren en te beheren. Wanneer de automatische incasso-opdracht wordt afgesloten, wordt de betaling op facturen automatisch geregistreerd en worden de facturen gesloten als het te betalen restant nul is.
+DoCreditTransferBeforePayments=Op dit tabblad kunt u een overboekingsopdracht aanvragen. Als u klaar bent, gaat u naar het menu Bank-> Betaling via overschrijving om de overschrijvingsopdracht te genereren en te beheren. Wanneer de overboekingsopdracht is gesloten, wordt de betaling op facturen automatisch geregistreerd en worden de facturen gesloten als het te betalen restant nul is.
+WithdrawalFile=Debet orderbestand
+CreditTransferFile=Credit overdrachtbestand
 SetToStatusSent=Stel de status in &quot;Bestand verzonden&quot;
 ThisWillAlsoAddPaymentOnInvoice=Dit registreert ook betalingen op facturen en classificeert ze als "Betaald" als het resterende bedrag niet is betaald
 StatisticsByLineStatus=Statistieken per status van lijnen
@@ -124,14 +125,15 @@ SEPAFrstOrRecur=Soort betaling
 ModeRECUR=Terugkomende betaling
 ModeFRST=Eenmalige incasso
 PleaseCheckOne=Alleen één controleren
-CreditTransferOrderCreated=Credit transfer order %s created
+CreditTransferOrderCreated=Overboekingsopdracht %s gemaakt
 DirectDebitOrderCreated=Incasso-opdracht %s gemaakt
 AmountRequested=Aangevraagde hoeveelheid
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Uitvoeringsdatum
 CreateForSepa=Aanmaken incassobestand
-ICS=Creditor Identifier CI
+ICS=Crediteur Identifier CI voor automatische incasso
+ICSTransfer=Crediteur Identifier CI voor bankoverschrijving
 END_TO_END=&quot;EndToEndId&quot; SEPA XML-tag - Uniek ID toegewezen per transactie
 USTRD=&quot;Ongestructureerde&quot; SEPA XML-tag
 ADDDAYS=Dagen toevoegen aan uitvoeringsdatum
@@ -145,4 +147,6 @@ InfoTransData=Bedrag: %s<br>Wijze: %s<br>Datum: %s
 InfoRejectSubject=Betalingsopdracht voor automatische incasso geweigerd
 InfoRejectMessage=M,<br><br>de incasso van factuur %s voor bedrijf %s, met een bedrag van %s is geweigerd door de bank.<br><br>--<br>%s
 ModeWarning=Optie voor echte modus was niet ingesteld, we stoppen na deze simulatie
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+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=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/nl_NL/workflow.lang b/htdocs/langs/nl_NL/workflow.lang
index 9d4ed65e55b..5aaea7ee12d 100644
--- a/htdocs/langs/nl_NL/workflow.lang
+++ b/htdocs/langs/nl_NL/workflow.lang
@@ -1,23 +1,25 @@
 # Dolibarr language file - Source file is en_US - workflow
-WorkflowSetup=Workflow module setup
+WorkflowSetup=Workflow module set-up
 WorkflowDesc=Deze module biedt enkele automatische acties. Standaard is de workflow open (u kunt dingen doen in de gewenste volgorde), maar hier kunt u enkele automatische acties activeren.
 ThereIsNoWorkflowToModify=Er zijn geen wijzigingen in de workflow beschikbaar met de geactiveerde modules.
 # Autocreate
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatisch een verkooporder maken nadat een offerte is ondertekend (de nieuwe bestelling heeft hetzelfde bedrag als offerte)
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Creëer automatisch een klantfactuur nadat een offerte is ondertekend (de nieuwe factuur heeft hetzelfde bedrag als de offerte)
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Maak automatisch een klant factuur aan nadat contract is gevalideerd.
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Maak automatisch een klant factuur aan nadat een contract is gevalideerd.
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Creëer automatisch een klantfactuur nadat een verkooporder is gesloten (de nieuwe factuur heeft hetzelfde bedrag als de bestelling)
 # Autoclassify customer proposal or order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classificeer gekoppeld bronvoorstel als gefactureerd wanneer verkooporder is ingesteld op gefactureerd (en als het bedrag van de bestelling gelijk is aan het totale bedrag van het ondertekende gekoppelde voorstel)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classificeer het gekoppelde bronvoorstel als gefactureerd wanneer de klantfactuur is gevalideerd (en als het factuurbedrag gelijk is aan het totale bedrag van het ondertekende gekoppelde voorstel)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classificeer gekoppelde bronverkooporder als gefactureerd wanneer klantfactuur is gevalideerd (en als het factuurbedrag gelijk is aan het totale bedrag van de gekoppelde bestelling)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classificeer gekoppelde bronverkooporder als gefactureerd wanneer klantfactuur is ingesteld op betaald (en als het factuurbedrag gelijk is aan het totale bedrag van de gekoppelde bestelling)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classificeer gekoppelde bronverkooporder zoals 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=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)
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classificeer het gekoppelde bronvoorstel als gefactureerd wanneer de leveranciersfactuur is gevalideerd (en als het factuurbedrag gelijk is aan het totale bedrag van het gekoppelde voorstel)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classificeer gekoppelde inkooporder als gefactureerd wanneer leveranciersfactuur is gevalideerd (en als het factuurbedrag gelijk is aan het totale bedrag van de gekoppelde order)
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+descWORKFLOW_BILL_ON_RECEPTION=Classificeer ontvangsten als "gefactureerd" wanneer een gekoppelde leveranciersorder wordt gevalideerd
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Sluit alle interventies die aan het ticket zijn gekoppeld wanneer een ticket is gesloten
 AutomaticCreation=Automatisch aanmaken
 AutomaticClassification=Automatisch classificeren
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/nl_NL/zapier.lang b/htdocs/langs/nl_NL/zapier.lang
index 770a821038b..f9f576f9fbe 100644
--- a/htdocs/langs/nl_NL/zapier.lang
+++ b/htdocs/langs/nl_NL/zapier.lang
@@ -26,4 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier voor Dolibarr-module
 # Admin page
 #
 ZapierForDolibarrSetup = Installatie van Zapier voor Dolibarr
-ZapierDescription=Interface with Zapier
+ZapierDescription=Interface met Zapier
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index f7abea4f251..f7345886c7e 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=Ta usługa
 ThisProduct=Ten produkt
 DefaultForService=Domyślny dla usługi
 DefaultForProduct=Domyślny dla produktu
+ProductForThisThirdparty=Product for this thirdparty
+ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Nie mogę zasugerować
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -48,6 +50,7 @@ CountriesExceptMe=Wszystkie kraje oprócz %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Główne konto księgowe dla klientów nie zdefiniowane w ustawieniach
 MainAccountForSuppliersNotDefined=Główne konto rozliczeniowe dla dostawców niezdefiniowane w konfiguracji
@@ -144,7 +147,7 @@ NotVentilatedinAccount=Nie dowiązane do konta księgowego
 XLineSuccessfullyBinded=%sprodukty/usługi z powodzeniem dowiązane do konta księgowego
 XLineFailedToBeBinded=%s produkty/usługi nie dowiązane do żadnego konta księgowego
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Rozpocznij sortowanie strony "Dowiązania do zrobienia" po najnowszych elementach
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Rozpocznij sortowanie strony "Dowiązania ukończone" po najnowszych elementach
 
@@ -198,7 +201,8 @@ Docdate=Data
 Docref=Odniesienie
 LabelAccount=Etykieta konta
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Dziennik
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=ilość sztuk
 TransactionNumShort=Numer transakcji
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Grupuj według konta księgowego
+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=Według kont
 ByPredefinedAccountGroups=By predefined groups
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Grupa konta
 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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Dowiąż automatycznie
 AutomaticBindingDone=Automatyczne dowiązanie ukończone
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index cfd5007cf51..68fdfa7587f 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Wyświetlanie
 SetupArea=Konfiguracja
 UploadNewTemplate=Załaduj nowy szablon(y)
 FormToTestFileUploadForm=Formularz do wysyłania pliku testowego (według konfiguracji)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Uwaga: tak jest skuteczne tylko wtedy, gdy <b>moduł %s</b> jest aktywny
 RemoveLock=Usuń/zmień nazwę pliku <b>%s</b> o ile istnieje, aby umożliwić korzystanie z narzędzia Aktualizuj/Instaluj.
 RestoreLock=Przywróć plik <b>%s</b> o uprawnieniach tylko do odczytu, aby wyłączyć dalsze korzystanie z narzędzia Aktualizuj/Instaluj.
@@ -85,7 +87,6 @@ ShowPreview=Pokaż podgląd
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Podgląd niedostępny
 ThemeCurrentlyActive=Temat obecnie aktywny
-CurrentTimeZone=Strefa czasowa PHP (server)
 MySQLTimeZone=Strefa czasowa MySQL (baza danych)
 TZHasNoEffect=Daty są przechowywane i zwracane przez serwer bazy danych tak, jakby były przechowywane jako przesłany ciąg. Strefa czasowa działa tylko przy użyciu funkcji UNIX_TIMESTAMP (która nie powinna być używana przez Dolibarr, więc baza danych TZ nie powinna mieć żadnego efektu, nawet jeśli zostanie zmieniona po wprowadzeniu danych).
 Space=Przestrzeń
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Ten Obszar zapewnia funkcje administracyjne. Użyj menu, aby
 Purge=Czyszczenie
 PurgeAreaDesc=Ta strona pozwala usunąć wszystkie pliki wygenerowane lub przechowywane przez Dolibarr (pliki tymczasowe lub wszystkie pliki w katalogu <b>%s</b>). Korzystanie z tej funkcji zwykle nie jest konieczne. Jest to obejście dla użytkowników, których Dolibarr jest hostowany przez dostawcę, który nie oferuje uprawnień do usuwania plików wygenerowanych przez serwer WWW.
 PurgeDeleteLogFile=Usuń pliki logu, wliczając <b>%s</b> zdefiniowany dla modułu Syslog (brak ryzyka utraty danych)
-PurgeDeleteTemporaryFiles=Usuń wszystkie pliki tymczasowe (bez ryzyka utraty danych). Uwaga: Usuwanie odbywa się tylko wtedy, gdy katalog tymczasowy został utworzony 24 godziny temu.
-PurgeDeleteTemporaryFilesShort=Usuń pliki tymczasowe
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 PurgeDeleteAllFilesInDocumentsDir=Usuń wszystkie pliki z katalogu: <b>%s</b>.<br>Spowoduje to usunięcie wszystkich wygenerowanych dokumentów związanych z elementami (strony trzecie, faktury itp.), plików przesłanych do modułu ECM, zrzutów kopii zapasowej bazy danych i plików tymczasowych.
 PurgeRunNow=Czyść teraz
 PurgeNothingToDelete=Brak katalogu lub plików do usunięcia.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferowani Partnerzy
 OtherResources=Inne zasoby
 ExternalResources=Zasoby zewnętrzne
 SocialNetworks=Sieci społecznościowe
+SocialNetworkId=Social Network ID
 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>
 HelpCenterDesc1=Oto niektóre zasoby pozwalające uzyskać pomoc i wsparcie z Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=Lista katalogów szablonów OpenDocument
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Przykłady składni: <br> c: \\ mydir <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Aby dowiedzieć się jak stworzyć szablony dokumentów odt, przed zapisaniem ich w katalogach, zapoznaj się z dokumentacją wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Pozycja Imienia / Nazwiska
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametry do zabezpiecznie adresu URL
 SecurityTokenIsUnique=Użyj unikalnego klucza zabezpieczeń dla każdego adresu
 EnterRefToBuildUrl=Wprowadź odwołanie do obiektu %s
 GetSecuredUrl=Pobierz obliczony adres URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Poprzednia stawka VAT
 NewVATRates=Nowa stawka VAT
 PriceBaseTypeToChange=Zmiana dla cen opartych na wartości referencyjnej ustalonej na
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Marże
-Module59000Desc=Moduł do zarządzania marżami
+Module59000Desc=Module to follow margins
 Module60000Name=Prowizje
 Module60000Desc=Moduł do zarządzania prowizjami
 Module62000Name=Formuły handlowe
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Pozycjonowanie
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ ServiceSetup=Konfiguracja modułu Usługi
 ProductServiceSetup=Produkty i usługi moduły konfiguracyjne
 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
+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 the language of the third party
+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=Domyślny kod kreskowy typu użyć do produktów
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Nowe menu
 MenuHandler=Menu obsługi
 MenuModule=Źródło modułu
-HideUnauthorizedMenu= Ukryj nieautoryzowane menu (wyszarz)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu obsługi gdzie pokazać nowe menu
 DetailMenuModule=Moduł nazwę w menu, jeśli pochodzą z modułem
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Kod pocztowy
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
index 58fe92e5f58..31fa178b5f7 100644
--- a/htdocs/langs/pl_PL/banks.lang
+++ b/htdocs/langs/pl_PL/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/pl_PL/blockedlog.lang b/htdocs/langs/pl_PL/blockedlog.lang
index 8ca78fd8046..dae949d1149 100644
--- a/htdocs/langs/pl_PL/blockedlog.lang
+++ b/htdocs/langs/pl_PL/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/pl_PL/boxes.lang b/htdocs/langs/pl_PL/boxes.lang
index 3c3730b9e9c..7dd168a0e77 100644
--- a/htdocs/langs/pl_PL/boxes.lang
+++ b/htdocs/langs/pl_PL/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Ostatnich %s zmodyfikowanych dotacji
 BoxTitleLastModifiedExpenses=Ostatnich %s zmodyfikowanych raportów kosztów
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Globalna aktywność (faktury, wnioski, zamówienia)
 BoxGoodCustomers=Dobrzy klienci
 BoxTitleGoodCustomers=%s dobrych klientów
+BoxScheduledJobs=Zaplanowane zadania
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Data ostatniego odświeżenia
 NoRecordedBookmarks=Brak zdefiniowanych zakładek
@@ -92,8 +95,8 @@ LastXMonthRolling=Ostatni %s miesiąc
 ChooseBoxToAdd=Dodaj widget do swojej tablicy...
 BoxAdded=Widget został dodany do twojej tablicy
 BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Księgowość
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/pl_PL/cashdesk.lang b/htdocs/langs/pl_PL/cashdesk.lang
index 337d7d5708e..f420c946b3c 100644
--- a/htdocs/langs/pl_PL/cashdesk.lang
+++ b/htdocs/langs/pl_PL/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Ilość faktur
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/pl_PL/categories.lang b/htdocs/langs/pl_PL/categories.lang
index a6dfccaf849..b0372678bc6 100644
--- a/htdocs/langs/pl_PL/categories.lang
+++ b/htdocs/langs/pl_PL/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Obszar tagów / kategorii projektów
 UsersCategoriesArea=Obszar znaczników/kategorii użytkowników
 SubCats=Podkategorie
 CatList=Lista tagów / kategorii
+CatListAll=List of tags/categories (all types)
 NewCategory=Nowy tag / kategoria
 ModifCat=Modyfikuj tag/kategorię
 CatCreated=Tag / kategoria stworzona
@@ -65,16 +66,22 @@ UsersCategoriesShort=Znaczniki/kategorie użytkowników
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag / ID kategorii
-CatSupList=List of vendor tags/categories
-CatCusList=Lista klientów / perspektywa tagów / kategorii
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Lista tagów/kategorii produktów
 CatMemberList=Lista tagów/kategorii członków
-CatContactList=Lista tagów/kategorii kontaktu
-CatSupLinks=Powiązania między dostawcami i tagami/kategoriami
+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=Powiązania między klientami / perspektyw i tagów / kategorii
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Powiązania między produktami/usługami i tagami/kategoriami
-CatProJectLinks=Połączenia pomiędzy projektami a tagami / kategoriami
+CatMembersLinks=Związki między członkami i tagów / kategorii
+CatProjectsLinks=Połączenia pomiędzy projektami a tagami / kategoriami
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Usuń z tagów/kategorii
 ExtraFieldsCategories=Atrybuty uzupełniające
 CategoriesSetup=Tagi / kategorie Konfiguracja
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index 0c7c3c2eb09..c5d2714854e 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Brak możliwości sprawdzenia. Usługa nie jest dostarczana dla wybranego regionu (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Pracownicy
 ProspectLevelShort=Potencjał
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index 1596c31aaa7..cb71232d049 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -111,7 +111,7 @@ Refund=Zwrot
 SocialContributionsPayments=Płatności za ZUS/podatki
 ShowVatPayment=Pokaż płatności za podatek VAT
 TotalToPay=Razem do zapłaty
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+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=Kod księg. klienta
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Jesteś pewien/a, że chcesz oznaczyć tą opła
 ExportDataset_tax_1=Składki ZUS, podatki i płatności
 CalcModeVATDebt=<b>Tryb% Svat na rachunkowości zaangażowanie% s.</b>
 CalcModeVATEngagement=<b>Tryb% Svat na dochody-wydatki% s.</b>
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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= <b>Tryb% SRE faktur klienta - dostawcy wystawia faktury% s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Saldo przychodów i kosztów, roczne podsumowanie
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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=- Kwoty podane są łącznie z podatkami
 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=- 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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Sprawozdanie trzecim RE partii
 LT2ReportByCustomersES=Raport osób trzecich IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/pl_PL/cron.lang b/htdocs/langs/pl_PL/cron.lang
index 745767075eb..68a5f84d9e3 100644
--- a/htdocs/langs/pl_PL/cron.lang
+++ b/htdocs/langs/pl_PL/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Stwórz/zaktualizuj zaplanowane zadanie
 Permission23103 = Usuń zaplanowane zadanie
 Permission23104 = Wykonaj zaplanowane zadanie
 # Admin
-CronSetup= Konfiguracja zarządzania zaplanowanymi zadaniami
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Albo sprawdzić i uruchomić określonej pracy
+CronSetup=Konfiguracja zarządzania zaplanowanymi zadaniami
+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=Klucz zabezpieczeń dla URL, aby uruchomić cron
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=W środowisku Unix należy użyć następującego wpisu crontab, aby uruchomić wiersz poleceń co 5 minut
-CronExplainHowToRunWin=W środowisku Microsoft Windows(tm) można użyć narzędzia  Zaplanowane zadania, aby uruchomić linię poleceń co 5 minut
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Klasa %s nie zawiera żadnej metody %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
@@ -42,10 +43,11 @@ CronModule=Moduł
 CronNoJobs=Brak zarejestrowanych zadań
 CronPriority=Priorytet
 CronLabel=Etykieta
-CronNbRun=Ilość uruchomień
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Każdy
 JobFinished=Zadania uruchomione i zakończone
+Scheduled=Scheduled
 #Page card
 CronAdd= Dodaj zadanie
 CronEvery=Wykonaj każde zadanie
@@ -56,16 +58,16 @@ CronNote=Komentarz
 CronFieldMandatory=Pole %s jest obowiązkowe
 CronErrEndDateStartDt=Data zakończenia nie może być wcześniejsza niż data rozpoczęcia
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Włączone
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Wyłączone
 CronTaskInactive=To zadanie jest wyłączone
 CronId=ID
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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=System linii poleceń do wykonania.
 CronCreateJob=Utwórz nowe zaplanowane zadanie
 CronFrom=Z
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Polecenie powłoki
 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=Idź do "Strona główna - Narzędzia administracyjne - Zaplanowane zadania" aby zobaczyć i zmieniać zaplanowane zadania
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Zadanie wyłączone
 MakeLocalDatabaseDumpShort=Backup lokalnej bazy danych
-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
+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/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 13d89600986..bd9179e37d9 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Nie ma błędu, zobowiązujemy
 # Errors
 ErrorButCommitIsDone=Znalezione błędy, ale mimo to możemy potwierdzić
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s jest błędny
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Zaloguj %s już istnieje.
 ErrorGroupAlreadyExists=Grupa %s już istnieje.
 ErrorRecordNotFound=Rekord nie został znaleziony.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Niektóre pola wymagane nie były uzupełnione.
 ErrorSubjectIsRequired=Temat wiadomości jest wymagany
 ErrorFailedToCreateDir=Nie można utworzyć katalogu. Sprawdź, czy serwer WWW użytkownik ma uprawnienia do zapisu do katalogu dokumentów Dolibarr. Jeśli parametr <b>safe_mode</b> jest włączona w tym PHP, czy posiada Dolibarr php pliki do serwera internetowego użytkownika (lub grupy).
 ErrorNoMailDefinedForThisUser=Nie określono adresu email dla tego użytkownika
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Ta funkcja wymaga do pracy aktywowanego JavaScript. Zmień to w konfiguracji - wyświetlanie.
 ErrorTopMenuMustHaveAParentWithId0=Menu typu "góry" nie może mieć dominującej menu. Umieść 0 dominującej w menu lub wybrać z menu typu "Lewy".
 ErrorLeftMenuMustHaveAParentId=Menu typu "Lewy" musi mieć identyfikator rodzica.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Ta nazwa profil już istnieje dla tego zestawu ekspor
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP dopasowywania nie jest kompletna.
 ErrorLDAPMakeManualTest=A. LDIF plik został wygenerowany w katalogu %s. Spróbuj załadować go ręcznie z wiersza polecenia, aby mieć więcej informacji na temat błędów.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Numer identyfikacyjny używany do tworzenia już istnieje.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Hasło zostało ustawione dla tego użytkownika. Jednakże nie Konto użytkownika zostało utworzone. Więc to hasło jest przechowywane, ale nie mogą być używane do logowania do Dolibarr. Może być stosowany przez zewnętrzny moduł / interfejsu, ale jeśli nie trzeba definiować dowolną logowania ani hasła do członka, można wyłączyć opcję "Zarządzaj login dla każdego członka" od konfiguracji modułu użytkownika. Jeśli potrzebujesz zarządzać logowanie, ale nie wymagają hasła, możesz zachować to pole puste, aby uniknąć tego ostrzeżenia. Uwaga: E może być również stosowany jako login, jeśli element jest połączony do użytkownika.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Twój login został zmodyfikowany. Z powo
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/pl_PL/exports.lang b/htdocs/langs/pl_PL/exports.lang
index dd5e8ee3731..4a291b908d4 100644
--- a/htdocs/langs/pl_PL/exports.lang
+++ b/htdocs/langs/pl_PL/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=pole tytuł
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Biblioteka
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Krok
 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.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=ilość wprowadzonych linii: %s
 NbUpdate=Ilość zaktualizowanych linii: %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/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
index 10ef6063468..54209fa28ee 100644
--- a/htdocs/langs/pl_PL/mails.lang
+++ b/htdocs/langs/pl_PL/mails.lang
@@ -92,6 +92,7 @@ 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=Linia w pliku %s
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=Nie wysłano wiadomości email. Zły email nadawcy lub odbiorcy. Sprawdź profil użytkownika.
 # Module Notifications
 Notifications=Powiadomienia
-NoNotificationsWillBeSent=Brak planowanych powiadomień mailowych dla tego wydarzenia i firmy
-ANotificationsWillBeSent=1 zgłoszenie zostanie wysłane pocztą elektroniczną
-SomeNotificationsWillBeSent=%s powiadomienia będą wysyłane przez e-mail
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=Lista wszystkich powiadomień wysłanych maili
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Konfiguracja poczty e-mail wysyłającego musi być połączone z '% s'. Tryb ten może być wykorzystywany do wysyłania masowego wysyłania.
 MailSendSetupIs2=Najpierw trzeba przejść, z konta administratora, w menu% sHome - Ustawienia - e-maile% s, aby zmienić parametr <strong>'% s'</strong> na tryb '% s' używać. W tym trybie można wprowadzić ustawienia serwera SMTP dostarczonych przez usługodawcę internetowego i używać funkcji e-maila Mszę św.
 MailSendSetupIs3=Jeśli masz jakieś pytania na temat konfiguracji serwera SMTP, możesz zapytać %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informacja
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 401ac7b9b3c..8d654d34ccd 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Szablon niedostępny dla tego typu wiadomości email
 AvailableVariables=Dostępne zmienne substytucji
 NoTranslation=Brak tłumaczenia
 Translation=Tłumaczenie
+CurrentTimeZone=Strefa czasowa PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Rekord nie został znaleziony.
 NoRecordDeleted=Brak usuniętych rekordów
 NotEnoughDataYet=Za mało danych
@@ -85,6 +87,8 @@ FileWasNotUploaded=Wybrano pliku do zamontowaia, ale jeszcze nie wysłano. W tym
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Przeczytaj pomoc online (wymaga połączenia z internetem)
 GoToHelpPage=Przeczytaj pomoc
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Strona główna
 RecordSaved=Rekord zapisany
 RecordDeleted=Rekord usunięty
 RecordGenerated=Rekord wygenerowany
@@ -220,6 +224,7 @@ Value=Wartość
 PersonalValue=Osobiste wartości
 NewObject=Nowy %s
 NewValue=Nowa wartość
+OldValue=Old value %s
 CurrentValue=Aktualna wartość
 Code=Kod
 Type=Typ
@@ -433,6 +438,7 @@ RemainToPay=Pozostało do zapłaty
 Module=Moduł/Aplikacja
 Modules=Moduły/Aplikacje
 Option=Opcja
+Filters=Filters
 List=Lista
 FullList=Pełna lista
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ SupplierPreview=Podgląd dostawcy
 ShowCustomerPreview=Pokaż podgląd klienta
 ShowSupplierPreview=Pokaż podgląd dostawcy
 RefCustomer=Nr ref. klient
+InternalRef=Internal ref.
 Currency=Waluta
 InfoAdmin=Informacje dla administratorów
 Undo=Cofnij
@@ -671,7 +678,7 @@ SendMail=Wyślij wiadomość email
 Email=Adres e-mail
 NoEMail=Brak e-mail
 AlreadyRead=Obecnie przeczytane
-NotRead=Nie przeczytane
+NotRead=Unread
 NoMobilePhone=Brak telefonu komórkowego
 Owner=Właściciel
 FollowingConstantsWillBeSubstituted=Kolejna zawartość będzie zastąpiona wartością z korespondencji.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=Wstrzymany
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/pl_PL/modulebuilder.lang b/htdocs/langs/pl_PL/modulebuilder.lang
index d9d1d794c77..e2346e75b40 100644
--- a/htdocs/langs/pl_PL/modulebuilder.lang
+++ b/htdocs/langs/pl_PL/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/pl_PL/mrp.lang b/htdocs/langs/pl_PL/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/pl_PL/mrp.lang
+++ b/htdocs/langs/pl_PL/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index 42937a4dc0d..22befcd2e4c 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -5,8 +5,6 @@ Tools=Narzędzia
 TMenuTools=Narzędzia
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Urodziny
-BirthdayDate=Data urodzin
-DateToBirth=Birth date
 BirthdayAlertOn=urodziny wpisu aktywnych
 BirthdayAlertOff=urodziny wpisu nieaktywne
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Rozłączono. Idź do strony logowania...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=Zobacz konfigurację modułu% s
 NbOfAttachedFiles=Liczba załączonych plików / dokumentów
 TotalSizeOfAttachedFiles=Całkowita wielkość załączonych plików / dokumentów
@@ -99,6 +100,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=__(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=Wybierz profil demo najlepiej odzwierciedlający twoje potrzeby...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -137,7 +139,7 @@ Right=Prawo
 CalculatedWeight=Obliczona waga
 CalculatedVolume=Obliczona wartość
 Weight=Waga
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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=Przywóz zestaw danych
 DolibarrNotification=Automatyczne powiadomienie
 ResizeDesc=Skriv inn ny <b>bredde</b> eller ny høyde. Forhold vil bli holdt under resizing ...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Wywóz obszarze
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index bac16142cef..3317f16ba9a 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Ilość cen
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+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=Liczba dominującej opakowaniu produktu
@@ -167,8 +168,10 @@ BuyingPrices=Cena zakupu
 CustomerPrices=Ceny klienta
 SuppliersPrices=Ceny dostawców
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Kraj pochodzenia
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Zastosuj stałą cenę
 PriceByQuantity=Różne ceny według ilości
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Zakres ilości
-MultipriceRules=Price segment rules
+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=%% Zmiany na% s
 PercentDiscountOver=%% Rabatu na% s
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 05a7af17809..6a19404be3c 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -76,15 +76,16 @@ MyActivities=Moje zadania / aktywności
 MyProjects=Moje projekty
 MyProjectsArea=Obszar moich projektów
 DurationEffective=Efektywny czas trwania
-ProgressDeclared=Deklarowany postęp
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Obliczony postęp
+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=Czas
+TimeConsumed=Consumed
 ListOfTasks=Lista zadań
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/pl_PL/recruitment.lang b/htdocs/langs/pl_PL/recruitment.lang
index 8faa1e9912f..d1f573b8bf9 100644
--- a/htdocs/langs/pl_PL/recruitment.lang
+++ b/htdocs/langs/pl_PL/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/pl_PL/sendings.lang b/htdocs/langs/pl_PL/sendings.lang
index 69db52a7677..1b1f4fc5baf 100644
--- a/htdocs/langs/pl_PL/sendings.lang
+++ b/htdocs/langs/pl_PL/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Inne wysyłki do tego zamówienia
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Transporty do zatwierdzenia
 StatusSendingCanceled=Anulowany
+StatusSendingCanceledShort=Anulowany
 StatusSendingDraft=Szkic
 StatusSendingValidated=Zatwierdzone (produkty do wysyłki lub już wysłane)
 StatusSendingProcessed=Przetwarzany
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=W pierwszej kolejności musisz zatwierdzić zam
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Więcej kompletny dokument model dostawy wpływy (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Stała EXPEDITION_ADDON_NUMBER nie zdefiniowano
 SumOfProductVolumes=Suma wolumenów
 SumOfProductWeights=Suma wag produktów
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index b7b0ba0716a..889b96b4be4 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Magazyny wartości
 UserWarehouseAutoCreate=Utwórz użytkownika dla magazynu kiedy tworzysz użytkownika
 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Domyślny magazyn
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/pl_PL/ticket.lang b/htdocs/langs/pl_PL/ticket.lang
index e33e54c62e2..457e5110c6b 100644
--- a/htdocs/langs/pl_PL/ticket.lang
+++ b/htdocs/langs/pl_PL/ticket.lang
@@ -18,23 +18,21 @@
 # Generic
 #
 
-Module56000Name=Tickets
+Module56000Name=Bilety
 Module56000Desc=System biletów do zarządzania kwestiami lub żądaniami
 
-Permission56001=See tickets
-Permission56002=Modify tickets
-Permission56003=Delete tickets
-Permission56004=Manage tickets
+Permission56001=Zobacz bilety
+Permission56002=Modyfikuj bilety
+Permission56003=Usuwaj bilety
+Permission56004=Zarządzaj biletami
 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
+TicketDictType=Bilet - Typ
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Inne
 TicketSeverityShortLOW=Niski
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Wysoki
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Czytać
 Assigned=Assigned
 InProgress=W trakcie
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang
index 2d9b4e9aa97..bb7ff022723 100644
--- a/htdocs/langs/pl_PL/website.lang
+++ b/htdocs/langs/pl_PL/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edytuj w linii
 AddWebsite=Dodaj witrynę
 Webpage=Strona/pojemnik
 AddPage=Dodaj stronę
-HomePage=Strona główna
 PageContainer=Strona
 PreviewOfSiteNotYetAvailable=Podgląd Twej witryny <strong>%s</strong> nie jest jeszcze dostępny. Użyj wpierw '<strong>Załaduj szablon witryny</strong>' lub '<strong>Dodaj stronę/pojemnik</strong>'.
 RequestedPageHasNoContentYet=Żądana strona o identyfikatorze %s nie ma jeszcze treści lub plik pamięci podręcznej .tpl.php został usunięty. Edytuj zawartość strony, aby to rozwiązać.
@@ -101,7 +100,7 @@ EmptyPage=Pusta strona
 ExternalURLMustStartWithHttp=Zewnętrzny adres URL musi zaczynać się od http:// lub https://
 ZipOfWebsitePackageToImport=Prześlij plik Zip pakietu szablonu witryny
 ZipOfWebsitePackageToLoad=lub Wybierz jakiś dostępny wbudowany pakiet szablonu web witryny
-ShowSubcontainers=Uwzględnij zawartość dynamiczną
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Wewnętrzny adres URL strony
 ThisPageIsTranslationOf=Ta strona/pojemnik to tłumaczenie
 ThisPageHasTranslationPages=Ta strona/pojemnik ma tłumaczenie
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/pl_PL/withdrawals.lang b/htdocs/langs/pl_PL/withdrawals.lang
index a9750a149e1..4d30e8d9c2e 100644
--- a/htdocs/langs/pl_PL/withdrawals.lang
+++ b/htdocs/langs/pl_PL/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Klasyfikacja zapisane
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Opcja dla trybu rzeczywistego nie był ustawiony, zatrzymujemy po tej symulacji
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/pl_PL/workflow.lang b/htdocs/langs/pl_PL/workflow.lang
index 384e999ce1e..2fe7a50b80e 100644
--- a/htdocs/langs/pl_PL/workflow.lang
+++ b/htdocs/langs/pl_PL/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatyczne utworzenie
 AutomaticClassification=Automatyczne zaklasyfikowanie
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/pt_AO/main.lang b/htdocs/langs/pt_AO/main.lang
new file mode 100644
index 00000000000..2e691473326
--- /dev/null
+++ b/htdocs/langs/pt_AO/main.lang
@@ -0,0 +1,21 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
diff --git a/htdocs/langs/pt_AO/mrp.lang b/htdocs/langs/pt_AO/mrp.lang
new file mode 100644
index 00000000000..e65383ffd8f
--- /dev/null
+++ b/htdocs/langs/pt_AO/mrp.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+NewBOM=New bill of material
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index d453360b552..e4b7f6b2454 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -87,7 +87,6 @@ VentilatedinAccount=Vinculado a conta contábil com sucesso
 NotVentilatedinAccount=Não vinculado a conta contábil
 XLineSuccessfullyBinded=%s produtos / serviços vinculados com sucesso a uma conta contábil
 XLineFailedToBeBinded=%s produtos/serviços não estão vinculados a qualquer conta da Contabilidade
-ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a vincular mostrados por página (máximo recomendado: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Iniciar a página "Vinculações a fazer" ordenando pelos elementos mais recentes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Iniciar a página "Vinculações feitas" ordenando pelos elementos mais recentes
 ACCOUNTING_LENGTH_DESCRIPTION=Truncar a descrição de Produtos & Serviços nas listagens, após x caracteres (Melhor = 50)
@@ -122,10 +121,8 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=Conta contábil padrão para os serviços vendid
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Conta contábil por padrão para os serviços vendidos na EEC (usada se não definida na ficha de serviço)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Conta contábil por padrão para os serviços vendidos e exportados para fora do EEC (usados ​​se não definidos na ficha de serviço)
 LabelAccount=Conta rótulo
-Sens=Significado
 JournalLabel=Rótulo de jornal
 TransactionNumShort=Nº da transação
-GroupByAccountAccounting=Agrupar pela conta da Contabilidade
 AccountingAccountGroupsDesc=Você pode definir aqui alguns grupos de contabilidade. Eles serão usados ​​para relatórios contábeis personalizados.
 NotMatch=Não Definido
 DelMonth=Mês a excluir
@@ -153,7 +150,6 @@ UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Conta de terceiro
 OpeningBalance=Saldo inicial
 ShowOpeningBalance=Mostrar saldo inicial
 HideOpeningBalance=Ocultar saldo inicial
-ShowSubtotalByGroup=Mostrar subtotal por grupo
 Pcgtype=Plano de Contas
 PcgtypeDesc=O grupo de contas é usado como critério predefinido de 'filtro' e 'agrupamento' para alguns relatórios contábeis. Por exemplo, 'RENDA' ou 'DESPESA' são usados ​​como grupos para contas contábeis de produtos para criar o relatório de despesas / receitas.
 Reconcilable=Reconciliável
@@ -172,7 +168,6 @@ DescClosure=Consulte aqui o número de movimentos por mês que não são validad
 OverviewOfMovementsNotValidated=Etapa 1 / Visão geral dos movimentos não validados. (Necessário para fechar um ano fiscal)
 ValidateMovements=Validar movimentações
 DescValidateMovements=Qualquer modificação ou exclusão de escrita, letras e exclusões será proibida. Todas as entradas para um exercício devem ser validadas, caso contrário, o fechamento não será possível
-SelectMonthAndValidate=Selecionar mês e validar movimentações
 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
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index a6c2222a0d7..74da419d9fb 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -33,6 +33,8 @@ UnlockNewSessions=Remover Bloqueio de Conexão
 YourSession=Sua Sessão
 Sessions=Sessões de Usuários
 WebUserGroup=Servidor Web para usuário/grupo
+PermissionsOnFilesInWebRoot=Permissões em arquivos no diretório raiz da web
+PermissionsOnFile=Permissões no arquivo %s
 NoSessionFound=Sua configuração do PHP parece não permitir listar as sessões ativas. O diretório usado para salvar sessões (<b>%s</ b>) pode estar protegido (por exemplo, pelas permissões do sistema operacional ou pela diretiva PHP "open_basedir").
 DBStoringCharset=Charset base de dados para armazenamento de dados (Database charset to store data)
 DBSortingCharset=Charset base de dados para classificar os dados (Database charset to sort data)
@@ -71,7 +73,6 @@ UsePreviewTabs=Usar previsão de digitação na tecla 'tab'
 ShowPreview=Mostrar Previsão
 PreviewNotAvailable=Previsão Indisponível
 ThemeCurrentlyActive=Tema Ativo
-CurrentTimeZone=Timezone PHP (do servidor apache)
 MySQLTimeZone=Timezone Mysql (do servidor sql)
 NextValue=Próximo Valor
 NextValueForInvoices=Próximo Valor (Faturas)
@@ -121,7 +122,6 @@ SystemToolsAreaDesc=Essa área dispõem de funções administrativas. Use esse m
 Purge=Purgar (apagar tudo)
 PurgeAreaDesc=Esta página permite deletar todos os arquivos gerados ou armazenados pelo Dolibarr (arquivos temporários ou todos os arquivos no diretório <b>%s</b>). Este recurso é fornecido como uma solução alternativa aos usuários cujo a instalação esteja hospedado num servidor que impeça o acesso as pastas onde os arquivos gerados pelo Dolibarr são armazenados, para excluí-los.
 PurgeDeleteLogFile=Excluir os arquivos de registro, incluindo o <b>%s</b> definido pelo módulo Syslog (não há risco de perda de dados)
-PurgeDeleteTemporaryFilesShort=Excluir arquivos temporários
 PurgeDeleteAllFilesInDocumentsDir=Eliminar todos os arquivos do diretório <b>%s</b>. Isto irá excluir todos documentos (Terceiros, faturas, ...), arquivos carregados no módulo ECM, Backups e arquivos temporários
 PurgeRunNow=Purgar(Apagar) Agora
 PurgeNothingToDelete=Sem diretório ou arquivos para excluir
@@ -214,6 +214,7 @@ MAIN_MAIL_AUTOCOPY_TO=Copiar (Cco) todos os e-mails enviados para
 MAIN_DISABLE_ALL_MAILS=Desativar todo o envio de e-mail (para fins de teste ou demonstrações)
 MAIN_MAIL_FORCE_SENDTO=Envie todos os e-mails para (em vez de destinatários reais, para fins de teste)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Sugira e-mails de funcionários (se definidos) na lista de destinatários predefinidos ao escrever um novo e-mail
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autorizar certificados auto-assinados
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use o DKIM para gerar assinatura de e-mail
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domínio de e-mail para uso com o dkim
 MAIN_SMS_SENDMODE=Método usado para enviar SMS
@@ -272,7 +273,6 @@ LanguageFilesCachedIntoShmopSharedMemory=Os arquivos .lang foram carregados na m
 LanguageFile=Arquivo de idioma
 ListOfDirectories=Lista de diretórios com templates de documentos abertos(.odt)
 ListOfDirectoriesForModelGenODT=A lista de diretórios contém modelos de arquivos no formato OpenDocument.<br><br>Insira aqui o caminho dos diretórios.<br>Adicione uma quebra de linha entre cada diretório.<br>Para adicionar um diretório do módulo GED, adicione aqui <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Os arquivos  nestes diretórios devem terminar com <b>.odt</b> ou <b>.ods</b>.
-ExampleOfDirectoriesForModelGen=Exemplo de sintaxe:<br>c:\\meudir<br>/home/meudir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Para saber como criar seus temas de documento em ODT, antes de armazená-los nesses diretórios, leia a documentação wiki:
 FirstnameNamePosition=Posição do Nome/Sobrenome
 KeyForWebServicesAccess=Chave para usar o Serviços Web (parâmetro "dolibarrkey" no serviço web)
@@ -467,7 +467,6 @@ Module50400Name=Contabilidade (entrada dupla)
 Module54000Name=ImprimirIPP
 Module55000Name=Pesquisa Aberta
 Module55000Desc=Criar pesquisas, enquetes ou votos on-line (como Doodle, Studs, RDVz etc ...)
-Module59000Desc=Módulo para gerenciar margens
 Module60000Desc=Módulo para gerenciar comissão
 Module63000Desc=Gerenciar recursos (impressoras, carros, salas, ...) para alocar eventos
 Permission11=Ler Faturas de Clientes
@@ -1183,7 +1182,6 @@ MenuDeleted=Menu Deletado
 NotTopTreeMenuPersonalized=Menus personalizados não conectados à uma entrada do menu superior
 NewMenu=Novo Menu
 MenuModule=Fonte do módulo
-HideUnauthorizedMenu=Esconder menus não autorizados (cinza)
 DetailId=Menu ID
 DetailMenuHandler=Gestor de menu onde mostra novo menu
 DetailMenuModule=Nome do módulo se a entrada do menu vier de um módulo
@@ -1380,8 +1378,6 @@ EmailCollectorDescription=Adicione um trabalho agendado e uma página de configu
 NewEmailCollector=Novo coletor de e-mail
 MaxEmailCollectPerCollect=Número máximo de e-mails coletados por coleta
 ConfirmCloneEmailCollector=Tem certeza de que deseja clonar o coletor de e-mail %s?
-DateLastCollectResult=Data da última coleta testada
-DateLastcollectResultOk=Data da última coleta bem-sucedida
 LastResult=Último resultado
 EmailCollectorConfirmCollectTitle=Confirmação de recebimento de e-mail
 EmailCollectorConfirmCollect=Deseja executar a coleta deste coletor agora?
@@ -1449,4 +1445,7 @@ RssNote=Nota: Cada definição de feed RSS fornece um widget que você deve ativ
 JumpToBoxes=Vá para Configuração -> Widgets
 MeasuringUnitTypeDesc=Use aqui um valor como "tamanho", "superfície", "volume", "peso", "tempo"
 MeasuringScaleDesc=A escala é o número de casas que você precisa mover a parte decimal para corresponder à unidade de referência padrão. Para o tipo de unidade "time", é o número de segundos. Valores entre 80 e 99 são valores reservados.
+TemplateAdded=Modelo adicionado
+TemplateUpdated=Modelo atualizado
+TemplateDeleted=Modelo excluído
 DictionaryProductNature=Natureza do produto
diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang
index 8b5063b041d..e57792e9621 100644
--- a/htdocs/langs/pt_BR/banks.lang
+++ b/htdocs/langs/pt_BR/banks.lang
@@ -134,8 +134,6 @@ ShowVariousPayment=Mostrar pagamento diverso
 AddVariousPayment=Adicionar pagamento diverso
 YourSEPAMandate=Seu mandato Área Única de Pagamentos em Euros
 AutoReportLastAccountStatement=Preencha automaticamente o campo 'número de extrato bancário' com o último número de extrato ao fazer a reconciliação
-CashControl=Caixa de dinheiro PDV
-NewCashFence=Nova caixa
 BankColorizeMovement=Colorir movimentos
 BankColorizeMovementDesc=Se esta função estiver ativada, você poderá escolher uma cor de plano de fundo específica para movimentos de débito ou crédito
 BankColorizeMovementName1=Cor de fundo para movimento de débito
diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
index 34fb1404b65..a20be8fd4bd 100644
--- a/htdocs/langs/pt_BR/bills.lang
+++ b/htdocs/langs/pt_BR/bills.lang
@@ -2,11 +2,8 @@
 BillsCustomer=Fatura de cliente
 BillsCustomersUnpaid=Faturas de clientes não pagos
 BillsCustomersUnpaidForCompany=Faturas de clientes não pagas para %s
-BillsSuppliersUnpaid=Faturas de fornecedores não pagas
-BillsSuppliersUnpaidForCompany=Faturas de fornecedores não pagas para %s
 BillsLate=Pagamentos atrasados
 BillsStatistics=Estatísticas de faturas de clientes
-BillsStatisticsSuppliers=Estatísticas de faturas de fornecedores
 DisabledBecauseDispatchedInBookkeeping=Desativado porque a nota fiscal foi despachada na contabilidade
 DisabledBecauseNotLastInvoice=Desativado porque a fatura não é apagável. Algumas faturas foram gravadas após esta e ele criará buracos no balcão.
 DisabledBecauseNotErasable=Desativada já que não pode ser apagada
@@ -42,16 +39,13 @@ InvoiceCustomer=Fatura de cliente
 CustomerInvoice=Fatura de cliente
 CustomersInvoices=Faturas de clientes
 SupplierInvoice=Fatura do fornecedores
-SuppliersInvoices=Faturas de fornecedores
 SupplierBill=Fatura do fornecedores
 SupplierBills=Faturas de fornecedores
 PaymentBack=Reembolso
 CustomerInvoicePaymentBack=Reembolso
-PaymentsBack=Reembolsos
 PaidBack=Reembolso pago
 DeletePayment=Deletar pagamento
 ConfirmDeletePayment=Você tem certeza que deseja excluir este pagamento?
-ConfirmConvertToReduc=Deseja converter este %s em um crédito disponível?
 ConfirmConvertToReduc2=O valor será salvo junto a todos os descontos e poderá ser usado como desconto em uma fatura atual ou futura deste cliente.
 ConfirmConvertToReducSupplier=Deseja converter este %s em um crédito disponível?
 ConfirmConvertToReducSupplier2=O valor será salvo junto a todos os descontos e poderá ser usado como desconto em uma fatura atual ou futura deste fornecedor.
@@ -63,15 +57,12 @@ PaymentsReportsForYear=Relatórios de pagamentos por %s
 PaymentsAlreadyDone=Pagamentos já feitos
 PaymentsBackAlreadyDone=Reembolsos já realizados
 PaymentRule=Regra de pagamento
-PaymentMode=Tipo 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
-PaymentConditions=Termos de pagamento
-PaymentConditionsShort=Termos de pagamento
 PaymentAmount=Valor a ser pago
 PaymentHigherThanReminderToPay=Pagamento superior ao valor a ser pago
 ClassifyPaid=Classificar 'pago'
@@ -199,7 +190,6 @@ SendReminderBillByMail=Enviar o restante por e-mail
 RelatedRecurringCustomerInvoices=Faturas recorrentes relacionadas ao cliente
 MenuToValid=Validar
 ClassifyBill=Classificar fatura
-SupplierBillsToPay=Faturas de fornecedores não pagas
 CustomerBillsUnpaid=Faturas de clientes não pagos
 SetConditions=Definir condições de pagamento
 SetMode=Definir tipo de pagamento
@@ -217,7 +207,6 @@ ExportDataset_invoice_1=Faturas do cliente e detalhes da fatura
 ExportDataset_invoice_2=Faturas de clientes e pagamentos
 ProformaBill=Conta pro-forma:
 Reductions=Reduções
-ReductionsShort=Disco.
 AddDiscount=Criar desconto
 EditGlobalDiscounts=Editar desconto fixo
 ShowDiscount=Mostrar desconto
@@ -252,7 +241,6 @@ DescTaxAndDividendsArea=Esta área apresenta um resumo de todos os pagamentos fe
 NbOfPayments=Nº. de pagamentos
 SplitDiscount=Dividir desconto em dois
 ConfirmSplitDiscount=Tem certeza de que deseja dividir este desconto de <b>%s</b> %s em dois descontos menores?
-TotalOfTwoDiscountMustEqualsOriginal=O total dos dois novos descontos deve ser igual ao valor do desconto original.
 ConfirmRemoveDiscount=Você tem certeza que deseja remover este desconto?
 RelatedSupplierInvoices=Faturas de fornecedores relacionadas
 LatestRelatedBill=Últimas fatura correspondente
@@ -296,11 +284,9 @@ PaymentTypeTRA=Cheque administrativo
 PaymentTypeShortTRA=Minuta
 BankDetails=Detalhes bancário
 BankCode=Código bancário
-DeskCode=Código da Agência
 BankAccountNumber=Número da conta
 BankAccountNumberKey=Soma de verificação
 Residence=Endereço
-IBANNumber=Número da conta IBAN
 IBAN=Agencia
 CustomerIBAN=IBAN do cliente
 SupplierIBAN=IBAN do fornecedor
@@ -319,7 +305,6 @@ IntracommunityVATNumber=ID do IVA intracomunitário
 PaymentByChequeOrderedTo=Cheque pagamentos (incluindo impostos) são pagas para %s, enviar para
 PaymentByChequeOrderedToShort=Cheque pagamentos (incl. Imposto) são pagas para
 SendTo=Enviar para
-PaymentByTransferOnThisBankAccount=Pagamento por transferência para a seguinte conta bancária
 VATIsNotUsedForInvoice=* Não aplicável ICMS art-293B de CGI
 LawApplicationPart1=Pela aplicação da lei 80.335 de 12/05/80
 LawApplicationPart2=os bens permanece propriedade de
@@ -371,7 +356,6 @@ TypeContact_facture_external_SERVICE=Contato de serviço de cliente
 TypeContact_invoice_supplier_internal_SALESREPFOLL=Fatura de fornecedor subsequente representativa
 TypeContact_invoice_supplier_external_BILLING=Contato da fatura do fornecedor
 TypeContact_invoice_supplier_external_SHIPPING=Contato de remessa do fornecedor
-TypeContact_invoice_supplier_external_SERVICE=Contato de serviço do fornecedor
 InvoiceFirstSituationAsk=Primeira situação da fatura
 InvoiceFirstSituationDesc=A <b>situação faturas</b> são amarradas às situações relacionadas com uma progressão, por exemplo, a progressão de uma construção. Cada situação é amarrada a uma fatura.
 InvoiceSituation=Situação da fatura
diff --git a/htdocs/langs/pt_BR/blockedlog.lang b/htdocs/langs/pt_BR/blockedlog.lang
index 390258dcf55..0a12ec89ee3 100644
--- a/htdocs/langs/pt_BR/blockedlog.lang
+++ b/htdocs/langs/pt_BR/blockedlog.lang
@@ -8,6 +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).
 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
@@ -17,7 +18,6 @@ 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=Gravação de caixa
 Fingerprint=Impressao digial
 logDOC_PREVIEW=Pré -visualização de um documento validado para imprimir ou baixar
 DataOfArchivedEvent=Dados completos do evento arquivado
diff --git a/htdocs/langs/pt_BR/boxes.lang b/htdocs/langs/pt_BR/boxes.lang
index 77eb32557aa..0d2b4f7a911 100644
--- a/htdocs/langs/pt_BR/boxes.lang
+++ b/htdocs/langs/pt_BR/boxes.lang
@@ -35,25 +35,22 @@ BoxTitleLastModifiedDonations=Últimas %s doações modificadas
 BoxTitleLatestModifiedBoms=%s BOMs modificadas recentemente
 BoxTitleLatestModifiedMos=%s ordens de fabricação modificadas recentemente
 BoxGlobalActivity=Atividade global (faturas, propostas, pedidos)
+BoxScheduledJobs=Tarefas agendadas
 FailedToRefreshDataInfoNotUpToDate=Falha ao atualizar o fluxo de RSS. Data de atualização mais recente com êxito: %s
 LastRefreshDate=Ultima data atualizacao
 NoRecordedBookmarks=Nenhum marcador definido.
 NoRecordedContacts=Nenhum contato registrado
 NoActionsToDo=Nenhuma ação para fazer
-NoRecordedOrders=Nenhum pedido de venda registrado
 NoRecordedProposals=Nenhum possível cliente registrado
 NoRecordedInvoices=Nenhuma nota fiscal registrada
 NoUnpaidCustomerBills=Não há notas fiscais de clientes não pagas
 NoUnpaidSupplierBills=Nenhuma fatura de fornecedor não paga
-NoModifiedSupplierBills=Nenhuma fatura de fornecedor registrada
 NoRecordedProducts=Nenhum registro de produtos/serviços
 NoRecordedProspects=Nenhum registro de possíveis clientes
 NoContractedProducts=Nenhum produtos/serviços contratados
 NoRecordedContracts=Nenhum registro de contratos
 NoRecordedInterventions=Nenhum registro de intervenções
-BoxLatestSupplierOrders=Últimos pedidos de compra
 BoxLatestSupplierOrdersAwaitingReception=Últimos pedidos (com uma recepção pendente)
-NoSupplierOrder=Nenhum pedido de compra registrado
 BoxCustomersInvoicesPerMonth=Faturas do cliente por mês
 BoxSuppliersInvoicesPerMonth=Faturas do fornecedor por mês
 BoxCustomersOrdersPerMonth=Pedidos de vendas por mês
@@ -73,8 +70,6 @@ LastXMonthRolling=Ultima %s mensal
 ChooseBoxToAdd=Adicionar widget para sua area de notificacoes
 BoxAdded=A ferramenta foi adicionada no seu painel
 BoxTitleUserBirthdaysOfMonth=Aniversários deste mês (usuários)
-BoxLastManualEntries=Últimas entradas manuais em contabilidade
-BoxTitleLastManualEntries=%s últimas entradas manuais
 NoRecordedManualEntries=Nenhuma entrada manual registrada na contabilidade
 BoxSuspenseAccount=Operação de contabilidade com conta suspensa
 BoxTitleSuspenseAccount=Número de linhas não alocadas
diff --git a/htdocs/langs/pt_BR/cashdesk.lang b/htdocs/langs/pt_BR/cashdesk.lang
index ff2e4bbd438..3a5201ded49 100644
--- a/htdocs/langs/pt_BR/cashdesk.lang
+++ b/htdocs/langs/pt_BR/cashdesk.lang
@@ -25,8 +25,6 @@ Footer=Rodapé
 AmountAtEndOfPeriod=Montante no final do período (dia, mês ou ano)
 TheoricalAmount=Quantidade teórica
 RealAmount=Quantidade real
-CashFence=Cerca de dinheiro
-CashFenceDone=Caixa feito para o período
 NbOfInvoices=Núm. de faturas
 Paymentnumpad=Tipo de Pad para inserir pagamento
 Numberspad=Números de Pad
@@ -70,7 +68,6 @@ CashDeskRefNumberingModules=Módulo de numeração para vendas PDV
 CashDeskGenericMaskCodes6 =<br>A tag {TN} é usada para adicionar o número do terminal
 TakeposGroupSameProduct=Agrupe as mesmas linhas de produtos
 StartAParallelSale=Iniciar uma nova venda paralela
-CloseCashFence=Fechar cerca de dinheiro
 CashReport=Relatório de caixa
 MainPrinterToUse=Impressora principal a ser usada
 OrderPrinterToUse=Solicite impressora a ser usada
diff --git a/htdocs/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang
index fd9c6ce0047..daab834c237 100644
--- a/htdocs/langs/pt_BR/categories.lang
+++ b/htdocs/langs/pt_BR/categories.lang
@@ -56,15 +56,13 @@ UsersCategoriesShort=Tags / categorias de usuários
 StockCategoriesShort=Tags / categorias de armazém
 ThisCategoryHasNoItems=Esta categoria não contém nenhum item.
 CategId=ID Tag / categoria
-CatCusList=Lista de cliente / perspectivas de tags / categorias
 CatProdList=Lista de produtos tags / categorias
 CatMemberList=Lista de membros tags / categorias
-CatContactList=Lista de contatos tags / categorias
-CatSupLinks=Ligações entre fornecedores e tags / categorias
 CatCusLinks=Relação/links entre clientes / perspectivas e tags / categorias
 CatContactsLinks=Links entre contatos / endereços e tags / categorias
 CatProdLinks=Relação/links entre produtos / serviços e tags / categorias
-CatProJectLinks=Links entre projetos e tags/categorias
+CatMembersLinks=Ligações entre os membros e tags / categorias
+CatProjectsLinks=Links entre projetos e tags/categorias
 ExtraFieldsCategories=atributos complementares
 CategoriesSetup=Configuração Tags / categorias
 CategorieRecursiv=Fazer a ligação com os pais tag/categoria automaticamente
diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang
index a7001066d5f..1dadb249b1e 100644
--- a/htdocs/langs/pt_BR/compta.lang
+++ b/htdocs/langs/pt_BR/compta.lang
@@ -54,6 +54,7 @@ SocialContribution=Contribuição fiscal ou social
 SocialContributions=Encargos sociais e fiscais
 SocialContributionsDeductibles=Contribuições fiscais ou sociais dedutíveis
 SocialContributionsNondeductibles=Contribuições fiscais ou sociais não dedutíveis
+DateOfSocialContribution=Data do imposto social ou fiscal
 LabelContrib=Rótulo da contribuição
 TypeContrib=Tipo de contribuição
 MenuSpecialExpenses=Despesas especiais
@@ -85,7 +86,6 @@ VATRefund=Reembolso da taxa sobre vendas
 SocialContributionsPayments=Pagamentos de impostos sociais / fiscais
 ShowVatPayment=Ver Pagamentos ICMS
 TotalToPay=Total a pagar
-BalanceVisibilityDependsOnSortAndFilters=O saldo é visível nessa lista somente se a tabela for ordenada ascendendo em %s e filtrada por 1 conta bancária
 CustomerAccountancyCode=Código contábil do cliente
 SupplierAccountancyCode=Código contábil do fornecedor
 CustomerAccountancyCodeShort=Cod. cont. cli.
@@ -176,3 +176,5 @@ RulesPurchaseTurnoverIn=- Inclui todos os pagamentos efetivos das faturas feitas
 RulesPurchaseTurnoverTotalPurchaseJournal=Inclui todas as linhas de débito no diário de compras.
 ReportPurchaseTurnover=Volume de negócios de compra faturada
 ReportPurchaseTurnoverCollected=Rotatividade de compras coletadas
+IncludeVarpaysInResults =Incluir vários pagamentos nos relatórios
+IncludeLoansInResults =Incluir empréstimos nos relatórios
diff --git a/htdocs/langs/pt_BR/cron.lang b/htdocs/langs/pt_BR/cron.lang
index 343355e7a5f..eed6598232e 100644
--- a/htdocs/langs/pt_BR/cron.lang
+++ b/htdocs/langs/pt_BR/cron.lang
@@ -4,8 +4,6 @@ Permission23102 =Criar / atualização de tarefa agendada
 Permission23103 =Excluir trabalho agendado
 Permission23104 =Executar trabalho agendado
 CronSetup=Configuração do gerenciamento de trabalho agendado
-URLToLaunchCronJobs=URL para verificar e iniciar os cron jobs qualificados
-OrToLaunchASpecificJob=Ou checkar e iniciar um specifico trabalho
 KeyForCronAccess=Chave seguranca para URL que lanca tarefas cron
 FileToLaunchCronJobs=Linha de comando para checar e iniciar tarefas cron qualificadas
 CronExplainHowToRunUnix=No ambiente Unix você deve usar a seguinte entrada crontab para executar a linha de comando a cada 5 minutos
@@ -29,7 +27,6 @@ CronNbRun=Número de lançamentos
 CronMaxRun=Número máximo de lançamentos
 JobFinished=Trabalho iniciado e terminado
 CronAdd=Adicionar tarefa
-CronEvery=Executar cada tarefa
 CronObject=Instância/Objeto a se criar
 CronSaveSucess=Salvo com sucesso
 CronFieldMandatory=O campo %s é obrigatório
@@ -44,12 +41,13 @@ CronMethodHelp=O método do objeto a ser lançado. <BR> Por exemplo, para chamar
 CronArgsHelp=Os argumentos do método. <BR> Por exemplo, para chamar o método fetch do objeto Dolibarr Product /htdocs/product/class/product.class.php, o valor dos parâmetros pode ser <i> 0, ProductRef </ i>
 CronCommandHelp=A linha de comando de sistema que deve ser executada.
 CronCreateJob=Criar uma nova Tarefa agendada
-CronType=Tipo de tarefa
 CronType_method=Chamar método de uma Classe PHP
 CronType_command=Comando Shell
 CronCannotLoadClass=Não é possível carregar o arquivo de classe %s (para usar a classe %s)
 CronCannotLoadObject=O arquivo de classe %s foi carregado, mas o objeto %s não foi encontrado nele
+UseMenuModuleToolsToAddCronJobs=Vá para o menu "<a href="%s">Página inicial - Ferramentas administrativas - Trabalhos agendados</a>" para ver e editar os trabalhos agendados.
 JobDisabled=Tarefa desativada
 MakeLocalDatabaseDumpShort=Backup do banco de dados local
 MakeLocalDatabaseDump=Crie um despejo de banco de dados local. Os parâmetros são: compression ('gz' ou 'bz' ou 'none'), tipo de backup ('mysql', 'pgsql', 'auto'), 1, 'auto' ou nome de arquivo para construir, número de arquivos de backup para manter
 WarningCronDelayed=Atenção, para fins de desempenho, seja qual for a próxima data de execução de tarefas habilitadas, suas tarefas podem ser atrasadas em até um máximo de %s horas, antes de serem executadas.
+DATAPOLICYJob=Limpador de dados e anonimizador
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index afe2c1ac0b2..971fb3d2fe0 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -60,7 +60,6 @@ ErrorNoAccountancyModuleLoaded=Módulo de Contabilidade não ativado
 ErrorExportDuplicateProfil=Este nome de perfil já existe para este lote de exportação.
 ErrorLDAPSetupNotComplete=A correspondência Dolibarr-LDAP não está completa.
 ErrorLDAPMakeManualTest=foi criado unn Arquivo .ldif na pasta %s. Trate de gastor manualmente este Arquivo a partir da linha de comandos para Obter mais detalles acerca do error.
-ErrorRefAlreadyExists=A ref. utilizada para a criação já existe.
 ErrorRecordHasAtLeastOneChildOfType=Object tem pelo menos um filho do tipo %s
 ErrorModuleRequireJavascript=Javascript não deve ser desativado para ter esse recurso funcionando. Para ativar / desativar o Javascript, vá ao menu Home-> Configuração-> Display.
 ErrorPasswordsMustMatch=Deve existir correspondência entre as senhas digitadas
@@ -163,6 +162,7 @@ ErrorBatchNoFoundForProductInWarehouse=Nenhum lote / série encontrado para o pr
 ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Quantidade insuficiente para este lote / série para o produto "%s"  "no armazém"%s ".
 ErrorOnlyOneFieldForGroupByIsPossible=Apenas 1 campo para o 'Agrupar por' é possível (outros são descartados)
 ErrorReplaceStringEmpty=Erro, a cadeia de caracteres para substituir está vazia
+ErrorPublicInterfaceNotEnabled=A interface pública não foi ativada
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Seu parâmetro PHP upload_max_filesize (%s) é maior que o parâmetro PHP post_max_size (%s). Esta não é uma configuração consistente.
 WarningPasswordSetWithNoAccount=A senha foi definida para esse membro. No entanto, nenhuma conta de usuário foi criada. Portanto, esta senha é armazenada, mas não pode ser usado para acessar Dolibarr. Ele pode ser usado por um módulo / interface externa, mas se você não precisa definir qualquer login nem palavra-passe para um membro, você pode desabilitar a opção "Gerenciar um login para cada membro" da configuração do módulo-Membro. Se você precisa para gerenciar um login, mas não precisa de qualquer senha, você pode manter este campo em branco para evitar este aviso. Nota: E-mail pode também ser utilizado como uma entre o membro se está ligado a um utilizador.
 WarningMandatorySetupNotComplete=Clique aqui para configurar os parâmetros obrigatórios
@@ -183,4 +183,3 @@ WarningSomeLinesWithNullHourlyRate=Algumas vezes foram registrados por alguns us
 WarningYourLoginWasModifiedPleaseLogin=O seu login foi modificado. Por questões de segurança, você terá de autenticar-se com o seu novo login antes da próxima ação.
 WarningProjectClosed=O projeto está fechado. Você deve reabri-lo primeiro.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Algumas transações bancárias foram removidas após geração do recebimento, incluindo elas. Portanto, o número de cheques e o total de recebimento podem diferir do número e do total na lista.
-WarningFailedToAddFileIntoDatabaseIndex=Aviso, falha ao adicionar entrada de arquivo na tabela de índice do banco de dados ECM
diff --git a/htdocs/langs/pt_BR/exports.lang b/htdocs/langs/pt_BR/exports.lang
index 63bff69e01d..4475adb3a39 100644
--- a/htdocs/langs/pt_BR/exports.lang
+++ b/htdocs/langs/pt_BR/exports.lang
@@ -6,6 +6,8 @@ NotImportedFields=Os campos de arquivo de origem não importado
 ExportModelSaved=Exportar perfil salvo como <b> %s </b>.
 ImportModelName=Nome do perfil de importação
 DatasetToImport=Conjunto de dados a importar
+ExportCsvSeparator=Separador de caracteres csv
+ImportCsvSeparator=Separador de caracteres csv
 FormatedImportDesc1=Este módulo permite atualizar dados existentes ou adicionar novos objetos ao banco de dados a partir de um arquivo sem conhecimento técnico, usando um assistente.
 NoImportableData=Não existe tipo de dados importavel (não existe nenhum módulo com definições de dados importavel ativado)
 FileSuccessfullyBuilt=Arquivo gerado
diff --git a/htdocs/langs/pt_BR/mails.lang b/htdocs/langs/pt_BR/mails.lang
index e0efe3c7f34..54faf80d28a 100644
--- a/htdocs/langs/pt_BR/mails.lang
+++ b/htdocs/langs/pt_BR/mails.lang
@@ -71,9 +71,6 @@ TagUnsubscribe=Atalho para se desenscrever
 EMailRecipient=E-mail do destinatário
 TagMailtoEmail=E-mail do destinatário (incluindo o link "mailto:" em html)
 NoEmailSentBadSenderOrRecipientEmail=Nenhum e-mail enviado. Bad remetente ou destinatário de e-mail. Verifique perfil de usuário.
-AddNewNotification=Ativar um novo alvo / evento de notificação por e-mail
-ListOfActiveNotifications=Listar todos os destinos/eventos ativos para notificação por e-mail
-ListOfNotificationsDone=Listar todas as notificações de e-mail enviadas
 MailSendSetupIs=Configuração do envio de e-mails foi configurado a '%s'. Este modo não pode ser usado para envios de massa de e-mails.
 MailSendSetupIs2=Voçê precisa primeiramente acessar com uma conta de Administrador o menu %sInicio - Configurações - E-mails%s para mudar o parâmetro <strong>'%s'</strong> para usar o modo '%s'. Neste modo você pode entrar a configuração do servidor SMTP fornecido pelo seu Provedor de Acesso a Internet e usar a funcionalidade de envios de massa de e-mails.
 MailSendSetupIs3=Se tiver perguntas sobre como configurar o seu servidor SMTP voçê pode perguntar %s.
@@ -94,8 +91,4 @@ AdvTgtDeleteFilter=Excluir filtro
 AdvTgtSaveFilter=Salvar filtro
 NoContactWithCategoryFound=Nenhum foi encontrado nenhum contato/endereço com uma categoria
 NoContactLinkedToThirdpartieWithCategoryFound=Nenhum foi encontrado nenhum contato/endereço com uma categoria
-OutGoingEmailSetup=Configuração de e-mail de saída
-InGoingEmailSetup=Configuração de e-mail de entrada
-OutGoingEmailSetupForEmailing=Configuração de email de saída (para o módulo %s)
-DefaultOutgoingEmailSetup=Configuração de e-mail de saída padrão
 ContactsWithThirdpartyFilter=Contatos com filtro de terceiros
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index c0d7d0ed2ac..7792b3ddc3c 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -21,6 +21,7 @@ FormatDateHourTextShort=%d %b, %Y, %I:%M %p
 FormatDateHourText=%d %B, %Y, %I:%M %p
 DatabaseConnection=Login à Base de Dados
 NoTemplateDefined=Nenhum modelo disponível para este tipo de email
+CurrentTimeZone=Timezone PHP (do servidor apache)
 EmptySearchString=Digite critérios na pesquisa
 NoRecordFound=Nenhum registro encontrado
 NoRecordDeleted=Nenhum registro foi deletado
@@ -65,6 +66,7 @@ FileWasNotUploaded=O arquivo foi selecionado, mas nao foi ainda enviado. Clique
 NbOfEntries=N°. de entradas
 GoToWikiHelpPage=Ler a ajuda online (necessário acesso a Internet)
 GoToHelpPage=Consulte a ajuda (pode necessitar de acesso à internet)
+HomePage=Pagina inicial
 RecordDeleted=Registro apagado
 RecordGenerated=Registro gerado
 LevelOfFeature=Nível de funções
@@ -532,3 +534,4 @@ NotUsedForThisCustomer=Não usado para este cliente
 AmountMustBePositive=O valor deve ser positivo
 ByStatus=Por status
 DateOfBirth=Data de nascimento
+OnHold=Em espera
diff --git a/htdocs/langs/pt_BR/modulebuilder.lang b/htdocs/langs/pt_BR/modulebuilder.lang
index 3c474204a64..e5120fa2996 100644
--- a/htdocs/langs/pt_BR/modulebuilder.lang
+++ b/htdocs/langs/pt_BR/modulebuilder.lang
@@ -51,7 +51,6 @@ UseSpecificEditorURL =Use um URL de editor específico
 UseSpecificFamily =Use uma família específica
 UseSpecificAuthor =Use um autor específico
 UseSpecificVersion =Use uma versão inicial específica
-ModuleMustBeEnabled=O módulo/aplicativo deve ser ativado primeiro
 IncludeRefGeneration=A referência do objeto deve ser gerada automaticamente
 IncludeRefGenerationHelp=Marque aqui se desejar incluir código para gerenciar a geração automaticamente da referência
 IncludeDocGeneration=Gerar alguns documentos a partir do objeto
diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang
index 2c7d8cbc922..3bb86856d85 100644
--- a/htdocs/langs/pt_BR/other.lang
+++ b/htdocs/langs/pt_BR/other.lang
@@ -92,7 +92,7 @@ DirWasRemoved=a pasta foi eliminado
 FeatureNotYetAvailable=Funcionalidade ainda não disponível na versão atual
 Left=Esquerda
 Right=Direita
-WeightUnitton=tonelada
+WeightUnitton=t
 VolumeUnitgallon=gallão
 SizeUnitfoot=pe
 BugTracker=Incidências
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index 6f9b9ca7a94..ca73468eb49 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -115,7 +115,6 @@ AlwaysUseNewPrice=Usar sempre preço atual do produto/serviço
 AlwaysUseFixedPrice=Usar preço fixo
 PriceByQuantity=Diferentes preços por quantidade
 PriceByQuantityRange=Intervalo de quantidade
-MultipriceRules=Regras de preços por segmento
 PercentVariationOver=%% variação sobre %s
 PercentDiscountOver=%% disconto sobre %s
 VariantRefExample=Exemplos: COR, TAMANHO
diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang
index 716fa43b767..cee7bda314e 100644
--- a/htdocs/langs/pt_BR/projects.lang
+++ b/htdocs/langs/pt_BR/projects.lang
@@ -47,12 +47,8 @@ AddHereTimeSpentForWeek=Adicione aqui o tempo gasto para esta semana / tarefa
 Activities=Tarefas/atividades
 MyActivities=Minhas Tarefas/Atividades
 MyProjectsArea=Minha Área de projetos
-ProgressDeclared=o progresso declarado
 TaskProgressSummary=Progresso tarefa
 CurentlyOpenedTasks=Tarefas atualmente abertas
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=O progresso declarado é menos %s do que a progressão calculada
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=O progresso declarado é mais %s do que a progressão calculada
-ProgressCalculated=calculado do progresso
 WhichIamLinkedTo=ao qual estou ligado
 WhichIamLinkedToProject=ao qual estou vinculado ao projeto
 GoToListOfTimeConsumed=Ir para a lista de dispêndios de tempo
diff --git a/htdocs/langs/pt_BR/sendings.lang b/htdocs/langs/pt_BR/sendings.lang
index c686aba270c..88024602add 100644
--- a/htdocs/langs/pt_BR/sendings.lang
+++ b/htdocs/langs/pt_BR/sendings.lang
@@ -17,6 +17,7 @@ KeepToShip=Permaneça para enviar
 KeepToShipShort=Permanecer
 SendingsAndReceivingForSameOrder=Envios e recibos para esse pedido
 SendingsToValidate=Envios a Confirmar
+StatusSendingCanceledShort=Cancelada
 StatusSendingValidated=Validado (produtos a enviar o enviados)
 SendingSheet=Folha de embarque
 ConfirmDeleteSending=Tem certeza que quer remover este envio?
diff --git a/htdocs/langs/pt_BR/ticket.lang b/htdocs/langs/pt_BR/ticket.lang
index 14a27fd797e..2f52343c451 100644
--- a/htdocs/langs/pt_BR/ticket.lang
+++ b/htdocs/langs/pt_BR/ticket.lang
@@ -97,7 +97,6 @@ TicketChangeStatus=Alterar status
 TicketConfirmChangeStatus=Confirma alteração de situação %s ?
 TicketLogStatusChanged=Situação modificada  de%s para %s
 TicketNotCreatedFromPublicInterface=Não disponível. O ticket não foi criado a partir da interface pública.
-PublicInterfaceNotEnabled=A interface pública não foi ativada
 ErrorTicketRefRequired=O nome de referência do ticket é obrigatório
 TicketLogMesgReadBy=Tíquete %s lido por %s
 TicketLogAssignedTo=Tíquete %s assinalado para %s
diff --git a/htdocs/langs/pt_BR/withdrawals.lang b/htdocs/langs/pt_BR/withdrawals.lang
index 5d560f9548b..dd45990f9a9 100644
--- a/htdocs/langs/pt_BR/withdrawals.lang
+++ b/htdocs/langs/pt_BR/withdrawals.lang
@@ -64,7 +64,6 @@ ModeRECUR=Pagamento recorrente
 PleaseCheckOne=Favor marcar apenas um
 DirectDebitOrderCreated=Pedido de débito direto %s criado
 CreateForSepa=Crie um arquivo de débito direto
-ICS=Identificador do credor
 END_TO_END=Tag SEPA XML "EndToEndId" - ID exclusivo atribuído por transação
 USTRD=Tag SEPA XML "não estruturada"
 ADDDAYS=Adicionar dias à data de execução
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index c94ba9653ef..5f98a41fc2e 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=Este serviço
 ThisProduct=Este produto
 DefaultForService=Padrão para o serviço
 DefaultForProduct=Padrão para o produto
+ProductForThisThirdparty=Product for this thirdparty
+ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Não pode sugerir
 AccountancySetupDoneFromAccountancyMenu=A maioria da configuração da contabilidade é efetuada a partir do menu %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -48,6 +50,7 @@ CountriesExceptMe=Todos os países, exceto %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Principal conta contábil para clientes não definidos na configuração
 MainAccountForSuppliersNotDefined=Conta contábil principal para fornecedores não definidos na configuração
@@ -144,7 +147,7 @@ NotVentilatedinAccount=Não vinculado à conta contabilística
 XLineSuccessfullyBinded=produtos / serviços %s vinculados com êxito a uma conta contábil
 XLineFailedToBeBinded=%s produtos/serviços não foram vinculados a uma conta contabilística
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comece a ordenação da página "Vinculação a efetuar" pelos elementos mais recentes
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comece a ordenação da página "Vinculação efetuada" pelos elementos mais recentes
 
@@ -198,7 +201,8 @@ Docdate=Data
 Docref=Referência
 LabelAccount=Etiqueta de conta
 LabelOperation=Operação de etiqueta
-Sens=Sentido
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Código de rotulação
 Lettering=Lettering
 Codejournal=Diário
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Número da peça
 TransactionNumShort=Núm. de transação
 AccountingCategory=Grupos personalizados
-GroupByAccountAccounting=Agrupar por conta contabilística
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Você pode definir aqui alguns grupos de conta contábil. Eles serão usados ​​para relatórios contábeis personalizados.
 ByAccounts=Por contas
 ByPredefinedAccountGroups=Por grupos predefinidos
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Pagamento não vinculado a nenhum produto / serviço
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Grupo de conta
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consulte aqui a lista de linhas do relatório de despesa
 DescVentilExpenseReportMore=Se você configurar uma conta contábil no tipo de linhas de relatório de despesas, o aplicativo poderá fazer toda a ligação entre suas linhas de relatório de despesas e a conta contábil do seu plano de contas, em apenas um clique com o botão <strong> "%s" </ strong>. Se a conta não foi definida no dicionário de taxas ou se você ainda tiver algumas linhas não vinculadas a nenhuma conta, será necessário fazer uma ligação manual no menu "<strong> %s </ strong>".
 DescVentilDoneExpenseReport=Consulte aqui a lista das linhas de relatórios de despesas e os seus honorários da conta contabilística
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Vincular automaticamente
 AutomaticBindingDone=Vinculação automática efetuada
@@ -293,6 +300,7 @@ Accounted=Contabilizado no ledger
 NotYetAccounted=Ainda não contabilizado no razão
 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
@@ -337,6 +345,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Exportar CSV configurável
 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index b2961d731ca..6db6d8a49dc 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Aparência
 SetupArea=Configuração
 UploadNewTemplate=Carregar novo(s) modelo(s)
 FormToTestFileUploadForm=Formulário para testar o envio de ficheiro (de acordo com a configuração)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Nota: sim, só é eficaz se o <b>módulo %s</b> estiver ativado
 RemoveLock=Remova / renomeie o arquivo <b> %s </b> se existir, para permitir o uso da ferramenta Atualizar / Instalar.
 RestoreLock=Restaure o arquivo <b> %s </b>, apenas com permissão de leitura, para desativar qualquer uso posterior da ferramenta Atualizar / Instalar.
@@ -85,7 +87,6 @@ ShowPreview=Mostrar pré-visualização
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Pré-visualização não disponível
 ThemeCurrentlyActive=Tema atualmente ativo
-CurrentTimeZone=Zona Horária PHP (servidor)
 MySQLTimeZone=Fuso Horário MySQL (base de dados)
 TZHasNoEffect=As datas são armazenadas e retornadas pelo servidor de banco de dados como se fossem mantidas como uma string enviada. O fuso horário só tem efeito ao usar a função UNIX_TIMESTAMP (que não deve ser usada pelo Dolibarr, portanto, o banco de dados TZ não deve ter efeito, mesmo se for alterado depois que os dados forem inseridos).
 Space=Área
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Esta área fornece funções de administração. Use o menu
 Purge=Limpar
 PurgeAreaDesc=Esta página permite excluir todos os arquivos gerados ou armazenados pelo Dolibarr (arquivos temporários ou todos os arquivos no diretório <b> %s </b>). Usar esse recurso normalmente não é necessário. Ele é fornecido como uma solução alternativa para usuários cujo Dolibarr é hospedado por um provedor que não oferece permissões para excluir arquivos gerados pelo servidor da web.
 PurgeDeleteLogFile=Eliminar os ficheiros de registo, incluindo <b>%s</b> definido para o módulo Syslog (não existe risco de perda de dados)
-PurgeDeleteTemporaryFiles=Exclua todos os arquivos temporários (sem risco de perder dados). Nota: A exclusão é feita apenas se o diretório temporário foi criado 24 horas atrás.
-PurgeDeleteTemporaryFilesShort=Eliminar ficheiros temporários
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 PurgeDeleteAllFilesInDocumentsDir=Exclua todos os arquivos do diretório: <b> %s </b>. <br> Isso excluirá todos os documentos gerados relacionados aos elementos (terceiros, faturas etc ...), arquivos carregados no módulo ECM, despejos de backup de banco de dados e arquivos temporários.
 PurgeRunNow=Limpar agora
 PurgeNothingToDelete=Nenhuma diretoria ou ficheiros para eliminar.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Parceiros preferidos
 OtherResources=Outros recursos
 ExternalResources=External Resources
 SocialNetworks=Redes sociais
+SocialNetworkId=Social Network ID
 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>
 HelpCenterDesc1=Aqui estão alguns recursos para obter ajuda e suporte com o Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Exemplos com configuração atual
 ListOfDirectories=Lista de diretórios com modelos OpenDocument
 ListOfDirectoriesForModelGenODT=Lista de diretórios que contêm ficheiros template com formato OpenDocument.<br><br>Digite aqui o caminho completo dos diretórios.<br>Adicione um "Enter" entre cada diratório.<br>Para adicionar um diretório do módulo GCE, adicione aqui <b>DOL_DATA_ROOT/ecm/seudiretorio</b>.<br><br>Ficheiros nesses diretórios têm de acabar com <b>.odt</b> ou <b>.ods</b>.
 NumberOfModelFilesFound=Número de arquivos de modelo ODT / ODS encontrados nesses diretórios
-ExampleOfDirectoriesForModelGen=Exemplos de sintaxe: <br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Para saber como criar os seus modelos de documentos ODT, antes de armazená-los nestes diretórios, leia a documentação no wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Posição do primeiro nome/último nome
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parâmetros para tornar URLs seguros
 SecurityTokenIsUnique=Use um parâmetro securekey único para cada URL
 EnterRefToBuildUrl=Digite a referência para o objeto %s
 GetSecuredUrl=Obter URL seguro
-ButtonHideUnauthorized=Ocultar botões para usuários não administradores para ações não autorizadas, em vez de mostrar botões desativados acinzentados
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Taxa de IVA antiga
 NewVATRates=Nova taxa de IVA
 PriceBaseTypeToChange=Modificar nos preços com valor de referência base definido em
@@ -668,7 +670,7 @@ Module54000Desc=Impressão direta (sem abrir os documentos) usando a interface C
 Module55000Name=Votação ou Questionário
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margens
-Module59000Desc=Módulo para gerir margens
+Module59000Desc=Module to follow margins
 Module60000Name=Comissões
 Module60000Desc=Módulo para gerir comissões
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ YouUseBestDriver=You use driver %s which is the best driver currently available.
 YouDoNotUseBestDriver=Você usa o driver %s, mas o driver %s é recomendado.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Optimização da pesquisa
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 BrowserIsOK=Você está usando o navegador da web %s. Este navegador está ok para segurança e desempenho.
 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.
@@ -1596,8 +1598,13 @@ ServiceSetup=Configuração do módulo "Serviços"
 ProductServiceSetup=Configuração do módulo "Produtos e Serviços"
 NumberOfProductShowInSelect=Número máximo de produtos a serem exibidos nas listas de seleção de combinação (0 = sem limite)
 ViewProductDescInFormAbility=Exibir descrições de produtos em formulários (caso contrário, mostrado em um pop-up de dica)
+DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
+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=Ative no separador "Ficheiros Anexados" do produto/serviço uma opção para unir o documento em PDF ao orçamento em PDF, se o produto/serviço estiver no orçamento
-ViewProductDescInThirdpartyLanguageAbility=Exibir descrições de produtos no idioma do terceiro
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 UseSearchToSelectProductTooltip=Além disso, se você tiver um grande número de produtos (> 100 000), poderá aumentar a velocidade definindo PRODUCT_DONOTSEARCH_ANYWHERE como 1 em Setup-> Other. A pesquisa será limitada ao início da string.
 UseSearchToSelectProduct=Espere até pressionar uma tecla antes de carregar o conteúdo da lista de combinação de produtos (isso pode aumentar o desempenho se você tiver um grande número de produtos, mas for menos conveniente)
 SetDefaultBarcodeTypeProducts=Tipo de código de barras predefinido para produtos
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Menus personalizados não ligados a uma entrada do me
 NewMenu=Novo menu
 MenuHandler=Gestor de menus
 MenuModule=Módulo origem
-HideUnauthorizedMenu= Ocultar menus não autorizados (cinza)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id do menu
 DetailMenuHandler=Gestor de menus onde será exibido o novo menu
 DetailMenuModule=Nome do módulo, no caso da entrada do menu ser resultante de um módulo
@@ -1983,11 +1990,12 @@ EMailHost=Host do servidor IMAP de e-mail
 MailboxSourceDirectory=Diretório de origem da caixa de correio
 MailboxTargetDirectory=Diretório de destino da caixa de correio
 EmailcollectorOperations=Operações para fazer pelo coletor
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Recolher agora
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
 EmailCollectorConfirmCollectTitle=Confirmação de recebimento de email
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Código postal
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang
index 2401d4caf2a..93df84b3707 100644
--- a/htdocs/langs/pt_PT/banks.lang
+++ b/htdocs/langs/pt_PT/banks.lang
@@ -173,10 +173,11 @@ SEPAMandate=Mandato SEPA
 YourSEPAMandate=Seu mandato SEPA
 FindYourSEPAMandate=Este é o seu mandato da SEPA para autorizar a nossa empresa a efetuar um pedido de débito direto ao seu banco. Devolva-o assinado (digitalização do documento assinado) ou envie-o por correio para
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index 9489ccfabda..ce7dadc46fc 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -6,11 +6,11 @@ BillsCustomer=Fatura a cliente
 BillsSuppliers=Faturas do fornecedor
 BillsCustomersUnpaid=Faturas a receber de clientes
 BillsCustomersUnpaidForCompany=Faturas a clientes não pagas para %s
-BillsSuppliersUnpaid=Unpaid vendor invoices
-BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+BillsSuppliersUnpaid=Faturas de fornecedores não pagas
+BillsSuppliersUnpaidForCompany=Faturas de fornecedores não pagas para %s
 BillsLate=Pagamentos em atraso
 BillsStatistics=Estatísticas das faturas a clientes
-BillsStatisticsSuppliers=Vendors invoices statistics
+BillsStatisticsSuppliers=Estatísticas de faturas de fornecedores
 DisabledBecauseDispatchedInBookkeeping=Desativado porque a fatura foi enviada para a contabilidade
 DisabledBecauseNotLastInvoice=Desativado porque a fatura não pode ser apagada. Algumas faturas foram registradas após esta e irão criar furos no contador.
 DisabledBecauseNotErasable=Desativar porque não pode ser eliminado
@@ -25,10 +25,10 @@ InvoiceProFormaAsk=Fatura Pró-Forma
 InvoiceProFormaDesc=A <b>Fatura Pró-Forma</b> é uma imagem de uma fatura, mas não tem valor contabilístico.
 InvoiceReplacement=Fatura de Substituição
 InvoiceReplacementAsk=Fatura de Substituição para a Fatura
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc= <b> Fatura de substituição </b> é usada para substituir completamente uma fatura sem pagamento já recebido. <br> <br> Nota: Apenas as faturas sem pagamento podem ser substituídas. Se a fatura que você substituiu ainda não foi fechada, ela será automaticamente encerrada como 'abandonada'.
 InvoiceAvoir=Nota de Crédito
 InvoiceAvoirAsk=Nota de crédito para corrigir a fatura
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
+InvoiceAvoirDesc=A nota de crédito <b> </b> é uma fatura negativa usada para corrigir o fato de que uma fatura mostra um valor diferente do valor efetivamente pago (por exemplo, o cliente pagou muito por engano ou não pagará o valor completo porque alguns produtos foram devolvidos) .
 invoiceAvoirWithLines=Criar Nota de Crédito com as linhas da fatura de origem
 invoiceAvoirWithPaymentRestAmount=Criar nota de crédito com fatura não paga de origem
 invoiceAvoirLineWithPaymentRestAmount=Nota de crédito para o restante valor não pago
@@ -41,7 +41,7 @@ CorrectionInvoice=Correção da Fatura
 UsedByInvoice=Utilizado para pagar a fatura %s
 ConsumedBy=Consumida por
 NotConsumed=Não consumiu
-NoReplacableInvoice=No replaceable invoices
+NoReplacableInvoice=Sem faturas substituíveis
 NoInvoiceToCorrect=Nenhuma Fatura para corrigir
 InvoiceHasAvoir=Era fonte de uma ou várias notas de crédito
 CardBill=Ficha da Fatura
@@ -54,23 +54,23 @@ InvoiceCustomer=Fatura a cliente
 CustomerInvoice=Fatura a cliente
 CustomersInvoices=Faturas a clientes
 SupplierInvoice=Fatura de fornecedor
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Faturas de fornecedores
 SupplierBill=Fatura de fornecedor
 SupplierBills=faturas de fornecedores
 Payment=Pagamento
-PaymentBack=Refund
+PaymentBack=Restituição
 CustomerInvoicePaymentBack=Refund
 Payments=Pagamentos
-PaymentsBack=Refunds
+PaymentsBack=Reembolsos
 paymentInInvoiceCurrency=na moeda das faturas
 PaidBack=Reembolsada
 DeletePayment=Eliminar pagamento
 ConfirmDeletePayment=Tem a certeza que deseja eliminar este pagamento?
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
+ConfirmConvertToReduc=Deseja converter este %s em um crédito disponível?
 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
+SupplierPayments=Pagamentos a fornecedores
 ReceivedPayments=Pagamentos recebidos
 ReceivedCustomersPayments=Pagamentos recebidos dos clientes
 PayedSuppliersPayments=Payments paid to vendors
@@ -78,9 +78,9 @@ ReceivedCustomersPaymentsToValid=Pagamentos recebidos dos clientes para validar
 PaymentsReportsForYear=Relatórios de pagamentos para %s
 PaymentsReports=Relatórios de pagamentos
 PaymentsAlreadyDone=Pagamentos já efetuados
-PaymentsBackAlreadyDone=Refunds already done
+PaymentsBackAlreadyDone=Reembolsos já feitos
 PaymentRule=Estado do Pagamento
-PaymentMode=Payment Type
+PaymentMode=Tipo de pagamento
 PaymentTypeDC=Cartão de débito/crédito
 PaymentTypePP=PayPal
 IdPaymentMode=Payment Type (id)
@@ -88,8 +88,8 @@ CodePaymentMode=Payment Type (code)
 LabelPaymentMode=Payment Type (label)
 PaymentModeShort=Payment Type
 PaymentTerm=Payment Term
-PaymentConditions=Payment Terms
-PaymentConditionsShort=Payment Terms
+PaymentConditions=Termos de pagamento
+PaymentConditionsShort=Termos de pagamento
 PaymentAmount=Montante a Pagar
 PaymentHigherThanReminderToPay=Pagamento superior ao valor a pagar
 HelpPaymentHigherThanReminderToPay=Atenção, o valor do pagamento de uma ou mais contas é maior do que o valor pendente a pagar. <br> Edite sua entrada, caso contrário, confirme e considere a criação de uma nota de crédito para o excesso recebido para cada fatura paga em excesso.
@@ -106,7 +106,7 @@ AddBill=Criar fatura ou nota de crédito
 AddToDraftInvoices=Adicionar à fatura rascunho
 DeleteBill=Eliminar fatura
 SearchACustomerInvoice=Procurar por uma fatura a cliente
-SearchASupplierInvoice=Search for a vendor invoice
+SearchASupplierInvoice=Pesquise uma fatura de fornecedor
 CancelBill=Cancelar uma fatura
 SendRemindByMail=Enviar um lembrete por E-Mail
 DoPayment=Inserir pagamento
@@ -145,17 +145,17 @@ BillShortStatusClosedUnpaid=Fechada por pagar
 BillShortStatusClosedPaidPartially=Paga (parcialmente)
 PaymentStatusToValidShort=Por validar
 ErrorVATIntraNotConfigured=Número de IVA intracomunitário ainda não definido
-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
+ErrorNoPaiementModeConfigured=Nenhum tipo de pagamento padrão definido. Vá para a configuração do módulo de fatura para corrigir isso.
+ErrorCreateBankAccount=Crie uma conta bancária e vá para o painel Configuração do módulo Fatura para definir os tipos de pagamento
 ErrorBillNotFound=Fatura %s inexistente
 ErrorInvoiceAlreadyReplaced=Erro, você tentou validar uma fatura para substituir a fatura %s. Mas este já foi substituído pela nota fiscal %s.
 ErrorDiscountAlreadyUsed=Erro, a remessa está já assignada
 ErrorInvoiceAvoirMustBeNegative=Erro, uma fatura deste tipo deve ter um montante negativo
-ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
+ErrorInvoiceOfThisTypeMustBePositive=Erro, este tipo de fatura deve ter um valor sem imposto positivo (ou nulo)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Erro, não pode cancelar uma fatura que tenha sido substituída por uma outra fatura e que se encontra ainda em rascunho
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Essa parte ou outra já é usada para que as séries de descontos não possam ser removidas.
 BillFrom=Emissor
-BillTo=Enviar a
+BillTo=Cliente
 ActionsOnBill=Ações sobre a fatura
 RecurringInvoiceTemplate=Fatura de modelo / recorrente
 NoQualifiedRecurringInvoiceTemplateFound=Nenhuma fatura de modelo recorrente qualificada para geração.
@@ -167,13 +167,13 @@ LatestTemplateInvoices=Últimas facturas modelo %s
 LatestCustomerTemplateInvoices=Últimas facturas de modelo de cliente %s
 LatestSupplierTemplateInvoices=Latest %s vendor template invoices
 LastCustomersBills=Últimas %s faturas a clientes
-LastSuppliersBills=Latest %s vendor invoices
+LastSuppliersBills=Faturas de fornecedor %s mais recentes
 AllBills=Todas as faturas
 AllCustomerTemplateInvoices=Todas as faturas modelo
 OtherBills=Outras faturas
 DraftBills=Faturas rascunho
 CustomersDraftInvoices=Faturas provisórias a cliente
-SuppliersDraftInvoices=Vendor draft invoices
+SuppliersDraftInvoices=Rascunho de faturas de fornecedor
 Unpaid=Pendentes
 ErrorNoPaymentDefined=Error No payment defined
 ConfirmDeleteBill=Tem a certeza que deseja eliminar esta fatura?
@@ -183,7 +183,7 @@ ConfirmClassifyPaidBill=Tem a certeza que pretende alterar a fatura <b>%s</b> pa
 ConfirmCancelBill=Tem a certeza que pretende cancelar a fatura <b>%s</b>?
 ConfirmCancelBillQuestion=Porque é que pretende classificar esta fatura como 'abandonada'?
 ConfirmClassifyPaidPartially=Tem a certeza que pretende alterar a fatura <b>%s</b> para o estado de paga?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
+ConfirmClassifyPaidPartiallyQuestion=Esta fatura não foi totalmente paga. Qual o motivo do fechamento desta fatura?
 ConfirmClassifyPaidPartiallyReasonAvoir=O restante <b> (%s %s) </ b> é um desconto concedido porque o pagamento foi feito antes do prazo. Regularizo o IVA com uma nota de crédito.
 ConfirmClassifyPaidPartiallyReasonDiscount=O restante <b> (%s %s) </ b> é um desconto concedido porque o pagamento foi feito antes do prazo.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=O restante <b> (%s %s) </ b> é um desconto concedido porque o pagamento foi feito antes do prazo. Aceito perder o IVA sobre esse desconto.
@@ -257,11 +257,11 @@ DateInvoice=Data da fatura
 DatePointOfTax=Ponto de imposto
 NoInvoice=Nenhuma fatura
 ClassifyBill=Classificar a fatura
-SupplierBillsToPay=Unpaid vendor invoices
+SupplierBillsToPay=Faturas de fornecedores não pagas
 CustomerBillsUnpaid=Faturas a receber de clientes
 NonPercuRecuperable=Não recuperável
-SetConditions=Set Payment Terms
-SetMode=Set Payment Type
+SetConditions=Definir termos de pagamento
+SetMode=Definir Tipo de Pagamento
 SetRevenuStamp=Definir selo fiscal
 Billed=Faturado
 RecurringInvoices=Faturas recorrentes
@@ -278,9 +278,9 @@ ExportDataset_invoice_1=Faturas de clientes e detalhes da fatura
 ExportDataset_invoice_2=Faturas a clientes e pagamentos
 ProformaBill=Fatura pró-forma:
 Reduction=Redução
-ReductionShort=Disc.
+ReductionShort=Disco.
 Reductions=Descontos
-ReductionsShort=Disc.
+ReductionsShort=Disco.
 Discounts=Descontos
 AddDiscount=Adicionar Desconto
 AddRelativeDiscount=Criar desconto relativo
@@ -289,7 +289,7 @@ AddGlobalDiscount=Criar desconto fixo
 EditGlobalDiscounts=Editar descontos fixos
 AddCreditNote=Criar nota de crédito
 ShowDiscount=Ver o deposito
-ShowReduc=Show the discount
+ShowReduc=Mostre o desconto
 ShowSourceInvoice=Show the source invoice
 RelativeDiscount=Desconto relativo
 GlobalDiscount=Desconto fixo
@@ -337,12 +337,12 @@ WatermarkOnDraftBill=Marca de agua em faturas rascunho (nada sem está vazia)
 InvoiceNotChecked=Nenhuma fatura selecionada
 ConfirmCloneInvoice=Tem a certeza que pretende clonar esta fatura <b>%s</b>?
 DisabledBecauseReplacedInvoice=Ação desativada porque a fatura foi substituída
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
+DescTaxAndDividendsArea=Esta área apresenta um resumo de todos os pagamentos feitos para despesas especiais. Somente registros com pagamentos durante o ano fixo são incluídos aqui.
 NbOfPayments=N.ª de pagamentos
 SplitDiscount=Dividido em duas desconto
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
+ConfirmSplitDiscount=Tem certeza de que deseja dividir este desconto de <b> %s </b> %s em dois descontos menores?
 TypeAmountOfEachNewDiscount=Quantidade de entrada para cada uma das duas partes:
-TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
+TotalOfTwoDiscountMustEqualsOriginal=O total dos dois novos descontos deve ser igual ao valor do desconto original.
 ConfirmRemoveDiscount=Tem certeza que deseja remover este desconto?
 RelatedBill=Fatura relacionada
 RelatedBills=Faturas relacionadas
@@ -410,7 +410,7 @@ PaymentConditionShort14D=14 dias
 PaymentCondition14D=14 dias
 PaymentConditionShort14DENDMONTH=14 dias do final do mês
 PaymentCondition14DENDMONTH=Dentro de 14 dias após o final do mês
-FixAmount=Fixed amount - 1 line with label '%s'
+FixAmount=Quantidade fixa - 1 linha com rótulo '%s'
 VarAmount=Quantidade variável (%% total.)
 VarAmountOneLine=Quantidade variável (%% tot.) - 1 linha com o rótulo '%s'
 VarAmountAllLines=Variable amount (%% tot.) - all same lines
@@ -435,16 +435,16 @@ PaymentTypeFAC=Fator
 PaymentTypeShortFAC=Fator
 BankDetails=Dados bancários
 BankCode=Código banco
-DeskCode=Branch code
+DeskCode=Código da Agência
 BankAccountNumber=Número conta
 BankAccountNumberKey=Checksum
 Residence=Direcção
-IBANNumber=IBAN account number
+IBANNumber=Número da conta IBAN
 IBAN=IBAN
 CustomerIBAN=IBAN of customer
 SupplierIBAN=IBAN of vendor
 BIC=BIC/SWIFT
-BICNumber=BIC/SWIFT code
+BICNumber=Código BIC / SWIFT
 ExtraInfos=Informações complementarias
 RegulatedOn=Regulado em
 ChequeNumber=Cheque nº
@@ -458,11 +458,11 @@ PhoneNumber=Tel.
 FullPhoneNumber=telefone
 TeleFax=Fax
 PrettyLittleSentence=Aceito o pagamento mediante cheques a meu nome dos valores em divida, na qualidade de membro de uma empresa autorizada por a Administração Fiscal.
-IntracommunityVATNumber=Intra-Community VAT ID
-PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
-PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
+IntracommunityVATNumber=ID de IVA intracomunitário
+PaymentByChequeOrderedTo=Os pagamentos em cheque (incluindo impostos) devem ser pagos a %s, enviar para
+PaymentByChequeOrderedToShort=Pagamentos de cheques (incluindo impostos) devem ser pagos a
 SendTo=- Enviando Para
-PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
+PaymentByTransferOnThisBankAccount=Pagamento por transferência para a seguinte conta bancária
 VATIsNotUsedForInvoice=* IVA não aplicável  art-293B do CGI
 LawApplicationPart1=Por aplicação da lei 80.335 de 12/05/80
 LawApplicationPart2=As mercadorias permanecem em propriedade de
@@ -473,18 +473,18 @@ UseLine=Aplicar
 UseDiscount=Aplicar Desconto
 UseCredit=Uso de crédito
 UseCreditNoteInInvoicePayment=Reduzir o pagamento com este deposito
-MenuChequeDeposits=Check Deposits
+MenuChequeDeposits=Depósitos de cheques
 MenuCheques=Gestão cheques
-MenuChequesReceipts=Check receipts
+MenuChequesReceipts=Verifique os recibos
 NewChequeDeposit=Novo deposito
-ChequesReceipts=Check receipts
-ChequesArea=Check deposits area
-ChequeDeposits=Check deposits
+ChequesReceipts=Verifique os recibos
+ChequesArea=Área de depósitos de cheques
+ChequeDeposits=Depósitos de cheques
 Cheques=Cheques
 DepositId=Depósito de identificação
 NbCheque=Número de cheques
 CreditNoteConvertedIntoDiscount=Esta nota de crédito %s, foi convertida no desconto %s
-UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third-party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=Use o contato / endereço com o tipo 'contato para cobrança' em vez do endereço de terceiros como destinatário das faturas
 ShowUnpaidAll=Mostrar todas as faturas não pagas
 ShowUnpaidLateOnly=Mostrar apenas faturas atrasadas não pagas
 PaymentInvoiceRef=Pagamento da fatura %s
@@ -497,19 +497,19 @@ CantRemovePaymentWithOneInvoicePaid=Não é possível remover o pagamento, uma v
 ExpectedToPay=Pagamento esperado
 CantRemoveConciliatedPayment=Não é possível remover o pagamento reconciliado
 PayedByThisPayment=Pago por esse pagamento
-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.
+ClosePaidInvoicesAutomatically=Classifica automaticamente todas as faturas padrão, de adiantamento ou de substituição como "Pagas" quando o pagamento é feito inteiramente.
+ClosePaidCreditNotesAutomatically=Classifica automaticamente todas as notas de crédito como "Pagas" quando o reembolso é feito totalmente.
 ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
-AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
+AllCompletelyPayedInvoiceWillBeClosed=Todas as faturas sem sobras a pagar serão automaticamente encerradas com o status "Pago".
 ToMakePayment=Pagar
 ToMakePaymentBack=Reembolsar
 ListOfYourUnpaidInvoices=Lista de faturas não pagas
 NoteListOfYourUnpaidInvoices=Nota: Esta lista apenas contém fatura de terceiros dos quais você está definido como representante de vendas.
-RevenueStamp=Tax stamp
+RevenueStamp=Selo fiscal
 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=Você precisa criar uma fatura padrão primeiro e convertê-la em "modelo" para criar uma nova fatura modelo
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription=Fatura PDF template Crabe. Um modelo de fatura completo (implementação antiga do modelo Sponge)
 PDFSpongeDescription=Modelo PDF da fatura Esponja. Um modelo de fatura completo
 PDFCrevetteDescription=Modelo PDF da fatura Crevette. Um modelo de fatura completo para faturas de situação
 TerreNumRefModelDesc1=Devolve o número com o formato %syymm-nnnn para facturas standard e %syymm-nnnn para notas de crédito em que yy é ano, mm é mês e nnnn é uma sequência sem pausa e sem retorno a 0
@@ -523,14 +523,15 @@ TypeContact_facture_internal_SALESREPFOLL=Representante que dá seguimento à fa
 TypeContact_facture_external_BILLING=Contacto na fatura do cliente
 TypeContact_facture_external_SHIPPING=Contacto com o transporte do cliente
 TypeContact_facture_external_SERVICE=Contactar o serviço ao cliente
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Fatura de fornecedor de acompanhamento representativo
 TypeContact_invoice_supplier_external_BILLING=Contacto da fatura do fornecedor
 TypeContact_invoice_supplier_external_SHIPPING=Contacto da expedição do fornecedor
-TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
+TypeContact_invoice_supplier_external_SERVICE=Contato de serviço do fornecedor
 # Situation invoices
 InvoiceFirstSituationAsk=Fatura da primeira situação
 InvoiceFirstSituationDesc=As <b> faturas de situação </ b> estão vinculadas a situações relacionadas a uma progressão, por exemplo, a progressão de uma construção. Cada situação está vinculada a uma fatura.
 InvoiceSituation=Fatura de situação
+PDFInvoiceSituation=Fatura de situação
 InvoiceSituationAsk=Fatura seguindo a situação
 InvoiceSituationDesc=Crie uma nova situação seguindo uma já existente
 SituationAmount=Valor da fatura da situação (líquida)
@@ -575,3 +576,7 @@ 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 %%
diff --git a/htdocs/langs/pt_PT/blockedlog.lang b/htdocs/langs/pt_PT/blockedlog.lang
index d50a1d77f48..798b7e6a075 100644
--- a/htdocs/langs/pt_PT/blockedlog.lang
+++ b/htdocs/langs/pt_PT/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Exclusão lógica de doação
 logMEMBER_SUBSCRIPTION_CREATE=Inscrição de membro criada
 logMEMBER_SUBSCRIPTION_MODIFY=Inscrição de membro modificada
 logMEMBER_SUBSCRIPTION_DELETE=Exclusão lógica de assinatura de membro
-logCASHCONTROL_VALIDATE=Cash fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Download da fatura do cliente
 BlockedLogBillPreview=Pré-visualização da fatura do cliente
 BlockedlogInfoDialog=Detalhes do log
diff --git a/htdocs/langs/pt_PT/boxes.lang b/htdocs/langs/pt_PT/boxes.lang
index bfe70c39c7e..494becf8c75 100644
--- a/htdocs/langs/pt_PT/boxes.lang
+++ b/htdocs/langs/pt_PT/boxes.lang
@@ -1,18 +1,18 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxLoginInformation=Login Information
-BoxLastRssInfos=RSS Information
-BoxLastProducts=Latest %s Products/Services
+BoxLastRssInfos=Informação RSS
+BoxLastProducts=Produtos / serviços %s mais recentes
 BoxProductsAlertStock=Alertas de stock para produtos
 BoxLastProductsInContract=Os %s últimos produtos/serviços contratados
-BoxLastSupplierBills=Latest Vendor invoices
-BoxLastCustomerBills=Latest Customer invoices
+BoxLastSupplierBills=Últimas faturas do fornecedor
+BoxLastCustomerBills=Últimas faturas do cliente
 BoxOldestUnpaidCustomerBills=Faturas a clientes não pagas mais antigas
-BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
+BoxOldestUnpaidSupplierBills=Faturas de fornecedores não pagas mais antigas
 BoxLastProposals=Últimos orçamentos
 BoxLastProspects=Últimas prospeções modificadas
 BoxLastCustomers=Últimos clientes modificados
 BoxLastSuppliers=Últimos fornecedores modificados
-BoxLastCustomerOrders=Latest sales orders
+BoxLastCustomerOrders=Últimos pedidos de venda
 BoxLastActions=Últimas ações
 BoxLastContracts=Últimos contratos
 BoxLastContacts=Últimos contactos/endereços
@@ -21,23 +21,23 @@ BoxFicheInter=Últimas intervenções
 BoxCurrentAccounts=Saldo de abertura das contas
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
 BoxTitleLastRssInfos=Últimas %s notícias de %s
-BoxTitleLastProducts=Products/Services: last %s modified
+BoxTitleLastProducts=Produtos / serviços: último %s modificado
 BoxTitleProductsAlertStock=Produtos: alerta de stock
 BoxTitleLastSuppliers=Últimos %s fornecedores registados
-BoxTitleLastModifiedSuppliers=Vendors: last %s modified
-BoxTitleLastModifiedCustomers=Customers: last %s modified
+BoxTitleLastModifiedSuppliers=Fornecedores: última modificação %s
+BoxTitleLastModifiedCustomers=Clientes: última modificação %s
 BoxTitleLastCustomersOrProspects=Últimos %s clientes ou prospeções
-BoxTitleLastCustomerBills=Latest %s modified Customer invoices
-BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
-BoxTitleLastModifiedProspects=Prospects: last %s modified
+BoxTitleLastCustomerBills=Faturas do cliente modificadas %s mais recentes
+BoxTitleLastSupplierBills=Faturas de fornecedor modificadas %s mais recentes
+BoxTitleLastModifiedProspects=Perspectivas: última modificação %s
 BoxTitleLastModifiedMembers=Últimos %s membros
 BoxTitleLastFicheInter=Últimas %s intervenções modificadas 
-BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
-BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
+BoxTitleOldestUnpaidCustomerBills=Faturas do cliente: %s mais antiga não paga
+BoxTitleOldestUnpaidSupplierBills=Faturas do fornecedor: %s mais antigo não pago
 BoxTitleCurrentAccounts=Contas em aberto: saldos
 BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
-BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
-BoxMyLastBookmarks=Bookmarks: latest %s
+BoxTitleLastModifiedContacts=Contatos / endereços: último %s modificado
+BoxMyLastBookmarks=Marcadores: último %s
 BoxOldestExpiredServices=Mais antigos ativos de serviços vencidos
 BoxLastExpiredServices=Últimos %s contactos mais antigos com serviços ativos expirados
 BoxTitleLastActionsToDo=Últimas %s ações a fazer
@@ -46,36 +46,39 @@ BoxTitleLastModifiedDonations=Últimos %s donativos modificados
 BoxTitleLastModifiedExpenses=Últimos %s relatórios de despesas modificados
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Atividade global (faturas, orçamentos, encomendas)
 BoxGoodCustomers=Bons clientes
 BoxTitleGoodCustomers=%s bons clientes
-FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
+BoxScheduledJobs=Trabalhos agendadas
+BoxTitleFunnelOfProspection=Lead funnel
+FailedToRefreshDataInfoNotUpToDate=Falha ao atualizar o fluxo RSS. Data da última atualização bem-sucedida: %s
 LastRefreshDate=Última data de atualização
 NoRecordedBookmarks=Não existem marcadores definidos.
 ClickToAdd=Clique aqui para adicionar.
 NoRecordedCustomers=Nenhum cliente registado
 NoRecordedContacts=Nenhum contacto registado
 NoActionsToDo=Sem ações a realizar
-NoRecordedOrders=No recorded sales orders
+NoRecordedOrders=Nenhum pedido de venda registrado
 NoRecordedProposals=Sem orçamentos registados
 NoRecordedInvoices=Nenhuma fatura a cliente registada
 NoUnpaidCustomerBills=Nenhuma fatura a clientes pendente de pagamento
-NoUnpaidSupplierBills=No unpaid vendor invoices
-NoModifiedSupplierBills=No recorded vendor invoices
+NoUnpaidSupplierBills=Sem faturas de fornecedores não pagas
+NoModifiedSupplierBills=Nenhuma fatura de fornecedor registrada
 NoRecordedProducts=Nenhum produto/serviço registado
 NoRecordedProspects=Nenhuma prospecção registada
 NoContractedProducts=Não contractados produtos / serviços
 NoRecordedContracts=Sem contratos registrados
 NoRecordedInterventions=Nenhuma intervenção registada
-BoxLatestSupplierOrders=Latest purchase orders
+BoxLatestSupplierOrders=Últimos pedidos de compra
 BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
-NoSupplierOrder=No recorded purchase order
+NoSupplierOrder=Nenhum pedido de compra registrado
 BoxCustomersInvoicesPerMonth=Customer Invoices per month
 BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
 BoxCustomersOrdersPerMonth=Sales Orders per month
 BoxSuppliersOrdersPerMonth=Vendor Orders per month
 BoxProposalsPerMonth=Orçamentos por mês
-NoTooLowStockProducts=No products are under the low stock limit
+NoTooLowStockProducts=Nenhum produto está abaixo do limite mínimo de estoque
 BoxProductDistribution=Products/Services Distribution
 ForObject=On %s
 BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
@@ -92,8 +95,8 @@ LastXMonthRolling=Balanço dos últimos %s meses
 ChooseBoxToAdd=Adicionar widget ao painel de controlo
 BoxAdded=O Widget foi adicionado ao seu painel
 BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Contabilidade
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/pt_PT/cashdesk.lang b/htdocs/langs/pt_PT/cashdesk.lang
index d1dba40375b..4c30714cba3 100644
--- a/htdocs/langs/pt_PT/cashdesk.lang
+++ b/htdocs/langs/pt_PT/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nº de faturas
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/pt_PT/categories.lang b/htdocs/langs/pt_PT/categories.lang
index bd0e39a4308..57c37b4515a 100644
--- a/htdocs/langs/pt_PT/categories.lang
+++ b/htdocs/langs/pt_PT/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Área de etiquetas/categorias de projetos
 UsersCategoriesArea=Users tags/categories area
 SubCats=Subcategorias
 CatList=Lista de etiquetas/categorias
+CatListAll=List of tags/categories (all types)
 NewCategory=Nova etiqueta/categoria
 ModifCat=Modificar etiqueta/categoria
 CatCreated=Etiqueta/categoria criada
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=ID de etiqueta/categoria
-CatSupList=Lista de tags / categorias de fornecedores
-CatCusList=Lista de etiquetas/categorias de clientes/prospecções
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Lista de etiquetas/categorias de produtos
 CatMemberList=Lista de etiquetas/categorias de membros
-CatContactList=Lista de etiquetas/categorias de contactos
-CatSupLinks=Ligações entre fornecedores e etiquetas/categorias
+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=Ligações entre clientes/prospecções e etiquetas/categorias
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Ligações entre produtos/serviços e etiquetas/categorias
-CatProJectLinks=Ligações entre os projetos e etiquetas/categorias
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Ligações entre os projetos e etiquetas/categorias
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Remover das etiquetas/categoria
 ExtraFieldsCategories=Atributos Complementares
 CategoriesSetup=Configuração de etiquetas/categorias
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index 0c75b753e4c..6e9e1163487 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Verifique o ID do IVA intracomunitário no site da Com
 VATIntraManualCheck=Você também pode verificar manualmente no site da Comissão Europeia <a href="%s" target="_blank"> %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=Tipo de Entidade Legal
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Funcionários
 ProspectLevelShort=Cli. Potenc.
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index 429e6922009..03ccdc3308f 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -11,7 +11,7 @@ FeatureIsSupportedInInOutModeOnly=Função disponível somente ao modo contas CR
 VATReportBuildWithOptionDefinedInModule=Montantes apresentados aqui são calculadas usando as regras definidas pelo Imposto de configuração do módulo.
 LTReportBuildWithOptionDefinedInModule=Os valores mostrados aqui são calculados usando regras definidas pela configuração da empresa.
 Param=Parametrização
-RemainingAmountPayment=Amount payment remaining:
+RemainingAmountPayment=Valor do pagamento restante:
 Account=Conta
 Accountparent=Conta pai
 Accountsparent=Contas pai
@@ -111,9 +111,9 @@ Refund=Reembolso
 SocialContributionsPayments=Pagamentos de impostos sociais/fiscais
 ShowVatPayment=Ver Pagamentos IVA
 TotalToPay=Total a Pagar
-BalanceVisibilityDependsOnSortAndFilters=O saldo é visível nesta lista apenas se a tabela estiver classificada como ascendente no %s e filtrada para uma conta bancária
+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=Código de contabilidade do cliente
-SupplierAccountancyCode=Vendor accounting code
+SupplierAccountancyCode=Código de contabilidade do fornecedor
 CustomerAccountancyCodeShort=Cust. conta. código
 SupplierAccountancyCodeShort=Sup. conta. código
 AccountNumber=Número de conta
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Tem certeza de que deseja eliminar este pagament
 ExportDataset_tax_1=Impostos e pagamentos sociais e fiscais
 CalcModeVATDebt=Modo <b> %sVAT no compromisso accounting%s </ b>.
 CalcModeVATEngagement=Modo <b> %sVAT em rendimentos-expenses%s </ b>.
-CalcModeDebt=Análise de faturas registradas, mesmo que ainda não estejam contabilizadas no razão.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Análise de pagamentos registrados conhecidos, mesmo que eles ainda não sejam contabilizados no Ledger.
 CalcModeBookkeeping=Análise de dados com periodicidade na tabela Ledger de contabilidade.
 CalcModeLT1= Modo <b> %sRE nas faturas do cliente - fornecedores invoices%s </ b>
@@ -154,11 +154,11 @@ AnnualSummaryInputOutputMode=Balanço da receita e despesas, resumo anual
 AnnualByCompanies=Saldo de receitas e despesas, por grupos predefinidos de conta
 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> disse <b> contabilidade de caixa </ b>.
-SeeReportInInputOutputMode=Consulte %sanálise de payments%s para um cálculo de pagamentos reais efetuados, mesmo que eles ainda não tenham sido contabilizados no Ledger.
-SeeReportInDueDebtMode=Consulte %sanálise de invoices%s para um cálculo baseado em faturas registradas conhecidas, mesmo que elas ainda não tenham sido contabilizadas no Ledger.
-SeeReportInBookkeepingMode=Consulte <b> %sRelatório de reservas%s </ b> para um cálculo na <b> tabela Razão da contabilidade </ 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=- Os montantes exibidos contêm todas as taxas incluídas
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
+RulesResultDue=- 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.
 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>
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Ele mostra um registro em seu livro contábil
 SeePageForSetup=Veja o menu <a href="%s"> %s </a> para configuração
 DepositsAreNotIncluded=- As faturas de adiantamento não estão incluídas
 DepositsAreIncluded=- As faturas de adiantamento estão incluídas
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Denunciar imposto 2 por terceiros
 LT2ReportByCustomers=Denunciar imposto 3 por terceiros
 LT1ReportByCustomersES=Relatório de terceiros RE
 LT2ReportByCustomersES=Relatório de terceiros IRPF
 VATReport=Relatório fiscal de venda
 VATReportByPeriods=Relatório fiscal de vendas por período
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Relatório fiscal de venda por taxas
 VATReportByThirdParties=Relatório fiscal de vendas de terceiros
 VATReportByCustomers=Relatório fiscal de venda por cliente
diff --git a/htdocs/langs/pt_PT/cron.lang b/htdocs/langs/pt_PT/cron.lang
index 4f3f47748fe..d6f7062e193 100644
--- a/htdocs/langs/pt_PT/cron.lang
+++ b/htdocs/langs/pt_PT/cron.lang
@@ -1,19 +1,20 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Ler trabalho 'Agendado'
-Permission23102 = Criar/atualizar trabalho agendado
-Permission23103 = Eliminar trabalho agendado
-Permission23104 = Executar Trabalho Agendado
+Permission23101 = Ler tarefa 'Agendada'
+Permission23102 = Criar/atualizar tarefa 'Agendada'
+Permission23103 = Eliminar tarefa 'Agendada'
+Permission23104 = Executar tarefa 'Agendada'
 # Admin
-CronSetup= Configuração da gestão de tarefas agendadas
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
-KeyForCronAccess=Security key for URL to launch cron jobs
+CronSetup=Configuração da gestão de tarefas agendadas
+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=Código de segurança para URL para iniciar tarefas qualificadas
 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 environement you can use Scheduled task tools 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
@@ -22,12 +23,12 @@ EnabledAndDisabled=Ativado e desativado
 CronLastOutput=Latest run output
 CronLastResult=Latest result code
 CronCommand=Comando
-CronList=Tarefas agendadas
-CronDelete=Delete scheduled jobs
-CronConfirmDelete=Tem certeza de que deseja eliminar estes trabalhos agendados?
-CronExecute=Launch scheduled job
-CronConfirmExecute=Tem certeza de que deseja executar esses trabalhos agendados agora?
-CronInfo=Módulo de trabalhos agendados permite agendar trabalhos para executá-los automaticamente. Os trabalhos também podem ser iniciados manualmente.
+CronList=Trabalhos agendadas
+CronDelete=Eliminar tarefas agendadas
+CronConfirmDelete=Tem a certeza que deseja eliminar estas tarefas agendadas?
+CronExecute=Iniciar tarefa agendada
+CronConfirmExecute=Tem a certeza de que deseja executar agora estas tarefas agendadas?
+CronInfo=O módulo de tarefas agendadas permite agendar tarefas para executá-las automaticamente. As tarefas também podem ser iniciadas manualmente.
 CronTask=Tarefa
 CronNone=Nenhuma
 CronDtStart=Não antes
@@ -39,16 +40,17 @@ CronFrequency=Frequência
 CronClass=Classe
 CronMethod=Método
 CronModule=Módulo
-CronNoJobs=Nenhumas tarefas registadas
+CronNoJobs=Sem tarefas registadas
 CronPriority=Prioridade
 CronLabel=Etiqueta
-CronNbRun=N.º de Execução
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Cada
-JobFinished=Terafa lançada e concluída
+JobFinished=Tarefa iniciada e concluída
+Scheduled=Scheduled
 #Page card
 CronAdd= Adicionar tarefas
-CronEvery=Executar cada trabalho
+CronEvery=Executar cada tarefa
 CronObject=Instância/Objeto para criar
 CronArgs=Parâmetros
 CronSaveSucess=Guardado com sucesso
@@ -56,28 +58,34 @@ CronNote=Comentário
 CronFieldMandatory=Os campos %s são obrigatórios
 CronErrEndDateStartDt=A data de fim não pode ser anterior à data de início
 StatusAtInstall=Estado da instalação do módulo
-CronStatusActiveBtn=Ativar
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Desativar
-CronTaskInactive=Esta tarefa está desactivada
+CronTaskInactive=Esta tarefa está desativada
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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
+CronCreateJob=Criar nova 'Tarefa Agendada'
 CronFrom=De
 # Info
 # Common
-CronType=Tipo de trabalho
+CronType=Tipo de tarefa
 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+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/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index 1750e06b3f6..57f8d93ee48 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Nenhum erro
 # Errors
 ErrorButCommitIsDone=Erros encontrados, mas a validação foi efetuada apesar disso
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=O url %s está errado
 ErrorBadValueForParamNotAString=Valor ruim para o seu parâmetro. Acrescenta geralmente quando falta a tradução.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=O login %s já existe.
 ErrorGroupAlreadyExists=O grupo %s já existe.
 ErrorRecordNotFound=Registo não foi encontrado.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Não se indicaram alguns campos obrigatórios
 ErrorSubjectIsRequired=O tópico do email é obrigatório
 ErrorFailedToCreateDir=Erro na criação de uma pasta. Verifique se o usuário do servidor Web tem acesso de escrita aos documentos Dolibarr. Se o parâmetro <b> safe_mode </ b> está ativo no PHP, Verifique se os arquivos php do Dolibarr são da propriedade do usuário do servidor web.
 ErrorNoMailDefinedForThisUser=E-Mail não definido para este utilizador
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Esta Funcionalidade precisa de javascript activo para funcionar. Modifique em configuração->ambiente.
 ErrorTopMenuMustHaveAParentWithId0=Um menu do tipo 'Superior' não pode ter um menu pai. Coloque 0 ao ID pai ou busque um menu do tipo 'esquerdo'
 ErrorLeftMenuMustHaveAParentId=Um menu do tipo 'esquerdo' deve de ter um ID de pai
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Este nome de perfil já existe para este conjunto de
 ErrorLDAPSetupNotComplete=A configuração Dolibarr-LDAP é incompleta.
 ErrorLDAPMakeManualTest=Foi criado um Ficheiro .ldif na pasta %s. Trate de gerir manualmente este Ficheiro desde a linha de comandos para Obter mais detalhes acerca do erro.
 ErrorCantSaveADoneUserWithZeroPercentage=Não é possível salvar uma ação com "status não iniciado" se o campo "concluído por" também estiver preenchido.
-ErrorRefAlreadyExists=A referencia utilizada para a criação já existe
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Por favor, insira o nome do extrato bancário onde a entrada deve ser relatada (Formato AAAA ou AAAAMMDD)
 ErrorRecordHasChildren=Falha ao excluir registro, pois possui alguns registros filhos.
 ErrorRecordHasAtLeastOneChildOfType=O objeto tem pelo menos um elemento do tipo %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Você deve escolher se o artigo 
 ErrorDiscountLargerThanRemainToPaySplitItBefore=O desconto que você tenta aplicar é maior do que continuar a pagar. Divida o desconto em 2 descontos menores antes.
 ErrorFileNotFoundWithSharedLink=Ficheiro não encontrado. É possível que a chave de partilha tenha sido modificada ou o ficheiro tenha sido removido recentemente.
 ErrorProductBarCodeAlreadyExists=O código de barras do produto %s já existe em outra referência de produto.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Observe também que não é possível usar o produto virtual para aumentar / diminuir automaticamente subprodutos quando pelo menos um subproduto (ou subproduto de subprodutos) precisa de um número de série / lote.
+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=A descrição é obrigatória para linhas com produto livre
 ErrorAPageWithThisNameOrAliasAlreadyExists=A página / container <strong> %s </ strong> tem o mesmo nome ou alias alternativo que você usa
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Uma senha foi definida para este membro. No entanto, nenhuma conta de usuário foi criada. Portanto, essa senha é armazenada, mas não pode ser usada para fazer login no Dolibarr. Pode ser usado por um módulo externo / interface, mas se você não precisa definir nenhum login nem senha para um membro, você pode desativar a opção "Gerenciar um login para cada membro" da configuração do módulo de membro. Se você precisar gerenciar um login, mas não precisar de nenhuma senha, poderá manter esse campo vazio para evitar esse aviso. Nota: O email também pode ser usado como um login se o membro estiver vinculado a um usuário.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=O seu login foi modificado. Por motivos d
 WarningAnEntryAlreadyExistForTransKey=Já existe uma entrada para a chave de tradução para este idioma
 WarningNumberOfRecipientIsRestrictedInMassAction=Atenção, o número de destinatários diferentes é limitado a <b> %s </ b> ao usar as ações em massa nas listas
 WarningDateOfLineMustBeInExpenseReportRange=Atenção, a data da linha não está no intervalo do relatório de despesas
+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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/pt_PT/exports.lang b/htdocs/langs/pt_PT/exports.lang
index 519f3985bc9..083e48f5527 100644
--- a/htdocs/langs/pt_PT/exports.lang
+++ b/htdocs/langs/pt_PT/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Campo título
 NowClickToGenerateToBuildExportFile=Agora, selecione o formato de arquivo na caixa de combinação e clique em "Generate" para construir o arquivo de exportação ...
 AvailableFormats=Formatos Disponíveis
 LibraryShort=Biblioteca
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Passo
 FormatedImport=Assistente de Importação
 FormatedImportDesc1=Este módulo permite-lhe atualizar os dados existentes ou adicionar novos objetos na base de dados a partir de um ficheiro sem conhecimentos técnicos, utilizando um assistente.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Chave (coluna) a ser usada para <b> atualizar </ b> dados ex
 NbInsert=Número de linhas inseridas: %s
 NbUpdate=Número de linhas atualizadas: %s
 MultipleRecordFoundWithTheseFilters=Foram encontrados vários registos com esses filtros: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang
index 4711f17de75..df6212dc07b 100644
--- a/htdocs/langs/pt_PT/mails.lang
+++ b/htdocs/langs/pt_PT/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Entrada de e-mails pelo usuário
 MailingModuleDescDolibarrUsers=Usuários com e-mails
 MailingModuleDescThirdPartiesByCategories=Terceiros (por categorias)
 SendingFromWebInterfaceIsNotAllowed=Envio de interface web não é permitido.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Linha %s em Ficheiro
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=Nenhum email enviado. Remetente incorreto ou email do destinatário. Verifique o perfil do usuário.
 # Module Notifications
 Notifications=Notificações
-NoNotificationsWillBeSent=Nenhuma notificação por e-mail está prevista para este evento e empresa
-ANotificationsWillBeSent=1 notificação vai a ser enviada por e-mail
-SomeNotificationsWillBeSent=%s Notificações vão ser enviadas por e-mail
-AddNewNotification=Ativar um novo alvo/evento de notificação por e-mail
-ListOfActiveNotifications=Listar todos os destinos / eventos ativos para notificação por email
-ListOfNotificationsDone=Lista de todas as notificações de e-mail enviado
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=A configuração do envio de email foi configurada para '%s'. Este modo não pode ser usado para enviar e-mails em massa.
 MailSendSetupIs2=Você deve primeiro ir, com uma conta admin, no menu %sHome - Setup - EMails%s para alterar o parâmetro <strong> '%s' </ strong> para usar o modo '%s'. Com esse modo, você pode inserir a configuração do servidor SMTP fornecido pelo seu provedor de serviços de Internet e usar o recurso de envio de email em massa.
 MailSendSetupIs3=Se você tiver alguma dúvida sobre como configurar seu servidor SMTP, você pode perguntar para %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=O arquivo importado deve ter formato <strong> email;
 UseFormatInputEmailToTarget=Insira uma string com o formato <strong> email; nome; nome; outro </ strong>
 MailAdvTargetRecipients=Destinatários (seleção avançada)
 AdvTgtTitle=Preencha os campos de entrada para pré-selecionar os terceiros ou contatos / endereços para segmentar
-AdvTgtSearchTextHelp=Use %% como curingas. Por exemplo, para encontrar todos os itens como <b> jean, joe, jim </ b>, você pode inserir <b> j%% </ b>, você também pode usar; como separador por valor e use! por exceto este valor. Por exemplo, <b> jean; joe; jim%%;! Jimo;! Jima% </ b> terá como alvo todo o jean, joe, comece com jim mas não jimo e nem tudo que começar com jima
+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 para selecionar int ou valor float
 AdvTgtMinVal=Valor mínimo
 AdvTgtMaxVal=Valor máximo
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Criar filtro
 AdvTgtOrCreateNewFilter=Nome do novo filtro
 NoContactWithCategoryFound=Nenhum contato / endereço com uma categoria encontrada
 NoContactLinkedToThirdpartieWithCategoryFound=Nenhum contato / endereço com uma categoria encontrada
-OutGoingEmailSetup=Configuração de email de saída
-InGoingEmailSetup=Configuração de email de entrada
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Configuração de email de saída padrão
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informação
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index d49765da4c1..69cfcbc202c 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Nenhum modelo disponível para este tipo de e-mail
 AvailableVariables=Variáveis de substituição disponíveis
 NoTranslation=Sem tradução
 Translation=Tradução
+CurrentTimeZone=Zona Horária PHP (servidor)
 EmptySearchString=Introduza alguns critérios de pesquisa
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Nenhum foi encontrado nenhum registo
 NoRecordDeleted=Nenhum registo eliminado
 NotEnoughDataYet=Não existe dados suficientes
@@ -85,6 +87,8 @@ 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
+HomePage=Página Inicial
 RecordSaved=Registo Guardado
 RecordDeleted=Registo eliminado
 RecordGenerated=Registo gerado
@@ -220,6 +224,7 @@ Value=Valor
 PersonalValue=Valor pessoal
 NewObject=Novo %s
 NewValue=Novo valor
+OldValue=Old value %s
 CurrentValue=Valor actual
 Code=Código
 Type=Tipo
@@ -433,6 +438,7 @@ RemainToPay=Montante por pagar
 Module=Módulo/Aplicação
 Modules=Módulos/Aplicações
 Option=Opção
+Filters=Filters
 List=Lista
 FullList=Lista Completa
 FullConversation=Conversa completa
@@ -650,6 +656,7 @@ SupplierPreview=Pré-visualização do fornecedor
 ShowCustomerPreview=Ver Historial Cliente
 ShowSupplierPreview=Mostrar pré-visualização do fornecedor
 RefCustomer=Ref. Cliente
+InternalRef=Internal ref.
 Currency=Moeda
 InfoAdmin=Informação para os administradores
 Undo=Desfazer
@@ -671,7 +678,7 @@ SendMail=Enviar e-mail
 Email=Email
 NoEMail=Sem e-mail
 AlreadyRead=Já lido
-NotRead=Não lido
+NotRead=Unread
 NoMobilePhone=Sem telefone móvel
 Owner=Proprietário
 FollowingConstantsWillBeSubstituted=As seguintes constantes serão substituidas pelo seu valor correspondente.
@@ -1107,3 +1114,9 @@ UpToDate=Actualizado
 OutOfDate=Desactualizado
 EventReminder=Lembrete de evento
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/pt_PT/modulebuilder.lang b/htdocs/langs/pt_PT/modulebuilder.lang
index 416c94c117f..f4005f2db69 100644
--- a/htdocs/langs/pt_PT/modulebuilder.lang
+++ b/htdocs/langs/pt_PT/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=Página PHP para criar/editar/visualizar um registo
 PageForAgendaTab=Página PHP para guia de evento
 PageForDocumentTab=Página PHP para guia do documento
 PageForNoteTab=Página do PHP para a guia de nota
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Caminho para o ficheiro pacote .zip do módulo/aplicação
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Espaços ou caracteres especiais não são permitidos.
@@ -77,7 +78,7 @@ IsAMeasure=É uma medida
 DirScanned=Diretório varrido
 NoTrigger=Nenhum gatilho
 NoWidget=Nenhum widget
-GoToApiExplorer=Ir para o explorador de API
+GoToApiExplorer=API explorer
 ListOfMenusEntries=Lista de entradas do menu
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=Lista de permissões definidas
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Se você tem conhecimento de SQL e PHP, você pode usar
 SeeTopRightMenu=Veja <span class = "fa fa-bug"> </ span> no menu superior direito
 AddLanguageFile=Adicionar ficheiro de idiomas
 YouCanUseTranslationKey=Você pode usar aqui uma chave que é a chave de tradução encontrada no arquivo de idioma (veja a aba "Idiomas")
-DropTableIfEmpty=(Excluir tabela se vazia)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=A tabela %s não existe
 TableDropped=Tabela %s excluída
 InitStructureFromExistingTable=Construir a cadeia de matriz de estrutura de uma tabela existente
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/pt_PT/mrp.lang b/htdocs/langs/pt_PT/mrp.lang
index 60409d454a7..9e4293a072e 100644
--- a/htdocs/langs/pt_PT/mrp.lang
+++ b/htdocs/langs/pt_PT/mrp.lang
@@ -78,3 +78,27 @@ TotalCost=Custo total
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index ce2b87ce1ac..58dad92008d 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -5,8 +5,6 @@ Tools=Utilidades
 TMenuTools=Ferramentas
 ToolsDesc=Todas as ferramentas não incluídas em outras entradas do menu estão agrupadas aqui. Todas as ferramentas podem ser acessadas através do menu à esquerda.
 Birthday=Aniversario
-BirthdayDate=Data de nascimento
-DateToBirth=Birth date
 BirthdayAlertOn=Alerta de aniversário activo
 BirthdayAlertOff=Alerta aniversário inativo
 TransKey=Tradução da chave TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Mês anterior (número 1-12) à data da fatura
 TextPreviousMonthOfInvoice=Mês anterior (texto) da data da fatura
 NextMonthOfInvoice=Mês seguinte (número 1-12) à data da fatura
 TextNextMonthOfInvoice=Mês seguinte (texto) à data da fatura
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Ficheiro zip gerado em <b>%s</b>.
 DocFileGeneratedInto=Ficheiro doc gerado em <b>%s</b>.
 JumpToLogin=Desconectado. Vá para a página de inicio de sessão...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Relatório de despesas validado (aprovação obri
 Notify_EXPENSE_REPORT_APPROVE=Relatório de despesas aprovado
 Notify_HOLIDAY_VALIDATE=Deixe o pedido validado (aprovação obrigatória)
 Notify_HOLIDAY_APPROVE=Deixe o pedido aprovado
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=Veja a configuração do módulo %s
 NbOfAttachedFiles=Número Ficheiros/Documentos anexos
 TotalSizeOfAttachedFiles=Tamanho Total dos Ficheiros/Documentos anexos
@@ -99,6 +100,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=Você pode clicar no link abaixo para fazer seu pagamento, se ainda não estiver pronto.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Olá)__\n\n\n__(Atenciosamente)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=O Dolibarr é um ERP/CRM compacto que suporta vários módulos de negócios. Uma demonstração mostrando todos os módulos não faz sentido porque esse cenário nunca ocorre (várias centenas disponíveis). Assim, vários perfis de demonstração estão disponíveis.
 ChooseYourDemoProfil=Escolha o perfil de demonstração que melhor se adequa às suas necessidades ...
 ChooseYourDemoProfilMore=...ou crie o seu próprio perfil <br> (seleção manual de módulo)
@@ -137,7 +139,7 @@ Right=Direito
 CalculatedWeight=Peso calculado
 CalculatedVolume=Volume calculado
 Weight=Peso
-WeightUnitton=Toneladas
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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=Importação conjunto de dados
 DolibarrNotification=Notificação automática
 ResizeDesc=Insira a nova largura <b>OU</b> altura. A proporção será mantida durante o redimensionamento...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Área de Exportações
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index c3b0fc3d5eb..45ba3d7cb6a 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Nº de preços
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+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=Número de produtos de embalagem fonte
@@ -167,8 +168,10 @@ BuyingPrices=Preços de compra
 CustomerPrices=Preços aos clientes
 SuppliersPrices=Preços de fornecedor
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Código Aduaneiro / Commodity / HS
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=País de origem
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Utilizar o preço fixo
 PriceByQuantity=Preços diferentes por quantidade
 DisablePriceByQty=Desativar preços por quantidade
 PriceByQuantityRange=Gama de quantidades
-MultipriceRules=Regras de segmento de preço
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Utilizar regras de segmento de preço (definidas na configuração do módulo do produto) para calcular automaticamente os preços de todos os outros segmentos de acordo com o primeiro segmento
 PercentVariationOver=variação %% sobre %s
 PercentDiscountOver=%% desconto sobre %s
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index bc1713523d8..77cd1521bfe 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -76,15 +76,16 @@ MyActivities=As Minhas Tarefas/Atividades
 MyProjects=Os Meus Projetos
 MyProjectsArea=A Minha Área de Projetos
 DurationEffective=Duração Efetiva
-ProgressDeclared=Progresso declarado
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Progresso calculado
+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=Tempo
+TimeConsumed=Consumed
 ListOfTasks=Lista de tarefas
 GoToListOfTimeConsumed=Ir para a lista de tempo consumido
 GanttView=Vista de Gantt
diff --git a/htdocs/langs/pt_PT/recruitment.lang b/htdocs/langs/pt_PT/recruitment.lang
index b11245de51e..eb48df47240 100644
--- a/htdocs/langs/pt_PT/recruitment.lang
+++ b/htdocs/langs/pt_PT/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/pt_PT/sendings.lang b/htdocs/langs/pt_PT/sendings.lang
index 156fc7a9c54..f66f4fbc0fe 100644
--- a/htdocs/langs/pt_PT/sendings.lang
+++ b/htdocs/langs/pt_PT/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Outros Envios deste Pedido
 SendingsAndReceivingForSameOrder=Envios e receções para esta encomenda
 SendingsToValidate=Expedições por validar
 StatusSendingCanceled=Cancelado
+StatusSendingCanceledShort=Cancelado
 StatusSendingDraft=Rascunho
 StatusSendingValidated=Validado (produtos a enviar ou enviados)
 StatusSendingProcessed=Processado
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Deve validar a encomenda antes de poder efetuar
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Modelo de documento mais completo para a entrega recibos (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER constante não definida
 SumOfProductVolumes=Soma dos volumes dos produtos
 SumOfProductWeights=Soma dos pesos dos produtos
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index 2ad95e6aadc..f45b0a7d580 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Valor de stocks
 UserWarehouseAutoCreate=Crie um armazém de usuários automaticamente ao criar um usuário
 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Armazém predefinido
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/pt_PT/ticket.lang b/htdocs/langs/pt_PT/ticket.lang
index 4ef4dab738e..3b45f4471c9 100644
--- a/htdocs/langs/pt_PT/ticket.lang
+++ b/htdocs/langs/pt_PT/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Lógica do sistema de desconexão
-TicketTypeShortBUGHARD=Disfonctionnement matériel
-TicketTypeShortCOM=Questão comercial
 
+TicketTypeShortCOM=Questão comercial
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Outro
 TicketSeverityShortLOW=Baixo
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Alto
-TicketSeverityShortBLOCKING=Crítico / Bloqueio
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Campo '%s' incorreto
 MenuTicketMyAssign=Os meus tickets
@@ -60,7 +58,6 @@ OriginEmail=Fonte de e-mail
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Não lido
 Read=Ler
 Assigned=Atribuído
 InProgress=Em progresso
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=A interface pública permite que qualquer vis
 TicketsAutoAssignTicket=Atribuir automaticamente o usuário que criou o ticket
 TicketsAutoAssignTicketHelp=Ao criar um ticket, o usuário pode ser atribuído automaticamente ao ticket.
 TicketNumberingModules=Módulo de numeração de ingressos
+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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Não notificar a empresa na criação
 Unread=Não lida
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/pt_PT/website.lang b/htdocs/langs/pt_PT/website.lang
index c18079450fb..9b4a56eab98 100644
--- a/htdocs/langs/pt_PT/website.lang
+++ b/htdocs/langs/pt_PT/website.lang
@@ -30,7 +30,6 @@ EditInLine=Editar em linha
 AddWebsite=Adicionar site da Web
 Webpage=Página/recipiente da Web
 AddPage=Adicionar página/recipiente
-HomePage=Página Inicial
 PageContainer=Página
 PreviewOfSiteNotYetAvailable=Pré-visualização do seu site <strong> %s </ strong> ainda não disponível. Você deve primeiro '<strong> Importar um modelo de site completo </ strong>' ou apenas '<strong> Adicionar uma página / contêiner </ strong>'.
 RequestedPageHasNoContentYet=Página solicitada com o ID %s ainda não tem conteúdo, ou o arquivo de cache .tpl.php foi removido. Edite o conteúdo da página para resolver isso.
@@ -101,7 +100,7 @@ EmptyPage=Página vazia
 ExternalURLMustStartWithHttp=O URL externo deve começar com http: // ou https: //
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Incluir conteúdo dinâmico
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=URL interno da página
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=Esta página / contêiner tem tradução
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang
index 56a6745c1c0..fba7a0e8227 100644
--- a/htdocs/langs/pt_PT/withdrawals.lang
+++ b/htdocs/langs/pt_PT/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Últimos recibos de débito direto %s
 MakeWithdrawRequest=Efetuar um pedido de pagamento por débito direto
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=Pedidos de pagamento por débito direto %s registrados
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=Nenhuma fatura debitada com sucesso. Verifique se as faturas estão em empresas com um IBAN válido e se o IBAN tem uma UMR (Unique Mandate Reference) com o modo <strong> %s </ strong>.
 ClassCredited=Classificar como creditado
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Data de execução
 CreateForSepa=Criar ficheiro de débito direto
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ InfoRejectSubject=Pedido de pagamento por débito direto recusado
 InfoRejectMessage=Olá, <br> <br> a ordem de pagamento de débito directo da factura  %s relacionada com a empresa %s, com uma quantidade de %s foi recusada pelo banco. <br> <br> <br> <br>%s
 ModeWarning=Opção para o modo real não foi definido, nós paramos depois desta simulação
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/pt_PT/workflow.lang b/htdocs/langs/pt_PT/workflow.lang
index c657d1eb8c2..15b30e7f6ac 100644
--- a/htdocs/langs/pt_PT/workflow.lang
+++ b/htdocs/langs/pt_PT/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Criação automática
 AutomaticClassification=Classificação automática
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index db1f0e59b3f..390a4165131 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=Acest serviciu
 ThisProduct=Acest produs
 DefaultForService=Implicit pentru serviciu
 DefaultForProduct=Implicit pentru produs
+ProductForThisThirdparty=Produs pentru acest terţ
+ServiceForThisThirdparty=Serviciu pentru acest terţ
 CantSuggest=Nu pot sugera
 AccountancySetupDoneFromAccountancyMenu=Cele mai multe configurări ale contabilității se fac din meniul %s
 ConfigAccountingExpert=Configurare modul Contabilitate (partidă dublă)
@@ -48,6 +50,7 @@ CountriesExceptMe=Toate țările, cu excepția %s
 AccountantFiles=Export documente sursă
 ExportAccountingSourceDocHelp=Cu acest instrument, puteți exporta evenimentele sursă (listă și PDF-uri) care au fost utilizate pentru a vă genera înregistrările contabile. Pentru a vă exporta jurnalele, utilizați intrarea din meniu %s-%s.
 VueByAccountAccounting=Vizualizare după contul contabil
+VueBySubAccountAccounting=Vizualizați după subcont contabil
 
 MainAccountForCustomersNotDefined=Contul contabil principal pentru clienții care nu sunt definiți în configurare
 MainAccountForSuppliersNotDefined=Contul contabil principal pentru furnizorii care nu sunt definiți în configurare
@@ -144,7 +147,7 @@ NotVentilatedinAccount=Nu este asociat cu contul contabil
 XLineSuccessfullyBinded=%s produse/servicii legate cu succes de un cont contabil
 XLineFailedToBeBinded=Produsele / serviciile %s nu au fost asociate niciunui cont contabil
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Număr de elemente de legat afișate de pagină (maximum recomandat: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Numărul maxim de linii în liste și pe pagina de legare (recomandat: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Începeți sortarea paginii "Asocieri de făcut" după cele mai recente elemente
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Începeți sortarea paginii "Asocieri făcute" după cele mai recente elemente
 
@@ -198,7 +201,8 @@ Docdate=Data
 Docref=Referinţă
 LabelAccount=Etichetă cont
 LabelOperation=Etichetarea operaţiei
-Sens=Sens
+Sens=Direcţie
+AccountingDirectionHelp=Pentru un cont contabil al unui client, utilizați Credit pentru a înregistra o plată pe care ați primit-o <br> Pentru un cont contabil al unui furnizor, utilizați Debit pentru a înregistra o plată pe care o efectuați
 LetteringCode=Codul de scriere
 Lettering=Numerotare
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Eticheta jurnalului
 NumPiece=Număr nota contabila
 TransactionNumShort=Numărul tranzacţiei
 AccountingCategory=Grupuri personalizate
-GroupByAccountAccounting=Grupează după contul contabil
+GroupByAccountAccounting=Grupare după cont registru
+GroupBySubAccountAccounting=Grupare după cont de subregistru
 AccountingAccountGroupsDesc=Puteți defini aici câteva grupuri de conturi de contabilitate. Acestea vor fi utilizate pentru rapoarte contabile personalizate.
 ByAccounts=Prin conturi
 ByPredefinedAccountGroups=Prin grupuri predefinite
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Plata nu legată de vreun produs/serviciu
 OpeningBalance=Sold iniţial de deschidere
 ShowOpeningBalance=Afişează  soldurile de deschidere
 HideOpeningBalance=Ascunde soldurile de deschidere
-ShowSubtotalByGroup=Afişare subtotal după grupă
+ShowSubtotalByGroup=Afișează subtotalul după nivel
 
 Pcgtype=Grup de conturi
 PcgtypeDesc=Grupele de conturi sunt utilizate ca criterii predefinite de 'filtrare' și 'grupare' pentru unele rapoarte contabile. De exemplu, 'VENITURI' sau 'CHELTUIELI' sunt utilizate ca grupe pentru conturile contabile ale produselor pentru a construi raportul de cheltuieli/venituri.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consultați aici lista liniilor de raportare a cheltuiel
 DescVentilExpenseReportMore=Dacă configurați contul de contabilitate pe linii de raportare a tipurilor de cheltuieli, aplicația va putea face toate legătura între liniile dvs. de raportare a cheltuielilor și contul contabil al planului dvs. de conturi, într-un singur clic <strong> „%s“ </strong>. În cazul în care contul nu a fost stabilit în dicționar de taxe sau dacă aveți încă anumite linii care nu sunt legate de niciun cont, va trebui să faceți o legare manuală din meniu<strong> %s </strong>".
 DescVentilDoneExpenseReport=Consultați aici lista liniilor rapoartelor privind cheltuielile și contul contabil a taxelor lor
 
+Closure=Închidere anuală
 DescClosure=Consultați aici numărul de tranzacţii lunare care nu sunt validate și se află în anii fiscali deschişi
 OverviewOfMovementsNotValidated=Pasul 1 / Prezentarea generală a tranzacţiilor nevalidate. (Necesar pentru a închide un an fiscal)
+AllMovementsWereRecordedAsValidated=Toate mișcările au fost înregistrate ca validate
+NotAllMovementsCouldBeRecordedAsValidated=Nu toate mișcările au putut fi înregistrate ca validate
 ValidateMovements=Vallidare trasferuri
 DescValidateMovements= Orice modificare sau ștergere a înregistrărilor va fi interzisă. Toate intrările pentru un exercițiu financiar trebuie validate, altfel închiderea nu va fi posibilă
-SelectMonthAndValidate=Selectează luna şi validează trasferurile
 
 ValidateHistory=Asociază automat
 AutomaticBindingDone=Asociere automată făcută
@@ -293,6 +300,7 @@ Accounted=Contabilizat în jurnal - Cartea Mare
 NotYetAccounted=Nu a fost încă înregistrată în jurnal - Cartea Mare
 ShowTutorial=Arată tutorial
 NotReconciled=Nu este conciliat
+WarningRecordWithoutSubledgerAreExcluded=Atenție, toate operațiunile fără cont de subregistru definit sunt filtrate și excluse din această vizualizare
 
 ## Admin
 BindingOptions=Opțiuni de legare
@@ -337,6 +345,7 @@ Modelcsv_LDCompta10=Export pentru LD Compta (v10 & mai nou)
 Modelcsv_openconcerto=Export pentru OpenConcerto (Test)
 Modelcsv_configurable=Exportați CSV configurabil
 Modelcsv_FEC=Exportă fişier FEC
+Modelcsv_FEC2=Export FEC (cu scriere de date generate/document inversat)
 Modelcsv_Sage50_Swiss=Export pentru Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export pentru Gestinum (v3)
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 604e4a99a94..2ae296c86f8 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Afişare
 SetupArea=Setări
 UploadNewTemplate=Încărcați șabloane noi
 FormToTestFileUploadForm=Formular pentru testarear încărcării de  fişiere (în funcţie de configurare)
+ModuleMustBeEnabled=Modulul/aplicația <b>%s</b> trebuie să fie activată
+ModuleIsEnabled=Modulul/aplicația <b>%s</b> a fost activată
 IfModuleEnabled=Notă: Da este folositor numai dacă modul  <b>%s</b> este activat
 RemoveLock=Eliminați / redenumiți fișierul <b> %s </b> dacă există, pentru a permite utilizarea instrumentului Actualizare / Instalare.
 RestoreLock=Restaurați fișierul <b> %s </b>, numai cu permisiunea de citire, pentru a dezactiva orice viitoare utilizare a instrumentului Actualizare / Instalare.
@@ -85,7 +87,6 @@ ShowPreview=Arată previzualizare
 ShowHideDetails=Afişare-Ascundere detalii
 PreviewNotAvailable=Preview nu este disponibil
 ThemeCurrentlyActive=Tema activă în prezent
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Datele sunt stocate și returnate de serverul de baze de date ca și cum ar fi păstrate ca șir trimis. Fusul orar are efect doar atunci când se folosește funcția UNIX_TIMESTAMP (care nu ar trebui să fie utilizată de Dolibarr, astfel că baza de date TZ nu ar trebui să aibă efect, chiar dacă este schimbată după introducerea datelor).
 Space=Spaţiu
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Această zonă oferă funcții de administrare. Utilizați m
 Purge=Curăţenie
 PurgeAreaDesc=Această pagină vă permite să ștergeți toate fișierele generate sau stocate de Dolibarr (fișiere temporare sau toate fișierele din directorul <b> %s </b>). Utilizarea acestei funcții nu este în mod normal necesară. Este oferită ca soluție pentru utilizatorii care găzduiesc Dolibarr la un furnizor care nu oferă permisiuni de ștergere a fișierelor generate de serverul web.
 PurgeDeleteLogFile=Ștergeți fișierele din jurnal, inclusiv <b> %s </ b> definite pentru modulul Syslog (fără risc de pierdere a datelor)
-PurgeDeleteTemporaryFiles=Ștergeți toate fișierele temporare (fără riscul de a pierde date). Notă: Ștergerea se face numai dacă directorul temporar a fost creat acum 24 de ore.
-PurgeDeleteTemporaryFilesShort=Sterge fisiere temporare
+PurgeDeleteTemporaryFiles= Ștergeți toate fișierele jurnal și temporare (fără risc de pierdere a datelor). Notă: Ștergerea fișierelor temporare se face numai dacă directorul temporar a fost creat acum mai mult de 24 de ore. 
+PurgeDeleteTemporaryFilesShort=Ștergeți fișierele jurnal și temporare
 PurgeDeleteAllFilesInDocumentsDir=Ștergeți toate fișierele din directorul: <b>%s</b>.<br>\nAceasta va șterge toate documentele generate legate de elemente (terțe părți, facturi etc.), fișierele încărcate în modulul ECM, gropile de rezervă pentru baze de date și fișierele temporare . 
 PurgeRunNow=Elimină acum
 PurgeNothingToDelete=Nici un director sau fișier de șters.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Parteneri preferati
 OtherResources=Alte resurse
 ExternalResources=Resurse externe
 SocialNetworks=Retele sociale
+SocialNetworkId=ID reţea socială
 ForDocumentationSeeWiki=Pentru utilizator sau developer documentaţia (doc, FAQs ...), <br> aruncăm o privire 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>
 HelpCenterDesc1=Iată câteva resurse pentru a obține ajutor și asistență cu Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Exemple cu configurația curentă
 ListOfDirectories=Lista de directoare OpenDocument template-uri
 ListOfDirectoriesForModelGenODT=Lista de directoare care conţin fişiere șablon in format OpenDocument.<br><br>puneţi aici intreaga cale de directoare.<br>Intoarceţi-va la inceputul textului la fiecare director.<br>Pentru a adăuga un director de modul GED, adăugaţi aici <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Fişierele în aceste directoare trebuie să se termine cu <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Numărul de fișiere șablon ODT / ODS găsite în aceste directoare
-ExampleOfDirectoriesForModelGen=Exemple de sintaxa: <br> c: mydir \\ <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Exemple de sintaxă:<br> c:\\ myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Pentru a şti cum să vă creaţi şabloane DOCX, ODT documente, înainte de a le stoca în aceste directoare, citiţi documentaţia wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Poziţia Prenume / Nume
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametrii pentru a asigura URL-uri
 SecurityTokenIsUnique=Utilizaţi un unic parametru securekey pentru fiecare URL
 EnterRefToBuildUrl=Introduceţi de referinţă pentru %s obiect
 GetSecuredUrl=Obţineţi URL-ul calculat
-ButtonHideUnauthorized=Ascundeți butoanele pentru utilizatorii care nu sunt administratori pentru acțiuni neautorizate, în loc să apară butoane dezactivate în culoarea gri
+ButtonHideUnauthorized= Ascunde butoanele de acțiune neautorizate și pentru utilizatorii interni (doar gri în caz contrar) 
 OldVATRates=Vechea rată TVA
 NewVATRates=Noua rată TVA
 PriceBaseTypeToChange=Modifică la prețuri cu valoarea de referință de bază definit pe
@@ -668,7 +670,7 @@ Module54000Desc=Imprimare directă (fără a deschide documentele) utilizând in
 Module55000Name=Sondaj, supraveghere sau vot
 Module55000Desc=Creați sondaje online, sondaje sau voturi (cum ar fi Doodle, Studs, RDVz etc ...)
 Module59000Name=Marje
-Module59000Desc=Modul management marje
+Module59000Desc=Modul pentru urmărirea marjelor
 Module60000Name=Comisioane
 Module60000Desc=Modul management comisioane
 Module62000Name=Incoterm
@@ -1306,7 +1308,7 @@ YouUseBestDriver=Utilizați driverul %s, care este cel mai bun driver disponibil
 YouDoNotUseBestDriver=Utilizați driverul %s dar  driverul %s este recomandat.
 NbOfObjectIsLowerThanNoPb=Aveţi doar %s%s în baza de date. Aceasta nu necesită nicio optimizare specială.
 SearchOptim=Optimizare căutare
-YouHaveXObjectUseSearchOptim=Aveţi %s%s în baza de date. Ar trebui să adăgaţi constanta %scu valoarea 1 în  Acasă-Setup-Altele. Limitați căutarea la începutul șirurilor, ceea ce face posibilă utilizarea bazei de date cu indecşi și ar trebui să obțineți un răspuns imediat.
+YouHaveXObjectUseSearchOptim=Aveți %s %s în baza de date. Puteți adăuga constanta %s la 1 în Acasă-Configurare-Altele. Limitați căutarea la începutul șirurilor, ceea ce face posibilă utilizarea indecşilor în baza de date și ar trebui să primiți un răspuns mai rapid.
 YouHaveXObjectAndSearchOptimOn=Aveţi %s%s în baza de date şi constanta %s este setată la valoarea 1 în Acasă-Setup-Altele.
 BrowserIsOK=Utilizați browserul web %s. Acest browser este ok pentru securitate și performanţă.
 BrowserIsKO=Utilizați browserul web %s. Acest browser este cunoscut ca fiind o alegere proastă pentru securitate, fiabilitate și performanță. Vă recomandăm să utilizați Firefox, Chrome, Opera sau Safari.
@@ -1596,8 +1598,13 @@ ServiceSetup=Servicii de modul de configurare
 ProductServiceSetup=Produse şi Servicii de module de configurare
 NumberOfProductShowInSelect=Numărul maxim de produse pentru a fi afișate în listele de selectare combo (0 = fără limită)
 ViewProductDescInFormAbility=Afișează descrierile produsului în formulare (altfel este afișat într-un pop-up de tip tooltip)
+DoNotAddProductDescAtAddLines=Nu adăuga descrierea produsului (din fișa produsului) la adăugarea de linii pe formulare
+OnProductSelectAddProductDesc=Cum se utilizează descrierea produselor atunci când se adaugă un produs ca linie a unui document
+AutoFillFormFieldBeforeSubmit=Completați automat câmpul de introducere a descrierii cu descrierea produsului
+DoNotAutofillButAutoConcat=Nu completa automat câmpul de introducere cu descrierea produsului. Descrierea produsului va fi concatenată automat cu descrierea introdusă. 
+DoNotUseDescriptionOfProdut=Descrierea produsului nu va fi niciodată inclusă în descrierea liniilor de pe documente
 MergePropalProductCard=Activați în fișier atașat la produs/serviciu o opțiune de îmbinare a produsului de tip document PDF la propunerea PDF azur dacă produsul/serviciul se află în propunere
-ViewProductDescInThirdpartyLanguageAbility=Afișați descrierile produselor în limba părții terțea 
+ViewProductDescInThirdpartyLanguageAbility=Afișați descrierile produselor în formulare în limba terțului (altfel în limba utilizatorului) 
 UseSearchToSelectProductTooltip=De asemenea, dacă aveți un număr mare de number de produse (> 100 000), puteți crește viteza prin configurarea constantă a PRODUCT_DONOTSEARCH_ANYWHERE la 1 în Configurare-> Altele. Căutarea va fi apoi limitată la începutul șirului.
 UseSearchToSelectProduct=Așteptați până când apăsați o tastă înainte de a încărca conținutul listei combo-ului de produse (aceasta poate crește performanța dacă aveți un număr mare de produse, dar este mai puțin convenabil)
 SetDefaultBarcodeTypeProducts=Implicit tip de cod de bare de a utiliza pentru produse
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Meniuri personalizate care nu sunt legate de o intrar
 NewMenu=New meniul
 MenuHandler=Meniu manipulant
 MenuModule=Sursa de modul
-HideUnauthorizedMenu= Ascunde meniuri neautorizate (gri)
+HideUnauthorizedMenu=Ascunde meniurile neautorizate și pentru utilizatorii interni (doar gri altfel)
 DetailId=Id-ul pentru meniul
 DetailMenuHandler=Meniu manipulant în cazul în care pentru a arăta noul meniu
 DetailMenuModule=Modul de intrare în meniu numele dacă provin dintr-un modul
@@ -1983,11 +1990,12 @@ EMailHost=Gazdă a serverului de email IMAP
 MailboxSourceDirectory=Directorul sursă al cutiei poștale
 MailboxTargetDirectory=Directorul ţintă al cutiei poștale 
 EmailcollectorOperations=Operațiuni de făcut de către colector
+EmailcollectorOperationsDesc=Operațiunile sunt executate în ordinea de sus în jos
 MaxEmailCollectPerCollect=Număr maxim de email-uri colectae per operaţiune
 CollectNow=Colectați acum
 ConfirmCloneEmailCollector=Eşti sigur că vrei să clonezi colectorul de email %s?
-DateLastCollectResult=Data ultimei încercări de colectare 
-DateLastcollectResultOk=Data ultimei colectări efectuate cu succes
+DateLastCollectResult=Data ultimei încercări de colectare
+DateLastcollectResultOk=Data ultimei colectări cu succes
 LastResult=Ultimul rezultat
 EmailCollectorConfirmCollectTitle=Confirmarea colectării de emailuri
 EmailCollectorConfirmCollect=Doriți să rulați acum colecția pentru acest colector?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Mesaj dintr-o conversație inițiată de un prim e-mail trimis
 WithoutDolTrackingID=Mesaj dintr-o conversație inițiată de un prim e-mail NU trimis de la Dolibarr
 WithDolTrackingIDInMsgId=Mesaj transmis de la Dolibarr
 WithoutDolTrackingIDInMsgId= Mesajul NU a fost trimis de la Dolibarr
-CreateCandidature=Creare candidatură
+CreateCandidature=Creare aplicare la job
 FormatZip=Zip
 MainMenuCode=Codul de introducere a meniului (meniu principal)
 ECMAutoTree=Afișați arborele ECM automat
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Țară (dacă este specifică unei anumite țări)
 YouMayFindSecurityAdviceHere=Aici puteți găsi recomandări de securitate
 ModuleActivatedMayExposeInformation=Acest modul poate expune date sensibile. Dacă nu aveți nevoie de el, dezactivați-l.
 ModuleActivatedDoNotUseInProduction=Un modul conceput pentru dezvoltare a fost activat. Nu-l activați într-un mediu de producție.
+CombinationsSeparator=Caracter separator pentru combinații de produse
+SeeLinkToOnlineDocumentation=Pentru exemple, consultați linkul către documentația online din meniul de sus
+SHOW_SUBPRODUCT_REF_IN_PDF=Dacă se folosește caracteristica "%s" a modulului <b>%s</b>, afișați detalii despre subprodusele unui kit în PDF.
+AskThisIDToYourBank=Contactați banca dvs. pentru a obține acest ID
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index 5e85e7eb2bc..0ca440a7b50 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -173,10 +173,11 @@ SEPAMandate=Mandat SEPA
 YourSEPAMandate=Mandatul dvs. SEPA  
 FindYourSEPAMandate=Acesta este mandatul dvs. SEPA pentru a autoriza compania noastră să efectueze un ordin de debitare directă către banca dvs. Reveniți semnat (scanarea documentului semnat) sau trimiteți-l prin poștă la
 AutoReportLastAccountStatement=Completați automat câmpul "numărul extrasului de cont" cu ultimul număr al declarației atunci când efectuați reconcilierea
-CashControl= Limită de numerar POS
-NewCashFence= Limită nouă de numerar
+CashControl=Control POS casierie
+NewCashFence=Închidere nouă de casierie
 BankColorizeMovement=Colorează tranzacţiile
 BankColorizeMovementDesc=Dacă această funcţie este activată, poţi alege o culoare de fundal personalizată pentru tranzacţiile de debit sau de credit
 BankColorizeMovementName1=Culoarea de fundal pentru tranzacţiile de debit
 BankColorizeMovementName2=Culoarea de fundal pentru tranzacţiile de credit
 IfYouDontReconcileDisableProperty= Dacă nu faceți reconcilieri bancare pe unele conturi bancare, dezactivați proprietatea "%s" de pe ele pentru a elimina acest avertisment. 
+NoBankAccountDefined=Nu a fost definit niciun cont bancar
diff --git a/htdocs/langs/ro_RO/blockedlog.lang b/htdocs/langs/ro_RO/blockedlog.lang
index fb1ab84c5eb..aadcbc5379c 100644
--- a/htdocs/langs/ro_RO/blockedlog.lang
+++ b/htdocs/langs/ro_RO/blockedlog.lang
@@ -35,7 +35,7 @@ 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
-logCASHCONTROL_VALIDATE=Înregistrarea limitei de bani
+logCASHCONTROL_VALIDATE= Înregistrare închidere casierie
 BlockedLogBillDownload=Descărcarea facturii clientului
 BlockedLogBillPreview=Previzualizarea facturii clientului
 BlockedlogInfoDialog=Detalii înregistrare
diff --git a/htdocs/langs/ro_RO/boxes.lang b/htdocs/langs/ro_RO/boxes.lang
index c258d9aee69..6cc341fa46f 100644
--- a/htdocs/langs/ro_RO/boxes.lang
+++ b/htdocs/langs/ro_RO/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Ultimele %s donaţii modificate
 BoxTitleLastModifiedExpenses=Ultimele %s deconturi modificare 
 BoxTitleLatestModifiedBoms=Ultimile %sbonuri de consum modificate 
 BoxTitleLatestModifiedMos=Ultimile %s comenzi de producţie modificate
+BoxTitleLastOutstandingBillReached=Clienţii cu restanţe mai mari decât limita de credit acceptată
 BoxGlobalActivity=Activitate globală ( facturi, oferte, comenzi)
 BoxGoodCustomers=Clienţi buni
 BoxTitleGoodCustomers=%s Clienţi buni
+BoxScheduledJobs=Joburi programate
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Actualizarea fluxului RSS a eșuat. Ultima actualizare reușită: %s
 LastRefreshDate=Ultima dată reîmprospătare
 NoRecordedBookmarks=Niciun bookmark definit.
@@ -92,8 +95,8 @@ LastXMonthRolling=Rulaj ultimele %s luni
 ChooseBoxToAdd=Adăugați widget în tabloul dvs. de bord
 BoxAdded=Widget a fost adăugat în tabloul dvs. de bord
 BoxTitleUserBirthdaysOfMonth=Aniversări în această lună (utilizatori)
-BoxLastManualEntries=Ultimele înregistrări manuale în contabilitate
-BoxTitleLastManualEntries=Ultimile %s înregistrări contabile manule
+BoxLastManualEntries=Ultimile înregistrări în contabilitate introduse manual sau fără document sursă 
+BoxTitleLastManualEntries=%s ultimele înregistrări introduse manual sau fără document sursă 
 NoRecordedManualEntries=Nici o înregistrare manuală în contabilitate
 BoxSuspenseAccount=Contorizează operaţiunea contabilă cu contul suspendat 
 BoxTitleSuspenseAccount=Număr linii nealocate
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Contul suspendat nu este definit
 BoxLastCustomerShipments=Ultimile livrări către clienţi 
 BoxTitleLastCustomerShipments=Ultimile %s livrări către clienţi
 NoRecordedShipments=Nici o livrare către clienţi
+BoxCustomersOutstandingBillReached=Clienţi care au epuizat limita de credit
 # Pages
 AccountancyHome=Contabilitate
+ValidatedProjects=Proiecte validate
diff --git a/htdocs/langs/ro_RO/cashdesk.lang b/htdocs/langs/ro_RO/cashdesk.lang
index a1d61daa35e..d8622b9d3ee 100644
--- a/htdocs/langs/ro_RO/cashdesk.lang
+++ b/htdocs/langs/ro_RO/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Subsol
 AmountAtEndOfPeriod=Valoare la sfârșitul perioadei (zi, lună sau an)
 TheoricalAmount=Valoare teoretică
 RealAmount=Sumă reală
-CashFence=Limită cash
-CashFenceDone=Limita de bani realizată pentru perioada
+CashFence=Închidere casierie
+CashFenceDone=Închiderea casei de marcat efectuată pentru perioada respectivă
 NbOfInvoices=Nr  facturi
 Paymentnumpad=Tipul de pad utilizat pentru introducerea plăţii
 Numberspad=Suport de numere
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Modul de numerotare pentru vânzările POS
 CashDeskGenericMaskCodes6 = Tag-ul <br><b>{TN}</b> este utilizat pentru adăugarea numărului de terminal
 TakeposGroupSameProduct=Grupează liniile cu produse identice
 StartAParallelSale=Iniţiază o vânzare paralelă
-ControlCashOpening=Controlează sertarul de bani la deschiderea POS
-CloseCashFence=Închidere plafon de numerar
+SaleStartedAt=Vânzarea a început la %s
+ControlCashOpening=Controlați sertarul de numerar la deschiderea POS
+CloseCashFence= Închideți controlul casieriei
 CashReport=Raport numerar
 MainPrinterToUse=Imprimantă principală de utilizat
 OrderPrinterToUse=Imprimantă utilizată pentru comenzi
@@ -121,4 +122,5 @@ GiftReceiptButton=Adaugă un buton "Bon cadou"
 GiftReceipt=Bon cadou 
 ModuleReceiptPrinterMustBeEnabled= \nModulul Imprimanta bonuri trebuie să fi fost activat mai întâi
 AllowDelayedPayment= Permite plata cu întârziere
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+PrintPaymentMethodOnReceipts=Tipăriți metoda de plată pe bonuri|chitanțe 
+WeighingScale=Cântar
diff --git a/htdocs/langs/ro_RO/categories.lang b/htdocs/langs/ro_RO/categories.lang
index 921c1fbbdb8..5bce5a6db56 100644
--- a/htdocs/langs/ro_RO/categories.lang
+++ b/htdocs/langs/ro_RO/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Tag-uri/categorii proiecte
 UsersCategoriesArea=Tag-uri/categorii utilizatori
 SubCats=Subcategorii
 CatList=Lista tag-uri/categorii
+CatListAll=Listă tag-uri/categorii (toate tipurile)
 NewCategory=Tag/categorie nouă
 ModifCat=Modifică tag/categorie
 CatCreated=Tag/categorie creată
@@ -65,16 +66,22 @@ UsersCategoriesShort=Tag-uri/categorii utilizatori
 StockCategoriesShort=Tag-uri/categorii depozite
 ThisCategoryHasNoItems=Această categorie nu conţine nici un element.
 CategId=ID tag/categorie
+ParentCategory=Tag/categorie părinte
+ParentCategoryLabel=Etichetă tag/categorie părinte
 CatSupList=Listă tag-uri/categorii furnizori
-CatCusList=Listă taguri/categorii clienţi/prospecţi
+CatCusList=Listă tag-uri/categorii clienţi/prospecţi
 CatProdList=Listă tag-uri/categorii produse 
 CatMemberList=Listă tag-uri/categorii membri
 CatContactList=Listă tag-uri/categorii contacte
-CatSupLinks=Asocieri între furnizori şi tag-uri/categorii
+CatProjectsList=Listă tag-uri/categorii proiecte
+CatUsersList=Listă tag-uri/categorii utilizatori
+CatSupLinks=Legături între furnizori și tag-uri/categorii
 CatCusLinks=Asocieri între clienţi/prospecţi şi tag-uri/categorii
 CatContactsLinks=Asocieri între contacte/adrese şi tag-uri/categorii 
 CatProdLinks=Asocieri între produse/servicii şi tag-uri/categorii
-CatProJectLinks=Asocieri între proiecte și tag-uri/categorii
+CatMembersLinks=Legături între membri şi tag-uri/categorii
+CatProjectsLinks=Asocieri între proiecte și tag-uri/categorii
+CatUsersLinks=Legături între utilizatori şi tag-uri/categorii
 DeleteFromCat=Elimină din tag-uri/categoriii
 ExtraFieldsCategories=Atribute complementare
 CategoriesSetup=Configurare tag-uri/categorii
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index 08129c19f16..044d0a52957 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Verificați codul TV intracomunitar pe site-ul web al
 VATIntraManualCheck=De asemenea, puteți verifica manual pe site-ul web al UE <a href="%s" target="_blank"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Verificare imposibilă. Verificaţi dacă serviciul este furnizat de către statul membru ( %s).
 NorProspectNorCustomer=Nici prospect, nici client
-JuridicalStatus=Tip entitate juridică
+JuridicalStatus=Tipul entității comerciale
 Workforce=Forţa de muncă
 Staff=Angajati
 ProspectLevelShort=Potenţial
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index ea0496677f0..bd3bde9e637 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -111,7 +111,7 @@ Refund=Rambursare
 SocialContributionsPayments=Plata taxe sociale sau fiscale
 ShowVatPayment=Arata plata TVA
 TotalToPay=Total de plată
-BalanceVisibilityDependsOnSortAndFilters=Soldul este vizibil în această listă numai dacă tabelul este sortat ascendent pe %s și filtrat pentru 1 cont bancar
+BalanceVisibilityDependsOnSortAndFilters= Soldul este vizibil în această listă numai dacă tabelul este sortat și filtrat pe %s 1 cont bancar (fără alte filtre)
 CustomerAccountancyCode=Codul contabilității clienților
 SupplierAccountancyCode=Codul contabil al furnizorului
 CustomerAccountancyCodeShort=Cont contabil client
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Sunteţi sigur că doriţi să ştergeţi aceast
 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 baza venituri-cheltuieli%s.</b>
-CalcModeDebt=Analiza facturilor înregistrate cunoscute, chiar dacă acestea nu sunt încă înregistrate în registru.
+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.
 CalcModeLT1= Mode <b>%sRE pe facturi clienţi - facturi furnizori %s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balanța de venituri și cheltuieli, rezumat anual
 AnnualByCompanies=Soldul veniturilor și al cheltuielilor, pe grupuri predefinite de cont
 AnnualByCompaniesDueDebtMode=Soldul veniturilor și cheltuielilor, detaliu după grupuri predefinite, modul <b> %sCereri-Datorii%s </b> a spus <b> Contabilitatea de angajament </b>.
 AnnualByCompaniesInputOutputMode=Soldul veniturilor și cheltuielilor, detaliile după grupuri predefinite, modul <b> %sVenituri-cheltuieli%s </b> a spus <b> contabilitatea numerică </b>.
-SeeReportInInputOutputMode=Vedeți %sanaliza plăților%s pentru un calcul al plăților actuale efectuate chiar dacă acestea nu sunt încă înregistrate în registru.
-SeeReportInDueDebtMode=Vedeți %sanaliza facturilor%s pentru un calcul bazat pe facturi înregistrate cunoscute, chiar dacă acestea nu sunt încă înregistrate în registru.
-SeeReportInBookkeepingMode=Vedeți <b> %sraportul contabil%s </b> pentru un calcul la <b> Tabelul registrului contabil </b>
+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
+SeeReportInBookkeepingMode=Consultați <b>%sanaliza registrului contabil%s</b> pentru un raport bazat pe <b>Registrul de contabilitate</b>
 RulesAmountWithTaxIncluded=- Valoarea afişată este 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 .
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Se înregistrează în registrul dvs. cu cont
 SeePageForSetup=Vedeți 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
+LT1ReportByMonth=Taxa 2 raportare lunară
+LT2ReportByMonth=Taxa 3 raportare lunară
 LT1ReportByCustomers=Raportați taxa 2 de către un terț
 LT2ReportByCustomers=Raportați taxa 3 de către un terț
 LT1ReportByCustomersES=Raport pe terţ RE
 LT2ReportByCustomersES=Raport de terţă parte IRPF
 VATReport=Raport privind impozitul pe vânzare
 VATReportByPeriods=Raport privind impozitul pe vânzare după perioadă
+VATReportByMonth=Taxa pe vânzări TVA raportare lunară
 VATReportByRates=Raport privind impozitul pe vânzare pe tarife
 VATReportByThirdParties=Raportul privind impozitul pe vânzări de către terți
 VATReportByCustomers=Raportul privind impozitul pe vânzări de către client
diff --git a/htdocs/langs/ro_RO/cron.lang b/htdocs/langs/ro_RO/cron.lang
index 352feb51e3e..fbfafaf8424 100644
--- a/htdocs/langs/ro_RO/cron.lang
+++ b/htdocs/langs/ro_RO/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Şterge Job programat
 Permission23104 = Execută Job programat
 # Admin
 CronSetup=Setare Managementul joburilor programate
-URLToLaunchCronJobs=URL pentru a verifica și a lansa sarcini cron calificate 
-OrToLaunchASpecificJob=Sau pentru a verifica și  a lansa un anumit job
+URLToLaunchCronJobs=Adresă URL pentru a verifica și lansa joburi cron calificate din browser
+OrToLaunchASpecificJob=Sau pentru a verifica și lansa un anumit task dintr-un browser
 KeyForCronAccess=Cheie de securitate pentru URL de lansare a joburilor cron
 FileToLaunchCronJobs=Linie de comanda pentru a verifica și a lansa sarcini cron calificate
 CronExplainHowToRunUnix=Pe mediul Unix veţi  utiliza instrumentul crontab pentru a  rula urmatoarea  linia de comanda la fiecare 5 minute
 CronExplainHowToRunWin=În mediul Microsoft (tm) Windows, puteți utiliza instrumentele programate pentru a executa linia de comandă la fiecare 5 minute
 CronMethodDoesNotExists= Clasa %s nu conține metoda %s
+CronMethodNotAllowed=Metoda %s clasei %seste în lista neagră a metodelor interzise
 CronJobDefDesc=Profilele sarcinilor Cron sunt definite în fișierul descriptor de module. Când modulul este activat, acestea sunt încărcate și disponibile, astfel încât să puteți administra lucrările din meniul instrumentelor de administrare%s.
 CronJobProfiles=Lista profilurilor sarcinilor cron predefinite
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Numărul de lansări
 CronMaxRun=Număr maxim de lansări
 CronEach=Fiecare
 JobFinished=Job lansat şi terminat
+Scheduled=Programat
 #Page card
 CronAdd= Adaugă joburi
 CronEvery=Executa fiecare job
@@ -56,7 +58,7 @@ CronNote=Comenteaza
 CronFieldMandatory=Câmpurile %s sunt obligatorii
 CronErrEndDateStartDt=Data de sfârşit nu poate fi înaintea datei de început
 StatusAtInstall=Stare la instalarea modulului
-CronStatusActiveBtn=Activare
+CronStatusActiveBtn=Programare
 CronStatusInactiveBtn=Dezactivare
 CronTaskInactive=Acest post este dezactivat
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Backup local baza de date
 MakeLocalDatabaseDump=Creați o bază de date locală. Parametrii sunt: ​​compresie ("gz" sau "bz" sau "none"), tipul de backup (mysql, pgsql, auto) 1, "auto" sau nume de fișier de construit, număr de fișiere de rezervă de păstrat
 WarningCronDelayed=Atenție, în scopul performanței, indiferent de data următoare a executării activităţilor activate, este posibil ca activităţile dvs. să fie întârziate la maximum %s ore înainte de a rula
 DATAPOLICYJob=Curățător de date și anonimizator
+JobXMustBeEnabled=Jobul %s trebuie să fie activat
+# Cron Boxes
+LastExecutedScheduledJob=Ultima execuţie a jobului programat 
+NextScheduledJobExecute=Următoarea execuţie a jobului programat
+NumberScheduledJobError=Numărul de joburi programate cu eroare
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index 2a7f2df8659..01159bce39a 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Ncio eroare, dăm commit
 # Errors
 ErrorButCommitIsDone=Erori constatate dar încă nevalidate
 ErrorBadEMail=Emailul %s este greșit
+ErrorBadMXDomain=Email-ul %s pare greșit (domeniul nu are nicio înregistrare MX validă)
 ErrorBadUrl=Url-ul %s este greşit
 ErrorBadValueForParamNotAString=Valoare greșită pentru parametru. Se adaugă,  în general, atunci când traducerea lipsește.
+ErrorRefAlreadyExists=Referinţa <b>%s</b> există deja.
 ErrorLoginAlreadyExists=Login %s există deja.
 ErrorGroupAlreadyExists=Grupul %s există deja.
 ErrorRecordNotFound=Înregistrarea nu a fost găsit.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Unele campuri obligatorii nu au fost ocupate.
 ErrorSubjectIsRequired=Tema e-mailului este necesară
 ErrorFailedToCreateDir=Nu a reuşit să creeze un director. Verificaţi ca server Web utilizator are permisiuni pentru a scrie în directorul de Dolibarr documente. Dacă <b>safe_mode</b> parametru este activat pe această PHP, Dolibarr verifica faptul că fişierele PHP detine la server web utilizator (sau grup).
 ErrorNoMailDefinedForThisUser=Nu mail definite pentru acest utilizator
+ErrorSetupOfEmailsNotComplete=Configurarea email-urilor nu este finalizată
 ErrorFeatureNeedJavascript=Această caracteristică JavaScript trebuie activat pentru a fi la locul de muncă. Schimbare în acest setup - display.
 ErrorTopMenuMustHaveAParentWithId0=Un meniu de tip "Top" nu poate avea un părinte de meniu. Pune-0 în meniul părinte sau alege un meniu de tip "stânga".
 ErrorLeftMenuMustHaveAParentId=Un meniu de tip "stânga" trebuie să aibă o mamă id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Acest profil nume există deja pentru acest set de ex
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP de potrivire nu este completă.
 ErrorLDAPMakeManualTest=A. Ldif fişier a fost generat în directorul %s. Încercaţi să încărcaţi manual de la linia de comandă pentru a avea mai multe informatii cu privire la erori.
 ErrorCantSaveADoneUserWithZeroPercentage=Nu se poate salva o acțiune cu "starea nu a început" dacă se completează și câmpul "efectuat de".
-ErrorRefAlreadyExists=Ref utilizate pentru crearea există deja.
+ErrorRefAlreadyExists=Referinţa <b>%s</b> există deja.
 ErrorPleaseTypeBankTransactionReportName=Introduceți numele contului bancar unde trebuie raportată înregistrarea (Format YYYYMM sau YYYYMMDD)
 ErrorRecordHasChildren=Nu s-a reușit ștergerea înregistrării deoarece are unele înregistrări copii.
 ErrorRecordHasAtLeastOneChildOfType=Obiectul are cel puțin o copie de tipul %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Trebuie să alegeți dacă artico
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Reducerea pe care încercați să o aplicați este mai mare decât restul de plată. Împărțiți reducerea în 2 reduceri mai mici înainte.
 ErrorFileNotFoundWithSharedLink=Dosarul nu a fost găsit. Poate fi modificată cheia de distribuire sau fișierul a fost eliminat recent.
 ErrorProductBarCodeAlreadyExists=Codul de bare al produsului %s există deja în altă referință la produs.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Rețineți, de asemenea, că utilizarea produsului virtual pentru a avea o creștere / scădere automată a subproduselor nu este posibilă atunci când cel puțin un subprodus (sau subprodus de subproduse) are nevoie de un număr serial / lot.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Rețineți, de asemenea, că utilizarea kiturilor pentru a crește/micșora automat subprodusele nu este posibilă atunci când cel puțin un subprodus (sau subprodus al subproduselor) are nevoie de un număr de serie/lot. 
 ErrorDescRequiredForFreeProductLines=Descrierea este obligatorie pentru liniile cu produse gratuite
 ErrorAPageWithThisNameOrAliasAlreadyExists=Pagina/containerul <strong> %s </strong> are același nume sau un alias alternativ ca cel pe care încercați să îl utilizați
 ErrorDuringChartLoad=Eroare la încărcarea schemei de conturi. În cazul în care câteva conturi nu au fost încărcate, le puteți introduce în continuare manual.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Eroare, şirul înlocuitor este gol
 ErrorProductNeedBatchNumber=Eroare, produsul '<b>%s</b>' necesită un număr de lot/serie
 ErrorProductDoesNotNeedBatchNumber=Eroare, produsul '<b>%s</b>' nu acceptă un număr de lot/serie
 ErrorFailedToReadObject=Eroare, nu am putut citi tipul obiectului <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Eroare, parametrul <b>%s</b> trebuie să fie activat în <b>conf / conf.php<b> pentru a permite utilizarea interfeței de linie de comandă de către programatorul de job-uri intern
+ErrorLoginDateValidity=Eroare, această conectare se află în afara intervalului temporal valabil
+ErrorValueLength=Lungimea câmpului '<b>%s</b>' trebuie să fie mai mare de '<b>%s</b>'
+ErrorReservedKeyword=Cuvântul '<b>%s</b>' este un cuvânt cheie rezervat
+ErrorNotAvailableWithThisDistribution=Nu este disponibil cu această distribuție
+ErrorPublicInterfaceNotEnabled=Interfaţa publică nu a fost activată
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Limba noii pagini trebuie definită dacă este setată ca traducere a altei pagini 
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother= Limba nooi pagini nu trebuie să fie limba sursă dacă este setată ca traducere a altei pagini 
+ErrorAParameterIsRequiredForThisOperation=Un parametru este obligatoriu pentru această operațiune
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Parametrul tău PHP upload_max_filesize (%s) este mai mare decât paramentrul PHP post_max_size (%s). Aceasta nu este o configuraţie consistentă.
 WarningPasswordSetWithNoAccount= O parolă a fost trimisă către acest membru. Cu toate acestea, nu a fost creat nici un cont de utilizator. Astfel, această parolă este stocată, dar nu poate fi utilizată pentru autentificare. Poate fi utilizată de către un modul / interfată externă, dar dacă nu aveți nevoie să definiți un utilizator sau o parolă pentru un membru, puteți dezactiva opțiunea "Gestionați o conectare pentru fiecare membru" din modul de configurare membri. În cazul în care aveți nevoie să gestionați un utilizator, dar nu este nevoie de parolă, aveți posibilitatea să păstrați acest câmp gol pentru a evita acest avertisment. Notă: Adresa de e-mail poate fi utilizată ca utilizator la autentificare, în cazul în care membrul este legat de un utilizator. 
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Utilizatorul-ul a fost modificat. Din mot
 WarningAnEntryAlreadyExistForTransKey=Există deja o intrare pentru cheia de traducere pentru această limbă
 WarningNumberOfRecipientIsRestrictedInMassAction=Avertisment, numărul destinatarului diferit este limitat la <b> %s </b> când se utilizează acțiunile de masă din liste
 WarningDateOfLineMustBeInExpenseReportRange=Avertisment, data liniei nu este în intervalul raportului de cheltuieli
+WarningProjectDraft=Proiectul este încă în modul schiţă. Nu uitați să îl validați dacă intenționați să utilizați sarcini.
 WarningProjectClosed=Proiectul este închis. Trebuie să-l redeschideți mai întâi.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Anumite tranzacţii bancare au fost eliminate după ce a fost generat extrasul care le includea. Aşa că numărul de cecuri şi totalul extrasului pot diferi de cele din listă.
-WarningFailedToAddFileIntoDatabaseIndex=Avertizare, nu am putut adăuga fişierul în tabela index a ECM
+WarningFailedToAddFileIntoDatabaseIndex=Atenţie , nu s-a putut adăuga fișierului în tabela index al bazei de date ECM
+WarningTheHiddenOptionIsOn=Atenţie, opţiunea ascunsă <b>%s</b> este activă.
+WarningCreateSubAccounts=Atenție, nu puteți crea direct un cont secundar, trebuie să creați un terț sau un utilizator și să le atribuiți un cod contabil pentru a le găsi în această listă
+WarningAvailableOnlyForHTTPSServers=Disponibil numai dacă se utilizează conexiunea securizată HTTPS.
diff --git a/htdocs/langs/ro_RO/exports.lang b/htdocs/langs/ro_RO/exports.lang
index 34a37b99469..08f9a64d27e 100644
--- a/htdocs/langs/ro_RO/exports.lang
+++ b/htdocs/langs/ro_RO/exports.lang
@@ -133,3 +133,4 @@ KeysToUseForUpdates=Tastă (coloană) de utilizat pentru <b>actualizarea </b>dat
 NbInsert=Numărul liniilor inserate: %s
 NbUpdate=Numărul liniilor actualizate: %s
 MultipleRecordFoundWithTheseFilters=Au fost găsite mai multe înregistrări cu ajutorul acestor filtre: %s
+StocksWithBatch=Stocuri și locație (depozit) a produselor cu număr de lot/serie
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index c021a5391ca..ae1db7a2f66 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Emailuri introduse de utilizator
 MailingModuleDescDolibarrUsers=Utilizatorii cu emailuri
 MailingModuleDescThirdPartiesByCategories=Terți (pe categorii)
 SendingFromWebInterfaceIsNotAllowed=Trimiterea de pe interfața web nu este permisă.
+EmailCollectorFilterDesc=Toate filtrele trebuie să se potrivească pentru ca un email să fie colectat
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Linia %s în fişierul
@@ -125,12 +126,13 @@ TagMailtoEmail=Email destinatar (inclusiv linkul html "mailto:")
 NoEmailSentBadSenderOrRecipientEmail=Nu a fost trimis niciun email.  Expeditor sau destinatar email greșit . Verificați profilul utilizatorului.
 # Module Notifications
 Notifications=Anunturi
-NoNotificationsWillBeSent=Nu notificări prin email sunt planificate pentru acest eveniment şi a companiei
-ANotificationsWillBeSent=1 notificarea va fi trimis prin e-mail
-SomeNotificationsWillBeSent=%s notificări vor fi trimise prin e-mail
-AddNewNotification=Activați o nouă țintă/eveniment de notificare prin email
-ListOfActiveNotifications=Afișați toate țintele / evenimentele active pentru notificarea prin email
-ListOfNotificationsDone=Lista toate notificările e-mail trimis
+NotificationsAuto=Notificări automate
+NoNotificationsWillBeSent=Nu sunt planificate notificări automate prin e-mail pentru acest tip de eveniment și companie
+ANotificationsWillBeSent=1 notificare automată va fi transmisă pe email
+SomeNotificationsWillBeSent=%s notificări automate vor fi transmise pe email
+AddNewNotification=Abonare la o nouă notificare automată prin email (țintă/eveniment)
+ListOfActiveNotifications=Enumerați toate abonamentele active (ținte/evenimente) pentru notificări automate prin email
+ListOfNotificationsDone=Afişaţi toate notificările automate trimise prin email 
 MailSendSetupIs=Configurarea trimiterii  e-mail a fost de configurat la '%s'.  Acest mod nu poate fi utilizat pentru a trimite email-uri în masă.
 MailSendSetupIs2=Trebuie mai întâi să mergi, cu un cont de administrator, în meniu%sHome - Setup - EMails%s  pentru a schimba parametrul  <strong>'%s'</strong> de utilizare în modul '%s'.  Cu acest mod, puteți introduce configurarea serverului SMTP furnizat de furnizorul de servicii Internet și de a folosi facilitatea Mass email .
 MailSendSetupIs3=Daca aveti intrebari cu privire la modul de configurare al serverului SMTP, puteți cere la %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Fișierul importat trebuie să aibă format <strong>
 UseFormatInputEmailToTarget=Introduceți un șir cu formatul de email <strong>; nume; prenume; altul </strong>
 MailAdvTargetRecipients=Destinatari (selecție avansată)
 AdvTgtTitle=Completați câmpurile de introducere pentru a preselecta terții sau contactele/adresele vizate
-AdvTgtSearchTextHelp=Utilizați %% ca metacaractere. De exemplu, pentru a găsi toate elementele cum ar fi <b> jean, joe, jim </b>, puteți introduce <b> j%% </b>, de asemenea, puteți utiliza; ca separator pentru valoare și utilizați ! pentru excepția acestei valori. De exemplu, <b> jean; joe; jim%%;! Jimo;! Jima% </b> va viza toate jean, joe, începe cu jim dar nu jimo și nu tot ce începe cu jima
+AdvTgtSearchTextHelp= Se utilizează %% ca metacaracter. De exemplu, pentru a găsi toate articolele cum ar fi j<b>ean, joe, jim</b>, puteți introduce <b>j%%</b>, puteți utiliza și; ca separator pentru valoare și folosiți ! pentru exceptarea acestei valori. De exemplu <b>jean; joe; jim%%;!Jimo;!Jima%%</b> va viza toate jean, joe, cele care încep cu jim dar nu jimo și tot ce nu începe cu jima
 AdvTgtSearchIntHelp=Utilizați intervalul pentru a selecta valoarea int sau float
 AdvTgtMinVal=Valoare minima
 AdvTgtMaxVal=Valoare maxima
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Creare filtru
 AdvTgtOrCreateNewFilter=Numele noului filtru
 NoContactWithCategoryFound=Nu s-a găsit niciun contact / adresă cu o categorie 
 NoContactLinkedToThirdpartieWithCategoryFound=Nu s-a găsit niciun contact / adresă cu o categorie 
-OutGoingEmailSetup=Setarea emailului de ieșire
-InGoingEmailSetup=Configurarea emailului de primire
-OutGoingEmailSetupForEmailing=Setup email de ieşire( pentru modulul %s)
-DefaultOutgoingEmailSetup=Configurarea implicită a emailurilor de ieșire
+OutGoingEmailSetup= Email-uri trimise
+InGoingEmailSetup=Email-uri primite
+OutGoingEmailSetupForEmailing=Email-uri trimise (pentru modulul %s)
+DefaultOutgoingEmailSetup=Aceeași configurație ca şi configurarea globală de trimitere email
 Information=Informatie
 ContactsWithThirdpartyFilter=Contacte cu filtrul terț
 Unanswered=Fără răspuns
 Answered=Răspuns
 IsNotAnAnswer=Nu răspunde (e-mail inițial)
 IsAnAnswer= Este un răspuns al unui email inițial
+RecordCreatedByEmailCollector=Înregistrare creată de colectorul de email %sdin adresa %s
+DefaultBlacklistMailingStatus=Stare implicită a contactului care refuză primirea de email-uri bulk
+DefaultStatusEmptyMandatory= Necompletat, dar obligatoriu 
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 58dea3a79cb..8edaaa8f73e 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Nu există șablon disponibil pentru acest tip de email
 AvailableVariables=Variabile de substituţie disponibile
 NoTranslation=Fără traducere
 Translation=Traduceri
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Introdu criterii de căutare valide
+EnterADateCriteria= Introduceți un criteriu de tip dată
 NoRecordFound=Nicio înregistrare  gasită
 NoRecordDeleted=Nu s-au șters înregistrări
 NotEnoughDataYet=Nu sunt date
@@ -85,6 +87,8 @@ 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
+HomePage=Acasă
 RecordSaved=Înregistrare salvată
 RecordDeleted=Înregistrare ştearsă
 RecordGenerated=Înregistrată generată
@@ -220,6 +224,7 @@ Value=Valoare
 PersonalValue=Valoare personalizată
 NewObject=Nou %s
 NewValue=Valoare nouă
+OldValue=Valoare anterioară %s
 CurrentValue=Valoarea curentă
 Code=Cod
 Type=Tip
@@ -433,6 +438,7 @@ RemainToPay=Rămas de plată
 Module=Modul/Aplicaţie
 Modules=Module/Aplicații
 Option=Opţiune
+Filters=Filtre
 List=Listă
 FullList=Listă completă
 FullConversation=Conversaţie integrală
@@ -650,6 +656,7 @@ SupplierPreview=Previzualizare furnizor
 ShowCustomerPreview=Afişează Preview client
 ShowSupplierPreview=Afișați previzualizarea furnizorului
 RefCustomer=Ref. client
+InternalRef=Ref. internă
 Currency=Moneda
 InfoAdmin=Informaţii pentru administratori
 Undo=Anulaţi
@@ -671,7 +678,7 @@ SendMail=Trimite un email
 Email=Email
 NoEMail=Niciun email
 AlreadyRead=Citit deja
-NotRead=Necitit
+NotRead=Necitită
 NoMobilePhone=Fără număr mobil
 Owner=Proprietar
 FollowingConstantsWillBeSubstituted=Următoarele constante vor fi înlocuite cu valoarea corespunzătoare.
@@ -1107,3 +1114,9 @@ UpToDate=Actualizat la zi
 OutOfDate=Expirat
 EventReminder=Memento eveniment
 UpdateForAllLines=Actualizare pentru toate liniile
+OnHold=În aşteptare
+Civility=Formulă de adresare
+AffectTag=Afectează eticheta
+ConfirmAffectTag=Afectare multiplă etichete
+ConfirmAffectTagQuestion=Sigur doriți să afectați etichetele înregistrărilor %s selectat(e)?
+CategTypeNotFound=Nu s-a găsit niciun tip de etichetă pentru tipul de înregistrări
diff --git a/htdocs/langs/ro_RO/modulebuilder.lang b/htdocs/langs/ro_RO/modulebuilder.lang
index 090269ab52f..219513f661d 100644
--- a/htdocs/langs/ro_RO/modulebuilder.lang
+++ b/htdocs/langs/ro_RO/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=Pagina PHP pentru a crea/edita/vizualiza o înregistrare
 PageForAgendaTab=Pagina PHP pentru fila eveniment
 PageForDocumentTab=Pagina PHP pentru fila document
 PageForNoteTab=Pagina PHP pentru fila note
+PageForContactTab=Pagina PHP pentru fila contact
 PathToModulePackage=Calea pentru zipul pachetului de module/aplicații
 PathToModuleDocumentation=Calea către fişierul documentaţie al modulului/aplicaţiei (%s)
 SpaceOrSpecialCharAreNotAllowed=Spațiile sau caracterele speciale nu sunt permise.
@@ -77,7 +78,7 @@ IsAMeasure=Este o măsură
 DirScanned=Directorul scanat
 NoTrigger=Niciun declanșator
 NoWidget=Nu există widget
-GoToApiExplorer=Mergeți la exploratorul API
+GoToApiExplorer=Explorer API
 ListOfMenusEntries=Lista intrărilor din meniu
 ListOfDictionariesEntries=Listă înregistrări dicţionare
 ListOfPermissionsDefined=Lista permisiunilor definite
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Dacă aveți cunoștințe despre SQL și PHP, puteți f
 SeeTopRightMenu=Vedeți <span class="fa fa-bug"> </span> din meniul din dreapta sus
 AddLanguageFile=Adăugați fișierul de limbă
 YouCanUseTranslationKey=Puteți folosi aici o cheie care este cheia de traducere găsită în fișierul de limbă (vezi fila "Limbi")
-DropTableIfEmpty=(Ștergeți tabelul dacă este gol)
+DropTableIfEmpty=(Distruge tabelul dacă este gol)
 TableDoesNotExists=Tabelul %s nu există
 TableDropped=Tabelul %s a fost șters
 InitStructureFromExistingTable=Construiți șirul de structură al unui tabel existent
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Utilizează un URL specificat de editor
 UseSpecificFamily = Utilizează o familie specifică
 UseSpecificAuthor = Utilizează un autor specific
 UseSpecificVersion = Utilizează o versiune iniţială specifică
-ModuleMustBeEnabled=Modulul/aplicaţia trebuie activată mai întâi
 IncludeRefGeneration=Referinţa obiectului trebuie să fie generată automat
 IncludeRefGenerationHelp=Bifează aceasta dacă vrei să incluzi cod de management pentru generarea automată a referinţei
 IncludeDocGeneration=Vreau să generez documente din obiect
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Tip de câmpuri: <br>varchar (99), double(24,8), real, text, ht
 AsciiToHtmlConverter=Convertor ASCII la HTML
 AsciiToPdfConverter=Convertor ASCII la PDF
 TableNotEmptyDropCanceled=Tabelul nu este gol. Operaţiunea de drop a fost anulată. 
+ModuleBuilderNotAllowed=Generatorul de module este disponibil, dar nu este permis utilizatorului dvs.
diff --git a/htdocs/langs/ro_RO/mrp.lang b/htdocs/langs/ro_RO/mrp.lang
index ca6af90cf80..7e8c774e52d 100644
--- a/htdocs/langs/ro_RO/mrp.lang
+++ b/htdocs/langs/ro_RO/mrp.lang
@@ -78,3 +78,27 @@ TotalCost=Cost total
 BOMTotalCost=Costul pentru fabricaţia acestui Bon de consum în funcție de costul fiecărei cantități și produs de consumat (utilizați Prețul de cost, dacă este definit, altfel Prețul mediu ponderat, dacă este definit, altfel cel mai bun preț de achiziție)
 GoOnTabProductionToProduceFirst=Mai întâi trebuie să fi început producția pentru a închide o Comandă de fabricație (Vezi fila '%s'). Puteți anula. 
 ErrorAVirtualProductCantBeUsedIntoABomOrMo=Un kit nu poate fi folosit într-un BOM sau MO
+Workstation=Staţie de lucru 
+Workstations=Staţii de lucru
+WorkstationsDescription=Management staţii de lucru
+WorkstationSetup = Configurare staţii de lucru
+WorkstationSetupPage = Pagină setup Staţii de lucru
+WorkstationAbout = Despre Staţie de lucru
+WorkstationAboutPage = Pagină Despre Staţii de lucru
+WorkstationList=Listă staţii de lucru
+WorkstationCreate=Adăugare staţie de lucru nouă
+ConfirmEnableWorkstation=Eşti sigur că vrei să activezi staţia de lucru <b>%s</b> ?
+EnableAWorkstation=Activare staţie de lucru
+ConfirmDisableWorkstation=Eşti sigur că vrei să dezactivezi staţia de lucru <b>%s</b> ?
+DisableAWorkstation=Dezactivare staţie de lucru
+DeleteWorkstation=Ştergere
+NbOperatorsRequired=Nr. de operatori necesar
+THMOperatorEstimated=Total ore minute estimat per operator
+THMMachineEstimated=Total ore minute estimat per maşină
+WorkstationType=Tip staţie de lucru
+Human=Uman
+Machine=Maşină
+HumanMachine=Uman / Maşină
+WorkstationArea=Staţii de lucru
+Machines=Maşini
+THMEstimatedHelp=Această rată face posibilă definirea unui cost prognozat al articolului
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index 545383cb7a3..1f6709568f6 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -5,8 +5,6 @@ Tools=Instrumente
 TMenuTools=Instrumente
 ToolsDesc=Toate instrumentele care nu sunt incluse în alte intrări în meniu sunt grupate aici. <br> Toate instrumentele pot fi accesate prin meniul din stânga.
 Birthday=Zi de naştere
-BirthdayDate=Data naştere
-DateToBirth=Data naşterii
 BirthdayAlertOn=ziua de nastere de alertă activă
 BirthdayAlertOff=ziua de nastere de alertă inactiv
 TransKey=Traducerea cheii TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Luna anterioară (numărul 1-12) de la data facturării
 TextPreviousMonthOfInvoice=Luna anterioară (textul) datei facturii
 NextMonthOfInvoice=Luna următoare (numărul 1-12) de la data facturării
 TextNextMonthOfInvoice=În luna următoare (textul) datei facturii
+PreviousMonth=Luna anterioară
+CurrentMonth=Luna curentă
 ZipFileGeneratedInto=Fișierul Zip generat în <b> %s </b>.
 DocFileGeneratedInto=Fișierul doc generat în <b> %s </b>.
 JumpToLogin=Deconectată. Accesați pagina de conectare ...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Raportul de cheltuieli validat (aprobarea necesar
 Notify_EXPENSE_REPORT_APPROVE=Raportul privind cheltuielile a fost aprobat
 Notify_HOLIDAY_VALIDATE=Lăsați cererea validată (este necesară aprobarea)
 Notify_HOLIDAY_APPROVE=Lăsați cererea aprobată
+Notify_ACTION_CREATE=Acţiune adăugată în Agendă
 SeeModuleSetup=Vezi setare modul %s
 NbOfAttachedFiles=Numărul de ataşat fişiere / documente
 TotalSizeOfAttachedFiles=Total marimea ataşat fişiere / documente
@@ -99,6 +100,7 @@ PredefinedMailContentSendShipping=__(Salut)__\n\nVeți găsi transportul __REF__
 PredefinedMailContentSendFichInter=__(Salut)__\n\nConsultați intervenția __REF__ atașată\n\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Puteți face clic pe linkul de mai jos pentru a efectua plata dacă nu este deja făcută.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Salut)__\n\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Memento eveniment "__EVENT_LABEL__" în data de  __EVENT_DATE__ la ora __EVENT_TIME__<br><br> Acesta este un mesaj automat, vă rugăm să nu răspundeți.
 DemoDesc=Dolibarr este un sistem ERP/CRM compact care suportă mai multe module de afaceri. O prezentare Demo pentru toate modulele nu are sens deoarece acest scenariu nu se produce niciodată (câteva sute disponibile). Deci, sunt disponibile mai multe profiluri demo.
 ChooseYourDemoProfil=Alegeți profilul demo care se potrivește cel mai bine nevoilor dvs. ...
 ChooseYourDemoProfilMore=... sau construiți propriul profil <br> (selectarea manuală a modulelor)
@@ -137,7 +139,7 @@ Right=Dreapta
 CalculatedWeight=Calculat în greutate
 CalculatedVolume=Calculat volum
 Weight=Greutate
-WeightUnitton=tonner
+WeightUnitton=tonă
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ EMailTextExpenseReportValidated=Raportul de cheltuieli %s a fost validat.
 EMailTextExpenseReportApproved=Raportul de cheltuieli %s a fost aprobat.
 EMailTextHolidayValidated=Cererea de concediu %s a fost validată.
 EMailTextHolidayApproved=Cererea de concediu %s a fost aprobată.
+EMailTextActionAdded=Acțiunea %s a fost adăugată în Agendă.
 ImportedWithSet=Import de date
 DolibarrNotification=Notificare Automată
 ResizeDesc=Introduceţi lăţimea noi <b>sau</b> înălţimea noi. Raportul va fi păstrat în timpul redimensionare ...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/adresă creată de colectorul de email-ur
 ProjectCreatedByEmailCollector=Proiect creat de colectorul de email-uri din email-ul cu MSGID %s
 TicketCreatedByEmailCollector=Tichet creat de colectorul de email-uri din email-ul cu MSGID %s
 OpeningHoursFormatDesc=Foloseşte un - pentru a separa orele de lucru.<br>Foloseşte un spaţiu pentru a introduce intervale oarare diferite.<br>Exemplu: 8-12 14-18
+PrefixSession=Prefix pentru ID-ul sesiunii
 
 ##### Export #####
 ExportsArea=Export
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index b65779946bc..dec5f4abd1c 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Completează cu data ultimelor linii de servicii
 MultiPricesAbility=Segmente multiple de preț pentru fiecare produs / serviciu (fiecare client se află într-un singur segment de preț)
 MultiPricesNumPrices=Numărul de preţ
 DefaultPriceType=Baza prețurilor în mod implicit (cu sau fără taxe) la adăugarea noilor prețuri de vânzare
-AssociatedProductsAbility=Activeaz kit-uri (produse virtuale)
+AssociatedProductsAbility=Activare kituri (set de mai multe produse) 
+VariantsAbility=Activare variante (variații ale produselor, de exemplu, culoare, dimensiune)
 AssociatedProducts=Kit-uri
 AssociatedProductsNumber=Numărul de produse care compun acest kit
 ParentProductsNumber=Numărul  pachetelor produselor  părinte
@@ -169,6 +170,8 @@ SuppliersPrices=Prețurile furnizorului
 SuppliersPricesOfProductsOrServices=Prețurile furnizorilor (de produse sau servicii)
 CustomCode=Cod vamal/Marfă/Cod HS
 CountryOrigin=Ţara de origine
+RegionStateOrigin=Regiune de origine
+StateOrigin=Judeţ/regiune de origine
 Nature=Natură produs(materie primă/produs finit)
 NatureOfProductShort=Natură produs
 NatureOfProductDesc=Materie primă sau produs finit
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Foloseşte preţul fix
 PriceByQuantity=Preţuri diferite pe cantitate
 DisablePriceByQty=Dezactivați prețurile în funcție de cantitate
 PriceByQuantityRange=Interval cantitate
-MultipriceRules=Regulile segmentului de prețuri
+MultipriceRules=Prețuri automate pentru segment
 UseMultipriceRules=Utilizați regulile segmentului de preț (definite în configurarea modulului de produs) pentru a calcula automat prețurile tuturor celorlalte segmente în funcție de primul segment
 PercentVariationOver=Variația %% peste %s
 PercentDiscountOver=%% reducere peste %s
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index 25a12b3f4cd..f56ec6dd958 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -76,15 +76,16 @@ MyActivities=Activităţile / Taskurile mele
 MyProjects=Proiectele mele
 MyProjectsArea=Zona proiectelor mele
 DurationEffective=Durata efectivă
-ProgressDeclared=Progres calculat
+ProgressDeclared=Progres real declarat
 TaskProgressSummary=Progres task
 CurentlyOpenedTasks=Taskuri deschise recent
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=Progresul declarat este mai mic cu %s decât cel calculat
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Progresul declarat este mai mare cu %s decât cel calculat
-ProgressCalculated=Progres calculat
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=Progresul real declarat este mai mic cu %s decât progresul consumului 
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Progresul real declarat este mai mare cu %s decât progresul consumului 
+ProgressCalculated=Progres consum
 WhichIamLinkedTo=la care sunt atribuit
 WhichIamLinkedToProject=pentru care sunt atribuit la proiect
 Time=Timp
+TimeConsumed=Consumat
 ListOfTasks=Lista de sarcini
 GoToListOfTimeConsumed=Accesați lista de timp consumată
 GanttView=Vizualizare Gantt 
diff --git a/htdocs/langs/ro_RO/recruitment.lang b/htdocs/langs/ro_RO/recruitment.lang
index d2fb1c6d642..b09ecb6b976 100644
--- a/htdocs/langs/ro_RO/recruitment.lang
+++ b/htdocs/langs/ro_RO/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=Oferta de job este închisă. Postul a fost ocupat.
 JobClosedTextCanceled=Oferta de job este închisă.
 ExtrafieldsJobPosition=Atribute complementare (oferte job)
 ExtrafieldsCandidatures=Atribute complementare (aplicări job)
+MakeOffer=Fă o ofertă
diff --git a/htdocs/langs/ro_RO/sendings.lang b/htdocs/langs/ro_RO/sendings.lang
index 763d028c91f..8e18a146120 100644
--- a/htdocs/langs/ro_RO/sendings.lang
+++ b/htdocs/langs/ro_RO/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Alte livrări pentru această comandă
 SendingsAndReceivingForSameOrder=Expedieri și documente pentru această comandă
 SendingsToValidate=Livrări de validat
 StatusSendingCanceled=Anulată
+StatusSendingCanceledShort=Anulata
 StatusSendingDraft=Schiţă
 StatusSendingValidated=Validată (produse  de livrat sau deja livrate)
 StatusSendingProcessed=Procesată
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Mai întâi trebuie să validezi comanda înain
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Model complet pentru dispoziţie de livrare  (logo. ..)
+DocumentModelStorm=Modele de documente mult mai complete pentru chitanțe de livrare și compatibilitate cu câmpurile suplimentare(sigla ...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constanta EXPEDITION_ADDON_NUMBER nu este definită
 SumOfProductVolumes=Volumul total al produselor
 SumOfProductWeights=Greutatea totală a produselor
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index ae3b0d063aa..50d0128e8fc 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Stoc valoric
 UserWarehouseAutoCreate=Creați automat un depozit utilizator atunci când creați un utilizator
 AllowAddLimitStockByWarehouse=Gestionează, de asemenea, valoarea pentru stocul minim și cel dorit pe perechi (produs-depozit), pe lângă valoarea pentru stocul minim și dorit pe produs
 RuleForWarehouse=Reguli pentru depozite
+WarehouseAskWarehouseDuringPropal=Setează un depozit pe oferta comercială
 WarehouseAskWarehouseDuringOrder=Setează un depozit pe comenzile de vânzare
 UserDefaultWarehouse=Setează un depozit pe utilizatori
 MainDefaultWarehouse=Depozit implicit
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Setați valoarea la 0 pentru a reseta câmpul cantitate<br>
 UpdateByScaning=Actualizare 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.
diff --git a/htdocs/langs/ro_RO/ticket.lang b/htdocs/langs/ro_RO/ticket.lang
index 6c582307da8..70ee1b31ebd 100644
--- a/htdocs/langs/ro_RO/ticket.lang
+++ b/htdocs/langs/ro_RO/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Tipuri de tichete
 TicketDictCategory=Tichet - Grupuri
 TicketDictSeverity=Tichet - Severități
 TicketDictResolution=Tichet - Rezoluție
-TicketTypeShortBUGSOFT=Logică disfuncţională
-TicketTypeShortBUGHARD=Material disfuncţional
-TicketTypeShortCOM=Întrebare comercială
 
+TicketTypeShortCOM=Întrebare comercială
 TicketTypeShortHELP=Solicitare funcţionalitate
 TicketTypeShortISSUE=Solicitare, eroare sau problemă
 TicketTypeShortREQUEST=Solicitare de modificare sau îmbunătăţire
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Altele
 TicketSeverityShortLOW=Scăzut
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Mare
-TicketSeverityShortBLOCKING=Critic / Blocaj
+TicketSeverityShortBLOCKING=Critic, blocant
 
 ErrorBadEmailAddress=Câmpul "%s" este incorect
 MenuTicketMyAssign=Tichetele mele
@@ -60,7 +58,6 @@ OriginEmail=Sursa emailului
 Notify_TICKET_SENTBYMAIL=Trimite mesaj tichet pe email
 
 # Status
-NotRead=Necitit
 Read=Citit
 Assigned=Atribuit
 InProgress=In progres
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Interfața publică permite vizitatorilor să
 TicketsAutoAssignTicket=Desemnați automat utilizatorul care a creat tichetul
 TicketsAutoAssignTicketHelp=La crearea unui tichet, utilizatorul poate fi automat alocat tichetului.
 TicketNumberingModules=Modul de numerotare a tichetelor
+TicketsModelModule=Şabloane documente pentru tichete
 TicketNotifyTiersAtCreation=Notificați terțul la creare
 TicketsDisableCustomerEmail=Dezactivați întotdeauna email-urile atunci când un tichet este creat din interfața publică 
 TicketsPublicNotificationNewMessage=Trimite email(uri) când un mesaj nou este adăugat
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Starea modificată: %s la %s
 TicketNotNotifyTiersAtCreate=Nu notificați compania la crearea
 Unread=Necitită
 TicketNotCreatedFromPublicInterface=Indisponibil. Tichetul nu a fost creat din interfaţa publică.
-PublicInterfaceNotEnabled=Interfaţa publică nu a fost activată
 ErrorTicketRefRequired=Denumirea de referință al tichetului este necesară
 
 #
diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
index 5e2dab5d97a..f1ca739ae33 100644
--- a/htdocs/langs/ro_RO/website.lang
+++ b/htdocs/langs/ro_RO/website.lang
@@ -30,7 +30,6 @@ EditInLine=Editați inline
 AddWebsite=Adaugă pagina web
 Webpage=Pagina web / container
 AddPage=Adăugați o pagină / un container
-HomePage=Acasă
 PageContainer=Pagina
 PreviewOfSiteNotYetAvailable=Previzualizarea site-ului dvs. web <strong> %s </strong> nu este încă disponibil. Mai întâi trebuie să '<strong> Importați un șablon complet de site-uri web </strong>' sau doar '<strong> Adăugați o pagină / container </strong>'.
 RequestedPageHasNoContentYet=Pagina solicitată cu id %s nu are încă conținut, sau fișierul cache cache.php a fost eliminat. Editați conținutul paginii pentru a rezolva această problemă.
@@ -101,7 +100,7 @@ EmptyPage=Pagina goală
 ExternalURLMustStartWithHttp=Adresa URL externă trebuie să înceapă cu http:// sau https://
 ZipOfWebsitePackageToImport=Încărcați fișierul Zip cu pachetul șablon website
 ZipOfWebsitePackageToLoad=sau Alegeți un pachet șablon website încorporat disponibil
-ShowSubcontainers=Includeți conținut dinamic
+ShowSubcontainers=Afişare conţinut dinamic
 InternalURLOfPage=Adresa URL internă a paginii
 ThisPageIsTranslationOf=Această pagină/recipient este o traducere a
 ThisPageHasTranslationPages=Această pagină / recipient are traducere
@@ -137,3 +136,4 @@ RSSFeedDesc=Puteți obține un flux RSS al celor mai recente articole cu tipul '
 PagesRegenerated=%s pagină(i) /container(e) regenerate
 RegenerateWebsiteContent=Regenerați fișierele cache ale site-ului web
 AllowedInFrames=Permis în Frame-uri
+DefineListOfAltLanguagesInWebsiteProperties=Definiți lista tuturor limbilor disponibile în proprietățile site-ului web.
diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang
index d0c4e6162c6..27cce1a4c2e 100644
--- a/htdocs/langs/ro_RO/withdrawals.lang
+++ b/htdocs/langs/ro_RO/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Ultimele încasări de debit direct %s
 MakeWithdrawRequest=Efectuați o solicitare de plată cu debit direct
 MakeBankTransferOrder=Solicitare transfer de credit
 WithdrawRequestsDone=%s au fost înregistrate cererile de debitare directă
+BankTransferRequestsDone=%s solicitări de transfer de credit înregistrate
 ThirdPartyBankCode=Codul bancar al terțului
 NoInvoiceCouldBeWithdrawed=Nici o factură nu a fost debitată cu succes. Verificați dacă facturile sunt pe companiile cu un IBAN valabil și că IBAN are un UMR (referință unică de mandat) cu modul <strong> %s </strong>.
 ClassCredited=Clasifica creditat
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Data executării
 CreateForSepa=Creați un fișier de debit direct
-ICS=Identificatorul creditorului CI
+ICS=Identificator creditor CI pentru debit direct
+ICSTransfer=Identificator creditor CI pentru transfer bancar
 END_TO_END=Eticheta "EndToEndId" SEPA XML - Id unic atribuit pentru fiecare tranzacție
 USTRD=Eticheta XML "nestructurată" SEPA
 ADDDAYS=Adăugați zile la data de executare
@@ -146,3 +148,5 @@ InfoRejectSubject=Comanda de debitare directă a fost refuzată
 InfoRejectMessage=Bună ziua, <br> <br> ordinul de plată prin debit direct al facturii %s aferente companiei %s, cu o sumă de %s a fost refuzată de bancă. <br> <br> - <br> %s
 ModeWarning=Opţiunea pentru modul real, nu a fost stabilit, ne oprim după această simulare
 ErrorCompanyHasDuplicateDefaultBAN=Compania cu id %s are mai multe conturi bancare implicite. Nu se poate determina cel care se doreşte a fi utilizat.
+ErrorICSmissing=ICS lipsă în contul bancar %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Suma totală a ordinului de debitare directă diferă de suma liniilor
diff --git a/htdocs/langs/ro_RO/workflow.lang b/htdocs/langs/ro_RO/workflow.lang
index d463b4a8433..de679361c0f 100644
--- a/htdocs/langs/ro_RO/workflow.lang
+++ b/htdocs/langs/ro_RO/workflow.lang
@@ -16,8 +16,10 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasificați comanda de vânzări s
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasificați propunerea furnizorului sursă asociată ca fiind facturată atunci când factura furnizorului este validată (și dacă valoarea facturii este aceeași cu valoarea totală a propunerii asociate)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasificați comanda de vânzări sursă asociată ca fiind facturată atunci când factura furnizorului este validată (și dacă valoarea facturii este aceeași cu valoarea totală a comenzii asociate)
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+descWORKFLOW_BILL_ON_RECEPTION=Clasificați recepțiile la "facturate" atunci când este validată o comandă de achiziţie asociată
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Închideți toate intervențiile legate de tichet  atunci când tichetul este închis
 AutomaticCreation=Creare automată
 AutomaticClassification=Clasificare automată
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE= Clasificați livrarea asociată ca închisă atunci când factura clientului este validată
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index bc73a4d82a0..2b44d84c585 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=This service
 ThisProduct=This product
 DefaultForService=По умолчанию для услуги
 DefaultForProduct=По умолчанию для товара
+ProductForThisThirdparty=Product for this thirdparty
+ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Больше настроек бухгалтерии выполняется из меню %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Дата
 Docref=Ссылка
 LabelAccount=Метка бухгалтерского счёта
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Журнал
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Не согласовано
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 8894f182715..621f545e086 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Внешний вид
 SetupArea=Настройка
 UploadNewTemplate=Загрузить новый шаблон(ы)
 FormToTestFileUploadForm=Форма для проверки загрузки файлов (в зависимости от настройки)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Примечание: "Да" влияет только тогда, когда модуль <b>%s</b> включен
 RemoveLock=Удалите/переименуйте файл <b>%s</b>, если он существует, чтобы разрешить использование инструмента обновления/установки.
 RestoreLock=Восстановите файл <b>%s</b> с разрешением только для чтение, чтобы отключить дальнейшее использование инструмента обновления/установки.
@@ -85,7 +87,6 @@ ShowPreview=Предварительный просмотр
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Предварительный просмотр не доступен
 ThemeCurrentlyActive=Текущая тема
-CurrentTimeZone=Текущий часовой пояс в настройках PHP
 MySQLTimeZone=Часовой пояс БД (MySQL)
 TZHasNoEffect=Даты хранятся и возвращаются сервером базы данных, как если бы они хранились в виде переданной строки. Часовой пояс действует только при использовании функции UNIX_TIMESTAMP (которая не должна использоваться Dolibarr, поэтому часовая зона (TZ) базы данных не должна иметь никакого эффекта, даже если она изменилась после ввода данных).
 Space=Пробел
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Эта область обеспечивает функци
 Purge=Очистить
 PurgeAreaDesc=Эта страница позволяет вам удалить все файлы, созданные или сохраненные Dolibarr (временные файлы или все файлы в каталоге <b> %s</b> ). Использование этой функции обычно не требуется. Он предоставляется в качестве обходного пути для пользователей, чей Dolibarr размещен поставщиком, который не предлагает разрешения на удаление файлов, созданных веб-сервером.
 PurgeDeleteLogFile=Удаление файлов журналов, включая <b>%s</b> определенный для модуля Syslog (без риска потери данных)
-PurgeDeleteTemporaryFiles=Удалить все временные файлы (без риска потери данных). Примечание: Удаление выполняется только в том случае, если временный каталог был создан 24 часа назад.
-PurgeDeleteTemporaryFilesShort=Удаление временных файлов
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 PurgeDeleteAllFilesInDocumentsDir=Удалить все файлы в каталоге: <b>%s</b> . <br> Это удалит все сгенерированные документы, связанные с элементами (контрагенты, счета и т.д.), файлы, загруженные в модуль ECM, резервные копии базы данных и временные файлы.
 PurgeRunNow=Очистить сейчас
 PurgeNothingToDelete=Нет директории или файла для удаления.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Предпочитаемые партнёры
 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</b></a>
 HelpCenterDesc1=Вот некоторые ресурсы для получения помощи и поддержки с Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Примеры с текущей конфигураци
 ListOfDirectories=Список каталогов с шаблонами OpenDocument
 ListOfDirectoriesForModelGenODT=Список каталогов, содержащих файлы шаблонов в формате OpenDocument. <br><br> Укажите здесь полный путь к каталогу. <br> Каждый каталог с новой строки. <br> Чтобы добавить каталог GED-модуля, добавьте здесь <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b> . <br><br> Файлы в этих каталогах должны заканчиваться на <b>.odt</b> или <b>.ods</b> .
 NumberOfModelFilesFound=Количество файлов шаблонов ODT/ODS, найденных в этих каталогах
-ExampleOfDirectoriesForModelGen=Примеры синтаксиса: <br> C: \\ MYDIR <br> / home / mydir <br> DOL_DATA_ROOT / ecm / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Прежде чем сохранить шаблоны в этих каталогах прочитайте документацию на Wiki чтобы узнать, как создать свой шаблоны ODT документов:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Расположение Имени / Фамилиии
@@ -406,7 +408,7 @@ UrlGenerationParameters=Параметры безопасных URL`ов
 SecurityTokenIsUnique=Использовать уникальный параметр securekey для каждого URL
 EnterRefToBuildUrl=Введите ссылку на объект %s
 GetSecuredUrl=Получить рассчитанный URL
-ButtonHideUnauthorized=Скрыть кнопки для пользователей без прав администратора для несанкционированных действий вместо отображения серых отключенных кнопок
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Предыдущее значение НДС
 NewVATRates=Новое значение НДС
 PriceBaseTypeToChange=Изменять базовые цены на определенную величину
@@ -668,7 +670,7 @@ Module54000Desc=Прямая печать (без открытия докуме
 Module55000Name=Голосование, обзор или голосование
 Module55000Desc=Создавайте онлайн-опросы, обзоры или голосования (например, Doodle, Studs, RDVz и т. Д.)
 Module59000Name=Наценки
-Module59000Desc=Модуль управления наценками
+Module59000Desc=Module to follow margins
 Module60000Name=Комиссии
 Module60000Desc=Модуль управления комиссиями
 Module62000Name=Обязанности по доставке товаров
@@ -1306,7 +1308,7 @@ YouUseBestDriver=Вы используете драйвер %s, который 
 YouDoNotUseBestDriver=Вы используете драйвер %s, но рекомендуется драйвер %s.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Поисковая оптимизация
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 BrowserIsOK=Вы используете веб-браузер %s. Этот браузер подходит в отношении безопасности и производительности.
 BrowserIsKO=Вы используете веб-браузер %s. Этот браузер, как известно, является плохим выбором по безопасности, производительности и надежности. Мы рекомендуем использовать Firefox, Chrome, Opera или Safari.
@@ -1596,8 +1598,13 @@ ServiceSetup=Настройка модуля Услуг
 ProductServiceSetup=Настройка модулей Продуктов и Услуг
 NumberOfProductShowInSelect=Максимальное количество товаров для отображения в комбинированных списках выбора (0 = без ограничений)
 ViewProductDescInFormAbility=Отображать описания продуктов в формах (в противном случае отображается во всплывающей подсказке)
+DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
+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=Отображать описания продуктов на языке контрагентов
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 UseSearchToSelectProductTooltip=Также, если у вас есть большое количество продуктов (> 100 000), вы можете увеличить скорость, установив постоянное значение PRODUCT_DONOTSEARCH_ANYWHERE равное 1 в меню «Настройка» - «Другие настройки». Поиск будет ограничен началом строки.
 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=Стандартный вид штрих-кода, используемого для продуктов
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Персонализированные меню, не
 NewMenu=Новое меню
 MenuHandler=Меню обработчик
 MenuModule=Исходный модуль
-HideUnauthorizedMenu= Скрыть несанкционированного меню (серый)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Идентификатор меню
 DetailMenuHandler=Обработчик меню, где показывать новое меню
 DetailMenuModule=Имя модуля, если пункт меню взят из модуля
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Индекс
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index 8c02e198885..c5f91b7749e 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -173,10 +173,11 @@ SEPAMandate=Мандат SEPA
 YourSEPAMandate=Ваш мандат SEPA
 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/ru_RU/blockedlog.lang b/htdocs/langs/ru_RU/blockedlog.lang
index 99bf472eed0..74164531cae 100644
--- a/htdocs/langs/ru_RU/blockedlog.lang
+++ b/htdocs/langs/ru_RU/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/ru_RU/boxes.lang b/htdocs/langs/ru_RU/boxes.lang
index b8e47954693..7cfe3e8a6e7 100644
--- a/htdocs/langs/ru_RU/boxes.lang
+++ b/htdocs/langs/ru_RU/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Последние  %sизмененные пож
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Глобальная активность (фактуры, предложения, заказы)
 BoxGoodCustomers=Хорошие клиенты
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=Запланированные задания
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Дата последнего обновления
 NoRecordedBookmarks=Закладки не созданы.
@@ -92,8 +95,8 @@ LastXMonthRolling=The latest %s month rolling
 ChooseBoxToAdd=Добавить виджет на вашу панель
 BoxAdded=Виджет был добавлен на вашу панель
 BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Бухгалтерия
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/ru_RU/cashdesk.lang b/htdocs/langs/ru_RU/cashdesk.lang
index 9b2073aed88..4a435be4e06 100644
--- a/htdocs/langs/ru_RU/cashdesk.lang
+++ b/htdocs/langs/ru_RU/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Нижний колонтитул
 AmountAtEndOfPeriod=Сумма на конец периода (день, месяц или год)
 TheoricalAmount=Теоретическая сумма
 RealAmount=Действительная сумма
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Кол-во счетов-фактур
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/ru_RU/categories.lang b/htdocs/langs/ru_RU/categories.lang
index c1fd9fc39d7..fc188dff315 100644
--- a/htdocs/langs/ru_RU/categories.lang
+++ b/htdocs/langs/ru_RU/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Раздел тегов/категорий проекто
 UsersCategoriesArea=Раздел тегов/категорий пользователей
 SubCats=Подкатегории
 CatList=Список тегов/категорий
+CatListAll=List of tags/categories (all types)
 NewCategory=Новый тег/категория
 ModifCat=Изменить тег/категорию
 CatCreated=Тег/категория созданы
@@ -65,16 +66,22 @@ UsersCategoriesShort=Теги/категории пользователей
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=ID тега/категории
-CatSupList=List of vendor tags/categories
-CatCusList=Список тегов/категорий клиента/потенциального клиента
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Список тегов/категорий товаров
 CatMemberList=Список тегов/категорий участников
-CatContactList=Список тегов/категорий контактов
-CatSupLinks=Связи между поставщиками и  тегами/категориями
+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=Связи между клиентами/потенц. клиентами  и  тегами/категориями
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Связи между продуктами/услугами  и  тегами/категориями
-CatProJectLinks=Связи между проектами и тегами/категориями
+CatMembersLinks=Связи между участниками  и  тегами/категориями
+CatProjectsLinks=Связи между проектами и тегами/категориями
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Удалить из тега/категории
 ExtraFieldsCategories=Дополнительные атрибуты
 CategoriesSetup=Настройка тегов/категорий
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index 53e53122d77..2f8f9c2005b 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Проверьте идентификатора НДС
 VATIntraManualCheck=Вы также можете проверить его вручную на сайте Европейской Комиссии <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Проверка невозможна. Сервис проверки не предоставляется государством-членом ЕС (%s).
 NorProspectNorCustomer=Не потенциальный клиент, не клиент
-JuridicalStatus=Тип юридического лица
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Сотрудники
 ProspectLevelShort=Потенциальный
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index f9002c431a6..c7e9361c99f 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Показать оплате НДС
 TotalToPay=Всего к оплате
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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= Режим <b>%sRE на счетах клиентов - счетах поставщиков%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Баланс доходов и расходов, г
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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= - Суммы даны с учётом всех налогов
 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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Доклад третьей стороной IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/ru_RU/cron.lang b/htdocs/langs/ru_RU/cron.lang
index c21b1597510..d65f1c21c33 100644
--- a/htdocs/langs/ru_RU/cron.lang
+++ b/htdocs/langs/ru_RU/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Удалить Запланированную задачу
 Permission23104 = Выполнить запланированную задачу
 # Admin
 CronSetup=Настройки запланированных заданий
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Или проверить и запустить специальную задачу
+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=Ключ безопасности для запуска запланированных заданий
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=В системах Unix-like вы должны задать crontab для выполнения команды каждые 5 минут.
 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
@@ -46,6 +47,7 @@ CronNbRun=Number of launches
 CronMaxRun=Maximum number of launches
 CronEach=Каждый
 JobFinished=Задание запущено и завершено
+Scheduled=Scheduled
 #Page card
 CronAdd= Добавить задание
 CronEvery=Execute job each
@@ -56,7 +58,7 @@ CronNote=Комментарий
 CronFieldMandatory=Поле %s является обязательным
 CronErrEndDateStartDt=Дата окончания не может быть раньше даты начала
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Включено
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Выключать
 CronTaskInactive=Задание отключено
 CronId=ID
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index d9a8f880d67..3bcf15212e8 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Нет ошибок, мы принимаем
 # Errors
 ErrorButCommitIsDone=Обнаружены ошибки, но мы подтвердиле несмотря на это
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s неправильно
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Логин %s уже существует.
 ErrorGroupAlreadyExists=Группа %s уже существует.
 ErrorRecordNotFound=Запись не найдена.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Некоторые обязательные поля не б
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Не удалось создать каталог. Убедитесь, что веб-сервер пользователь имеет разрешения на запись в каталог Dolibarr документы. Если параметр <b>safe_mode</b> включен по этому PHP, проверьте, что Dolibarr PHP файлы принадлежат к веб-серверу пользователей (или группы).
 ErrorNoMailDefinedForThisUser=Нет определена почта для этого пользователя
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Эта функция JavaScript должны быть активированы на работу. Изменить это в настройки - дисплей.
 ErrorTopMenuMustHaveAParentWithId0=Меню типа 'Top' не может быть родителем меню. Положить 0 родителей в меню или выбрать меню типа 'левых'.
 ErrorLeftMenuMustHaveAParentId=Меню типа 'левых' должен иметь родителя ID.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Имя этого профиля уже сущесв
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP соответствия не является полной.
 ErrorLDAPMakeManualTest=. LDIF файл был создан в директории %s. Попробуйте загрузить его вручную из командной строки, чтобы иметь больше информации об ошибках.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ссылки, используемые для создания, уже существует.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/ru_RU/exports.lang b/htdocs/langs/ru_RU/exports.lang
index 380635eca51..5fbbcfd4665 100644
--- a/htdocs/langs/ru_RU/exports.lang
+++ b/htdocs/langs/ru_RU/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Поле название
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Библиотека
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 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.
@@ -131,3 +133,4 @@ 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/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang
index 1da962648ec..6470dc1dddc 100644
--- a/htdocs/langs/ru_RU/mails.lang
+++ b/htdocs/langs/ru_RU/mails.lang
@@ -92,6 +92,7 @@ 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=Линия %s в файл
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Уведомления
-NoNotificationsWillBeSent=Нет электронной почте уведомления, планируется к этому мероприятию и компании
-ANotificationsWillBeSent=1 уведомление будет отправлено по электронной почте
-SomeNotificationsWillBeSent=%s уведомления будут отправлены по электронной почте
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=Список всех уведомлений по электронной почте отправлено
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Информация
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index bcd5f1ea608..ac8383b1f2f 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Для этого типа электронной почты 
 AvailableVariables=Доступны переменные для замены
 NoTranslation=Нет перевода
 Translation=Перевод
+CurrentTimeZone=Текущий часовой пояс в настройках PHP
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Запись не найдена
 NoRecordDeleted=Нет удаленных записей
 NotEnoughDataYet=Недостаточно данных
@@ -85,6 +87,8 @@ FileWasNotUploaded=Файл выбран как вложение, но пока
 NbOfEntries=Кол-во записей
 GoToWikiHelpPage=Читать интернет-справку (необходим доступ к Интернету)
 GoToHelpPage=Читать помощь
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=Запись сохранена
 RecordDeleted=Запись удалена
 RecordGenerated=Запись сгенерирована
@@ -220,6 +224,7 @@ Value=Значение
 PersonalValue=Личное значение
 NewObject=Новый %s
 NewValue=Новое значение
+OldValue=Old value %s
 CurrentValue=Текущее значение
 Code=Код
 Type=Тип
@@ -433,6 +438,7 @@ RemainToPay=Осталось заплатить
 Module=Модуль/Приложение
 Modules=Модули/Приложения
 Option=Опция
+Filters=Filters
 List=Список
 FullList=Полный список
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ SupplierPreview=Предварительный просмотр поставщи
 ShowCustomerPreview=Показать обзор клиента
 ShowSupplierPreview=Показать предварительный просмотр поставщика
 RefCustomer=Ref. клиента
+InternalRef=Internal ref.
 Currency=Валюта
 InfoAdmin=Информация для администраторов
 Undo=Отмена
@@ -671,7 +678,7 @@ SendMail=Отправить письмо
 Email=Адрес электронной почты
 NoEMail=Нет Email
 AlreadyRead=Прочитано
-NotRead=Не прочитано
+NotRead=Unread
 NoMobilePhone=Нет мобильного телефона
 Owner=Владелец
 FollowingConstantsWillBeSubstituted=Следующие константы будут подменять соответствующие значения.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/ru_RU/modulebuilder.lang b/htdocs/langs/ru_RU/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/ru_RU/modulebuilder.lang
+++ b/htdocs/langs/ru_RU/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/ru_RU/mrp.lang b/htdocs/langs/ru_RU/mrp.lang
index 5c5ff627f11..5a772a7147d 100644
--- a/htdocs/langs/ru_RU/mrp.lang
+++ b/htdocs/langs/ru_RU/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index 390b2716c41..2a5bf106504 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -5,8 +5,6 @@ Tools=Инструменты
 TMenuTools=Инструменты
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=День рождения
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=рождения активного оповещения
 BirthdayAlertOff=рождения оповещения неактивные
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=Посмотреть настройку модуля  %s
 NbOfAttachedFiles=Количество прикрепленных файлов / документов
 TotalSizeOfAttachedFiles=Общий размер присоединенных файлов / документы
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Право
 CalculatedWeight=расчетный вес
 CalculatedVolume=Beregnet volum
 Weight=Вес
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=кг
 WeightUnitg=G
 WeightUnitmg=мг
@@ -214,6 +216,7 @@ 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=Импорт данных
 DolibarrNotification=Автоматические уведомления
 ResizeDesc=Skriv inn ny <b>bredde</b> eller ny høyde. Forhold vil bli holdt under resizing ...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Экспорт области
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index dd1b39584f5..105d51de4e7 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Кол-во цен
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+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=Количество родительских упаковочных продуктов
@@ -167,8 +168,10 @@ BuyingPrices=Цены на покупку
 CustomerPrices=Цены клиентов
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Таможенный / Товарный / HS код
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Страна происхождения
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Использовать фиксированную цену
 PriceByQuantity=Разные цены по количеству
 DisablePriceByQty=Отключить цены по количеству
 PriceByQuantityRange=Диапазон количества
-MultipriceRules=Правила ценового сегмента
+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=%% вариация над %s
 PercentDiscountOver=%% скидка на %s
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index c1f34e89f14..2b752094276 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -76,15 +76,16 @@ MyActivities=Мои задачи / мероприятия
 MyProjects=Мои проекты
 MyProjectsArea=My projects Area
 DurationEffective=Эффективная длительность
-ProgressDeclared=Заданный ход выполнения проекта
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Вычисленный  ход выполнения проекта
+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=Время
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/ru_RU/recruitment.lang b/htdocs/langs/ru_RU/recruitment.lang
index f113cfbe396..71fa83a3e38 100644
--- a/htdocs/langs/ru_RU/recruitment.lang
+++ b/htdocs/langs/ru_RU/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/ru_RU/sendings.lang b/htdocs/langs/ru_RU/sendings.lang
index 83633eb27c1..8f423ba15d8 100644
--- a/htdocs/langs/ru_RU/sendings.lang
+++ b/htdocs/langs/ru_RU/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Другие поставки для этого зак
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Поставки для проверки
 StatusSendingCanceled=Отменена
+StatusSendingCanceledShort=Отменена
 StatusSendingDraft=Черновик
 StatusSendingValidated=Утверждена (товары для отправки или уже отправлены)
 StatusSendingProcessed=Обработано
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Более полная модель документа для доставки квитанций (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Постоянное EXPEDITION_ADDON_NUMBER не определена
 SumOfProductVolumes=Сумма сторон товара
 SumOfProductWeights=Вес товара в сумме
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index e06e1cebd17..25e96f3910c 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Склады стоимости
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/ru_RU/ticket.lang b/htdocs/langs/ru_RU/ticket.lang
index 99c9e52ce56..708af1e5769 100644
--- a/htdocs/langs/ru_RU/ticket.lang
+++ b/htdocs/langs/ru_RU/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Другое
 TicketSeverityShortLOW=Низкий
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Высокий
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Не прочитано
 Read=Читать
 Assigned=Assigned
 InProgress=Выполняется
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/ru_RU/website.lang b/htdocs/langs/ru_RU/website.lang
index 4b46043e5a1..775344b328a 100644
--- a/htdocs/langs/ru_RU/website.lang
+++ b/htdocs/langs/ru_RU/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Страница
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang
index e7d2417a55d..2b878111e01 100644
--- a/htdocs/langs/ru_RU/withdrawals.lang
+++ b/htdocs/langs/ru_RU/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Классифицировать зачисленных
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Вариант для реального режима не был установлен, мы останавливаемся после этого моделирования
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/ru_RU/workflow.lang b/htdocs/langs/ru_RU/workflow.lang
index 3d5e478c0ba..2d1edff056b 100644
--- a/htdocs/langs/ru_RU/workflow.lang
+++ b/htdocs/langs/ru_RU/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Автоматическое создание
 AutomaticClassification=Автоматическая классификация
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/ru_UA/mrp.lang b/htdocs/langs/ru_UA/mrp.lang
new file mode 100644
index 00000000000..4d8f6b98309
--- /dev/null
+++ b/htdocs/langs/ru_UA/mrp.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - mrp
+BillOfMaterials=Bill of Material
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
diff --git a/htdocs/langs/ru_UA/products.lang b/htdocs/langs/ru_UA/products.lang
deleted file mode 100644
index 6e900475275..00000000000
--- a/htdocs/langs/ru_UA/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-CustomCode=Customs / Commodity / HS code
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index 5b1f85a55c1..e3377be2231 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -16,6 +16,8 @@ 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=Väčšina nastavení účtovníctva sa vykonáva z menu %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ NotVentilatedinAccount=Nie je viazaný na účet
 XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
 XLineFailedToBeBinded=%s produkty / služby neboli viazané na žiadny účtovný účet
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Začnite triediť stránku "Väzba urobiť" najnovšími prvkami
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Začnite triediť stránku "Väzba vykonaná" najnovšími prvkami
 
@@ -198,7 +201,8 @@ Docdate=dátum
 Docref=referencie
 LabelAccount=Značkový účet
 LabelOperation=Label operation
-Sens=sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=časopis
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Číslo kusu
 TransactionNumShort=Num. transakcie
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Skupinové účty
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Priradzovať automaticky
 AutomaticBindingDone=Automatické priradenie dokončené
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 ShowTutorial=Show Tutorial
 NotReconciled=Nezlúčené
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 22c255b5c06..bae00fceb7e 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Zobraziť
 SetupArea=Setup
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Formulár pre testovanie nahrávania súborov (podľa nastavenia)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Poznámka: áno je účinné len vtedy, ak je modul <b>%s</b> zapnutý
 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.
@@ -85,7 +87,6 @@ ShowPreview=Zobraziť náhľad
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Náhľad nie je k dispozícii
 ThemeCurrentlyActive=Téma aktívnej
-CurrentTimeZone=Časové pásmo PHP (server)
 MySQLTimeZone=TimeZone MySql (databáza)
 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=Miesto
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Očistiť
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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=Vyčistiť teraz
 PurgeNothingToDelete=Žiadne súbory alebo priečinky na zmazanie
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferovaní partneri
 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>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=Zoznam OpenDocument šablóny zoznamov
 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=Príklady syntaxe: <br> c: \\ mydir <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Ak chcete vedieť, ako vytvoriť svoje ODT šablóny dokumentov pred ich uložením do týchto adresárov, prečítajte si wiki dokumentácie:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Pozícia Meno / Priezvisko
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametre na zabezpečenie URL
 SecurityTokenIsUnique=Používame unikátny securekey parameter pre každú adresu URL
 EnterRefToBuildUrl=Zadajte odkaz na objekt %s
 GetSecuredUrl=Získajte vypočítanú URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Staré Sadzba DPH
 NewVATRates=Nová sadzba DPH
 PriceBaseTypeToChange=Zmeniť na cenách s hodnotou základného odkazu uvedeného na
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Anketa, Dotazník, Hlasovanie
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Okraje
-Module59000Desc=Modul pre správu marže
+Module59000Desc=Module to follow margins
 Module60000Name=Provízie
 Module60000Desc=Modul pre správu provízie
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Optimalizácia pre vyhľadávače
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ ServiceSetup=Služby modul nastavenia
 ProductServiceSetup=Produkty a služby moduly nastavenie
 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
+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 the language of the third party
+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=Predvolený typ čiarového kódu použiť pre produkty
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Nová ponuka
 MenuHandler=Menu handler
 MenuModule=Modul zdroja
-HideUnauthorizedMenu= Skryť neoprávneným menu (sivá)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id ponuka
 DetailMenuHandler=Menu handler, kde má novú ponuku
 DetailMenuModule=Názov modulu, pokiaľ položky ponuky pochádzajú z modulu
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zips
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/sk_SK/banks.lang b/htdocs/langs/sk_SK/banks.lang
index 471e6830858..877a8abd81b 100644
--- a/htdocs/langs/sk_SK/banks.lang
+++ b/htdocs/langs/sk_SK/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/sk_SK/blockedlog.lang b/htdocs/langs/sk_SK/blockedlog.lang
index bce0ea3bd25..05233648848 100644
--- a/htdocs/langs/sk_SK/blockedlog.lang
+++ b/htdocs/langs/sk_SK/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/sk_SK/boxes.lang b/htdocs/langs/sk_SK/boxes.lang
index dea1fdff8da..8036acd4779 100644
--- a/htdocs/langs/sk_SK/boxes.lang
+++ b/htdocs/langs/sk_SK/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Najnovšie %s upravené príspevky
 BoxTitleLastModifiedExpenses=Najnovšie %s upravené správy o výdavkoch
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Globálna aktivita (faktúry, návrhy, objednávky)
 BoxGoodCustomers=Top zákazníci
 BoxTitleGoodCustomers=%s Top zákazníkov
+BoxScheduledJobs=Naplánované úlohy
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Najnovší čas obnovenia
 NoRecordedBookmarks=Žiadne záložky definované.
@@ -92,8 +95,8 @@ LastXMonthRolling=Posledný %s mesiac postupu
 ChooseBoxToAdd=Pridať blok na nástenku
 BoxAdded=Widget was added in your dashboard
 BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Účtovníctvo
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/sk_SK/cashdesk.lang b/htdocs/langs/sk_SK/cashdesk.lang
index 849dfa5d97a..0c85aa44b53 100644
--- a/htdocs/langs/sk_SK/cashdesk.lang
+++ b/htdocs/langs/sk_SK/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb faktúr
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/sk_SK/categories.lang b/htdocs/langs/sk_SK/categories.lang
index 1f28159b136..9c7e4ed9951 100644
--- a/htdocs/langs/sk_SK/categories.lang
+++ b/htdocs/langs/sk_SK/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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=Doplnkové atribúty
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index 1aae4a6f624..fc39a7f1038 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potenciál
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index 86356ba2d4a..2f3486a9535 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Zobraziť DPH platbu
 TotalToPay=Celkom k zaplateniu
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Režim <b>%sVAT na záväzky accounting%s.</b>
 CalcModeVATEngagement=Režim <b>%sVAT z príjmov-expense%sS.</b>
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Bilancia príjmov a výdavkov, ročné zhrnutie
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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=- 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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Správa o treťou stranou IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/sk_SK/cron.lang b/htdocs/langs/sk_SK/cron.lang
index ba8fc86897a..1631b6c9038 100644
--- a/htdocs/langs/sk_SK/cron.lang
+++ b/htdocs/langs/sk_SK/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Vytvoriť / upraviť naplánovanú úlohu
 Permission23103 = Odstrániť naplánovanú úlohu
 Permission23104 = Spustiť naplánovanú úlohu
 # Admin
-CronSetup= Naplánované úlohy správy Nastavenie
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+CronSetup=Naplánované úlohy správy Nastavenie
+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=Bezpečnostný kľúč pre URL spustiť cron
 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 environement you can use Scheduled task tools 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
@@ -42,10 +43,11 @@ CronModule=Modul
 CronNoJobs=Žiadny registrovaný práce
 CronPriority=Priorita
 CronLabel=Štítok
-CronNbRun=Nb. začať
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Každý
 JobFinished=Práca zahájená a dokončená
+Scheduled=Scheduled
 #Page card
 CronAdd= Pridať pracovných miest
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Komentár
 CronFieldMandatory=Pole je povinné %s
 CronErrEndDateStartDt=Dátum ukončenia nemôže byť pred dátumom začatia
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Umožniť
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Zakázať
 CronTaskInactive=Táto úloha je zakázaný
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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=Systém príkazového riadka spustiť.
 CronCreateJob=Create new Scheduled Job
 CronFrom=Z
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Shell príkaz
 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+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/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 2b0b88987e9..30e9dea3094 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Žiadna chyba sa zaväzujeme
 # Errors
 ErrorButCommitIsDone=Boli nájdené chyby, ale my overiť aj cez to
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s je zle
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Prihlásenie %s už existuje.
 ErrorGroupAlreadyExists=Skupina %s už existuje.
 ErrorRecordNotFound=Záznam nie je nájdený.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Niektoré požadované pole sa nevypĺňa.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Nepodarilo sa vytvoriť adresár. Uistite sa, že webový server má užívateľ oprávnenie na zápis do adresára dokumentov Dolibarr. Ak je parameter <b>safe_mode</b> je povolené na tomto PHP, skontrolujte, či Dolibarr php súbory, vlastné pre užívateľa webového servera (alebo skupina).
 ErrorNoMailDefinedForThisUser=Žiadna pošta definované pre tohto používateľa
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Táto funkcia potrebujete mať Java scripty byť aktivovaný do práce. Zmeniť v nastavení - displej.
 ErrorTopMenuMustHaveAParentWithId0=Ponuka typu &quot;top&quot; nemôže mať rodič menu. Dajte 0 do nadradenej ponuky alebo zvoliť ponuku typu &quot;vľavo&quot;.
 ErrorLeftMenuMustHaveAParentId=Ponuka typu &quot;ľavica&quot;, musí mať rodič id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP zhoda nie je úplná.
 ErrorLDAPMakeManualTest=. LDIF súbor bol vytvorený v adresári %s. Skúste načítať ručne z príkazového riadku získať viac informácií o chybách.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref používa pre tvorbu už existuje.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/sk_SK/exports.lang b/htdocs/langs/sk_SK/exports.lang
index 5d9514819a8..a9991f8c0fd 100644
--- a/htdocs/langs/sk_SK/exports.lang
+++ b/htdocs/langs/sk_SK/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Polia názov
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Knižnica
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Krok
 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.
@@ -131,3 +133,4 @@ 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/sk_SK/mails.lang b/htdocs/langs/sk_SK/mails.lang
index d8f41131b19..5ee7e05f1ca 100644
--- a/htdocs/langs/sk_SK/mails.lang
+++ b/htdocs/langs/sk_SK/mails.lang
@@ -92,6 +92,7 @@ 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=Linka %s v súbore
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Upozornenie
-NoNotificationsWillBeSent=Žiadne oznámenia e-mailom sú naplánované pre túto udalosť a spoločnosť
-ANotificationsWillBeSent=1 bude zaslaný e-mailom
-SomeNotificationsWillBeSent=%s oznámenia bude zaslané e-mailom
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=Vypísať všetky e-maily odosielané oznámenia
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informácie
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index efb38289b90..b86251db431 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=Preklad neexistuje
 Translation=Preklad
+CurrentTimeZone=Časové pásmo PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Nebol nájdený žiadny záznam
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Záznam uložený
 RecordDeleted=Zaznamenajte zmazaný
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Hodnota
 PersonalValue=Osobné hodnota
 NewObject=New %s
 NewValue=Nová hodnota
+OldValue=Old value %s
 CurrentValue=Súčasná hodnota
 Code=Kód
 Type=Typ
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Voľba
+Filters=Filters
 List=Zoznam
 FullList=Plný zoznam
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ SupplierPreview=Vendor preview
 ShowCustomerPreview=Zobraziť zákaznícku náhľad
 ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref zákazník
+InternalRef=Internal ref.
 Currency=Mena
 InfoAdmin=Informácie pre správcov
 Undo=Zrušiť
@@ -671,7 +678,7 @@ SendMail=Odoslať e-mail
 Email=E-mail
 NoEMail=Žiadny e-mail
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=Žiadny mobil
 Owner=Majiteľ
 FollowingConstantsWillBeSubstituted=Nasledujúci konštanty bude nahradený zodpovedajúcou hodnotou.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/sk_SK/modulebuilder.lang b/htdocs/langs/sk_SK/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/sk_SK/modulebuilder.lang
+++ b/htdocs/langs/sk_SK/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/sk_SK/mrp.lang b/htdocs/langs/sk_SK/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/sk_SK/mrp.lang
+++ b/htdocs/langs/sk_SK/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index d758a30e814..cdf766025a8 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -5,8 +5,6 @@ Tools=Nástroje
 TMenuTools=Nástroje
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Narodeniny
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=narodeniny výstraha aktívna
 BirthdayAlertOff=narodeniny upozornenia neaktívne
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Počet pripojených súborov / dokumentov
 TotalSizeOfAttachedFiles=Celková veľkosť pripojených súborov / dokumentov
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Právo
 CalculatedWeight=Vypočítaná hmotnosť
 CalculatedVolume=Vypočítaný objem
 Weight=Hmotnosť
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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=Dovoz súbor dát
 DolibarrNotification=Automatické upozornenie
 ResizeDesc=Zadajte novú šírku <b>alebo</b> výšku novej. Pomer budú uchovávané pri zmene veľkosti ...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Vývoz plocha
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index ef7e10c7f3f..ad7d3f5440e 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Počet cien
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+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=Počet rodičovských balíčkov produktu
@@ -167,8 +168,10 @@ BuyingPrices=Nákupné ceny
 CustomerPrices=Zákaznícka cena
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Krajina pôvodu
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Použite pevnú cenu
 PriceByQuantity=Rozdielné ceny podľa quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Množstvo rozsah
-MultipriceRules=Pravidlá cenových oblastí
+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=%% zmena cez %s
 PercentDiscountOver=%% zľava cez %s
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index e66dcd1adf2..43af18884d9 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -76,15 +76,16 @@ MyActivities=Moje úlohy / činnosti
 MyProjects=Moje projekty
 MyProjectsArea=My projects Area
 DurationEffective=Efektívny čas
-ProgressDeclared=Deklarovaná pokrok
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Vypočítaná pokrok
+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=Čas
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/sk_SK/recruitment.lang b/htdocs/langs/sk_SK/recruitment.lang
index f010df9c509..321f949aa39 100644
--- a/htdocs/langs/sk_SK/recruitment.lang
+++ b/htdocs/langs/sk_SK/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/sk_SK/sendings.lang b/htdocs/langs/sk_SK/sendings.lang
index 54d61a56291..76606f60e53 100644
--- a/htdocs/langs/sk_SK/sendings.lang
+++ b/htdocs/langs/sk_SK/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Ďalšie zásielky pre túto objednávku
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Zásielky na overenie
 StatusSendingCanceled=Zrušený
+StatusSendingCanceledShort=Zrušený
 StatusSendingDraft=Návrh
 StatusSendingValidated=Overené (výrobky na odoslanie alebo už dodané)
 StatusSendingProcessed=Spracované
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Najprv musíte overiť objednávku pred vytvore
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Viac Celý dokument model pre potvrdenie o doručení (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konštantná EXPEDITION_ADDON_NUMBER nie je definované
 SumOfProductVolumes=Súčet objemov produktov
 SumOfProductWeights=Súčet hmotností produktov
diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
index 29fb6b84fcf..0f1519c6e37 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Sklady hodnota
 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/sk_SK/ticket.lang b/htdocs/langs/sk_SK/ticket.lang
index b0914c5f748..f45e4fb3067 100644
--- a/htdocs/langs/sk_SK/ticket.lang
+++ b/htdocs/langs/sk_SK/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Ostatné
 TicketSeverityShortLOW=Nízky
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Vysoký
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Čítať
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/sk_SK/website.lang b/htdocs/langs/sk_SK/website.lang
index b2c84ed0d5b..e1cfe004a2f 100644
--- a/htdocs/langs/sk_SK/website.lang
+++ b/htdocs/langs/sk_SK/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Strana
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/sk_SK/withdrawals.lang b/htdocs/langs/sk_SK/withdrawals.lang
index a13acf88e77..b28d60cf571 100644
--- a/htdocs/langs/sk_SK/withdrawals.lang
+++ b/htdocs/langs/sk_SK/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Klasifikovať pripísaná
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Voľba pre reálny režim nebol nastavený, môžeme zastaviť po tomto simuláciu
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/sk_SK/workflow.lang b/htdocs/langs/sk_SK/workflow.lang
index 2a3db6f62aa..2a596f6e567 100644
--- a/htdocs/langs/sk_SK/workflow.lang
+++ b/htdocs/langs/sk_SK/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index 93e33834eff..9ca8ca3875d 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Datum
 Docref=Reference
 LabelAccount=Račun Label
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Revija
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 38d716f78eb..8e4740be5cc 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Prikaz
 SetupArea=Nastavitve
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Testiranje »upload-a« (v skladu z nastavitvami)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Opomba: 'Da' velja samo, če je omogočen modul <b>%s</b>
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Prikaži predogled
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Predogled ni na voljo
 ThemeCurrentlyActive=Trenutno aktivna tema
-CurrentTimeZone=Časovni pas PHP strežnika
 MySQLTimeZone=Časovni pas MySql (baze podatkov)
 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=Presledek
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Počisti
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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=Počisti zdaj
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferirani partnerji
 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>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=Seznam map z OpenDocument predlogami
 ListOfDirectoriesForModelGenODT=Seznam map, ki vsebujejo predloge v OpenDocument formatu.<br><br>Tukaj navedite celotno pot do mape.<br>Med mapami vstavite CR.<br>Mapo GED modula dodajte tukaj <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Datoteke v tej mapi morajo imeti končnico <b>.odt</b> ali <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Primeri sintakse:<br>c:\\mydir<br>/home/mydir <br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=Z dodatkom takih oznak v predlogo, boste ob kreiranju dokumenta dobili personalizirane vrednosti:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org
 FirstnameNamePosition=Položaj imena/priimka
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametri za zagotovitev URL
 SecurityTokenIsUnique=Uporabite edinstven parameter securekey za vsako URL
 EnterRefToBuildUrl=Vnesite sklic za predmet %s
 GetSecuredUrl=Get izračuna URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Stara stopnja DDV
 NewVATRates=Nova stopnja DDV
 PriceBaseTypeToChange=Sprememba cen z definirano osnovno referenčno vrednostjo
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Izberi, oceni ali glasuj
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Marže
-Module59000Desc=Modul za upravljanje z maržami
+Module59000Desc=Module to follow margins
 Module60000Name=Provizije
 Module60000Desc=Modul za upravljanje s provizijami
 Module62000Name=Mednarodni Poslovni Izrazi
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Iskanje optimizacijo
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ ServiceSetup=Storitve modul nastavitev
 ProductServiceSetup=Izdelki in storitve moduli za nastavitev
 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
+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=Aktivacija opcije za združevanje PDF dokumenta proizvoda in PDF ponudbe azur v zavihku priložene datoteke proizvod/storitev, če je proizvod/storitev v ponudbi
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in the language of the third party
+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=Privzet tip črtne kode za proizvode
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=Nov meni
 MenuHandler=Menijski vmesnik
 MenuModule=Modul izvorov
-HideUnauthorizedMenu= Zasenči neavtoriziran meni (sivo)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=ID meni
 DetailMenuHandler=Upravljavec menijev za prikaz novega menija
 DetailMenuModule=Ime modula, če vnos prihaja iz modula
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/sl_SI/banks.lang b/htdocs/langs/sl_SI/banks.lang
index a73db019812..71a06145d5c 100644
--- a/htdocs/langs/sl_SI/banks.lang
+++ b/htdocs/langs/sl_SI/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/sl_SI/blockedlog.lang b/htdocs/langs/sl_SI/blockedlog.lang
index 84dc7eb9c06..cb5b53c1bd8 100644
--- a/htdocs/langs/sl_SI/blockedlog.lang
+++ b/htdocs/langs/sl_SI/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/sl_SI/boxes.lang b/htdocs/langs/sl_SI/boxes.lang
index 92f815a1a33..0bd7b6a8519 100644
--- a/htdocs/langs/sl_SI/boxes.lang
+++ b/htdocs/langs/sl_SI/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Zadnje %s spremenjene donacije
 BoxTitleLastModifiedExpenses=Zadnja %s poročila o stroških
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Globalna aktivnost (računi, ponudbe, naročila)
 BoxGoodCustomers=Dobri kupci
 BoxTitleGoodCustomers=%s dobri kupci
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Zadnji datum osvežitve podatkov
 NoRecordedBookmarks=Ni definiranih zaznamkov.
@@ -92,8 +95,8 @@ LastXMonthRolling=Zadnji %s tekoči meseci
 ChooseBoxToAdd=Dodaj vključnik na nadzorno ploščo
 BoxAdded=Widget was added in your dashboard
 BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Računovodstvo
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/sl_SI/cashdesk.lang b/htdocs/langs/sl_SI/cashdesk.lang
index a103bd51275..90b364f16d4 100644
--- a/htdocs/langs/sl_SI/cashdesk.lang
+++ b/htdocs/langs/sl_SI/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Število računov
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/sl_SI/categories.lang b/htdocs/langs/sl_SI/categories.lang
index 70060a70318..187bd536897 100644
--- a/htdocs/langs/sl_SI/categories.lang
+++ b/htdocs/langs/sl_SI/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=Seznam značk/kategorij
+CatListAll=List of tags/categories (all types)
 NewCategory=Nova značka/kategorija
 ModifCat=Spremeni značko/kategorijo
 CatCreated=Kreirana značka/kategorija
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=ID značke/kategorije
-CatSupList=List of vendor tags/categories
-CatCusList=Seznam značk/kategorij kupcev/možnih strank
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Seznam značk/kategorij proizvodov
 CatMemberList=Seznam značk/kategorij članov
-CatContactList=Seznam kontaktnih oznak/kategorij
-CatSupLinks=Povezave med dobavitelji in značkami/kategorijami
+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=Povezave med kupci/možnimi strankami in značkami/kategorijami
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Povezave med proizvodi/storitvami in značkami/kategorijami
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Povezave med člani in značkami/kategorijami
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Odstrani iz značk/kategorije
 ExtraFieldsCategories=Koplementarni atributi
 CategoriesSetup=Nastavitev značk/kategorij
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index c83ab2f3231..95e4d763b46 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Kontrola ni možna. Država članica ne zagotavlja storitve poizvedbe (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potencial
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index a3a4ec4adde..2f71f9efc4f 100644
--- a/htdocs/langs/sl_SI/compta.lang
+++ b/htdocs/langs/sl_SI/compta.lang
@@ -111,7 +111,7 @@ Refund=Vračilo
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Prikaži plačilo DDV
 TotalToPay=Skupaj za plačilo
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Bilanca prihodkov in stroškov, letni povzetek
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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=- 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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Poročilo tretjih oseb IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/sl_SI/cron.lang b/htdocs/langs/sl_SI/cron.lang
index bf247f95c88..5f3c8ecd5fa 100644
--- a/htdocs/langs/sl_SI/cron.lang
+++ b/htdocs/langs/sl_SI/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Ustvari/posodobi načrtovano delo
 Permission23103 = Izbriši načrtovano delo
 Permission23104 = Izvedi načrtovano delo
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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 environement you can use Scheduled task tools 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
@@ -42,10 +43,11 @@ CronModule=Modul
 CronNoJobs=Nobene naloge niso registrirane
 CronPriority=Prioriteta
 CronLabel=Oznaka
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Dodaj naloge
 CronEvery=Execute job each
@@ -56,16 +58,16 @@ CronNote=Komentar
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Omogočeno
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Onemogoči
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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=Od
@@ -76,8 +78,14 @@ 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+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/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index c9142ec4843..ef8cfd2d53f 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s je napačen
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Uporabniško ime %s že obstaja.
 ErrorGroupAlreadyExists=Skupina %s že obstaja.
 ErrorRecordNotFound=Ne najdem zapisa.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Nekatera zahtevana polja niso izpolnjena.
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Kreiranje mape ni uspelo. Preverite, če ima uporabnik internetne strani dovoljenje za pisanje v mapo z Dolibarr dokumenti. Če je parameter <b>safe_mode</b> v tem PHP omogočen, preverite če je lastnik Dolibarr php datotek uporabnik web strežnika (ali skupina).
 ErrorNoMailDefinedForThisUser=Ta uporabnik nima določenega Email naslova
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Za aktiviranje ali delovanje te funkcije je potreben javascript. Spremenite »Nastavitve – Prikaz«.
 ErrorTopMenuMustHaveAParentWithId0='Zgoernji' meni ne more imeti nadrejenega menija. Vnesite 0 v nadrejeni meni ali izberite vrsto menija 'Levi'.
 ErrorLeftMenuMustHaveAParentId='Levi' meni mora imeti Nadrejeni ID.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP združevanje ni popolno.
 ErrorLDAPMakeManualTest=Datoteka .ldif je bila ustvarjena v mapi %s. Poskusite jo naložiti ročno preko ukazne vrstice, da bi dobili več podatkov o napaki.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Referenca, uporabljena za kreiranje, že obstaja.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/sl_SI/exports.lang b/htdocs/langs/sl_SI/exports.lang
index b9cb40877c1..e48218574d6 100644
--- a/htdocs/langs/sl_SI/exports.lang
+++ b/htdocs/langs/sl_SI/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Naziv polja
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Knjižnica
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Korak
 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.
@@ -131,3 +133,4 @@ 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/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang
index 8c93e61eedc..e87e6b2b66a 100644
--- a/htdocs/langs/sl_SI/mails.lang
+++ b/htdocs/langs/sl_SI/mails.lang
@@ -92,6 +92,7 @@ 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=%s vrstica v datoteki
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=Email ni bil poslan. Napačen naslov pošiljatelja ali prejemnika. Preverite profil uporabnika.
 # Module Notifications
 Notifications=Obvestila
-NoNotificationsWillBeSent=Za ta dogodek in podjetje niso predvidena obvestila po e-pošti
-ANotificationsWillBeSent=1 obvestilo bo poslano z e-pošto
-SomeNotificationsWillBeSent=%s obvestil bo poslanih z e-pošto
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=Seznam vseh poslanih e-poštnih obvestil
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Konfiguracij pošiljanja e-pošte je bila nastavljena na '%s'. Ta način ne more biti uporabljen za masovno pošiljanje.
 MailSendSetupIs2=Najprej morate kot administrator preko menija %sDomov - Nastavitve - E-pošta%s spremeniti parameter <strong>'%s'</strong> za uporabo načina '%s'. V tem načinu lahko odprete nastavitve SMTP strežnika, ki vam jih omogoča vaš spletni oprerater in uporabite masovno pošiljanje.
 MailSendSetupIs3=Če imate vprašanja o nastavitvi SMTP strežnika, lahko vprašate %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informacija
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index f7d1c8a39d7..7f2afe8aebe 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=Ni prevoda
 Translation=Prevod
+CurrentTimeZone=Časovni pas PHP strežnika
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Ni najden zapis
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Zapis je shranjen
 RecordDeleted=Zapis je izbrisan
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Vrednost
 PersonalValue=Osebna vrednost
 NewObject=New %s
 NewValue=Nova vrednost
+OldValue=Old value %s
 CurrentValue=Trenutna vrednost
 Code=Koda
 Type=Tip
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Opcija
+Filters=Filters
 List=Seznam
 FullList=Celoten seznam
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ SupplierPreview=Vendor preview
 ShowCustomerPreview=Prikaži pregled kupca
 ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. kupca
+InternalRef=Internal ref.
 Currency=Valuta
 InfoAdmin=Informacija za administratorje
 Undo=Razveljavi
@@ -671,7 +678,7 @@ SendMail=Pošlji e-pošto
 Email=E-pošta
 NoEMail=Ni email-a
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=Ni mobilnega telefona
 Owner=Lastnik
 FollowingConstantsWillBeSubstituted=Naslednje konstante bodo zamenjane z ustrezno vrednostjo.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=Ustavljeno
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/sl_SI/modulebuilder.lang b/htdocs/langs/sl_SI/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/sl_SI/modulebuilder.lang
+++ b/htdocs/langs/sl_SI/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/sl_SI/mrp.lang b/htdocs/langs/sl_SI/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/sl_SI/mrp.lang
+++ b/htdocs/langs/sl_SI/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
index 3cc9bcea61e..e5b75647b50 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -5,8 +5,6 @@ Tools=Orodja
 TMenuTools=Orodja
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Rojstni dan
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=Vklopljeno opozorilo na rojstni dan
 BirthdayAlertOff=Izklopljeno opozorilo na rojstni dan
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=Glejte nastavitev modula %s
 NbOfAttachedFiles=Število pripetih datotek/dokumentov
 TotalSizeOfAttachedFiles=Skupna velikost pripetih datotek/dokumentov
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Desno
 CalculatedWeight=Kalkulirana teža
 CalculatedVolume=Kalkulirana prostornina
 Weight=Teža
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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=Nabor podatkov za uvoz
 DolibarrNotification=Avtomatsko obvestilo
 ResizeDesc=Vnesite novo širino <b>ALI</b> novo višino. Razmerje se bo med spreminjanjem velikosti ohranilo...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Področje izvoza
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 21ec9a1ac38..7fb5405f77f 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Število cen
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+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=Število nadrejenih sestavljenih izdelkov
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Cene za kupce
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Država porekla
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Uporabi fiksno ceno
 PriceByQuantity=Različne cene glede na količino
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Območje količin
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 9edb7c2fcaa..452a680f3b5 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -76,15 +76,16 @@ MyActivities=Moje naloge/aktivnosti
 MyProjects=Moji projekti
 MyProjectsArea=My projects Area
 DurationEffective=Efektivno trajanje
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Čas
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/sl_SI/recruitment.lang b/htdocs/langs/sl_SI/recruitment.lang
index 30292aa07dc..9c84e4c01d8 100644
--- a/htdocs/langs/sl_SI/recruitment.lang
+++ b/htdocs/langs/sl_SI/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/sl_SI/sendings.lang b/htdocs/langs/sl_SI/sendings.lang
index 722f6d6c939..928c2e0f03c 100644
--- a/htdocs/langs/sl_SI/sendings.lang
+++ b/htdocs/langs/sl_SI/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Ostale pošiljke za to naročilo
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Pošiljke za potrditev
 StatusSendingCanceled=Preklicano
+StatusSendingCanceledShort=Preklicano
 StatusSendingDraft=Osnutek
 StatusSendingValidated=Potrjeno (proizvodi za pošiljanje ali že poslani)
 StatusSendingProcessed=Obdelani
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Popolnejši vzorec dobavnice (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined==
 SumOfProductVolumes=Vsota volumnov proizvodov
 SumOfProductWeights=Vsota tež proizvodov
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index a9cb3761255..b46640afdac 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Vrednost skladišč
 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/sl_SI/ticket.lang b/htdocs/langs/sl_SI/ticket.lang
index 4fce4674b17..c8506ca6800 100644
--- a/htdocs/langs/sl_SI/ticket.lang
+++ b/htdocs/langs/sl_SI/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Ostalo
 TicketSeverityShortLOW=Majhen potencial
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Visok potencial
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Preberite
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/sl_SI/website.lang b/htdocs/langs/sl_SI/website.lang
index 92889944fa4..26e7a852a93 100644
--- a/htdocs/langs/sl_SI/website.lang
+++ b/htdocs/langs/sl_SI/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Stran
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/sl_SI/withdrawals.lang b/htdocs/langs/sl_SI/withdrawals.lang
index 98b270589d9..c0912aaeaf5 100644
--- a/htdocs/langs/sl_SI/withdrawals.lang
+++ b/htdocs/langs/sl_SI/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Označi kot prejeto
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Opcija za delo v živo ni bila nastavljena, zato se bo sistem ustavil po simulaciji
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/sl_SI/workflow.lang b/htdocs/langs/sl_SI/workflow.lang
index 2fdcedce378..e7257c04c73 100644
--- a/htdocs/langs/sl_SI/workflow.lang
+++ b/htdocs/langs/sl_SI/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Samodejno generiranje
 AutomaticClassification=Samodejno spreminjanje statusa
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index 4e7da1a8564..b2c8f38576a 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 6ca94565b87..ce21ede1d21 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Shfaq
 SetupArea=Konfiguro
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=Form to test file upload (according to setup)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Spastro
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
 PurgeRunNow=Spastro tani
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ 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.
@@ -375,7 +377,7 @@ 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:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+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
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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
+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 the language of the third party
+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
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+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
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang
index e131a6bbd10..6feb31b8e9c 100644
--- a/htdocs/langs/sq_AL/banks.lang
+++ b/htdocs/langs/sq_AL/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/sq_AL/blockedlog.lang b/htdocs/langs/sq_AL/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/sq_AL/blockedlog.lang
+++ b/htdocs/langs/sq_AL/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/sq_AL/boxes.lang b/htdocs/langs/sq_AL/boxes.lang
index 1468b3a7864..c5cf2d90ba8 100644
--- a/htdocs/langs/sq_AL/boxes.lang
+++ b/htdocs/langs/sq_AL/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
 BoxGoodCustomers=Blerës të mirë
 BoxTitleGoodCustomers=%s Blerës të mirë
+BoxScheduledJobs=Scheduled jobs
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=No bookmarks defined.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/sq_AL/cashdesk.lang b/htdocs/langs/sq_AL/cashdesk.lang
index 489e2191fa6..1c7c73155f2 100644
--- a/htdocs/langs/sq_AL/cashdesk.lang
+++ b/htdocs/langs/sq_AL/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+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
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/sq_AL/categories.lang b/htdocs/langs/sq_AL/categories.lang
index 8acad1ef594..66125ff271d 100644
--- a/htdocs/langs/sq_AL/categories.lang
+++ b/htdocs/langs/sq_AL/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index f0fb358a3b8..63049256431 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Punonjësit
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index 7a237dbc407..c587a416989 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -111,7 +111,7 @@ 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 ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/sq_AL/cron.lang b/htdocs/langs/sq_AL/cron.lang
index 6238f0fce2c..485accd2a17 100644
--- a/htdocs/langs/sq_AL/cron.lang
+++ b/htdocs/langs/sq_AL/cron.lang
@@ -6,14 +6,15 @@ 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
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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 environement you can use Scheduled task tools 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
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Prioriteti
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+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
@@ -56,16 +58,16 @@ CronNote=Koment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Aktivizo
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Çaktivizo
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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
@@ -76,8 +78,14 @@ 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+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/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 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.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/sq_AL/exports.lang b/htdocs/langs/sq_AL/exports.lang
index 2dcf4317e00..a0eb7161ef2 100644
--- a/htdocs/langs/sq_AL/exports.lang
+++ b/htdocs/langs/sq_AL/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 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.
@@ -131,3 +133,4 @@ 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/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang
index 16e913977d4..a79dff4badb 100644
--- a/htdocs/langs/sq_AL/mails.lang
+++ b/htdocs/langs/sq_AL/mails.lang
@@ -92,6 +92,7 @@ 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
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index b52a374d7d5..ba2fa0a111d 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -28,7 +28,9 @@ 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
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Value
 PersonalValue=Personal value
 NewObject=New %s
 NewValue=New value
+OldValue=Old value %s
 CurrentValue=Current value
 Code=Code
 Type=Type
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ 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
@@ -671,7 +678,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/sq_AL/modulebuilder.lang b/htdocs/langs/sq_AL/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/sq_AL/modulebuilder.lang
+++ b/htdocs/langs/sq_AL/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/sq_AL/mrp.lang b/htdocs/langs/sq_AL/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/sq_AL/mrp.lang
+++ b/htdocs/langs/sq_AL/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index fd7a7fb44ea..9540d523083 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index 497ce01c6dc..93dc7f8448c 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -108,7 +108,8 @@ 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=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index 4a272a821a1..93142ff9135 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -76,15 +76,16 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/sq_AL/recruitment.lang b/htdocs/langs/sq_AL/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/sq_AL/recruitment.lang
+++ b/htdocs/langs/sq_AL/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/sq_AL/sendings.lang b/htdocs/langs/sq_AL/sendings.lang
index dce3be1c1db..cea753bf79b 100644
--- a/htdocs/langs/sq_AL/sendings.lang
+++ b/htdocs/langs/sq_AL/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Anulluar
+StatusSendingCanceledShort=Anulluar
 StatusSendingDraft=Draft
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Processed
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index 11577ff1d3e..666ede4efd4 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/sq_AL/ticket.lang b/htdocs/langs/sq_AL/ticket.lang
index 97de9a5b5f9..5f259230780 100644
--- a/htdocs/langs/sq_AL/ticket.lang
+++ b/htdocs/langs/sq_AL/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Tjetër
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/sq_AL/website.lang
+++ b/htdocs/langs/sq_AL/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/sq_AL/withdrawals.lang b/htdocs/langs/sq_AL/withdrawals.lang
index 68f1a63dbe7..92dfe12e1c3 100644
--- a/htdocs/langs/sq_AL/withdrawals.lang
+++ b/htdocs/langs/sq_AL/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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/sq_AL/workflow.lang b/htdocs/langs/sq_AL/workflow.lang
index 299be277e1d..494a0424a75 100644
--- a/htdocs/langs/sq_AL/workflow.lang
+++ b/htdocs/langs/sq_AL/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang
index 66b404cdec9..0f47b67db83 100644
--- a/htdocs/langs/sr_RS/accountancy.lang
+++ b/htdocs/langs/sr_RS/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Datum
 Docref=Referenca
 LabelAccount=Oznaka računa
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Izveštaj
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Deo broj
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 842fbea4662..e7d50480139 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Display
 SetupArea=Podešavanja
 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.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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.
@@ -256,6 +257,7 @@ 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.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=Lista foldera sa templejtima u OpenDocument formatu.<br><br>Staviti apsolutnu putanju foldera.<br>Svaki folder u listi mora biti na novoj liniji.<br>Da biste dodali folder GED modulu, ubacite ga ovde <b>DOL_DATA_ROOT/ecm/ime_vaseg_foldera</b>.<br><br>Fajlovi u tim folderima moraju imati ekstenziju <b>.odt</b> ili <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+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
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Anketa ili Glasanje
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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
+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 the language of the third party
+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
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+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
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/sr_RS/banks.lang b/htdocs/langs/sr_RS/banks.lang
index 2939146c14e..0a1a42832d4 100644
--- a/htdocs/langs/sr_RS/banks.lang
+++ b/htdocs/langs/sr_RS/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/sr_RS/blockedlog.lang b/htdocs/langs/sr_RS/blockedlog.lang
index 9be5b672696..977e3f9d5c0 100644
--- a/htdocs/langs/sr_RS/blockedlog.lang
+++ b/htdocs/langs/sr_RS/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/sr_RS/boxes.lang b/htdocs/langs/sr_RS/boxes.lang
index 037853abcf2..9f9318be2df 100644
--- a/htdocs/langs/sr_RS/boxes.lang
+++ b/htdocs/langs/sr_RS/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Opšta aktivnost (fakture, ponude, narudžbine)
 BoxGoodCustomers=Dobri kupci
 BoxTitleGoodCustomers=%s Dobri kupci
+BoxScheduledJobs=Planirane operacije
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=Nema definisane zabeleške
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Računovodstvo
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/sr_RS/cashdesk.lang b/htdocs/langs/sr_RS/cashdesk.lang
index 5074b404df8..75b0acd39a2 100644
--- a/htdocs/langs/sr_RS/cashdesk.lang
+++ b/htdocs/langs/sr_RS/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+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
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/sr_RS/categories.lang b/htdocs/langs/sr_RS/categories.lang
index 3467c78c1e5..f72f3351441 100644
--- a/htdocs/langs/sr_RS/categories.lang
+++ b/htdocs/langs/sr_RS/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=Lista naziva/kategorija
+CatListAll=List of tags/categories (all types)
 NewCategory=Nov naziv/kategorija
 ModifCat=Izmeni naziv/kategoriju
 CatCreated=Kreiran naziv/kategorija
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=ID naziva/kategorije
-CatSupList=List of vendor tags/categories
-CatCusList=Lista naziva/kategorija kupca/prospekta
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Lista naziva/kategorija proizvoda
 CatMemberList=Lista naziva/kategorija članova
-CatContactList=Lista naziva/kategorija kontakata
-CatSupLinks=Povezanost između dobavljača i naziva/kategorija
+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=Povezanost između kupaca/prospekta i naziva/kategorija
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Povezanost između proizvoda/usluga i naziva/kategorija
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=Povezanost između članova i naziva/kategorija
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Ukloni iz naziva/kategorije
 ExtraFieldsCategories=Komplementarni atributi
 CategoriesSetup=TPodešavanje naziva/kategorija
diff --git a/htdocs/langs/sr_RS/companies.lang b/htdocs/langs/sr_RS/companies.lang
index 31db7cdc260..154132b33da 100644
--- a/htdocs/langs/sr_RS/companies.lang
+++ b/htdocs/langs/sr_RS/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Provera nije moguća. Servis nije dostupan za datu državu (%s).
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Zaposleni
 ProspectLevelShort=Potencijal
diff --git a/htdocs/langs/sr_RS/compta.lang b/htdocs/langs/sr_RS/compta.lang
index edf211abd56..122fa300178 100644
--- a/htdocs/langs/sr_RS/compta.lang
+++ b/htdocs/langs/sr_RS/compta.lang
@@ -111,7 +111,7 @@ Refund=Povraćaj
 SocialContributionsPayments=Uplate poreza/doprinosa
 ShowVatPayment=Prikaži PDV uplatu
 TotalToPay=Ukupno za uplatu
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+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=Rač. kod klijenta
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Da li ste sigurni da želite da obrišete ovu up
 ExportDataset_tax_1=Uplate poreza/doprinosa
 CalcModeVATDebt=Mod <b>%sPDV u posvećenom računovodstvu%s</b>.
 CalcModeVATEngagement=Mod <b>%sPDV na prihodima-rashodima%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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= Mod <b>%sRE za fakture klijenata - fakture dobavljača%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Stanje prihoda i rashoda, godišnji prikaz
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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=- 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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Izveštaj po RE subjektima
 LT2ReportByCustomersES=Izveštaj po subjektu IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/sr_RS/cron.lang b/htdocs/langs/sr_RS/cron.lang
index 184926050c0..5a246d49be9 100644
--- a/htdocs/langs/sr_RS/cron.lang
+++ b/htdocs/langs/sr_RS/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = Kreiraj/ažuriraj planiranu operaciju
 Permission23103 = Obriši planiranu operaciju
 Permission23104 = Izvrši planiranu operaciju
 # Admin
-CronSetup= Podešavanja planiranih operacija
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Ili za proveru i izvršenje određene operacije
+CronSetup=Podešavanja planiranih operacija
+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 za URL za izvršenje cron operacija
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=U Unix okruženju možete koristiti crontab za izvršenje komandne linije svakih 5 minuta
-CronExplainHowToRunWin=U Windows okruženju možete koristiti Scheduled task tools za izvršenje komandne linije svakih 5 minuta
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Klasa %s ne sadrži ni jedan metod %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
@@ -42,10 +43,11 @@ CronModule=Modul
 CronNoJobs=Nema prijavljenih operacija
 CronPriority=Prioritet
 CronLabel=Naziv
-CronNbRun=Br. izvršenja
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=Svakih
 JobFinished=Operacija je izvršena
+Scheduled=Scheduled
 #Page card
 CronAdd= Dodaj operacije
 CronEvery=Izvrši operaciju svakih
@@ -56,16 +58,16 @@ CronNote=Komentar
 CronFieldMandatory=Polje %s je obavezno
 CronErrEndDateStartDt=Kraj ne može biti pre početka
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Aktiviraj
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Deaktiviraj
 CronTaskInactive=Operacije je deaktivirana
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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=Komandna linija za izvršenje
 CronCreateJob=Kreiraj novu planiranu operaciju
 CronFrom=Od
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Komandna linija
 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Operacija deaktivirana
 MakeLocalDatabaseDumpShort=Bekap lokalne baze
-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
+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/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index b257b6a38d4..29ba9a69da3 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Nema greške, commit.
 # Errors
 ErrorButCommitIsDone=Bilo je grešaka, ali potvrđujemo uprkos tome
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=URL %s je pogrešan
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s već postoji
 ErrorGroupAlreadyExists=Grupa %s već postoji
 ErrorRecordNotFound=Linija nije pronađena.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Neka obavezna polja nisu popunjena
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=Greška prilikom kreacije foldera. Proverite da li Web server nalog ima prava da piše u Dolibarr documents folderu. Ako je parametar <b>safe_mode</b> aktivan u PHP-u, proverite da li Dolibarr php fajlovi pripadaju korisniku (ili grupi) Web server naloga.
 ErrorNoMailDefinedForThisUser=Mail nije definisan za ovog korisnika
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Za ovu funkcionalnost morate aktivirati javascript.
 ErrorTopMenuMustHaveAParentWithId0=Meni tipa "Top" ne može imati parent meni. Stavite 0 u parent meni ili izaberite meni tipa "Left".
 ErrorLeftMenuMustHaveAParentId=Meni tipa "Levi" mora imati parent ID.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Ovo ime profila već postoji za ovaj export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching nije završen.
 ErrorLDAPMakeManualTest=.ldif fajl je generisan u folderu %s. Pokušajte da ga učitate ručno iz komandne linije da biste imali više informacija o greškama.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref korišćena za kreaciju već postoji.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Lozinka je podešena za ovog člana, ali korisnik nije kreiran. To znači da je lozinka sačuvana, ali se član ne može ulogovati na Dolibarr. Informaciju može koristiti neka eksterna komponenta, ali ako nemate potrebe da definišete korisnika/lozinku za članove, možete deaktivirati opciju "Upravljanje lozinkama za svakog člana" u podešavanjima modula Članovi. Ukoliko morate da kreirate login, ali Vam nije potrebna lozinka, ostavite ovo polje prazno da se ovo upozorenje ne bi prikazivalo. Napomena: email može biti korišćen kao login ako je član povezan sa korisnikom.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Vaša prijava je promenjena. Iz sigurnosn
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/sr_RS/exports.lang b/htdocs/langs/sr_RS/exports.lang
index 1ed869416fd..41f2f5ed861 100644
--- a/htdocs/langs/sr_RS/exports.lang
+++ b/htdocs/langs/sr_RS/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Naziv polja
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Biblioteka
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Korak
 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.
@@ -131,3 +133,4 @@ 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/sr_RS/mails.lang b/htdocs/langs/sr_RS/mails.lang
index 9b2a31bd01f..a37342806c3 100644
--- a/htdocs/langs/sr_RS/mails.lang
+++ b/htdocs/langs/sr_RS/mails.lang
@@ -92,6 +92,7 @@ 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=Linija %s u fajlu
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=Mail nije poslat. Pogrešan mail primaoca ili pošiljaoca. Proverite profil korisnika.
 # Module Notifications
 Notifications=Obaveštenja
-NoNotificationsWillBeSent=Nema planiranih obaveštenja za ovaj događaj i kompaniju
-ANotificationsWillBeSent=1 obaveštenje će biti poslato mailom
-SomeNotificationsWillBeSent=%s obaveštenja će biti poslato mailom
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=Lista svih poslatih obaveštenja
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Konfiguracija slanja mailova je podešena na "%s". Ovaj mod ne može slati masovne mailove.
 MailSendSetupIs2=Prvo morate sa admin nalogom otvoriti meni %sHome - Setup - EMails%s da biste promenili parametar <strong>'%s'</strong> i prešli u mod '%s'. U ovom modu, možete uneti podešavanja SMTP servera Vašeg provajdera i koristiti funkcionalnost masovnog emailinga.
 MailSendSetupIs3=Ukoliko imate pitanja oko podešavanja SMTP servera, možete pitati %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Informacija
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index d6425161390..1630acdddf6 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Dostupne zamenske promenljive
 NoTranslation=Nema prevoda
 Translation=Prevod
+CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Nema rezultata
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Linija sačuvana
 RecordDeleted=Linija obrisana
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Vrednost
 PersonalValue=Lična vrednost
 NewObject=New %s
 NewValue=Nova vrednost
+OldValue=Old value %s
 CurrentValue=Trenutna vrednost
 Code=Kod
 Type=Tip
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Opcija
+Filters=Filters
 List=Lista
 FullList=Cela lista
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ SupplierPreview=Vendor preview
 ShowCustomerPreview=Prikaži preview klijenta
 ShowSupplierPreview=Show vendor preview
 RefCustomer=Ref. klijenta
+InternalRef=Internal ref.
 Currency=Valuta
 InfoAdmin=Informacija za administratore
 Undo=Undo
@@ -671,7 +678,7 @@ SendMail=Pošalji email
 Email=Email
 NoEMail=Nema maila
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=Nema mobilnog telefona
 Owner=Vlasnik
 FollowingConstantsWillBeSubstituted=Sledeće konstante će biti zamenjene odgovarajućim vrednostima.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=Na čekanju
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/sr_RS/modulebuilder.lang b/htdocs/langs/sr_RS/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/sr_RS/modulebuilder.lang
+++ b/htdocs/langs/sr_RS/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/sr_RS/mrp.lang b/htdocs/langs/sr_RS/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/sr_RS/mrp.lang
+++ b/htdocs/langs/sr_RS/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/sr_RS/other.lang b/htdocs/langs/sr_RS/other.lang
index a314caa0fb6..6abb3f27b1a 100644
--- a/htdocs/langs/sr_RS/other.lang
+++ b/htdocs/langs/sr_RS/other.lang
@@ -5,8 +5,6 @@ Tools=Alati
 TMenuTools=Alati
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Datum rođenja
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=Obaveštenje o rođendanu je aktivno
 BirthdayAlertOff=Obaveštenje o rođendanu je neaktivno
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=Vidi podešavanja modula %s
 NbOfAttachedFiles=Broj fajlova/dokumenata u prilogu
 TotalSizeOfAttachedFiles=Ukupna veličina priloženih fajlova/dokumenata
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Desno
 CalculatedWeight=Izračunata težina
 CalculatedVolume=Izračunata zapremina
 Weight=Težina
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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=Podaci za import
 DolibarrNotification=Automatsko obaveštenje
 ResizeDesc=Unesite novu širinu <b>ILI</b> novu visinu. Proporcija će biti održana prilikom promene veličine...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Oblast exporta
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index d553a48ca39..1df147564f2 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Broj cena
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+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=Broj paketa proizvoda
@@ -167,8 +168,10 @@ BuyingPrices=Kupovne cene
 CustomerPrices=Cene klijenta
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Zemlja porekla
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Koristi fiksnu cenu
 PriceByQuantity=Različite cene po količini
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Raspon količina
-MultipriceRules=Price segment rules
+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=%% varijacija od %s
 PercentDiscountOver=%% popust od %s
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index ac565c0140b..931194501ee 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/projects.lang
@@ -76,15 +76,16 @@ MyActivities=Moji zadaci/aktivnosti
 MyProjects=Moji projekti
 MyProjectsArea=Moja zona projekata
 DurationEffective=Efektivno trajanje
-ProgressDeclared=Prijavljeni napredak
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Izračunati napredak
+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=Vreme
+TimeConsumed=Consumed
 ListOfTasks=Lista zadataka
 GoToListOfTimeConsumed=Idi na listu utrošenog vremena
 GanttView=Gantt View
diff --git a/htdocs/langs/sr_RS/recruitment.lang b/htdocs/langs/sr_RS/recruitment.lang
index 2d9b75ed0b9..ae1eb5feb23 100644
--- a/htdocs/langs/sr_RS/recruitment.lang
+++ b/htdocs/langs/sr_RS/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/sr_RS/sendings.lang b/htdocs/langs/sr_RS/sendings.lang
index 6aa01a7b447..25672b23d46 100644
--- a/htdocs/langs/sr_RS/sendings.lang
+++ b/htdocs/langs/sr_RS/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Druge isporuke za ovu narudžbinu
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Isporuke za potvrdu
 StatusSendingCanceled=Otkazano
+StatusSendingCanceledShort=Poništeno
 StatusSendingDraft=Nacrt
 StatusSendingValidated=Potvrđeno (proizvodi za isporuku ili već isporučeni)
 StatusSendingProcessed=Procesuirano
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Morate prvo potvrditi porudžbinu pre nego omog
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Kompletni model dokumenta za prijemnice isporuka (logo, ...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstanta EXPEDITION_ADDON_NUMBER nije definisana
 SumOfProductVolumes=Suma količina proizvoda
 SumOfProductWeights=Suma težina proizvoda
diff --git a/htdocs/langs/sr_RS/stocks.lang b/htdocs/langs/sr_RS/stocks.lang
index 2df84e2de08..d33ab3c5d47 100644
--- a/htdocs/langs/sr_RS/stocks.lang
+++ b/htdocs/langs/sr_RS/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Vrednost magacina
 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/sr_RS/ticket.lang b/htdocs/langs/sr_RS/ticket.lang
index 88a8ad89046..35102542484 100644
--- a/htdocs/langs/sr_RS/ticket.lang
+++ b/htdocs/langs/sr_RS/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Drugo
 TicketSeverityShortLOW=Nizak
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Visok
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Pročitaj
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/sr_RS/website.lang b/htdocs/langs/sr_RS/website.lang
index 0ff0213ef31..baa3b7e08c8 100644
--- a/htdocs/langs/sr_RS/website.lang
+++ b/htdocs/langs/sr_RS/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Strana
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/sr_RS/withdrawals.lang b/htdocs/langs/sr_RS/withdrawals.lang
index e207c6d1316..001a9c81371 100644
--- a/htdocs/langs/sr_RS/withdrawals.lang
+++ b/htdocs/langs/sr_RS/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Označi kreditirano
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Opcija za realni mod nije podešena, prekidamo posle ove simulacije.
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/sr_RS/workflow.lang b/htdocs/langs/sr_RS/workflow.lang
index e623a6593c3..7502f987d7a 100644
--- a/htdocs/langs/sr_RS/workflow.lang
+++ b/htdocs/langs/sr_RS/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatsko kriranje
 AutomaticClassification=Automatsko klasifikovanje
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index 30f4f0325a6..384ab4af6a9 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=Tjänsten
 ThisProduct=Den här produkten
 DefaultForService=Standard för service
 DefaultForProduct=Standard för produkter
+ProductForThisThirdparty=Product for this thirdparty
+ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Kan inte föreslå
 AccountancySetupDoneFromAccountancyMenu=De flesta inställningarna för bokföringen görs från menyn %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -47,7 +49,8 @@ CountriesInEECExceptMe=Länder i EEG förutom %s
 CountriesExceptMe=Alla länder utom %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
-VueByAccountAccounting=View by accounting account
+VueByAccountAccounting=Visa baserat på redovisningskonto
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Huvudsakliga bokföringskonto för kunder som inte definierats i installationen
 MainAccountForSuppliersNotDefined=Huvudkonton för leverantörer som inte definierats i installationen
@@ -144,7 +147,7 @@ NotVentilatedinAccount=Ej bunden till bokföringskonto
 XLineSuccessfullyBinded=%s produkter / tjänster har framgångsrikt bundet till ett bokföringskonto
 XLineFailedToBeBinded=%s produkter / tjänster var inte bundna till något kontokonto
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Antal element att förbinda visat per sida (högst rekommenderat: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Börja sorteringen av sidan "Bindning att göra" av de senaste elementen
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Börja sorteringen av sidan "Bindning gjort" av de senaste elementen
 
@@ -198,7 +201,8 @@ Docdate=Datum
 Docref=Referens
 LabelAccount=Etikett konto
 LabelOperation=Etikettoperation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Brevkod
 Lettering=Lettering
 Codejournal=Loggbok
@@ -206,7 +210,8 @@ JournalLabel=Loggboksetikett
 NumPiece=Stycke nummer
 TransactionNumShort=Num. transaktion
 AccountingCategory=Personliga grupper
-GroupByAccountAccounting=Grupp efter bokföringskonto
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Här kan du definiera vissa grupper av bokföringskonto. De kommer att användas för personliga redovisningsrapporter.
 ByAccounts=Enligt konton
 ByPredefinedAccountGroups=Av fördefinierade grupper
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Betalning som inte är kopplad till någon produkt /
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Grupp av konto
 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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Här kan du se listan över kostnadsrapporter som är bu
 DescVentilExpenseReportMore=Om du ställer in bokföringskonto på typ av kostnadsrapportrader kommer applikationen att kunna göra alla bindningar mellan dina kostnadsrapporter och konton för ditt kontoplan, bara med ett klick med knappen <strong> "%s" </strong>. Om kontot inte var inställt på avgifterna eller om du fortfarande har några rader som inte är kopplade till något konto måste du göra en manuell bindning från menyn "<strong> %s </strong>".
 DescVentilDoneExpenseReport=Här kan du se listan över raderna för kostnadsrapporter och deras bokföringskonto
 
+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
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Förbind automatiskt
 AutomaticBindingDone=Automatisk bindning gjord
@@ -293,6 +300,7 @@ Accounted=Redovisas i huvudbok
 NotYetAccounted=Ännu inte redovisad i huvudbok
 ShowTutorial=Show Tutorial
 NotReconciled=Inte avstämd
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +345,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Exportera CSV konfigurerbar
 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 067f3a478a2..68ba4a916a7 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -38,7 +38,7 @@ YourSession=Din session
 Sessions=Användarsessioner
 WebUserGroup=Webbserver användare / grupp
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
+PermissionsOnFile=Behörigheter på fil %s
 NoSessionFound=Din PHP-konfiguration verkar inte tillåta att du registrerar aktiva sessioner. Den katalog som används för att spara sessioner (<b> %s </b>) kan skyddas (till exempel av operatörsbehörigheter eller genom PHP-direktivet open_basedir).
 DBStoringCharset=Databas charset för att lagra data
 DBSortingCharset=Databas charset att sortera data
@@ -56,6 +56,8 @@ GUISetup=Visa
 SetupArea=Inställning
 UploadNewTemplate=Ladda upp ny mall (er)
 FormToTestFileUploadForm=Formulär för att testa filuppladdning (enligt inställningar)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Anm: ja effektivt endast om modul <b>%s</b> är aktiverat
 RemoveLock=Ta bort / byt namn på filen <b> %s </b> om den existerar, för att tillåta användning av Update / Install-verktyget.
 RestoreLock=Återställ fil <b> %s </b>, endast med läsbehörighet, för att inaktivera ytterligare användning av Update / Install-verktyget.
@@ -85,7 +87,6 @@ ShowPreview=Visa förhandsgranskning
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Förhandsgranska inte tillgänglig
 ThemeCurrentlyActive=Tema för tillfället
-CurrentTimeZone=PHP server tidszon
 MySQLTimeZone=Timezone MySql (databas)
 TZHasNoEffect=Datum lagras och returneras av databaseserver som om de behölls som inlämnade strängar. Tidszonen har endast effekt när UNIX_TIMESTAMP-funktionen används (som inte ska användas av Dolibarr, så databasen TZ skulle inte ha någon effekt, även om den ändrats efter att data hade angetts).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Detta område ger administrationsfunktioner. Använd menyn f
 Purge=Rensa
 PurgeAreaDesc=På den här sidan kan du radera alla filer som genereras eller lagras av Dolibarr (temporära filer eller alla filer i <b> %s </b> katalog). Att använda den här funktionen är normalt inte nödvändig. Den tillhandahålls som en lösning för användare vars Dolibarr är värd av en leverantör som inte erbjuder behörigheter för att radera filer som genereras av webbservern.
 PurgeDeleteLogFile=Ta bort loggfiler, inklusive <b> %s </b> definierad för Syslog-modulen (ingen risk att förlora data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Ta bort temporära filer
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 PurgeDeleteAllFilesInDocumentsDir=Ta bort alla filer i katalogen: <b> %s </b>. <br> Detta tar bort alla genererade dokument relaterade till elementer (tredje part, fakturor etc ...), filer som laddas upp i ECM-modulen, databassäkerhetskopior och tillfälliga filer.
 PurgeRunNow=Rensa nu
 PurgeNothingToDelete=Ingen katalog eller filer att radera.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Andra resurser
 ExternalResources=Externa resurser
 SocialNetworks=Sociala nätverk
+SocialNetworkId=Social Network 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>
 HelpCenterDesc1=Här finns några resurser för att få hjälp och support med Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Exempel med nuvarande konfiguration
 ListOfDirectories=Förteckning över OpenDocument mallar kataloger
 ListOfDirectoriesForModelGenODT=Lista över kataloger som innehåller mallfiler med OpenDocument-format. <br> <br> Sätt här hela sökvägen till kataloger. <br> Lägg till en vagnretur mellan eah-katalogen. <br> För att lägga till en katalog över GED-modulen, lägg till här <b> DOL_DATA_ROOT / ecm / ditt katalognamn </b>. <br> <br> Filer i katalogerna måste sluta med <b> .odt </b> eller <b> .ods </b>.
 NumberOfModelFilesFound=Antal ODT / ODS-mallfiler som finns i dessa kataloger
-ExampleOfDirectoriesForModelGen=Exempel på syntax: <br> C: \\ Mydir <br> / Home / Mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Att veta hur du skapar dina odT dokumentmallar, innan du förvarar dem i dessa kataloger, läs wiki dokumentation:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Ståndpunkt av förnamn / namn
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parametrar för att säkra webbadresser
 SecurityTokenIsUnique=Använd en unik securekey parameter för varje webbadress
 EnterRefToBuildUrl=Ange referens för objekt %s
 GetSecuredUrl=Få beräknat URL
-ButtonHideUnauthorized=Dölj knappar för icke-administrativa användare för obehöriga åtgärder istället för att visa grått inaktiverade knappar
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Gammal momssats
 NewVATRates=Ny momssats
 PriceBaseTypeToChange=Ändra om priser med bas referensvärde som definieras på
@@ -668,7 +670,7 @@ Module54000Desc=Direktutskrift (utan att öppna dokumenten) med koppar IPP-grän
 Module55000Name=Omröstning, undersökning eller omröstning
 Module55000Desc=Skapa online-omröstningar, undersökningar eller röster (som Doodle, Studs, RDVz etc ...)
 Module59000Name=Marginaler
-Module59000Desc=Modul för att hantera marginaler
+Module59000Desc=Module to follow margins
 Module60000Name=Provision
 Module60000Desc=Modul för att hantera uppdrag
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ YouUseBestDriver=Du använder drivrutinen %s vilket är den bästa drivrutinen s
 YouDoNotUseBestDriver=Du använder drivrutinen %s men drivrutinen %s rekommenderas.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Sökoptimering
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 BrowserIsOK=Du använder %s webbläsaren. Den här webbläsaren är ok för säkerhet och prestanda.
 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.
@@ -1596,8 +1598,13 @@ ServiceSetup=Tjänster modul konfiguration
 ProductServiceSetup=Produkter och tjänster moduler inställning
 NumberOfProductShowInSelect=Maximalt antal produkter som ska visas i kombinationsvallista (0 = ingen gräns)
 ViewProductDescInFormAbility=Visa produktbeskrivningar i formulär (visas annars i en verktygstips)
+DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
+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=Aktivera i produkt / tjänst Bifogade fliken Filer en möjlighet att slå samman produkt PDF-dokument till förslag PDF azur om produkten / tjänsten är på förslaget
-ViewProductDescInThirdpartyLanguageAbility=Visa produktbeskrivningar på tredje parts språk
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 UseSearchToSelectProductTooltip=Även om du har ett stort antal produkter (> 100 000) kan du öka hastigheten genom att ställa in konstant PRODUCT_DONOTSEARCH_ANYWHERE till 1 i Setup-> Other. Sökningen begränsas sedan till början av strängen.
 UseSearchToSelectProduct=Vänta tills du trycker på en knapp innan du laddar innehållet i produktkombinationslistan (Detta kan öka prestanda om du har ett stort antal produkter, men det är mindre bekvämt)
 SetDefaultBarcodeTypeProducts=Standard streckkod som ska användas för produkter
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personliga menyer som inte är kopplade till en toppm
 NewMenu=Ny meny
 MenuHandler=Meny handler
 MenuModule=Källa modul
-HideUnauthorizedMenu= Göm obehöriga menyer (grå)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Id-menyn
 DetailMenuHandler=Meny hanterare där för att visa nya menyn
 DetailMenuModule=Modulnamn om menyalternativet kommer från en modul
@@ -1983,11 +1990,12 @@ EMailHost=Värd för e-post IMAP-server
 MailboxSourceDirectory=Postkälla källkatalog
 MailboxTargetDirectory=Målkatalogen för brevlådan
 EmailcollectorOperations=Verksamhet att göra av samlare
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Samla nu
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Datum senaste samlingen försökt
-DateLastcollectResultOk=Datum senaste samla framgångsrikt
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Senaste resultatet
 EmailCollectorConfirmCollectTitle=E-post samla bekräftelse
 EmailCollectorConfirmCollect=Vill du springa samlingen för den här samlaren nu?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menyinmatningskod (huvudmeny)
 ECMAutoTree=Visa automatiskt ECM-träd
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang
index dc82d075631..42c143d1b0b 100644
--- a/htdocs/langs/sv_SE/banks.lang
+++ b/htdocs/langs/sv_SE/banks.lang
@@ -173,10 +173,11 @@ SEPAMandate=SEPA-mandatet
 YourSEPAMandate=Ditt SEPA-mandat
 FindYourSEPAMandate=Detta är ditt SEPA-mandat för att bemyndiga vårt företag att göra direkt debitering till din bank. Returnera det undertecknat (skanna av det signerade dokumentet) eller skicka det via post till
 AutoReportLastAccountStatement=Fyll i fältet 'Antal kontoutdrag' automatiskt med det sista kontonummeret när avstämning görs
-CashControl=POS kontantstängsel
-NewCashFence=Nytt kontantstängsel
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/sv_SE/blockedlog.lang b/htdocs/langs/sv_SE/blockedlog.lang
index 480f38a923d..56f0339d071 100644
--- a/htdocs/langs/sv_SE/blockedlog.lang
+++ b/htdocs/langs/sv_SE/blockedlog.lang
@@ -35,7 +35,7 @@ logDON_DELETE=Donation logisk borttagning
 logMEMBER_SUBSCRIPTION_CREATE=Medlemskapsabonnemang skapad
 logMEMBER_SUBSCRIPTION_MODIFY=Medlemsabonnemang modifierad
 logMEMBER_SUBSCRIPTION_DELETE=Medlems abonnemangs logisk borttagning
-logCASHCONTROL_VALIDATE=Kontantskyddsinspelning
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Kundfaktura nedladdning
 BlockedLogBillPreview=Kundfaktura förhandsvisning
 BlockedlogInfoDialog=Logguppgifter
diff --git a/htdocs/langs/sv_SE/boxes.lang b/htdocs/langs/sv_SE/boxes.lang
index 8de035e3c7b..a7deb6f3811 100644
--- a/htdocs/langs/sv_SE/boxes.lang
+++ b/htdocs/langs/sv_SE/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Senast %s ändrade donationer
 BoxTitleLastModifiedExpenses=Senaste %s modifierade kostnadsrapporterna
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Global aktivitet (fakturor, förslag, order)
 BoxGoodCustomers=Bra kunder
 BoxTitleGoodCustomers=%s Bra kunder
+BoxScheduledJobs=Schemalagda jobb
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Misslyckades med att uppdatera RSS-flöde. Senaste framgångsrika uppdateringsdatum: %s
 LastRefreshDate=Senaste uppdateringsdatum
 NoRecordedBookmarks=Inga bokmärken definieras. Klicka <a href="%s">här</a> för att lägga till bokmärken.
@@ -92,8 +95,8 @@ LastXMonthRolling=Den senaste %s månaden rullande
 ChooseBoxToAdd=Lägg till widget i din instrumentpanel
 BoxAdded=Widget har lagts till i din instrumentpanel
 BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Redovisning
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/sv_SE/cashdesk.lang b/htdocs/langs/sv_SE/cashdesk.lang
index de64394d96b..96ea227c941 100644
--- a/htdocs/langs/sv_SE/cashdesk.lang
+++ b/htdocs/langs/sv_SE/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=sidfot
 AmountAtEndOfPeriod=Belopp vid periodens utgång (dag, månad eller år)
 TheoricalAmount=Teoretisk mängd
 RealAmount=Verklig mängd
-CashFence=Cash fence
-CashFenceDone=Kassaskydd gjord för perioden
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Antal av fakturor
 Paymentnumpad=Typ av kudde för att komma in i betalningen
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/sv_SE/categories.lang b/htdocs/langs/sv_SE/categories.lang
index f3c56936403..821c5b52128 100644
--- a/htdocs/langs/sv_SE/categories.lang
+++ b/htdocs/langs/sv_SE/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projektets taggar / kategorier område
 UsersCategoriesArea=Användare taggar / kategorier område
 SubCats=Underkategorier
 CatList=Lista med taggar / kategorier
+CatListAll=List of tags/categories (all types)
 NewCategory=Ny tagg / kategori
 ModifCat=Ändra tagg / kategori
 CatCreated=Tagg / kategori skapad
@@ -65,16 +66,22 @@ UsersCategoriesShort=Användare taggar / kategorier
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tagg / kategori id
-CatSupList=Lista över leverantörskoder / kategorier
-CatCusList=Lista över kund / prospektetiketter / kategorier
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Lista över produkter taggar / kategorier
 CatMemberList=Lista över medlemmar taggar / kategorier
-CatContactList=Lista över kontaktkoder / kategorier
-CatSupLinks=Länkar mellan leverantörer och taggar / kategorier
+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=Länkar mellan kunder / utsikter och taggar / kategorier
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=Länkar mellan produkter / tjänster och taggar / kategorier
-CatProJectLinks=Länkar mellan projekt och taggar / kategorier
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Ta bort från taggar / kategori
 ExtraFieldsCategories=Extra attibut
 CategoriesSetup=Taggar / kategorier inställning
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index 57b74758a58..1e64d1649c3 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Kontrollera momsnumret inom gemenskapen på Europeiska
 VATIntraManualCheck=Du kan också kontrollera manuellt på Europeiska kommissionens webbplats <a href="%s" target="_blank"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Kontroll inte möjlig. Kontrollera om tjänsten tillhandahålls av medlemsstaten (%s).
 NorProspectNorCustomer=Inte utsikter, eller kund
-JuridicalStatus=Juridisk enhetstyp
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=anställda
 ProspectLevelShort=Potentiella
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index 481d0ead328..b9ac03cf0ef 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -111,7 +111,7 @@ Refund=Återbetalning
 SocialContributionsPayments=Betalning av sociala / skattemässiga skatter
 ShowVatPayment=Visa mervärdesskatteskäl
 TotalToPay=Totalt att betala
-BalanceVisibilityDependsOnSortAndFilters=Balans är endast synlig i den här listan om tabell sorteras stigande på %s och filtreras för 1 bankkonto
+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=Kundbokföringskod
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Cust. konto. koda
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Är du säker på att du vill ta bort denna soci
 ExportDataset_tax_1=Sociala och skattemässiga skatter och betalningar
 CalcModeVATDebt=<b>Läge% svat på redovisning engagemang% s.</b>
 CalcModeVATEngagement=<b>Läge% svat på inkomster-utgifter% s.</b>
-CalcModeDebt=Analys av kända inspelade fakturor, även om de ännu inte redovisas i huvudboken.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Analys av kända registrerade betalningar, även om de ännu inte är redovisade i huvudboken.
 CalcModeBookkeeping=Analys av data bokförd i huvudboken.
 CalcModeLT1= <b>Läge% SRE på kundfakturor - leverantörerna fakturerar% s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Överskott av intäkter och kostnader, årliga samm
 AnnualByCompanies=Inkomst- och utgiftsbalans, enligt fördefinierade konton
 AnnualByCompaniesDueDebtMode=Balans av intäkter och kostnader, detalj av fördefinierade grupper, läge <b> %sClaims-Debts%s </b> sa <b> Åtagandebetalning </b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=Se %sanalys av payments%s för en beräkning av faktiska betalningar som gjorts även om de ännu inte är redovisade i huvudboken.
-SeeReportInDueDebtMode=Se %sanalys av fakturor%s för en beräkning baserad på kända inspelade fakturor, även om de ännu inte är redovisade i huvudboken.
-SeeReportInBookkeepingMode=Se <b> %sBokföringsrapport%s </b> för en beräkning på <b> Bokföring huvudboken tabell </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=- Belopp som visas är med alla skatter inkluderade
 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=- 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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Det visar rekord i din huvudboken med bokför
 SeePageForSetup=Se meny <a href="%s"> %s </a> för installation
 DepositsAreNotIncluded=- Betalningsfakturor ingår ej
 DepositsAreIncluded=- Betalningsfakturor ingår
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Rapportera skatt 2 av tredje part
 LT2ReportByCustomers=Rapportera skatt 3 av tredje part
 LT1ReportByCustomersES=Rapport från tredje part RE
 LT2ReportByCustomersES=Rapport från tredje part IRPF
 VATReport=Försäljningsskatterapport
 VATReportByPeriods=Försäljningsskattrapport per period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Försäljningsskattrapport enligt priser
 VATReportByThirdParties=Försäljningsskattrapport från tredje part
 VATReportByCustomers=Försäljningsskatt rapport från kund
diff --git a/htdocs/langs/sv_SE/cron.lang b/htdocs/langs/sv_SE/cron.lang
index a8a025d1345..05f3017600e 100644
--- a/htdocs/langs/sv_SE/cron.lang
+++ b/htdocs/langs/sv_SE/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Radera schemalagt jobb
 Permission23104 = Utför schemalagt jobb
 # Admin
 CronSetup=Planerad jobbhantering installation
-URLToLaunchCronJobs=URL för att kontrollera och starta kvalificerade cron-jobb
-OrToLaunchASpecificJob=Eller för att kontrollera och starta ett specifikt arbete
+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=Säkerhetsnyckel för URL för att lansera cron-jobb
 FileToLaunchCronJobs=Kommandorad för att kontrollera och starta kvalificerade cron-jobb
 CronExplainHowToRunUnix=I en Unix-miljö bör följande rad läggas i crontab så kommandot exekveras var 5:e minut.
 CronExplainHowToRunWin=I Microsoft (tm) Windows-miljö kan du använda Schemalagda uppgiftsverktyg för att köra kommandoraden var 5: e minut
 CronMethodDoesNotExists=Klass %s innehåller ingen metod %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron-jobbprofiler definieras i modulbeskrivningsfilen. När modulen är aktiverad laddas de och är tillgängliga så att du kan administrera jobben från adminverktygsmenyn %s.
 CronJobProfiles=Förteckning över fördefinierade cron jobbprofiler
 # Menu
@@ -42,10 +43,11 @@ CronModule=Modul
 CronNoJobs=Inga jobb registrerade
 CronPriority=Prioritet
 CronLabel=Etikett
-CronNbRun=Antal lanseringar
+CronNbRun=Number of launches
 CronMaxRun=Maximalt antal lanseringar
 CronEach=Varje
 JobFinished=Job lanserad och klar
+Scheduled=Scheduled
 #Page card
 CronAdd= Lägg till jobb
 CronEvery=Utför jobbet vardera
@@ -56,7 +58,7 @@ CronNote=Kommentar
 CronFieldMandatory=Fält %s är obligatoriskt
 CronErrEndDateStartDt=Slutdatum kan inte vara före startdatum
 StatusAtInstall=Status vid modulinstallation
-CronStatusActiveBtn=Aktivera
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Inaktivera
 CronTaskInactive=Det här jobbet är avaktiverat
 CronId=Id
@@ -76,8 +78,14 @@ CronType_method=Samtalsmetod för en PHP-klass
 CronType_command=Skalkommando
 CronCannotLoadClass=Kan inte ladda klassfilen %s (för att använda klass %s)
 CronCannotLoadObject=Klassfilen %s laddades, men objektet %s kunde inte hittas i det
-UseMenuModuleToolsToAddCronJobs=Gå till menyn "Hem - Adminverktyg - Schemalagda jobb" för att se och redigera schemalagda jobb.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=Jobb inaktiverat
 MakeLocalDatabaseDumpShort=Lokal databas säkerhetskopia
 MakeLocalDatabaseDump=Skapa en lokal databasdump. Parametrarna är: komprimering ('gz' eller 'bz' eller 'none'), säkerhetskopieringstyp ('mysql', 'pgsql', 'auto'), 1, 'auto' eller filnamn att bygga, antal backupfiler för att hålla
 WarningCronDelayed=Uppmärksamhet, för prestationsändamål, vad som än är nästa datum för utförande av aktiverade jobb, kan dina jobb försenas till högst %s timmar innan de körs.
+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/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index feca0db02b2..0ec329c972d 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Inget fel
 # Errors
 ErrorButCommitIsDone=Fel hittades men vi bekräfta trots detta
 ErrorBadEMail=E-post %s är fel
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s är fel
 ErrorBadValueForParamNotAString=Dåligt värde för din parameter. Det lägger till i allmänhet när översättning saknas.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Logga %s finns redan.
 ErrorGroupAlreadyExists=Grupp %s finns redan.
 ErrorRecordNotFound=Spela in hittades inte.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Vissa obligatoriska fält inte fylls.
 ErrorSubjectIsRequired=E-postämnet krävs
 ErrorFailedToCreateDir=Misslyckades med att skapa en katalog. Kontrollera att webbservern användaren har rättigheter att skriva till Dolibarr dokument katalogen. Om parametern <b>safe_mode</b> är aktiv på PHP, kontrollera att Dolibarr php-filer äger till webbserver användare (eller grupp).
 ErrorNoMailDefinedForThisUser=Ingen post definierats för denna användare
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Denna funktion måste ha Javascript vara aktiverat för att arbeta. Ändra detta i inställning - displayen.
 ErrorTopMenuMustHaveAParentWithId0=En meny av typen &quot;Top&quot; kan inte ha en förälder meny. Sätt 0 i överordnade menyn eller välja en meny av typen &quot;Vänster&quot;.
 ErrorLeftMenuMustHaveAParentId=En meny av typen &quot;Vänster&quot; måste ha en förälder id.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Detta profilnamn finns redan för denna export.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matchning inte är fullständig.
 ErrorLDAPMakeManualTest=A. LDIF filen har genererats i katalogen %s. Försök att läsa in den manuellt från kommandoraden för att få mer information om fel.
 ErrorCantSaveADoneUserWithZeroPercentage=Kan inte spara en åtgärd med "status inte startad" om fältet "gjort av" också är fyllt.
-ErrorRefAlreadyExists=Ref används för att skapa finns redan.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Var god ange kontoutdragsnamnet där posten ska rapporteras
 ErrorRecordHasChildren=Misslyckades med att radera rekord eftersom det har några barnrekord.
 ErrorRecordHasAtLeastOneChildOfType=Objektet har minst ett barn av typ %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Du måste välja om artikeln är
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Den rabatt du försöker att tillämpa är större än förblir att betala. Dela rabatten i 2 mindre rabatter före.
 ErrorFileNotFoundWithSharedLink=Filen hittades inte. Det kan hända att dela nyckeln ändrades eller filen togs bort nyligen.
 ErrorProductBarCodeAlreadyExists=Produktens streckkod %s finns redan på en annan produktreferens.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Observera också att det är inte möjligt att använda en virtuell produkt för automatisk ökning / minskning av underprodukt när minst en underprodukt (eller delprodukt av underprodukter) behöver ett serienummer / lotnummer.
+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=Beskrivning är obligatorisk för linjer med fri produkt
 ErrorAPageWithThisNameOrAliasAlreadyExists=Sidan / behållaren <strong> %s </strong> har samma namn eller alternativ alias som den du försöker använda
 ErrorDuringChartLoad=Fel vid inmatning av kontoplan. Om några konton inte laddades, kan du fortfarande skriva in dem manuellt.
@@ -243,6 +246,16 @@ 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
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Ett lösenord har ställts för den här medlemmen. Men inget användarkonto skapades. Så det här lösenordet är lagrat men kan inte användas för att logga in till Dolibarr. Den kan användas av en extern modul / gränssnitt men om du inte behöver definiera någon inloggning eller ett lösenord för en medlem kan du inaktivera alternativet "Hantera en inloggning för varje medlem" från inställningen av medlemsmodulen. Om du behöver hantera en inloggning men inte behöver något lösenord, kan du hålla fältet tomt för att undvika denna varning. Obs! Email kan också användas som inloggning om medlemmen är länkad till en användare.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Din inloggning har ändrats. För säkerh
 WarningAnEntryAlreadyExistForTransKey=Det finns redan en post för översättningsnyckeln för det här språket
 WarningNumberOfRecipientIsRestrictedInMassAction=Varning, antalet olika mottagare är begränsat till <b> %s </b> vid användning av massåtgärder på listor
 WarningDateOfLineMustBeInExpenseReportRange=Varning, datumet för raden ligger inte inom kostnadsberäkningsområdet
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Projektet är stängt. Du måste öppna den först igen.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/sv_SE/exports.lang b/htdocs/langs/sv_SE/exports.lang
index cd841c26648..445763abcf0 100644
--- a/htdocs/langs/sv_SE/exports.lang
+++ b/htdocs/langs/sv_SE/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Fält titel
 NowClickToGenerateToBuildExportFile=Välj nu filformatet i kombinationsrutan och klicka på "Generera" för att bygga exportfilen ...
 AvailableFormats=Tillgängliga format
 LibraryShort=Bibliotek
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Steg
 FormatedImport=Importassistent
 FormatedImportDesc1=Den här modulen låter dig uppdatera befintliga data eller lägga till nya objekt i databasen från en fil utan teknisk kunskap, med hjälp av en assistent.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Nyckel (kolumn) som ska användas för <b> uppdatering av </
 NbInsert=Antal infogade rader: %s
 NbUpdate=Antal uppdaterade rader: %s
 MultipleRecordFoundWithTheseFilters=Flera poster har hittats med dessa filter: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
index ae4c2707259..d7d01c9a7eb 100644
--- a/htdocs/langs/sv_SE/mails.lang
+++ b/htdocs/langs/sv_SE/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=E-postmeddelanden inskrivna av användaren
 MailingModuleDescDolibarrUsers=Användare med e-post
 MailingModuleDescThirdPartiesByCategories=Tredje part (enligt kategorier)
 SendingFromWebInterfaceIsNotAllowed=Skicka från webbgränssnitt är inte tillåtet.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Line %s i filen
@@ -125,12 +126,13 @@ TagMailtoEmail=Mottagar Email (inklusive html "mailto:" länk)
 NoEmailSentBadSenderOrRecipientEmail=Ingen email skickad. Dålig avsändare eller mottagarens e-postadress. Verifiera användarprofil.
 # Module Notifications
 Notifications=Anmälningar
-NoNotificationsWillBeSent=Inga e-postmeddelanden planeras för detta evenemang och företag
-ANotificationsWillBeSent=En anmälan kommer att skickas via e-post
-SomeNotificationsWillBeSent=%s anmälningar kommer att skickas via e-post
-AddNewNotification=Aktivera ett nytt e-postmeddelandemål / -händelse
-ListOfActiveNotifications=Lista alla aktiva mål / händelser för e-postmeddelande
-ListOfNotificationsDone=Lista alla e-postmeddelanden skickas
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Konfiguration av e-post att skicka har ställts in till "% s". Detta läge kan inte användas för att skicka massutskick.
 MailSendSetupIs2=Du måste först gå, med ett administratörskonto, i meny% Shome - Setup - e-post% s för att ändra parameter <strong>'% s'</strong> för att använda läget "% s". Med det här läget kan du ange inställningar för SMTP-servern från din internetleverantör och använda Mass mejla funktionen.
 MailSendSetupIs3=Om du har några frågor om hur man ställer in din SMTP-server, kan du be att% s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Importerad fil måste ha format <strong> email, namn,
 UseFormatInputEmailToTarget=Ange en sträng med format <strong> email, namn, förnamn, annat </strong>
 MailAdvTargetRecipients=Mottagare (avancerat urval)
 AdvTgtTitle=Fyll i inmatningsfält för att välja tredjepart eller kontakter / adresser som ska riktas in
-AdvTgtSearchTextHelp=Använd %% som jokertecken. Till exempel för att hitta alla objekt som <b> jean, joe, jim </b>, kan du skriva <b> j%% </b>, du kan också använda; som separator för värde och använd! för utom detta värde. Till exempel <b> jean; joe; jim%%;! Jimo;! Jima% </b> kommer att rikta alla jean, joe, börja med jim men inte jimo och inte allt som börjar med jima
+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=Använd intervall för att välja int eller float värde
 AdvTgtMinVal=Minsta värde
 AdvTgtMaxVal=Maximalt värde
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Skapa filter
 AdvTgtOrCreateNewFilter=Namn på nytt filter
 NoContactWithCategoryFound=Ingen kontakt / adress med en kategori hittad
 NoContactLinkedToThirdpartieWithCategoryFound=Ingen kontakt / adress med en kategori hittad
-OutGoingEmailSetup=Utgående e-postinstallation
-InGoingEmailSetup=Inkommande e-postinstallation
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Standard utgående e-postinstallation
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Kontakter med filter från tredje part
 Unanswered=Unanswered
 Answered=Besvarade
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 4820abfdd05..f8603cc6238 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Ingen mall tillgänglig för denna e-posttyp
 AvailableVariables=Tillgängliga substitutionsvariabler
 NoTranslation=Ingen översättning
 Translation=Översättning
+CurrentTimeZone=PHP server tidszon
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Ingen post funnen
 NoRecordDeleted=Ingen post borttagen
 NotEnoughDataYet=Inte tillräckligt med data
@@ -85,6 +87,8 @@ 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=There is a dedicated help page related to your current screen
+HomePage=Webbsida
 RecordSaved=Post sparades
 RecordDeleted=Post raderad
 RecordGenerated=Post skapad
@@ -220,6 +224,7 @@ Value=Värde
 PersonalValue=Personlig värde
 NewObject=Ny %s
 NewValue=Nytt värde
+OldValue=Old value %s
 CurrentValue=Aktuellt värde
 Code=Kod
 Type=Typ
@@ -433,6 +438,7 @@ RemainToPay=Fortsätt att betala
 Module=Modul / applikation
 Modules=Moduler / Applications
 Option=Alternativ
+Filters=Filters
 List=Lista
 FullList=Fullständig lista
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ SupplierPreview=Leverantörsförhandsgranskning
 ShowCustomerPreview=Visa kunden förhandsgranskning
 ShowSupplierPreview=Visa leverantörsförhandsvisning
 RefCustomer=Ref. kund
+InternalRef=Internal ref.
 Currency=Valuta
 InfoAdmin=Information för administratörer
 Undo=Ångra
@@ -671,7 +678,7 @@ SendMail=Skicka e-post
 Email=epost
 NoEMail=Ingen e-post
 AlreadyRead=Redan läst
-NotRead=Inte läst
+NotRead=Unread
 NoMobilePhone=Ingen mobiltelefon
 Owner=Ägare
 FollowingConstantsWillBeSubstituted=Följande konstanter kommer att ersätta med motsvarande värde.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
index bde1806a162..848cc24cf49 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -32,7 +32,7 @@ DateSubscription=Teckningsdag
 DateEndSubscription=Prenumeration slutdatum
 EndSubscription=Avsluta prenumeration
 SubscriptionId=Prenumeration id
-WithoutSubscription=Without subscription
+WithoutSubscription=Utan prenumeration
 MemberId=Medlem id
 NewMember=Ny medlem
 MemberType=Medlem typ
diff --git a/htdocs/langs/sv_SE/modulebuilder.lang b/htdocs/langs/sv_SE/modulebuilder.lang
index 84447f97569..9983f774100 100644
--- a/htdocs/langs/sv_SE/modulebuilder.lang
+++ b/htdocs/langs/sv_SE/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=PHP-sida för att skapa / redigera / visa en post
 PageForAgendaTab=PHP-sida för händelsefliken
 PageForDocumentTab=PHP-sida för dokumentfliken
 PageForNoteTab=PHP-sida för fliken Not
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Vägen till zip på modulen / applikationspaketet
 PathToModuleDocumentation=Ban till fil med modul / ansökningsdokumentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Mellanslag eller specialtecken är inte tillåtna.
@@ -77,7 +78,7 @@ IsAMeasure=Är en åtgärd
 DirScanned=Directory skannad
 NoTrigger=Ingen utlösare
 NoWidget=Ingen widget
-GoToApiExplorer=Gå till API-explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=Lista över menyuppgifter
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=Lista över definierade behörigheter
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Om du har kunskap om SQL och PHP kan du använda guiden
 SeeTopRightMenu=Se <span class="fa fa-bug"> </span> längst upp till höger
 AddLanguageFile=Lägg till språkfil
 YouCanUseTranslationKey=Här kan du använda en nyckel som är översättningsnyckeln i språkfilen (se fliken "Språk")
-DropTableIfEmpty=(Ta bort tabellen om den är tom)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=Tabellen %s existerar inte
 TableDropped=Tabell %s utgår
 InitStructureFromExistingTable=Bygg strukturen array-strängen i en befintlig tabell
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Använd en specifik redigeringsadress
 UseSpecificFamily = Använd en specifik familj
 UseSpecificAuthor = Använd en specifik författare
 UseSpecificVersion = Använd en specifik första version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/sv_SE/mrp.lang b/htdocs/langs/sv_SE/mrp.lang
index fb36e45f2f3..ae1796e24e4 100644
--- a/htdocs/langs/sv_SE/mrp.lang
+++ b/htdocs/langs/sv_SE/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index 15add067b10..1f8d1297596 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -5,8 +5,6 @@ Tools=Verktyg
 TMenuTools=Verktyg
 ToolsDesc=Alla verktyg som inte ingår i andra menyposter grupperas här. <br> Alla verktyg kan nås via menyn till vänster.
 Birthday=Födelsedag
-BirthdayDate=Födelsedagsdatum
-DateToBirth=Birth date
 BirthdayAlertOn=födelsedag alert aktiva
 BirthdayAlertOff=födelsedag alert inaktiv
 TransKey=Översättning av nyckel: TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Föregående månad (nummer 1-12) på fakturadatum
 TextPreviousMonthOfInvoice=Föregående månad (text) på fakturadatum
 NextMonthOfInvoice=Följande månad (nummer 1-12) på fakturadatum
 TextNextMonthOfInvoice=Följande månad (text) på fakturadatum
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip-fil genererad till <b> %s </b>.
 DocFileGeneratedInto=Doc-filen genereras till <b> %s </b>.
 JumpToLogin=Förbindelse förlorad. Gå till inloggningssidan ...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Utläggsrapport bekräftat (godkännande krävs)
 Notify_EXPENSE_REPORT_APPROVE=Kostnadsrapport godkänd
 Notify_HOLIDAY_VALIDATE=Lämna förfrågan bekräftat (godkännande krävs)
 Notify_HOLIDAY_APPROVE=Lämna förfrågan godkänd
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=Se inställning av modul %s
 NbOfAttachedFiles=Antal bifogade filer / dokument
 TotalSizeOfAttachedFiles=Total storlek på bifogade filer / dokument
@@ -99,6 +100,7 @@ PredefinedMailContentSendShipping=__(Hej)__\n\nVänligen hitta frakt __REF__ bif
 PredefinedMailContentSendFichInter=__(Hej)__\n\nVänligen hitta intervention __REF__ bifogad\n\n\n__(Vänliga hälsningar)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Du kan klicka på länken nedan för att göra din betalning om den inte redan är klar.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hej)__\n\n\n__(Vänliga hälsningar)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr är en kompakt ERP / CRM som stöder flera affärsmoduler. En demo som visar alla moduler ger ingen mening eftersom detta scenario aldrig uppstår (flera hundra tillgängliga). Det finns därför flera demoprofiler tillgängliga.
 ChooseYourDemoProfil=Välj den demoprofil som bäst passar dina behov ...
 ChooseYourDemoProfilMore=... eller bygg din egen profil <br> (manuellt modulval)
@@ -214,6 +216,7 @@ EMailTextExpenseReportValidated=Kostnadsrapport %s har bekräftats.
 EMailTextExpenseReportApproved=Kostnadsrapport %s har godkänts.
 EMailTextHolidayValidated=Lämna förfrågan %s har bekräftats.
 EMailTextHolidayApproved=Förfrågan %s har godkänts.
+EMailTextActionAdded=The action %s has been added to the Agenda.
 ImportedWithSet=Import dataunderlaget
 DolibarrNotification=Automatisk anmälan
 ResizeDesc=Ange nya <b>bredd</b> eller ny höjd. Förhållandet kommer att hållas under storleksändring ...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Kontakt / adress skapad via e-post samlare från
 ProjectCreatedByEmailCollector=Projekt skapat av e-post samlare från email MSGID %s
 TicketCreatedByEmailCollector=Biljett skapad av e-post samlare från 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
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Export område
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index 35ad5dd24d9..895502e8464 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Flera prissegment per produkt / tjänst (varje kund är i ett prissegment)
 MultiPricesNumPrices=Antal pris
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+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=Antal förälder förpackningsartikel
@@ -167,8 +168,10 @@ BuyingPrices=Köpa priser
 CustomerPrices=Kundpriser
 SuppliersPrices=Leverantörspriser
 SuppliersPricesOfProductsOrServices=Leverantörspriser (av produkter eller tjänster)
-CustomCode=Tull / Varu / HS-kod
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Ursprungsland
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Använd fast pris
 PriceByQuantity=Olika priser m.a.p. mängd
 DisablePriceByQty=Inaktivera priserna efter antal
 PriceByQuantityRange=Pris för mängdgaffel
-MultipriceRules=Prissegmentregler
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Använd prissegmentregler (definierad i produktmoduluppsättning) för att automatiskt beräkna priser för alla andra segment enligt första segmentet
 PercentVariationOver=%% variation över %s
 PercentDiscountOver=%% rabatt över %s
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index e07fe348437..144d986172d 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -39,14 +39,14 @@ ShowProject=Visa projekt
 ShowTask=Visa uppgift
 SetProject=Ställ projekt
 NoProject=Inget projekt definieras eller ägs
-NbOfProjects=Number of projects
-NbOfTasks=Number of tasks
+NbOfProjects=Antal projekt
+NbOfTasks=Antal uppgifter
 TimeSpent=Tid som tillbringas
 TimeSpentByYou=Tid spenderad av dig
 TimeSpentByUser=Tid spenderad av användaren
 TimesSpent=Tid
-TaskId=Task ID
-RefTask=Task ref.
+TaskId=UppgiftsID
+RefTask=Uppgiftsreferens
 LabelTask=Task label
 TaskTimeSpent=Tid som ägnas åt uppgifter
 TaskTimeUser=Användare
@@ -68,7 +68,7 @@ TaskDescription=Uppgiftsbeskrivning
 NewTask=Ny uppgift
 AddTask=Skapa uppgift
 AddTimeSpent=Skapa tid spenderad
-AddHereTimeSpentForDay=Lägg till här dags tid för denna dag / uppgift
+AddHereTimeSpentForDay=Lägg till här tid för denna dag / uppgift
 AddHereTimeSpentForWeek=Add here time spent for this week/task
 Activity=Aktivitet
 Activities=Uppgifter / aktiviteter
@@ -76,18 +76,19 @@ MyActivities=Mina uppgifter / aktiviteter
 MyProjects=Mina projekt
 MyProjectsArea=Mina projektområde
 DurationEffective=Effektiv längd
-ProgressDeclared=Förklarades framsteg
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Beräknat framsteg
+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=Tid
+TimeConsumed=Consumed
 ListOfTasks=Lista över uppgifter
 GoToListOfTimeConsumed=Gå till listan över tidskrävt
-GanttView=Gantt View
+GanttView=Gantt-vy
 ListProposalsAssociatedProject=Förteckning över de kommersiella förslagen relaterade till projektet
 ListOrdersAssociatedProject=Förteckning över försäljningsorder relaterade till projektet
 ListInvoicesAssociatedProject=Förteckning över kundfakturor relaterade till projektet
diff --git a/htdocs/langs/sv_SE/recruitment.lang b/htdocs/langs/sv_SE/recruitment.lang
index a88bbbbcb31..cc983d2e347 100644
--- a/htdocs/langs/sv_SE/recruitment.lang
+++ b/htdocs/langs/sv_SE/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/sv_SE/sendings.lang b/htdocs/langs/sv_SE/sendings.lang
index ff472cc3f3e..c11320eba55 100644
--- a/htdocs/langs/sv_SE/sendings.lang
+++ b/htdocs/langs/sv_SE/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Andra sändningar för denna beställning
 SendingsAndReceivingForSameOrder=Sändningar och kvitton för denna beställning
 SendingsToValidate=Transporter för att bekräfta
 StatusSendingCanceled=Annullerad
+StatusSendingCanceledShort=Annullerad
 StatusSendingDraft=Förslag
 StatusSendingValidated=Bekräftat (produkter till ett fartyg eller som redan sänts)
 StatusSendingProcessed=Bearbetade
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Du måste först validera ordern innan du kan g
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Mer komplett dokument modell för leverans intäkter (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstant EXPEDITION_ADDON_NUMBER definieras inte
 SumOfProductVolumes=Summan av produktvolymer
 SumOfProductWeights=Summan av produktvikter
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index f840a0301be..3979dcebd89 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Lagervärde
 UserWarehouseAutoCreate=Skapa ett användarlager automatiskt när du skapar en användare
 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/sv_SE/ticket.lang b/htdocs/langs/sv_SE/ticket.lang
index 860b4453738..95a2fb76ef8 100644
--- a/htdocs/langs/sv_SE/ticket.lang
+++ b/htdocs/langs/sv_SE/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Biljett - Typer
 TicketDictCategory=Biljett - Grupper
 TicketDictSeverity=Ticket - Severiteter
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Programfel
-TicketTypeShortBUGHARD=Hårdvarufel
-TicketTypeShortCOM=Kommersiell fråga
 
+TicketTypeShortCOM=Kommersiell fråga
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Andra
 TicketSeverityShortLOW=Låg
 TicketSeverityShortNORMAL=Vanligt
 TicketSeverityShortHIGH=Hög
-TicketSeverityShortBLOCKING=Kritisk / Blockering
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Fältet '%s' felaktigt
 MenuTicketMyAssign=Mina biljetter
@@ -60,7 +58,6 @@ OriginEmail=E-postkälla
 Notify_TICKET_SENTBYMAIL=Skicka biljettmeddelande via e-post
 
 # Status
-NotRead=Inte läst
 Read=Läsa
 Assigned=Tilldelad
 InProgress=Pågående
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Offentligt gränssnitt tillåter alla besöka
 TicketsAutoAssignTicket=Tilldela automatiskt användaren som skapade biljetten
 TicketsAutoAssignTicketHelp=När du skapar en biljett kan användaren automatiskt tilldelas biljetten.
 TicketNumberingModules=Biljettnummermodul
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Meddela tredje part vid skapandet
 TicketsDisableCustomerEmail=Avaktivera alltid e-postmeddelanden när en biljett skapas från det offentliga gränssnittet
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status ändrad: %s till %s
 TicketNotNotifyTiersAtCreate=Meddela inte företaget på create
 Unread=Oläst
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/sv_SE/website.lang b/htdocs/langs/sv_SE/website.lang
index 7770506abfb..e04af80c19a 100644
--- a/htdocs/langs/sv_SE/website.lang
+++ b/htdocs/langs/sv_SE/website.lang
@@ -30,7 +30,6 @@ EditInLine=Redigera inline
 AddWebsite=Lägg till webbplats
 Webpage=Webbsida / container
 AddPage=Lägg till sida / behållare
-HomePage=Webbsida
 PageContainer=Sida
 PreviewOfSiteNotYetAvailable=Förhandsgranskning av din webbplats <strong> %s </strong> ej tillgänglig än. Du måste först '<strong> Importera en fullständig webbplatsmall </strong>' eller bara '<strong> Lägg till en sida / behållare </strong>'.
 RequestedPageHasNoContentYet=Den begärda sidan med id %s har inget innehåll ännu, eller cachefilen .tpl.php har tagits bort. Redigera innehållet på sidan för att lösa detta.
@@ -101,7 +100,7 @@ EmptyPage=Tom sida
 ExternalURLMustStartWithHttp=Extern webbadress måste börja med http: // eller https: //
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Inkludera dynamiskt innehåll
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Intern webbadress
 ThisPageIsTranslationOf=Den här sidan / behållaren är en översättning av
 ThisPageHasTranslationPages=Den här sidan / behållaren har översättning
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang
index 4b18e747ab8..e1aa6c99928 100644
--- a/htdocs/langs/sv_SE/withdrawals.lang
+++ b/htdocs/langs/sv_SE/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Senaste %s direktavköpsintäkterna
 MakeWithdrawRequest=Gör en förskottsbetalningsförfrågan
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s begärda betalningsförfrågningar
+BankTransferRequestsDone=%s credit transfer requests recorded
 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>.
 ClassCredited=Märk krediterad
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Exekveringsdatum
 CreateForSepa=Skapa direkt debitfil
-ICS=Krediteridentifierare CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML-tagg - Unikt ID tilldelat per transaktion
 USTRD="Ostrukturerad" SEPA XML-tagg
 ADDDAYS=Lägg till dagar till Exekveringsdatum
@@ -146,3 +148,5 @@ InfoRejectSubject=Betalningsordern vägrade
 InfoRejectMessage=Hej, <br> <br> Betalningsordern för fakturan %s relaterad till företaget %s, med ett belopp på %s, har vägrats av banken. <br> <br> - <br> %s
 ModeWarning=Alternativ på riktigt läget inte var satt, sluta vi efter denna simulering
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/sv_SE/workflow.lang b/htdocs/langs/sv_SE/workflow.lang
index 6ae9ed67c3b..55f87b7d0d3 100644
--- a/htdocs/langs/sv_SE/workflow.lang
+++ b/htdocs/langs/sv_SE/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatisk skapande
 AutomaticClassification=Automatisk uppmärkning
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index 3211a0b62df..9e084932477 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index f1c41a3b62b..f9a6468d94a 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -56,6 +56,8 @@ 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.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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.
@@ -256,6 +257,7 @@ 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.
@@ -375,7 +377,7 @@ 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:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+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
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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
+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 the language of the third party
+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
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+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
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/sw_SW/banks.lang b/htdocs/langs/sw_SW/banks.lang
index 9500a5b8b2e..81a23238550 100644
--- a/htdocs/langs/sw_SW/banks.lang
+++ b/htdocs/langs/sw_SW/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/sw_SW/blockedlog.lang b/htdocs/langs/sw_SW/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/sw_SW/blockedlog.lang
+++ b/htdocs/langs/sw_SW/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/sw_SW/boxes.lang b/htdocs/langs/sw_SW/boxes.lang
index d6fd298a3a7..9a751483fb1 100644
--- a/htdocs/langs/sw_SW/boxes.lang
+++ b/htdocs/langs/sw_SW/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+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.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/sw_SW/cashdesk.lang b/htdocs/langs/sw_SW/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/sw_SW/cashdesk.lang
+++ b/htdocs/langs/sw_SW/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+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
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/sw_SW/categories.lang b/htdocs/langs/sw_SW/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/sw_SW/categories.lang
+++ b/htdocs/langs/sw_SW/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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
diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
index dadff6a7894..8dc815b522e 100644
--- a/htdocs/langs/sw_SW/companies.lang
+++ b/htdocs/langs/sw_SW/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/sw_SW/compta.lang
+++ b/htdocs/langs/sw_SW/compta.lang
@@ -111,7 +111,7 @@ 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 ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/sw_SW/cron.lang b/htdocs/langs/sw_SW/cron.lang
index d2da7ded67e..2ebdda1e685 100644
--- a/htdocs/langs/sw_SW/cron.lang
+++ b/htdocs/langs/sw_SW/cron.lang
@@ -6,14 +6,15 @@ 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
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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 environement you can use Scheduled task tools 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
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+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
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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
@@ -76,8 +78,14 @@ 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+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/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 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.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/sw_SW/exports.lang b/htdocs/langs/sw_SW/exports.lang
index 2dcf4317e00..a0eb7161ef2 100644
--- a/htdocs/langs/sw_SW/exports.lang
+++ b/htdocs/langs/sw_SW/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 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.
@@ -131,3 +133,4 @@ 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/sw_SW/mails.lang b/htdocs/langs/sw_SW/mails.lang
index 1235eef3b27..2d02c5ddcf9 100644
--- a/htdocs/langs/sw_SW/mails.lang
+++ b/htdocs/langs/sw_SW/mails.lang
@@ -92,6 +92,7 @@ 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
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index 96c68cdcfa3..f8ba6f4073c 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -28,7 +28,9 @@ 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
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Value
 PersonalValue=Personal value
 NewObject=New %s
 NewValue=New value
+OldValue=Old value %s
 CurrentValue=Current value
 Code=Code
 Type=Type
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ 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
@@ -671,7 +678,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/sw_SW/modulebuilder.lang b/htdocs/langs/sw_SW/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/sw_SW/modulebuilder.lang
+++ b/htdocs/langs/sw_SW/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/sw_SW/mrp.lang b/htdocs/langs/sw_SW/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/sw_SW/mrp.lang
+++ b/htdocs/langs/sw_SW/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang
index 54c0572d453..7a895bb1ca5 100644
--- a/htdocs/langs/sw_SW/other.lang
+++ b/htdocs/langs/sw_SW/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index 97db059594f..9ecc11ed93d 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -108,7 +108,8 @@ 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=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index baf0ecde17f..05aa1f5a560 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -76,15 +76,16 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/sw_SW/recruitment.lang b/htdocs/langs/sw_SW/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/sw_SW/recruitment.lang
+++ b/htdocs/langs/sw_SW/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/sw_SW/sendings.lang b/htdocs/langs/sw_SW/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/sw_SW/sendings.lang
+++ b/htdocs/langs/sw_SW/sendings.lang
@@ -30,6 +30,7 @@ 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
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang
index 660443bcded..a1f55010139 100644
--- a/htdocs/langs/sw_SW/stocks.lang
+++ b/htdocs/langs/sw_SW/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/sw_SW/ticket.lang b/htdocs/langs/sw_SW/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/sw_SW/ticket.lang
+++ b/htdocs/langs/sw_SW/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/sw_SW/website.lang b/htdocs/langs/sw_SW/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/sw_SW/website.lang
+++ b/htdocs/langs/sw_SW/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/sw_SW/withdrawals.lang b/htdocs/langs/sw_SW/withdrawals.lang
index 114a8d9dd6c..059b3451c11 100644
--- a/htdocs/langs/sw_SW/withdrawals.lang
+++ b/htdocs/langs/sw_SW/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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/sw_SW/workflow.lang b/htdocs/langs/sw_SW/workflow.lang
index 299be277e1d..494a0424a75 100644
--- a/htdocs/langs/sw_SW/workflow.lang
+++ b/htdocs/langs/sw_SW/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index 4c4d303f11c..6755dca4379 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=วันที่
 Docref=การอ้างอิง
 LabelAccount=บัญชีฉลาก
 LabelOperation=Label operation
-Sens=ซองส์
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=วารสาร
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index c50cf3e78cf..b816ace6628 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -56,6 +56,8 @@ GUISetup=แสดง
 SetupArea=การติดตั้ง
 UploadNewTemplate=Upload new template(s)
 FormToTestFileUploadForm=แบบทดสอบการอัปโหลดไฟล์ (ตามการตั้งค่า)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=หมายเหตุ: <b>ใช่จะมีผลเฉพาะถ้าโมดูล% s</b> ถูกเปิดใช้งาน
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=แสดงตัวอย่าง
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=ตัวอย่างที่ไม่สามารถใช้ได้
 ThemeCurrentlyActive=รูปแบบที่ใช้งานอยู่ในปัจจุบัน
-CurrentTimeZone=เขต PHP (เซิร์ฟเวอร์)
 MySQLTimeZone=เขตฐาน (ฐานข้อมูล)
 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=ช่องว่าง
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=ล้าง
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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=ล้างในขณะนี้
 PurgeNothingToDelete=No directory or files to delete.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=พาร์ทเนอร์ที่ต้อง
 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>
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=รายการ OpenDocument ไดเรกทอรีแม่
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=ตัวอย่างของไวยากรณ์: <br> C: \\ mydir <br> / home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> หากต้องการทราบวิธีการสร้างเอกสารของคุณ ODT แม่ก่อนที่จะเก็บไว้ในไดเรกทอรีเหล่านั้นอ่านเอกสารวิกิพีเดีย:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=ตำแหน่งชื่อ / นามสกุล
@@ -406,7 +408,7 @@ UrlGenerationParameters=พารามิเตอร์ URL ที่การ
 SecurityTokenIsUnique=ใช้พารามิเตอร์ SecureKey ไม่ซ้ำกันสำหรับแต่ละ URL
 EnterRefToBuildUrl=ป้อนการอ้างอิงสำหรับวัตถุ% s
 GetSecuredUrl=รับ URL คำนวณ
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=อัตราภาษีมูลค่าเพิ่มเก่า
 NewVATRates=ใหม่อัตราภาษีมูลค่าเพิ่ม
 PriceBaseTypeToChange=การปรับเปลี่ยนราคาค่าอ้างอิงกับฐานที่กำหนดไว้ใน
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=อัตรากำไรขั้นต้น
-Module59000Desc=โมดูลการจัดการอัตรากำไรขั้นต้น
+Module59000Desc=Module to follow margins
 Module60000Name=คณะกรรมการ
 Module60000Desc=โมดูลการจัดการค่าคอมมิชชั่น
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=ค้นหาการเพิ่มประสิทธิภาพ
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ ServiceSetup=บริการติดตั้งโมดูล
 ProductServiceSetup=ผลิตภัณฑ์และบริการการติดตั้งโมดูล
 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
+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 the language of the third party
+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=ประเภทบาร์โค้ดเริ่มต้นที่จะใช้สำหรับผลิตภัณฑ์
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=เมนูใหม่
 MenuHandler=จัดการเมนู
 MenuModule=โมดูลที่มา
-HideUnauthorizedMenu= ซ่อนเมนูไม่ได้รับอนุญาต (สีเทา)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=เมนู Id
 DetailMenuHandler=จัดการเมนูที่จะแสดงเมนูใหม่
 DetailMenuModule=ชื่อโมดูลถ้ารายการเมนูมาจากโมดูล
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=ไปรษณีย์
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang
index fd3ab8f2696..0a547bb3422 100644
--- a/htdocs/langs/th_TH/banks.lang
+++ b/htdocs/langs/th_TH/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/th_TH/blockedlog.lang b/htdocs/langs/th_TH/blockedlog.lang
index 88511cd5fbd..1b2467dcb5e 100644
--- a/htdocs/langs/th_TH/blockedlog.lang
+++ b/htdocs/langs/th_TH/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/th_TH/boxes.lang b/htdocs/langs/th_TH/boxes.lang
index 48979414509..f51f0e660fa 100644
--- a/htdocs/langs/th_TH/boxes.lang
+++ b/htdocs/langs/th_TH/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=กิจกรรมทั่วโลก (ใบแจ้งหนี้, ข้อเสนอ, การสั่งซื้อ)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
+BoxScheduledJobs=งานที่กำหนดเวลาไว้
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=บุ๊คมาร์คไม่มีกำหนด
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=การบัญชี
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/th_TH/cashdesk.lang b/htdocs/langs/th_TH/cashdesk.lang
index ec6eefe89a4..7dee305ab80 100644
--- a/htdocs/langs/th_TH/cashdesk.lang
+++ b/htdocs/langs/th_TH/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=nb ของใบแจ้งหนี้
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/th_TH/categories.lang b/htdocs/langs/th_TH/categories.lang
index 1e978741186..e61138aee8e 100644
--- a/htdocs/langs/th_TH/categories.lang
+++ b/htdocs/langs/th_TH/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users tags/categories area
 SubCats=Sub-categories
 CatList=รายการของแท็ก / ประเภท
+CatListAll=List of tags/categories (all types)
 NewCategory=แท็กใหม่ / หมวดหมู่
 ModifCat=ปรับเปลี่ยนแท็ก / หมวดหมู่
 CatCreated=Tag / สร้างหมวดหมู่
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag / รหัสหมวดหมู่
-CatSupList=List of vendor tags/categories
-CatCusList=รายชื่อลูกค้า / โอกาสแท็ก / ประเภท
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=รายการของแท็ก / ผลิตภัณฑ์ประเภท
 CatMemberList=รายชื่อสมาชิกแท็ก / ประเภท
-CatContactList=รายการของแท็กติดต่อ / ประเภท
-CatSupLinks=การเชื่อมโยงระหว่างซัพพลายเออร์และแท็ก / ประเภท
+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=การเชื่อมโยงระหว่างลูกค้า / ลูกค้าเป้าหมาย และ แท็ก / ประเภท
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=การเชื่อมโยงระหว่างผลิตภัณฑ์ / บริการและแท็ก / ประเภท
-CatProJectLinks=Links between projects and tags/categories
+CatMembersLinks=การเชื่อมโยงระหว่างสมาชิกและแท็ก / ประเภท
+CatProjectsLinks=Links between projects and tags/categories
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=ลบออกจากแท็ก / หมวดหมู่
 ExtraFieldsCategories=คุณลักษณะที่สมบูรณ์
 CategoriesSetup=แท็ก / ประเภทการติดตั้ง
diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
index 698f595ebaf..8956b27f853 100644
--- a/htdocs/langs/th_TH/companies.lang
+++ b/htdocs/langs/th_TH/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=ตรวจสอบไม่ได้ บริการตรวจสอบไม่ได้ให้โดยรัฐสมาชิก (% s)
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=ที่อาจเกิดขึ้น
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index 60fe78c8f6f..a74d5c1967d 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -111,7 +111,7 @@ Refund=Refund
 SocialContributionsPayments=สังคม / การชำระเงินภาษีการคลัง
 ShowVatPayment=แสดงการชำระเงินภาษีมูลค่าเพิ่ม
 TotalToPay=ทั้งหมดที่จะต้องจ่าย
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=คุณแน่ใจหรือว่าต
 ExportDataset_tax_1=ภาษีสังคมและการคลังและการชำระเงิน
 CalcModeVATDebt=<b>โหมด% sVAT ความมุ่งมั่นบัญชี%</b> s
 CalcModeVATEngagement=โหมด <b>sVAT% รายได้ค่าใช้จ่าย-%</b> s
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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= <b>โหมด% Sre ในใบแจ้งหนี้ของลูกค้า - ซัพพลายเออร์ใบแจ้งหนี้% s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=ความสมดุลของรายได
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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=- จํานวนเงินที่แสดงเป็นกับภาษีรวมทั้งหมด
 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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=รายงานโดยเรื่องของบุคคลที่สาม
 LT2ReportByCustomersES=รายงานโดยบุคคลที่สาม IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/th_TH/cron.lang b/htdocs/langs/th_TH/cron.lang
index 85838088924..8294f683d7e 100644
--- a/htdocs/langs/th_TH/cron.lang
+++ b/htdocs/langs/th_TH/cron.lang
@@ -6,14 +6,15 @@ Permission23102 = สร้าง / การปรับปรุงกำห
 Permission23103 = ลบงานที่กำหนด
 Permission23104 = การดำเนินงานที่กำหนด
 # Admin
-CronSetup= กำหนดเวลาการตั้งค่าการจัดการงาน
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=หรือเพื่อตรวจสอบและการเปิดตัวงานที่เฉพาะเจาะจง
+CronSetup=กำหนดเวลาการตั้งค่าการจัดการงาน
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=กุญแจสำคัญในการรักษาความปลอดภัยสำหรับ URL ที่จะเปิดตัวงาน cron
 FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=ในสภาพแวดล้อมระบบปฏิบัติการยูนิกซ์ที่คุณควรใช้ crontab รายการต่อไปนี้เพื่อเรียกใช้บรรทัดคำสั่งแต่ละ 5 นาที
-CronExplainHowToRunWin=ไมโครซอฟท์ (TM) ของ Windows environement คุณสามารถใช้เครื่องมือการจัดตารางงานที่จะเรียกใช้บรรทัดคำสั่งแต่ละ 5 นาที
+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
@@ -42,10 +43,11 @@ CronModule=โมดูล
 CronNoJobs=ไม่มีงานที่ลงทะเบียน
 CronPriority=ลำดับความสำคัญ
 CronLabel=ฉลาก
-CronNbRun=nb ยิง
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=ทุกๆ
 JobFinished=งานเปิดตัวและจบ
+Scheduled=Scheduled
 #Page card
 CronAdd= เพิ่มงาน
 CronEvery=ดำเนินงานแต่ละงาน
@@ -56,16 +58,16 @@ CronNote=ความเห็น
 CronFieldMandatory=ทุ่ง% s มีผลบังคับใช้
 CronErrEndDateStartDt=วันที่สิ้นสุดไม่สามารถก่อนวันเริ่มต้น
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=เปิดใช้งาน
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=ปิดการใช้งาน
 CronTaskInactive=งานนี้ถูกปิดใช้งาน
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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=บรรทัดคำสั่งระบบที่จะดำเนินการ
 CronCreateJob=สร้างงานใหม่กำหนด
 CronFrom=จาก
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=ปิดการใช้งาน
 MakeLocalDatabaseDumpShort=Local database backup
-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
+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/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index 125ecf6e5b3..4de399f8493 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=ไม่มีข้อผิดพลาดที่เร
 # Errors
 ErrorButCommitIsDone=พบข้อผิดพลาด แต่เราตรวจสอบอย่างไรก็ตามเรื่องนี้
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=% s url ที่ไม่ถูกต้อง
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=เข้าสู่ระบบ% s อยู่แล้ว
 ErrorGroupAlreadyExists=s% กลุ่มที่มีอยู่แล้ว
 ErrorRecordNotFound=บันทึกไม่พบ
@@ -48,6 +50,7 @@ ErrorFieldsRequired=ฟิลด์ที่จำเป็นบางคนไ
 ErrorSubjectIsRequired=The email topic is required
 ErrorFailedToCreateDir=ล้มเหลวในการสร้างไดเรกทอรี ตรวจสอบการใช้เว็บเซิร์ฟเวอร์ที่มีสิทธิ์ในการเขียนลงในไดเรกทอรีเอกสาร Dolibarr หาก <b>safe_mode</b> พารามิเตอร์เปิดใช้งานบน PHP นี้ตรวจสอบว่า php ไฟล์ Dolibarr เป็นเจ้าของให้กับผู้ใช้เว็บเซิร์ฟเวอร์ (หรือกลุ่ม)
 ErrorNoMailDefinedForThisUser=จดหมายไม่มีกำหนดไว้สำหรับผู้ใช้นี้
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=คุณลักษณะนี้จะต้องเปิดการใช้งานได้ในการทำงาน เปลี่ยนนี้ในการตั้งค่า - การแสดงผล
 ErrorTopMenuMustHaveAParentWithId0=เมนูประเภทยอด 'ไม่สามารถมีเมนูปกครอง ใส่ 0 ในเมนูปกครองหรือเลือกเมนูประเภท 'ซ้าย'
 ErrorLeftMenuMustHaveAParentId=เมนูชนิด 'ซ้าย' ต้องมีรหัสผู้ปกครอง
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=ชื่อโปรไฟล์นี้มีอ
 ErrorLDAPSetupNotComplete=การจับคู่ Dolibarr-LDAP ไม่สมบูรณ์
 ErrorLDAPMakeManualTest=ไฟล์ .ldif ได้รับการสร้างขึ้นในไดเรกทอรี% s พยายามที่จะโหลดได้ด้วยตนเองจากบรรทัดคำสั่งที่จะมีข้อมูลเพิ่มเติมเกี่ยวกับข้อผิดพลาด
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Ref ใช้สำหรับการสร้างที่มีอยู่แล้ว
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/th_TH/exports.lang b/htdocs/langs/th_TH/exports.lang
index e7c28b1980e..4ec434b49a1 100644
--- a/htdocs/langs/th_TH/exports.lang
+++ b/htdocs/langs/th_TH/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=ชื่อฟิลด์
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=ห้องสมุด
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 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.
@@ -131,3 +133,4 @@ 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/th_TH/mails.lang b/htdocs/langs/th_TH/mails.lang
index ea92de0f2ba..ae8e8b52f85 100644
--- a/htdocs/langs/th_TH/mails.lang
+++ b/htdocs/langs/th_TH/mails.lang
@@ -92,6 +92,7 @@ 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=สาย% s ในแฟ้ม
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=ส่งอีเมลไม่มี ผู้ส่งที่ไม่ดีหรืออีเมลของผู้รับ ตรวจสอบรายละเอียดของผู้ใช้
 # Module Notifications
 Notifications=การแจ้งเตือน
-NoNotificationsWillBeSent=ไม่มีการแจ้งเตือนอีเมลที่มีการวางแผนสำหรับเหตุการณ์และ บริษัท นี้
-ANotificationsWillBeSent=1 การแจ้งเตือนจะถูกส่งไปทางอีเมล
-SomeNotificationsWillBeSent=% s การแจ้งเตือนจะถูกส่งไปทางอีเมล
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=รายการทั้งหมดแจ้งเตือนอีเมลที่ส่ง
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=การกำหนดค่าของการส่งอีเมล์ที่ได้รับการติดตั้งเพื่อ '% s' โหมดนี้ไม่สามารถใช้ในการส่งการส่งอีเมลมวล
 MailSendSetupIs2=ก่อนอื่นคุณต้องไปกับบัญชีผู้ดูแลระบบลงไปในเมนู% sHome - การติดตั้ง - อีเมล์% s จะเปลี่ยนพารามิเตอร์ <strong>'% s'</strong> เพื่อใช้โหมด '% s' ด้วยโหมดนี้คุณสามารถเข้าสู่การตั้งค่าของเซิร์ฟเวอร์ที่ให้บริการโดยผู้ให้บริการอินเทอร์เน็ตของคุณและใช้คุณลักษณะการส่งอีเมลมวล
 MailSendSetupIs3=หากคุณมีคำถามใด ๆ เกี่ยวกับวิธีการติดตั้งเซิร์ฟเวอร์ของคุณคุณสามารถขอให้% s
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=ข้อมูล
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index 71d84671325..62d14790365 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=แปลไม่มี
 Translation=การแปล
+CurrentTimeZone=เขต PHP (เซิร์ฟเวอร์)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=บันทึกไม่พบ
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ FileWasNotUploaded=ไฟล์ที่ถูกเลือกสำหรั
 NbOfEntries=No. of entries
 GoToWikiHelpPage=อ่านความช่วยเหลือออนไลน์ (อินเทอร์เน็ตจำเป็น)
 GoToHelpPage=อ่านความช่วยเหลือ
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=บันทึกที่บันทึกไว้
 RecordDeleted=บันทึกลบ
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=มูลค่า
 PersonalValue=ค่าส่วนบุคคล
 NewObject=New %s
 NewValue=ค่าใหม่
+OldValue=Old value %s
 CurrentValue=มูลค่าปัจจุบัน
 Code=รหัส
 Type=ชนิด
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=ตัวเลือก
+Filters=Filters
 List=รายการ
 FullList=รายการเต็มรูปแบบ
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ SupplierPreview=Vendor preview
 ShowCustomerPreview=แสดงตัวอย่างของลูกค้า
 ShowSupplierPreview=Show vendor preview
 RefCustomer=อ้าง ลูกค้า
+InternalRef=Internal ref.
 Currency=เงินตรา
 InfoAdmin=ข้อมูลสำหรับผู้ดูแล
 Undo=แก้
@@ -671,7 +678,7 @@ SendMail=ส่งอีเมล
 Email=อีเมล์
 NoEMail=ไม่มีอีเมล
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=ไม่มีโทรศัพท์มือถือ
 Owner=เจ้าของ
 FollowingConstantsWillBeSubstituted=ค่าคงที่ต่อไปนี้จะถูกแทนที่ด้วยค่าที่สอดคล้องกัน
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=ไว้
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/th_TH/modulebuilder.lang b/htdocs/langs/th_TH/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/th_TH/modulebuilder.lang
+++ b/htdocs/langs/th_TH/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/th_TH/mrp.lang b/htdocs/langs/th_TH/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/th_TH/mrp.lang
+++ b/htdocs/langs/th_TH/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index d877cbda594..b69c81198d1 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -5,8 +5,6 @@ Tools=เครื่องมือ
 TMenuTools=เครื่องมือ
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=วันเกิด
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=การแจ้งเตือนการใช้งานวันเกิด
 BirthdayAlertOff=การแจ้งเตือนวันเกิดไม่ได้ใช้งาน
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=ดูการตั้งค่าของโมดูล% s
 NbOfAttachedFiles=จำนวนแนบไฟล์ / เอกสาร
 TotalSizeOfAttachedFiles=ขนาดของไฟล์ที่แนบมา / เอกสาร
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=เหมาะสม
 CalculatedWeight=น้ำหนักการคำนวณ
 CalculatedVolume=ปริมาณการคำนวณ
 Weight=น้ำหนัก
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=กก.
 WeightUnitg=ก.
 WeightUnitmg=มก.
@@ -214,6 +216,7 @@ 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=การนำเข้าข้อมูลที่ตั้ง
 DolibarrNotification=การแจ้งเตือนอัตโนมัติ
 ResizeDesc=<b>ป้อนความกว้างใหม่หรือสูงใหม่</b> อัตราส่วนจะถูกเก็บไว้ในช่วงการปรับขนาด ...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=พื้นที่การส่งออก
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index 08f045c48a9..5d91c67d7ec 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=จำนวนของราคา
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+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=จำนวนผู้ปกครองผลิตภัณฑ์บรรจุภัณฑ์
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=ราคาของลูกค้า
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=ประเทศแหล่งกำเนิดสินค้า
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=ใช้ราคาคงที่
 PriceByQuantity=ราคาที่แตกต่างกันตามปริมาณ
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=จำนวนช่วง
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index 3cdc4c31d90..dc146212012 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -76,15 +76,16 @@ MyActivities=งานของฉัน / กิจกรรม
 MyProjects=โครงการของฉัน
 MyProjectsArea=My projects Area
 DurationEffective=ระยะเวลาที่มีประสิทธิภาพ
-ProgressDeclared=ความคืบหน้าการประกาศ
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=ความคืบหน้าของการคำนวณ
+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=เวลา
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/th_TH/recruitment.lang b/htdocs/langs/th_TH/recruitment.lang
index 45af9e2bfbb..fafd8a9a580 100644
--- a/htdocs/langs/th_TH/recruitment.lang
+++ b/htdocs/langs/th_TH/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/th_TH/sendings.lang b/htdocs/langs/th_TH/sendings.lang
index 2dcc36fe18f..f5e201c2f33 100644
--- a/htdocs/langs/th_TH/sendings.lang
+++ b/htdocs/langs/th_TH/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=การจัดส่งอื่น ๆ สำห
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=ในการตรวจสอบการจัดส่ง
 StatusSendingCanceled=ยกเลิก
+StatusSendingCanceledShort=ยกเลิก
 StatusSendingDraft=ร่าง
 StatusSendingValidated=การตรวจสอบ (สินค้าจะจัดส่งหรือจัดส่งแล้ว)
 StatusSendingProcessed=การประมวลผล
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=รูปแบบเอกสารที่สมบูรณ์มากขึ้นสำหรับการจัดส่งใบเสร็จรับเงิน (โลโก้ ... )
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER คงที่ไม่ได้กำหนดไว้
 SumOfProductVolumes=ผลรวมของปริมาณสินค้า
 SumOfProductWeights=ผลรวมของน้ำหนักสินค้า
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index 25e162a70a3..1ec66e72dee 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=ค่าโกดัง
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
 RuleForWarehouse=Rule for warehouses
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/th_TH/ticket.lang b/htdocs/langs/th_TH/ticket.lang
index 63e20a956df..c66c4830bdf 100644
--- a/htdocs/langs/th_TH/ticket.lang
+++ b/htdocs/langs/th_TH/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=อื่น ๆ
 TicketSeverityShortLOW=ต่ำ
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=สูง
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=อ่าน
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/th_TH/website.lang b/htdocs/langs/th_TH/website.lang
index d905e966535..373eab76476 100644
--- a/htdocs/langs/th_TH/website.lang
+++ b/htdocs/langs/th_TH/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=หน้า
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/th_TH/withdrawals.lang b/htdocs/langs/th_TH/withdrawals.lang
index 4cdd1b59e6f..8390f78c1e3 100644
--- a/htdocs/langs/th_TH/withdrawals.lang
+++ b/htdocs/langs/th_TH/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=จำแนกเครดิต
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=ตัวเลือกสำหรับโหมดจริงไม่ได้ตั้งค่าเราหยุดหลังจากจำลองนี้
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/th_TH/workflow.lang b/htdocs/langs/th_TH/workflow.lang
index 728e20bacb1..e55fdf4eb92 100644
--- a/htdocs/langs/th_TH/workflow.lang
+++ b/htdocs/langs/th_TH/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index 9abb47b577e..197742deeac 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=Bu hizmet
 ThisProduct=Bu ürün
 DefaultForService=Hizmet için varsayılan
 DefaultForProduct=Ürün için varsayılan
+ProductForThisThirdparty=Product for this thirdparty
+ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Öneri yok
 AccountancySetupDoneFromAccountancyMenu=Muhasebenin çoğu kurulumu %s menüsünden yapılır.
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -48,6 +50,7 @@ CountriesExceptMe=%s hariç tüm ülkeler
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Müşteriler için ana muhasebe hesabı kurulumda tanımlı değil
 MainAccountForSuppliersNotDefined=Tedarikçiler için ana muhasebe hesabı kurulumda tanımlı değil
@@ -144,7 +147,7 @@ NotVentilatedinAccount=Muhasebe hesabına bağlı değil
 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=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO="Bağlama yapılacaklar" sayfasının sıralama işlemini en son öğelerden başlatın
 ACCOUNTING_LIST_SORT_VENTILATION_DONE="Bağlama yapılanlar" sayfasının sıralama işlemini en son öğelerden başlatın
 
@@ -198,7 +201,8 @@ Docdate=Tarih
 Docref=Referans
 LabelAccount=Hesap etiketi
 LabelOperation=Label operation
-Sens=Sens (borsa haberleri yayınlama günlüğü)
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Günlük
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Parça sayısı
 TransactionNumShort=Num. transaction
 AccountingCategory=Kişiselleştirilmiş gruplar
-GroupByAccountAccounting=Group by accounting account
+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=Önceden tanımlanmış gruplar tarafından
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Hesap grubu
 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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Otomatik Olarak Bağla
 AutomaticBindingDone=Otomatik bağlama bitti
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Büyük defterde henüz muhasebeleştirilmemiş
 ShowTutorial=Show Tutorial
 NotReconciled=Uzlaştırılmadı
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index fc4430e87ca..e15ec009134 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Ekran
 SetupArea=Ayarlar
 UploadNewTemplate=Yeni şablon(lar) yükleyin
 FormToTestFileUploadForm=Dosya yükleme deneme formu (ayarlara göre)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Not: yalnızca <b>%s</b> modülü etkinleştirildiğinde evet etkilidir.
 RemoveLock=<b>%s</b> dosyası mevcutsa, Güncelleme/Yükleme aracının kullanımına izin vermek için kaldırın veya yeniden adlandırın.
 RestoreLock=Güncelleme/Yükleme aracının daha sonraki kullanımlarına engel olmak için <b>%s</b> dosyasını, sadece okuma iznine sahip olacak şekilde geri yükleyin.
@@ -85,7 +87,6 @@ ShowPreview=Önizleme göster
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Önizleme yok
 ThemeCurrentlyActive=Geçerli etkin tema
-CurrentTimeZone=PHP Saat Dilimi (sunucu)
 MySQLTimeZone=MySql Saat Dilimi (veritabanı)
 TZHasNoEffect=Tarihler veritabanı sunucusu tarafından gönderilmiş dize gibi saklanır ve getirilir. Saat dilimi yalnızca UNIX_TIMESTAMP işlevi kullanıldığında etkilidir (Dolibarr tarafından kullanılmamalıdır, bu nedenle veri girdikten sonra değiştirilse bile veritabanı TZ'nin bir etkisi olmamalıdır).
 Space=Boşluk
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Bu alan yönetim işlevlerini sunar. İstenilen özelliği s
 Purge=Temizleme
 PurgeAreaDesc=Bu sayfa Dolibarr tarafından oluşturulan veya depolanan tüm dosyaları silmenizi sağlar (<b>%s</b> dizinindeki geçici veya tüm dosyalar). Bu özelliğin kullanılması normalde gerekli değildir. Bu araç, Dolibarr yazılımı web sunucusu tarafından oluşturulan dosyaların silinmesine izin vermeyen bir sağlayıcı tarafından barındırılan kullanıcılar için geçici bir çözüm olarak sunulur.
 PurgeDeleteLogFile=Syslog modülü için tanımlı <b>%s</b> dosyası da dahil olmak üzere günlük dosyalarını sil (veri kaybetme riskiniz yoktur)
-PurgeDeleteTemporaryFiles=Tüm geçici dosyaları sil (veri kaybetme riskiniz yoktur). Not: Geçici dizin eğer 24 saat önce oluşturulmuşsa silme işlemi tamamlanır.
-PurgeDeleteTemporaryFilesShort=Geçici dosyaları sil
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 PurgeDeleteAllFilesInDocumentsDir=<b>%s</b> dizinindeki bütün dosyaları sil.<br>Bu işlem, öğelerle (üçüncü partiler, faturalar, v.s.) ilgili oluşturulan tüm dosyaları, ECM modülüne yüklenen dosyaları, veritabanı yedekleme dökümlerini ve geçici dosyaları silecektir.
 PurgeRunNow=Şimdi temizle
 PurgeNothingToDelete=Silinecek dizin ya da dosya yok.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Tercihli Ortaklar
 OtherResources=Diğer kaynaklar
 ExternalResources=Dış Kaynaklar
 SocialNetworks=Sosyal Ağlar
+SocialNetworkId=Social Network ID
 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>
 HelpCenterDesc1=Burada Dolibar ile ilgili yardım ve destek almak için bazı kaynaklar bulabilirsiniz.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Tanımladığınız mevcut yapılandırma için örnekl
 ListOfDirectories=OpenDocument (AçıkBelge) temaları dizin listesi
 ListOfDirectoriesForModelGenODT=OpenDocument biçimli şablon dosyalarını içeren dizinler listesi.<br><br>Buraya tam yol dizinlerini koyun.<br>Her dizin arasına satır başı ekleyin.<br>GED modülü dizinini eklemek için buraya ekleyin<b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>O dizinlerdeki dosyaların bitiş şekli böyle omalıdır <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Bu dizinlerde bulunana ODT/ODS şablon dosyalarının sayısı 
-ExampleOfDirectoriesForModelGen=Sözdizimi örnekleri:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Odt belge şablonlarının nasıl oluşturulacağını öğrenmek için o dizinlere kaydetmeden önce, wiki belgelerini okuyun:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Ad/Soyad konumu
@@ -406,7 +408,7 @@ UrlGenerationParameters=URL güvenliği için parametreler
 SecurityTokenIsUnique=Her URL için benzersiz bir güvenlik anahtarı kullan
 EnterRefToBuildUrl=Nesen %s için hata referansı
 GetSecuredUrl=Hesaplanan URL al
-ButtonHideUnauthorized=Yönetici olmayan kullanıcıların yetkisiz eylemlerinin önüne geçmek için, butonları gri ve engellenmiş olarak göstermek yerine tamamen gizle.
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Eski KDV oranı
 NewVATRates=Yeni KDV oranı
 PriceBaseTypeToChange=Buna göre tanımlanan temel referans değerli fiyatları değiştir
@@ -668,7 +670,7 @@ Module54000Desc=Cups IPP arabirimini kullanarak belgeleri açmadan doğrudan yaz
 Module55000Name=Anket, Araştırma ya da Oylama
 Module55000Desc=Çevrimiçi anketler, yoklamalar veya oylamalar oluşturun (Doodle, Studs, RDVz vs. gibi)
 Module59000Name=Kar Oranları
-Module59000Desc=Kar Oranı yönetimi modülü
+Module59000Desc=Module to follow margins
 Module60000Name=Komisyonlar
 Module60000Desc=Komisyon yönetimi modülü
 Module62000Name=Uluslararası Ticaret Terimleri
@@ -1306,7 +1308,7 @@ YouUseBestDriver=Kullandığınız %s sürücüsü şu anda mevcut olan en iyi s
 YouDoNotUseBestDriver=%s sürücüsünü kullanıyorsunuz fakat %s sürücüsü önerilir.
 NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
 SearchOptim=Optimizasyon ara
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 BrowserIsOK=%s web tarayıcısını kullanıyorsunuz. Bu tarayıcı güvenlik ve performans açısından uygundur.
 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.
@@ -1596,8 +1598,13 @@ ServiceSetup=Hizmetler modülü kurulumu
 ProductServiceSetup=Ürünler ve Hizmetler modüllerinin kurulumu
 NumberOfProductShowInSelect=Aşağı açılan seçim listelerinde gösterilecek maksimum ürün sayısı (0=limit yok)
 ViewProductDescInFormAbility=Ürün açıklamalarını formlarda göster (aksi takdirde araç ipucu penceresinde gösterilir)
+DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
+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=Eğer ürün/hizmet teklifte varsa Ekli Dosyalar sekmesinde ürün/hizmet seçeneğini etkinleştirin, böylece ürün PDF belgesini PDF azur teklifine birleştirirsiniz
-ViewProductDescInThirdpartyLanguageAbility=Ürün açıklamalarını üçün partinin dilinde görüntüle
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 UseSearchToSelectProductTooltip=Ayrıca çok fazla sayıda ürüne sahipseniz (>100.000), Ayarlar->Diğer Ayarlar menüsünden PRODUCT_DONOTSEARCH_ANYWHERE sabitini 1 olarak ayarlayarak hızı arttırabilirsiniz. Bu durumda, arama dizenin başlangıcıyla sınırlı olacaktır.
 UseSearchToSelectProduct=Aşağı açılır listeden ürün içeriği listelemeden önce bir tuşa basarak arama yapmanızı bekler (Çok sayıda ürününüz varsa bu performansı artırabilir, fakat daha az kullanışlıdır)
 SetDefaultBarcodeTypeProducts=Ürünler için kullanılacak varsayılan barkod türü
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Özelleştirilmiş menüler bir üst menüye bağlant
 NewMenu=Yeni menü
 MenuHandler=Menü işleyicisi
 MenuModule=Kaynak modül
-HideUnauthorizedMenu= Yetkisiz menüleri gizle (gri)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=Kimlik menüsü
 DetailMenuHandler=Yeni menü göstermek için menü işleyicisi
 DetailMenuModule=Eğer menü girişi bir modülden geliyorsa modül adı
@@ -1983,11 +1990,12 @@ 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=Şimdi topla
 ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=En son sonuç
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Posta Kodu
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Otomatik ECM ağacını göster
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index 00371009950..e89ddad9ee5 100644
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -173,10 +173,11 @@ SEPAMandate=SEPA yetkisi
 YourSEPAMandate=SEPA yetkiniz
 FindYourSEPAMandate=Bu, firmamızın bankanıza otomatik ödeme talimatı verebilme yetkisi için SEPA yetkinizdir. İmzalayarak iade edin (imzalı belgeyi tarayarak) veya e-mail ile gönderin
 AutoReportLastAccountStatement=Uzlaşma yaparken 'banka hesap özeti numarasını' en son hesap özeti numarası ile otomatik olarak doldur
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Hareketleri renklendir
 BankColorizeMovementDesc=Bu işlev etkinleştirilirse, borçlandırma veya kredi hareketleri için belirli bir arka plan rengi seçebilirsiniz
 BankColorizeMovementName1=Borç hareketi için arka plan rengi
 BankColorizeMovementName2=Kredi hareketi için arka plan rengi
 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
diff --git a/htdocs/langs/tr_TR/blockedlog.lang b/htdocs/langs/tr_TR/blockedlog.lang
index 072bf60a6d8..14db1cc265b 100644
--- a/htdocs/langs/tr_TR/blockedlog.lang
+++ b/htdocs/langs/tr_TR/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Müşteri faturası indir
 BlockedLogBillPreview=Müşteri faturası önizlemesi
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/tr_TR/boxes.lang b/htdocs/langs/tr_TR/boxes.lang
index f374d3c9080..09c86eb5ee9 100644
--- a/htdocs/langs/tr_TR/boxes.lang
+++ b/htdocs/langs/tr_TR/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Değiştirilen son %s bağış
 BoxTitleLastModifiedExpenses=Değiştirilen son %s gider raporu
 BoxTitleLatestModifiedBoms=Değiştirilen son %s BOM
 BoxTitleLatestModifiedMos=Değiştirilen son %s Üretim Siparişleri
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Genel etkinlik (faturalar, teklifler, siparişler)
 BoxGoodCustomers=İyi müşteriler
 BoxTitleGoodCustomers=%s İyi müşteri
+BoxScheduledJobs=Planlı İşler
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=RSS akışı yenilenemedi. Son başarılı yenileme tarihi: %s
 LastRefreshDate=Son yenileme tarihi
 NoRecordedBookmarks=Tanımlanmış yerimi yok.
@@ -83,8 +86,8 @@ BoxTitleLatestModifiedSupplierOrders=Tedarikçi Siparişleri: değiştirilen son
 BoxTitleLastModifiedCustomerBills=Müşteri Faturaları: değiştirilen son %s
 BoxTitleLastModifiedCustomerOrders=Müşteri Siparişleri: son değiştirilen %s
 BoxTitleLastModifiedPropals=Değiştirilen son %s teklif
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=En son %s değiştirilmiş iş
+BoxTitleLatestModifiedCandidatures=En son %s değiştirilmiş aday
 ForCustomersInvoices=Müşteri faturaları
 ForCustomersOrders=Müşteri siparişleri
 ForProposals=Teklifler
@@ -92,8 +95,8 @@ LastXMonthRolling=Devreden son %s ay
 ChooseBoxToAdd=Gösterge panelinize ekran etiketi ekleyin
 BoxAdded=Ekran etiketi gösterge panelinize eklendi
 BoxTitleUserBirthdaysOfMonth=Bu ayın doğum günleri (kullanıcılar)
-BoxLastManualEntries=Muhasebedeki son manuel girişler
-BoxTitleLastManualEntries=%s son manuel yapılan girişler
+BoxLastManualEntries=Latest record in accountancy entered manually or without source document
+BoxTitleLastManualEntries=%s latest record entered manually or without source document
 NoRecordedManualEntries=Muhasebede manuel giriş kaydı yok
 BoxSuspenseAccount=Askıdaki hesap muhasebe işlemlerini say
 BoxTitleSuspenseAccount=Ayrılmamış satır sayısı
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Askı hesabı tanımlanmamış
 BoxLastCustomerShipments=Son müşteri gönderileri
 BoxTitleLastCustomerShipments=Son %s müşteri gönderileri
 NoRecordedShipments=Kayıtlı müşteri gönderimi yok
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Muhasebe
+ValidatedProjects=Doğrulanmış projeler
diff --git a/htdocs/langs/tr_TR/cashdesk.lang b/htdocs/langs/tr_TR/cashdesk.lang
index 1c52f025daf..f9c0a22ebd4 100644
--- a/htdocs/langs/tr_TR/cashdesk.lang
+++ b/htdocs/langs/tr_TR/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Teorik tutar
 RealAmount=Gerçek tutar
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Fatura sayısı
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang
index 94a510df93f..5369ebbec99 100644
--- a/htdocs/langs/tr_TR/categories.lang
+++ b/htdocs/langs/tr_TR/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Proje etiket/kategori alanı
 UsersCategoriesArea=Kullanıcı Etiketleri/Kategorileri Alanı
 SubCats=Alt kategoriler
 CatList= Etiketler/kategoriler listesi
+CatListAll=List of tags/categories (all types)
 NewCategory=Yeni etiket/kategori
 ModifCat=Etiket/kategori değiştir
 CatCreated=Etiket/kategori oluşturuldu
@@ -65,16 +66,22 @@ UsersCategoriesShort=Kullanıcı etiketleri/kategorileri
 StockCategoriesShort=Depo etiketleri / kategorileri
 ThisCategoryHasNoItems=Bu kategori herhangi bir öğe içermiyor.
 CategId=Etiket/kategori kimliği
-CatSupList=Tedarikçi etiketleri/kategorileri listesi
-CatCusList=Müşteri/beklenti etiketleri/kategorileri listesi
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Ürün etiketleri/kategorileri listesi
 CatMemberList=Üye etiketleri/kategorileri listesi
-CatContactList=Kişi etiketleri/kategorileri listesi
-CatSupLinks=Tedarikçiler ve etiketler/kategoriler arasındaki bağlantılar
+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=Müşteriler/beklentiler ve etiketler/kategoriler arasındaki bağlantılar
 CatContactsLinks=Kişiler/adresler ve etiketler/kategoriler arasındaki bağlantılar
 CatProdLinks=Ürünler/hizmetler ve etiketler/kategoriler arasındaki bağlantılar
-CatProJectLinks=Projeler ve etiketler/kategoriler arasındaki bağlantılar
+CatMembersLinks=Üyeler ve etiketler/kategoriler arasındaki bağlantılar
+CatProjectsLinks=Projeler ve etiketler/kategoriler arasındaki bağlantılar
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Etiketlerden/kategorilerden kaldır
 ExtraFieldsCategories=Tamamlayıcı öznitelikler
 CategoriesSetup=Etiket/kategori ayarları
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 1a0b08308e6..b27fea49898 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Avrupa Komisyonu web sitesinden topluluk içi Vergi Nu
 VATIntraManualCheck=Avrupa Komisyonu'nun <a href="%s" target="_blank">%s</a> web adresinden de manuel olarak kontrol edebilirsiniz
 ErrorVATCheckMS_UNAVAILABLE=Denetlemiyor. Denetim hizmeti üye ülke (%s) tarafından sağlanmıyor.
 NorProspectNorCustomer=Ne aday ne de müşteri
-JuridicalStatus=Tüzel Kişilik Türü
+JuridicalStatus=Business entity type
 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 2623f2bdb57..5889d98d6bd 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -111,7 +111,7 @@ Refund=İade
 SocialContributionsPayments=Sosyal/mali vergi ödemeleri
 ShowVatPayment=KDV ödemesi göster
 TotalToPay=Ödenecek toplam
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
+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=Müşteri muhasebe kodu
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=Müşt. hesap kodu
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Bu sosyal/mali vergiyi silmek istediğinizden em
 ExportDataset_tax_1=Sosyal ve mali vergiler ve ödemeleri
 CalcModeVATDebt=Mod <b>%sKDV, taahhüt hesabı%s için</b>.
 CalcModeVATEngagement=Mod <b>%sKDV, gelirler-giderler%s için</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Henüz kayıtlı hesapta olmasa bile, bilinen kayıtlı ödemelerin analizi.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Müşteri faturaları için mod <b>%sRE tedrikçi faturaları için mod %s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Gelir ve gider bilançosu, yıllık özet
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=Henüz kayıtlı defterde yer almamış olsalar bile, bilinen kayıtlı faturalara dayalı bir hesaplama için  %s analizinin %s faturasına bakın.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</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=- 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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Peşinat faturaları dahil değildir
 DepositsAreIncluded=- Peşinat faturaları dahildir
+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=RE Üçüncü partiye göre rapor
 LT2ReportByCustomersES=Üçüncü parti IRPF Raporu
 VATReport=Satış vergisi raporu
 VATReportByPeriods=Döneme göre satış vergisi raporu
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Oranlara göre satış vergisi raporu
 VATReportByThirdParties=Üçüncü taraflara göre satış vergisi raporu
 VATReportByCustomers=Müşteriye göre satış vergisi raporu
diff --git a/htdocs/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang
index 34939dd94f3..3c20bddb891 100644
--- a/htdocs/langs/tr_TR/cron.lang
+++ b/htdocs/langs/tr_TR/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Planlı iş sil
 Permission23104 = Planlı iş yürüt
 # Admin
 CronSetup=Planlı iş yönetimi ayarları
-URLToLaunchCronJobs=Nitelikli cron işlerini kontrol etmek ve başlatmak için URL
-OrToLaunchASpecificJob=Ya da özel bir işi denetlemek ve başlatmak için
+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=Cron işlerini başlatacak URL için güvenlik anahtarı
 FileToLaunchCronJobs=Nitelikli cron işlerini kontrol etmek ve başlatmak için komut satırı
 CronExplainHowToRunUnix=Unix ortamında komut satırını her 5 dakikada bir çalıştırmak için kron sekmesi girişini kullanmalısınız
 CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Sınıf %s hiçbir %s yöntemi içermiyor
+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=Önceden tanımlanmış cron görevi profillerinin listesi
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Number of launches
 CronMaxRun=Maximum number of launches
 CronEach=Her
 JobFinished=İş başlatıldı ve bitirildi
+Scheduled=Scheduled
 #Page card
 CronAdd= İş ekle
 CronEvery=İş yürütme zamanı
@@ -56,7 +58,7 @@ CronNote=Yorum
 CronFieldMandatory=%s alanı zorunludur
 CronErrEndDateStartDt=Bitiş tarihi başlama tarihinden önce olamaz
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Etkin
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Engelle
 CronTaskInactive=Bu iş devre dışı
 CronId=Kimlik
@@ -76,8 +78,14 @@ CronType_method=Call method of a PHP Class
 CronType_command=Kabuk komutu
 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=Planlı işleri görmek ve düzenlemek için "Giriş - Yönetici Araçları - Planlı İşler" menüsüne git.
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=İş engellendi
 MakeLocalDatabaseDumpShort=Yerel veritabanı yedeklemesi
 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=Dikkat: Performans amaçlı olarak etkinleştirilmiş işlerin bir sonraki yürütme tarihi ne olursa olsun, işleriniz çalıştırılmadan önce maksimum %s saat ertelenebilir.
+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/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 8753b1ee175..8cc4092af00 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Hata yok, taahüt ediyoruz
 # Errors
 ErrorButCommitIsDone=Hatalar bulundu, buna rağmen doğruluyoruz
 ErrorBadEMail=%s e-postası hatalı
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=URL %s yanlış
 ErrorBadValueForParamNotAString=Parametreniz için hatalı değer. Genellikle çeviri eksik olduğunda eklenir.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=%s kullanıcı adı zaten var.
 ErrorGroupAlreadyExists=%s Grubu zaten var.
 ErrorRecordNotFound=Kayıt bulunamadı.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Bazı gerekli alanlar doldurulmamış.
 ErrorSubjectIsRequired=E-posta konusu zorunludur
 ErrorFailedToCreateDir=Dizin oluşturulamadı. Web sunucusu kullanıcısının Dolibarr belgeleri dizinine yazma izinlerini denetleyin. Eğer bu parametre <b>guvenli_mod</b> bu PHP üzerinde etkinleştirilmişse, Dolibarr php dosyalarının web sunucusu kullanıcısına (ya da grubuna) sahip olduğunu denetleyin.
 ErrorNoMailDefinedForThisUser=Bu kullanıcı için tanımlı posta yok
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Bu özelliğin çalışması için JavaScriptin etkinleştirilmesi gerekir. Bunu Kurulum - Ekran menüsünden değiştirebilirsiniz.
 ErrorTopMenuMustHaveAParentWithId0='Üst' menü tipi menünün bir ana menüsü olamaz. Ana menüye 0 koyun ya da 'Sol' menü türünü seçin.
 ErrorLeftMenuMustHaveAParentId='Sol' tipli bir menünün bir üst tanımı olmalıdır.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Bu profil adı, bu dışa aktarma grubu için zaten m
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP eşleşmesi tamamlanmamış.
 ErrorLDAPMakeManualTest=A. Ldif dosyası %s dizininde oluşturuldu. Hatalar hakkında daha fazla bilgi almak için komut satırından elle yüklemeyi deneyin.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Oluşturulması için kullanılan referans zaten var.
+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=Kayıt bazı alt kayıtlar içerdiği için silinemedi
 ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=Dosya bulunamadı. Paylaşım anahtarı değiştirilmiş veya dosya yakın bir zamanda kaldırılmış olabilir.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP'nizdeki upload_max_filesize (%s) parametresi, post_max_size (%s) PHP parametresinden daha yüksek. Bu tutarlı bir kurulum değil.
 WarningPasswordSetWithNoAccount=Bu üye için bir parola ayarlıdır. Ancak, hiçbir kullanıcı hesabı oluşturulmamıştır. Yani bu şifre saklanır ama Dolibarr'a giriş için kullanılamaz. Dış bir modül/arayüz tarafından kullanılıyor olabilir, ama bir üye için ne bir kullanıcı adı ne de parola tanımlamanız gerekmiyorsa "Her üye için bir kullanıcı adı yönet" seçeneğini devre dışı bırakabilirsiniz. Bir kullanıcı adı yönetmeniz gerekiyorsa ama herhangi bir parolaya gereksinim duymuyorsanız bu uyarıyı engellemek için bu alanı boş bırakabilirsiniz. Not: Eğer bir üye bir kullanıcıya bağlıysa kullanıcı adı olarak e-posta adresi de kullanılabilir.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Kullanıcı adınız değiştirilmiştir.
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/tr_TR/exports.lang b/htdocs/langs/tr_TR/exports.lang
index 3818365af40..a909d78355e 100644
--- a/htdocs/langs/tr_TR/exports.lang
+++ b/htdocs/langs/tr_TR/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Alan başlğı
 NowClickToGenerateToBuildExportFile=Şimdi açılan kutudan dosya biçimini seçin ve dışa aktarma dosyasını oluşturmak için "Oluştur" linkine tıklayın...
 AvailableFormats=Mevcut Formatlar
 LibraryShort=Kitaplık
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Adım
 FormatedImport=İçe Aktarma Yardımcısı
 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.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=Eklenen satır sayısı: %s
 NbUpdate=Güncellenmiş satır sayısı: %s
 MultipleRecordFoundWithTheseFilters=Bu filtrelerle birden çok kayıt bulundu: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index 85fe5c91d72..8d33ac213fb 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Kullanıcı tarafından girilen e-postalar
 MailingModuleDescDolibarrUsers=E-postaları olan kullanıcılar
 MailingModuleDescThirdPartiesByCategories=Üçüncü taraflar (kategorilere göre)
 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=Satır %s dosyası
@@ -125,12 +126,13 @@ TagMailtoEmail=Alıcı E-posta Adresi ("kime:" html linkini içeren)
 NoEmailSentBadSenderOrRecipientEmail=Gönderilen e-posta yok. Hatalı gönderici ya da alıcı epostası. Kullanıcı profilini doğrula.
 # Module Notifications
 Notifications=Bildirimler
-NoNotificationsWillBeSent=Bu etkinlik ve firma için hiçbir e-posta bildirimi planlanmamış
-ANotificationsWillBeSent=E-posta ile 1 bildirim gönderilecektir
-SomeNotificationsWillBeSent=%s bildirim e-posta ile gönderilecektir
-AddNewNotification=Yeni bir e-posta bildirim hedefi/etkinliği oluştur
-ListOfActiveNotifications=E-posta bildirimi için aktif olan hedef/etkinlik listesi
-ListOfNotificationsDone=Gönderilen tüm e-posta bildirimleri listesi
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=E-posta gönderme yapılandırması '%s'ye ayarlandı. Bu mod toplu e-postalama için kullanılamaz.
 MailSendSetupIs2='%s' Modunu kullanmak için <strong>'%s'</strong> parametresini değiştirecekseniz, önce yönetici hesabı ile %sGiriş - Ayarlar - E-postalar%s menüsüne gitmelisiniz. Bu mod ile İnternet Servis Sağlayıcınız tarafından sağlanan SMTP sunucusu ayarlarını girebilir ve Toplu e-posta özelliğini kullanabilirsiniz.
 MailSendSetupIs3=SMTP sunucusunun nasıl yapılandırılacağı konusunda sorunuz varsa, %s e sorabilirsiniz.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
 MailAdvTargetRecipients=Alıcılar (gelişmiş seçim)
 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
+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=Tam sayı veya kayan değer seçmek için aralık kullanın
 AdvTgtMinVal=En düşük değer
 AdvTgtMaxVal=En yüksek değer
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Süzgeç oluştur
 AdvTgtOrCreateNewFilter=Yeni süzgeç adı
 NoContactWithCategoryFound=Kategorisi olan hiç bir kişi/adres bulunamadı
 NoContactLinkedToThirdpartieWithCategoryFound=Kategorisi olan hiç bir kişi/adres bulunamadı
-OutGoingEmailSetup=Giden e-posta kurulumu
-InGoingEmailSetup=Gelen e-posta kurulumu
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Varsayılan giden e-posta kurulumu
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Bilgi
 ContactsWithThirdpartyFilter=Üçüncü parti filtreli kişiler
 Unanswered=Unanswered
 Answered=Cevaplandı
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index ecc538bf1dc..5fa3692202b 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Bu e-posta türü için mevcut şablon yok
 AvailableVariables=Mevcut yedek değişkenler
 NoTranslation=Çeviri yok
 Translation=Çeviri
+CurrentTimeZone=PHP Saat Dilimi (sunucu)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Kayıt bulunamadı
 NoRecordDeleted=Hiç kayıt silinmedi
 NotEnoughDataYet=Yeterli bilgi yok
@@ -85,6 +87,8 @@ 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
+HomePage=Ana Sayfa
 RecordSaved=Kayıt kaydedildi
 RecordDeleted=Kayıt silindi
 RecordGenerated=Kayıt oluşturuldu
@@ -220,6 +224,7 @@ Value=Değer
 PersonalValue=Kişisel değer
 NewObject=Yeni %s
 NewValue=Yeni değer
+OldValue=Old value %s
 CurrentValue=Geçerli değer
 Code=Kod
 Type=Tür
@@ -433,6 +438,7 @@ RemainToPay=Kalan ödeme
 Module=Modül/Uygulama
 Modules=Modüller/Uygulamalar
 Option=Seçenek
+Filters=Filters
 List=Liste
 FullList=Tüm liste
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ SupplierPreview=Tedarikçi önizlemesi
 ShowCustomerPreview=Müşteri önizlemeyi göster
 ShowSupplierPreview=Tedarikçi önizlemesini göster
 RefCustomer=Müşteri Ref.
+InternalRef=Internal ref.
 Currency=Para birimi
 InfoAdmin=Yöneticiler için bilgi
 Undo=Geri al
@@ -671,7 +678,7 @@ SendMail=E-posta gönder
 Email=E-posta
 NoEMail=E-posta yok
 AlreadyRead=Zaten okundu
-NotRead=Okunmayan
+NotRead=Okunmamış
 NoMobilePhone=Cep telefonu yok
 Owner=Sahibi
 FollowingConstantsWillBeSubstituted=Aşağıdaki değişmezler uygun değerlerin yerine konacaktır
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=Beklemede
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/tr_TR/modulebuilder.lang b/htdocs/langs/tr_TR/modulebuilder.lang
index 93b4879a0d0..c80a020642b 100644
--- a/htdocs/langs/tr_TR/modulebuilder.lang
+++ b/htdocs/langs/tr_TR/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=Bir kaydı oluşturmak/düzenlemek/görüntülemek için P
 PageForAgendaTab=Etkinlik sekmesi için PHP sayfası
 PageForDocumentTab=Belge sekmesi için PHP sayfası
 PageForNoteTab=Not sekmesi için PHP sayfası
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Modül/uygulama dökümantasyon dosyasına yol (%s)
 SpaceOrSpecialCharAreNotAllowed=Boşluklara veya özel karakterlere izin verilmez.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Taranan dizin
 NoTrigger=No trigger
 NoWidget=Ekran etiketi yok
-GoToApiExplorer=API gezginine git
+GoToApiExplorer=API explorer
 ListOfMenusEntries=Menü kayıtlarının listesi
 ListOfDictionariesEntries=Sözlük girişlerinin listesi
 ListOfPermissionsDefined=Tanımlanan izinlerin listesi
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Eğer SQL ve PHP hakkında bilginiz varsa, yerel modül
 SeeTopRightMenu=Sağ üst menüde yer alan <span class="fa fa-bug"></span> simgesine bakın
 AddLanguageFile=Dil dosyası ekle
 YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Boşsa tabloyu sil)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=%s tablosu mevcut değil
 TableDropped=%s tablosu silindi
 InitStructureFromExistingTable=Build the structure array string of an existing table
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Spesifik bir editör URL'si kullanın
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Spesifik bir yazar kullanın
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=Önce modül/uygulama etkinleştirilmelidir
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=Nesneden bazı belgeler oluşturmak istiyorum
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/tr_TR/mrp.lang b/htdocs/langs/tr_TR/mrp.lang
index b68f85e39d9..1c581bebb72 100644
--- a/htdocs/langs/tr_TR/mrp.lang
+++ b/htdocs/langs/tr_TR/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index 1ac66fd963c..66cfdd557cb 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -5,8 +5,6 @@ Tools=Araçlar
 TMenuTools=Araçlar
 ToolsDesc=Diğer menü girişlerinde bulunmayan tüm araçlar burada gruplandırılmıştır.<br>Tüm araçlara sol menüden erişilebilir.
 Birthday=Doğumgünü
-BirthdayDate=Doğumgünü tarihi
-DateToBirth=Doğum günü
 BirthdayAlertOn=doğum günü uyarısı etkin
 BirthdayAlertOff=doğumgünü uyarısı etkin değil
 TransKey=TransKey anahtarının çevirisi
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Fatura tarihinden önceki ay (sayı 1-12)
 TextPreviousMonthOfInvoice=Fatura tarihinden önceki ay (metin)
 NextMonthOfInvoice=Fatura tarihinden sonraki ay (sayı 1-12)
 TextNextMonthOfInvoice=Fatura tarihinden sonraki ay (metin)
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip dosyası <b>%s</b> içinde oluşturuldu.
 DocFileGeneratedInto=Doc dosyası <b>%s</b> içinde oluşturuldu.
 JumpToLogin=Bağlantı kesildi. Giriş sayfasına git...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Gider raporu onaylandı
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=%s modülü kurulumuna bak
 NbOfAttachedFiles=Eklenen dosya/belge sayısı
 TotalSizeOfAttachedFiles=Eklenen dosyaların/belgelerin toplam boyutu
@@ -99,6 +100,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\n__REF__ referans numaralı sevk
 PredefinedMailContentSendFichInter=__(Hello)__\n\n__REF__ referans numaralı müdahaleyi ekte bulabilirsiniz\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Ödemeniz yapılmadıysa ödemenizi yapmak için aşağıdaki bağlantıyı tıklayabilirsiniz.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr, çeşitli iş modüllerini destekleyen kompakt bir ERP/CRM çözümüdür. Tüm modüllerin sergilendiği bir demonun mantığı yoktur, çünkü böyle bir senaryo asla gerçekleşmez (birkaç yüz adet mevcut). Bu nedenle birkaç demo profili vardır.
 ChooseYourDemoProfil=İşlemlerinize uyan demo profilini seçin...
 ChooseYourDemoProfilMore=...veya kendi profilinizi oluşturun<br>(manuel modül seçimi)
@@ -214,6 +216,7 @@ 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=Veri dizisinin içe aktarımı
 DolibarrNotification=Otomatik bilgilendirme
 ResizeDesc=Yeni genişliği <b>VEYA</b> yeni yüksekliği gir. Yeniden boyutlandırma sırasında oran kotunacaktır...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Dışa aktarma alanı
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index a5c62b2b2d2..f06d6621115 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Ürün/hizmet başına çoklu fiyat segmenti (her müşteri bir fiyat segmentinde)
 MultiPricesNumPrices=Fiyat sayısı
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+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=Ana paket ürünü sayısı
@@ -167,8 +168,10 @@ BuyingPrices=Alış fiyatları
 CustomerPrices=Müşteri fiyatları
 SuppliersPrices=Tedarikçi fiyatları
 SuppliersPricesOfProductsOrServices=Tedarikçi fiyatları (ürün veya hizmetlerin)
-CustomCode=G.T.İ.P Numarası
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Menşei ülke
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Sabit fiyatı kullan
 PriceByQuantity=Miktara göre değişen fiyatlar
 DisablePriceByQty=Fiyatları miktara göre devre dışı bırak
 PriceByQuantityRange=Miktar aralığı
-MultipriceRules=Fiyat seviyesi kuralları
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=İlk segmente göre diğer tüm segmentlerin fiyatlarını otomatik olarak hesaplamak için fiyat segmenti kurallarını (ürün modülü kurulumunda tanımlanan) kullan
 PercentVariationOver=%s üzerindeki %% değişim
 PercentDiscountOver=%s üzerindeki %% indirim
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index 8b8891d2c6b..24cb80a885a 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -76,15 +76,16 @@ MyActivities=Görevlerim/etkinliklerim
 MyProjects=Projelerim
 MyProjectsArea=Projelerim Alanı
 DurationEffective=Etken süre
-ProgressDeclared=Bildirilen ilerleme
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Mevcut açık görevler
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Hesaplanan ilerleme
+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=Süre
+TimeConsumed=Consumed
 ListOfTasks=Görevler listesi
 GoToListOfTimeConsumed=Tüketilen süre listesine git
 GanttView=Gantt View
diff --git a/htdocs/langs/tr_TR/recruitment.lang b/htdocs/langs/tr_TR/recruitment.lang
index 7d2ea6182f2..caede8f42a0 100644
--- a/htdocs/langs/tr_TR/recruitment.lang
+++ b/htdocs/langs/tr_TR/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang
index a56954de001..cdbc562d1ac 100644
--- a/htdocs/langs/tr_TR/sendings.lang
+++ b/htdocs/langs/tr_TR/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Bu sipariş için diğer sevkiyatlar
 SendingsAndReceivingForSameOrder=Bu sipariş için gönderiler ve makbuzlar
 SendingsToValidate=Doğrulanacak sevkiyatlar
 StatusSendingCanceled=İptal edildi
+StatusSendingCanceledShort=İptal edildi
 StatusSendingDraft=Taslak
 StatusSendingValidated=Doğrulanmış (sevkedilecek ürünler veya halihazırda sevkedilmişler)
 StatusSendingProcessed=İşlenmiş
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Sevkiyatları yapabilmek için önce siparişi
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Teslimat makbuzları için daha fazla eksiksiz doküman modeli (logo. ..)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER değişmezi tanımlanmamış
 SumOfProductVolumes=Ürün hacimleri toplamı
 SumOfProductWeights=Ürün ağırlıkları toplamı
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index be4eb25d528..07374a8b0f4 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Depolar değeri
 UserWarehouseAutoCreate=Kullanıcı oluştururken otomatik olarak bir kullanıcı deposu oluştur
 AllowAddLimitStockByWarehouse=Her bir ürün için minimum ve istenen stok değerini yönetmenin yanı sıra her bir eşleştirme (ürün-depo) için de minimum ve istenen stok değerini de yönetin
 RuleForWarehouse=Rule for warehouses
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Varsayılan depo
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/tr_TR/ticket.lang b/htdocs/langs/tr_TR/ticket.lang
index 55746ab9f31..86bfb2ce139 100644
--- a/htdocs/langs/tr_TR/ticket.lang
+++ b/htdocs/langs/tr_TR/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Destek Bildirimi - Türler
 TicketDictCategory=Destek Bildirimi - Gruplar
 TicketDictSeverity=Destek Bildirimi - Önemler
 TicketDictResolution=Destek Bildirimi - Çözüm
-TicketTypeShortBUGSOFT=Yazılım arızası
-TicketTypeShortBUGHARD=Donanım arızası
-TicketTypeShortCOM=Ticari soru
 
+TicketTypeShortCOM=Ticari soru
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Diğer
 TicketSeverityShortLOW=Düşük
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=Yüksek
-TicketSeverityShortBLOCKING=Kritik/Engelleyici
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress='%s' alanı hatalı
 MenuTicketMyAssign=Destek bildirimlerim
@@ -60,7 +58,6 @@ OriginEmail=E-posta kaynağı
 Notify_TICKET_SENTBYMAIL=Destek bildirimini e-posta ile gönderil
 
 # Status
-NotRead=Okunmayan
 Read=Okundu
 Assigned=Atanan
 InProgress=Devam etmekte
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Genel arayüz, ziyaretçilerin destek bildiri
 TicketsAutoAssignTicket=Destek bildirimini oluşturan kullanıcıyı otomatik olarak atayın
 TicketsAutoAssignTicketHelp=Bir destek bildirimi oluştururken, kullanıcı otomatik olarak destek bildirimine atanabilir.
 TicketNumberingModules=Destek bildirimi numaralandırma modülü
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Oluşturunca üçüncü tarafa bildir
 TicketsDisableCustomerEmail=Bir destek bildirimi ortak arayüzden oluşturulduğunda e-postaları her zaman devre dışı bırak
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Okunmamış
 TicketNotCreatedFromPublicInterface=Mevcut değil. Destek bildirimi genel arayüzden oluşturulmadı.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Destek bildirimi referans adı gerekli
 
 #
diff --git a/htdocs/langs/tr_TR/website.lang b/htdocs/langs/tr_TR/website.lang
index 65378d92d62..38b93f9cc3a 100644
--- a/htdocs/langs/tr_TR/website.lang
+++ b/htdocs/langs/tr_TR/website.lang
@@ -30,7 +30,6 @@ EditInLine=Satır içi düzenle
 AddWebsite=Web sitesi ekle
 Webpage=Web sayfası/kapsayıcı
 AddPage=Sayfa/kapsayıcı ekle
-HomePage=Ana Sayfa
 PageContainer=Sayfa
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=İstenen %s kimlik numaralı sayfa henüz bir içeriğe sahip değil, önbellek dosyası .tpl.php kaldırıldı. Bu sorunu çözmek için sayfa içeriğini düzenleyin.
@@ -101,7 +100,7 @@ EmptyPage=Boş sayfa
 ExternalURLMustStartWithHttp=Harici URL http:// veya https:// ile başlamalıdır
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Dinamik içeriği dahil et
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Sayfanın iç URL'si
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=Bu sayfa/kapsayıcı'nın çevirisi mevcut
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang
index 04b9a4a8498..fbe921943da 100644
--- a/htdocs/langs/tr_TR/withdrawals.lang
+++ b/htdocs/langs/tr_TR/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Otomatik ödeme talebi oluşturun
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Üçüncü parti banka kodu
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=Alacak olarak sınıflandır
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Otomatik ödeme dosyası oluşturun
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Merhaba, <br> <br> fatura %s, ait olduğu firma %s, tutarı %s olan otomatik ödeme talimatı banka tarafından reddedilmiştir.  <br> - <br> -- <br> %s
 ModeWarning=Gerçek mod için seçenek ayarlanmamış, bu simülasyondan sonra durdururuz
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/tr_TR/workflow.lang b/htdocs/langs/tr_TR/workflow.lang
index d3cc2b2f0b2..84e8e7d722a 100644
--- a/htdocs/langs/tr_TR/workflow.lang
+++ b/htdocs/langs/tr_TR/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Otomatik oluşturma
 AutomaticClassification=Otomatik sınıflandırma
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index f99b2780e48..467fc0b218c 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=Ця послуга
 ThisProduct=Цей товар
 DefaultForService=Default for service
 DefaultForProduct=Default for product
+ProductForThisThirdparty=Product for this thirdparty
+ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Більшість налаштувань обліку здійснюється у меню %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index d04882db68a..4fa18be466d 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Зовнішній вигляд
 SetupArea=Налаштування
 UploadNewTemplate=Завантажити новий шаблон(и)
 FormToTestFileUploadForm=Форма для тестування завантаження файлу (відповідно до налаштування)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Примітка: так діє, лише якщо модуль <b> %s </b> увімкнено
 RemoveLock=Видаліть або перейменуйте файл <b> %s </b>, якщо він існує, щоб дозволити використання інструменту "Оновити / Встановити".
 RestoreLock=Відновіть файл <b> %s </b>, лише з дозволом для читання, щоб відключити подальше використання інструменту "Оновити / Встановити".
@@ -85,7 +87,6 @@ ShowPreview=Показати попередній перегляд
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Попередній перегляд недоступний
 ThemeCurrentlyActive=Тема наразі активна
-CurrentTimeZone=PHP TimeZone (сервер)
 MySQLTimeZone=TimeZone MySql (база даних)
 TZHasNoEffect=Дати зберігаються та повертаються сервером баз даних так, ніби вони зберігаються як подані рядки. Часовий пояс діє лише при використанні функції UNIX_TIMESTAMP (яку не використовує Dolibarr, тому часовий пояс бази даних не повинен мати ніякого ефекту, навіть якщо він був змінений після введення даних).
 Space=Простір
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Ця область забезпечує функції ад
 Purge=Чистка
 PurgeAreaDesc=Ця сторінка дозволяє видалити всі файли, що були створені або зберігаються Dolibarr (тимчасові файли або всі файли в каталозі <b> %s </b>). Використовувати цю функцію зазвичай не потрібно. Вона надається як рішення для користувачів, у яких Dolibarr розміщений у провайдера, що не надає дозволу на видалення файлів, створених веб-сервером.
 PurgeDeleteLogFile=Видалення файлів журналів, включаючи <b> %s </b>, визначених для модуля Syslog (немає ризику втрати даних)
-PurgeDeleteTemporaryFiles=Видаліть усі тимчасові файли (без ризику втрати даних). Примітка: Видалення робиться лише в тому випадку, якщо тимчасовий каталог був створений 24 години тому.
-PurgeDeleteTemporaryFilesShort=Видалення тимчасових файлів
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 PurgeDeleteAllFilesInDocumentsDir=Видалить усі файли в каталозі: <b> %s </b>. <br> Це видалить усі згенеровані документи, пов'язані з елементами (контрагенти, рахунки тощо), файли, завантажені в модуль ECM, резервні копії бази даних та тимчасові файли.
 PurgeRunNow=Очистити зараз
 PurgeNothingToDelete=Немає каталогів або файлів для видалення.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Партнери
 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>
 HelpCenterDesc1=Ось деякі ресурси для отримання допомоги та підтримки з Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Приклади з поточною конфігура
 ListOfDirectories=Список каталогів шаблонів OpenDocument
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
 NumberOfModelFilesFound=Кількість файлів шаблонів ODT/ODS, знайдених у цих каталогах
-ExampleOfDirectoriesForModelGen=Приклади синтаксису:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed= <br> Щоб дізнатися, як створити шаблони odt-документів, перш ніж зберігати їх у цих каталогах, прочитайте документацію на wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Розміщення імені та прізвища
@@ -406,7 +408,7 @@ UrlGenerationParameters=Параметри безпеки URL
 SecurityTokenIsUnique=Використовувати унікальний ключ безпеки для кожної URL-адреси
 EnterRefToBuildUrl=Введіть характеристику для об'єкта %s
 GetSecuredUrl=Отримати обчислену URL-адресу
-ButtonHideUnauthorized=Заховати для звичайних користувачів кнопки привілейованих функцій, замість того щоб відображати їх затемненими.
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Старе значення комісії
 NewVATRates=Нове значення комісії
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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
+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 the language of the third party
+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
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+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
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang
index 676fdcd7500..5e37c104927 100644
--- a/htdocs/langs/uk_UA/banks.lang
+++ b/htdocs/langs/uk_UA/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/uk_UA/blockedlog.lang b/htdocs/langs/uk_UA/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/uk_UA/blockedlog.lang
+++ b/htdocs/langs/uk_UA/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/uk_UA/boxes.lang b/htdocs/langs/uk_UA/boxes.lang
index 187fb5abbfe..1dd858b093f 100644
--- a/htdocs/langs/uk_UA/boxes.lang
+++ b/htdocs/langs/uk_UA/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+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.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/uk_UA/cashdesk.lang b/htdocs/langs/uk_UA/cashdesk.lang
index a77e6f6893f..a7372bb3b86 100644
--- a/htdocs/langs/uk_UA/cashdesk.lang
+++ b/htdocs/langs/uk_UA/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=К-ть рахунків-фактур
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/uk_UA/categories.lang b/htdocs/langs/uk_UA/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/uk_UA/categories.lang
+++ b/htdocs/langs/uk_UA/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index 7bb65732df0..e788c649905 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index f7643379a98..717985b9ddc 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -111,7 +111,7 @@ 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 ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/uk_UA/cron.lang b/htdocs/langs/uk_UA/cron.lang
index 87dc53e8b69..46c3b30f128 100644
--- a/htdocs/langs/uk_UA/cron.lang
+++ b/htdocs/langs/uk_UA/cron.lang
@@ -6,14 +6,15 @@ 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
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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 environement you can use Scheduled task tools 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
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+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
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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=Продавець
@@ -76,8 +78,14 @@ 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+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/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 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.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/uk_UA/exports.lang b/htdocs/langs/uk_UA/exports.lang
index 50ef674d821..e075edfbcbe 100644
--- a/htdocs/langs/uk_UA/exports.lang
+++ b/htdocs/langs/uk_UA/exports.lang
@@ -133,3 +133,4 @@ 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/uk_UA/mails.lang b/htdocs/langs/uk_UA/mails.lang
index 754ce0cee4b..f6e418263bd 100644
--- a/htdocs/langs/uk_UA/mails.lang
+++ b/htdocs/langs/uk_UA/mails.lang
@@ -92,6 +92,7 @@ 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
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Оповіщення
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 2f257767cd7..e1d4ca6a387 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=Немає перекладу
 Translation=Translation
+CurrentTimeZone=PHP TimeZone (сервер)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Записів не знайдено
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Value
 PersonalValue=Personal value
 NewObject=New %s
 NewValue=New value
+OldValue=Old value %s
 CurrentValue=Current value
 Code=Code
 Type=Тип
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ 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
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/uk_UA/modulebuilder.lang b/htdocs/langs/uk_UA/modulebuilder.lang
index 2ac06ba7f55..7a72508aa33 100644
--- a/htdocs/langs/uk_UA/modulebuilder.lang
+++ b/htdocs/langs/uk_UA/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/uk_UA/mrp.lang b/htdocs/langs/uk_UA/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/uk_UA/mrp.lang
+++ b/htdocs/langs/uk_UA/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index c6472c143db..6f41e992ef6 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=Див. налаштування модуля %s
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index de32e4bd5dc..80d7861289c 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -108,7 +108,8 @@ 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=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index 6218178d78d..0ff4be4d522 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -76,15 +76,16 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/uk_UA/recruitment.lang b/htdocs/langs/uk_UA/recruitment.lang
index a160e956958..04e0a8bb779 100644
--- a/htdocs/langs/uk_UA/recruitment.lang
+++ b/htdocs/langs/uk_UA/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/uk_UA/sendings.lang b/htdocs/langs/uk_UA/sendings.lang
index 43fa631631e..364df1eb8c9 100644
--- a/htdocs/langs/uk_UA/sendings.lang
+++ b/htdocs/langs/uk_UA/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Other shipments for this order
 SendingsAndReceivingForSameOrder=Shipments and receipts for this order
 SendingsToValidate=Shipments to validate
 StatusSendingCanceled=Canceled
+StatusSendingCanceledShort=Canceled
 StatusSendingDraft=Проект
 StatusSendingValidated=Validated (products to ship or already shipped)
 StatusSendingProcessed=Оброблений
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
index fddb3382b60..e032197748f 100644
--- a/htdocs/langs/uk_UA/stocks.lang
+++ b/htdocs/langs/uk_UA/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/uk_UA/ticket.lang b/htdocs/langs/uk_UA/ticket.lang
index cc7caade32a..aa2c156c056 100644
--- a/htdocs/langs/uk_UA/ticket.lang
+++ b/htdocs/langs/uk_UA/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Заявка-Типи
 TicketDictCategory=Заявка-Групи
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Комерційне питання
 
+TicketTypeShortCOM=Комерційне питання
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Інший
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=Мої заявки
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Не читаються
 Read=Прочитані
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Непрочитані
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/uk_UA/website.lang b/htdocs/langs/uk_UA/website.lang
index ebd59dac2fa..447d9de9a65 100644
--- a/htdocs/langs/uk_UA/website.lang
+++ b/htdocs/langs/uk_UA/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/uk_UA/withdrawals.lang b/htdocs/langs/uk_UA/withdrawals.lang
index 533989bdd30..c3e1100a0c3 100644
--- a/htdocs/langs/uk_UA/withdrawals.lang
+++ b/htdocs/langs/uk_UA/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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/uk_UA/workflow.lang b/htdocs/langs/uk_UA/workflow.lang
index 299be277e1d..494a0424a75 100644
--- a/htdocs/langs/uk_UA/workflow.lang
+++ b/htdocs/langs/uk_UA/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index 3211a0b62df..9e084932477 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index f1c41a3b62b..f9a6468d94a 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -56,6 +56,8 @@ 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.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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.
@@ -256,6 +257,7 @@ 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.
@@ -375,7 +377,7 @@ 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:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+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
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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
+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 the language of the third party
+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
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+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
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang
index 9500a5b8b2e..81a23238550 100644
--- a/htdocs/langs/uz_UZ/banks.lang
+++ b/htdocs/langs/uz_UZ/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/uz_UZ/blockedlog.lang b/htdocs/langs/uz_UZ/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/uz_UZ/blockedlog.lang
+++ b/htdocs/langs/uz_UZ/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/uz_UZ/boxes.lang b/htdocs/langs/uz_UZ/boxes.lang
index d6fd298a3a7..9a751483fb1 100644
--- a/htdocs/langs/uz_UZ/boxes.lang
+++ b/htdocs/langs/uz_UZ/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+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.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/uz_UZ/cashdesk.lang b/htdocs/langs/uz_UZ/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/uz_UZ/cashdesk.lang
+++ b/htdocs/langs/uz_UZ/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+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
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/uz_UZ/categories.lang
+++ b/htdocs/langs/uz_UZ/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index dadff6a7894..8dc815b522e 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -111,7 +111,7 @@ 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 ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/uz_UZ/cron.lang b/htdocs/langs/uz_UZ/cron.lang
index d2da7ded67e..2ebdda1e685 100644
--- a/htdocs/langs/uz_UZ/cron.lang
+++ b/htdocs/langs/uz_UZ/cron.lang
@@ -6,14 +6,15 @@ 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
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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 environement you can use Scheduled task tools 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
@@ -42,10 +43,11 @@ CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
 CronLabel=Label
-CronNbRun=Nb. launch
-CronMaxRun=Max number launch
+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
@@ -56,16 +58,16 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
 CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+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
@@ -76,8 +78,14 @@ 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 "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
+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' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
+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/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 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.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/uz_UZ/exports.lang b/htdocs/langs/uz_UZ/exports.lang
index 2dcf4317e00..a0eb7161ef2 100644
--- a/htdocs/langs/uz_UZ/exports.lang
+++ b/htdocs/langs/uz_UZ/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=Library
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 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.
@@ -131,3 +133,4 @@ 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/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index 1235eef3b27..2d02c5ddcf9 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -92,6 +92,7 @@ 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
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index cc76ba88d89..1744926874f 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -28,7 +28,9 @@ 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
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Value
 PersonalValue=Personal value
 NewObject=New %s
 NewValue=New value
+OldValue=Old value %s
 CurrentValue=Current value
 Code=Code
 Type=Type
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ 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
@@ -671,7 +678,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/uz_UZ/modulebuilder.lang b/htdocs/langs/uz_UZ/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/uz_UZ/modulebuilder.lang
+++ b/htdocs/langs/uz_UZ/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/uz_UZ/mrp.lang b/htdocs/langs/uz_UZ/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/uz_UZ/mrp.lang
+++ b/htdocs/langs/uz_UZ/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index 54c0572d453..7a895bb1ca5 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index 97db059594f..9ecc11ed93d 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -108,7 +108,8 @@ 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=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index baf0ecde17f..05aa1f5a560 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -76,15 +76,16 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/uz_UZ/recruitment.lang b/htdocs/langs/uz_UZ/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/uz_UZ/recruitment.lang
+++ b/htdocs/langs/uz_UZ/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/uz_UZ/sendings.lang b/htdocs/langs/uz_UZ/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/uz_UZ/sendings.lang
+++ b/htdocs/langs/uz_UZ/sendings.lang
@@ -30,6 +30,7 @@ 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
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index 660443bcded..a1f55010139 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/uz_UZ/ticket.lang b/htdocs/langs/uz_UZ/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/uz_UZ/ticket.lang
+++ b/htdocs/langs/uz_UZ/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/uz_UZ/website.lang b/htdocs/langs/uz_UZ/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/uz_UZ/website.lang
+++ b/htdocs/langs/uz_UZ/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/uz_UZ/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang
index 114a8d9dd6c..059b3451c11 100644
--- a/htdocs/langs/uz_UZ/withdrawals.lang
+++ b/htdocs/langs/uz_UZ/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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/uz_UZ/workflow.lang b/htdocs/langs/uz_UZ/workflow.lang
index 299be277e1d..494a0424a75 100644
--- a/htdocs/langs/uz_UZ/workflow.lang
+++ b/htdocs/langs/uz_UZ/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 0426ce8fd0b..24ec964a46d 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=Dịch vụ này
 ThisProduct=Sản phẩm này
 DefaultForService=Mặc định cho dịch vụ
 DefaultForProduct=Mặc định cho sản phẩm
+ProductForThisThirdparty=Product for this thirdparty
+ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=Không thể gợi ý
 AccountancySetupDoneFromAccountancyMenu=Hầu hết các thiết lập của kế toán được thực hiện từ menu %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -48,6 +50,7 @@ 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 and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Tài khoản kế toán chính cho khách hàng không được định nghĩa trong thiết lập
 MainAccountForSuppliersNotDefined=Tài khoản kế toán chính cho các nhà cung cấp không được định nghĩa trong thiết lập
@@ -144,7 +147,7 @@ NotVentilatedinAccount=Không liên kết với tài khoản kế toán
 XLineSuccessfullyBinded=%s sản phẩm/ dịch vụ được liên kết thành công với tài khoản kế toán
 XLineFailedToBeBinded=%s sản phẩm/ dịch vụ không bị ràng buộc với bất kỳ tài khoản kế toán nào
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Số phần tử để liên kết được hiển thị theo trang (khuyến nghị tối đa: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Bắt đầu sắp xếp trang "Liên kết cần làm" theo các yếu tố gần đây nhất
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Bắt đầu sắp xếp trang "Liên kết" theo các yếu tố gần đây nhất
 
@@ -198,7 +201,8 @@ Docdate=Ngày
 Docref=Tham chiếu
 LabelAccount=Nhãn tài khoản
 LabelOperation=Nhãn hoạt động
-Sens=Ý nghĩa
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Mã sắp đặt chữ
 Lettering=Sắp đặt chữ
 Codejournal=Nhật ký
@@ -206,7 +210,8 @@ JournalLabel=Mã nhật ký
 NumPiece=Số lượng cái
 TransactionNumShort=Số Giao dịch
 AccountingCategory=Nhóm cá nhân hóa
-GroupByAccountAccounting=Nhóm theo tài khoản kế toán
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=Bạn có thể định nghĩa ở đây một số nhóm tài khoản kế toán. Chúng sẽ được sử dụng cho các báo cáo kế toán đã cá nhân hóa.
 ByAccounts=Theo tài khoản
 ByPredefinedAccountGroups=Theo nhóm được xác định trước
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Thanh toán không được liên kết với bất k
 OpeningBalance=Opening balance
 ShowOpeningBalance=Xem số dư 
 HideOpeningBalance=Ẩn số dư
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=Nhóm tài khoản
 PcgtypeDesc=Nhóm tài khoản được sử dụng làm tiêu chí 'bộ lọc' và 'nhóm' được xác định trước cho một số báo cáo kế toán. Ví dụ: 'THU NHẬP' hoặc 'CHI PHÍ' được sử dụng làm nhóm cho tài khoản kế toán của các sản phẩm để xây dựng báo cáo chi phí / thu nhập.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Tham khảo tại đây danh sách các dòng báo cáo
 DescVentilExpenseReportMore=Nếu bạn thiết lập tài khoản kế toán theo kiểu dòng báo cáo chi phí, ứng dụng sẽ có thể thực hiện tất cả các ràng buộc giữa các dòng báo cáo chi phí và tài khoản kế toán của hệ thống đồ tài khoản của bạn, chỉ bằng một cú nhấp chuột với nút <strong>"%s"</strong> . Nếu tài khoản không được đặt trong từ điển phí hoặc nếu bạn vẫn có một số dòng không bị ràng buộc với bất kỳ tài khoản nào, bạn sẽ phải thực hiện ràng buộc thủ công từ menu " <strong>%s</strong> ".
 DescVentilDoneExpenseReport=Tham khảo tại đây danh sách các dòng báo cáo chi phí và tài khoản kế toán phí của họ
 
+Closure=Annual closure
 DescClosure=Tham khảo tại đây số lượng kết chuyển theo tháng không được xác nhận và năm tài chính đã mở
 OverviewOfMovementsNotValidated=Bước 1 / Tổng quan về các kết chuyển không được xác nhận. (Cần thiết để đóng một năm tài chính)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Xác nhận các kết chuyển
 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
-SelectMonthAndValidate=Chọn tháng và xác nhận các kết chuyển
 
 ValidateHistory=Tự động ràng buộc
 AutomaticBindingDone=Tự động ràng buộc thực hiện xong
@@ -293,6 +300,7 @@ Accounted=Tài khoản trên Sổ cái
 NotYetAccounted=Chưa hạch toán vào Sổ cái
 ShowTutorial=Chương trình hướng dẫn
 NotReconciled=Chưa đối chiếu
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +345,7 @@ Modelcsv_LDCompta10=Xuất cho chuẩn LD Compta (v10 hoặc cao hơn)
 Modelcsv_openconcerto=Xuất dữ liệu cho OpenConcerto (Kiểm tra)
 Modelcsv_configurable=Xuất dữ liệu cấu hình CSV
 Modelcsv_FEC=Xuất dữ liệu FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=Xuất dữ liệu cho Sage 50 Thụy Sĩ
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index ef784047979..3daf83f7d2b 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -56,6 +56,8 @@ GUISetup=Hiển thị
 SetupArea=Thiết lập
 UploadNewTemplate=Tải lên (các) mẫu mới
 FormToTestFileUploadForm=Mẫu để thử nghiệm việc tải lên tập tin (dựa theo thiết lập)
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=Ghi chú: Yes chỉ có tác dụng nếu module <b>%s</b> được mở
 RemoveLock=Xóa / đổi tên tệp <b>%s</b> nếu nó tồn tại, để cho phép sử dụng công cụ Cập nhật / Cài đặt.
 RestoreLock=Khôi phục tệp <b>%s</b> , chỉ với quyền đọc, để vô hiệu hóa bất kỳ việc sử dụng thêm công cụ Cập nhật / Cài đặt nào.
@@ -85,7 +87,6 @@ ShowPreview=Hiển thị xem trước
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Xem trước không sẵn có
 ThemeCurrentlyActive=Giao diện hiện đã kích hoạt
-CurrentTimeZone=Mã vùng thời gian PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Ngày được lưu trữ và trả về bởi máy chủ cơ sở dữ liệu như thể chúng được giữ dưới dạng chuỗi đã gửi. Múi giờ chỉ có hiệu lực khi sử dụng hàm UNIX_TIMESTAMP (không nên sử dụng bởi Dolibarr, vì vậy TZ cơ sở dữ liệu sẽ không có hiệu lực, ngay cả khi đã thay đổi sau khi nhập dữ liệu).
 Space=Khoảng trống
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=Khu vực này cung cấp các chức năng quản trị. S
 Purge=Thanh lọc
 PurgeAreaDesc=Trang này cho phép bạn xóa tất cả các tệp được tạo hoặc lưu trữ bởi Dolibarr (các tệp tạm thời hoặc tất cả các tệp trong thư mục <b>%s</b> ). Sử dụng tính năng này thường không cần thiết. Nó được cung cấp như một cách giải quyết cho người dùng có Dolibarr được lưu trữ bởi nhà cung cấp không cung cấp quyền xóa các tệp được tạo bởi máy chủ web.
 PurgeDeleteLogFile=Xóa tập tin nhật ký <b>%s</b> được tạo bởi mô-đun Syslog (không gây nguy hiểm mất dữ liệu)
-PurgeDeleteTemporaryFiles=Xóa tất cả các tệp tạm thời (không có nguy cơ mất dữ liệu). Lưu ý: Việc xóa chỉ được thực hiện nếu thư mục tạm thời được tạo 24 giờ trước.
-PurgeDeleteTemporaryFilesShort=Xóa các tập tin tạm thời
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 PurgeDeleteAllFilesInDocumentsDir=Xóa tất cả các tệp trong thư mục: <b>%s</b> . <br> Việc này sẽ xóa tất cả các tài liệu được tạo liên quan đến các yếu tố (bên thứ ba, hóa đơn, v.v.), các tệp được tải lên mô-đun ECM, các bản sao lưu cơ sở dữ liệu và các tệp tạm thời.
 PurgeRunNow=Thanh lọc bây giờ
 PurgeNothingToDelete=Không có thư mục hoặc tập tin để xóa.
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=Đối tác ưu tiên
 OtherResources=Các tài nguyên khác
 ExternalResources=Tài nguyên bên ngoài
 SocialNetworks=Mạng xã hội
+SocialNetworkId=Social Network ID
 ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%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=Dưới đây là một số tài nguyên để nhận trợ giúp và hỗ trợ với Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Ví dụ với cấu hình hiện tại
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=Danh sách các thư mục chứa các tệp mẫu với định dạng OpenDocument. <br><br> Đặt ở đây đường dẫn đầy đủ của các thư mục. <br> Thêm một trở lại đầu giữa thư mục eah. <br> Để thêm một thư mục của mô-đun GED, thêm ở đây <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br> Các tệp trong các thư mục đó phải kết thúc bằng <b>.odt</b> hoặc <b>.ods</b>.
 NumberOfModelFilesFound=Số tệp mẫu ODT / ODS được tìm thấy trong các thư mục này
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+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=Chức vụ của Tên/Họ
@@ -406,7 +408,7 @@ UrlGenerationParameters=Các thông số để bảo mật URL
 SecurityTokenIsUnique=Sử dụng một tham số securekey duy nhất cho mỗi URL
 EnterRefToBuildUrl=Nhập tham chiếu cho đối tượng %s
 GetSecuredUrl=Nhận URL được tính
-ButtonHideUnauthorized=Ẩn các nút cho người dùng không phải quản trị viên cho các hành động không được phép thay vì hiển thị các nút bị tắt màu xám
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=Thuế suất VAT cũ
 NewVATRates=Thuế suất VAT mới
 PriceBaseTypeToChange=Sửa đổi về giá với giá trị tham chiếu cơ sở được xác định trên
@@ -668,7 +670,7 @@ Module54000Desc=In trực tiếp (không mở tài liệu) bằng giao diện Cu
 Module55000Name=Thăm dò ý kiến, khảo sát hoặc bình chọn
 Module55000Desc=Tạo các cuộc thăm dò, khảo sát hoặc bình chọn trực tuyến (như Doodle, Studs, RDVz, v.v.)
 Module59000Name=Lợi nhuận
-Module59000Desc=Module quản lý lợi nhuận
+Module59000Desc=Module to follow margins
 Module60000Name=Hoa hồng
 Module60000Desc=Module quản lý hoa hồng
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ YouUseBestDriver=Bạn sử dụng trình điều khiển %s, trình điều khi
 YouDoNotUseBestDriver=Bạn sử dụng trình điều khiển %s nhưng trình điều khiển %s được khuyến nghị.
 NbOfObjectIsLowerThanNoPb=Bạn chỉ có %s %s trong cơ sở dữ liệu. Điều này không yêu cầu bất kỳ tối ưu hóa cụ thể.
 SearchOptim=Tối ưu hóa tìm kiếm
-YouHaveXObjectUseSearchOptim=Bạn có %s %s trong cơ sở dữ liệu. Bạn nên thêm hằng số %s thành 1 trong Nhà - Cài đặt - Khác. Giới hạn tìm kiếm ở đầu chuỗi giúp cơ sở dữ liệu có thể sử dụng các chỉ mục và bạn sẽ nhận được phản hồi ngay lập tức.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=Bạn có %s %s trong cơ sở dữ liệu và hằng số %s được đặt thành 1 trong Nhà - Cài đặt - Khác.
 BrowserIsOK=Bạn đang sử dụng trình duyệt web %s. Trình duyệt này là ổn cho bảo mật và hiệu suất.
 BrowserIsKO=Bạn đang sử dụng trình duyệt web %s. Trình duyệt này được biết đến là một lựa chọn xấu cho bảo mật, hiệu suất và độ tin cậy. Chúng tôi khuyên bạn nên sử dụng Firefox, Chrome, Opera hoặc Safari.
@@ -1596,8 +1598,13 @@ ServiceSetup=Cài đặt module dịch vụ
 ProductServiceSetup=Cài đặt module Sản phẩm và Dịch vụ
 NumberOfProductShowInSelect=Số lượng sản phẩm tối đa được hiển thị trong danh sách chọn kết hợp (0 = không giới hạn)
 ViewProductDescInFormAbility=Hiển thị các mô tả sản phẩm trong biểu mẫu (được hiển thị trong cửa sổ bật lên chú giải công cụ)
+DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
+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=Kích hoạt trong sản phẩm/dịch vụ Tệp tệp đính kèm một tùy chọn để hợp nhất tài liệu PDF của sản phẩm với đề xuất PDF azur nếu sản phẩm/dịch vụ nằm trong đề xuất
-ViewProductDescInThirdpartyLanguageAbility=Hiển thị mô tả sản phẩm bằng ngôn ngữ của bên thứ ba
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 UseSearchToSelectProductTooltip=Ngoài ra, nếu bạn có số lượng lớn sản phẩm (> 100 000), bạn có thể tăng tốc độ bằng cách đặt hằng số PRODUCT_DONOTSEARCH_ANYWHERE thành 1 trong Cài đặt-> Khác. Tìm kiếm sau đó sẽ được giới hạn để bắt đầu chuỗi tìm kiếm.
 UseSearchToSelectProduct=Đợi cho đến khi bạn nhấn một phím trước khi tải nội dung của danh sách kết hợp sản phẩm - combo list (Điều này có thể tăng hiệu suất nếu bạn có số lượng lớn sản phẩm, nhưng nó không thuận tiện)
 SetDefaultBarcodeTypeProducts=Loại mã vạch mặc định để sử dụng cho các sản phẩm
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Các menu được cá nhân hóa không được li
 NewMenu=Menu mới
 MenuHandler=Xử lý menu
 MenuModule=Module nguồn
-HideUnauthorizedMenu= Ẩn menu không được phép (màu xám)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=ID menu
 DetailMenuHandler=Xử lý menu nơi hiển thị menu mới
 DetailMenuModule=Tên module nếu menu vào đến từ một module
@@ -1983,11 +1990,12 @@ EMailHost=Máy chủ email IMAP
 MailboxSourceDirectory=Thư mục nguồn hộp thư
 MailboxTargetDirectory=Thư mục đích hộp thư
 EmailcollectorOperations=Hoạt động để làm bởi trình thu thập
+EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Số lượng email tối đa được thu thập trên mỗi thu thập
 CollectNow=Thu thập ngay bây giờ
 ConfirmCloneEmailCollector=Bạn có chắc chắn muốn sao chép trình thu thập Email %s không?
-DateLastCollectResult=Ngày thu thập mới nhất đã thử
-DateLastcollectResultOk=Ngày thu thập mới nhất thành công
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=Kết quả mới nhất
 EmailCollectorConfirmCollectTitle=Email xác nhận thu thập
 EmailCollectorConfirmCollect=Bạn có muốn chạy trình thu thập cho thu thập này bây giờ không?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Mã mục nhập menu (mainmenu)
 ECMAutoTree=Hiển thị cây ECM tự động
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang
index 162d7062272..8a13699a9e8 100644
--- a/htdocs/langs/vi_VN/banks.lang
+++ b/htdocs/langs/vi_VN/banks.lang
@@ -173,10 +173,11 @@ SEPAMandate=Ủy quyền SEPA
 YourSEPAMandate=Ủy quyền SEPA của bạn
 FindYourSEPAMandate=Đây là ủy quyền SEPA của bạn để ủy quyền cho công ty chúng tôi thực hiện lệnh ghi nợ trực tiếp vào ngân hàng của bạn. Trả lại nó đã ký (quét tài liệu đã ký) hoặc gửi thư đến
 AutoReportLastAccountStatement=Tự động điền vào trường "số báo cáo ngân hàng" với số sao kê cuối cùng khi thực hiện đối chiếu
-CashControl=Rào cản tiền mặt POS
-NewCashFence=Rào cản tiền mặt mới
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 BankColorizeMovement=Tô màu cho các kết chuyển
 BankColorizeMovementDesc=Nếu chức năng này được bật, bạn có thể chọn màu nền cụ thể cho các kết chuyển ghi nợ hoặc tín dụng
 BankColorizeMovementName1=Màu nền cho kết chuyển ghi nợ
 BankColorizeMovementName2=Màu nền cho kết chuyển ghi có
 IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
+NoBankAccountDefined=No bank account defined
diff --git a/htdocs/langs/vi_VN/blockedlog.lang b/htdocs/langs/vi_VN/blockedlog.lang
index d0ed0570da4..9b3a20f1438 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=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=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 đó).
 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
@@ -35,7 +35,7 @@ logDON_DELETE=Đóng góp được xóa logic
 logMEMBER_SUBSCRIPTION_CREATE=Đăng ký thành viên đã tạo
 logMEMBER_SUBSCRIPTION_MODIFY=Đăng ký thành viên đã sửa đổi
 logMEMBER_SUBSCRIPTION_DELETE=Đăng ký thành viên đã xóa logic
-logCASHCONTROL_VALIDATE=Hàng rào tiền mặt ghi lại
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Tải hóa đơn khách hàng
 BlockedLogBillPreview=Xem trước hóa đơn khách hàng
 BlockedlogInfoDialog=Chi tiết nhật ký
diff --git a/htdocs/langs/vi_VN/boxes.lang b/htdocs/langs/vi_VN/boxes.lang
index a92b40fb524..20c4c4c059e 100644
--- a/htdocs/langs/vi_VN/boxes.lang
+++ b/htdocs/langs/vi_VN/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Đóng góp sửa đổi mới nhất %s
 BoxTitleLastModifiedExpenses=Báo cáo chi phí sửa đổi mới nhất %s 
 BoxTitleLatestModifiedBoms=BOMs sửa đổi mới nhất %s 
 BoxTitleLatestModifiedMos=Đơn đặt hàng sản xuất sửa đổi mới nhất %s 
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=Hoạt động toàn cầu (hoá đơn, đề xuất, đơn đặt hàng)
 BoxGoodCustomers=Khách hàng thân thiết
 BoxTitleGoodCustomers=%s Khách hàng thân thiết
+BoxScheduledJobs=Công việc theo lịch trình
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Không thể làm mới thông lượng RSS. Ngày làm mới thành công mới nhất: %s
 LastRefreshDate=Ngày làm tươi mới nhất
 NoRecordedBookmarks=Không có dấu trang được xác định.
@@ -92,8 +95,8 @@ LastXMonthRolling=%s tháng mới nhất
 ChooseBoxToAdd=Thêm widget vào bảng điều khiển của bạn
 BoxAdded=Widget đã được thêm vào trong bảng điều khiển của bạn
 BoxTitleUserBirthdaysOfMonth=Sinh nhật của tháng này (người dùng)
-BoxLastManualEntries=Mục nhập thủ công cuối cùng trong kế toán
-BoxTitleLastManualEntries=%s mục nhập thủ công mới nhất
+BoxLastManualEntries=Latest record in accountancy entered manually or without source document
+BoxTitleLastManualEntries=%s latest record entered manually or without source document
 NoRecordedManualEntries=Không có mục nhập thủ công được ghi lại trong kế toán
 BoxSuspenseAccount=Đếm hoạt động kế toán với tài khoản bị đình chỉ
 BoxTitleSuspenseAccount=Số dòng chưa phân bổ
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=Tài khoản bị đình chỉ không được xác đ
 BoxLastCustomerShipments=Lô hàng cuối cùng của khách hàng
 BoxTitleLastCustomerShipments=Lô hàng mới nhất của khách hàng %s
 NoRecordedShipments=Không ghi nhận lô hàng của khách hàng
+BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 # Pages
 AccountancyHome=Kế toán
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/vi_VN/cashdesk.lang b/htdocs/langs/vi_VN/cashdesk.lang
index b71e1adb3c9..e988007469f 100644
--- a/htdocs/langs/vi_VN/cashdesk.lang
+++ b/htdocs/langs/vi_VN/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Chân trang
 AmountAtEndOfPeriod=Số tiền cuối kỳ (ngày, tháng hoặc năm)
 TheoricalAmount=Số lượng lý thuyết
 RealAmount=Số tiền thực tế
-CashFence=Cash fence
-CashFenceDone=Rào cản tiền mặt được thực hiện trong kỳ
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=Nb của hoá đơn
 Paymentnumpad=Loại Bảng để nhập thanh toán
 Numberspad=Bảng số
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b>được sử dụng để thêm số thiết bị đầu cuối
 TakeposGroupSameProduct=Nhóm sản phẩm cùng dòng
 StartAParallelSale=Bắt đầu bán hàng mới
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Báo cáo tiền mặt
 MainPrinterToUse=Máy in chính để dùng
 OrderPrinterToUse=Máy in đơn hàng để dùng
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/vi_VN/categories.lang b/htdocs/langs/vi_VN/categories.lang
index bb15ed66bb6..c7947d9a0d0 100644
--- a/htdocs/langs/vi_VN/categories.lang
+++ b/htdocs/langs/vi_VN/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Khu vực thẻ/ danh mục dự án
 UsersCategoriesArea=Khu vực thẻ/ danh mục người dùng
 SubCats=Danh mục con
 CatList=Danh sách thẻ/danh mục
+CatListAll=List of tags/categories (all types)
 NewCategory=Thẻ/danh mục mới
 ModifCat=Sửa thẻ/ danh mục
 CatCreated=Thẻ/danh mục đã tạo
@@ -65,16 +66,22 @@ UsersCategoriesShort=thẻ/ danh mục Người dùng
 StockCategoriesShort=thẻ/ danh mục Kho
 ThisCategoryHasNoItems=Danh mục này không có dữ liệu nào
 CategId=ID thẻ/ danh mục
-CatSupList=Danh sách Nhà cung cấp thẻ/ danh mục
-CatCusList=Danh sách khách hàng/ tiềm năng thẻ/ danh mục
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=Danh sách sản phẩm thẻ/danh mục
 CatMemberList=Danh sách thành viên thẻ/ danh mục
-CatContactList=Danh sách liên lạc thẻ/ danh mục
-CatSupLinks=Liên kết giữa nhà cung cấp và thẻ/ danh mục
+CatContactList=List of contacts tags/categories
+CatProjectsList=List of projects tags/categories
+CatUsersList=List of users tags/categories
+CatSupLinks=Links between vendors and tags/categories
 CatCusLinks=Liên kết giữa khách hàng/ tiềm năng và thẻ/ danh mục
 CatContactsLinks=Liên kết Liên hệ/địa chỉ với danh mục
 CatProdLinks=Liên kết giữa sản phẩm/ dịch vụ và thẻ/ danh mục
-CatProJectLinks=Liên kết giữa dự án và thẻ/ danh mục
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=Liên kết giữa dự án và thẻ/ danh mục
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=Xóa khỏi thẻ/ danh mục
 ExtraFieldsCategories=Thuộc tính bổ sung
 CategoriesSetup=Thiết lập thẻ/ danh mục
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index e559f40ecb5..38e3c5dad27 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Kiểm tra ID VAT nội bộ cộng đồng trên tran
 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>
 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=Loại pháp nhân
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Nhân viên
 ProspectLevelShort=Tiềm năng
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index f1cc23cf244..fda16aecf93 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -111,7 +111,7 @@ Refund=Hoàn thuế
 SocialContributionsPayments=Thanh toán thuế xã hội / tài chính
 ShowVatPayment=Hiện nộp thuế GTGT
 TotalToPay=Tổng số trả
-BalanceVisibilityDependsOnSortAndFilters=Số dư chỉ hiển thị trong danh sách này nếu bảng được sắp xếp tăng dần trên %s và được lọc cho 1 tài khoản ngân hàng
+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=Mã kế toán khách hàng
 SupplierAccountancyCode=Mã kế toán nhà cung cấp
 CustomerAccountancyCodeShort=Mã K.toán K.H
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Bạn có chắc chắn muốn xóa khoản than
 ExportDataset_tax_1=Thuế và tài chính xã hội và thanh toán
 CalcModeVATDebt=Chế độ <b>%sVAT về kế toán cam kết%s</b>.
 CalcModeVATEngagement=Chế độ <b>%sVAT đối với thu nhập-chi phí%s.</b>
-CalcModeDebt=Phân tích các hóa đơn được ghi lại ngay cả khi chúng chưa được hạch toán vào sổ cái.
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=Phân tích các khoản thanh toán được ghi lại, ngay cả khi chúng chưa được hạch toán vào sổ cái.
 CalcModeBookkeeping=Phân tích dữ liệu được báo cáo trong bảng Sổ sách kế toán.
 CalcModeLT1= Chế độ <b>%sRE trên hoá đơn của khách hàng - nhà cung cấp hoá đơn%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Cán cân thu nhập và chi phí, tổng kết hà
 AnnualByCompanies=Cân đối thu nhập và chi phí, theo các nhóm tài khoản được xác định trước
 AnnualByCompaniesDueDebtMode=Cân đối thu nhập và chi phí, chi tiết theo các nhóm được xác định trước, chế độ <b>%sKhiếu nại - Nợ%s</b> cho biết <b>Kế toán cam kết</b> .
 AnnualByCompaniesInputOutputMode=Cân đối thu nhập và chi phí, chi tiết theo các nhóm được xác định trước, chế độ <b>%sThu nhập - Chi phí %s</b> cho biết <b>kế toán tiền mặt</b> .
-SeeReportInInputOutputMode=Xem %s Phân tích thanh toán %s để biết tính toán về các khoản thanh toán thực tế được thực hiện ngay cả khi chúng chưa được hạch toán vào Sổ cái.
-SeeReportInDueDebtMode=Xem %s phân tích hóa đơn%s để biết cách tính toán dựa trên hóa đơn đã ghi ngay cả khi chúng chưa được hạch toán vào Sổ cái.
-SeeReportInBookkeepingMode=Xem <b>%s Sổ sách báo cáo %s</b> để biết tính toán trên <b>bảng Sổ sách kế toán</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=- 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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=Nó hiển thị ghi nhận trong Sổ cái c
 SeePageForSetup=Xem menu <a href="%s">%s</a> để thiết lập
 DepositsAreNotIncluded=- Không bao gồm hóa đơn giảm thanh toán
 DepositsAreIncluded=- Bao gồm hóa đơn giảm thanh toán
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Báo cáo thuế 2 của bên thứ ba
 LT2ReportByCustomers=Báo cáo thuế 3 của bên thứ ba
 LT1ReportByCustomersES=Báo cáo của bên thứ ba RE
 LT2ReportByCustomersES=Báo cáo của bên thứ ba IRPF
 VATReport=Báo cáo thuế bán hàng
 VATReportByPeriods=Báo cáo thuế bán theo kỳ
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Báo cáo thuế bán hàng theo thuế suất
 VATReportByThirdParties=Báo cáo thuế bán hàng của bên thứ ba
 VATReportByCustomers=Báo cáo thuế bán hàng của khách hàng
diff --git a/htdocs/langs/vi_VN/cron.lang b/htdocs/langs/vi_VN/cron.lang
index 0a3630cf45d..3ea052d3289 100644
--- a/htdocs/langs/vi_VN/cron.lang
+++ b/htdocs/langs/vi_VN/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Xóa công việc theo lịch trình
 Permission23104 = Thực hiện công việc theo lịch trình
 # Admin
 CronSetup=Thiết lập quản lý công việc theo lịch trình
-URLToLaunchCronJobs=URL để kiểm tra và khởi chạy các công việc định kỳ đủ điều kiện
-OrToLaunchASpecificJob=Hoặc để kiểm tra và khởi động một công việc cụ thể
+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=Khóa bảo mật cho URL để khởi chạy các công việc định kỳ
 FileToLaunchCronJobs=Dòng lệnh để kiểm tra và khởi chạy các công việc định kỳ đủ điều kiện
 CronExplainHowToRunUnix=Trên môi trường Unix, bạn nên sử dụng mục crontab sau để chạy dòng lệnh mỗi 5 phút
 CronExplainHowToRunWin=Trên môi trường Microsoft (tm) Windows, bạn có thể sử dụng các công cụ Tác vụ theo lịch để chạy dòng lệnh mỗi 5 phút
 CronMethodDoesNotExists=Lớp %s không chứa bất kỳ phương thức nào %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Hồ sơ công việc theo định kỳ được xác định vào tập tin mô tả mô-đun. Khi mô-đun được kích hoạt, chúng được tải và có sẵn để bạn có thể quản lý các công việc từ menu công cụ quản trị %s.
 CronJobProfiles=Danh sách hồ sơ công việc định kỳ được xác định trước
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=Số lần khởi chạy
 CronMaxRun=Số lần khởi chạy tối đa
 CronEach=Mỗi
 JobFinished=Công việc khởi chạy và kết thúc
+Scheduled=Scheduled
 #Page card
 CronAdd= Thêm công việc
 CronEvery=Thực hiện mỗi công việc
@@ -56,7 +58,7 @@ CronNote=Nhận xét
 CronFieldMandatory=Các trường %s là bắt buộc
 CronErrEndDateStartDt=Ngày kết thúc không thể trước ngày bắt đầu
 StatusAtInstall=Trạng thái khi cài đặt mô-đun
-CronStatusActiveBtn=Kích hoạt
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Vô hiệu hoá
 CronTaskInactive=Công việc này bị vô hiệu hóa
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=Sao lưu cơ sở dữ liệu cục bộ
 MakeLocalDatabaseDump=Tạo một kết xuất cơ sở dữ liệu cục bộ. Các tham số là:  nén('gz' hoặc 'bz' hoặc 'none'), loại sao lưu ('mysql', 'pssql', 'auto'), 1, 'auto' hoặc tên tệp để tạo, số lượng tệp sao lưu cần giữ
 WarningCronDelayed=Chú ý, vì mục đích hiệu suất, bất kể ngày nào là ngày thực hiện các công việc được kích hoạt, công việc của bạn có thể bị trì hoãn tối đa là %s giờ trước khi được chạy.
 DATAPOLICYJob=Trình dọn dẹp dữ liệu và ẩn danh
+JobXMustBeEnabled=Job %s must be enabled
+# 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/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 5c97da8e340..1413520f21d 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=Không có lỗi, chúng tôi cam kết
 # Errors
 ErrorButCommitIsDone=Lỗi được tìm thấy nhưng chúng tôi xác nhận mặc dù điều này
 ErrorBadEMail=Email %s là sai
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url% s là sai
 ErrorBadValueForParamNotAString=Giá trị xấu cho tham số của bạn. Nói chung khi dịch bị thiếu.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Đăng nhập% s đã tồn tại.
 ErrorGroupAlreadyExists=Nhóm% s đã tồn tại.
 ErrorRecordNotFound=Ghi lại không tìm thấy.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Một số trường yêu cầu không được lấp đầy
 ErrorSubjectIsRequired=Chủ đề email là bắt buộc
 ErrorFailedToCreateDir=Không thể tạo một thư mục. Kiểm tra xem người sử dụng máy chủ web có quyền ghi vào thư mục tài liệu Dolibarr. Nếu tham số <b>safe_mode</b> được kích hoạt trên PHP này, hãy kiểm tra các tập tin php Dolibarr sở hữu cho người sử dụng máy chủ web (hoặc một nhóm).
 ErrorNoMailDefinedForThisUser=Không có thư xác định cho người dùng này
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Tính năng này cần javascript để được kích hoạt để làm việc. Thay đổi điều này trong thiết lập - hiển thị.
 ErrorTopMenuMustHaveAParentWithId0=Một thực đơn của loại 'Top' không thể có một trình đơn phụ huynh. Đặt 0 trong trình đơn phụ huynh hoặc chọn một trình đơn của loại 'trái'.
 ErrorLeftMenuMustHaveAParentId=Một thực đơn của loại 'trái' phải có một id cha mẹ.
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=Tên hồ sơ này đã tồn tại cho bộ xuất k
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP phù hợp là không đầy đủ.
 ErrorLDAPMakeManualTest=Một tập tin .ldif đã được tạo ra trong thư mục% s. Hãy thử để tải nó bằng tay từ dòng lệnh để có thêm thông tin về lỗi.
 ErrorCantSaveADoneUserWithZeroPercentage=Không thể lưu một hành động với "trạng thái chưa bắt đầu" nếu trường "được thực hiện bởi" cũng được điền.
-ErrorRefAlreadyExists=Tài liệu tham khảo dùng để tạo đã tồn tại.
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=Vui lòng nhập tên sao kê ngân hàng nơi mục nhập phải được báo cáo (Định dạng YYYYMM hoặc YYYYMMDD)
 ErrorRecordHasChildren=Không thể xóa hồ sơ vì nó có một số hồ sơ con.
 ErrorRecordHasAtLeastOneChildOfType=Đối tượng có ít nhất một con của loại %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Bạn phải chọn nếu sản p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Giảm giá bạn cố gắng áp dụng là lớn hơn tiền còn lại để trả. Chia giảm giá trong 2 giảm giá nhỏ hơn trước.
 ErrorFileNotFoundWithSharedLink=Tập tin không được tìm thấy. Có thể là khóa chia sẻ đã được sửa đổi hoặc tập tin đã bị xóa gần đây.
 ErrorProductBarCodeAlreadyExists=Mã vạch sản phẩm %s đã tồn tại trên một tham chiếu sản phẩm khác.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Cũng lưu ý rằng việc sử dụng sản phẩm ảo để tự động tăng / giảm sản phẩm con là không thể khi ít nhất một sản phẩm phụ (hoặc sản phẩm phụ của sản phẩm phụ) cần số sê-ri/ lô.
+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=Mô tả là bắt buộc đối với các dòng có sản phẩm miễn phí
 ErrorAPageWithThisNameOrAliasAlreadyExists=Trang/ khung chứa <strong>%s</strong> có cùng tên hoặc bí danh thay thế mà bạn cố gắng sử dụng
 ErrorDuringChartLoad=Lỗi khi tải hệ thống tài khoản. Nếu một vài tài khoản chưa được tải, bạn vẫn có thể nhập chúng theo cách thủ công.
@@ -243,6 +246,16 @@ ErrorReplaceStringEmpty=Lỗi, cụm từ để thay thế đang trống
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=Giao diện công cộng không được kích hoạt
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
+ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Tham số PHP của bạn upload_max_filesize (%s) cao hơn tham số PHP post_max_size (%s). Đây không phải là một thiết lập phù hợp.
 WarningPasswordSetWithNoAccount=Một mật khẩu đã được đặt cho thành viên này. Tuy nhiên, không có tài khoản người dùng nào được tạo. Vì vậy, mật khẩu này được lưu trữ nhưng không thể được sử dụng để đăng nhập vào Dolibarr. Nó có thể được sử dụng bởi một mô-đun / giao diện bên ngoài nhưng nếu bạn không cần xác định bất kỳ thông tin đăng nhập hay mật khẩu nào cho thành viên, bạn có thể tắt tùy chọn "Quản lý đăng nhập cho từng thành viên" từ thiết lập mô-đun Thành viên. Nếu bạn cần quản lý thông tin đăng nhập nhưng không cần bất kỳ mật khẩu nào, bạn có thể để trống trường này để tránh cảnh báo này. Lưu ý: Email cũng có thể được sử dụng làm thông tin đăng nhập nếu thành viên được liên kết với người dùng.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Đăng nhập của bạn đã được s
 WarningAnEntryAlreadyExistForTransKey=Một mục đã tồn tại cho khóa dịch của ngôn ngữ này
 WarningNumberOfRecipientIsRestrictedInMassAction=Cảnh báo, số lượng người nhận khác nhau được giới hạn ở <b>%s</b> khi sử dụng các hành động hàng loạt trong danh sách
 WarningDateOfLineMustBeInExpenseReportRange=Cảnh báo, ngày của dòng không nằm trong phạm vi của báo cáo chi phí
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Dự án đã đóng. Bạn phải mở lại nó trước.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Một số giao dịch ngân hàng đã bị xóa sau đó biên nhận bao gồm cả chúng được tạo ra. Vì vậy, số lượng séc và tổng số hóa đơn có thể khác với số lượng và tổng số trong danh sách.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/vi_VN/exports.lang b/htdocs/langs/vi_VN/exports.lang
index 81f0901f077..f15be790dc6 100644
--- a/htdocs/langs/vi_VN/exports.lang
+++ b/htdocs/langs/vi_VN/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Tiêu đề trường
 NowClickToGenerateToBuildExportFile=Bây giờ, chọn định dạng tệp trong hộp combo và nhấp vào "Tạo" để tạo tệp xuất ...
 AvailableFormats=Các định dạng có sẵn
 LibraryShort=Thư viện
+ExportCsvSeparator=Phân cách thập phân
+ImportCsvSeparator=Phân cách thập phân
 Step=Bước
 FormatedImport=Trợ lý nhập dữ liệu
 FormatedImportDesc1=Mô-đun này cho phép bạn cập nhật dữ liệu hiện có hoặc thêm các đối tượng mới vào cơ sở dữ liệu từ một tệp mà không có kiến ​​thức kỹ thuật, sử dụng trợ lý.
@@ -37,7 +39,7 @@ FormatedExportDesc3=Khi dữ liệu cần xuất được chọn, bạn có th
 Sheet=Bảng
 NoImportableData=Không có dữ liệu có thể nhập (không có mô-đun với định nghĩa để cho phép nhập dữ liệu)
 FileSuccessfullyBuilt=Tập tin được tạo
-SQLUsedForExport=SQL Request used to extract data
+SQLUsedForExport=Yêu cầu SQL để xuất liệu
 LineId=Id của dòng
 LineLabel=Nhãn của dòng
 LineDescription=Mô tả của dòng
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Khóa (cột) được sử dụng cho <b>cập nhật</b> d
 NbInsert=Số dòng được chèn: %s
 NbUpdate=Số dòng cập nhật: %s
 MultipleRecordFoundWithTheseFilters=Nhiều bản ghi đã được tìm thấy với các bộ lọc này: %s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang
index 200b7eae30b..59190543259 100644
--- a/htdocs/langs/vi_VN/mails.lang
+++ b/htdocs/langs/vi_VN/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=Email đầu vào của người dùng
 MailingModuleDescDolibarrUsers=Người dùng có email
 MailingModuleDescThirdPartiesByCategories=Các bên thứ ba (theo danh mục)
 SendingFromWebInterfaceIsNotAllowed=Gửi từ giao diện web không được phép.
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Dòng %s trong tập tin
@@ -125,12 +126,13 @@ TagMailtoEmail=Email người nhận (bao gồm liên kết "mailto:" html)
 NoEmailSentBadSenderOrRecipientEmail=Không có email nào được gửi. Người gửi hoặc người nhận email xấu. Xác nhận hồ sơ người dùng.
 # Module Notifications
 Notifications=Thông báo
-NoNotificationsWillBeSent=Không có thông báo email được lên kế hoạch cho sự kiện này và công ty
-ANotificationsWillBeSent=1 thông báo sẽ được gửi qua email
-SomeNotificationsWillBeSent=Thông báo %s sẽ được gửi qua email
-AddNewNotification=Kích hoạt email mới thông báo mục tiêu/sự kiện 
-ListOfActiveNotifications=Liệt kê tất cả các mục tiêu/sự kiện đang hoạt động để thông báo qua email
-ListOfNotificationsDone=Liệt kê tất cả các thông báo email đã gửi
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Cấu hình gửi email đã được thiết lập thành '%s'. Chế độ này không thể được sử dụng để gửi email hàng loạt.
 MailSendSetupIs2=Trước tiên, bạn phải đi, với tài khoản quản trị viên, vào menu %sNhà - Cài đặt - EMails %s để thay đổi tham số <strong>'%s'</strong> để sử dụng chế độ '%s' . Với chế độ này, bạn có thể nhập thiết lập máy chủ SMTP do Nhà cung cấp dịch vụ Internet của bạn cung cấp và sử dụng tính năng gửi email hàng loạt.
 MailSendSetupIs3=Nếu bạn có bất kỳ câu hỏi nào về cách thiết lập máy chủ SMTP của mình, bạn có thể hỏi %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Tệp đã nhập phải có định dạng <strong>e
 UseFormatInputEmailToTarget=Nhập một chuỗi với định dạng <strong>email;tên;họ;tênkhác</strong>
 MailAdvTargetRecipients=Người nhận (lựa chọn nâng cao)
 AdvTgtTitle=Điền vào các trường đầu vào để chọn trước bên thứ ba hoặc liên hệ / địa chỉ để nhắm mục tiêu
-AdvTgtSearchTextHelp=Sử dụng %% làm ký tự đại diện. Ví dụ: để tìm tất cả các mục như <b>jean, joe, jim</b> , bạn có thể nhập <b>j%%</b> , bạn cũng có thể sử dụng; như dấu phân cách cho giá trị, và sử dụng! ngoại trừ giá trị này. Ví dụ: <b>jean; joe;jim%% ;!Jimo;!Jima%</b> sẽ nhắm mục tiêu tất cả jean, joe, bắt đầu với jim nhưng không phải jimo và không phải mọi thứ bắt đầu bằng jima
+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=Sử dụng khoảng để chọn giá trị int hoặc float
 AdvTgtMinVal=Giá trị tối thiểu
 AdvTgtMaxVal=Gia trị tối đa
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Tạo bộ lọc
 AdvTgtOrCreateNewFilter=Tên bộ lọc mới
 NoContactWithCategoryFound=Không có liên lạc/địa chỉ với một danh mục được tìm thấy
 NoContactLinkedToThirdpartieWithCategoryFound=Không có liên lạc/địa chỉ với một danh mục được tìm thấy
-OutGoingEmailSetup=Thiết lập email đi
-InGoingEmailSetup=Thiết lập email đến
-OutGoingEmailSetupForEmailing=Thiết lập email gửi đi (cho module %s)
-DefaultOutgoingEmailSetup=Thiết lập email gửi đi mặc định
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Thông tin
 ContactsWithThirdpartyFilter=Danh bạ với bộ lọc của bên thứ ba
 Unanswered=Unanswered
 Answered=Đã trả lời
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 4a0fe321d58..787b79af04c 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=Không có sẵn mẫu nào cho loại email này
 AvailableVariables=Các biến thay thế có sẵn
 NoTranslation=Không dịch
 Translation=Dịch
+CurrentTimeZone=Mã vùng thời gian PHP (server)
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=Không tìm thấy bản ghi
 NoRecordDeleted=Không có bản ghi nào bị xóa
 NotEnoughDataYet=Không đủ dữ liệu
@@ -85,6 +87,8 @@ 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
+HomePage=Trang chủ
 RecordSaved=Bản ghi đã lưu
 RecordDeleted=Bản ghi đã xóa
 RecordGenerated=Bản ghi được tạo
@@ -220,6 +224,7 @@ Value=Giá trị
 PersonalValue=Giá trị cá nhân
 NewObject=Tạo mới %s
 NewValue=Giá trị mới
+OldValue=Old value %s
 CurrentValue=Giá trị hiện tại
 Code=Mã
 Type=Loại
@@ -433,6 +438,7 @@ RemainToPay=Còn lại để trả tiền
 Module=Mô-đun / Ứng dụng
 Modules=Mô-đun / Ứng dụng
 Option=Tùy chọn
+Filters=Filters
 List=Danh sách
 FullList=Danh mục đầy đủ
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ SupplierPreview=Xem trước nhà cung cấp
 ShowCustomerPreview=Xem trước khách hàng hiển thị
 ShowSupplierPreview=Hiển thị xem trước nhà cung cấp
 RefCustomer=Tham chiếu khách hàng
+InternalRef=Internal ref.
 Currency=Tiền tệ
 InfoAdmin=Thông tin dành cho người quản trị
 Undo=Lùi lại
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/vi_VN/modulebuilder.lang b/htdocs/langs/vi_VN/modulebuilder.lang
index f2aa036ec7d..d8c8e376b9b 100644
--- a/htdocs/langs/vi_VN/modulebuilder.lang
+++ b/htdocs/langs/vi_VN/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=Trang PHP để tạo/chỉnh sửa/xem bản ghi
 PageForAgendaTab=Trang PHP cho tab sự kiện
 PageForDocumentTab=Trang PHP cho tab tài liệu
 PageForNoteTab=Trang PHP cho tab ghi chú
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=Đường dẫn đến zip của gói mô-đun/ứng dụng
 PathToModuleDocumentation=Đường dẫn đến tệp tài liệu mô-đun/ứng dụng (%s)
 SpaceOrSpecialCharAreNotAllowed=Khoảng trắng hoặc ký tự đặc biệt không được phép.
@@ -77,7 +78,7 @@ IsAMeasure=Là một phép do
 DirScanned=Thư mục được quét
 NoTrigger=Không trigger
 NoWidget=Không có widget
-GoToApiExplorer=Đi tới trình khám phá API
+GoToApiExplorer=API explorer
 ListOfMenusEntries=Danh sách các mục menu
 ListOfDictionariesEntries=Danh sách các mục từ điển
 ListOfPermissionsDefined=Danh sách các quyền được định nghĩa
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=Nếu bạn có kiến thức về SQL và PHP, bạn c
 SeeTopRightMenu=Xem <span class="fa fa-bug"></span> trên menu bên phải
 AddLanguageFile=Thêm tập tin ngôn ngữ
 YouCanUseTranslationKey=Bạn có thể sử dụng ở đây một khóa là khóa dịch được tìm thấy trong tệp ngôn ngữ (xem tab "Ngôn ngữ")
-DropTableIfEmpty=(Xóa bảng nếu trống)
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=Bảng %s không tồn tại
 TableDropped=Bảng %s đã bị xóa
 InitStructureFromExistingTable=Xây dựng cấu trúc mảng chuỗi của một bảng hiện có
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Sử dụng một URL biên tập cụ thể
 UseSpecificFamily = Sử dụng một họ cụ thể
 UseSpecificAuthor = Sử dụng một tác giả cụ thể
 UseSpecificVersion = Sử dụng một phiên bản mở đầu cụ thể
-ModuleMustBeEnabled=Mô-đun / ứng dụng phải được bật trước
 IncludeRefGeneration=Tham chiếu của đối tượng phải được tạo tự động
 IncludeRefGenerationHelp=Kiểm tra điều này nếu bạn muốn bao gồm mã để quản lý việc tạo tự động của tham chiếu
 IncludeDocGeneration=Tôi muốn tạo một số tài liệu từ đối tượng
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Kiểu trường: <br> varchar (99), double (24,8), real, text,
 AsciiToHtmlConverter=Chuyển mã ASCII sang HTML
 AsciiToPdfConverter=Chuyển ASCII sang PDF
 TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/vi_VN/mrp.lang b/htdocs/langs/vi_VN/mrp.lang
index 5ca0bd1ddbf..1133ac46a0b 100644
--- a/htdocs/langs/vi_VN/mrp.lang
+++ b/htdocs/langs/vi_VN/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index a5a94478621..5ad76877a81 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -5,8 +5,6 @@ Tools=Công cụ
 TMenuTools=Công cụ
 ToolsDesc=Tất cả các công cụ không bao gồm trong các mục menu khác được nhóm ở đây. <br> Tất cả các công cụ có thể được truy cập thông qua menu bên trái.
 Birthday=Sinh nhật
-BirthdayDate=Ngày sinh nhật
-DateToBirth=Ngày sinh
 BirthdayAlertOn=sinh nhật cảnh báo hoạt động
 BirthdayAlertOff=sinh nhật không hoạt động cảnh báo
 TransKey=Dịch khóa TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Tháng trước (số 1-12) ngày hóa đơn
 TextPreviousMonthOfInvoice=Tháng trước (chữ) của ngày hóa đơn
 NextMonthOfInvoice=Tháng sau (số 1-12) của ngày hóa đơn
 TextNextMonthOfInvoice=Tháng sau (chữ) của ngày hóa đơn
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Tệp zip được tạo vào <b>%s</b> .
 DocFileGeneratedInto=Tệp doc được tạo vào <b>%s</b> .
 JumpToLogin=Ngắt kết nối. Chuyển đến trang đăng nhập ...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Báo cáo chi phí được xác nhận (yêu c
 Notify_EXPENSE_REPORT_APPROVE=Báo cáo chi phí đã được phê duyệt
 Notify_HOLIDAY_VALIDATE=Yêu cầu nghỉ phép được xác nhận (yêu cầu phê duyệt)
 Notify_HOLIDAY_APPROVE=Yêu cầu nghỉ phép đã được phê duyệt
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=Xem thiết lập mô-đun %s
 NbOfAttachedFiles=Số đính kèm tập tin / tài liệu
 TotalSizeOfAttachedFiles=Tổng dung lượng của các file đính kèm / tài liệu
@@ -99,6 +100,7 @@ PredefinedMailContentSendShipping=__ (Xin chào) __ \n\nVui lòng tìm vận chu
 PredefinedMailContentSendFichInter=__ (Xin chào) __ \n\nVui lòng tìm sự can thiệp __REF__ đính kèm \n\n\n__ (Trân trọng) __ \n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Bạn có thể nhấp vào liên kết bên dưới để thực hiện thanh toán nếu chưa được thực hiện.\n\n %s\n\n
 PredefinedMailContentGeneric=__ (Xin chào) __ \n\n\n__ (Trân trọng) __ \n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr là một ERP / CRM nhỏ gọn hỗ trợ một số mô-đun kinh doanh. Một bản demo giới thiệu tất cả các mô-đun không có ý nghĩa vì kịch bản này không bao giờ xảy ra (có sẵn hàng trăm). Vì vậy, một số hồ sơ demo là có sẵn.
 ChooseYourDemoProfil=Chọn hồ sơ demo phù hợp nhất với nhu cầu của bạn ...
 ChooseYourDemoProfilMore=... hoặc xây dựng hồ sơ của riêng bạn <br> (lựa chọn mô-đun thủ công)
@@ -214,6 +216,7 @@ EMailTextExpenseReportValidated=Báo cáo chi phí %s đã được xác nhận.
 EMailTextExpenseReportApproved=Báo cáo chi phí %s đã được phê duyệt.
 EMailTextHolidayValidated=Yêu cầu nghỉ phép %s đã được xác nhận.
 EMailTextHolidayApproved=Yêu cầu nghỉ phép %s đã được phê duyệt.
+EMailTextActionAdded=The action %s has been added to the Agenda.
 ImportedWithSet=Thiết lập nhập dữ liệu
 DolibarrNotification=Thông báo tự động
 ResizeDesc=Nhập chiều rộng mới <b>HOẶC</b> chiều cao mới. Tỷ lệ sẽ được giữ trong khi thay đổi kích thước ...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Liên hệ / địa chỉ được tạo bởi tr
 ProjectCreatedByEmailCollector=Dự án được tạo bởi trình thu thập email từ email MSGID %s
 TicketCreatedByEmailCollector=Vé được tạo bởi trình thu thập email từ email MSGID %s
 OpeningHoursFormatDesc=Sử dụng một - để tách giờ mở và đóng cửa. <br> Sử dụng một khoảng trắng để nhập các phạm vi khác nhau. <br> Ví dụ: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Khu vực xuất khẩu
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index d2ec4ce1cdc..2e0982b1ff6 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Nhiều phân khúc giá cho mỗi sản phẩm/ dịch vụ (mỗi khách hàng một phân khúc giá)
 MultiPricesNumPrices=Số lượng Giá
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+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=Số lượng của gói sản phẩm gốc
@@ -167,8 +168,10 @@ BuyingPrices=Giá mua
 CustomerPrices=Giá khách hàng
 SuppliersPrices=Giá nhà cung cấp
 SuppliersPricesOfProductsOrServices=Giá nhà cung cấp (của sản phẩm hoặc dịch vụ)
-CustomCode=Hải quan / Hàng hóa / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Nước xuất xứ
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Loại sản phẩm  (nguyên liệu / thành phẩm)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Sử dụng giá cố định
 PriceByQuantity=Giá thay đổi theo số lượng
 DisablePriceByQty=Vô hiệu giá theo số lượng
 PriceByQuantityRange=Phạm vi số lượng
-MultipriceRules=Quy tắc giá thành phần
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=Sử dụng các quy tắc phân khúc giá (được định nghĩa bên trong thiết lập module sản phẩm) để tự động tính giá của tất cả phân khúc giá khác dựa theo phân khúc đầu tiên
 PercentVariationOver=%% biến đổi hơn %s
 PercentDiscountOver=%% giảm giá hơn %s
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index 66a08436bc7..0337979bc3b 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -76,15 +76,16 @@ MyActivities=Tác vụ/hoạt động của tôi
 MyProjects=Dự án của tôi
 MyProjectsArea=Khu vực dự án của tôi
 DurationEffective=Thời hạn hiệu lực
-ProgressDeclared=Tiến độ công bố
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Tiến độ công việc
 CurentlyOpenedTasks=Công việc còn mở
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=Tiến độ khai báo ít hơn %s so với tiến độ tính toán
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Tiến độ khai báo là nhiều hơn %s so với tiến độ tính toán
-ProgressCalculated=Tiến độ được tính toán
+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=cái mà tôi liên kết đến
 WhichIamLinkedToProject=cái mà tôi liên kết với dự án
 Time=Thời gian
+TimeConsumed=Consumed
 ListOfTasks=Danh sách nhiệm vụ
 GoToListOfTimeConsumed=Tới danh sách thời gian tiêu thụ
 GanttView=Chế độ xem Gantt
diff --git a/htdocs/langs/vi_VN/recruitment.lang b/htdocs/langs/vi_VN/recruitment.lang
index c0feca4d244..c62da50ed0c 100644
--- a/htdocs/langs/vi_VN/recruitment.lang
+++ b/htdocs/langs/vi_VN/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/vi_VN/sendings.lang b/htdocs/langs/vi_VN/sendings.lang
index 9bf1264e824..0311215ed2a 100644
--- a/htdocs/langs/vi_VN/sendings.lang
+++ b/htdocs/langs/vi_VN/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=Lô hàng khác về đơn hàng này
 SendingsAndReceivingForSameOrder=Lô hàng và biên nhận cho đơn đặt hàng này
 SendingsToValidate=Xác nhận lô hàng
 StatusSendingCanceled=Hủy bỏ
+StatusSendingCanceledShort=Đã hủy
 StatusSendingDraft=Dự thảo
 StatusSendingValidated=Xác nhận (sản phẩm để vận chuyển hoặc đã được vận chuyển)
 StatusSendingProcessed=Xử lý
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=Trước tiên, bạn phải xác nhận đơn
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Mô hình tài liệu đầy đủ hơn cho hóa đơn giao hàng (logo ...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER liên tục không được xác định
 SumOfProductVolumes=Tổng khối lượng sản phẩm
 SumOfProductWeights=Tổng trọng lượng sản phẩm
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index b2c7c324651..d25ecfa620a 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=Giá trị kho
 UserWarehouseAutoCreate=Tự động tạo người dùng kho khi tạo người dùng
 AllowAddLimitStockByWarehouse=Quản lý đồng thời giá trị cho tồn kho tối thiểu và mong muốn trên mỗi cặp (sản phẩm - kho) ngoài giá trị cho tồn kho tối thiểu và mong muốn trên mỗi sản phẩm
 RuleForWarehouse=Rule for warehouses
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Kho mặc định
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/vi_VN/ticket.lang b/htdocs/langs/vi_VN/ticket.lang
index ea5424e4654..572f49247ce 100644
--- a/htdocs/langs/vi_VN/ticket.lang
+++ b/htdocs/langs/vi_VN/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Vé - Các loại
 TicketDictCategory=Vé - Nhóm
 TicketDictSeverity=Vé - Mức độ nghiêm trọng
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Sự cố phần mềm
-TicketTypeShortBUGHARD=Sự cố phần cứng
-TicketTypeShortCOM=Câu hỏi thương mại
 
+TicketTypeShortCOM=Câu hỏi thương mại
 TicketTypeShortHELP=Yêu cầu trợ giúp chức năng
 TicketTypeShortISSUE=Sự cố, lỗi hoặc vấn đề
 TicketTypeShortREQUEST=Yêu cầu thay đổi hoặc nâng cao
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Khác
 TicketSeverityShortLOW=Thấp
 TicketSeverityShortNORMAL=Bình thường
 TicketSeverityShortHIGH=Cao
-TicketSeverityShortBLOCKING=Quan trọng / Chặn
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Trường '%s' không chính xác
 MenuTicketMyAssign=Vé của tôi
@@ -60,7 +58,6 @@ OriginEmail=Nguồn email
 Notify_TICKET_SENTBYMAIL=Gửi tin nhắn vé qua email
 
 # Status
-NotRead=Chưa đọc
 Read=Đọc
 Assigned=Phân công
 InProgress=Trong tiến trình xử lý
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Giao diện công cộng cho phép bất kỳ
 TicketsAutoAssignTicket=Tự động chỉ định người dùng đã tạo vé
 TicketsAutoAssignTicketHelp=Khi tạo vé, người dùng có thể được tự động chỉ định cho vé.
 TicketNumberingModules=Mô-đun đánh số vé
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=Thông báo cho bên thứ ba khi tạo
 TicketsDisableCustomerEmail=Luôn vô hiệu hóa email khi vé được tạo từ giao diện công cộng
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Trạng thái đã thay đổi: %s thành %s
 TicketNotNotifyTiersAtCreate=Không thông báo cho công ty khi tạo
 Unread=Chưa đọc
 TicketNotCreatedFromPublicInterface=Không có sẵn. Vé không được tạo từ giao diện công cộng.
-PublicInterfaceNotEnabled=Giao diện công cộng không được kích hoạt
 ErrorTicketRefRequired=Tên tham chiếu vé là bắt buộc
 
 #
diff --git a/htdocs/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang
index 5d047fe8420..5f40936142b 100644
--- a/htdocs/langs/vi_VN/website.lang
+++ b/htdocs/langs/vi_VN/website.lang
@@ -30,7 +30,6 @@ EditInLine=Chỉnh sửa nội tuyến
 AddWebsite=Thêm trang web
 Webpage=Trang web / vùng chứa
 AddPage=Thêm trang / vùng chứa
-HomePage=Trang chủ
 PageContainer=Trang
 PreviewOfSiteNotYetAvailable=Xem trước trang web của bạn <strong>%s</strong> chưa có sẵn. Trước tiên, bạn phải ' <strong>Nhập mẫu trang web đầy đủ</strong> ' hoặc chỉ ' <strong>Thêm trang / vùng chứa</strong> '.
 RequestedPageHasNoContentYet=Trang được yêu cầu có id %s chưa có nội dung hoặc tệp bộ đệm .tpl.php đã bị xóa. Chỉnh sửa nội dung của trang để giải quyết điều này.
@@ -101,7 +100,7 @@ EmptyPage=Trang trống
 ExternalURLMustStartWithHttp=URL bên ngoài phải bắt đầu bằng http:// hoặc https://
 ZipOfWebsitePackageToImport=Tải lên tệp Zip của gói mẫu trang web
 ZipOfWebsitePackageToLoad=hoặc Chọn gói mẫu trang web nhúng có sẵn
-ShowSubcontainers=Bao gồm nội dung động
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=URL nội bộ của trang
 ThisPageIsTranslationOf=Trang / vùng chứa này là bản dịch của
 ThisPageHasTranslationPages=Trang / vùng chứa này có bản dịch
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/vi_VN/withdrawals.lang b/htdocs/langs/vi_VN/withdrawals.lang
index c3e19547427..2b2c1e76554 100644
--- a/htdocs/langs/vi_VN/withdrawals.lang
+++ b/htdocs/langs/vi_VN/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=Biên nhận ghi nợ trực tiếp mới nhất %s
 MakeWithdrawRequest=Tạo một yêu cầu thanh toán ghi nợ trực tiếp
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s yêu cầu thanh toán ghi nợ trực tiếp được ghi lại
+BankTransferRequestsDone=%s credit transfer requests recorded
 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> .
 ClassCredited=Phân loại tín dụng
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Ngày thi hành
 CreateForSepa=Tạo tập tin ghi nợ trực tiếp
-ICS=Định danh chủ nợ CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END=Thẻ SEPA XML "EndToEndId" - Id duy nhất được gán cho mỗi giao dịch
 USTRD=Thẻ SEPA XML "không cấu trúc"
 ADDDAYS=Thêm ngày vào Ngày thực hiện
@@ -146,3 +148,5 @@ InfoRejectSubject=Lệnh thanh toán ghi nợ trực tiếp bị từ chối
 InfoRejectMessage=Xin chào, <br><br> lệnh thanh toán ghi nợ trực tiếp của hóa đơn %s liên quan đến công ty %s, với số tiền %s đã bị ngân hàng từ chối. <br><br> - <br> %s
 ModeWarning=Tùy chọn cho chế độ thực không được đặt, chúng tôi dừng lại sau mô phỏng này
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/vi_VN/workflow.lang b/htdocs/langs/vi_VN/workflow.lang
index 0084de738c3..5926b4e4b9b 100644
--- a/htdocs/langs/vi_VN/workflow.lang
+++ b/htdocs/langs/vi_VN/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Tạo tự động
 AutomaticClassification=Phân loại tự động
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index 9a49f373c52..5bfcb481baa 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=这项服务
 ThisProduct=这个产品
 DefaultForService=默认服务
 DefaultForProduct=默认产品
+ProductForThisThirdparty=Product for this thirdparty
+ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=无法建议
 AccountancySetupDoneFromAccountancyMenu=大多数会计设置都是从​​菜单%s完成的
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -48,6 +50,7 @@ CountriesExceptMe=除%s以外的所有国家/地区
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=未在设置中定义的顾客的主要会计科目
 MainAccountForSuppliersNotDefined=未在设置中定义的供应商的主要会计科目
@@ -144,7 +147,7 @@ NotVentilatedinAccount=未绑定到会计科目
 XLineSuccessfullyBinded=%s产品/服务绑定到会计科目
 XLineFailedToBeBinded=%s产品/服务未绑定到会计科目
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=按“最近"对“即将绑定”页面进行排序
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=按"最近"对"绑定完成"页面进行排序
 
@@ -198,7 +201,8 @@ Docdate=日期
 Docref=参考
 LabelAccount=标签帐户
 LabelOperation=标签操作
-Sens=SENS
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=刻字代码
 Lettering=Lettering
 Codejournal=日记帐
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=件数
 TransactionNumShort=Num. transaction
 AccountingCategory=会计分类
-GroupByAccountAccounting=按会计科目分组
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=您可以在此处定义一些会计科目组。它们将用于会计分类报告。
 ByAccounts=按帐户
 ByPredefinedAccountGroups=按预定义的组
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=付款未与任何产品/服务相关联
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=帐户组
 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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=请在此处查看费用会计帐户绑定（或不绑
 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=请在此查询费用报表行及其费用会计帐户清单
 
+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
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=自动绑定
 AutomaticBindingDone=自动绑定完成
@@ -293,6 +300,7 @@ Accounted=占总账
 NotYetAccounted=尚未计入分类帐
 ShowTutorial=Show Tutorial
 NotReconciled=未调解
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +345,7 @@ Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=导出CSV可配置
 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index c84a23958aa..0c6ae1ca992 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -56,6 +56,8 @@ GUISetup=主题
 SetupArea=设置
 UploadNewTemplate=上传新模板
 FormToTestFileUploadForm=文件上传功能测试
+ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
+ModuleIsEnabled=The module/application <b>%s</b> has been enabled
 IfModuleEnabled=注：“是”仅在模块 <b>%s</b> 启用时有效
 RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
 RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
@@ -85,7 +87,6 @@ ShowPreview=显示预览
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=无预览
 ThemeCurrentlyActive=当前使用的主题
-CurrentTimeZone=PHP 服务器的时区
 MySQLTimeZone=MySql 服务器的时区
 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=空间
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 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=删除系统日志模块定义的日志文件<b>%s</b>(无数据丢失风险)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=删除临时文件
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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=立即清空
 PurgeNothingToDelete=未删除目录或文件
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=首选合作伙伴
 OtherResources=其他资源
 ExternalResources=External Resources
 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>简体中文翻译可到Dolibarr爱好者交流Q群技术交流：206239089
 HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=Examples with current configuration
 ListOfDirectories=开源办公软件文档模板目录列表
 ListOfDirectoriesForModelGenODT=包含开源办公软件的格式的文档的模板目录列表。<br><br>请在此填写完整的目录路径。<br>每填写一个目录路径结尾按回车换行。<br>添加一个 GED 模块目录, 如下 <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>。<br><br>该目录中的文件格式必须是 <b>.odt</b> 格式或 <b>.ods</b>格式。
 NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=参考语法格式:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>要知道如何建立您的ODT文件范本并储存在指定目录，请至wiki网站：
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=姓 /名 位置顺序
@@ -406,7 +408,7 @@ UrlGenerationParameters=URL地址的保护参数
 SecurityTokenIsUnique=为每个URL使用唯一的securekey参数值
 EnterRefToBuildUrl=输入对象 %s 的编号
 GetSecuredUrl=获取算得的URL地址
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
 OldVATRates=以前的增值税率(VAT)
 NewVATRates=新建增值税率(VAT)
 PriceBaseTypeToChange=设置了基本参考价值的产品的价格
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=问卷, 调查或投票
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=利润空间
-Module59000Desc=利润空间管理模块
+Module59000Desc=Module to follow margins
 Module60000Name=佣金
 Module60000Desc=佣金管理模块
 Module62000Name=国际贸易术语解释通则
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=搜索优化
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ ServiceSetup=服务模块设置
 ProductServiceSetup=产品和服务模块的设置
 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
+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 the language of the third party
+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=默认的条码类型
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=个性化菜单未链接到顶部菜单条目
 NewMenu=新建菜单
 MenuHandler=菜单处理程序
 MenuModule=源模块
-HideUnauthorizedMenu= 是否隐藏未经授权的菜单 (灰色为不可用)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=菜单编号
 DetailMenuHandler=菜单处理程序 (决定何处显示新菜单)
 DetailMenuModule=模块名称 (如果菜单项来自模块)
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=邮编
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang
index 6f2afe060cc..c810652102d 100644
--- a/htdocs/langs/zh_CN/banks.lang
+++ b/htdocs/langs/zh_CN/banks.lang
@@ -173,10 +173,11 @@ SEPAMandate=SEPA授权
 YourSEPAMandate=您的SEPA授权
 FindYourSEPAMandate=这是您的SEPA授权，授权我们公司向您的银行直接扣款。返回签名（扫描签名文档）或通过邮件发送给
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/zh_CN/blockedlog.lang b/htdocs/langs/zh_CN/blockedlog.lang
index ce7718f76c4..37ec67f2a06 100644
--- a/htdocs/langs/zh_CN/blockedlog.lang
+++ b/htdocs/langs/zh_CN/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/zh_CN/boxes.lang b/htdocs/langs/zh_CN/boxes.lang
index 99c36d31a7c..6ff10e54c76 100644
--- a/htdocs/langs/zh_CN/boxes.lang
+++ b/htdocs/langs/zh_CN/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=最近变更的 %s 份捐款
 BoxTitleLastModifiedExpenses=最近变更的 %s 份费用报表
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
 BoxGlobalActivity=全局活动(账单,报价,订单)
 BoxGoodCustomers=优质客户
 BoxTitleGoodCustomers=%s 优质客户
+BoxScheduledJobs=计划任务
+BoxTitleFunnelOfProspection=Lead funnel
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=最后刷新日期
 NoRecordedBookmarks=未设置任何书签。
@@ -92,8 +95,8 @@ LastXMonthRolling=最后 %s 月波动
 ChooseBoxToAdd=点击下拉菜单选择相应视图并添加到你的看板
 BoxAdded=插件已添加到仪表板中
 BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=会计
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/zh_CN/cashdesk.lang b/htdocs/langs/zh_CN/cashdesk.lang
index 4ddbad3d082..bcaf0780474 100644
--- a/htdocs/langs/zh_CN/cashdesk.lang
+++ b/htdocs/langs/zh_CN/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+CashFence=Cash desk closing
+CashFenceDone=Cash desk closing done for the period
 NbOfInvoices=发票数
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/zh_CN/categories.lang b/htdocs/langs/zh_CN/categories.lang
index dbd3530d85b..355be943e79 100644
--- a/htdocs/langs/zh_CN/categories.lang
+++ b/htdocs/langs/zh_CN/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=项目标签/分类区
 UsersCategoriesArea=Users tags/categories area
 SubCats=子类别
 CatList=标签/分类列表
+CatListAll=List of tags/categories (all types)
 NewCategory=新建标签/分类
 ModifCat=变更标签/分类
 CatCreated=标签/分类已创建
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=标签/分类id号码
-CatSupList=List of vendor tags/categories
-CatCusList=客户/准客户标签/分类列表
+ParentCategory=Parent tag/category
+ParentCategoryLabel=Label of parent tag/category
+CatSupList=List of vendors tags/categories
+CatCusList=List of customers/prospects tags/categories
 CatProdList=产品标签/分类列表
 CatMemberList=会员标签/分类列表
-CatContactList=联系人标签/分类列表
-CatSupLinks=链接供应商与标签/分类
+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=链接客户/准客户与标签/分类
 CatContactsLinks=Links between contacts/addresses and tags/categories
 CatProdLinks=链接产品/服务与标签/分类
-CatProJectLinks=链接项目与标签/分类
+CatMembersLinks=Links between members and tags/categories
+CatProjectsLinks=链接项目与标签/分类
+CatUsersLinks=Links between users and tags/categories
 DeleteFromCat=从标签/分类移除
 ExtraFieldsCategories=自定义属性
 CategoriesSetup=标签/分类设置
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index d2a0362c3fa..8f852619ac3 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=检查不可能的。检查服务是没有提供的会员国（%s）中。
 NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=雇员
 ProspectLevelShort=潜力
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index 6372c1186e3..4ae180df234 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -111,7 +111,7 @@ Refund=退
 SocialContributionsPayments=社会/财政税款
 ShowVatPayment=显示增值税纳税
 TotalToPay=共支付
-BalanceVisibilityDependsOnSortAndFilters=仅当表格在%s上按升序排序并过滤为1个银行帐户时，才会在此列表中显示余额
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=客户科目代码
 SupplierAccountancyCode=Vendor accounting code
 CustomerAccountancyCodeShort=客户账户代码
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=你确定要删除这个社会/财政税款吗
 ExportDataset_tax_1=社会和财政税和付款
 CalcModeVATDebt=模式 <b>%sVAT 关于承诺债务%s</b>.
 CalcModeVATEngagement=模式 <b>%s 增值税收入，支出 %s</b>.
-CalcModeDebt=分析已知的已记录发票，即使它们尚未计入分类帐。
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=分析已知的记录付款，即使它们尚未计入分类帐。
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= 模式 <b>%sRE 客户发票 - 供应商发票%s</b>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=年度总结的收支平衡表
 AnnualByCompanies=按预定义的帐户组划分的收入和支出余额
 AnnualByCompaniesDueDebtMode=收支平衡，详细按合作方，模式<b>%sClaims-Debts%s</b>，据说<b>承诺债务</b>。
 AnnualByCompaniesInputOutputMode=收支平衡，详细按合作方，模式<b>%sIncomes-Expenses%s</b>，据说<b>现金会计</b>。
-SeeReportInInputOutputMode=有关实际付款的计算，请参阅%s of payments%s，即使它们尚未在Ledger中计算。
-SeeReportInDueDebtMode=请参阅%s对invoices%s的分析，以便根据已知的记录发票进行计算，即使它们尚未计入分类帐。
-SeeReportInBookkeepingMode=有关<b>簿记分类帐表</b>的计算，请参阅<b> %sBookeeping report%s </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=- 所示金额均含税
 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>  - 它基于发票，费用，增值税和工资的付款日期。捐赠的捐赠日期。
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=它在您的分类帐中显示记录，其中
 SeePageForSetup=请参阅菜单<a href="%s"> %s </a>进行设置
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- 包括预付款发票
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=由合作方报告税2
 LT2ReportByCustomers=由合作方报告税3
 LT1ReportByCustomersES=按合作方 RE 报表
 LT2ReportByCustomersES=按合作方IRPF的报表
 VATReport=销售税报告
 VATReportByPeriods=按期间的销售税报告
+VATReportByMonth=Sale tax report by month
 VATReportByRates=销售税报告按费率计算
 VATReportByThirdParties=第三方销售税报告
 VATReportByCustomers=客户销售税报告
diff --git a/htdocs/langs/zh_CN/cron.lang b/htdocs/langs/zh_CN/cron.lang
index b0b151ccf45..63b93692f0e 100644
--- a/htdocs/langs/zh_CN/cron.lang
+++ b/htdocs/langs/zh_CN/cron.lang
@@ -6,28 +6,29 @@ Permission23102 = 创建/更新计划任务
 Permission23103 = 删除计划任务
 Permission23104 = 执行计划任务
 # Admin
-CronSetup= 计划任务管理设置
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=或者检查并启动一个特别计划任务
+CronSetup=计划任务管理设置
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
+OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
 KeyForCronAccess=启动计划任务的URL网址的安全密钥
-FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+FileToLaunchCronJobs=用于检查和启动合格的cron作业的命令行
 CronExplainHowToRunUnix=在Unix环境你可以在命令行下每5分钟执行以下计划任务
-CronExplainHowToRunWin=在微软(tm)Windows操作系统环境下你可以使用控制面板中的计划任务工具每5分钟运行
+CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class类 %s 没有包含任何方法 %s
-CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
-CronJobProfiles=List of predefined cron job profiles
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
+CronJobDefDesc=Cron作业配置文件定义在模块描述符文件中。激活模块后，它们将被加载并可用，因此您可以从管理工具菜单%s管理作业。
+CronJobProfiles=预定义的cron作业配置文件列表
 # Menu
 EnabledAndDisabled=启用和禁用
 # Page list
-CronLastOutput=Latest run output
-CronLastResult=Latest result code
+CronLastOutput=最新的运行输出
+CronLastResult=最新结果代码
 CronCommand=命令
 CronList=计划任务
 CronDelete=删除计划任务
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
+CronConfirmDelete=您确定要删除这些预定作业吗？
 CronExecute=安排计划工作
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
+CronConfirmExecute=您确定要立即执行这些预定作业吗？
+CronInfo=计划作业模块允许计划作业以自动执行它们。也可以手动启动作业。
 CronTask=工作
 CronNone=无
 CronDtStart=之前
@@ -42,10 +43,11 @@ CronModule=模块
 CronNoJobs=没有工作注册
 CronPriority=优先级
 CronLabel=标签
-CronNbRun=运行编号
-CronMaxRun=Max number launch
+CronNbRun=Number of launches
+CronMaxRun=Maximum number of launches
 CronEach=每
 JobFinished=工作启动和完成
+Scheduled=Scheduled
 #Page card
 CronAdd= 添加工作
 CronEvery=执行每个工作
@@ -55,29 +57,35 @@ CronSaveSucess=保存成功
 CronNote=说明
 CronFieldMandatory=栏位 %s 为必填
 CronErrEndDateStartDt=结束日期不能早过开始日期啊，时光不能倒流呀魂淡
-StatusAtInstall=Status at module installation
-CronStatusActiveBtn=生效
+StatusAtInstall=模块安装时的状态
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=禁用
 CronTaskInactive=这个工作已失效
 CronId=Id
-CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronClassFile=带有类的文件名
+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=系统命令行执行。
 CronCreateJob=创建新的计划任务
 CronFrom=From
 # Info
 # Common
 CronType=工作类型
-CronType_method=Call method of a PHP Class
+CronType_method=调用PHP类的方法
 CronType_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=请到菜单 "主页 - 管理员工具 - 计划任务" 查看和修改计划任务。
+CronCannotLoadClass=无法加载类文件%s（使用类%s）
+CronCannotLoadObject=已加载类文件%s，但未找到对象%s
+UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
 JobDisabled=岗位无效
 MakeLocalDatabaseDumpShort=本地数据库备份
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+MakeLocalDatabaseDump=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=注意，出于性能目的，无论启用作业的下一个执行日期是什么，您的作业可能会在运行之前延迟到最大值%s小时。
+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/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index 33ed9cea573..a7705c06513 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=没有错误，我们承诺
 # Errors
 ErrorButCommitIsDone=发现错误我们将进行验证
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=网址 %s 有误
 ErrorBadValueForParamNotAString=参数值不正确。它通常在缺少翻译时附加。
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=登陆%s已经存在。
 ErrorGroupAlreadyExists=组%s已经存在。
 ErrorRecordNotFound=记录没有找到。
@@ -48,6 +50,7 @@ ErrorFieldsRequired=一些必要的栏位都没有填补。
 ErrorSubjectIsRequired=电子邮件主题是必需的
 ErrorFailedToCreateDir=无法创建一个目录。检查Web服务器的用户有权限写入Dolibarr文件目录。如果参数<b>safe_mode设置</b>为启用这个PHP，检查Dolibarr php文件到Web服务器的用户拥有（或组）。
 ErrorNoMailDefinedForThisUser=没有邮件定义该用户
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=此功能需要Javascript被激活才能工作。更改此设置 - 显示。
 ErrorTopMenuMustHaveAParentWithId0=一个类型'顶'不能有一个父菜单中的菜单。放在父菜单0或选择一个类型为'左'菜单。
 ErrorLeftMenuMustHaveAParentId=一个类型为'左'必须有一个父菜单的ID。
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=导出设定配置名称已存在
 ErrorLDAPSetupNotComplete=Dolibarr - LDAP的匹配是不完整的。
 ErrorLDAPMakeManualTest=甲。LDIF文件已经生成在目录%s的尝试加载命令行手动有更多的错误信息。
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=号的创作已经存在。
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=请输入必须报告条目的银行对账单名称（格式YYYYMM或YYYYMMDD）
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=对象至少有一个类型为%s的子项
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=您必须选择文章是否为预
 ErrorDiscountLargerThanRemainToPaySplitItBefore=您尝试申请的折扣大于剩余支付。之前将折扣分为2个较小的折扣。
 ErrorFileNotFoundWithSharedLink=找不到档案。可能是修改了共享密钥或最近删除了文件。
 ErrorProductBarCodeAlreadyExists=产品条形码%s已存在于其他产品参考中。
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=还要注意，当至少一个子产品（或子产品的子产品）需要序列号/批号时，使用虚拟产品来自动增加/减少子产品是不可能的。
+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=对于包含免费产品的行，必须说明
 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.
@@ -243,6 +246,16 @@ 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
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=为此成员设置了密码。但是，未创建任何用户帐户。因此，此密码已存储，但无法用于登录Dolibarr。它可以由外部模块/接口使用，但如果您不需要为成员定义任何登录名或密码，则可以从成员模块设置中禁用“管理每个成员的登录名”选项。如果您需要管理登录但不需要任何密码，则可以将此字段保留为空以避免此警告。注意：如果成员链接到用户，则电子邮件也可用作登录。
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=您的登录已被修改。出于安全
 WarningAnEntryAlreadyExistForTransKey=此语言的翻译密钥已存在条目
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=警告，行日期不在费用报表范围内
+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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/zh_CN/exports.lang b/htdocs/langs/zh_CN/exports.lang
index 2117c02d285..11cfd2fcb7e 100644
--- a/htdocs/langs/zh_CN/exports.lang
+++ b/htdocs/langs/zh_CN/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=字段标题
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
 LibraryShort=资料库
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 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.
@@ -131,3 +133,4 @@ KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
 NbInsert=插入行数：%s
 NbUpdate=更新行数：%s
 MultipleRecordFoundWithTheseFilters=使用这些过滤器找到了多条记录：%s
+StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
diff --git a/htdocs/langs/zh_CN/mails.lang b/htdocs/langs/zh_CN/mails.lang
index c6a2af28558..948f4d6d845 100644
--- a/htdocs/langs/zh_CN/mails.lang
+++ b/htdocs/langs/zh_CN/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=用户输入的电子邮件
 MailingModuleDescDolibarrUsers=用户使用电子邮件
 MailingModuleDescThirdPartiesByCategories=第三方（按类别）
 SendingFromWebInterfaceIsNotAllowed=不允许从Web界面发送。
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=在文件%s的线
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=没有发送电子邮件发件人或收件人电子邮件错验证用户配置文件
 # Module Notifications
 Notifications=通知
-NoNotificationsWillBeSent=没有电子邮件通知此事件的计划和公司
-ANotificationsWillBeSent=1通知将通过电子邮件发送
-SomeNotificationsWillBeSent=%s的通知将通过电子邮件发送
-AddNewNotification=激活新的电子邮件通知目标/事件
-ListOfActiveNotifications=列出电子邮件通知的所有活动目标/事件
-ListOfNotificationsDone=列出所有发送电子邮件通知
+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 all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Email电子邮箱配置设定 '%s'. 这个模式无法用于邮件群发。
 MailSendSetupIs2=首先您得这么地, 得先有个管理员账号吧 admin , 进入菜单 %s主页 - 设置 - EMails%s 修改参数 <strong>'%s'</strong> 用 '%s'模式。 在此模式下， 您才可输入一个 SMTP 服务器地址 来供您收发邮件。
 MailSendSetupIs3=如果你对 SMTP 服务器的配置方面有疑问, 你可到这里询问 %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=导入的文件必须具有格式<strong>电子邮件
 UseFormatInputEmailToTarget=输入格式为<strong>电子邮件;名称;名字;其他</strong>的字符串
 MailAdvTargetRecipients=收件人（高级选择）
 AdvTgtTitle=填写输入字段以预先选择要定位的第三方或联系人/地址
-AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
+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=使用interval选择int或float值
 AdvTgtMinVal=最小值
 AdvTgtMaxVal=最大值
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=创建筛选
 AdvTgtOrCreateNewFilter=新筛选器的名称
 NoContactWithCategoryFound=分类没有联系人/地址
 NoContactLinkedToThirdpartieWithCategoryFound=分类没有联系人/地址
-OutGoingEmailSetup=发件服务器设置
-InGoingEmailSetup=传入电子邮件设置
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=默认外发电子邮件设置
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=信息
 ContactsWithThirdpartyFilter=Contacts with third-party filter
 Unanswered=Unanswered
 Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index ba5ab7c1706..23a6b0f6baa 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=此电子邮件类型没有可用的模板
 AvailableVariables=可用的替代变量
 NoTranslation=没有翻译
 Translation=翻译
+CurrentTimeZone=PHP 服务器的时区
 EmptySearchString=Enter non empty search criterias
+EnterADateCriteria=Enter a date criteria
 NoRecordFound=空空如也——没有找到记录
 NoRecordDeleted=未删除记录
 NotEnoughDataYet=数据不足
@@ -85,6 +87,8 @@ FileWasNotUploaded=一个文件被选中的附件，但还没有上传。点击
 NbOfEntries=No. of entries
 GoToWikiHelpPage=阅读在线帮助文档 (需要访问外网)
 GoToHelpPage=阅读帮助
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=Home Page
 RecordSaved=记录已保存
 RecordDeleted=记录已删除
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=值
 PersonalValue=自定义
 NewObject=新%s
 NewValue=新值
+OldValue=Old value %s
 CurrentValue=当前值
 Code=编码
 Type=类型
@@ -433,6 +438,7 @@ RemainToPay=继续付钱
 Module=模块/应用程序
 Modules=模块/应用
 Option=选项
+Filters=Filters
 List=列表
 FullList=全部列表
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ SupplierPreview=供应商预览
 ShowCustomerPreview=显示顾客预览
 ShowSupplierPreview=显示供应商预览
 RefCustomer=顾客编号
+InternalRef=Internal ref.
 Currency=货币
 InfoAdmin=管理员信息
 Undo=复原
@@ -671,7 +678,7 @@ SendMail=发送电子邮件
 Email=电子邮件
 NoEMail=没有电子邮件
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=没有手机号码
 Owner=拥有者
 FollowingConstantsWillBeSubstituted=以下常量将与相应的值代替。
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/zh_CN/modulebuilder.lang b/htdocs/langs/zh_CN/modulebuilder.lang
index 5c6573c3299..520c9966786 100644
--- a/htdocs/langs/zh_CN/modulebuilder.lang
+++ b/htdocs/langs/zh_CN/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=用于创建/编辑/查看记录的PHP页面
 PageForAgendaTab=事件选项卡的PHP页面
 PageForDocumentTab=文档选项卡的PHP页面
 PageForNoteTab=注释选项卡的PHP页面
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=zip /模块/应用程序包的路径
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=不允许使用空格或特殊字符。
@@ -77,7 +78,7 @@ IsAMeasure=是衡量标准
 DirScanned=扫描目录
 NoTrigger=没有触发器
 NoWidget=无插件
-GoToApiExplorer=转到API资源管理器
+GoToApiExplorer=API explorer
 ListOfMenusEntries=菜单条目列表
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=已定义权限的列表
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 SeeTopRightMenu=请参阅右上方菜单中的<span class="fa fa-bug"></span>
 AddLanguageFile=添加语言文件
 YouCanUseTranslationKey=你可以在这里使用一个密钥，它是在语言文件中找到的翻译密钥（参见“语言”选项卡）
-DropTableIfEmpty=（删除表格如果为空）
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=表%s不存在
 TableDropped=表%s已删除
 InitStructureFromExistingTable=构建现有表的结构数组字符串
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/zh_CN/mrp.lang b/htdocs/langs/zh_CN/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/zh_CN/mrp.lang
+++ b/htdocs/langs/zh_CN/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index 4671a563cb1..8a671ff8156 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -5,8 +5,6 @@ Tools=工具
 TMenuTools=工具
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=生日
-BirthdayDate=生日
-DateToBirth=Birth date
 BirthdayAlertOn=生日提醒活跃
 BirthdayAlertOff=生日提醒无效
 TransKey=关键TransKey的翻译
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=发票日期的上个月（编号1-12）
 TextPreviousMonthOfInvoice=发票日期的上个月（文本）
 NextMonthOfInvoice=发票日期的下个月（编号1-12）
 TextNextMonthOfInvoice=发票日期的月份（文本）
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip文件生成<b> %s </b>。
 DocFileGeneratedInto=Doc文件生成<b> %s </b>。
 JumpToLogin=断开。转到登录页面...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+Notify_ACTION_CREATE=Added action to Agenda
 SeeModuleSetup=参见模块设置 %s
 NbOfAttachedFiles=所附文件数/文件
 TotalSizeOfAttachedFiles=所附文件/文档的总大小
@@ -99,6 +100,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=如果尚未完成，您可以点击下面的链接进行付款。\n\n%s\n\n
 PredefinedMailContentGeneric=__（你好）__\n\n\n__（此致）__\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是一款具有几百种业务模块支撑的紧凑型ERP / CRM系统。如若所有的业务模块统统向您展示演示我们认为这么做没有任何意义，假如真发生了这样的情况：这几百个业务贵公司统统都涉足到了那么请您直接包养我们吧，土豪请直接 (加我们中国社区QQ群206239089)赞助我们吧，让Dolibarr在中国推得更广走得更远！以下您有几个选择。
 ChooseYourDemoProfil=请选择最贴近贵企业需求的演示…
 ChooseYourDemoProfilMore=...自定义配置<br>（手动选择模块）
@@ -137,7 +139,7 @@ Right=右键
 CalculatedWeight=计算重量
 CalculatedVolume=计算量
 Weight=重量
-WeightUnitton=吨
+WeightUnitton=ton
 WeightUnitkg=公斤
 WeightUnitg=克
 WeightUnitmg=毫克
@@ -214,6 +216,7 @@ 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=输入数据集
 DolibarrNotification=自动通知
 ResizeDesc=输入新的高度新的宽度<b>或</b> 。比率将维持在调整大小...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=导出区
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index e9ad7c64214..71ff5981d18 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=价格个数
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Activate kits (virtual products)
+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=父级包装产品的数量
@@ -167,8 +168,10 @@ BuyingPrices=买价
 CustomerPrices=客户价格
 SuppliersPrices=供应商价格
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=海关/商品/ HS编码
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=产地国
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=使用固定价格
 PriceByQuantity=不同数量价格
 DisablePriceByQty=按数量禁用价格
 PriceByQuantityRange=定量范围
-MultipriceRules=市场价格规则
+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=%% 变化 %s
 PercentDiscountOver=%%折扣超过%s
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index 748dc5a455e..29454990c0b 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -76,15 +76,16 @@ MyActivities=我的任务/活动
 MyProjects=我的项目
 MyProjectsArea=我的项目区
 DurationEffective=有效时间
-ProgressDeclared=进度
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=计算进展
+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=时间
+TimeConsumed=Consumed
 ListOfTasks=任务列表
 GoToListOfTimeConsumed=转到消耗的时间列表
 GanttView=甘特视图
diff --git a/htdocs/langs/zh_CN/recruitment.lang b/htdocs/langs/zh_CN/recruitment.lang
index 1fd9b48e629..02e8dce6590 100644
--- a/htdocs/langs/zh_CN/recruitment.lang
+++ b/htdocs/langs/zh_CN/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/zh_CN/sendings.lang b/htdocs/langs/zh_CN/sendings.lang
index 265e417e1ae..3abc9d1f869 100644
--- a/htdocs/langs/zh_CN/sendings.lang
+++ b/htdocs/langs/zh_CN/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=这个订单的其他运输
 SendingsAndReceivingForSameOrder=此订单的发货和收货
 SendingsToValidate=运输验证
 StatusSendingCanceled=取消
+StatusSendingCanceledShort=已取消
 StatusSendingDraft=草稿
 StatusSendingValidated=验证（产品出货或已经出货）
 StatusSendingProcessed=加工
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=您必须先验证订单才能发货。
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=更多的送货单(logo. ..完整的文档模板)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=没有定义的常数EXPEDITION_ADDON_NUMBER
 SumOfProductVolumes=产品总数
 SumOfProductWeights=产品总重
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index 2a32f22f414..8f79f6ef131 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=仓库价值
 UserWarehouseAutoCreate=创建用户时自动创建用户仓库
 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/zh_CN/ticket.lang b/htdocs/langs/zh_CN/ticket.lang
index 2d2ab96304e..4cd03733e48 100644
--- a/htdocs/langs/zh_CN/ticket.lang
+++ b/htdocs/langs/zh_CN/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=软件故障
-TicketTypeShortBUGHARD=硬件故障
-TicketTypeShortCOM=商业问题
 
+TicketTypeShortCOM=商业问题
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=其他
 TicketSeverityShortLOW=低
 TicketSeverityShortNORMAL=正常
 TicketSeverityShortHIGH=高
-TicketSeverityShortBLOCKING=临界/阻塞
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=字段'%s'不正确
 MenuTicketMyAssign=我的票据
@@ -60,7 +58,6 @@ OriginEmail=电邮来源
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=没看过
 Read=阅读
 Assigned=分配
 InProgress=进行中
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=公共接口允许任何访问者创建票证
 TicketsAutoAssignTicket=自动分配创建故障单的用户
 TicketsAutoAssignTicketHelp=创建故障单时，可以自动将用户分配给故障单。
 TicketNumberingModules=票据编号模块
+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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=不在创建时通知公司
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/zh_CN/website.lang b/htdocs/langs/zh_CN/website.lang
index 847c0ea30c2..2b160b7e674 100644
--- a/htdocs/langs/zh_CN/website.lang
+++ b/htdocs/langs/zh_CN/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=添加网站
 Webpage=网页/容器
 AddPage=添加页面/容器
-HomePage=主页
 PageContainer=页面
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=ID为%s的请求页面尚无内容，或者删除了缓存文件.tpl.php。编辑页面内容以解决此问题。
@@ -101,7 +100,7 @@ EmptyPage=空页面
 ExternalURLMustStartWithHttp=外部URL必须以http：//或https：//开头
 ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
 ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/zh_CN/withdrawals.lang b/htdocs/langs/zh_CN/withdrawals.lang
index 952c2388f85..c21b3b1f702 100644
--- a/htdocs/langs/zh_CN/withdrawals.lang
+++ b/htdocs/langs/zh_CN/withdrawals.lang
@@ -42,6 +42,7 @@ LastWithdrawalReceipt=最新的%s直接借记收据
 MakeWithdrawRequest=直接付款请求
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s记录了直接付款请求
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 ClassCredited=分类记
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=执行日期
 CreateForSepa=创建直接付款文件
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ InfoRejectSubject=直接付款订单被拒绝
 InfoRejectMessage=您好，<br> <br>与公司%s相关的发票%s的直接借记支付订单，金额已被%s拒绝了。<br> <br> <br> <br> %s
 ModeWarning=实模式下的选项没有设置，这个模拟后，我们停止
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/zh_CN/workflow.lang b/htdocs/langs/zh_CN/workflow.lang
index 34d49860135..d327a5e148d 100644
--- a/htdocs/langs/zh_CN/workflow.lang
+++ b/htdocs/langs/zh_CN/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=自动创建
 AutomaticClassification=自动分类
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/langs/zh_HK/accountancy.lang b/htdocs/langs/zh_HK/accountancy.lang
index 3211a0b62df..9e084932477 100644
--- a/htdocs/langs/zh_HK/accountancy.lang
+++ b/htdocs/langs/zh_HK/accountancy.lang
@@ -16,6 +16,8 @@ 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)
@@ -48,6 +50,7 @@ CountriesExceptMe=All countries except %s
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+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
@@ -144,7 +147,7 @@ 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=Number of elements to bind shown by page (maximum recommended: 50)
+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
 
@@ -198,7 +201,8 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=Sens
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=Journal
@@ -206,7 +210,8 @@ JournalLabel=Journal label
 NumPiece=Piece number
 TransactionNumShort=Num. transaction
 AccountingCategory=Personalized groups
-GroupByAccountAccounting=Group by accounting account
+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
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+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.
@@ -271,11 +276,13 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
+Closure=Annual closure
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=Validate movements
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
 
 ValidateHistory=Bind Automatically
 AutomaticBindingDone=Automatic binding done
@@ -293,6 +300,7 @@ Accounted=Accounted in ledger
 NotYetAccounted=Not yet accounted in ledger
 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
@@ -337,6 +345,7 @@ 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 Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/zh_HK/admin.lang b/htdocs/langs/zh_HK/admin.lang
index f1c41a3b62b..f9a6468d94a 100644
--- a/htdocs/langs/zh_HK/admin.lang
+++ b/htdocs/langs/zh_HK/admin.lang
@@ -56,6 +56,8 @@ 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.
@@ -85,7 +87,6 @@ ShowPreview=Show preview
 ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Space
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=This area provides administration functions. Use the menu to
 Purge=Purge
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). 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
 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.
@@ -256,6 +257,7 @@ 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.
@@ -375,7 +377,7 @@ 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:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+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
@@ -406,7 +408,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
+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
@@ -668,7 +670,7 @@ Module54000Desc=Direct print (without opening the documents) using Cups IPP inte
 Module55000Name=Poll, Survey or Vote
 Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
 Module59000Name=Margins
-Module59000Desc=Module to manage margins
+Module59000Desc=Module to follow margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
 Module62000Name=Incoterms
@@ -1306,7 +1308,7 @@ 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.
 SearchOptim=Search optimization
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
 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.
@@ -1596,8 +1598,13 @@ 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
+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 the language of the third party
+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
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
+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
@@ -1983,11 +1990,12 @@ 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 latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
+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 ?
@@ -2005,7 +2013,7 @@ WithDolTrackingID=Message from a conversation initiated by a first email sent fr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/zh_HK/banks.lang b/htdocs/langs/zh_HK/banks.lang
index 9500a5b8b2e..81a23238550 100644
--- a/htdocs/langs/zh_HK/banks.lang
+++ b/htdocs/langs/zh_HK/banks.lang
@@ -173,10 +173,11 @@ 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 fence
-NewCashFence=New cash fence
+CashControl=POS cash desk control
+NewCashFence=New cash desk 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
diff --git a/htdocs/langs/zh_HK/blockedlog.lang b/htdocs/langs/zh_HK/blockedlog.lang
index 5afae6e9e53..0bba5605d0f 100644
--- a/htdocs/langs/zh_HK/blockedlog.lang
+++ b/htdocs/langs/zh_HK/blockedlog.lang
@@ -35,7 +35,7 @@ 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 fence recording
+logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
diff --git a/htdocs/langs/zh_HK/boxes.lang b/htdocs/langs/zh_HK/boxes.lang
index d6fd298a3a7..9a751483fb1 100644
--- a/htdocs/langs/zh_HK/boxes.lang
+++ b/htdocs/langs/zh_HK/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+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.
@@ -92,8 +95,8 @@ 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=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
+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
@@ -102,5 +105,7 @@ 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
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/zh_HK/cashdesk.lang b/htdocs/langs/zh_HK/cashdesk.lang
index 498baa82200..3fef645d99d 100644
--- a/htdocs/langs/zh_HK/cashdesk.lang
+++ b/htdocs/langs/zh_HK/cashdesk.lang
@@ -49,8 +49,8 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
+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
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -122,3 +123,4 @@ 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
diff --git a/htdocs/langs/zh_HK/categories.lang b/htdocs/langs/zh_HK/categories.lang
index ba37a43b4ec..4ddf0d6093f 100644
--- a/htdocs/langs/zh_HK/categories.lang
+++ b/htdocs/langs/zh_HK/categories.lang
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=Projects tags/categories area
 UsersCategoriesArea=Users 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
@@ -65,16 +66,22 @@ UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
-CatSupList=List of vendor tags/categories
-CatCusList=List of customer/prospect tags/categories
+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 contact tags/categories
-CatSupLinks=Links between suppliers and 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
-CatProJectLinks=Links between projects 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
diff --git a/htdocs/langs/zh_HK/companies.lang b/htdocs/langs/zh_HK/companies.lang
index dadff6a7894..8dc815b522e 100644
--- a/htdocs/langs/zh_HK/companies.lang
+++ b/htdocs/langs/zh_HK/companies.lang
@@ -358,7 +358,7 @@ VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commi
 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=Legal Entity Type
+JuridicalStatus=Business entity type
 Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
diff --git a/htdocs/langs/zh_HK/compta.lang b/htdocs/langs/zh_HK/compta.lang
index 8f4f058bb87..1afeb6e3727 100644
--- a/htdocs/langs/zh_HK/compta.lang
+++ b/htdocs/langs/zh_HK/compta.lang
@@ -111,7 +111,7 @@ 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 ascending on %s and filtered for 1 bank account
+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
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fisc
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
+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>
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
 AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
+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.
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/zh_HK/cron.lang b/htdocs/langs/zh_HK/cron.lang
index 1de1251831a..2ebdda1e685 100644
--- a/htdocs/langs/zh_HK/cron.lang
+++ b/htdocs/langs/zh_HK/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
-OrToLaunchASpecificJob=Or to check and launch a specific job
+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
@@ -46,6 +47,7 @@ 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
@@ -56,7 +58,7 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
@@ -82,3 +84,8 @@ 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/zh_HK/errors.lang b/htdocs/langs/zh_HK/errors.lang
index 893f4a35b65..5b26be724d9 100644
--- a/htdocs/langs/zh_HK/errors.lang
+++ b/htdocs/langs/zh_HK/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=No error, we commit
 # Errors
 ErrorButCommitIsDone=Errors found but we validate despite this
 ErrorBadEMail=Email %s is wrong
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=Url %s is wrong
 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.
 ErrorRecordNotFound=Record not found.
@@ -48,6 +50,7 @@ ErrorFieldsRequired=Some required fields were not filled.
 ErrorSubjectIsRequired=The email topic 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.
@@ -75,7 +78,7 @@ 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=Ref used for creation already exists.
+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 has at least one child of type %s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -243,6 +246,16 @@ 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
+
 # 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.
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 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=Warnin, failed to add file entry into ECM database index table
+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.
diff --git a/htdocs/langs/zh_HK/exports.lang b/htdocs/langs/zh_HK/exports.lang
index 3549e3f8b23..a0eb7161ef2 100644
--- a/htdocs/langs/zh_HK/exports.lang
+++ b/htdocs/langs/zh_HK/exports.lang
@@ -133,3 +133,4 @@ 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/zh_HK/mails.lang b/htdocs/langs/zh_HK/mails.lang
index 1235eef3b27..2d02c5ddcf9 100644
--- a/htdocs/langs/zh_HK/mails.lang
+++ b/htdocs/langs/zh_HK/mails.lang
@@ -92,6 +92,7 @@ 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
@@ -125,12 +126,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;fir
 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
+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
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+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 contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/zh_HK/main.lang b/htdocs/langs/zh_HK/main.lang
index 96c68cdcfa3..f8ba6f4073c 100644
--- a/htdocs/langs/zh_HK/main.lang
+++ b/htdocs/langs/zh_HK/main.lang
@@ -28,7 +28,9 @@ 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
@@ -85,6 +87,8 @@ 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
+HomePage=Home Page
 RecordSaved=Record saved
 RecordDeleted=Record deleted
 RecordGenerated=Record generated
@@ -220,6 +224,7 @@ Value=Value
 PersonalValue=Personal value
 NewObject=New %s
 NewValue=New value
+OldValue=Old value %s
 CurrentValue=Current value
 Code=Code
 Type=Type
@@ -433,6 +438,7 @@ RemainToPay=Remain to pay
 Module=Module/Application
 Modules=Modules/Applications
 Option=Option
+Filters=Filters
 List=List
 FullList=Full list
 FullConversation=Full conversation
@@ -650,6 +656,7 @@ 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
@@ -671,7 +678,7 @@ SendMail=Send email
 Email=Email
 NoEMail=No email
 AlreadyRead=Already read
-NotRead=Not read
+NotRead=Unread
 NoMobilePhone=No mobile phone
 Owner=Owner
 FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
@@ -1107,3 +1114,9 @@ UpToDate=Up-to-date
 OutOfDate=Out-of-date
 EventReminder=Event Reminder
 UpdateForAllLines=Update for all lines
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/zh_HK/modulebuilder.lang b/htdocs/langs/zh_HK/modulebuilder.lang
index 460aef8103b..845dd12624d 100644
--- a/htdocs/langs/zh_HK/modulebuilder.lang
+++ b/htdocs/langs/zh_HK/modulebuilder.lang
@@ -40,6 +40,7 @@ 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.
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
@@ -105,7 +106,7 @@ TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the n
 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=(Delete table if empty)
+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
@@ -126,7 +127,6 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
 IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 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.
diff --git a/htdocs/langs/zh_HK/mrp.lang b/htdocs/langs/zh_HK/mrp.lang
index f018be890cc..ec999a473a4 100644
--- a/htdocs/langs/zh_HK/mrp.lang
+++ b/htdocs/langs/zh_HK/mrp.lang
@@ -78,3 +78,27 @@ 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
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/zh_HK/other.lang b/htdocs/langs/zh_HK/other.lang
index 54c0572d453..7a895bb1ca5 100644
--- a/htdocs/langs/zh_HK/other.lang
+++ b/htdocs/langs/zh_HK/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
+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
@@ -99,6 +100,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=__(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)
@@ -137,7 +139,7 @@ Right=Right
 CalculatedWeight=Calculated weight
 CalculatedVolume=Calculated volume
 Weight=Weight
-WeightUnitton=tonne
+WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ 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...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+PrefixSession=Prefix for session ID
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/zh_HK/products.lang b/htdocs/langs/zh_HK/products.lang
index 97db059594f..9ecc11ed93d 100644
--- a/htdocs/langs/zh_HK/products.lang
+++ b/htdocs/langs/zh_HK/products.lang
@@ -108,7 +108,8 @@ 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=Activate kits (virtual products)
+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
@@ -167,8 +168,10 @@ BuyingPrices=Buying prices
 CustomerPrices=Customer prices
 SuppliersPrices=Vendor prices
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs / Commodity / HS code
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=Origin country
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=Nature of product (material/finished)
 NatureOfProductShort=Nature of product
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=Use the fixed price
 PriceByQuantity=Different prices by quantity
 DisablePriceByQty=Disable prices by quantity
 PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+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
diff --git a/htdocs/langs/zh_HK/projects.lang b/htdocs/langs/zh_HK/projects.lang
index baf0ecde17f..05aa1f5a560 100644
--- a/htdocs/langs/zh_HK/projects.lang
+++ b/htdocs/langs/zh_HK/projects.lang
@@ -76,15 +76,16 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
+TimeConsumed=Consumed
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GanttView=Gantt View
diff --git a/htdocs/langs/zh_HK/recruitment.lang b/htdocs/langs/zh_HK/recruitment.lang
index b775e78552e..437445f25dc 100644
--- a/htdocs/langs/zh_HK/recruitment.lang
+++ b/htdocs/langs/zh_HK/recruitment.lang
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/zh_HK/sendings.lang b/htdocs/langs/zh_HK/sendings.lang
index 5ce3b7f67e9..73bd9aebd42 100644
--- a/htdocs/langs/zh_HK/sendings.lang
+++ b/htdocs/langs/zh_HK/sendings.lang
@@ -30,6 +30,7 @@ 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
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/zh_HK/stocks.lang b/htdocs/langs/zh_HK/stocks.lang
index 660443bcded..a1f55010139 100644
--- a/htdocs/langs/zh_HK/stocks.lang
+++ b/htdocs/langs/zh_HK/stocks.lang
@@ -62,6 +62,7 @@ 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
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
 UserDefaultWarehouse=Set a warehouse on Users
 MainDefaultWarehouse=Default warehouse
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove
 UpdateByScaning=Update 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.
diff --git a/htdocs/langs/zh_HK/ticket.lang b/htdocs/langs/zh_HK/ticket.lang
index 59519282c80..982fff90ffa 100644
--- a/htdocs/langs/zh_HK/ticket.lang
+++ b/htdocs/langs/zh_HK/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -60,7 +58,6 @@ OriginEmail=Email source
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
-NotRead=Not read
 Read=Read
 Assigned=Assigned
 InProgress=In progress
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create
 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 is added
@@ -233,7 +231,6 @@ TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
 ErrorTicketRefRequired=Ticket reference name is required
 
 #
diff --git a/htdocs/langs/zh_HK/website.lang b/htdocs/langs/zh_HK/website.lang
index 03e042e4be6..f17def114b8 100644
--- a/htdocs/langs/zh_HK/website.lang
+++ b/htdocs/langs/zh_HK/website.lang
@@ -30,7 +30,6 @@ EditInLine=Edit inline
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
-HomePage=Home Page
 PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
@@ -101,7 +100,7 @@ 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=Include dynamic content
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=Internal URL of page
 ThisPageIsTranslationOf=This page/container is a translation of
 ThisPageHasTranslationPages=This page/container has translation
@@ -137,3 +136,4 @@ RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using
 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.
diff --git a/htdocs/langs/zh_HK/withdrawals.lang b/htdocs/langs/zh_HK/withdrawals.lang
index 114a8d9dd6c..059b3451c11 100644
--- a/htdocs/langs/zh_HK/withdrawals.lang
+++ b/htdocs/langs/zh_HK/withdrawals.lang
@@ -42,6 +42,7 @@ 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>.
 ClassCredited=Classify credited
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
-ICS=Creditor Identifier CI
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -146,3 +148,5 @@ 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/zh_HK/workflow.lang b/htdocs/langs/zh_HK/workflow.lang
index 299be277e1d..494a0424a75 100644
--- a/htdocs/langs/zh_HK/workflow.lang
+++ b/htdocs/langs/zh_HK/workflow.lang
@@ -21,3 +21,5 @@ descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked sup
 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/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index bf49bbd2fba..3b4947efd9a 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -16,6 +16,8 @@ ThisService=此服務
 ThisProduct=此產品
 DefaultForService=服務的預設
 DefaultForProduct=產品的預設
+ProductForThisThirdparty=Product for this thirdparty
+ServiceForThisThirdparty=Service for this thirdparty
 CantSuggest=無法建議
 AccountancySetupDoneFromAccountancyMenu=從%s選單的大部分會計設定已完成
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -48,6 +50,7 @@ CountriesExceptMe=除了%s以外的所有國家
 AccountantFiles=Export source documents
 ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=在設定中客戶的主要會計帳戶尚未定義
 MainAccountForSuppliersNotDefined=在設定中供應商的主要會計帳戶尚未定義
@@ -144,7 +147,7 @@ NotVentilatedinAccount=不受會計項目約束
 XLineSuccessfullyBinded=%s 產品/服務成功地指定會計項目
 XLineFailedToBeBinded=%s 產品/服務沒指定任何會計項目
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=頁面顯示要綁定的元件數（建議的最大值：50）
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=開始按最新元件對“待綁定”頁面進行排序
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=開始按最新元件對“完成綁定”頁面進行排序
 
@@ -198,7 +201,8 @@ Docdate=日期
 Docref=參考
 LabelAccount=標籤帳戶
 LabelOperation=標籤操作
-Sens=意義
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you received<br>For an accounting account of a supplier, use Debit to record a payment you make
 LetteringCode=字元編碼
 Lettering=字元
 Codejournal=日記帳
@@ -206,7 +210,8 @@ JournalLabel=日記帳標籤
 NumPiece=件數
 TransactionNumShort=交易編號
 AccountingCategory=個人化群組
-GroupByAccountAccounting=按會計科目分組
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
 AccountingAccountGroupsDesc=您可定義某些會計科目大類。他們可以在個人化會計報表中使用。
 ByAccounts=依帳戶
 ByPredefinedAccountGroups=依大類
@@ -248,7 +253,7 @@ PaymentsNotLinkedToProduct=付款未連結到任何產品/服務
 OpeningBalance=初期餘額
 ShowOpeningBalance=顯示初期餘額
 HideOpeningBalance=隱藏初期餘額
-ShowSubtotalByGroup=依組顯示小計
+ShowSubtotalByGroup=Show subtotal by level
 
 Pcgtype=會計項目大類
 PcgtypeDesc=用作某些會計報告的預定義“過濾器”和“分組”標準的科目組。例如“ INCOME”或“ EXPENSE”用作產品的會計科目組，以建立費用/收入報告。
@@ -271,11 +276,13 @@ DescVentilExpenseReport=在此查閱費用報表行數是否關聯到費用會
 DescVentilExpenseReportMore=如果您在費用報告類型上設定會計帳戶，則應用程序將能夠在費用報告和會計科目表的會計帳戶之間進行所有綁定，只需點擊按鈕<strong>“ %s”即可</strong> 。如果未在費用字典中設定帳戶，或者您仍有某些行未綁定到任何帳戶，則必須從選單“ <strong>%s</strong> ”進行手動綁定。
 DescVentilDoneExpenseReport=在此查閱費用報表的清單及其費用會計項目。
 
+Closure=Annual closure
 DescClosure=請在此處查詢依照月份的未經驗證活動數和已經開放的會計年度
 OverviewOfMovementsNotValidated=第1步/未驗證移動總覽。 （需要關閉一個會計年度）
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
 ValidateMovements=驗證動作
 DescValidateMovements=禁止修改，刪除任何文字內容。所有條目都必須經過驗證，否則將無法結案
-SelectMonthAndValidate=選擇月份並驗證移動
 
 ValidateHistory=自動關聯
 AutomaticBindingDone=自動關聯已完成
@@ -293,6 +300,7 @@ Accounted=計入總帳
 NotYetAccounted=尚未記入總帳
 ShowTutorial=顯示教程
 NotReconciled=未對帳
+WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
 
 ## Admin
 BindingOptions=Binding options
@@ -337,6 +345,7 @@ Modelcsv_LDCompta10=LD Compta用之匯出（v10及更高版本）
 Modelcsv_openconcerto=匯出為OpenConcerto（測試）
 Modelcsv_configurable=匯出為可設置CSV
 Modelcsv_FEC=匯出為FEC
+Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
 Modelcsv_Sage50_Swiss=匯出為Sage 50 Switzerland
 Modelcsv_winfic=匯出Winfic-eWinfic-WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 833e0197a6b..3d26c53e461 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -37,8 +37,8 @@ UnlockNewSessions=移除連線鎖定
 YourSession=您的程序
 Sessions=用戶程序
 WebUserGroup=網頁伺服器用戶/組別
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
+PermissionsOnFilesInWebRoot=網站根目錄中檔案的權限
+PermissionsOnFile=檔案%s的權限
 NoSessionFound=您的PHP設定似乎不允許列出活動程序。用於保存程序的資料夾（ <b>%s</b> ）可能受到保護（例如，通過OS權限或PHP指令open_basedir）。
 DBStoringCharset=儲存資料的資料庫字集
 DBSortingCharset=資料排序以資料庫字集
@@ -56,6 +56,8 @@ GUISetup=顯示設定
 SetupArea=設定
 UploadNewTemplate=上傳新的範本
 FormToTestFileUploadForm=用於測試檔案上傳的表格（根據設定）
+ModuleMustBeEnabled=模組/應用程式 <b>%s</b>必須啟用
+ModuleIsEnabled=模組/應用程式 <b>%s</b> 已啟用
 IfModuleEnabled=註：若模組<b>%s</b>啓用時，「是的」有效。
 RemoveLock=如果存在<b>%s</b>檔案,刪除/重新命名文件以允許使用更新/安裝工具。
 RestoreLock=還原檔案唯讀權限檔案<b>%s</b> ，以禁止使用更新/安裝工具。
@@ -73,7 +75,7 @@ DisableJavascriptNote=注意：用於測試或調整目的。為了優化盲人
 UseSearchToSelectCompanyTooltip=另外您若有大量合作方 (> 100,000), 您可在 "設定 -> 其他" 設定常數 COMPANY_DONOTSEARCH_ANYWHERE 為 1 增加速度。搜尋則會只限制在字串的開頭。
 UseSearchToSelectContactTooltip=另外您若有大量合作方 (> 100,000), 您可在 " 設定 -> 其他" 中設定常數 CONTACT_DONOTSEARCH_ANYWHERE 為 1 以增加速度。搜尋則會只限制在字串的開頭。
 DelaiedFullListToSelectCompany=等待直到按下任一鍵，然後再加載合作方組合清單的內容。 <br>如果您有大量的合作方，這可能會提高性能，但是不太方便。
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
+DelaiedFullListToSelectContact=載入“聯絡人”組合清單的內容前一直等待到按下任一按鍵。 <br>如果您有大量聯絡人的通訊錄，這可能會提高性能，但不太方便.
 NumberOfKeyToSearch=觸發搜尋的字元號：%s
 NumberOfBytes=位元數
 SearchString=尋找字串
@@ -82,10 +84,9 @@ AllowToSelectProjectFromOtherCompany=在合作方的文件上，可選擇已連
 JavascriptDisabled=JavaScript 不啓動
 UsePreviewTabs=使用預覽分頁
 ShowPreview=顯示預覽
-ShowHideDetails=Show-Hide details
+ShowHideDetails=顯示-隱藏詳細訊息
 PreviewNotAvailable=無法預覽
 ThemeCurrentlyActive=目前可用主題
-CurrentTimeZone=PHP (伺服器)時區
 MySQLTimeZone=MySql (資料庫)時區
 TZHasNoEffect=日期由資料庫伺服器已儲存和已返回，就像它們被保存為提交的字串一樣。時區僅在使用UNIX_TIMESTAMP函數時才有效（Dolibarr不應使用，因此即使輸入資料後更改資料庫TZ也不起作用）。
 Space=空間
@@ -153,8 +154,8 @@ SystemToolsAreaDesc=此區域提供管理功能。使用選單選擇所需的功
 Purge=清除
 PurgeAreaDesc=此頁面允許您刪除Dolibarr產生或儲存的所有文件（暫存檔案或<b>%s</b>目錄中的所有文件）。通常不需要使用此功能。此功能提供無權限刪除Web服務器產生之文件的Dolibarr用戶提供了一種解決方法。
 PurgeDeleteLogFile=刪除 log 檔案，包含Syslog 模組的 <b>%s</b> (沒有遺失資料風險)
-PurgeDeleteTemporaryFiles=刪除所有暫存檔案（沒有丟失資料的風險）。注意：僅對於24小時前於temp目錄產生的檔案才執行刪除操作。
-PurgeDeleteTemporaryFilesShort=刪除範本檔案
+PurgeDeleteTemporaryFiles=刪除所有紀錄與暫存檔案（沒有丟失資料的風險）。注意：僅對於24小時前於temp資料夾已建立的檔案才執行刪除操作。
+PurgeDeleteTemporaryFilesShort=刪除紀錄和暫存檔案
 PurgeDeleteAllFilesInDocumentsDir=刪除資料夾中的所有檔案： <b>%s</b> 。 <br>這將刪除所有與元件（合作方，發票等）相關的所有產生文件，上傳到ECM模組中的檔案，資料庫備份轉存和臨時文件。
 PurgeRunNow=立即清除
 PurgeNothingToDelete=沒有可以刪除的資料夾或檔案。
@@ -256,6 +257,7 @@ ReferencedPreferredPartners=首選合作夥伴
 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>
 HelpCenterDesc1=以下是獲得Dolibarr幫助和支持的一些資源。
@@ -274,7 +276,7 @@ NoticePeriod=通知期
 NewByMonth=依月份的新通知
 Emails=電子郵件
 EMailsSetup=電子郵件設定
-EMailsDesc=This page allows you to set parameters or options for email sending.
+EMailsDesc=此頁面允許您設定電子郵件傳送的參數或選項。
 EmailSenderProfiles=電子郵件寄件者資訊
 EMailsSenderProfileDesc=您可以將此部分保留空白。如果您在此處輸入一些電子郵件，當您編寫新電子郵件時，它們將被增加到組合框中的可能寄件人清單中。
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS連接埠（php.ini中的預設值： <b>%s</b> ）
@@ -292,7 +294,7 @@ MAIN_MAIL_SMTPS_ID=SMTP 帳號（如果發送服務器需要身份驗證）
 MAIN_MAIL_SMTPS_PW=SMTP密碼（如果發送伺服器需要身份驗證）
 MAIN_MAIL_EMAIL_TLS=使用TLS（SSL）加密
 MAIN_MAIL_EMAIL_STARTTLS=使用TLS（STARTTLS）加密
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=授權自動簽署證書
 MAIN_MAIL_EMAIL_DKIM_ENABLED=使用數位簽章產生電子郵件簽名
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=使用數位簽章的電子郵件網域
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=數位簽章選擇器名稱
@@ -375,7 +377,7 @@ ExamplesWithCurrentSetup=目前設定的範例
 ListOfDirectories=OpenDocument 範本資料夾下的清單
 ListOfDirectoriesForModelGenODT=包含具有OpenDocument格式的範本文件的資料夾清單。 <br><br>在這裡放置資料夾的完整路徑。 <br>在eah資料夾之間增加Enter符號。 <br>要增加GED模組的資料夾，請在此處增加<b>DOL_DATA_ROOT/ecm/yourdirectoryname</b> 。 <br><br>這些資料夾中的文件必須以<b>.odt</b>或<b>.ods</b>結尾。
 NumberOfModelFilesFound=在這些資料夾中找到的ODT / ODS範本文件數
-ExampleOfDirectoriesForModelGen=語法範例:<br> ç:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=語法範例:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>要了解如何建立odt文件範本，然後將它們存儲在那些資料夾中，請參閱Wiki文件：
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=名字/姓氏的位置
@@ -406,7 +408,7 @@ UrlGenerationParameters=保護網址參數
 SecurityTokenIsUnique=為每個網址使用唯一的安全金鑰參數
 EnterRefToBuildUrl=輸入項目%s的參考值
 GetSecuredUrl=取得計算後網址
-ButtonHideUnauthorized=隱藏非管理員用戶的按鈕以執行未經授權的操作，而不是顯示禁用的灰色按鈕
+ButtonHideUnauthorized=對內部用戶也隱藏未經授權的操作按鈕（否則為灰色）
 OldVATRates=舊營業稅率
 NewVATRates=新營業稅率
 PriceBaseTypeToChange=根據已定義的基礎參考價參修改價格
@@ -555,7 +557,7 @@ Module55Name=條碼
 Module55Desc=條碼管理
 Module56Name=信用轉帳付款
 Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Payments by Direct Debit
+Module57Name=銀行直接轉帳付款
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=點選撥打
 Module58Desc=點選撥打系統(Asterisk, ...)的整合
@@ -668,7 +670,7 @@ Module54000Desc=直接列印(不用打開文件)使用 Cups IPP 介面(印表機
 Module55000Name=問卷、調查或投票
 Module55000Desc=建立線上問卷，調查或投票（例如Doodle，Studs，RDVz等）
 Module59000Name=利潤
-Module59000Desc=利潤管理模組
+Module59000Desc=跟隨利潤的模組
 Module60000Name=佣金
 Module60000Desc=管理佣金的模組
 Module62000Name=國際貿易術語
@@ -677,7 +679,7 @@ Module63000Name=資源
 Module63000Desc=管理用於分配給事件的資源（印表機，汽車，房間等）
 Permission11=讀取客戶發票
 Permission12=建立/修改客戶發票
-Permission13=Invalidate customer invoices
+Permission13=無效的客戶發票
 Permission14=驗證客戶發票
 Permission15=以電子郵件寄送客戶發票
 Permission16=為客戶發票建立付款
@@ -694,7 +696,7 @@ Permission32=建立/修改產品資訊
 Permission34=刪除產品
 Permission36=查看/管理隱藏的產品
 Permission38=匯出產品資訊
-Permission39=Ignore minimum price
+Permission39=忽略最低價格
 Permission41=讀取專案及任務（已分享專案及以我擔任連絡人的專案）。也可在被指派的任務對自已或等級中輸入耗用的時間（時間表）
 Permission42=建立/修改專案（已分享專案及以我擔任連絡人的專案）。也可以建立任務及指派用戶到專案及任務
 Permission44=刪除專案（已分享專案及以我擔任連絡人的專案）
@@ -703,9 +705,9 @@ Permission61=讀取干預
 Permission62=建立/修改干預
 Permission64=刪除干預
 Permission67=匯出干預
-Permission68=Send interventions by email
-Permission69=Validate interventions
-Permission70=Invalidate interventions
+Permission68=使用電子郵件傳送干預措施
+Permission69=驗證干預措施
+Permission70=無效的干預措施
 Permission71=讀取會員
 Permission72=建立/修改會員
 Permission74=刪除會員
@@ -728,7 +730,7 @@ Permission95=讀取報告
 Permission101=讀取出貨資訊
 Permission102=建立/修改出貨單
 Permission104=驗證出貨單
-Permission105=Send sendings by email
+Permission105=使用電子郵件傳送傳送
 Permission106=匯出出貨單
 Permission109=刪除出貨單
 Permission111=讀取財務帳戶
@@ -836,10 +838,10 @@ Permission402=建立/修改折扣
 Permission403=驗證折扣
 Permission404=刪除折扣
 Permission430=使用除錯欄
-Permission511=Read payments of salaries (yours and subordinates)
+Permission511=讀取薪資支付（您和您的下屬）
 Permission512=建立/修改薪水支付
 Permission514=刪除薪水支付
-Permission517=Read payments of salaries of everybody
+Permission517=讀取每個人的薪資支付
 Permission519=匯出薪水
 Permission520=讀取借款
 Permission522=建立/修改借款
@@ -851,19 +853,19 @@ Permission532=建立/修改服務
 Permission534=刪除服務
 Permission536=查看/管理隱藏服務
 Permission538=匯出服務
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
-Permission601=Read stickers
-Permission602=Create/modify stickers
-Permission609=Delete stickers
+Permission561=讀取以直接轉帳的付款單
+Permission562=建立/修改直接轉帳的付款單
+Permission563=傳送/傳遞直接轉帳的付款單
+Permission564=記錄借方/拒絕的直接轉帳
+Permission601=讀取標籤
+Permission602=建立/修改標籤
+Permission609=刪除標籤
 Permission650=讀取物料清單
 Permission651=新增/更新物料清單
 Permission652=刪除物料清單
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission660=讀取製造訂單（MO）
+Permission661=建立/更新製造訂單（MO）
+Permission662=刪除製造訂單（MO）
 Permission701=讀取捐款
 Permission702=建立/修改捐款
 Permission703=刪除捐款
@@ -873,8 +875,8 @@ Permission773=刪除費用報告
 Permission774=讀取全部費用報告(甚至非屬於用戶的下屬)
 Permission775=核准費用報告
 Permission776=支付費用報告
-Permission777=Read expense reports of everybody
-Permission778=Create/modify expense reports of everybody
+Permission777=讀取每個人的費用報表
+Permission778=建立/修改每個人的費用報表
 Permission779=匯出費用報告
 Permission1001=讀取庫存資訊
 Permission1002=建立/修改倉庫
@@ -899,9 +901,9 @@ Permission1185=批准採購訂單
 Permission1186=訂購採購訂單
 Permission1187=確認收到採購訂單
 Permission1188=刪除採購訂單
-Permission1189=Check/Uncheck a purchase order reception
+Permission1189=選取/反選取採購訂單接收
 Permission1190=批准（第二次批准）採購訂單
-Permission1191=Export supplier orders and their attributes
+Permission1191=匯出供應商訂單及其屬性
 Permission1201=取得匯出結果
 Permission1202=建立/修改匯出
 Permission1231=讀取供應商發票
@@ -915,8 +917,8 @@ Permission1251=執行從外部資料批次匯入到資料庫的功能 (載入資
 Permission1321=匯出客戶發票、屬性及付款資訊
 Permission1322=重啟已付帳單
 Permission1421=匯出銷售訂單和屬性
-Permission1521=Read documents
-Permission1522=Delete documents
+Permission1521=讀取文件
+Permission1522=刪除文件
 Permission2401=連結到他的用戶帳戶的讀取操作（事件或任務）（如果是事件的所有者或僅被分配）
 Permission2402=建立/修改連結到自己的用戶帳戶（如果是事件所有者）的活動（事件或任務）
 Permission2403=刪除連結到自己用戶帳戶的行動（事件或任務）（如果是事件所有者）
@@ -931,7 +933,7 @@ Permission2515=設定文件資料夾
 Permission2801=在唯讀模式下使用 FTP 客戶端 (僅瀏覽及下載)
 Permission2802=在寫入模式下使用 FTP 客戶端 (可刪除或上傳檔案)
 Permission3200=讀取存檔的事件和指紋
-Permission3301=Generate new modules
+Permission3301=產生新模組
 Permission4001=查看員工
 Permission4002=建立員工
 Permission4003=刪除員工
@@ -951,13 +953,13 @@ Permission23001=讀取預定工作
 Permission23002=建立/更新預定工作
 Permission23003=刪除預定工作
 Permission23004=執行預定工作
-Permission50101=Use Point of Sale (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
+Permission50101=使用銷售點（SimplePOS）
+Permission50151=使用銷售點（TakePOS）
 Permission50201=讀取交易
 Permission50202=匯入交易
-Permission50330=Read objects of Zapier
-Permission50331=Create/Update objects of Zapier
-Permission50332=Delete objects of Zapier
+Permission50330=讀取Zapier的物件
+Permission50331=建立/更新Zapier的物件
+Permission50332=刪除Zapier的物件
 Permission50401=將產品和發票與會計科目綁定
 Permission50411=讀取分類帳中的操作
 Permission50412=分類帳中的寫入/編輯操作
@@ -981,26 +983,26 @@ Permission63001=讀取資源
 Permission63002=建立/修改資源
 Permission63003=刪除資源
 Permission63004=連結資源到行程事件
-Permission64001=Allow direct printing
-Permission67000=Allow printing of receipts
-Permission68001=Read intracomm report
-Permission68002=Create/modify intracomm report
-Permission68004=Delete intracomm report
-Permission941601=Read receipts
-Permission941602=Create and modify receipts
-Permission941603=Validate receipts
-Permission941604=Send receipts by email
-Permission941605=Export receipts
-Permission941606=Delete receipts
+Permission64001=允許直接列印
+Permission67000=允許列印收據
+Permission68001=讀取通訊報告
+Permission68002=建立/修改通訊報告
+Permission68004=刪除通訊報告
+Permission941601=讀取收據
+Permission941602=建立和修改收據
+Permission941603=驗證收據
+Permission941604=以電子郵件傳送收據
+Permission941605=匯出收據
+Permission941606=刪除收據
 DictionaryCompanyType=合作方類型
 DictionaryCompanyJuridicalType=法人合作方
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
+DictionaryProspectLevel=公司的潛在機率層級
+DictionaryProspectContactLevel=聯絡人的潛在機率層級
 DictionaryCanton=州/省
 DictionaryRegion=地區
 DictionaryCountry=國家
 DictionaryCurrency=幣別
-DictionaryCivility=榮譽稱號
+DictionaryCivility=稱謂或頭銜
 DictionaryActions=行程事件類型
 DictionarySocialContributions=社會稅或財政稅類型
 DictionaryVAT=營業稅率或銷售稅率
@@ -1025,14 +1027,14 @@ DictionaryEMailTemplates=電子郵件範本
 DictionaryUnits=單位
 DictionaryMeasuringUnits=計算單位
 DictionarySocialNetworks=社會網路
-DictionaryProspectStatus=Prospect status for companies
-DictionaryProspectContactStatus=Prospect status for contacts
+DictionaryProspectStatus=公司的潛在狀態
+DictionaryProspectContactStatus=聯絡人的潛在狀態
 DictionaryHolidayTypes=休假類型
 DictionaryOpportunityStatus=專案/潛在的潛在狀態
 DictionaryExpenseTaxCat=費用報表 -交通類別
 DictionaryExpenseTaxRange=費用報表 - 依交通類別劃分範圍
-DictionaryTransportMode=Intracomm report - Transport mode
-TypeOfUnit=Type of unit
+DictionaryTransportMode=通訊報告-傳送模式
+TypeOfUnit=單位類型
 SetupSaved=設定已儲存
 SetupNotSaved=設定未儲存
 BackToModuleList=返回模組清單
@@ -1083,7 +1085,7 @@ LabelUsedByDefault=若代號沒有找翻譯字句，則使用預設標籤
 LabelOnDocuments=文件標籤
 LabelOrTranslationKey=標籤或翻譯秘鑰
 ValueOfConstantKey=常數設置的值
-ConstantIsOn=Option %s is on
+ConstantIsOn= 選項%s啟用中
 NbOfDays=天數
 AtEndOfMonth=月底
 CurrentNext=現在/下一個
@@ -1128,7 +1130,7 @@ LoginPage=登入頁面
 BackgroundImageLogin=背景圖片
 PermanentLeftSearchForm=左側選單上的永久搜尋表格
 DefaultLanguage=預設語言
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
+EnableMultilangInterface=為客戶或供應商關係啟用多語言支援
 EnableShowLogo=在選單中顯示公司logo
 CompanyInfo=公司/組織
 CompanyIds=公司/組織身分
@@ -1170,8 +1172,8 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=費用報表批准
 Delays_MAIN_DELAY_HOLIDAYS=休假申請批准
 SetupDescription1=在開始使用Dolibarr之前，必須定義一些初始參數並啟用/設定模組。
 SetupDescription2=以下兩個部分是必需的（“設定”選單中的前兩個項目）：
-SetupDescription3= <a href="%s"> %s-> %s </a> <br> <br>用於自訂您應用程式默認行為的基本參數（例如 跟國家相關的功能）。
-SetupDescription4= <a href="%s"> %s-> %s </a> <br> <br>此軟件是許多模塊/應用程序的套件。必須啟用和配置與您的需求相關的模塊。這些模塊的激活將顯示菜單條目。
+SetupDescription3= <a href="%s"> %s-> %s </a> <br> <br>用於自訂您的應用程式預設行為的基本參數（例如 跟國家相關的功能）。
+SetupDescription4= <a href="%s"> %s-> %s </a> <br> <br>此軟體是許多模組/應用程式的套件。必須啟用和配置與您的需求相關的模組。這些模組啟動後將會顯示在選單上。
 SetupDescription5=其他設定選單項目管理可選參數。
 LogEvents=安全稽核事件
 Audit=稽核
@@ -1182,7 +1184,7 @@ InfoWebServer=關於網頁伺服器
 InfoDatabase=關於資料庫
 InfoPHP=關於 PHP
 InfoPerf=關於效能
-InfoSecurity=About Security
+InfoSecurity=關於安全性
 BrowserName=瀏覽器名稱
 BrowserOS=瀏覽器系統
 ListOfSecurityEvents=Dolibarr 安全事件清單
@@ -1233,7 +1235,7 @@ RestoreDesc2=將“ 文件”資料夾的備份文件（例如zip文件）還原
 RestoreDesc3=將資料庫結構和數據從備份檔案還原到新Dolibarr安裝的資料庫或目前安裝的資料庫 (<b>%s</b>)中。警告，還原完成後，您必須使用備份時間/安裝中存在的登入名稱/密碼才能再次連接。 <br>要將備份數據庫還原到目前安裝中，可以依照此助手進行操作。
 RestoreMySQL=MySQL匯入
 ForcedToByAModule=有一啟動模組強制<b>%s</b>適用此規則
-ValueIsForcedBySystem=This value is forced by the system. You can't change it.
+ValueIsForcedBySystem=此數值由系統設定。您無法更改。
 PreviousDumpFiles=現有備份檔案
 PreviousArchiveFiles=現有壓縮檔案
 WeekStartOnDay=一周的第一天
@@ -1294,8 +1296,8 @@ WarningAtLeastKeyOrTranslationRequired=搜索條件至少要有一個值或翻
 NewTranslationStringToShow=顯示新翻譯字串
 OriginalValueWas=已覆蓋原始翻譯。 原始翻譯是：<br><br>%s
 TransKeyWithoutOriginalValue=您為任何語言文件中都不存在的翻譯密鑰'<strong>%s</strong>'強制進行了新翻譯
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=已啟用模組
+TotalNumberOfActivatedModules=已啟用模組: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=您至少要啟用 1 個模組
 ClassNotFoundIntoPathWarning=在PHP路徑中找不到類別%s
 YesInSummer=是的，在夏天
@@ -1306,7 +1308,7 @@ YouUseBestDriver=您使用的驅動程式%s是目前的最佳驅動程式。
 YouDoNotUseBestDriver=您使用驅動程式%s，但建議使用驅動程式%s。
 NbOfObjectIsLowerThanNoPb=您的資料庫中有%s %s。這不需要任何特定的優化。
 SearchOptim=搜尋最佳化
-YouHaveXObjectUseSearchOptim=您的資料庫中有%s %s。您應該在首頁-設定-其他中加入常數%s到1。將搜尋限制在字串的開頭，這樣資料庫就可以使用索引，並且您應該立即得到回應。
+YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
 YouHaveXObjectAndSearchOptimOn=您在資料庫中具有%s %s，並且在首頁-設定-其他中，常數%s設定為1。
 BrowserIsOK=您正在使用%s 網頁瀏覽器。此瀏覽器可以確保安全性和性能。
 BrowserIsKO=您正在使用%s 網頁瀏覽器。眾所周知，此瀏覽器是安全性，性能和可靠性的錯誤選擇。我們建議使用Firefox，Chrome，Opera或Safari。
@@ -1564,9 +1566,9 @@ LDAPDescValues=範例值是為具有以下載入模式的<b>OpenLDAP</b>設計
 ForANonAnonymousAccess=已驗證存取(例如寫入存取)
 PerfDolibarr=效能設定/最佳化報告
 YouMayFindPerfAdviceHere=此頁面提供了一些與性能有關的檢查或建議。
-NotInstalled=Not installed.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
+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=找到應用程式快取的快取模組，但模組設定沒有完成。
@@ -1596,8 +1598,13 @@ ServiceSetup=服務模組設定
 ProductServiceSetup=產品和服務模組設定
 NumberOfProductShowInSelect=組合選擇清單中可顯示的最大產品數量（0 =無限制）
 ViewProductDescInFormAbility=在表格中顯示產品描述（否則在工具提示彈出窗口中顯示）
+DoNotAddProductDescAtAddLines=Do not add product description (from product card) on submit add lines on forms
+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 文件整合成報價/建議書/提案的 azur 格式 PDF
-ViewProductDescInThirdpartyLanguageAbility=在合作方的語言中顯示產品描述
+ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
 UseSearchToSelectProductTooltip=同樣，如果您有大量產品(> 100 000)，則可以通過在設定-其他中將PRODUCT_DONOTSEARCH_ANYWHERE常數變數變為1來提高速度。然後搜尋將僅限於字串開頭的。
 UseSearchToSelectProduct=等到您按下一個鍵，然後再載入產品組合清單的內容（如果您有很多產品，這可能會提高性能，但是使用起來不太方便）
 SetDefaultBarcodeTypeProducts=產品預設條碼類型
@@ -1689,7 +1696,7 @@ NotTopTreeMenuPersonalized=個人化選單沒有連結到頂端選單項目
 NewMenu=新選單
 MenuHandler=選單處理程式
 MenuModule=原始碼模組
-HideUnauthorizedMenu= 隱藏未經授權的選單（灰色）
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
 DetailId=選單編號
 DetailMenuHandler=顯示新的選單的選單處理程式
 DetailMenuModule=若選單項目來自一個模組則為模組名稱
@@ -1917,7 +1924,7 @@ ExampleOfNewsMessageForMajorRelease=已提供Dolibarr ERP和CRM %s。版本%s是
 ExampleOfNewsMessageForMaintenanceRelease=已提供Dolibarr ERP和CRM %s。版本%s是維護版本，因此僅包含錯誤修復。我們建議所有用戶升級到此版本。維護版本不加入新功能或對資料庫進行更改。您可以從https://www.dolibarr.org下載區域（穩定目錄的子目錄）下載此檔案。您可以閱讀<a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a>以獲得完整的更改列表。
 MultiPriceRuleDesc=啟用選項“產品/服務的多種價格”後，您可以為每種產品定義不同的價格（一種價格水平一個）。為了節省您的時間，您可以在此處輸入一個規則，根據第一級的價格自動計算每個級別的價格，因此您只需要為每種產品輸入第一級的價格。此頁面旨在節省您的時間，但僅在您每個級別的價格都相對於第一級別時才有用。在大多數情況下，您可以忽略此頁面。
 ModelModulesProduct=產品文件的範本
-WarehouseModelModules=Templates for documents of warehouses
+WarehouseModelModules=倉庫檔案模板
 ToGenerateCodeDefineAutomaticRuleFirst=為了能夠自動產生代碼，您首先必須定義一個管理器來自動定義條碼編號。
 SeeSubstitutionVars=請參閱 * 註釋以取得可能的替代變數清單
 SeeChangeLog=查看變更日誌檔案(僅有英文)
@@ -1956,7 +1963,7 @@ MAIN_PDF_MARGIN_LEFT=PDF左邊邊距
 MAIN_PDF_MARGIN_RIGHT=PDF右邊邊距
 MAIN_PDF_MARGIN_TOP=PDF頂部邊距
 MAIN_PDF_MARGIN_BOTTOM=PDF底部邊距
-MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=PDF上Logo的高度
 NothingToSetup=此模組不需要特別的設定。
 SetToYesIfGroupIsComputationOfOtherGroups=若此群組是其他群組的計算值，則將其設定為 "是"
 EnterCalculationRuleIfPreviousFieldIsYes=如果先前欄位設定為“是”，則輸入計算規則（例如“ CODEGRP1 + CODEGRP2”）
@@ -1983,11 +1990,12 @@ EMailHost=IMAP伺服器主機
 MailboxSourceDirectory=信箱來源資料夾
 MailboxTargetDirectory=信箱目標資料夾
 EmailcollectorOperations=收集器要做的操作
+EmailcollectorOperationsDesc=全部訂單的操作已執行
 MaxEmailCollectPerCollect=每次收集電子郵件的最大數量
 CollectNow=立刻收集
 ConfirmCloneEmailCollector=您確定要複製電子郵件收集器%s嗎？
-DateLastCollectResult=最新嘗試收集日期
-DateLastcollectResultOk=最新收集成功日期
+DateLastCollectResult=Date of latest collect try
+DateLastcollectResultOk=Date of latest collect success
 LastResult=最新結果
 EmailCollectorConfirmCollectTitle=郵件收集確認
 EmailCollectorConfirmCollect=您是否要立即執行此收集器的收集？
@@ -2003,9 +2011,9 @@ LoadThirdPartyFromName=在%s載入合作方搜尋 (僅載入)
 LoadThirdPartyFromNameOrCreate= 在%s載入合作方搜尋 (如果找不到就建立)
 WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
 WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
-WithDolTrackingIDInMsgId=Message sent from Dolibarr
-WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create candidature
+WithDolTrackingIDInMsgId=來自Dolibarr的訊息
+WithoutDolTrackingIDInMsgId=未從Dolibarr傳送訊息
+CreateCandidature=建立工作應用程式
 FormatZip=Zip
 MainMenuCode=選單輸入代碼（主選單）
 ECMAutoTree=顯示自動ECM樹狀圖
@@ -2042,7 +2050,7 @@ DEBUGBAR_LOGS_LINES_NUMBER=控制台中可保留的日誌行數
 WarningValueHigherSlowsDramaticalyOutput=警告，較高的值會嚴重降低輸出速度
 ModuleActivated=模組%s已啟動並顯示於界面上
 IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
-AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
+AntivirusEnabledOnUpload=在上傳的檔案已啟用了防病毒功能
 EXPORTS_SHARE_MODELS=匯出模組功能可分享此模組給所有人
 ExportSetup=模組匯出設定
 ImportSetup=模組匯入設定
@@ -2073,9 +2081,9 @@ RssNote=注意：每個RSS feed定義都提供一個小部件，您必須啟用
 JumpToBoxes=跳至設定 -> 小部件
 MeasuringUnitTypeDesc=使用值例如 "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=比例尺是您必須移動小數部分以匹配默認參考單位的位數。對於“時間”單位類型，它是秒數。 80到99之間的值是保留值。
-TemplateAdded=Template added
-TemplateUpdated=Template updated
-TemplateDeleted=Template deleted
+TemplateAdded=範本已增加
+TemplateUpdated=範本已更新
+TemplateDeleted=範本已刪除
 MailToSendEventPush=Event reminder email
 SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
 DictionaryProductNature= 產品性質
@@ -2083,3 +2091,7 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country)
 YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
+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
diff --git a/htdocs/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang
index dbc8cb5e692..b72514bf7b6 100644
--- a/htdocs/langs/zh_TW/agenda.lang
+++ b/htdocs/langs/zh_TW/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=事件集數量
 ListOfActions=事件清單
 EventReports=事件報表
 Location=位置
-ToUserOfGroup=Event assigned to any user in group
+ToUserOfGroup=將事件分配給群組中的任何用戶
 EventOnFullDay=整天事件
 MenuToDoActions=全部未完成事件
 MenuDoneActions=全部已停止事件
@@ -86,8 +86,8 @@ ProposalDeleted=提案/建議書已刪除
 OrderDeleted=訂單已刪除
 InvoiceDeleted=發票已刪除
 DraftInvoiceDeleted=發票草稿已刪除
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_DELETEInDolibarr=Contact %s deleted
+CONTACT_CREATEInDolibarr=聯絡人%s已建立
+CONTACT_DELETEInDolibarr=聯絡人%s已刪除
 PRODUCT_CREATEInDolibarr=產品 %s 已建立
 PRODUCT_MODIFYInDolibarr=產品 %s 已修改
 PRODUCT_DELETEInDolibarr=產品 %s 已刪除
@@ -111,7 +111,7 @@ TICKET_CLOSEInDolibarr=服務單%s已關閉
 TICKET_DELETEInDolibarr=服務單%s已刪除
 BOM_VALIDATEInDolibarr=物料清單(BOM)已驗證
 BOM_UNVALIDATEInDolibarr=物料清單(BOM)未驗證
-BOM_CLOSEInDolibarr=物料清單(BOM)已禁用
+BOM_CLOSEInDolibarr=物料清單已停用
 BOM_REOPENInDolibarr=物料清單(BOM)重新打開
 BOM_DELETEInDolibarr=物料清單(BOM)已刪除
 MRP_MO_VALIDATEInDolibarr=MO已驗證
@@ -152,6 +152,7 @@ ActionType=事件類別
 DateActionBegin=事件開始日期
 ConfirmCloneEvent=您確定要複製事件 <b>%s</b>?
 RepeatEvent=重覆事件
+OnceOnly=只有一次
 EveryWeek=每周
 EveryMonth=每月
 DayOfMonth=一個月中的某天
@@ -160,9 +161,9 @@ DateStartPlusOne=開始日 +1 小時
 SetAllEventsToTodo=將所有事件設定為待辦事項
 SetAllEventsToInProgress=將所有事件設定為進行中
 SetAllEventsToFinished=將所有事件設定為已完成
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
+ReminderTime=事件前的提醒時間
+TimeType=持續時間類型
+ReminderType=回調類型
+AddReminder=為此事件建立自動提醒通知
+ErrorReminderActionCommCreation=為此事件建立提醒通知時出現錯誤
+BrowserPush=查看彈出通知
diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
index 9efdccb1287..f3885f17658 100644
--- a/htdocs/langs/zh_TW/banks.lang
+++ b/htdocs/langs/zh_TW/banks.lang
@@ -173,10 +173,11 @@ SEPAMandate=歐洲統一支付區要求
 YourSEPAMandate=您的歐洲統一支付區要求
 FindYourSEPAMandate=這是您SEPA的授權，授權我們公司向您的銀行直接付款。退還已簽名（掃描已簽名文檔）或通過郵件發送至
 AutoReportLastAccountStatement=進行對帳時，自動用最後一個對帳單編號填寫“銀行對帳單編號”欄位
-CashControl=POS現金圍欄
-NewCashFence=新現金圍欄
+CashControl=POS cash desk control
+NewCashFence=New cash desk closing
 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
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index 6ff4433dde0..5e5158ca8af 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -11,9 +11,9 @@ BillsSuppliersUnpaidForCompany=%s的未付款供應商發票
 BillsLate=逾期付款
 BillsStatistics=客戶發票統計
 BillsStatisticsSuppliers=供應商發票統計
-DisabledBecauseDispatchedInBookkeeping=已經停用,因為發票已發送到記帳簿中
-DisabledBecauseNotLastInvoice=已停用，因為發票不可清除。在這之後一些發票已被紀錄，並且會在記數器上產生空洞。
-DisabledBecauseNotErasable=已停用,因為無法清除
+DisabledBecauseDispatchedInBookkeeping=已關閉,因為發票已發送到記帳簿中
+DisabledBecauseNotLastInvoice=已關閉,因為發票無法抹除。已有一些發票已在這之後被紀錄，並且會在計數器中產生破洞。
+DisabledBecauseNotErasable=已關閉,因為無法清除
 InvoiceStandard=標準發票
 InvoiceStandardAsk=標準發票
 InvoiceStandardDesc=此種發票為一般性發票。
@@ -22,16 +22,16 @@ InvoiceDepositAsk=預付款發票
 InvoiceDepositDesc=當收到預付款後，這種發票便完成了。
 InvoiceProForma=形式發票
 InvoiceProFormaAsk=形式發票
-InvoiceProFormaDesc=<b>形式發票</b>是發票的形式，但沒有真實的會計價值。
+InvoiceProFormaDesc=<b>預編發票</b>是真實發票的影像但沒有真實的會計值。
 InvoiceReplacement=替換發票
 InvoiceReplacementAsk=替換發票的發票
 InvoiceReplacementDesc=<b>替換發票</b>用於完全替換尚未收到付款的發票。 <br><br>注意：只能替換沒有付款的發票。如果您要替換的發票尚未關閉，它將自動關閉為“放棄”。
-InvoiceAvoir=信用票據(折讓單-credit notes)
-InvoiceAvoirAsk=信用票據(credit notes)用來更正發票
-InvoiceAvoirDesc=<b>信用票據</b>(折讓單-credit notes)是一種負值發票，用於更正發票顯示的金額與實際支付的金額不同的事實（例如，客戶誤付了太多，或者由於退還了某些產品而無法支付全部金額）`。
-invoiceAvoirWithLines=從原始發票中的行建立信用票據(折讓單-credit notes)
-invoiceAvoirWithPaymentRestAmount=建立有未付款提醒原始發票的信用票據(折讓單-credit notes)
-invoiceAvoirLineWithPaymentRestAmount=未付款提醒餘額的信用票據(折讓單-credit notes)
+InvoiceAvoir=同意折讓照會通知
+InvoiceAvoirAsk=同意折讓照會通知來更正發票
+InvoiceAvoirDesc=<b>同意折讓照會通知</b>就是交易中如有積欠對方款項，例如出貨的損害或錯誤的賠償等等，均可開立 Credit Note 給對方，表示我方願意賠償與還款的誠意，亦即我方欠對方多少錢的意思。（例如，客戶誤付了太多，或者由於退還了某些產品而無法支付全部金額）`。
+invoiceAvoirWithLines=從原始發票項目中建立同意折讓照會通知
+invoiceAvoirWithPaymentRestAmount=建立原始發票尚有未付款的同意折讓照會通知
+invoiceAvoirLineWithPaymentRestAmount=尚未付款金額的同意折讓照會通知
 ReplaceInvoice=替換發票%s
 ReplacementInvoice=替換發票
 ReplacedByInvoice=依發票%s替換
@@ -39,17 +39,17 @@ ReplacementByInvoice=依發票替換
 CorrectInvoice=正確發票%s
 CorrectionInvoice=更正發票
 UsedByInvoice=被用於支付發票%s
-ConsumedBy=消耗者
+ConsumedBy=消耗由
 NotConsumed=非消耗品
-NoReplacableInvoice=沒有可替換的發票
-NoInvoiceToCorrect=沒有任何發票(invoice)可以更正
-InvoiceHasAvoir=是一個或幾個信用票據(折讓單-credit notes)的來源
+NoReplacableInvoice=無可替換發票
+NoInvoiceToCorrect=無發票可更正
+InvoiceHasAvoir=是一個或幾個同意折讓照會通知的來源
 CardBill=發票卡
-PredefinedInvoices=預定義的發票
+PredefinedInvoices=預定義之發票
 Invoice=發票
 PdfInvoiceTitle=發票
 Invoices=發票
-InvoiceLine=發票行
+InvoiceLine=發票項目
 InvoiceCustomer=客戶發票
 CustomerInvoice=客戶發票
 CustomersInvoices=客戶發票
@@ -61,20 +61,20 @@ Payment=付款
 PaymentBack=退款
 CustomerInvoicePaymentBack=退款
 Payments=付款
-PaymentsBack=退回付款
+PaymentsBack=退款
 paymentInInvoiceCurrency=發票幣別
-PaidBack=退款
+PaidBack=償還
 DeletePayment=刪除付款
 ConfirmDeletePayment=您確定要刪除此付款？
-ConfirmConvertToReduc=您是否要將%s轉換為可用信用？
+ConfirmConvertToReduc=您是否要將%s轉換為可用貸項？
 ConfirmConvertToReduc2=此金額將保存在所有折扣中，並可用作此客戶目前或未來發票的折扣。
-ConfirmConvertToReducSupplier=您是否要將%s轉換為可用信用？
+ConfirmConvertToReducSupplier=您是否要將%s轉換為貸項？
 ConfirmConvertToReducSupplier2=此金額將保存在所有折扣中，並可用作此供應商目前或未來發票的折扣。
 SupplierPayments=供應商付款
 ReceivedPayments=收到付款
 ReceivedCustomersPayments=從客戶收到的付款
 PayedSuppliersPayments=支付給供應商的款項
-ReceivedCustomersPaymentsToValid=待驗證的客戶已付款單據
+ReceivedCustomersPaymentsToValid=收到客戶已付款去驗證
 PaymentsReportsForYear=%s的付款報告
 PaymentsReports=付款報告
 PaymentsAlreadyDone=付款已完成
@@ -83,27 +83,27 @@ PaymentRule=付款條件
 PaymentMode=付款類型
 PaymentTypeDC=借/貸卡片
 PaymentTypePP=PayPal
-IdPaymentMode=付款類型（ID）
+IdPaymentMode=付款類型 (id)
 CodePaymentMode=付款類型（編碼）
 LabelPaymentMode=付款類型（標籤）
 PaymentModeShort=付款類型
-PaymentTerm=付款期限
+PaymentTerm=付款條件
 PaymentConditions=付款條件
 PaymentConditionsShort=付款條件
 PaymentAmount=付款金額
-PaymentHigherThanReminderToPay=付款高於提醒付款金額
-HelpPaymentHigherThanReminderToPay=注意，一張或多張帳單的付款金額高於未付金額。<br>編輯您的輸入，否則請確認並考慮為每張超額支付的發票建立信用票據(折讓單-credit notes)。
-HelpPaymentHigherThanReminderToPaySupplier=注意，一張或多張帳單的付款金額高於未付金額。<br>編輯您的輸入，否則請確認並考慮為每張超額支付的發票建立信用票據(折讓單-credit notes)。
-ClassifyPaid=分類'已付款'
-ClassifyUnPaid=分類'未付款'
-ClassifyPaidPartially=分類'部份支付'
-ClassifyCanceled=分類'已放棄'
-ClassifyClosed=分類'已關閉'
-ClassifyUnBilled=分類'未開票'
+PaymentHigherThanReminderToPay=付款高於付款提醒金額
+HelpPaymentHigherThanReminderToPay=注意，一張或多張帳單的付款金額高於未付金額。<br>編輯您的輸入，否則請確認並考慮為每張超額支付的發票建立同意折讓照會通知。
+HelpPaymentHigherThanReminderToPaySupplier=注意，一張或多張帳單的付款金額高於未付金額。<br>編輯您的輸入，否則請確認並考慮為每張超額支付的發票建立同意折讓照會通知。
+ClassifyPaid=分類 '已付款'
+ClassifyUnPaid=分類 '未付款'
+ClassifyPaidPartially=分類 '部份支付'
+ClassifyCanceled=分類 '已放棄'
+ClassifyClosed=分類 '已結'
+ClassifyUnBilled=分類 '未支付'
 CreateBill=建立發票
-CreateCreditNote=建立信用票據(折讓單-credit notes)
-AddBill=建立發票或信用票據(折讓單-credit notes)
-AddToDraftInvoices=增加到草稿發票
+CreateCreditNote=建立同意折讓照會通知
+AddBill=建立發票或同意折讓照會通知
+AddToDraftInvoices=增加至發票草稿
 DeleteBill=刪除發票
 SearchACustomerInvoice=搜尋客戶發票
 SearchASupplierInvoice=搜尋供應商發票
@@ -116,13 +116,13 @@ ConvertExcessReceivedToReduc=將超額付款轉換為可用信用額
 ConvertExcessPaidToReduc=將超額付款轉換為可用折扣
 EnterPaymentReceivedFromCustomer=輸入從客戶收到的付款
 EnterPaymentDueToCustomer=應付客戶款項
-DisabledBecauseRemainderToPayIsZero=已禁用，因為剩餘的未付餘額為零
+DisabledBecauseRemainderToPayIsZero=已關閉,因為剩餘的未付餘額為零
 PriceBase=價格基準
 BillStatus=發票狀態
 StatusOfGeneratedInvoices=已產生發票的狀態
 BillStatusDraft=草稿（等待驗證）
 BillStatusPaid=已付款
-BillStatusPaidBackOrConverted=信用票據(折讓單-credit notes)退款或已標記為可貸
+BillStatusPaidBackOrConverted=同意折讓照會通知退款或已標記為貸項
 BillStatusConverted=已付款（已可在最終發票中消費）
 BillStatusCanceled=已放棄
 BillStatusValidated=已驗證（需要付費）
@@ -184,10 +184,10 @@ ConfirmCancelBill=您確定要取消發票<b>%s</b>嗎？
 ConfirmCancelBillQuestion=您為什麼要將此發票分類為“廢棄”？
 ConfirmClassifyPaidPartially=您確定要將發票<b>%s</b>更改為已付款狀態嗎？
 ConfirmClassifyPaidPartiallyQuestion=該發票尚未完全支付。關閉此發票的原因是什麼？
-ConfirmClassifyPaidPartiallyReasonAvoir=剩餘的未付款項<b>（%s %s）</b>是折扣，因為付款是在到期日前進行的。我用固定營業稅在信用票據(折讓單-credit notes)上。
+ConfirmClassifyPaidPartiallyReasonAvoir=剩餘未付款項<b>（%s %s）</b>同意為折扣，因為付款是在到期日前完成的。我調整了固定營業稅在同意折讓照會通知上。
 ConfirmClassifyPaidPartiallyReasonDiscount=未付款餘額<b>（%s %s）</b>是折扣，因為付款是在付款到期日前進行的。
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=未付款餘額<b>（%s %s）</b>是折扣，因為付款是在付款到期日前進行的。。我司接受此折扣不加營業稅。
-ConfirmClassifyPaidPartiallyReasonDiscountVat=未付款餘額<b>（%s %s）</b>是折扣，因為付款是在付款到期日前進行的。我可以在沒有信用票據(折讓單-credit notes)的情況下以這種折扣方式回復營業稅。
+ConfirmClassifyPaidPartiallyReasonDiscountVat=剩餘未付款項<b>(%s %s)</b>同意為折扣，因為付款是在付款到期日前完成的。我在沒有同意折讓照會通知的情況下以這種折扣方式恢復營業稅。
 ConfirmClassifyPaidPartiallyReasonBadCustomer=壞客戶
 ConfirmClassifyPaidPartiallyReasonProductReturned=產品部分退貨
 ConfirmClassifyPaidPartiallyReasonOther=因其他原因而放棄的金額
@@ -196,7 +196,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=在某些國家/地區，只
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=如果其他所有條件都不適合，請使用此選項
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>壞客戶</b>是拒絕付款的客戶。
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=由於部分產品已退還而付款未完成時，使用此選項
-ConfirmClassifyPaidPartiallyReasonOtherDesc=如果其他所有條件都不適合，請使用此選項，例如在以下情況下： <br> -付款不完整，因為一些產品被運回<br> -聲稱金額太重要，因為忘記了折扣<br>在所有情況下，都必須通過建立信用票據(折讓單-credit notes)在會計系統中更正超額的金額。
+ConfirmClassifyPaidPartiallyReasonOtherDesc=如果其他所有選項都不適用，請使用此選擇，例如在以下情況下: <br> - 付款不完整因為一些產品被運回<br> - 聲稱金額太重要因為忘記了折扣<br>在所有情況下，都必須建立同意折讓照會通知在會計系統中更正超額的金額。
 ConfirmClassifyAbandonReasonOther=其他
 ConfirmClassifyAbandonReasonOtherDesc=此選擇將在所有其他情況下使用。例如，因為您計劃建立替換發票。
 ConfirmCustomerPayment=您確認此為<b>%s</b> %s的付款金額？
@@ -210,7 +210,7 @@ AmountOfBills=發票金額
 AmountOfBillsHT=發票金額（稅後）
 AmountOfBillsByMonthHT=每月發票(invoice)金額（稅後）
 UseSituationInvoices=允許發票狀況
-UseSituationInvoicesCreditNote=允許發票狀況信用票據(折讓單-credit notes)
+UseSituationInvoicesCreditNote=允許狀況開立同意折讓照會通知
 Retainedwarranty=有保修
 AllowedInvoiceForRetainedWarranty=保留保固，可用於以下類型的發票
 RetainedwarrantyDefaultPercent=有保修預設百分比
@@ -228,7 +228,7 @@ RetainedWarrantyDateLimit=保修期限制
 RetainedWarrantyNeed100Percent=發票情況需要以100%%的進度顯示在PDF上
 AlreadyPaid=已付款
 AlreadyPaidBack=已償還
-AlreadyPaidNoCreditNotesNoDeposits=已付款（無信用票據(折讓單-credit notes)和預付款）
+AlreadyPaidNoCreditNotesNoDeposits=已付款 (無同意折讓照會通知及訂金）
 Abandoned=已放棄
 RemainderToPay=未付款餘額
 RemainderToTake=剩餘金額
@@ -287,18 +287,18 @@ AddRelativeDiscount=建立相對折扣
 EditRelativeDiscount=編輯相對折扣
 AddGlobalDiscount=新增絕對折扣
 EditGlobalDiscounts=編輯絕對折扣
-AddCreditNote=建立信用票據(折讓單-credit notes)
+AddCreditNote=建立同意折讓照會通知
 ShowDiscount=顯示折扣
 ShowReduc=顯示折扣
 ShowSourceInvoice=顯示來源發票
 RelativeDiscount=相對折扣
 GlobalDiscount=全域折扣
-CreditNote=信用票據(折讓單-credit notes)
-CreditNotes=信用票據(折讓單-credit notes)
-CreditNotesOrExcessReceived=信用票據(折讓單-credit notes)或收到的超額款項
+CreditNote=同意折讓照會通知
+CreditNotes=同意折讓照會通知
+CreditNotesOrExcessReceived=同意折讓照會通知或收到的超額款項
 Deposit=預付款
 Deposits=預付款
-DiscountFromCreditNote=信用票據(折讓單-credit notes)%s的折扣
+DiscountFromCreditNote=從同意折讓照會通知 %s的折扣
 DiscountFromDeposit=發票%s的預付款
 DiscountFromExcessReceived=付款超過發票%s
 DiscountFromExcessPaid=付款超過發票%s
@@ -336,7 +336,7 @@ RemoveDiscount=取消折扣
 WatermarkOnDraftBill=草案發票上的水印（如果為空，則一無所有）
 InvoiceNotChecked=未選擇發票
 ConfirmCloneInvoice=您確定要複製此發票<b>%s</b>嗎？
-DisabledBecauseReplacedInvoice=由於發票已被替換，因此操作被禁用
+DisabledBecauseReplacedInvoice=由於發票已被替換，因此操作被關閉
 DescTaxAndDividendsArea=該區域提供了所有特殊費用付款的摘要。這裡僅包括在固定年度內付款的記錄。
 NbOfPayments=付款編號
 SplitDiscount=將折扣分為兩部份
@@ -358,7 +358,7 @@ ListOfPreviousSituationInvoices=舊狀況發票清單
 ListOfNextSituationInvoices=下個狀況發票清單
 ListOfSituationInvoices=狀況發票的清單
 CurrentSituationTotal=目前狀況總數
-DisabledBecauseNotEnouthCreditNote=要從周期中刪除狀況發票，此發票的信用票據(折讓單-credit notes)總計必須涵蓋該發票總計
+DisabledBecauseNotEnouthCreditNote=要從周期中刪除狀況發票，發票的同意折讓照會通知總和必須補足此發票的總和
 RemoveSituationFromCycle=從周期中刪除此發票
 ConfirmRemoveSituationFromCycle=從周期中刪除此%s發票？
 ConfirmOuting=確認中
@@ -441,8 +441,8 @@ BankAccountNumberKey=校驗碼
 Residence=地址
 IBANNumber=IBAN帳號
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=客戶國際銀行帳戶號碼
+SupplierIBAN=供應商國際銀行帳戶號碼
 BIC=BIC / SWIFT
 BICNumber=BIC / SWIFT代碼
 ExtraInfos=額外信息
@@ -498,7 +498,7 @@ ExpectedToPay=預期付款
 CantRemoveConciliatedPayment=無法刪除對帳款
 PayedByThisPayment=支付這筆款項
 ClosePaidInvoicesAutomatically=完全付款後，將所有標準，預付款或替換發票自動分類為“已付款”。
-ClosePaidCreditNotesAutomatically=完全退款後，將所有信用票據(折讓單-credit notes)自動分類為“已付款”。
+ClosePaidCreditNotesAutomatically=當已完全退款後將所有同意折讓照會通知自動分類為 "已付款"。
 ClosePaidContributionsAutomatically=完全付款後，將所有社會或財政捐款自動分類為“已付款”。
 AllCompletelyPayedInvoiceWillBeClosed=所有沒有餘款的發票將自動關閉，狀態為“已付款”。
 ToMakePayment=付款
@@ -512,10 +512,10 @@ YouMustCreateStandardInvoiceFirstDesc=您必須先建立標準發票，然後將
 PDFCrabeDescription=發票PDF範本Crabe。完整的發票範本（Sponge範本的舊範本）
 PDFSpongeDescription=發票PDF範本Sponge。完整的發票範本
 PDFCrevetteDescription=發票PDF範本Crevette。狀況發票的完整發票範本
-TerreNumRefModelDesc1=退回編號格式，標準發票為%syymm-nnnn，信用票據(折讓單-credit notes)是%syymm-nnnn的格式，其中yy是年，mm是月，nnnn是不間斷且不返回0的序列
-MarsNumRefModelDesc1=退回編號格式,標準發票退回格式為%syymm-nnnn，替換發票為%syymm-nnnn，預付款發票為%syymm-nnnn，信用票據(折讓單-credit notes)為 %syymm-nnnn，其中yy是年,mm是月,nnnn不間斷且不返回0的序列
+TerreNumRefModelDesc1=轉回數字的格式，標準發票為%syymm-nnnn 及同意折讓照會通知是%syymm-nnnn，其中 yy 是年，mm 是月，nnnn 是無空白且不返回 0 的序列
+MarsNumRefModelDesc1=轉回數字格式，標準發票為%syymm-nnnn，替換發票為%syymm-nnnn，訂金發票為%syymm-nnnn，同意折讓照會通知為 %syymm-nnnn，其中 yy 是年，mm 是月，nnnn 為無空白且不返回 0 的序列
 TerreNumRefModelError=以$ syymm開頭的帳單已經存在，並且與該序列模型不符合。將其刪除或重新命名以啟動此模組。
-CactusNumRefModelDesc1=退回編號格式，標準發票的退回格式為%syymm-nnnn，信用票據(折讓單-credit notes)格式為%syymm-nnnn，預付款發票格式為%syymm-nnnn，其中yy為年，mm為月，nnnn為不間斷且不返回0的序列
+CactusNumRefModelDesc1=轉回數字格式，標準發票為%syymm-nnnn，同意折讓照會通知為%syymm-nnnn，訂金發票格式為%syymm-nnnn，其中 yy 為年，mm 為月，nnnn 為無空白且不返回0的序列
 EarlyClosingReason=提前關閉原因
 EarlyClosingComment=提前關閉註記
 ##### Types de contacts #####
@@ -531,6 +531,7 @@ TypeContact_invoice_supplier_external_SERVICE=供應商服務聯絡人
 InvoiceFirstSituationAsk=第一張狀況發票
 InvoiceFirstSituationDesc=<b>狀況發票</b>與進度（例如建築進度）相關的狀況相關聯。每種狀況都與發票相關。
 InvoiceSituation=狀況發票
+PDFInvoiceSituation=狀況發票
 InvoiceSituationAsk=根據狀況開具發票
 InvoiceSituationDesc=在已經存在的狀況下建立新的狀況
 SituationAmount=狀況發票金額（淨額）
@@ -539,7 +540,7 @@ ModifyAllLines=修改所有行
 CreateNextSituationInvoice=建立下一個狀況
 ErrorFindNextSituationInvoice=錯誤,無法找到下一個狀況周期參考
 ErrorOutingSituationInvoiceOnUpdate=無法為此狀況開票。
-ErrorOutingSituationInvoiceCreditNote=無法開立已連結的信用票據(折讓單-credit notes)。
+ErrorOutingSituationInvoiceCreditNote=無法開立已連結的同意折讓照會通知。
 NotLastInCycle=此發票不是周期中最新的，不能修改。
 DisabledBecauseNotLastInCycle=下一個狀況已經存在。
 DisabledBecauseFinal=此為最後狀況。
@@ -575,3 +576,7 @@ BILL_SUPPLIER_DELETEInDolibarr=供應商發票已刪除
 UnitPriceXQtyLessDiscount=單價 x 數量 - 折讓
 CustomersInvoicesArea=客戶計費區
 SupplierInvoicesArea=供應商付款區
+FacParentLine=發票的母行
+SituationTotalRayToRest=剩下的不含稅
+PDFSituationTitle=情況n°%d
+SituationTotalProgress=總進度%d %%
diff --git a/htdocs/langs/zh_TW/blockedlog.lang b/htdocs/langs/zh_TW/blockedlog.lang
index 98a1bcf5d5c..01d6e9d8300 100644
--- a/htdocs/langs/zh_TW/blockedlog.lang
+++ b/htdocs/langs/zh_TW/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=歸檔的日誌條目無效。這意味著某人（黑客？）在記錄後已經修改了該記錄的某些數據，或者刪除了先前的存檔記錄（檢查是否存在具有先前＃號的行）。
 OkCheckFingerprintValidity=歸檔日誌記錄有效。此行上的數據未修改，並且該條目位於上一個條目之後。
 OkCheckFingerprintValidityButChainIsKo=與以前的日誌相比，已歸檔的日誌似乎有效，但是先前的鏈已損壞。
 AddedByAuthority=已儲存到遠端授權中
@@ -35,7 +35,7 @@ logDON_DELETE=捐贈邏輯刪除
 logMEMBER_SUBSCRIPTION_CREATE=會員訂閱已建立
 logMEMBER_SUBSCRIPTION_MODIFY=會員訂閱已修改
 logMEMBER_SUBSCRIPTION_DELETE=會員訂閱邏輯刪除
-logCASHCONTROL_VALIDATE=現金圍欄記錄
+logCASHCONTROL_VALIDATE=收銀台結帳記錄
 BlockedLogBillDownload=客戶發票下載
 BlockedLogBillPreview=客戶發票預覽
 BlockedlogInfoDialog=日誌詳細訊息
@@ -46,9 +46,9 @@ logDOC_PREVIEW=預覽經過驗證的文件以進行列印或下載
 logDOC_DOWNLOAD=下載經過驗證的文件以進行列印或發送
 DataOfArchivedEvent=存檔事件的完整數據
 ImpossibleToReloadObject=未連結原始項目（類型為%s，編號為%s）（請參閱“完整數據”列以獲取不可更改的保存數據）
-BlockedLogAreRequiredByYourCountryLegislation=您所在國家/地區的法規可能要求使用不可更改的日誌模組。禁用此模組可能會使任何未來的交易在法律和法律軟件使用方面均無效，因為它們無法通過稅務審核進行驗證。
-BlockedLogActivatedBecauseRequiredByYourCountryLegislation=由於您所在國家/地區的法律，“不可更改的日誌”模組已啟用。禁用此模組可能會使任何未來的交易在法律和使用合法軟件方面均無效，因為它們無法通過稅務審核進行驗證。
-BlockedLogDisableNotAllowedForCountry=強制使用此模組的國家/地區清單（為防止錯誤地禁用此模組，如果您所在的國家/地區位於此清單中，則必須先編輯此清單才能禁用此模組。另外請注意，啟用/禁用此模組將被記錄到不可更改的日誌）。
+BlockedLogAreRequiredByYourCountryLegislation=您所在國家/地區的法規可能要求使用不可更改的日誌模組。關閉此模組可能會使任何未來的交易在法律和法律軟件使用方面均無效，因為它們無法通過稅務審核進行驗證。
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=由於您所在國家/地區的法律，“不可更改的日誌”模組已啟用。關閉此模組可能會使任何未來的交易在法律和使用合法軟件方面均無效，因為它們無法通過稅務審核進行驗證。
+BlockedLogDisableNotAllowedForCountry=強制使用此模組的國家/地區清單（為防止錯誤地關閉此模組，如果您所在的國家/地區位於此清單中，則必須先編輯此清單才能關閉此模組。另外請注意，啟用/關閉此模組將被記錄到不可更改的日誌）。
 OnlyNonValid=無效的
 TooManyRecordToScanRestrictFilters=記錄太多，無法掃描/分析。請使用更嚴格的過濾條件來限制清單。
 RestrictYearToExport=限制月/年匯出
diff --git a/htdocs/langs/zh_TW/boxes.lang b/htdocs/langs/zh_TW/boxes.lang
index 9dcff47deff..157b6a17cef 100644
--- a/htdocs/langs/zh_TW/boxes.lang
+++ b/htdocs/langs/zh_TW/boxes.lang
@@ -46,9 +46,12 @@ BoxTitleLastModifiedDonations=最新%s筆已修改捐贈
 BoxTitleLastModifiedExpenses=最新%s份已修改費用報告
 BoxTitleLatestModifiedBoms=最新%s筆已修改BOM
 BoxTitleLatestModifiedMos=最新%s筆已修改製造訂單
+BoxTitleLastOutstandingBillReached=超過最大未償還額的客戶
 BoxGlobalActivity=全球活動(發票、提案/建議書、訂單)
 BoxGoodCustomers=好客戶
 BoxTitleGoodCustomers=%s位好客戶
+BoxScheduledJobs=排程工作
+BoxTitleFunnelOfProspection=潛在漏斗
 FailedToRefreshDataInfoNotUpToDate=無法更新RSS流量。最近成功更新的日期：%s
 LastRefreshDate=最新更新日期
 NoRecordedBookmarks=未定義書籤。
@@ -83,8 +86,8 @@ BoxTitleLatestModifiedSupplierOrders=供應商訂單：最後修改的%s筆
 BoxTitleLastModifiedCustomerBills=客戶發票：最後修改的%s張
 BoxTitleLastModifiedCustomerOrders=銷售訂單：最後修改的%s筆
 BoxTitleLastModifiedPropals=最新%s筆修改的提案/建議書
-BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
-BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
+BoxTitleLatestModifiedJobPositions=最新已修改的工作%s
+BoxTitleLatestModifiedCandidatures=最新已修改的候選人%s
 ForCustomersInvoices=客戶發票
 ForCustomersOrders=客戶訂單
 ForProposals=提案/建議書
@@ -92,8 +95,8 @@ LastXMonthRolling=最新%s月份滾動
 ChooseBoxToAdd=將小工具加到您的控制板
 BoxAdded=小工具已加到您的控制板中
 BoxTitleUserBirthdaysOfMonth=本月的生日（用戶）
-BoxLastManualEntries=會計中的最後手動條目
-BoxTitleLastManualEntries=%s最新手動條目
+BoxLastManualEntries=Latest record in accountancy entered manually or without source document
+BoxTitleLastManualEntries=%s latest record entered manually or without source document
 NoRecordedManualEntries=會計中沒有手動條目
 BoxSuspenseAccount=用暫記帳戶計算會計操作
 BoxTitleSuspenseAccount=未分配的行數
@@ -102,5 +105,7 @@ SuspenseAccountNotDefined=未定義暫記帳戶
 BoxLastCustomerShipments=上次客戶發貨
 BoxTitleLastCustomerShipments=最新%s筆客戶發貨
 NoRecordedShipments=沒有已記錄的客戶發貨
+BoxCustomersOutstandingBillReached=達到最大客戶數
 # Pages
 AccountancyHome=會計
+ValidatedProjects=已驗證的專案
diff --git a/htdocs/langs/zh_TW/cashdesk.lang b/htdocs/langs/zh_TW/cashdesk.lang
index 59713d97ac3..e0d7525a4d7 100644
--- a/htdocs/langs/zh_TW/cashdesk.lang
+++ b/htdocs/langs/zh_TW/cashdesk.lang
@@ -12,16 +12,16 @@ CashDeskOn=在
 CashDeskThirdParty=合作方
 ShoppingCart=購物車
 NewSell=新銷售
-AddThisArticle=加入此文章
+AddThisArticle=加入此物品
 RestartSelling=回到銷售
 SellFinished=銷售完成
 PrintTicket=列印銷售單
 SendTicket=送出銷售單
-NoProductFound=未找到文章
+NoProductFound=未找到物品
 ProductFound=找到產品
-NoArticle=無文章
+NoArticle=沒有物品
 Identification=證明
-Article=文章
+Article=物品
 Difference=差異
 TotalTicket=全部銷售單
 NoVAT=此銷售沒有營業稅
@@ -29,7 +29,7 @@ Change=超額已收到
 BankToPay=付款帳戶
 ShowCompany=顯示公司
 ShowStock=顯示倉庫
-DeleteArticle=點擊刪除此文章
+DeleteArticle=點擊刪除此物品
 FilterRefOrLabelOrBC=搜索（參考/標籤）
 UserNeedPermissionToEditStockToUsePos=您要求減少由發票建立的庫存，所以使用POS的使用者需要具有編輯庫存的權限。
 DolibarrReceiptPrinter=Dolibarr 收據印表機
@@ -46,11 +46,11 @@ SearchProduct=搜尋商品
 Receipt=收據
 Header=頁首
 Footer=頁尾
-AmountAtEndOfPeriod=結束的金額（天，月或年）
+AmountAtEndOfPeriod=結算金額（天，月或年）
 TheoricalAmount=理論金額
 RealAmount=實際金額
-CashFence=現金圍欄
-CashFenceDone=本期現金圍欄完成
+CashFence=收銀台關閉
+CashFenceDone=本期收銀台關閉完成
 NbOfInvoices=發票數
 Paymentnumpad=輸入付款的便籤類型
 Numberspad=號碼便籤
@@ -77,7 +77,7 @@ POSModule=POS 模組
 BasicPhoneLayout=在手機上使用基本佈局
 SetupOfTerminalNotComplete=終端機%s的設定尚未完成
 DirectPayment=直接付款
-DirectPaymentButton=Add a "Direct cash payment" button
+DirectPaymentButton=增加“直接現金付款”按鈕
 InvoiceIsAlreadyValidated=發票已通過驗證
 NoLinesToBill=無計費項目
 CustomReceipt=自訂收據
@@ -94,13 +94,14 @@ TakeposConnectorMethodDescription=具有附加功能的外部模組。可以從
 PrintMethod=列印方式
 ReceiptPrinterMethodDescription=具有很多參數的強大方法。完全可定制的模板。無法從雲端列印。
 ByTerminal=依照站台
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
+TakeposNumpadUsePaymentIcon=在小鍵盤的付款按鈕上使用圖示而不是文字
 CashDeskRefNumberingModules=POS銷售編號模組
 CashDeskGenericMaskCodes6 = <br> <b> {TN} </b>標籤用於增加站台
 TakeposGroupSameProduct=群組相同產品線
 StartAParallelSale=開啟新的平行銷售
-ControlCashOpening=Control cash box at opening POS
-CloseCashFence=關閉現金圍籬
+SaleStartedAt=銷售開始於%s
+ControlCashOpening=在打開POS時控制現金彈出窗口
+CloseCashFence=關閉收銀台控制
 CashReport=現金報告
 MainPrinterToUse=要使用的主印表機
 OrderPrinterToUse=要使用的訂單印表機
@@ -112,13 +113,14 @@ RestaurantMenu=選單
 CustomerMenu=客戶選單
 ScanToMenu=掃描QR Code顯示選單
 ScanToOrder=掃描QR Code訂購
-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
+Appearance=出現
+HideCategoryImages=隱藏類別圖片
+HideProductImages=隱藏產品圖片
+NumberOfLinesToShow=要顯示的圖片行數
+DefineTablePlan=定義表格計劃
+GiftReceiptButton=增加“禮物收據”按鈕
+GiftReceipt=禮物收據
+ModuleReceiptPrinterMustBeEnabled=必須先啟用收據印表機模組
+AllowDelayedPayment=允許延遲付款
+PrintPaymentMethodOnReceipts=在收據上列印付款方式
+WeighingScale=秤重
diff --git a/htdocs/langs/zh_TW/categories.lang b/htdocs/langs/zh_TW/categories.lang
index 6935e5275bb..c92c7a709c4 100644
--- a/htdocs/langs/zh_TW/categories.lang
+++ b/htdocs/langs/zh_TW/categories.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=標籤/類別
-Rubriques=標籤/類別
-RubriquesTransactions=交易標籤/類別
-categories=標籤/類別
-NoCategoryYet=此類型沒有已建立的標籤/類別
+Rubrique=標籤/分類
+Rubriques=標籤/分類
+RubriquesTransactions=交易標籤/分類
+categories=標籤/分類
+NoCategoryYet=此類型沒有已建立的標籤/分類
 In=在
 AddIn=加入
 modify=修改
@@ -19,6 +19,7 @@ ProjectsCategoriesArea=專案標籤/類別區域
 UsersCategoriesArea=用戶標籤/類別區域
 SubCats=子類別
 CatList=標籤/類別清單
+CatListAll=標籤/分類清單（所有類型）
 NewCategory=新標籤/類別
 ModifCat=修改標籤/類別
 CatCreated=標籤/類別已建立
@@ -65,28 +66,34 @@ UsersCategoriesShort=用戶標籤/類別
 StockCategoriesShort=倉庫標籤/類別
 ThisCategoryHasNoItems=此類別內沒有任何項目。
 CategId=標籤/類別編號
-CatSupList=供應商標籤/類別清單
-CatCusList=客戶/潛在方標籤/類別清單
+ParentCategory=母標籤/分類
+ParentCategoryLabel=母標籤/分類的標籤
+CatSupList=供應商標籤/分類清單
+CatCusList=客戶/潛在客戶標籤/分類清單
 CatProdList=產品標籤/類別清單
 CatMemberList=會員標籤/類別清單
-CatContactList=聯絡人標籤/類別清單
-CatSupLinks=供應商與標籤/類別之間的連結
+CatContactList=聯絡人標籤/分類清單
+CatProjectsList=專案標籤/分類清單
+CatUsersList=用戶標籤/分類清單
+CatSupLinks=供應商與標籤/分類之間的連結
 CatCusLinks=客戶/潛在方與標籤/類別之間的連結
 CatContactsLinks=聯絡人/地址與標籤/類別之間的連結
 CatProdLinks=產品/服務與標籤/類別之間的連結
-CatProJectLinks=專案與標籤/類別之間的連結
+CatMembersLinks=會員與標籤/分類之間的連結
+CatProjectsLinks=專案與標籤/類別之間的連結
+CatUsersLinks=用戶與標籤/分類之間的連結
 DeleteFromCat=從標籤/類別中刪除
 ExtraFieldsCategories=補充屬性
 CategoriesSetup=標籤/類別設定
 CategorieRecursiv=自動連結到母標籤/母類別
 CategorieRecursivHelp=如果啟用此選項，當將產品增加到子類別時，產品也會增加到母類別中。
 AddProductServiceIntoCategory=新增以下產品/服務
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
+AddCustomerIntoCategory=分配類別給客戶
+AddSupplierIntoCategory=分配類別給供應商
 ShowCategory=顯示標籤/類別
 ByDefaultInList=預設在清單中
 ChooseCategory=選擇類別
-StocksCategoriesArea=Warehouses Categories
-ActionCommCategoriesArea=Events Categories
-WebsitePagesCategoriesArea=Page-Container Categories
+StocksCategoriesArea=倉庫類別
+ActionCommCategoriesArea=事件類別
+WebsitePagesCategoriesArea=頁面容器類別
 UseOrOperatorForCategories=類別的使用或運算
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index 1d83ed486ae..8bbc2a0225b 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (商業登記號碼)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=歐盟增值稅號
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (專業號碼)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=歐盟增值稅號
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (國家註冊)
@@ -148,7 +148,7 @@ ProfId1CH=UID-Nummer
 ProfId2CH=-
 ProfId3CH=Prof Id 1（聯邦碼）
 ProfId4CH=Prof Id 2（商業記錄碼）
-ProfId5CH=EORI number
+ProfId5CH=歐盟增值稅號
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (商業登記號碼)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=歐盟增值稅號
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 （社會安全號碼）
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (學院編號)
-ProfId5ES=EORI number
+ProfId5ES=歐盟增值稅號
 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=EORI number
+ProfId5FR=歐盟增值稅號
 ProfId6FR=-
 ProfId1GB=註冊號
 ProfId2GB=-
@@ -202,12 +202,12 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=歐盟增值稅號
 ProfId1LU=Id. prof. 1 (R.C.S.盧森堡)
 ProfId2LU=Id. prof. 2 (營業執照)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=歐盟增值稅號
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
@@ -225,13 +225,13 @@ ProfId1NL=KVK數字
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
-ProfId5NL=EORI number
+ProfId5NL=歐盟增值稅號
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2（社會安全號碼）
 ProfId3PT=Prof Id 3（商業記錄碼）
 ProfId4PT=Prof Id 4 (音樂學院)
-ProfId5PT=EORI number
+ProfId5PT=歐盟增值稅號
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -255,7 +255,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=EORI number
+ProfId5RO=歐盟增值稅號
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -358,8 +358,8 @@ VATIntraCheckableOnEUSite=檢查在歐盟區網站內的區內營業稅
 VATIntraManualCheck=您也可在歐盟網站以人工方式確認<a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=無法檢查。無法使用會員國家（%s）進行檢查服務。
 NorProspectNorCustomer=非潛在方或客戶
-JuridicalStatus=法人類型
-Workforce=Workforce
+JuridicalStatus=業務實體類型
+Workforce=員工
 Staff=僱員
 ProspectLevelShort=潛在等級
 ProspectLevel=潛在方的可能性
@@ -462,8 +462,8 @@ PaymentTermsSupplier=付款條件-供應商
 PaymentTypeBoth=付款方式-客戶和供應商
 MulticurrencyUsed=使用多幣種
 MulticurrencyCurrency=貨幣
-InEEC=Europe (EEC)
-RestOfEurope=Rest of Europe (EEC)
-OutOfEurope=Out of Europe (EEC)
-CurrentOutstandingBillLate=Current outstanding bill late
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
+InEEC=歐洲（EEC）
+RestOfEurope=歐洲其他地區（EEC）
+OutOfEurope=歐洲以外（EEC）
+CurrentOutstandingBillLate=目前拖欠帳單
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=請注意，根據您的產品價格設定，應在將產品增加到POS之前更改合作方。
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index 5465526e4ed..82b499908a9 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -69,7 +69,7 @@ SocialContribution=社會稅或財政稅
 SocialContributions=社會稅或財政稅
 SocialContributionsDeductibles=可抵扣的社會稅或財政稅
 SocialContributionsNondeductibles=不可抵扣的社會稅或財政稅
-DateOfSocialContribution=Date of social or fiscal tax
+DateOfSocialContribution=社會稅或財政稅的日期
 LabelContrib=捐助標籤
 TypeContrib=捐助類型
 MenuSpecialExpenses=特別支出
@@ -111,7 +111,7 @@ Refund=退款
 SocialContributionsPayments=社會/財政稅金
 ShowVatPayment=顯示營業稅稅金
 TotalToPay=支付總額
-BalanceVisibilityDependsOnSortAndFilters=當表格依%s升序排列並且已過濾為一個銀行帳戶時餘額才可顯示
+BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
 CustomerAccountancyCode=客戶會計代碼
 SupplierAccountancyCode=供應商會計代碼
 CustomerAccountancyCodeShort=客戶帳戶代碼
@@ -140,7 +140,7 @@ ConfirmDeleteSocialContribution=您確定要刪除此社會/財政稅金嗎？
 ExportDataset_tax_1=社會和財政稅金及繳稅
 CalcModeVATDebt=<b>%s承諾會計營業稅%s</b>模式.
 CalcModeVATEngagement=<b>%s收入-支出營業稅%s</b>模式.
-CalcModeDebt=分析已知並已記錄發票，即使尚未在分類帳中進行核算。
+CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
 CalcModeEngagement=分析已知並已記錄付款，即使尚未在分類帳中。
 CalcModeBookkeeping=分析記帳簿表中記錄的數據。
 CalcModeLT1= <b>客戶發票-供應商發票%s中的%sRE</b>模式
@@ -154,9 +154,9 @@ AnnualSummaryInputOutputMode=收支平衡表，年度匯總
 AnnualByCompanies=收入和支出餘額，依預定義帳戶組別
 AnnualByCompaniesDueDebtMode=收支平衡表，依預定義組別明細，模式<b>%s債權-債務%s</b>表示<b>承諾會計</b> 。
 AnnualByCompaniesInputOutputMode=收支平衡表，依預定義組別明細，方式<b>%s收入-支出%s</b>表示<b>現金會計</b> 。
-SeeReportInInputOutputMode=有關實際付款(即使尚未在分類帳中實際付款)的計算，請參閱%s付款分析%s。
-SeeReportInDueDebtMode=有關基於已記錄發票(即使尚未在分類帳中進行核算)的計算，請參閱%s發票分析%s。
-SeeReportInBookkeepingMode=請參閱<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>
 RulesAmountWithTaxIncluded=-顯示的金額包括所有稅費
 RulesResultDue=-包括無論是否付款的未結發票，費用，增值稅，捐贈。還包括已付款薪資。 <br>-它基於發票的開票日期以及費用或稅款的到期日。對於使用“薪資”模組定義的薪資，將使用付款的起息日。
 RulesResultInOut=-它包括發票，費用，營業稅和薪水的實際付款。 <br> -它基於發票，費用，營業稅和薪水的付款日期。捐贈的捐贈日期。
@@ -169,12 +169,15 @@ RulesResultBookkeepingPersonalized=它顯示會計帳戶分類帳中的記錄，
 SeePageForSetup=請參考選單<a href="%s">%s</a>進行設定
 DepositsAreNotIncluded=-未包含預付款發票
 DepositsAreIncluded=-包含預付款發票
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=合作方稅率2報告
 LT2ReportByCustomers=合作方稅率3報告
 LT1ReportByCustomersES=合作方RE報告
 LT2ReportByCustomersES=合作方IRPF報告
 VATReport=營業稅報告
 VATReportByPeriods=分期營業稅報告
+VATReportByMonth=每月營業稅報告
 VATReportByRates=營業稅率報告
 VATReportByThirdParties=合作方營業稅報告
 VATReportByCustomers=客戶銷售稅報告
diff --git a/htdocs/langs/zh_TW/contracts.lang b/htdocs/langs/zh_TW/contracts.lang
index d3e8619ee8c..8a6b57e2e85 100644
--- a/htdocs/langs/zh_TW/contracts.lang
+++ b/htdocs/langs/zh_TW/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=正在執行的服務
 MenuExpiredServices=已過期服務
 MenuClosedServices=已關閉服務
 NewContract=新合約
-NewContractSubscription=New contract or subscription
+NewContractSubscription=新合約或訂閱
 AddContract=建立合約
 DeleteAContract=刪除合約
 ActivateAllOnContract=啟動所有服務
diff --git a/htdocs/langs/zh_TW/cron.lang b/htdocs/langs/zh_TW/cron.lang
index b988bac33aa..7bc4d4b9d74 100644
--- a/htdocs/langs/zh_TW/cron.lang
+++ b/htdocs/langs/zh_TW/cron.lang
@@ -7,13 +7,14 @@ Permission23103 = 刪除預定工作
 Permission23104 = 執行預定工作
 # Admin
 CronSetup=預定工作管理設定
-URLToLaunchCronJobs=用於檢查和啟動合格cron作業的URL
-OrToLaunchASpecificJob=或是檢查並啟動特定工作
+URLToLaunchCronJobs=用於從瀏覽器檢查和啟動合格cron作業的網址
+OrToLaunchASpecificJob=或以瀏覽器檢查並啟動特定作業
 KeyForCronAccess=用於啟動cron作業URL的安全密鑰
 FileToLaunchCronJobs=命令列檢查並啟動合格的cron作業
 CronExplainHowToRunUnix=在Unix環境中，您應該使用以下crontab條目以每隔5分鐘執行命令行
 CronExplainHowToRunWin=在Microsoft（tm）Windows環境中，您可以使用“計劃任務”工具每5分鐘執行命令行
 CronMethodDoesNotExists=類別%s不包含任何方法%s
+CronMethodNotAllowed=類別%s中的方法%s在禁止方法的黑名單中
 CronJobDefDesc=Cron工作設定文件定義在模組描述符檔案中。啟動模組後，它們將被載入使用，因此您可以從管理員工具選單%s管理作業。
 CronJobProfiles=預定義cron工作配置文件清單
 # Menu
@@ -46,6 +47,7 @@ CronNbRun=啟動次數
 CronMaxRun=最大啟動次數
 CronEach=每一個
 JobFinished=工作已啟動並完成
+Scheduled=已預定工作
 #Page card
 CronAdd= 新增工作
 CronEvery=執行每個工作
@@ -56,7 +58,7 @@ CronNote=註解
 CronFieldMandatory=欄位%s為必填
 CronErrEndDateStartDt=結束日期不能早於開始日期
 StatusAtInstall=模組安裝狀態
-CronStatusActiveBtn=啓用
+CronStatusActiveBtn=計畫表
 CronStatusInactiveBtn=停用
 CronTaskInactive=此工作已停用
 CronId=Id
@@ -82,3 +84,8 @@ MakeLocalDatabaseDumpShort=本地資料庫備份
 MakeLocalDatabaseDump=建立本地資料庫備份。參數為：壓縮（“ gz”或“ bz”或“none”），備份類型（“ mysql”，“ pgsql”，“ auto”），1，"自動"或建立檔案名稱，要保留的備份檔案數
 WarningCronDelayed=請注意，出於性能目的，無論下一次執行已啟動工作的日期如何，您的工作執行最多可能會延遲%s小時。
 DATAPOLICYJob=資料清理器和匿名器
+JobXMustBeEnabled=必須啟用工作%s
+# Cron Boxes
+LastExecutedScheduledJob=最後執行的計劃工作
+NextScheduledJobExecute=下一個要預定要執行的工作
+NumberScheduledJobError=錯誤的預定工作數量
diff --git a/htdocs/langs/zh_TW/deliveries.lang b/htdocs/langs/zh_TW/deliveries.lang
index dd26d50ec74..489be238c4e 100644
--- a/htdocs/langs/zh_TW/deliveries.lang
+++ b/htdocs/langs/zh_TW/deliveries.lang
@@ -27,5 +27,6 @@ Recipient=收貨人
 ErrorStockIsNotEnough=庫存不足
 Shippable=可運送
 NonShippable=無法運送
+ShowShippableStatus=顯示可運送狀態
 ShowReceiving=顯示交貨單
 NonExistentOrder=不存在的訂單
diff --git a/htdocs/langs/zh_TW/ecm.lang b/htdocs/langs/zh_TW/ecm.lang
index c39a9af9b35..155f77c6998 100644
--- a/htdocs/langs/zh_TW/ecm.lang
+++ b/htdocs/langs/zh_TW/ecm.lang
@@ -23,7 +23,7 @@ ECMSearchByKeywords=搜尋關鍵字
 ECMSearchByEntity=搜尋對象
 ECMSectionOfDocuments=目錄中的文件
 ECMTypeAuto=自動
-ECMDocsBy=Documents linked to %s
+ECMDocsBy=已連結到%s的文件
 ECMNoDirectoryYet=未建立資料夾
 ShowECMSection=顯示資料夾
 DeleteSection=刪除資料夾
@@ -40,4 +40,4 @@ NoDirectoriesFound=找不到目錄
 FileNotYetIndexedInDatabase=檔案尚未編入資料庫（嘗試重新上傳）
 ExtraFieldsEcmFiles=Extrafields Ecm Files
 ExtraFieldsEcmDirectories=Extrafields Ecm Directories
-ECMSetup=ECM Setup
+ECMSetup=ECM設定
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 4eebe27f1aa..f4f7a6ed0cc 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -5,8 +5,10 @@ NoErrorCommitIsDone=我們保證沒有錯誤
 # Errors
 ErrorButCommitIsDone=發現錯誤，但儘管如此我們仍進行驗證
 ErrorBadEMail=電子郵件%s錯誤
+ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record)
 ErrorBadUrl=網址%s錯誤
 ErrorBadValueForParamNotAString=您的參數值錯誤。一般在轉譯遺失時產生。
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorLoginAlreadyExists=登入者%s已經存在。
 ErrorGroupAlreadyExists=群組%s已經存在。
 ErrorRecordNotFound=記錄沒有找到。
@@ -48,6 +50,7 @@ ErrorFieldsRequired=一些必要的欄位都沒有填入。
 ErrorSubjectIsRequired=電子郵件主題為必填
 ErrorFailedToCreateDir=無法建立資料夾。檢查網頁伺服器中的用戶有權限寫入Dolibarr檔案資料夾。如果PHP使用了參數<b>safe_mode</b>，檢查網頁伺服器的用戶（或群組）擁有Dolibarr php檔案。
 ErrorNoMailDefinedForThisUser=沒有此用戶的定義郵件
+ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=此功能需要啟動Javascript。需要變更請前往設定 - 顯示。
 ErrorTopMenuMustHaveAParentWithId0=一個類型'頂部'選單不能有一個母選單。在母選單填入0或選擇一個類型為'左'的選單。
 ErrorLeftMenuMustHaveAParentId=一個類型為'左'的選單必須有一個母選單的ID。
@@ -75,7 +78,7 @@ ErrorExportDuplicateProfil=此匯出設定已存在此設定檔案名稱。
 ErrorLDAPSetupNotComplete=Dolibarr與LDAP的匹配不完整。
 ErrorLDAPMakeManualTest=.ldif檔案已在資料夾%s中.請以命令行手動讀取以得到更多的錯誤信息。
 ErrorCantSaveADoneUserWithZeroPercentage=如果填寫了“完成者”欄位，則無法使用“狀態未開始”保存操作。
-ErrorRefAlreadyExists=建立參考已經存在。
+ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
 ErrorPleaseTypeBankTransactionReportName=請輸入必須在報告條目中的銀行對帳單名稱（格式YYYYMM或YYYYMMDD）
 ErrorRecordHasChildren=因為有子記錄所以刪除失敗。
 ErrorRecordHasAtLeastOneChildOfType=項目至少有一個子類別%s
@@ -216,7 +219,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=您必須選擇商品是否為預
 ErrorDiscountLargerThanRemainToPaySplitItBefore=您嘗試使用的折扣大於剩餘的折扣。將之前的折扣分成2個較小的折扣。
 ErrorFileNotFoundWithSharedLink=找不到檔案。可能是共享金鑰最近被修改或檔案被刪除了。
 ErrorProductBarCodeAlreadyExists=產品條碼%s已存在於另一個產品參考上。
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=另請注意，當至少一個子產品（或子產品的子產品）需要序列號/批號時，無法使用虛擬產品自動增加/減少子產品。
+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=對於帶有免費產品的行，必須進行描述說明
 ErrorAPageWithThisNameOrAliasAlreadyExists=此頁面/容器<strong>%s</strong>與您嘗試使用的名稱/別名相同
 ErrorDuringChartLoad=載入會計科目表時出錯。如果幾個帳戶沒有被載入，您仍然可以手動輸入。
@@ -226,8 +229,8 @@ ErrorURLMustStartWithHttp=網址 %s 必須以 http://或https://開始
 ErrorNewRefIsAlreadyUsed=錯誤，新參考已被使用
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=錯誤，無法刪除連結到已關閉發票的付款。
 ErrorSearchCriteriaTooSmall=搜尋條件太小。
-ErrorObjectMustHaveStatusActiveToBeDisabled=項目必須具有“活動”狀態才能被禁用
-ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=要啟用的項目必須具有“草稿”或“已禁用”狀態
+ErrorObjectMustHaveStatusActiveToBeDisabled=項目必須具有“啟用”狀態才能被關閉
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=要啟用的項目必須具有“草稿”或“已關閉”狀態
 ErrorNoFieldWithAttributeShowoncombobox=沒有欄位在項目“ %s”的定義中具有屬性“ showoncombobox”。無法顯示組合清單。
 ErrorFieldRequiredForProduct=產品%s必須有欄位'%s'
 ProblemIsInSetupOfTerminal=問題在於站台%s的設定。
@@ -243,9 +246,19 @@ ErrorReplaceStringEmpty=錯誤，要替換的字串為空
 ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
 ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
 ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
+ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
+ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
+ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorPublicInterfaceNotEnabled=未啟用公共界面
+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
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=您的PHP參數upload_max_filesize（%s）高於PHP參數post_max_size（%s）。這不是相同的設定。
-WarningPasswordSetWithNoAccount=為此會員設定了密碼。但是，沒有建立用戶帳戶。因此，雖然密碼已儲存，但不能用於登入Dolibarr。外部模組/界面可以使用它，但是如果您不需要為會員定義任何登入名稱或密碼，則可以從會員模組設定中禁用選項“管理每個會員的登入名稱”。如果您需要管理登入名稱但不需要任何密碼，則可以將此欄位保留為空白以避免此警告。注意：如果會員連結到用戶，電子郵件也可以用作登入名稱。
+WarningPasswordSetWithNoAccount=為此會員設定了密碼。但是，沒有建立用戶帳戶。因此，雖然密碼已儲存，但不能用於登入Dolibarr。外部模組/界面可以使用它，但是如果您不需要為會員定義任何登入名稱或密碼，則可以從會員模組設定中關閉選項“管理每個會員的登入名稱”。如果您需要管理登入名稱但不需要任何密碼，則可以將此欄位保留為空白以避免此警告。注意：如果會員連結到用戶，電子郵件也可以用作登入名稱。
 WarningMandatorySetupNotComplete=點擊此處設定必填參數
 WarningEnableYourModulesApplications=點擊此處啟用您的模組和應用程式
 WarningSafeModeOnCheckExecDir=警告，PHP選項<b>safe_mode</b>處於開啟狀態，因此命令必須儲存在php參數<b>safe_mode_exec_dir</b>聲明的資料夾內。
@@ -259,7 +272,7 @@ WarningUntilDirRemoved=只要存在此漏洞（或在設定->其他設定中增
 WarningCloseAlways=警告，即使來源元件和目標元件之間的數量不同，也將關閉。請謹慎啟用此功能。
 WarningUsingThisBoxSlowDown=警告，使用此框會嚴重降低顯示此框所有頁面的速度。
 WarningClickToDialUserSetupNotComplete=您用戶的ClickToDial資訊設定尚未完成（請參閱用戶卡上的ClickToDial分頁）。
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=當針對盲人或文字瀏覽器優化了顯示設定時，此功能將被禁用。
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=當針對盲人或文字瀏覽器優化了顯示設定時，此功能將被關閉。
 WarningPaymentDateLowerThanInvoiceDate=付款日期（%s）早於發票%s的發票日期（%s）。
 WarningTooManyDataPleaseUseMoreFilters= 資料太多（超過%s行）。請使用更多過濾器或將常數%s設定為更高的上限。
 WarningSomeLinesWithNullHourlyRate=某些用戶記錄了某些時間，但未定義其小時費率。%s每小時使用的值為0 ，但這可能會導致錯誤的花費時間評估。
@@ -267,6 +280,10 @@ WarningYourLoginWasModifiedPleaseLogin=您的登入名稱已修改。為了安
 WarningAnEntryAlreadyExistForTransKey=此語言的翻譯密鑰條目已存在
 WarningNumberOfRecipientIsRestrictedInMassAction=警告，在清單上使用批次操作時，其他收件人的數量限制為<b>%s</b>
 WarningDateOfLineMustBeInExpenseReportRange=警告，行的日期不在費用報告的範圍內
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=專案已關閉。您必須先重新打開它。
 WarningSomeBankTransactionByChequeWereRemovedAfter=在產生包括它們的收據之後，一些銀行交易將被刪除。因此支票的數量和收據的數量可能與清單中的數量和總數有所不同。
-WarningFailedToAddFileIntoDatabaseIndex=警告，無法將檔案項目增加到ECM資料庫索引表中
+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.
diff --git a/htdocs/langs/zh_TW/exports.lang b/htdocs/langs/zh_TW/exports.lang
index 7c8d3f0d1dd..721e44dfde2 100644
--- a/htdocs/langs/zh_TW/exports.lang
+++ b/htdocs/langs/zh_TW/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=欄位標題
 NowClickToGenerateToBuildExportFile=現在，在組合框中選擇檔案格式，然後點擊“產生”以建立匯出檔案...
 AvailableFormats=可用格式
 LibraryShort=程式庫
+ExportCsvSeparator=CSV字符分隔器
+ImportCsvSeparator=CSV字符分隔器
 Step=步驟
 FormatedImport=匯入小幫手
 FormatedImportDesc1=此模組允許您更新現有資料或增加新項目到資料庫中而不需要專業技術知識,只須使用小幫手。
@@ -131,3 +133,4 @@ KeysToUseForUpdates=用於<b>更新</b>現有資料的鍵（欄）
 NbInsert=已插入的行數：%s
 NbUpdate=已更新的行數：%s
 MultipleRecordFoundWithTheseFilters=使用過濾器找到了多個記錄：%s
+StocksWithBatch=具有批次/序號產品的庫存和位置（倉庫）
diff --git a/htdocs/langs/zh_TW/hrm.lang b/htdocs/langs/zh_TW/hrm.lang
index 3e8d938470d..e62a5430c67 100644
--- a/htdocs/langs/zh_TW/hrm.lang
+++ b/htdocs/langs/zh_TW/hrm.lang
@@ -16,4 +16,4 @@ DictionaryFunction=人力資源管理-職位
 Employees=員工
 Employee=員工
 NewEmployee=新員工
-ListOfEmployees=List of employees
+ListOfEmployees=員工名單
diff --git a/htdocs/langs/zh_TW/install.lang b/htdocs/langs/zh_TW/install.lang
index c785b848207..a717552589b 100644
--- a/htdocs/langs/zh_TW/install.lang
+++ b/htdocs/langs/zh_TW/install.lang
@@ -209,7 +209,7 @@ MigrationResetBlockedLog=為v7 algorithm重置模組"被阻止的日誌(Blocked
 ShowNotAvailableOptions=顯示不可用的選項
 HideNotAvailableOptions=隱藏不可用的選項
 ErrorFoundDuringMigration=在移轉過程中出現了錯誤，因此無法進行下一步。要忽略錯誤，可以<a href="%s">點擊此處</a> ，但是在解決錯誤之前，該應用程序或某些功能可能無法正常運行。
-YouTryInstallDisabledByDirLock=該應用程式嘗試進行自我升級，但是出於安全性考慮，已禁用了安裝/升級頁面（使用.lock後綴重命名資料夾）。 <br>
+YouTryInstallDisabledByDirLock=該應用程式嘗試進行自我升級，但是出於安全性考慮，已禁用了安裝/升級頁面（使用.lock副檔名重新命名資料夾）。 <br>
 YouTryInstallDisabledByFileLock=此應用程式嘗試進行自我升級，但是出於安全性考慮，已禁用了安裝/升級頁面（由於dolibarr檔案資料夾中存在鎖定文件<strong>install.lock</strong> ）。 <br>
 ClickHereToGoToApp=點擊此處前往您的應用程式
 ClickOnLinkOrRemoveManualy=如果正在進行升級，請等待。如果沒有，請點擊以下連結。如果始終看到同一頁面，則必須在documents資料夾中刪除/重新命名install.lock檔案。
diff --git a/htdocs/langs/zh_TW/intracommreport.lang b/htdocs/langs/zh_TW/intracommreport.lang
index f6373cf6009..1cb77c19dc7 100644
--- a/htdocs/langs/zh_TW/intracommreport.lang
+++ b/htdocs/langs/zh_TW/intracommreport.lang
@@ -1,4 +1,4 @@
-Module68000Name = Intracomm report
+Module68000Name = 通訊報告
 Module68000Desc = Intracomm report management (Support for French DEB/DES format)
 IntracommReportSetup = Intracommreport module setup
 IntracommReportAbout = About intracommreport
@@ -14,16 +14,16 @@ 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=通訊報告
 MenuIntracommReportNew=New declaration
 MenuIntracommReportList=清單
 
 # View
 NewDeclaration=New declaration
 Declaration=Declaration
-AnalysisPeriod=Analysis period
+AnalysisPeriod=分析期間
 TypeOfDeclaration=Type of declaration
-DEB=Goods exchange declaration (DEB)
+DEB=貨物交換報關單（DEB）
 DES=Services exchange declaration (DES)
 
 # Export page
@@ -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/zh_TW/languages.lang b/htdocs/langs/zh_TW/languages.lang
index 8c2475ca6ca..2c762a9075b 100644
--- a/htdocs/langs/zh_TW/languages.lang
+++ b/htdocs/langs/zh_TW/languages.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_am_ET=Ethiopian
+Language_am_ET=衣索比亞
 Language_ar_AR=阿拉伯語
 Language_ar_EG=阿拉伯語（埃及）
 Language_ar_SA=阿拉伯語
-Language_az_AZ=Azerbaijani
+Language_az_AZ=亞塞拜然
 Language_bn_BD=孟加拉語
-Language_bn_IN=Bengali (India)
+Language_bn_IN=孟加拉語（印度）
 Language_bg_BG=保加利亞語
 Language_bs_BA=波斯尼亞語
 Language_ca_ES=加泰羅尼亞語
@@ -23,7 +23,7 @@ Language_en_GB=英語（英國）
 Language_en_IN=英國（印度）
 Language_en_NZ=英語（紐西蘭）
 Language_en_SA=英语 (沙特阿拉伯)
-Language_en_SG=English (Singapore)
+Language_en_SG=英文（新加坡）
 Language_en_US=英語（美國）
 Language_en_ZA=英語（南非）
 Language_es_ES=西班牙語
@@ -33,16 +33,16 @@ Language_es_CL=西班牙語（智利）
 Language_es_CO=西班牙語（哥倫比亞）
 Language_es_DO=西班牙語（多明尼加共和國）
 Language_es_EC=西班牙語（厄瓜多爾）
-Language_es_GT=Spanish (Guatemala)
+Language_es_GT=西班牙語（瓜地馬拉）
 Language_es_HN=西班牙語（洪都拉斯）
 Language_es_MX=西班牙語（墨西哥）
 Language_es_PA=西班牙語（巴拿馬）
 Language_es_PY=西班牙語（巴拉圭）
 Language_es_PE=西班牙語（秘魯）
 Language_es_PR=西班牙語（波多黎各）
-Language_es_US=Spanish (USA)
+Language_es_US=西班牙語（美國）
 Language_es_UY=西班牙語（烏拉圭）
-Language_es_GT=Spanish (Guatemala)
+Language_es_GT=西班牙語（瓜地馬拉）
 Language_es_VE=西班牙語（委內瑞拉）
 Language_et_EE=愛沙尼亞語
 Language_eu_ES=巴斯克語
@@ -51,22 +51,22 @@ Language_fi_FI=芬蘭語
 Language_fr_BE=法語（比利時）
 Language_fr_CA=法語（加拿大）
 Language_fr_CH=法語（瑞士）
-Language_fr_CI=French (Cost Ivory)
-Language_fr_CM=French (Cameroun)
+Language_fr_CI=法語（象牙海岸）
+Language_fr_CM=法語（喀麥隆）
 Language_fr_FR=法語
-Language_fr_GA=French (Gabon)
+Language_fr_GA=法語（加彭）
 Language_fr_NC=法語 (新喀里多尼亞)
-Language_fr_SN=French (Senegal)
+Language_fr_SN=法語（塞內加爾）
 Language_fy_NL=弗里斯蘭語
-Language_gl_ES=Galician
+Language_gl_ES=加利西亞語
 Language_he_IL=希伯來語
-Language_hi_IN=Hindi (India)
+Language_hi_IN=印地語（印度）
 Language_hr_HR=克羅地亞語
 Language_hu_HU=匈牙利語
 Language_id_ID=印尼語
 Language_is_IS=冰島語
 Language_it_IT=意大利語
-Language_it_CH=Italian (Switzerland)
+Language_it_CH=義大利文（瑞士）
 Language_ja_JP=日語
 Language_ka_GE=格魯吉亞人語
 Language_km_KH=高棉語
@@ -78,7 +78,7 @@ Language_lv_LV=拉脫維亞語
 Language_mk_MK=馬其頓語
 Language_mn_MN=蒙古語
 Language_nb_NO=挪威語（Bokmål）
-Language_ne_NP=Nepali
+Language_ne_NP=尼泊爾語
 Language_nl_BE=荷蘭語（比利時）
 Language_nl_NL=荷蘭人
 Language_pl_PL=波蘭語
@@ -101,5 +101,5 @@ Language_uz_UZ=烏茲別克語
 Language_vi_VN=越南語
 Language_zh_CN=簡體中文
 Language_zh_TW=繁體中文
-Language_zh_HK=Chinese (Hong Kong)
+Language_zh_HK=中文（香港）
 Language_bh_MY=馬來語
diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
index 1ca5e5ccdb1..c8ad519aa7c 100644
--- a/htdocs/langs/zh_TW/mails.lang
+++ b/htdocs/langs/zh_TW/mails.lang
@@ -92,6 +92,7 @@ MailingModuleDescEmailsFromUser=用戶輸入的電子郵件
 MailingModuleDescDolibarrUsers=擁有電子郵件的用戶
 MailingModuleDescThirdPartiesByCategories=合作方（依類別）
 SendingFromWebInterfaceIsNotAllowed=不允許從Web界面發送。
+EmailCollectorFilterDesc=All filters must match to have an email being collected
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=在檔案%s的行
@@ -125,12 +126,13 @@ TagMailtoEmail=收件人電子郵件（包括html“ mailto：”連結）
 NoEmailSentBadSenderOrRecipientEmail=沒有發送電子郵件。寄件人或收件人的電子郵件不正確。驗證用戶資料。
 # Module Notifications
 Notifications=通知
-NoNotificationsWillBeSent=沒有為此事件和公司計畫的電子郵件通知
-ANotificationsWillBeSent=1個通知將通過電子郵件發送
-SomeNotificationsWillBeSent=%s的通知將通過電子郵件發送
-AddNewNotification=啟動新的電子郵件通知目標/事件
-ListOfActiveNotifications=列出所有活動目標/事件以進行電子郵件通知
-ListOfNotificationsDone=列出所有發送電子郵件通知
+NotificationsAuto=自動通知。
+NoNotificationsWillBeSent=沒有為此類型事件和公司計畫的自動電子郵件通知
+ANotificationsWillBeSent=1條自動通知將以電子郵件寄送
+SomeNotificationsWillBeSent=%s的自動通知將以電子郵件寄送
+AddNewNotification=Subscribe to a new automatic email notification (target/event)
+ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification
+ListOfNotificationsDone=列出所有已寄送的自動電子郵件通知
 MailSendSetupIs=電子郵件發送的設定已設定為“ %s”。此模式不能用於發送批次電子郵件。
 MailSendSetupIs2=您必須先使用管理員帳戶進入選單%s首頁-設定-EMails%s以將參數<strong>'%s'</strong>更改為使用模式 '%s'。使用此模式 ，您可以輸入Internet服務供應商提供的SMTP伺服器的設定，並使用批次電子郵件功能。
 MailSendSetupIs3=如果對如何設定SMTP伺服器有任何疑問，可以詢問%s。
@@ -140,7 +142,7 @@ UseFormatFileEmailToTarget=匯入檔案的格式必須為<strong>電子郵件; 
 UseFormatInputEmailToTarget=輸入字串格式為<strong>電子郵件; 姓;名;其他</strong>
 MailAdvTargetRecipients=收件人（進階選項）
 AdvTgtTitle=填寫輸入欄位以預先選擇合作方或聯絡人/地址
-AdvTgtSearchTextHelp=使用%%作為通用字元。例如，要尋找像是<b>jean，joe，jim</b>的所有項目，可以輸入 <b>j%%</b> ，也可以使用;作為數值的分隔字元，並使用！排除此值。例如 <b>jean;joe;jim%%;!jimo;!jima%</b> 將會指向所有沒有jimo與所有以jima開始的jean,joe
+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=使用空格選擇整數或浮點值
 AdvTgtMinVal=最小值
 AdvTgtMaxVal=最大值
@@ -162,13 +164,16 @@ AdvTgtCreateFilter=建立過濾器
 AdvTgtOrCreateNewFilter=新過濾器名稱
 NoContactWithCategoryFound=找不到具有類別的聯絡人/地址
 NoContactLinkedToThirdpartieWithCategoryFound=找不到具有類別的聯絡人/地址
-OutGoingEmailSetup=發送電子郵件設定
-InGoingEmailSetup=接收電子郵件設定
-OutGoingEmailSetupForEmailing=外送電子郵件設定（用於模組%s）
-DefaultOutgoingEmailSetup=預設發送電子郵件設定
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
+DefaultOutgoingEmailSetup=與全域寄送電子郵件設定相同的配置
 Information=資訊
 ContactsWithThirdpartyFilter=帶有合作方過濾器的聯絡人
-Unanswered=Unanswered
+Unanswered=未回應
 Answered=已回覆
-IsNotAnAnswer=Is not answer (initial email)
-IsAnAnswer=Is an answer of an initial email
+IsNotAnAnswer=未回應（原始電子郵件）
+IsAnAnswer=是一封原始電子郵件的回應
+RecordCreatedByEmailCollector=由電子郵件收集器%s從電子郵件%s建立的記錄
+DefaultBlacklistMailingStatus=Default contact status for refuse bulk emailing
+DefaultStatusEmptyMandatory=Empty but mandatory
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index abc5ed6e22c..74cc374cb06 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -28,7 +28,9 @@ NoTemplateDefined=此電子郵件類別沒有可用的範本
 AvailableVariables=可用的替代變數
 NoTranslation=沒有翻譯
 Translation=翻譯
+CurrentTimeZone=PHP (伺服器)時區
 EmptySearchString=輸入非空白的搜索字串
+EnterADateCriteria=輸入日期條件
 NoRecordFound=沒有找到任何紀錄
 NoRecordDeleted=沒有刪除記錄
 NotEnoughDataYet=沒有足夠資料
@@ -85,6 +87,8 @@ FileWasNotUploaded=所選定的檔案尚未上傳。點選 "附加檔案"。
 NbOfEntries=項目數量
 GoToWikiHelpPage=讀取線上幫助 (需要連上網路)
 GoToHelpPage=讀取幫助
+DedicatedPageAvailable=There is a dedicated help page related to your current screen
+HomePage=首頁
 RecordSaved=記錄已儲存
 RecordDeleted=記錄已刪除
 RecordGenerated=記錄已產生
@@ -147,8 +151,8 @@ NotClosed=尚未關閉
 Enabled=已啟用
 Enable=啓用
 Deprecated=已棄用
-Disable=禁用
-Disabled=已禁用
+Disable=關閉
+Disabled=已關閉
 Add=新增
 AddLink=新增連結
 RemoveLink=移除連結
@@ -197,7 +201,7 @@ ReOpen=重新公開
 Upload=上傳
 ToLink=連線
 Select=選擇
-SelectAll=Select all
+SelectAll=全選
 Choose=選擇
 Resize=調整大小
 ResizeOrCrop=調整大小或裁剪
@@ -210,7 +214,7 @@ Groups=群組
 NoUserGroupDefined=未定義用戶群組
 Password=密碼
 PasswordRetype=重新輸入您的密碼
-NoteSomeFeaturesAreDisabled=請注意在這個示範中多項功能/模組已禁用。
+NoteSomeFeaturesAreDisabled=請注意在這個示範中多項功能/模組已關閉。
 Name=名稱
 NameSlashCompany=姓名/公司
 Person=人員
@@ -220,6 +224,7 @@ Value=值
 PersonalValue=個人設定值
 NewObject=新 %s
 NewValue=新值
+OldValue=Old value %s
 CurrentValue=目前值
 Code=代碼
 Type=類型
@@ -258,7 +263,7 @@ Cards=資訊卡
 Card=資訊卡
 Now=現在
 HourStart=開始(時)
-Deadline=Deadline
+Deadline=最後期限
 Date=日期
 DateAndHour=日期及小時
 DateToday=今日日期
@@ -433,6 +438,7 @@ RemainToPay=保持付款
 Module=模組/應用程式
 Modules=模組/應用程式
 Option=選項
+Filters=Filters
 List=清單
 FullList=全部清單
 FullConversation=全部轉換
@@ -494,7 +500,7 @@ By=由
 From=從
 FromDate=從
 FromLocation=從
-at=at
+at=在
 to=至
 To=至
 and=和
@@ -650,6 +656,7 @@ SupplierPreview=供應商預覽資訊
 ShowCustomerPreview=顯示客戶預覽資訊
 ShowSupplierPreview=顯示供應商預覽
 RefCustomer=參考客戶
+InternalRef=Internal ref.
 Currency=貨幣
 InfoAdmin=管理員資訊
 Undo=復原
@@ -689,7 +696,7 @@ RecordsModified=%s記錄已修改
 RecordsDeleted=%s記錄已刪除
 RecordsGenerated=%s記錄已產生
 AutomaticCode=自動代碼
-FeatureDisabled=功能已禁用
+FeatureDisabled=功能已關閉
 MoveBox=移動小工具
 Offered=已提供
 NotEnoughPermissions=您沒有權限執行這個動作
@@ -703,13 +710,13 @@ PartialWoman=部分
 TotalWoman=全部
 NeverReceived=從未收到
 Canceled=已取消
-YouCanChangeValuesForThisListFromDictionarySetup=您可從選單「設定-字典」改變此清單的值
+YouCanChangeValuesForThisListFromDictionarySetup=您可從選單「首頁-設定-分類」改變此清單的值
 YouCanChangeValuesForThisListFrom=您可從選單 %s 修改此清單的值
 YouCanSetDefaultValueInModuleSetup=您可以設定一個當在模組設定中產生一個新紀錄時的默認值
 Color=色彩
 Documents=已連結檔案
 Documents2=文件
-UploadDisabled=禁用上傳
+UploadDisabled=上傳已關閉
 MenuAccountancy=會計
 MenuECM=文件
 MenuAWStats=AWStats 軟體
@@ -724,7 +731,7 @@ CurrentMenuManager=目前選單管理器
 Browser=瀏覽器
 Layout=外觀
 Screen=畫面
-DisabledModules=已禁用模組
+DisabledModules=已關閉模組
 For=為
 ForCustomer=客戶
 Signature=簽名
@@ -749,7 +756,7 @@ PrintContentArea=顯示列印頁面的主要內容區域
 MenuManager=選單管理器
 WarningYouAreInMaintenanceMode=警告，您處於維護模式：僅允許<b>%s</b>登入且在此模式下使用應用程序。
 CoreErrorTitle=系統錯誤
-CoreErrorMessage=很抱歉，發生錯誤。連絡您的系統管理員以確認記錄檔或禁用 $dolibarr_main_prod=1 以取得更多資訊。
+CoreErrorMessage=很抱歉，發生錯誤。連絡您的系統管理員以確認記錄檔或關閉 $dolibarr_main_prod=1 以取得更多資訊。
 CreditCard=信用卡
 ValidatePayment=驗證付款
 CreditOrDebitCard=信用卡或金融信用卡
@@ -888,8 +895,8 @@ Miscellaneous=雜項
 Calendar=行事曆
 GroupBy=群組依...
 ViewFlatList=檢視平面清單
-ViewAccountList=View ledger
-ViewSubAccountList=View subaccount ledger
+ViewAccountList=檢視總帳
+ViewSubAccountList=檢視子帳戶總帳
 RemoveString=移除字串‘%s’
 SomeTranslationAreUncomplete=提供的某些語言可能僅被部分翻譯，或者可能包含錯誤。請通過註冊<a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>來進行改進，以幫助修正您的語言。
 DirectDownloadLink=直接下載連結(公共/外部)
@@ -1105,5 +1112,11 @@ DateOfBirth=出生日期
 SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=安全許可證已過期，因此操作已被取消。請再試一次。
 UpToDate=最新
 OutOfDate=過期
-EventReminder=Event Reminder
-UpdateForAllLines=Update for all lines
+EventReminder=事件提醒
+UpdateForAllLines=更新所有行
+OnHold=On hold
+Civility=Civility
+AffectTag=Affect Tag
+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
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index 81f115bf880..d31b8fa9640 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -19,8 +19,8 @@ MembersCards=會員名片
 MembersList=會員清單
 MembersListToValid=草案會員清單（待確認）
 MembersListValid=有效會員清單
-MembersListUpToDate=List of valid members with up-to-date subscription
-MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListUpToDate=最新訂閱的有效會員清單
+MembersListNotUpToDate=訂閱過期的有效會員清單
 MembersListResiliated=已被終止會員清單
 MembersListQualified=合格會員清單
 MenuMembersToValidate=草案會員
@@ -32,7 +32,7 @@ DateSubscription=訂閱日期
 DateEndSubscription=訂閱結束日期
 EndSubscription=結束訂閱
 SubscriptionId=訂閱編號
-WithoutSubscription=Without subscription
+WithoutSubscription=沒有訂閱
 MemberId=會員編號
 NewMember=新會員
 MemberType=會員類型
@@ -80,7 +80,7 @@ DeleteType=刪除
 VoteAllowed=允許投票
 Physical=自然人
 Moral=法人
-MorAndPhy=Moral and Physical
+MorAndPhy=法人與自然人
 Reenable=重新啟用
 ResiliateMember=終止會員
 ConfirmResiliateMember=您確定要終止此會員嗎？
@@ -116,7 +116,7 @@ SendingEmailOnMemberValidation=發送新會員驗證電子郵件
 SendingEmailOnNewSubscription=發送新訂閱電子郵件
 SendingReminderForExpiredSubscription=發送過期訂閱提醒
 SendingEmailOnCancelation=發送取消郵件
-SendingReminderActionComm=Sending reminder for agenda event
+SendingReminderActionComm=寄送議程事件提醒
 # Topic of email templates
 YourMembershipRequestWasReceived=您的會員資格已收到。
 YourMembershipWasValidated=您的會員資格已通過驗證
@@ -167,7 +167,7 @@ MembersStatisticsByState=會員統計(州/省)
 MembersStatisticsByTown=會員統計(城鎮)
 MembersStatisticsByRegion=會員統計(地區)
 NbOfMembers=會員數
-NbOfActiveMembers=Number of current active members
+NbOfActiveMembers=目前活躍會員數
 NoValidatedMemberYet=無已驗證的會員
 MembersByCountryDesc=此畫面顯示依國家/地區劃分的會員統計訊息。圖形取決於Google線上圖形服務，並且僅在網路連接正常時可用。
 MembersByStateDesc=此畫面依州/省顯示有關會員的統計訊息。
@@ -177,7 +177,7 @@ MenuMembersStats=統計
 LastMemberDate=最新會員日期
 LatestSubscriptionDate=最新訂閱日期
 MemberNature=會員性質
-MembersNature=Nature of members
+MembersNature=會員性質
 Public=資訊是公開的
 NewMemberbyWeb=增加了新會員。等待核准
 NewMemberForm=新會員表格
diff --git a/htdocs/langs/zh_TW/modulebuilder.lang b/htdocs/langs/zh_TW/modulebuilder.lang
index b92626cee0e..bffd8ecac21 100644
--- a/htdocs/langs/zh_TW/modulebuilder.lang
+++ b/htdocs/langs/zh_TW/modulebuilder.lang
@@ -40,6 +40,7 @@ PageForCreateEditView=建立/編輯/檢視記錄PHP頁面
 PageForAgendaTab=事件分頁的PHP頁面
 PageForDocumentTab=文件分頁的PHP頁面
 PageForNoteTab=註記分頁的PHP頁面
+PageForContactTab=PHP page for contact tab
 PathToModulePackage=模組/應用程式包的zip路徑
 PathToModuleDocumentation=模組/應用程式檔案的文件路徑(%s)
 SpaceOrSpecialCharAreNotAllowed=不允許使用空格或特殊符號。
@@ -77,7 +78,7 @@ IsAMeasure=Is a measure
 DirScanned=資料夾已掃描
 NoTrigger=沒有觸發器
 NoWidget=沒有小工具
-GoToApiExplorer=前往API資源管理器
+GoToApiExplorer=API explorer
 ListOfMenusEntries=選單條目清單
 ListOfDictionariesEntries=分類條目清單
 ListOfPermissionsDefined=已定義權限清單
@@ -105,11 +106,11 @@ TryToUseTheModuleBuilder=如果您具有SQL和PHP的知識，則可以使用本
 SeeTopRightMenu=請參閱右上方選單中的<span class="fa fa-bug"> </span>
 AddLanguageFile=增加語言檔案
 YouCanUseTranslationKey=您可以在此處使用一個key，此key是在語言檔案中找到的翻譯key（請參見“語言”分頁）
-DropTableIfEmpty=（如果為空，則刪除表）
+DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=表%s不存在
 TableDropped=表%s已刪除
 InitStructureFromExistingTable=建立現有表的結構數組字串
-UseAboutPage=禁用關於頁面
+UseAboutPage=關閉關於頁面
 UseDocFolder=禁用文件資料夾
 UseSpecificReadme=使用特定的ReadMe檔案
 ContentOfREADMECustomized=注意：README.md檔案的內容已替換為ModuleBuilder設定中定義的特定值。
@@ -126,7 +127,6 @@ UseSpecificEditorURL = 使用特定的編輯器網址
 UseSpecificFamily = 使用特定的家族
 UseSpecificAuthor = 使用特定作者
 UseSpecificVersion = 使用特定的初始版本
-ModuleMustBeEnabled=必須先啟用模組/應用程式
 IncludeRefGeneration=項目參考必須自動產生
 IncludeRefGenerationHelp=如果要包含代碼以自動管理參考的產生成，請點選此選框
 IncludeDocGeneration=我想從項目產生一些文件
@@ -140,3 +140,4 @@ TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html,
 AsciiToHtmlConverter=ASCII到HTML轉換器
 AsciiToPdfConverter=ASCII到PDF轉換器
 TableNotEmptyDropCanceled=表不為空。刪除已被取消。
+ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
diff --git a/htdocs/langs/zh_TW/mrp.lang b/htdocs/langs/zh_TW/mrp.lang
index f52b8abeb1b..58bbdd4bcc7 100644
--- a/htdocs/langs/zh_TW/mrp.lang
+++ b/htdocs/langs/zh_TW/mrp.lang
@@ -77,4 +77,28 @@ UnitCost=單位成本
 TotalCost=總計花費
 BOMTotalCost=根據每個要消耗的數量和產品的成本產生此BOM的成本（如果定義則使用“成本價”，如果定義則使用“平均加權價格”，否則使用“最佳採購價”）
 GoOnTabProductionToProduceFirst=您必須先開始生產才能關閉生產訂單（請參見分頁“ %s”）。但是您可以取消它。
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=套件不能用於物料清單或製造訂單
+Workstation=Workstation
+Workstations=Workstations
+WorkstationsDescription=Workstations management
+WorkstationSetup = Workstations setup
+WorkstationSetupPage = Workstations setup page
+WorkstationAbout = About Workstation
+WorkstationAboutPage = Workstations about 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=Supprimer
+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
diff --git a/htdocs/langs/zh_TW/multicurrency.lang b/htdocs/langs/zh_TW/multicurrency.lang
index fc1db29be55..0cf54b67b17 100644
--- a/htdocs/langs/zh_TW/multicurrency.lang
+++ b/htdocs/langs/zh_TW/multicurrency.lang
@@ -16,5 +16,23 @@ CurrenciesUsed_help_to_add=增加您需要在<b>提案</b> ， <b>訂單</b>等
 rate=利率
 MulticurrencyReceived=已收，原來幣別
 MulticurrencyRemainderToTake=剩餘金額，原始貨幣
-MulticurrencyPaymentAmount=付款金額，原來幣別
+MulticurrencyPaymentAmount=付款金額，原始貨幣
 AmountToOthercurrency=金額（以接收帳戶的貨幣表示）
+CurrencyRateSyncSucceed=貨幣匯率同步成功完成
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=使用文件的匯率進行線上支付
+TabTitleMulticurrencyRate=匯率清單
+ListCurrencyRate=貨幣匯率清單
+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/zh_TW/orders.lang b/htdocs/langs/zh_TW/orders.lang
index 05df173b1d9..1213c4f6bdb 100644
--- a/htdocs/langs/zh_TW/orders.lang
+++ b/htdocs/langs/zh_TW/orders.lang
@@ -6,7 +6,7 @@ OrderId=訂單編號
 Order=訂單
 PdfOrderTitle=訂單
 Orders=訂單
-OrderLine=在線訂單
+OrderLine=訂單行
 OrderDate=訂購日期
 OrderDateShort=訂購日期
 OrderToProcess=訂單處理
@@ -86,11 +86,11 @@ AllOrders=所有訂單
 NbOfOrders=訂單號碼
 OrdersStatistics=訂單統計
 OrdersStatisticsSuppliers=採購訂單統計
-NumberOfOrdersByMonth=按月份訂單數
-AmountOfOrdersByMonthHT=每月訂單量（不含稅）
+NumberOfOrdersByMonth=每月訂單數
+AmountOfOrdersByMonthHT=每月訂單金額(不含稅)
 ListOfOrders=訂單列表
 CloseOrder=關閉命令
-ConfirmCloseOrder=您確定要將此訂單設置為已交付嗎？訂單下達後，可以將其設置為開票。
+ConfirmCloseOrder=您確定要將此訂單設為已出貨嗎？訂單下達後，可以將其設為開票。
 ConfirmDeleteOrder=您確定要刪除此訂單嗎？
 ConfirmValidateOrder=您確定要驗證此訂單名稱為<b>%s</b>嗎？
 ConfirmUnvalidateOrder=您確定要恢復訂單<b>%s</b>到草稿狀態嗎？
@@ -106,7 +106,7 @@ RefCustomerOrder=參考的客戶訂單
 RefOrderSupplier=參考的供應商訂單
 RefOrderSupplierShort=供應商參考訂單
 SendOrderByMail=通過郵件發送訂單
-ActionsOnOrder=訂單活動
+ActionsOnOrder=訂單事件
 NoArticleOfTypeProduct=沒有“產品”類型的商品，因此該訂單沒有可運送的商品
 OrderMode=訂購方式
 AuthorRequest=發起者
@@ -146,6 +146,7 @@ PDFEratostheneDescription=完整的訂單模型
 PDFEdisonDescription=可產生一份簡單的訂單範本
 PDFProformaDescription=完整的形式發票範本
 CreateInvoiceForThisCustomer=提單/記名票據
+CreateInvoiceForThisSupplier=提單/記名票據
 NoOrdersToInvoice=沒有訂單可計費
 CloseProcessedOrdersAutomatically=將所有選定訂單分類為“已處理”。
 OrderCreation=訂單新增
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index 0e643a6518f..9ee8202b562 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -5,8 +5,6 @@ Tools=工具
 TMenuTools=工具
 ToolsDesc=所有在其他選單項目中未包含的工具都在此處。 <br>所有工具均可通過左側選單使用。
 Birthday=生日
-BirthdayDate=生日日期
-DateToBirth=生日
 BirthdayAlertOn=生日提醒啟動中
 BirthdayAlertOff=生日提醒停用中
 TransKey=密鑰TransKey的翻譯
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=發票日期的前一個月（1-12）
 TextPreviousMonthOfInvoice=發票日期的前一個月（文字）
 NextMonthOfInvoice=發票日期的下個月（1-12）
 TextNextMonthOfInvoice=發票日期的下個月（文字）
+PreviousMonth=前一個月
+CurrentMonth=目前月份
 ZipFileGeneratedInto=壓縮檔案已產生到<b> %s </b>中。
 DocFileGeneratedInto=DOC檔案已產生到<b> %s </b>中。
 JumpToLogin=已斷線。請前往登入頁面...
@@ -78,6 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=費用報告已驗證（需要批准）
 Notify_EXPENSE_REPORT_APPROVE=費用報告已批准
 Notify_HOLIDAY_VALIDATE=休假申請已驗證（需要批准）
 Notify_HOLIDAY_APPROVE=休假申請已批准
+Notify_ACTION_CREATE=已新增活動至應辦事項
 SeeModuleSetup=請參閱模組%s的設定
 NbOfAttachedFiles=所附檔案/文件數
 TotalSizeOfAttachedFiles=附件大小總計
@@ -99,6 +100,7 @@ PredefinedMailContentSendShipping=__(Hello)__\n\n請查看已附上之發貨__RE
 PredefinedMailContentSendFichInter=__(Hello)__\n\n請查看已附上之干預__REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=如果付款尚未完成您可以點擊以下連結.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=活動提醒 "__EVENT_LABEL__" 在 __EVENT_DATE__ 的 __EVENT_TIME__<br><br>\n此為自動提醒訊息,請勿回覆.
 DemoDesc=Dolibarr是一個嚴謹的ERP / CRM，支援多個業務模組。展示所有模組的DEMO沒有意義，因為這種情況永遠不會發生（有數百種可用）。因此，有幾個DEMO設定檔案可用。
 ChooseYourDemoProfil=選擇最適合您需求的DEMO設定檔案...
 ChooseYourDemoProfilMore=...或建立您自己的設定檔案<br>（手動選擇模組）
@@ -137,7 +139,7 @@ Right=右
 CalculatedWeight=已計算重量
 CalculatedVolume=已計算體積
 Weight=重量
-WeightUnitton=公噸
+WeightUnitton=噸
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
@@ -214,6 +216,7 @@ EMailTextExpenseReportValidated=費用報告%s已通過驗證。
 EMailTextExpenseReportApproved=費用報告%s已批准。
 EMailTextHolidayValidated=休假申請%s已通過驗證。
 EMailTextHolidayApproved=休假申請%s已被批准。
+EMailTextActionAdded=已新增活動%s至應辦事項中。
 ImportedWithSet=匯入資料集
 DolibarrNotification=自動通知
 ResizeDesc=輸入新的寬度<b>或</b> 新的高度。調整大小時將維持長寬比率...
@@ -258,6 +261,7 @@ ContactCreatedByEmailCollector=電子郵件收集器從電子郵件MSGID %s建
 ProjectCreatedByEmailCollector=電子郵件收集器從電子郵件MSGID %s建立的專案
 TicketCreatedByEmailCollector=電子郵件收集器從電子郵件MSGID %s建立的服務單
 OpeningHoursFormatDesc=使用-分隔營業開始時間和營業結束時間。 <br>使用空格輸入不同的範圍。 <br>範例：8-12 14-18
+PrefixSession=程序ID的前綴
 
 ##### Export #####
 ExportsArea=出口地區
@@ -278,9 +282,9 @@ LinesToImport=要匯入的行
 
 MemoryUsage=記憶體使用率
 RequestDuration=請求期限
-ProductsPerPopularity=Products/Services by popularity
+ProductsPerPopularity=依受歡迎程度的產品/服務
 PopuProp=依照在提案中受歡迎程度列出的產品/服務
 PopuCom=依照在訂單中受歡迎程度列出的產品/服務
 ProductStatistics=產品/服務統計
 NbOfQtyInOrders=訂單數量
-SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
+SelectTheTypeOfObjectToAnalyze=選擇要分析的項目類型...
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index bcff540d70c..6b2594c3473 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -108,7 +108,8 @@ FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=每個產品/服務有多個價格區段（每個客戶屬於一個價格區段）
 MultiPricesNumPrices=價格數量
 DefaultPriceType=增加新銷售價格時的每個預設價格（含稅和不含稅）基準
-AssociatedProductsAbility=Activate kits (virtual products)
+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=母套裝產品數
@@ -167,8 +168,10 @@ BuyingPrices=採購價格
 CustomerPrices=客戶價格
 SuppliersPrices=供應商價格
 SuppliersPricesOfProductsOrServices=供應商價格（產品或服務）
-CustomCode=海關/商品/ HS編碼
+CustomCode=Customs|Commodity|HS code
 CountryOrigin=原產地
+RegionStateOrigin=Region origin
+StateOrigin=State|Province origin
 Nature=產品性質（材料/成品）
 NatureOfProductShort=產品性質
 NatureOfProductDesc=Raw material or finished product
@@ -239,7 +242,7 @@ AlwaysUseFixedPrice=使用固定價格
 PriceByQuantity=數量不同的價格
 DisablePriceByQty=停用數量價格
 PriceByQuantityRange=數量範圍
-MultipriceRules=價格區段規則
+MultipriceRules=Automatic prices for segment
 UseMultipriceRules=使用價格區段規則（在產品模組設定中定義），根據第一區段自動計算所有其他區段的價格
 PercentVariationOver=%%超過%s上的變化
 PercentDiscountOver=%%超過%s的折扣
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index 163b487dd3a..81804cf8dcf 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -76,15 +76,16 @@ MyActivities=我的任務/活動
 MyProjects=我的專案
 MyProjectsArea=專案區
 DurationEffective=有效期限
-ProgressDeclared=進度宣布
+ProgressDeclared=宣布實際進度
 TaskProgressSummary=任務進度
 CurentlyOpenedTasks=目前的打開任務
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=預計進度比計算的進度少%s
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=預計進度比計算的進度多%s
-ProgressCalculated=進度計算
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=宣布的實際進度小於消耗進度%s
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=宣布的實際進度比消耗進度多%s
+ProgressCalculated=消耗進度
 WhichIamLinkedTo=我連結到的
 WhichIamLinkedToProject=此我已連結到專案
 Time=時間
+TimeConsumed=已消耗
 ListOfTasks=任務清單
 GoToListOfTimeConsumed=前往工作時間清單
 GanttView=甘特圖
@@ -211,9 +212,9 @@ 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
+ProjectOpenedProjectByOppStatus=依照潛在狀態開啟專案/ 潛在
+ProjectsStatistics=專案/潛在統計
+TasksStatistics=專案/潛在任務的統計
 TaskAssignedToEnterTime=任務已分配。應該可以輸入此任務的時間。
 IdTaskTime=任務時間ID
 YouCanCompleteRef=如果要使用一些後綴來完成引用，則建議增加-字元以將其分隔，因此自動編號仍可正確用於下一個專案。例如%s-MYSUFFIX
diff --git a/htdocs/langs/zh_TW/recruitment.lang b/htdocs/langs/zh_TW/recruitment.lang
index 5302409b57c..71b646c556d 100644
--- a/htdocs/langs/zh_TW/recruitment.lang
+++ b/htdocs/langs/zh_TW/recruitment.lang
@@ -47,8 +47,8 @@ ResponsibleOfRecruitement=負責招聘
 IfJobIsLocatedAtAPartner=如果職缺位於合作夥伴地點
 PositionToBeFilled=工作職稱
 PositionsToBeFilled=工作職位
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+ListOfPositionsToBeFilled=工作職位清單
+NewPositionToBeFilled=新職位
 
 JobOfferToBeFilled=Job position to be filled
 ThisIsInformationOnJobPosition=工作職位空缺訊息
@@ -73,3 +73,4 @@ JobClosedTextCandidateFound=The job position is closed. The position has been fi
 JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsCandidatures=Complementary attributes (job applications)
+MakeOffer=Make an offer
diff --git a/htdocs/langs/zh_TW/sendings.lang b/htdocs/langs/zh_TW/sendings.lang
index 42c24671414..0a422561415 100644
--- a/htdocs/langs/zh_TW/sendings.lang
+++ b/htdocs/langs/zh_TW/sendings.lang
@@ -30,6 +30,7 @@ OtherSendingsForSameOrder=此訂單的其他出貨清單
 SendingsAndReceivingForSameOrder=此訂單的出貨貨品和收據
 SendingsToValidate=出貨驗證
 StatusSendingCanceled=已取消
+StatusSendingCanceledShort=已取消
 StatusSendingDraft=草案
 StatusSendingValidated=已驗證（產品出貨或已經出貨）
 StatusSendingProcessed=已處理
@@ -65,6 +66,7 @@ ValidateOrderFirstBeforeShipment=您必須先驗證訂單，然後才能進行
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=交貨收據的更完整文件模型（商標...）
+DocumentModelStorm=更完整的文件模型，可用於交貨單和域外兼容性（logo...）
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=常數EXPEDITION_ADDON_NUMBER未定義
 SumOfProductVolumes=產品體積總和
 SumOfProductWeights=產品重量總和
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index d2936453e9f..d28483b5676 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -24,13 +24,13 @@ StockAtDateInFuture=將來的日期
 StocksByLotSerial=依批次/序號的庫存
 LotSerial=批次/序號
 LotSerialList=批次/序號清單
-Movements=轉讓
+Movements=庫存移轉
 ErrorWarehouseRefRequired=倉庫引用的名稱為必填
 ListOfWarehouses=倉庫清單
-ListOfStockMovements=庫存轉讓清單
+ListOfStockMovements=庫存移轉清單
 ListOfInventories=庫存清單
-MovementId=轉讓編號
-StockMovementForId=轉讓編號 %d
+MovementId=移轉編號
+StockMovementForId=移轉編號 %d
 ListMouvementStockProject=與項目相關的庫存變動清單
 StocksArea=庫存區域
 AllWarehouses=所有倉庫
@@ -62,6 +62,7 @@ EnhancedValueOfWarehouses=倉庫價值
 UserWarehouseAutoCreate=新增用戶時自動新增用戶倉庫
 AllowAddLimitStockByWarehouse=除了每個產品的最小和期望庫存值之外，還管理每個配對（產品倉庫）的最小和期望庫存值
 RuleForWarehouse=倉庫規則
+WarehouseAskWarehouseDuringPropal=Set a warehouse on Sale propal
 WarehouseAskWarehouseDuringOrder=在銷售訂單上設定一個倉庫
 UserDefaultWarehouse=在用戶上設定一個倉庫
 MainDefaultWarehouse=預設倉庫
@@ -240,3 +241,4 @@ InventoryRealQtyHelp=將值設定為0以重置數量<br>保持欄位為空或刪
 UpdateByScaning=以掃描更新
 UpdateByScaningProductBarcode=掃描更新（產品條碼）
 UpdateByScaningLot=掃描更新（批次|序列條碼）
+DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
diff --git a/htdocs/langs/zh_TW/ticket.lang b/htdocs/langs/zh_TW/ticket.lang
index d591079e2f6..8ce934d6b3e 100644
--- a/htdocs/langs/zh_TW/ticket.lang
+++ b/htdocs/langs/zh_TW/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=服務單-類型
 TicketDictCategory=服務單-組別
 TicketDictSeverity=服務單-嚴重程度
 TicketDictResolution=服務單-決議
-TicketTypeShortBUGSOFT=軟體故障
-TicketTypeShortBUGHARD=設備故障
-TicketTypeShortCOM=商業問題
 
+TicketTypeShortCOM=商業問題
 TicketTypeShortHELP=請求有用的幫助
 TicketTypeShortISSUE=錯誤或問題
 TicketTypeShortREQUEST=變更或增強要求
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=其他
 TicketSeverityShortLOW=低
 TicketSeverityShortNORMAL=正常
 TicketSeverityShortHIGH=高
-TicketSeverityShortBLOCKING=嚴重/阻止
+TicketSeverityShortBLOCKING=嚴重，阻止中
 
 ErrorBadEmailAddress=欄位'%s'不正確
 MenuTicketMyAssign=我的服務單
@@ -60,7 +58,6 @@ OriginEmail=電子郵件來源
 Notify_TICKET_SENTBYMAIL=以電子郵件發送服務單訊息
 
 # Status
-NotRead=未讀
 Read=已讀
 Assigned=已分配
 InProgress=進行中
@@ -109,7 +106,7 @@ TicketPublicInterfaceTextHelpMessageHelpAdmin=此段文字將出現在用戶的
 ExtraFieldsTicket=額外屬性
 TicketCkEditorEmailNotActivated=HTML編輯器未啟動。請將FCKEDITOR_ENABLE_MAIL內容設為1即可啟動。
 TicketsDisableEmail=不要為服務單建立或訊息紀錄發送電子郵件
-TicketsDisableEmailHelp=預設情況下，在建立新服務單或訊息時會發送電子郵件。啟用此選項可禁用*所有*電子郵件通知
+TicketsDisableEmailHelp=預設情況下，在建立新服務單或訊息時會發送電子郵件。啟用此選項可關閉*所有*電子郵件通知
 TicketsLogEnableEmail=通過電子郵件啟用日誌
 TicketsLogEnableEmailHelp=每次更改時，都會向與此服務單有關的**每個聯絡人**發送電子郵件。
 TicketParams=參數
@@ -126,6 +123,7 @@ TicketsActivatePublicInterfaceHelp=公共界面允許任何訪客建立服務單
 TicketsAutoAssignTicket=自動分配建立服務單的用戶
 TicketsAutoAssignTicketHelp=建立服務單時，可以自動將用戶分配給服務單。
 TicketNumberingModules=服務單編號模組
+TicketsModelModule=Document templates for tickets
 TicketNotifyTiersAtCreation=建立時通知合作方
 TicketsDisableCustomerEmail=從公共界面建立服務單時，始終禁用電子郵件
 TicketsPublicNotificationNewMessage=當有新訊息時寄送電子郵件
@@ -135,7 +133,7 @@ TicketPublicNotificationNewMessageDefaultEmailHelp=如果沒有分配服務單
 #
 # Index & list page
 #
-TicketsIndex=門票區
+TicketsIndex=服務單區域
 TicketList=服務單清單
 TicketAssignedToMeInfos=此頁面顯示由目前用戶建立或分配給目前用戶的服務單清單
 NoTicketsFound=找不到服務單
@@ -233,7 +231,6 @@ TicketLogStatusChanged=狀態已更改：%s到%s
 TicketNotNotifyTiersAtCreate=建立時不通知公司
 Unread=未讀
 TicketNotCreatedFromPublicInterface=無法使用。服務單不是從公共界面建立的。
-PublicInterfaceNotEnabled=未啟用公共界面
 ErrorTicketRefRequired=服務單參考名稱為必填
 
 #
diff --git a/htdocs/langs/zh_TW/users.lang b/htdocs/langs/zh_TW/users.lang
index 0ae2e4c036f..26680ee4029 100644
--- a/htdocs/langs/zh_TW/users.lang
+++ b/htdocs/langs/zh_TW/users.lang
@@ -20,7 +20,7 @@ DeleteAUser=刪除一位用戶
 EnableAUser=啟用用戶
 DeleteGroup=刪除
 DeleteAGroup=刪除一群組
-ConfirmDisableUser=您確定要禁用用戶 <b>%s</b> ?
+ConfirmDisableUser=您確定要關閉用戶 <b>%s</b> ?
 ConfirmDeleteUser=您確定要刪除用戶 <b>%s</b> ?
 ConfirmDeleteGroup=您確定要刪除群組 <b>%s</b>?
 ConfirmEnableUser=您確定要啟用用戶 <b>%s</b>?
@@ -46,6 +46,8 @@ RemoveFromGroup=從群組中刪除
 PasswordChangedAndSentTo=密碼更改，發送到<b>%s</b>。
 PasswordChangeRequest=<b>%s</b>要求變更密碼
 PasswordChangeRequestSent=<b>%s</b> 傳送給 <b>%s</b> 要求更改密碼。
+IfLoginExistPasswordRequestSent=如果此登入名稱為有效帳戶，則已發送一封電子郵件以重置密碼。
+IfEmailExistPasswordRequestSent=如果此電子郵件為有效帳戶，則已發送一封用於重置密碼的電子郵件。
 ConfirmPasswordReset=確認密碼重設
 MenuUsersAndGroups=用戶和群組
 LastGroupsCreated=最新建立的%s個群組
@@ -63,7 +65,7 @@ LinkedToDolibarrUser=連線成為 Dolibarr 用戶
 LinkedToDolibarrThirdParty=連線成為 Dolibarr 的合作方
 CreateDolibarrLogin=建立一位用戶
 CreateDolibarrThirdParty=建立一位合作方(客戶/供應商)
-LoginAccountDisableInDolibarr=在 Dolibarr 中帳戶已禁用。
+LoginAccountDisableInDolibarr=在 Dolibarr 中帳戶已關閉。
 UsePersonalValue=使用個人設定值
 InternalUser=內部用戶
 ExportDataset_user_1=用戶及其屬性
@@ -73,6 +75,7 @@ CreateInternalUserDesc=此表單使您可以在公司/組織中建立內部用
 InternalExternalDesc=一位 <b>內部</b> 使用者是您 公司/組織 的一部分。<br>一位 <b>外部</b> 使用者是顧客，供應商或是其他 (可從第三方的聯絡人紀錄為第三方建立一位外部使用者)。<br><br>以上兩種情形，在 Dolibarr 權限定義權利，外部使用者可以使用一個跟內部使用者不同的選單管理器 (見 首頁 - 設定 - 顯示)
 PermissionInheritedFromAGroup=因為從權限授予一個用戶的一組繼承。
 Inherited=繼承
+UserWillBe=Created user will be
 UserWillBeInternalUser=建立的用戶將是一個內部用戶（因為沒有連結到一個特定的第三方）
 UserWillBeExternalUser=建立的用戶將是外部用戶（因為連結到一個特定的第三方）
 IdPhoneCaller=手機來電者身份
@@ -80,7 +83,7 @@ NewUserCreated=建立用戶%s
 NewUserPassword=%變動的密碼
 NewPasswordValidated=您的新密碼已通過驗證，必須立即用於登錄。
 EventUserModified=用戶%s修改
-UserDisabled=用戶%s禁用
+UserDisabled=用戶%s已關閉
 UserEnabled=用戶%s啟動
 UserDeleted=使用者%s刪除
 NewGroupCreated=集團建立%s的
@@ -104,17 +107,19 @@ LoginUsingOpenID=使用OpenID登入
 WeeklyHours=工作小時數（每週）
 ExpectedWorkedHours=預計每週工作時間
 ColorUser=用戶顏色
-DisabledInMonoUserMode=在維護模式下禁用
+DisabledInMonoUserMode=在維護模式下已關閉
 UserAccountancyCode=用戶帳號
 UserLogoff=用戶登出
 UserLogged=用戶登入
-DateOfEmployment=Employment date
-DateEmployment=入職日期
+DateOfEmployment=到職日期
+DateEmployment=就業機會
+DateEmploymentstart=入職日期
 DateEmploymentEnd=離職日期
-CantDisableYourself=您不能禁用自己的用戶記錄
+RangeOfLoginValidity=登入的有效日期範圍
+CantDisableYourself=您不能關閉自己的用戶記錄
 ForceUserExpenseValidator=強制使用費用報告表驗證
 ForceUserHolidayValidator=強制使用休假請求驗證
 ValidatorIsSupervisorByDefault=預設情況下，驗證者是用戶的主管。保持空白狀態以保持這種行為。
 UserPersonalEmail=私人信箱
 UserPersonalMobile=私人手機
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+WarningNotLangOfInterface=警告，這是用戶使用的主要語言，而不是他選擇查看的界面語言。要更改該用戶可見的界面語言，請前往分頁%s
diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang
index 6a62024abd5..f83dc275c73 100644
--- a/htdocs/langs/zh_TW/website.lang
+++ b/htdocs/langs/zh_TW/website.lang
@@ -30,7 +30,6 @@ EditInLine=編輯嵌入
 AddWebsite=新增網站
 Webpage=網頁/容器
 AddPage=新增 頁面/容器
-HomePage=首頁
 PageContainer=頁面
 PreviewOfSiteNotYetAvailable=您的網站<strong>%s</strong>預覽尚不可用。您必須先“ <strong>導入完整的網站模板</strong> ”或僅“ <strong>新增頁面/容器</strong> ”。
 RequestedPageHasNoContentYet=要求ID為%s的頁面尚無內容，或暫存檔案.tpl.php被刪除。編輯頁面內容以解決此問題。
@@ -101,7 +100,7 @@ EmptyPage=空白頁
 ExternalURLMustStartWithHttp=外部網址必須以http://或https://開始
 ZipOfWebsitePackageToImport=上傳網站模板包的Zip檔案
 ZipOfWebsitePackageToLoad=或選擇一個可用的嵌入式網站模板包
-ShowSubcontainers=包含動態內容
+ShowSubcontainers=Show dynamic content
 InternalURLOfPage=頁面的內部網址
 ThisPageIsTranslationOf=該頁面/內容是以下內容的翻譯：
 ThisPageHasTranslationPages=此頁面/內容已翻譯
@@ -137,3 +136,4 @@ RSSFeedDesc=您可以使用此網址獲得類型為“ blogpost”的最新文
 PagesRegenerated=已重新產生%s頁面/容器
 RegenerateWebsiteContent=重新產生網站快取檔案
 AllowedInFrames=Allowed in Frames
+DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
diff --git a/htdocs/langs/zh_TW/withdrawals.lang b/htdocs/langs/zh_TW/withdrawals.lang
index b4c32e4de5a..10539908125 100644
--- a/htdocs/langs/zh_TW/withdrawals.lang
+++ b/htdocs/langs/zh_TW/withdrawals.lang
@@ -11,7 +11,7 @@ PaymentByBankTransferLines=信用轉帳訂單行
 WithdrawalsReceipts=直接轉帳付款訂單
 WithdrawalReceipt=直接轉帳付款訂單
 BankTransferReceipts=信用轉帳訂單行
-BankTransferReceipt=Credit transfer order
+BankTransferReceipt=貸方轉帳訂單
 LatestBankTransferReceipts=最新%s筆信用轉帳訂單
 LastWithdrawalReceipts=最新%s個直接轉帳付款檔案
 WithdrawalsLine=直接轉帳訂單行
@@ -40,8 +40,9 @@ CreditTransferStatistics=信用轉帳統計
 Rejects=拒絕
 LastWithdrawalReceipt=最新%s張直接轉帳付款收據
 MakeWithdrawRequest=提出直接轉帳付款請求
-MakeBankTransferOrder=Make a credit transfer request
+MakeBankTransferOrder=提出貸記轉帳請求
 WithdrawRequestsDone=已記錄%s直接轉帳付款請求
+BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=合作方銀行代碼
 NoInvoiceCouldBeWithdrawed=沒有直接轉帳成功的發票。檢查發票上是否有有效IBAN的公司，以及IBAN是否具有模式為<strong> %s </strong>的UMR（唯一授權參考）。
 ClassCredited=分類為已記入
@@ -63,7 +64,7 @@ InvoiceRefused=發票被拒絕（向客戶收取拒絕費用）
 StatusDebitCredit=借項/貸項狀況
 StatusWaiting=等候
 StatusTrans=傳送
-StatusDebited=Debited
+StatusDebited=借貸方
 StatusCredited=已記入
 StatusPaid=已付款
 StatusRefused=已拒絕
@@ -79,13 +80,13 @@ StatusMotif8=其他原因
 CreateForSepaFRST=建立直接轉帳付款檔案(SEPA FRST)
 CreateForSepaRCUR=建立直接轉帳付款檔案(SEPA RCUR)
 CreateAll=建立直接轉帳付款檔案(全部)
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
+CreateFileForPaymentByBankTransfer=建立用於信用轉移的檔案
 CreateSepaFileForPaymentByBankTransfer=建立信用轉帳文件（SEPA）
 CreateGuichet=只有辦公室
 CreateBanque=只有銀行
 OrderWaiting=等待處理
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
+NotifyTransmision=訂單的檔案傳輸記錄
+NotifyCredit=訂單信用記錄
 NumeroNationalEmetter=國際轉帳編號
 WithBankUsingRIB=用於RIB的銀行帳戶
 WithBankUsingBANBIC=用於IBAN / BIC / SWIFT的銀行帳戶
@@ -131,7 +132,8 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=執行日期
 CreateForSepa=建立直接轉帳付款檔案
-ICS=債權人識別碼
+ICS=Creditor Identifier CI for direct debit
+ICSTransfer=Creditor Identifier CI for bank transfer
 END_TO_END="EndToEndId" SEPA XML標籤- 每筆交易分配的唯一ID
 USTRD="Unstructured" SEPA XML標籤
 ADDDAYS=將天數加到執行日期
@@ -146,3 +148,5 @@ InfoRejectSubject=直接轉帳付款訂單已被拒絕
 InfoRejectMessage=您好，<br><br>銀行拒絕了與公司%s相關的發票%s的直接轉帳付款訂單 。%s的金額已被銀行拒絕 <br> <br>--<br> %s
 ModeWarning=未設定實際模式選項，我們將在此模擬後停止
 ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
+ErrorICSmissing=Missing ICS in Bank account %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
diff --git a/htdocs/langs/zh_TW/workflow.lang b/htdocs/langs/zh_TW/workflow.lang
index 2139dc0f143..0c32f533241 100644
--- a/htdocs/langs/zh_TW/workflow.lang
+++ b/htdocs/langs/zh_TW/workflow.lang
@@ -16,8 +16,10 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=當已確認裝運後（並且如
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=當供應商發票已確認時（如果發票金額與連接提案的總金額相同），將連接供應商提案分類為開票
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=當供應商發票已確認時（如果發票金額與連接訂單的總金額相同），將連接的採購訂單分類為開票
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+descWORKFLOW_BILL_ON_RECEPTION=驗證連結的供應商訂單後，將接收分類為“已開票”
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=關閉服務單後，關閉與服務單連結的所有干預措施
 AutomaticCreation=自動建立
 AutomaticClassification=自動分類
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 29cae07e11d..1143fbcd474 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -67,7 +67,7 @@ if (empty($reshook))
 	if ($action == 'confirm_paid' && $confirm == 'yes' && $user->rights->loan->write)
 	{
 		$object->fetch($id);
-		$result = $object->set_paid($user);
+		$result = $object->setPaid($user);
 		if ($result > 0)
 		{
 			setEventMessages($langs->trans('LoanPaid'), null, 'mesgs');
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index ae683c829a5..9f2d8297edc 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -377,14 +377,28 @@ class Loan extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Tag loan as payed completely
+	 *  Tag loan as paid completely
 	 *
+	 *	@deprecated
+	 *  @see setPaid()
 	 *  @param	User	$user	Object user making change
 	 *  @return	int				<0 if KO, >0 if OK
 	 */
 	public function set_paid($user)
 	{
 		// phpcs:enable
+		dol_syslog(get_class($this)."::set_paid is deprecated, use setPaid instead", LOG_NOTICE);
+		return $this->setPaid($user);
+	}
+
+	/**
+	 *  Tag loan as paid completely
+	 *
+	 *  @param	User	$user	Object user making change
+	 *  @return	int				<0 if KO, >0 if OK
+	 */
+	public function setPaid($user)
+	{
 		$sql = "UPDATE ".MAIN_DB_PREFIX."loan SET";
 		$sql .= " paid = ".$this::STATUS_PAID;
 		$sql .= " WHERE rowid = ".$this->id;
@@ -399,14 +413,28 @@ class Loan extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Tag loan as payement started
+	 *  Tag loan as payment started
 	 *
+	 *	@deprecated
+	 *  @see setStarted()
 	 *  @param	User	$user	Object user making change
 	 *  @return	int				<0 if KO, >0 if OK
 	 */
 	public function set_started($user)
 	{
 		// phpcs:enable
+		dol_syslog(get_class($this)."::set_started is deprecated, use setStarted instead", LOG_NOTICE);
+		return $this->setStarted($user);
+	}
+
+	/**
+	 *  Tag loan as payment started
+	 *
+	 *  @param	User	$user	Object user making change
+	 *  @return	int				<0 if KO, >0 if OK
+	 */
+	public function setStarted($user)
+	{
 		$sql = "UPDATE ".MAIN_DB_PREFIX."loan SET";
 		$sql .= " paid = ".$this::STATUS_STARTED;
 		$sql .= " WHERE rowid = ".$this->id;
@@ -422,13 +450,26 @@ class Loan extends CommonObject
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Tag loan as payement as unpaid
-	 *
+	 *	@deprecated
+	 *  @see setUnpaid()
 	 *  @param	User	$user	Object user making change
 	 *  @return	int				<0 if KO, >0 if OK
 	 */
 	public function set_unpaid($user)
 	{
 		// phpcs:enable
+		dol_syslog(get_class($this)."::set_unpaid is deprecated, use setUnpaid instead", LOG_NOTICE);
+		return $this->setUnpaid($user);
+	}
+
+	/**
+	 *  Tag loan as payement as unpaid
+	 *
+	 *  @param	User	$user	Object user making change
+	 *  @return	int				<0 if KO, >0 if OK
+	 */
+	public function setUnpaid($user)
+	{
 		$sql = "UPDATE ".MAIN_DB_PREFIX."loan SET";
 		$sql .= " paid = ".$this::STATUS_UNPAID;
 		$sql .= " WHERE rowid = ".$this->id;
@@ -445,7 +486,7 @@ class Loan extends CommonObject
 	 *  Return label of loan status (unpaid, paid)
 	 *
 	 *  @param  int		$mode			0=label, 1=short label, 2=Picto + Short label, 3=Picto, 4=Picto + Label
-	 *  @param  integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+	 *  @param  integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount paid if you have it, 1 otherwise)
 	 *  @return string					Label
 	 */
 	public function getLibStatut($mode = 0, $alreadypaid = -1)
@@ -459,7 +500,7 @@ class Loan extends CommonObject
 	 *
 	 *  @param  int		$status			Id status
 	 *  @param  int		$mode			0=Label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Label, 5=Short label + Picto
-	 *  @param  integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+	 *  @param  integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount paid if you have it, 1 otherwise)
 	 *  @return string					Label
 	 */
 	public function LibStatut($status, $mode = 0, $alreadypaid = -1)
diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index 34acb06f9ce..aa3f895f314 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -377,8 +377,7 @@ class PaymentLoan extends CommonObject
 			if ($sum_payment == 0)
 			{
 				dol_syslog(get_class($this)."::delete : set loan to unpaid", LOG_DEBUG);
-				if ($loan->set_unpaid($user) < 1)
-				{
+				if ($loan->setUnpaid($user) < 1) {
 					$error++;
 					dol_print_error($this->db);
 				}
@@ -532,7 +531,7 @@ class PaymentLoan extends CommonObject
 			if ($loan->paid == $loan::STATUS_UNPAID)
 			{
 				dol_syslog(get_class($this)."::addPaymentToBank : set loan payment to started", LOG_DEBUG);
-				if ($loan->set_started($user) < 1)
+				if ($loan->setStarted($user) < 1)
 				{
 					$error++;
 					dol_print_error($this->db);
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index 79e38dbdeb1..744a6929fc8 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -93,7 +93,7 @@ $help_url = '';
 $title = $langs->trans('Loans');
 
 $sql = "SELECT l.rowid, l.label, l.capital, l.datestart, l.dateend, l.paid,";
-$sql .= " SUM(pl.amount_capital) as alreadypayed";
+$sql .= " SUM(pl.amount_capital) as alreadypaid";
 $sql .= " FROM ".MAIN_DB_PREFIX."loan as l LEFT JOIN ".MAIN_DB_PREFIX."payment_loan AS pl";
 $sql .= " ON l.rowid = pl.fk_loan";
 $sql .= " WHERE l.entity = ".$conf->entity;
@@ -229,7 +229,7 @@ if ($resql)
 		print '<td class="center width100">'.dol_print_date($db->jdate($obj->dateend), 'day').'</td>';
 
 		print '<td class="right nowrap">';
-		print $loan_static->LibStatut($obj->paid, 5, $obj->alreadypayed);
+		print $loan_static->LibStatut($obj->paid, 5, $obj->alreadypaid);
 		print '</td>';
 
 		print '<td></td>';
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index 6aebd9fb33d..ac76dbf9053 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -149,7 +149,7 @@ print '</div>';
 
 
 /*
- * List of loans payed
+ * List of loans paid
  */
 
 $disable_delete = 0;
@@ -194,7 +194,7 @@ if ($resql)
 			// print '<td class="right">'.price($objp->capital).'</td>';
 			// Status
 			print '<td class="center">'.$loan->getLibStatut(4, $objp->amount_capital).'</td>';
-			// Amount payed
+			// Amount paid
 			$amount_payed = $objp->amount_capital + $objp->amount_insurance + $objp->amount_interest;
 
 			print '<td class="right">'.price($amount_payed).'</td>';
diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php
index 5e27a48fa02..b9e6783ceca 100644
--- a/htdocs/loan/schedule.php
+++ b/htdocs/loan/schedule.php
@@ -48,7 +48,9 @@ $object->fetch($loanid);
 $echeances = new LoanSchedule($db);
 $echeances->fetchAll($object->id);
 
-if ($object->paid > 0 && count($echeances->lines) == 0) $pay_without_schedule = 1;
+if ($object->paid > 0 && count($echeances->lines) == 0) {
+	$pay_without_schedule = 1;
+}
 
 /*
  * Actions
@@ -86,8 +88,9 @@ if ($action == 'createecheancier' && empty($pay_without_schedule)) {
 		$echeances->lines[] = $new_echeance;
 		$i++;
 	}
-	var_dump($result);
-	if ($result > 0) $db->commit();
+	if ($result > 0) {
+		$db->commit();
+	}
 }
 
 if ($action == 'updateecheancier' && empty($pay_without_schedule)) {
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 5c3fd8ee46b..c91f4802974 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -51,6 +51,8 @@ if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO']))
 
 /**
  * Security: WAF layer for SQL Injection and XSS Injection (scripts) protection (Filters on GET, POST, PHP_SELF).
+ * Warning: Such a protection can't be enough. It is not reliable as it will alwyas be possible to bypass this. Good protection can
+ * only be guaranted by escaping data during output.
  *
  * @param		string		$val		Value brut found int $_GET, $_POST or PHP_SELF
  * @param		string		$type		1=GET, 0=POST, 2=PHP_SELF, 3=GET without sql reserved keywords (the less tolerant test)
@@ -120,6 +122,19 @@ function testSqlAndScriptInject($val, $type)
 	$inj += preg_match('/on(keydown|keypress|keyup|load|loadeddata|loadedmetadata|loadstart|offline|online|pagehide|pageshow)\s*=/i', $val);
 	$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|resize|reset|scroll|search|seeking|select|show|stalled|start|submit|suspend)\s*=/i', $val);
 	$inj += preg_match('/on(timeupdate|toggle|unload|volumechange|waiting)\s*=/i', $val);
+
+	// We refuse html into html because some hacks try to obfuscate evil strings by inserting HTML into HTML. Example: <img on<a>error=alert(1) to bypass test on onerror
+	$tmpval = preg_replace('/<[^<]+>/', '', $val);
+	// List of dom events is on https://www.w3schools.com/jsref/dom_obj_event.asp
+	$inj += preg_match('/onmouse([a-z]*)\s*=/i', $tmpval); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
+	$inj += preg_match('/ondrag([a-z]*)\s*=/i', $tmpval); //
+	$inj += preg_match('/ontouch([a-z]*)\s*=/i', $tmpval); //
+	$inj += preg_match('/on(abort|afterprint|beforeprint|beforeunload|blur|canplay|canplaythrough|change|click|contextmenu|copy|cut)\s*=/i', $tmpval);
+	$inj += preg_match('/on(dblclick|drop|durationchange|ended|error|focus|focusin|focusout|hashchange|input|invalid)\s*=/i', $tmpval);
+	$inj += preg_match('/on(keydown|keypress|keyup|load|loadeddata|loadedmetadata|loadstart|offline|online|pagehide|pageshow)\s*=/i', $tmpval);
+	$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|resize|reset|scroll|search|seeking|select|show|stalled|start|submit|suspend)\s*=/i', $tmpval);
+	$inj += preg_match('/on(timeupdate|toggle|unload|volumechange|waiting)\s*=/i', $tmpval);
+
 	//$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
 	$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val); // refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
 	$inj += preg_match('/javascript\s*:/i', $val);
@@ -371,7 +386,7 @@ if (!defined('NOLOGIN') && !defined('NOIPCHECK') && !empty($dolibarr_main_restri
 
 // Loading of additional presentation includes
 if (!defined('NOREQUIREHTML')) require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; // Need 660ko memory (800ko in 2.2)
-require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; // Need 22ko memory
+if (!defined('NOREQUIREAJAX')) require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; // Need 22ko memory
 
 // If install or upgrade process not done or not completely finished, we call the install page.
 if (!empty($conf->global->MAIN_NOT_INSTALLED) || !empty($conf->global->MAIN_NOT_UPGRADED))
@@ -412,7 +427,7 @@ if (!defined('NOTOKENRENEWAL'))
 //$dolibarr_nocsrfcheck=1;
 // Check token
 if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))
-	|| defined('CSRFCHECK_WITH_TOKEN'))	// Check validity of token, only if option MAIN_SECURITY_CSRF_WITH_TOKEN enabled or if constant CSRFCHECK_WITH_TOKEN is set
+	|| defined('CSRFCHECK_WITH_TOKEN'))	// Check validity of token, only if option MAIN_SECURITY_CSRF_WITH_TOKEN enabled or if constant CSRFCHECK_WITH_TOKEN is set into page
 {
 	// Check all cases that need a token (all POST actions, all actions and mass actions on pages with CSRFCHECK_WITH_TOKEN set, all sensitive GET actions)
 	if ($_SERVER['REQUEST_METHOD'] == 'POST' ||
@@ -428,8 +443,12 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->gl
 				die;
 			} else {
 				dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." refused by CSRFCHECK_WITH_TOKEN protection. Token not provided.");
-				print "Access to this page this way (POST method or page with CSRFCHECK_WITH_TOKEN on or having a sensible value for action parameter) is refused by CSRF protection in main.inc.php. Token not provided.\n";
-				print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file or MAIN_SECURITY_CSRF_WITH_TOKEN to 0 into setup).\n";
+				if (defined('CSRFCHECK_WITH_TOKEN')) {
+					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 {
+					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";
+				}
 				die;
 			}
 		}
@@ -1498,7 +1517,8 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 					// To use external ckeditor 4 js lib
 					$pathckeditor = constant('JS_CKEDITOR');
 				}
-				print '<script><!-- enable ckeditor by main.inc.php -->';
+				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 ckeditorFilebrowserBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
@@ -1506,8 +1526,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 				print '</script>'."\n";
 				print '<script src="'.$pathckeditor.$jsckeditor.($ext ? '?'.$ext : '').'"></script>'."\n";
 				print '<script>';
-				if (GETPOST('mode', 'aZ09') == 'Full_inline')
-				{
+				if (GETPOST('mode', 'aZ09') == 'Full_inline') {
 					print 'CKEDITOR.disableAutoInline = false;'."\n";
 				} else {
 					print 'CKEDITOR.disableAutoInline = true;'."\n";
@@ -1871,6 +1890,14 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	$dropdownBody .= '<br><b>'.$langs->trans("CurrentMenuManager").':</b> '.$menumanager->name;
 	$langFlag = picto_from_langcode($langs->getDefaultLang());
 	$dropdownBody .= '<br><b>'.$langs->trans("CurrentUserLanguage").':</b> '.($langFlag ? $langFlag.' ' : '').$langs->getDefaultLang();
+
+	$tz = (int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst'];
+	$dropdownBody .= '<br><b>'.$langs->trans("ClientTZ").':</b> '.($tz ? ($tz >= 0 ? '+' : '').$tz : '');
+	$dropdownBody .= ' ('.$_SESSION['dol_tz_string'].')';
+	//$dropdownBody .= ' &nbsp; &nbsp; &nbsp; '.$langs->trans("DaylingSavingTime").': ';
+	//if ($_SESSION['dol_dst'] > 0) $dropdownBody .= yn(1);
+	//else $dropdownBody .= yn(0);
+
 	$dropdownBody .= '<br><b>'.$langs->trans("Browser").':</b> '.$conf->browser->name.($conf->browser->version ? ' '.$conf->browser->version : '').' ('.dol_escape_htmltag($_SERVER['HTTP_USER_AGENT']).')';
 	$dropdownBody .= '<br><b>'.$langs->trans("Layout").':</b> '.$conf->browser->layout;
 	$dropdownBody .= '<br><b>'.$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 6d119ac0280..d97d992b99d 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -106,6 +106,7 @@ $titre = $langs->trans("Margins");
 $picto = 'margin';
 
 print '<form method="post" name="sel" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 
 print dol_get_fiche_head($head, 'agentMargins', $titre, 0, $picto);
 
@@ -113,7 +114,7 @@ print '<table class="border centpercent">';
 
 print '<tr><td class="titlefield">'.$langs->trans('ContactOfInvoice').'</td>';
 print '<td class="maxwidthonsmartphone" colspan="4">';
-print $form->select_dolusers($agentid, 'agentid', 1, '', $user->rights->margins->read->all ? 0 : 1, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+print img_picto('', 'user').$form->select_dolusers($agentid, 'agentid', 1, '', $user->rights->margins->read->all ? 0 : 1, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 print '</td></tr>';
 
 // Start date
@@ -333,10 +334,7 @@ $db->free($result);
 
 print "\n".'<script type="text/javascript">
 $(document).ready(function() {
-  	$("#agentid").change(function() {
-    	$("div.fiche form").submit();
-  	});
-
+	console.log("Init some values");
   	$("#totalMargin").html("'.price(price2num($totalMargin, 'MT')).'");
 	$("#marginRate").html("'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").'");
 	$("#markRate").html("'.(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%").'");
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 5f35b4e4936..1693462b749 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -87,6 +87,7 @@ $picto = 'margin';
 
 
 print '<form method="post" name="sel" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 
 print dol_get_fiche_head($head, 'customerMargins', $titre, 0, $picto);
 
@@ -101,7 +102,7 @@ if ($socid > 0) {
 	{
 		print '<tr><td class="titlefield">'.$langs->trans('ThirdPartyName').'</td>';
 		print '<td class="maxwidthonsmartphone" colspan="4">';
-		print $form->select_company($socid, 'socid', '(client=1 OR client=3)', 1, 0, 0);
+		print img_picto('', 'company').$form->select_company($socid, 'socid', '(client=1 OR client=3)', 1, 0, 0);
 		print '</td></tr>';
 
 		$client = true;
@@ -111,7 +112,7 @@ if ($socid > 0) {
 } else {
 	print '<tr><td class="titlefield">'.$langs->trans('ThirdPartyName').'</td>';
 	print '<td class="maxwidthonsmartphone" colspan="4">';
-	print $form->select_company(null, 'socid', '(client=1 OR client=3)', 1, 0, 0);
+	print img_picto('', 'company').$form->select_company(null, 'socid', '(client=1 OR client=3)', 1, 0, 0);
 	print '</td></tr>';
 }
 
@@ -138,16 +139,16 @@ foreach ($TRes as $prod) {
 	$TProducts[$prod['key']] = $prod['label'];
 }
 
-print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
+print '<tr><td class="titlefield">'.$langs->trans('ProductOrService').'</td>';
 print '<td class="maxwidthonsmartpone" colspan="4">';
-print $form->multiselectarray('products', $TProducts, $TSelectedProducts, 0, 0, 'minwidth500');
+print img_picto('', 'product').$form->multiselectarray('products', $TProducts, $TSelectedProducts, 0, 0, 'minwidth500');
 print '</td></tr>';
 
 // Categories
 $TCats = $form->select_all_categories(0, array(), '', 64, 0, 1);
 
 print '<tr>';
-print '<td class="titlefield">'.$langs->trans('ChooseCategory').'</td>';
+print '<td class="titlefield">'.$langs->trans('Category').'</td>';
 print '<td class="maxwidthonsmartphone" colspan="4">';
 print img_picto('', 'category').$form->multiselectarray('categories', $TCats, $TSelectedCats, 0, 0, 'quatrevingtpercent widthcentpercentminusx');
 print '</td>';
@@ -365,11 +366,7 @@ $db->free($result);
 
 print '<script type="text/javascript">
 $(document).ready(function() {
-	/*
-	$("#socid").change(function() {
-    	$("div.fiche form").submit();
-	});*/
-
+	console.log("Init some values");
 	$("#totalMargin").html("'.price(price2num($totalMargin, 'MT')).'");
 	$("#marginRate").html("'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").'");
 	$("#markRate").html("'.(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%").'");
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 9fa7389a153..3bb7eff8e23 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -99,31 +99,23 @@ $titre = $langs->trans("Margins");
 $picto = 'margin';
 
 print '<form method="post" name="sel" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 
 print dol_get_fiche_head($head, 'productMargins', $titre, 0, $picto);
 
 print '<table class="border centpercent">';
 
-if ($id > 0) {
-	print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
-	print '<td class="maxwidthonsmartpone" colspan="4">';
-	$form->select_produits($id, 'id', '', 20, 0, 1, 2, '', 1, array(), 0, 'All');
-	print '</td></tr>';
-
-	if (!$sortorder) $sortorder = "DESC";
-	if (!$sortfield) $sortfield = "f.datef";
-} else {
-	print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
-	print '<td class="maxwidthonsmartphone" colspan="4">';
-	$form->select_produits('', 'id', '', 20, 0, 1, 2, '', 1, array(), 0, 'All');
-	print '</td></tr>';
-}
+// Product
+print '<tr><td class="titlefield">'.$langs->trans('ProductOrService').'</td>';
+print '<td class="maxwidthonsmartphone" colspan="4">';
+print img_picto('', 'product').$form->select_produits(($id > 0 ? $id : ''), 'id', '', 20, 0, 1, 2, '', 1, array(), 0, 'All', 0, '', 0, '', null, 1);
+print '</td></tr>';
 
 // Categories
 $TCats = $form->select_all_categories(0, array(), '', 64, 0, 1);
 
 print '<tr>';
-print '<td class="titlefield">'.$langs->trans('ChooseCategory').'</td>';
+print '<td class="titlefield">'.$langs->trans('Category').'</td>';
 print '<td class="maxwidthonsmartphone" colspan="4">';
 print img_picto('', 'category').$form->multiselectarray('categories', $TCats, $TSelectedCats, 0, 0, 'quatrevingtpercent widthcentpercentminusx');
 print '</td>';
@@ -350,15 +342,10 @@ $db->free($result);
 print '
 <script type="text/javascript">
 $(document).ready(function() {
-
-  $("#id").change(function() {
-     $("div.fiche form").submit();
-  });
-
+  console.log("Init some values");
   $("#totalMargin").html("'.price(price2num($totalMargin, 'MT')).'");
   $("#marginRate").html("'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").'");
   $("#markRate").html("'.(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%").'");
-
 });
 </script>
 ';
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index f3922aa6342..5159aef7577 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -230,7 +230,7 @@ if ($dirins && $action == 'initmodule' && $modulename)
 		dol_delete_dir_recursive($destdir.'/core/tpl');
 		dol_delete_dir_recursive($destdir.'/core/triggers');
 		dol_delete_dir_recursive($destdir.'/doc');
-		dol_delete_dir_recursive($destdir.'/.tx');
+		//dol_delete_dir_recursive($destdir.'/.tx');
 		dol_delete_dir_recursive($destdir.'/core/boxes');
 
 		dol_delete_file($destdir.'/admin/myobject_extrafields.php');
diff --git a/htdocs/modulebuilder/template/README.md b/htdocs/modulebuilder/template/README.md
index c3afa63e1b7..45c5e4b51eb 100644
--- a/htdocs/modulebuilder/template/README.md
+++ b/htdocs/modulebuilder/template/README.md
@@ -2,17 +2,17 @@
 
 ## Features
 
-Description...
+Description of the module...
 
 <!--
 ![Screenshot mymodule](img/screenshot_mymodule.png?raw=true "MyModule"){imgmd}
 -->
 
-Other modules are available on [Dolistore.com](https://www.dolistore.com).
+Other external modules are available on [Dolistore.com](https://www.dolistore.com).
 
 ## Translations
 
-Translations can be define manually by editing files into directories *langs*.
+Translations can be completed manually by editing files into directories *langs*.
 
 <!--
 This module contains also a sample configuration for Transifex, under the hidden directory [.tx](.tx), so it is possible to manage translation using this service.
diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php
index 518920592f4..d527f1978a9 100644
--- a/htdocs/modulebuilder/template/admin/about.php
+++ b/htdocs/modulebuilder/template/admin/about.php
@@ -45,7 +45,9 @@ require_once '../lib/mymodule.lib.php';
 $langs->loadLangs(array("errors", "admin", "mymodule@mymodule"));
 
 // Access control
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 // Parameters
 $action = GETPOST('action', 'aZ09');
diff --git a/htdocs/modulebuilder/template/admin/myobject_extrafields.php b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
index 0e42b75da0b..41ca86a0ce2 100644
--- a/htdocs/modulebuilder/template/admin/myobject_extrafields.php
+++ b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
@@ -52,13 +52,17 @@ $form = new Form($db);
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'mymodule_myobject'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -91,8 +95,7 @@ print dol_get_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+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>";
@@ -102,8 +105,7 @@ if ($action != 'create' && $action != 'edit')
 /*
  * Creation of an optional field
  */
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -113,8 +115,7 @@ if ($action == 'create')
 /*
  * Edition of an optional field
  */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index c7cc61171a7..e93b8686d79 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -47,7 +47,9 @@ require_once '../lib/mymodule.lib.php';
 $langs->loadLangs(array("admin", "mymodule@mymodule"));
 
 // Access control
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 // Parameters
 $action = GETPOST('action', 'aZ09');
@@ -71,28 +73,27 @@ $setupnotempty = 0;
  * Actions
  */
 
-if ((float) DOL_VERSION >= 6)
-{
+if ((float) DOL_VERSION >= 6) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 }
 
-if ($action == 'updateMask')
-{
+if ($action == 'updateMask') {
 	$maskconstorder = GETPOST('maskconstorder', 'alpha');
 	$maskorder = GETPOST('maskorder', 'alpha');
 
-	if ($maskconstorder) $res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
+	if ($maskconstorder) {
+		$res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
+		if (!($res > 0)) {
+			$error++;
+		}
+	}
 
-	if (!$res > 0) $error++;
-
-	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'specimen')
-{
+} elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
 	$tmpobjectkey = GETPOST('object');
 
@@ -102,25 +103,21 @@ if ($action == 'updateMask')
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir)
-	{
+	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/mymodule/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
-		if (file_exists($file))
-		{
+		if (file_exists($file)) {
 			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound)
-	{
+	if ($filefound) {
 		require_once $file;
 
 		$module = new $classname($db);
 
-		if ($module->write_file($tmpobject, $langs) > 0)
-		{
+		if ($module->write_file($tmpobject, $langs) > 0) {
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
 			return;
 		} else {
@@ -131,19 +128,15 @@ if ($action == 'updateMask')
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
-}
-
-elseif ($action == 'setmod') {
+} elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
 	$tmpobjectkey = GETPOST('object');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey)."_ADDON";
 		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
 	}
-}
-
-// Activate a model
-elseif ($action == 'set') {
+} elseif ($action == 'set') {
+	// Activate a model
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
@@ -151,13 +144,13 @@ elseif ($action == 'set') {
 		$tmpobjectkey = GETPOST('object');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
-			if ($conf->global->$constforval == "$value") dolibarr_del_const($db, $constforval, $conf->entity);
+			if ($conf->global->$constforval == "$value") {
+				dolibarr_del_const($db, $constforval, $conf->entity);
+			}
 		}
 	}
-}
-
-// Set or unset default model
-elseif ($action == 'setdoc') {
+} elseif ($action == 'setdoc') {
+	// Set or unset default model
 	$tmpobjectkey = GETPOST('object');
 	if (!empty($tmpobjectkey)) {
 		$constforval = 'MYMODULE_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
@@ -207,8 +200,7 @@ print dol_get_fiche_head($head, 'settings', '', -1, "mymodule@mymodule");
 echo '<span class="opacitymedium">'.$langs->trans("MyModuleSetupPage").'</span><br><br>';
 
 
-if ($action == 'edit')
-{
+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">';
@@ -216,8 +208,7 @@ if ($action == 'edit')
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-	foreach ($arrayofparameters as $key => $val)
-	{
+	foreach ($arrayofparameters as $key => $val) {
 		print '<tr class="oddeven"><td>';
 		$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
 		print $form->textwithpicto($langs->trans($key), $tooltiphelp);
@@ -232,13 +223,11 @@ if ($action == 'edit')
 	print '</form>';
 	print '<br>';
 } else {
-	if (!empty($arrayofparameters))
-	{
+	if (!empty($arrayofparameters)) {
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-		foreach ($arrayofparameters as $key => $val)
-		{
+		foreach ($arrayofparameters as $key => $val) {
 			$setupnotempty++;
 
 			print '<tr class="oddeven"><td>';
@@ -264,7 +253,9 @@ $myTmpObjects['MyObject'] = array('includerefgeneration'=>0, 'includedocgenerati
 
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
-	if ($myTmpObjectKey == 'MyObject') continue;
+	if ($myTmpObjectKey == 'MyObject') {
+		continue;
+	}
 	if ($myTmpObjectArray['includerefgeneration']) {
 		/*
 		 * Orders Numbering model
@@ -284,19 +275,14 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 		clearstatcache();
 
-		foreach ($dirmodels as $reldir)
-		{
+		foreach ($dirmodels as $reldir) {
 			$dir = dol_buildpath($reldir."core/modules/".$moduledir);
 
-			if (is_dir($dir))
-			{
+			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')
-						{
+				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';
@@ -304,11 +290,14 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 							$module = new $file($db);
 
 							// Show modules according to features level
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+								continue;
+							}
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+								continue;
+							}
 
-							if ($module->isEnabled())
-							{
+							if ($module->isEnabled()) {
 								dol_include_once('/'.$moduledir.'/class/'.strtolower($myTmpObjectKey).'.class.php');
 
 								print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
@@ -321,14 +310,16 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								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;
+								} elseif ($tmp == 'NotConfigured') {
+									print $langs->trans($tmp);
+								} else {
+									print $tmp;
+								}
 								print '</td>'."\n";
 
 								print '<td class="center">';
 								$constforvar = 'MYMODULE_'.strtoupper($myTmpObjectKey).'_ADDON';
-								if ($conf->global->$constforvar == $file)
-								{
+								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).'">';
@@ -348,9 +339,10 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
 									$htmltooltip .= ''.$langs->trans("NextValue").': ';
 									if ($nextval) {
-										if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+										if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
 											$nextval = $langs->trans($nextval);
-											$htmltooltip .= $nextval.'<br>';
+										}
+										$htmltooltip .= $nextval.'<br>';
 									} else {
 										$htmltooltip .= $langs->trans($module->error).'<br>';
 									}
@@ -387,12 +379,10 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 		$sql .= " WHERE type = '".$db->escape($type)."'";
 		$sql .= " AND entity = ".$conf->entity;
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
 			$num_rows = $db->num_rows($resql);
-			while ($i < $num_rows)
-			{
+			while ($i < $num_rows) {
 				$array = $db->fetch_array($resql);
 				array_push($def, $array[0]);
 				$i++;
@@ -413,31 +403,23 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 		clearstatcache();
 
-		foreach ($dirmodels as $reldir)
-		{
-			foreach (array('', '/doc') as $valdir)
-			{
+		foreach ($dirmodels as $reldir) {
+			foreach (array('', '/doc') as $valdir) {
 				$realpath = $reldir."core/modules/".$moduledir.$valdir;
 				$dir = dol_buildpath($realpath);
 
-				if (is_dir($dir))
-				{
+				if (is_dir($dir)) {
 					$handle = opendir($dir);
-					if (is_resource($handle))
-					{
-						while (($file = readdir($handle)) !== false)
-						{
+					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))
-								{
+						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);
 
@@ -445,21 +427,26 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 									$module = new $classname($db);
 
 									$modulequalified = 1;
-									if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-									if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+									if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+										$modulequalified = 0;
+									}
+									if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+										$modulequalified = 0;
+									}
 
-									if ($modulequalified)
-									{
+									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;
+										if (method_exists($module, 'info')) {
+											print $module->info($langs);
+										} else {
+											print $module->description;
+										}
 										print '</td>';
 
 										// Active
-										if (in_array($name, $def))
-										{
+										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');
@@ -486,8 +473,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Info
 										$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
 										$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-										if ($module->type == 'pdf')
-										{
+										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;
@@ -502,8 +488,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 										// Preview
 										print '<td class="center">';
-										if ($module->type == 'pdf')
-										{
+										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');
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index 05ca7f27d16..2e04e34dcac 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -203,7 +203,7 @@ class MyModuleApi extends DolibarrApi
 		foreach ($request_data as $field => $value) {
 			$this->myobject->$field = $value;
 		}
-		if (!$this->myobject->create(DolibarrApiAccess::$user)) {
+		if ($this->myobject->create(DolibarrApiAccess::$user)<0) {
 			throw new RestException(500, "Error creating MyObject", array_merge(array($this->myobject->error), $this->myobject->errors));
 		}
 		return $this->myobject->id;
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index e33aa866b8e..e7da913f39c 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' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *  '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
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 2a5853a1e60..e4f662c9e99 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -65,7 +65,7 @@ class modMyModule extends DolibarrModules
 		// Module description, used if translation string 'ModuleMyModuleDesc' not found (MyModule is name of module).
 		$this->description = "MyModuleDescription";
 		// Used only if file README.md and README-LL.md not found.
-		$this->descriptionlong = "MyModule description (Long)";
+		$this->descriptionlong = "MyModuleDescription";
 
 		// Author
 		$this->editor_name = 'Editor name';
@@ -144,7 +144,7 @@ class modMyModule extends DolibarrModules
 		$this->langfiles = array("mymodule@mymodule");
 
 		// Prerequisites
-		$this->phpmin = array(5, 5); // Minimum version of PHP required by module
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(11, -3); // Minimum version of Dolibarr required by module
 
 		// Messages at activation
@@ -410,7 +410,9 @@ class modMyModule extends DolibarrModules
 		global $conf, $langs;
 
 		$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')
+		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';
@@ -432,19 +434,19 @@ class modMyModule extends DolibarrModules
 		$myTmpObjects['MyObject'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
 
 		foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
-			if ($myTmpObjectKey == 'MyObject') continue;
+			if ($myTmpObjectKey == 'MyObject') {
+				continue;
+			}
 			if ($myTmpObjectArray['includerefgeneration']) {
 				$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/mymodule/template_myobjects.odt';
 				$dirodt = DOL_DATA_ROOT.'/doctemplates/mymodule';
 				$dest = $dirodt.'/template_myobjects.odt';
 
-				if (file_exists($src) && !file_exists($dest))
-				{
+				if (file_exists($src) && !file_exists($dest)) {
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 					dol_mkdir($dirodt);
 					$result = dol_copy($src, $dest, 0, 0);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$langs->load("errors");
 						$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 						return 0;
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 cb9e4f0a6dd..4546d7044bd 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
@@ -80,9 +80,9 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	 */
 	public $version = 'dolibarr';
 
-	 /**
-	  * @var int page_largeur
-	  */
+	/**
+	 * @var int page_largeur
+	 */
 	public $page_largeur;
 
 	/**
@@ -128,7 +128,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 
 
 	/**
-	 * @var array of document table collumns
+	 * @var array of document table columns
 	 */
 	public $cols;
 
diff --git a/htdocs/modulebuilder/template/css/mymodule.css.php b/htdocs/modulebuilder/template/css/mymodule.css.php
index af1566c0869..ecffe5dcf97 100644
--- a/htdocs/modulebuilder/template/css/mymodule.css.php
+++ b/htdocs/modulebuilder/template/css/mymodule.css.php
@@ -54,8 +54,7 @@ if (!$res) die("Include of main fails");
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 // Load user to have $user->conf loaded (not done by default here because of NOLOGIN constant defined) and load permission if we need to use them in CSS
-/*if (empty($user->id) && ! empty($_SESSION['dol_login']))
-{
+/*if (empty($user->id) && ! empty($_SESSION['dol_login'])) {
 	$user->fetch('',$_SESSION['dol_login']);
 	$user->getrights();
 }*/
@@ -65,8 +64,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 header('Content-type: text/css');
 // Important: Following code is to cache this file to avoid page request by browser at each Dolibarr page access.
 // You can use CTRL+F5 to refresh your browser cache.
-if (empty($dolibarr_nocache)) header('Cache-Control: max-age=10800, public, must-revalidate');
-else header('Cache-Control: no-cache');
+if (empty($dolibarr_nocache)) {
+	header('Cache-Control: max-age=10800, public, must-revalidate');
+} else {
+	header('Cache-Control: no-cache');
+}
 
 ?>
 
diff --git a/htdocs/modulebuilder/template/js/mymodule.js.php b/htdocs/modulebuilder/template/js/mymodule.js.php
index b257e23fb48..fea88d695ec 100644
--- a/htdocs/modulebuilder/template/js/mymodule.js.php
+++ b/htdocs/modulebuilder/template/js/mymodule.js.php
@@ -53,8 +53,11 @@ if (!$res) die("Include of main fails");
 header('Content-Type: application/javascript');
 // Important: Following code is to cache this file to avoid page request by browser at each Dolibarr page access.
 // You can use CTRL+F5 to refresh your browser cache.
-if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
-else header('Cache-Control: no-cache');
+if (empty($dolibarr_nocache)) {
+	header('Cache-Control: max-age=3600, public, must-revalidate');
+} else {
+	header('Cache-Control: no-cache');
+}
 ?>
 
 /* Javascript library of module MyModule */
diff --git a/htdocs/modulebuilder/template/mymoduleindex.php b/htdocs/modulebuilder/template/mymoduleindex.php
index 3da38a7e02c..ee2fe6b28f0 100644
--- a/htdocs/modulebuilder/template/mymoduleindex.php
+++ b/htdocs/modulebuilder/template/mymoduleindex.php
@@ -48,10 +48,11 @@ $action = GETPOST('action', 'aZ09');
 
 
 // Security check
-//if (! $user->rights->mymodule->myobject->read) accessforbidden();
+// if (! $user->rights->mymodule->myobject->read) {
+// 	accessforbidden();
+// }
 $socid = GETPOST('socid', 'int');
-if (isset($user->socid) && $user->socid > 0)
-{
+if (isset($user->socid) && $user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 541d971013f..fbd156f2a97 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -70,16 +70,18 @@ $langs->loadLangs(array("mymodule@mymodule", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
-$ref        = GETPOST('ref', 'alpha');
+$ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$cancel     = GETPOST('cancel', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
-	if (!count($actioncode)) $actioncode = '0';
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
@@ -87,12 +89,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = 'a.datep,a.id';
-if (!$sortorder) $sortorder = 'DESC,DESC';
+if (!$sortfield) {
+	$sortfield = 'a.datep,a.id';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC,DESC';
+}
 
 // Initialize technical objects
 $object = new MyObject($db);
@@ -104,7 +112,9 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->mymodule->multidir_output[$object->entity]."/".$object->id;
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->mymodule->multidir_output[$object->entity]."/".$object->id;
+}
 
 // Security check - Protection if external user
 //if ($user->socid > 0) accessforbidden();
@@ -120,20 +130,19 @@ $permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the incl
 
 $parameters = array('id'=>$id);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	// Cancel
-	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-	{
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
 		header("Location: ".$backtopage);
 		exit;
 	}
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-	{
+	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 = '';
 	}
@@ -147,14 +156,15 @@ if (empty($reshook))
 
 $form = new Form($db);
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
 	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = '';
 	llxHeader('', $title, $help_url);
 
-	if (!empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) {
+		$langs->load("mails");
+	}
 	$head = myobjectPrepareHead($object);
 
 
@@ -172,14 +182,13 @@ if ($object->id > 0)
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	// Project
-	if (! empty($conf->projet->enabled))
-	{
+	if (! empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-		if ($permissiontoadd)
-		{
-			if ($action != 'classify')
+		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);
@@ -228,10 +237,11 @@ if ($object->id > 0)
 	$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)
-	{
+	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);
+		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');
@@ -241,10 +251,8 @@ if ($object->id > 0)
 
 	print '<div class="tabsAction">';
 
-	if (!empty($conf->agenda->enabled))
-	{
-		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
-		{
+	if (!empty($conf->agenda->enabled)) {
+		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
 		} else {
 			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
@@ -253,11 +261,14 @@ if ($object->id > 0)
 
 	print '</div>';
 
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-	{
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$param = '&id='.$object->id.'&socid='.$socid;
-		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+		if (!empty($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("ActionsOnMyObject"), '', '');
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index ef7a6da8d66..dc4426f7df9 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -69,11 +69,11 @@ $langs->loadLangs(array("mymodule@mymodule", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
-$ref        = GETPOST('ref', 'alpha');
+$ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$confirm    = GETPOST('confirm', 'alpha');
-$cancel     = GETPOST('cancel', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'myobjectcard'; // To manage different context of search
+$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');
 //$lineid   = GETPOST('lineid', 'int');
@@ -92,12 +92,15 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 // 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');
+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';
+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.
@@ -125,18 +128,22 @@ $upload_dir = $conf->mymodule->multidir_output[isset($object->entity) ? $object-
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	$error = 0;
 
 	$backurlforlist = dol_buildpath('/mymodule/myobject_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('/mymodule/myobject_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+				$backtopage = $backurlforlist;
+			} else {
+				$backtopage = dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+			}
 		}
 	}
 
@@ -157,12 +164,10 @@ if (empty($reshook))
 	// Action to build doc
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
-	if ($action == 'set_thirdparty' && $permissiontoadd)
-	{
+	if ($action == 'set_thirdparty' && $permissiontoadd) {
 		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
 	}
-	if ($action == 'classin' && $permissiontoadd)
-	{
+	if ($action == 'classin' && $permissiontoadd) {
 		$object->setProject(GETPOST('projectid', 'int'));
 	}
 
@@ -207,15 +212,18 @@ jQuery(document).ready(function() {
 
 
 // Part to create
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("MyObject")), '', 'object_'.$object->picto);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
-	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	}
 
 	print dol_get_fiche_head(array(), '');
 
@@ -246,16 +254,19 @@ if ($action == 'create')
 }
 
 // Part to edit record
-if (($id || $ref) && $action == 'edit')
-{
+if (($id || $ref) && $action == 'edit') {
 	print load_fiche_titre($langs->trans("MyObject"), '', 'object_'.$object->picto);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
-	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	}
 
 	print dol_get_fiche_head();
 
@@ -279,8 +290,7 @@ if (($id || $ref) && $action == 'edit')
 }
 
 // Part to show record
-if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
-{
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
 	$res = $object->fetch_optionals();
 
 	$head = myobjectPrepareHead($object);
@@ -304,8 +314,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 
 	// Confirmation of action xxxx
-	if ($action == 'xxx')
-	{
+	if ($action == 'xxx') {
 		$formquestion = array();
 		/*
 		$forcecombo=0;
@@ -323,8 +332,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Call Hook formConfirm
 	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
 	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-	elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
 
 	// Print form confirm
 	print $formconfirm;
@@ -342,12 +354,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
-	 {
+	 if (! empty($conf->projet->enabled)) {
 	 $langs->load("projects");
 	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
-	 if ($permissiontoadd)
-	 {
+	 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') {
@@ -404,8 +414,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 * Lines
 	 */
 
-	if (!empty($object->table_element_line))
-	{
+	if (!empty($object->table_element_line)) {
 		// Show object lines
 		$result = $object->getLinesArray();
 
@@ -421,21 +430,17 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 
 		print '<div class="div-table-responsive-no-min">';
-		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
-		{
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
 			print '<table id="tablelines" class="noborder noshadow" width="100%">';
 		}
 
-		if (!empty($object->lines))
-		{
+		if (!empty($object->lines)) {
 			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1);
 		}
 
 		// Form to add new line
-		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines')
-		{
-			if ($action != 'editline')
-			{
+		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
+			if ($action != 'editline') {
 				// Add products/services form
 				$object->formAddObjectLine(1, $mysoc, $soc);
 
@@ -444,8 +449,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 		}
 
-		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
-		{
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
 			print '</table>';
 		}
 		print '</div>';
@@ -462,8 +466,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-		if (empty($reshook))
-		{
+		if (empty($reshook)) {
 			// Send
 			if (empty($user->socid)) {
 				print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle');
@@ -478,7 +481,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			// Validate
 			if ($object->status == $object::STATUS_DRAFT) {
-				if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0))	{
+				if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0)) {
 					print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', $permissiontoadd);
 				} else {
 					$langs->load("errors");
@@ -491,16 +494,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=scrumsprint', '', $permissiontoadd);
 
 			/*
-			if ($permissiontoadd)
-			{
+			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_ENABLED) {
 					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable">'.$langs->trans("Disable").'</a>'."\n";
 				} else {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable">'.$langs->trans("Enable").'</a>'."\n";
 				}
 			}
-			if ($permissiontoadd)
-			{
+			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_VALIDATED) {
 					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close">'.$langs->trans("Cancel").'</a>'."\n";
 				} else {
@@ -521,8 +522,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$action = 'presend';
 	}
 
-	if ($action != 'presend')
-	{
+	if ($action != 'presend') {
 		print '<div class="fichecenter"><div class="fichehalfleft">';
 		print '<a name="builddoc"></a>'; // ancre
 
@@ -561,7 +561,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 
 	//Select mail models is same action as presend
-	if (GETPOST('modelselected')) $action = 'presend';
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
 
 	// Presend form
 	$modelmail = 'myobject';
diff --git a/htdocs/modulebuilder/template/myobject_contact.php b/htdocs/modulebuilder/template/myobject_contact.php
index c48a997aba4..35e5be2716a 100644
--- a/htdocs/modulebuilder/template/myobject_contact.php
+++ b/htdocs/modulebuilder/template/myobject_contact.php
@@ -73,36 +73,30 @@ $permission = $user->rights->mymodule->myobject->write;
  * Add a new contact
  */
 
-if ($action == 'addcontact' && $permission)
-{
+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)
-	{
+	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	} else {
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-} // Toggle the status of a contact
-elseif ($action == 'swapstatut' && $permission)
-{
+} elseif ($action == 'swapstatut' && $permission) {
+	// Toggle the status of a contact
 	$result = $object->swapContactStatus(GETPOST('ligne'));
-} // Deletes a contact
-elseif ($action == 'deletecontact' && $permission)
-{
+} elseif ($action == 'deletecontact' && $permission) {
+	// Deletes a contact
 	$result = $object->delete_contact($lineid);
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	} else {
@@ -132,8 +126,7 @@ $userstatic = new User($db);
 /*                                                                             */
 /* *************************************************************************** */
 
-if ($object->id)
-{
+if ($object->id) {
 	/*
 	 * Show tabs
 	 */
@@ -191,10 +184,11 @@ if ($object->id)
 
 	// 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)
-	{
+	foreach ($dirtpls as $reldir) {
 		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-		if ($res) break;
+		if ($res) {
+			break;
+		}
 	}
 }
 
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 7399fa6fb09..1cd3de2ebd9 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -79,12 +79,18 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 //if (! $sortfield) $sortfield="position_name";
 
 // Initialize technical objects
@@ -98,7 +104,9 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->mymodule->multidir_output[$object->entity ? $object->entity : $conf->entity]."/myobject/".get_exdir(0, 0, 0, 1, $object);
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->mymodule->multidir_output[$object->entity ? $object->entity : $conf->entity]."/myobject/".get_exdir(0, 0, 0, 1, $object);
+}
 
 // Security check - Protection if external user
 //if ($user->socid > 0) accessforbidden();
@@ -127,8 +135,7 @@ $help_url = '';
 //$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
-if ($object->id)
-{
+if ($object->id) {
 	/*
 	 * Show tabs
 	 */
@@ -140,8 +147,7 @@ if ($object->id)
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 	$totalsize = 0;
-	foreach ($filearray as $key => $file)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 8c225e091ce..e22de010459 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -79,7 +79,7 @@ $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')
 
 $id = GETPOST('id', 'int');
 
@@ -88,7 +88,9 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1 or if we click on clear filters
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -106,15 +108,21 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Default sort order (if not yet defined by previous GETPOST)
-if (!$sortfield) $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
-if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) {
+	reset($object->fields);					// Reset is required to avoid key() to return null.
+	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 
 // Initialize array of search criterias
 $search_all = GETPOST('search_all', 'alphanohtml') ? 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');
+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'));
@@ -123,8 +131,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)
-{
+foreach ($object->fields as $key => $val) {
 	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
 }
 
@@ -156,8 +163,7 @@ $permissiontodelete = $user->rights->mymodule->myobject->delete;
 // Security check
 if (empty($conf->mymodule->enabled)) accessforbidden('Module not enabled');
 $socid = 0;
-if ($user->socid > 0)	// Protection if external user
-{
+if ($user->socid > 0) { // Protection if external user
 	//$socid = $user->socid;
 	accessforbidden();
 }
@@ -170,21 +176,26 @@ if ($user->socid > 0)	// Protection if external user
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list';
+	$massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		foreach ($object->fields as $key => $val) {
 			$search[$key] = '';
 			if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
@@ -196,8 +207,7 @@ if (empty($reshook))
 		$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'))
-	{
+		|| 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
 	}
 
@@ -226,13 +236,14 @@ $title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("MyObjects"));
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	$sql .= 't.'.$key.', ';
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+	}
 }
 // Add fields from hooks
 $parameters = array();
@@ -240,15 +251,16 @@ $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'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
+}
 // Add table from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity($object->element).")";
 else $sql .= " WHERE 1 = 1";
-foreach ($search as $key => $val)
-{
+foreach ($search as $key => $val) {
 	if (in_array($key, $object->fields)) {
 		if ($key == 'status' && $search[$key] == -1) continue;
 		$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
@@ -256,7 +268,9 @@ foreach ($search as $key => $val)
 			if ($search[$key] == '-1') $search[$key] = '';
 			$mode_search = 2;
 		}
-		if ($search[$key] != '') $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+		if ($search[$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);
@@ -271,7 +285,9 @@ foreach ($search as $key => $val)
 		}
 	}
 }
-if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+}
 //$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -282,8 +298,7 @@ $sql .= $hookmanager->resPrint;
 
 /* If a group by is required
 $sql.= " GROUP BY ";
-foreach($object->fields as $key => $val)
-{
+foreach($object->fields as $key => $val) {
 	$sql.='t.'.$key.', ';
 }
 // Add fields from extrafields
@@ -325,8 +340,7 @@ if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit
 }
 
 // Direct jump if only one record found
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page)
-{
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.$id);
@@ -357,14 +371,24 @@ jQuery(document).ready(function() {
 $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 (!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);
 }
-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
@@ -379,12 +403,18 @@ $arrayofmassactions = array(
 	//'builddoc'=>$langs->trans("PDFMerge"),
 	//'presend'=>$langs->trans("SendByMail"),
 );
-if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if ($permissiontodelete) {
+	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+}
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+	$arrayofmassactions = array();
+}
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+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">';
@@ -403,9 +433,10 @@ $objecttmp = new MyObject($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);
+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>';
 }
 
@@ -416,11 +447,13 @@ $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($reshook)) {
+	$moreforfilter .= $hookmanager->resPrint;
+} else {
+	$moreforfilter = $hookmanager->resPrint;
+}
 
-if (!empty($moreforfilter))
-{
+if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
 	print '</div>';
@@ -437,18 +470,22 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['css']) ? '' : $val['css']);
-	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
-	if (!empty($arrayfields['t.'.$key]['checked']))
-	{
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (!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) {
+		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_', '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]).'">';
@@ -481,15 +518,18 @@ print '</tr>'."\n";
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-foreach ($object->fields as $key => $val)
-{
+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') $cssforfield .= ($cssforfield ? ' ' : '').'right';
-	if (!empty($arrayfields['t.'.$key]['checked']))
-	{
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
 	}
 }
@@ -506,10 +546,8 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val)
-	{
+if (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
 	}
 }
@@ -519,38 +557,51 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
-while ($i < ($limit ? min($num, $limit) : $num))
-{
+while ($i < ($limit ? min($num, $limit) : $num)) {
 	$obj = $db->fetch_object($resql);
-	if (empty($obj)) break; // Should not happen
+	if (empty($obj)) {
+		break; // Should not happen
+	}
 
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
 	// Show here line of result
 	print '<tr class="oddeven">';
-	foreach ($object->fields as $key => $val)
-	{
+	foreach ($object->fields as $key => $val) {
 		$cssforfield = (empty($val['css']) ? '' : $val['css']);
-		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-		elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		} elseif ($key == 'status') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		}
 
-		if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		if (in_array($val['type'], array('timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		} elseif ($key == 'ref') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) $cssforfield .= ($cssforfield ? ' ' : '').'right';
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'right';
+		}
 		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
-		if (!empty($arrayfields['t.'.$key]['checked']))
-		{
+		if (!empty($arrayfields['t.'.$key]['checked'])) {
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
-			if ($key == 'status') print $object->getLibStatut(5);
-			else print $object->showOutputField($val, $key, $object->$key, '');
+			if ($key == 'status') {
+				print $object->getLibStatut(5);
+			} else {
+				print $object->showOutputField($val, $key, $object->$key, '');
+			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-			if (!empty($val['isameasure']))
-			{
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!empty($val['isameasure'])) {
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
@@ -563,8 +614,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	print $hookmanager->resPrint;
 	// Action column
 	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-	{
+	if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 		$selected = 0;
 		if (in_array($object->id, $arrayofselected)) $selected = 1;
 		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
@@ -581,10 +631,13 @@ while ($i < ($limit ? min($num, $limit) : $num))
 include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 // If no record found
-if ($num == 0)
-{
+if ($num == 0) {
 	$colspan = 1;
-	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
+			$colspan++;
+		}
+	}
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
@@ -600,10 +653,11 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
-{
+if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 	$formfile = new FormFile($db);
diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index f56585497ea..abe8daf7622 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -86,7 +86,9 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->mymodule->multidir_output[$object->entity]."/".$object->id;
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->mymodule->multidir_output[$object->entity]."/".$object->id;
+}
 
 $permissionnote = $user->rights->mymodule->myobject->write; // Used by the include of actions_setnotes.inc.php
 $permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the include of actions_addupdatedelete.inc.php
@@ -110,8 +112,7 @@ $form = new Form($db);
 $help_url = '';
 llxHeader('', $langs->trans('MyObject'), $help_url);
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$object->fetch_thirdparty();
 
 	$head = myobjectPrepareHead($object);
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 274782a14ea..121909eb28a 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -106,7 +106,7 @@ class Mo extends CommonObject
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61, 'notnull'=>-1,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62, 'notnull'=>-1,),
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>500, 'notnull'=>1,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>501, 'notnull'=>-1,),
+		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>501, 'notnull'=>1,),
 		'date_valid' => array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-2, 'position'=>502,),
 		'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'user.rowid',),
 		'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1,),
@@ -1352,7 +1352,7 @@ class Mo extends CommonObject
 	 */
 	public static function replaceThirdparty($db, $origin_id, $dest_id)
 	{
-		$tables = array('mrp_production');
+		$tables = array('mrp_mo');
 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 5ab913f7ce9..b16748f66b4 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -92,7 +92,7 @@ if ($action == "setlive")
 {
 	$liveenable = GETPOST('value', 'int') ? 0 : 1;
 	$res = dolibarr_set_const($db, "PAYPAL_API_SANDBOX", $liveenable, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 655d501cac3..873678adcae 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -105,7 +105,7 @@ function print_paypal_redirect($paymentAmount, $currencyCodeType, $paymentType,
 		$landingPage = 'Billing';
 	}
 
-	dol_syslog("expresscheckout redirect with callSetExpressCheckout $paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $tag, $solutionType, $landingPage, $shipToName, $shipToStreet, $shipToCity, $shipToState, $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum");
+	dol_syslog("print_paypal_redirect expresscheckout redirect with callSetExpressCheckout $paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $tag, $solutionType, $landingPage, $shipToName, $shipToStreet, $shipToCity, $shipToState, $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum");
 	$resArray = callSetExpressCheckout(
 		$paymentAmount,
 		$currencyCodeType,
@@ -127,6 +127,8 @@ function print_paypal_redirect($paymentAmount, $currencyCodeType, $paymentType,
 		$desc
 	);
 
+	dol_syslog("print_paypal_redirect resArray=".var_export($resArray, true), LOG_DEBUG);
+
 	$ack = strtoupper($resArray["ACK"]);
 	if ($ack == "SUCCESS" || $ack == "SUCCESSWITHWARNING")
 	{
@@ -134,6 +136,7 @@ function print_paypal_redirect($paymentAmount, $currencyCodeType, $paymentType,
 
 		// Redirect to paypal.com here
 		$payPalURL = $API_Url.$token;
+		dol_syslog("Redirect to ".$payPalURL, LOG_INFO);
 		header("Location: ".$payPalURL);
 		exit;
 	} else {
@@ -282,7 +285,7 @@ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType,
 	$_SESSION["FinalPaymentAmt"] = $paymentAmount;
 	$_SESSION["currencyCodeType"] = $currencyCodeType;
 	$_SESSION["PaymentType"] = $paymentType; // 'Mark', 'Sole'
-	$_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR']; // Payer ip
+	$_SESSION['ipaddress'] = getUserRemoteIP();	// Payer ip
 
 	//'---------------------------------------------------------------------------------------------------------------
 	//' Make the API call to PayPal
@@ -433,7 +436,7 @@ function DirectPayment($paymentType, $paymentAmount, $creditCardType, $creditCar
     $nvpstr = $nvpstr . "&CITY=" . urlencode($city);
     $nvpstr = $nvpstr . "&STATE=" . urlencode($state);
     $nvpstr = $nvpstr . "&COUNTRYCODE=" . urlencode($countryCode);
-    $nvpstr = $nvpstr . "&IPADDRESS=" . $_SERVER['REMOTE_ADDR'];
+    $nvpstr = $nvpstr . "&IPADDRESS=" . getUserRemotIP();
     $nvpstr = $nvpstr . "&INVNUM=" . urlencode($tag);
 
     $resArray=hash_call("DoDirectPayment", $nvpstr);
diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
index bae21309022..4d2307d17ac 100644
--- a/htdocs/product/admin/dynamic_prices.php
+++ b/htdocs/product/admin/dynamic_prices.php
@@ -170,10 +170,8 @@ if ($action != 'create_updater' && $action != 'edit_updater')
 	print '</tr>';
 
 	$arrayglobalvars = $price_globals->listGlobalVariables();
-	if (!empty($arrayglobalvars))
-	{
+	if (!empty($arrayglobalvars)) {
 		foreach ($arrayglobalvars as $i=>$entry) {
-			$var = !$var;
 			print '<tr class="oddeven">';
 			print '<td>'.$entry->code.'</td>';
 			print '<td>'.$entry->description.'</td>';
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 6cd727d33b8..f268003e1bb 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -89,12 +89,12 @@ if ($action == 'setcodeproduct')
 if ($action == 'other' && GETPOST('value_PRODUIT_LIMIT_SIZE') >= 0)
 {
 	$res = dolibarr_set_const($db, "PRODUIT_LIMIT_SIZE", GETPOST('value_PRODUIT_LIMIT_SIZE'), 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 }
 if ($action == 'other' && GETPOST('value_PRODUIT_MULTIPRICES_LIMIT') > 0)
 {
 	$res = dolibarr_set_const($db, "PRODUIT_MULTIPRICES_LIMIT", GETPOST('value_PRODUIT_MULTIPRICES_LIMIT'), 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 }
 if ($action == 'other')
 {
@@ -145,6 +145,9 @@ if ($action == 'other')
 	$value = GETPOST('activate_useProdFournDesc', 'alpha');
 	$res = dolibarr_set_const($db, "PRODUIT_FOURN_TEXTS", $value, 'chaine', 0, '', $conf->entity);
 
+	$value = GETPOST('activate_FillProductDescAuto', 'alpha');
+	$res = dolibarr_set_const($db, "PRODUIT_AUTOFILL_DESC", $value, 'chaine', 0, '', $conf->entity);
+
 	if ($value) {
 		$sql_test = "SELECT count(desc_fourn) as cpt FROM ".MAIN_DB_PREFIX."product_fournisseur_price WHERE 1";
 		$resql = $db->query($sql_test);
@@ -249,7 +252,7 @@ if ($action == 'set')
 	$value = GETPOST('value');
 	if (GETPOST('value', 'alpha')) $res = dolibarr_set_const($db, $const, $value, 'chaine', 0, '', $conf->entity);
 	else $res = dolibarr_del_const($db, $const, $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 }
 
 //if ($action == 'other')
@@ -577,7 +580,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES)) $current_rule = 'PRODUIT_MULTIPR
 if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) $current_rule = 'PRODUIT_CUSTOMER_PRICES_BY_QTY';
 if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) $current_rule = 'PRODUIT_CUSTOMER_PRICES';
 if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $current_rule = 'PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES';
-print $form->selectarray("princingrule", $select_pricing_rules, $current_rule);
+print $form->selectarray("princingrule", $select_pricing_rules, $current_rule, 0, 0, 0, '', 1, 0, 0, '', 'maxwidth400', 1);
 print '</td>';
 print '</tr>';
 
@@ -629,6 +632,28 @@ if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
 	print '</tr>';
 }
 
+// Do Not Add Product description on add lines
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("OnProductSelectAddProductDesc").'</td>';
+print '<td class="right">';
+print $form->selectarray(
+	"activate_FillProductDescAuto",
+	array(1=>'AutoFillFormFieldBeforeSubmit', 0=>'DoNotAutofillButAutoConcat', -1=>'DoNotUseDescriptionOfProdut'),
+	empty($conf->global->PRODUIT_AUTOFILL_DESC) ? 0 : $conf->global->PRODUIT_AUTOFILL_DESC,
+	0,
+	0,
+	0,
+	'',
+	1,
+	0,
+	0,
+	'',
+	'maxwidth400',
+	1
+);
+print '</td>';
+print '</tr>';
+
 // Visualiser description produit dans les formulaires activation/desactivation
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ViewProductDescInFormAbility").'</td>';
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 0013ec90811..198d49defaf 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -72,7 +72,9 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 	{
 		$outref = $object->ref;
 		$outlabel = $object->label;
+		$outlabel_trans ='';
 		$outdesc = $object->description;
+		$outdesc_trans ='';
 		$outtype = $object->type;
 		$outqty = 1;
 		$outdiscount = 0;
@@ -80,10 +82,28 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 		$found = false;
 
 		$price_level = 1;
-		if ($socid > 0 && (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) {
+		if ($socid > 0 ) {
 			$thirdpartytemp = new Societe($db);
 			$thirdpartytemp->fetch($socid);
-			$price_level = $thirdpartytemp->price_level;
+
+			//Load translation description and label
+			if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+				$newlang = $thirdpartytemp->default_lang;
+
+				if (!empty($newlang)) {
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+					$outdesc_trans = (!empty($object->multilangs[$outputlangs->defaultlang]["description"])) ? $object->multilangs[$outputlangs->defaultlang]["description"] : $object->description;
+					$outlabel_trans = (!empty($object->multilangs[$outputlangs->defaultlang]["label"])) ? $object->multilangs[$outputlangs->defaultlang]["label"] : $object->label;
+				} else {
+					$outdesc_trans = $object->description;
+					$outlabel_trans = $object->label;
+				}
+			}
+
+			if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+				$price_level = $thirdpartytemp->price_level;
+			}
 		}
 
 		// Price by qty
@@ -159,7 +179,20 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 			$outtva_tx = $object->tva_tx;
 		}
 
-		$outjson = array('ref' => $outref, 'label' => $outlabel, 'desc' => $outdesc, 'type' => $outtype, 'price_ht' => $outprice_ht, 'price_ttc' => $outprice_ttc, 'pricebasetype' => $outpricebasetype, 'tva_tx' => $outtva_tx, 'qty' => $outqty, 'discount' => $outdiscount);
+		$outjson = array(
+			'ref' => $outref,
+			'label' => $outlabel,
+			'label_trans' => $outlabel_trans,
+			'desc' => $outdesc,
+			'desc_trans' => $outdesc_trans,
+			'type' => $outtype,
+			'price_ht' => $outprice_ht,
+			'price_ttc' => $outprice_ttc,
+			'pricebasetype' => $outpricebasetype,
+			'tva_tx' => $outtva_tx,
+			'qty' => $outqty,
+			'discount' => $outdiscount,
+			'array_options'=>$object->array_options);
 	}
 
 	echo json_encode($outjson);
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index b351b9ec7e1..55c29aa1381 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -16,7 +16,7 @@
  * Copyright (C) 2016		Charlie Benke		 <charlie@patas-monkey.com>
  * Copyright (C) 2016		Meziane Sof		     <virtualsof@yahoo.fr>
  * Copyright (C) 2017		Josep Lluís Amador	 <joseplluis@lliuretic.cat>
- * Copyright (C) 2019       Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2021  Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2019-2020  Thibault FOUCART     <support@ptibogxiv.net>
  * Copyright (C) 2020  		Pierre Ardoin     	 <mapiolca@me.com>
  *
@@ -413,7 +413,10 @@ if (empty($reshook))
 
 				$object->ref                    = $ref;
 				$object->label                  = GETPOST('label', $label_security_check);
-				$object->description            = dol_htmlcleanlastbr(GETPOST('desc', 'restricthtml'));
+
+				$desc = dol_htmlcleanlastbr(preg_replace('/&nbsp;$/', '', GETPOST('desc', 'restricthtml')));
+				$object->description            = $desc;
+
 				$object->url = GETPOST('url');
 				if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 				{
@@ -426,8 +429,8 @@ if (empty($reshook))
 				$object->status                 = GETPOST('statut', 'int');
 				$object->status_buy             = GETPOST('statut_buy', 'int');
 				$object->status_batch = GETPOST('status_batch', 'aZ09');
-				// removed from update view so GETPOST always empty
 				$object->fk_default_warehouse   = GETPOST('fk_default_warehouse');
+				// removed from update view so GETPOST always empty
 				/*
                 $object->seuil_stock_alerte     = GETPOST('seuil_stock_alerte');
                 $object->desiredstock           = GETPOST('desiredstock');
@@ -740,7 +743,7 @@ if (empty($reshook))
 			if (GETPOST('propalid') > 0) {
 				// Define cost price for margin calculation
 				$buyprice = 0;
-				if (($result = $propal->defineBuyPrice($pu_ht, GETPOST('remise_percent'), $object->id)) < 0)
+				if (($result = $propal->defineBuyPrice($pu_ht, price2num(GETPOST('remise_percent'), 2), $object->id)) < 0)
 				{
 					dol_syslog($langs->trans('FailedToGetCostPrice'));
 					setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
@@ -751,12 +754,12 @@ if (empty($reshook))
 				$result = $propal->addline(
 					$desc,
 					$pu_ht,
-					GETPOST('qty'),
+					price2num(GETPOST('qty'), 'MS'),
 					$tva_tx,
 					$localtax1_tx, // localtax1
 					$localtax2_tx, // localtax2
 					$object->id,
-					GETPOST('remise_percent'),
+					price2num(GETPOST('remise_percent'), 2),
 					$price_base_type,
 					$pu_ttc,
 					0,
@@ -781,7 +784,7 @@ if (empty($reshook))
 			} elseif (GETPOST('commandeid') > 0) {
 				// Define cost price for margin calculation
 				$buyprice = 0;
-				if (($result = $commande->defineBuyPrice($pu_ht, GETPOST('remise_percent'), $object->id)) < 0)
+				if (($result = $commande->defineBuyPrice($pu_ht, GETPOST('remise_percent', 2), $object->id)) < 0)
 				{
 					dol_syslog($langs->trans('FailedToGetCostPrice'));
 					setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
@@ -792,12 +795,12 @@ if (empty($reshook))
 				$result = $commande->addline(
 					$desc,
 					$pu_ht,
-					GETPOST('qty'),
+					price2num(GETPOST('qty'), 'MS'),
 					$tva_tx,
 					$localtax1_tx, // localtax1
 					$localtax2_tx, // localtax2
 					$object->id,
-					GETPOST('remise_percent'),
+					price2num(GETPOST('remise_percent'), 2),
 					'',
 					'',
 					$price_base_type,
@@ -822,7 +825,7 @@ if (empty($reshook))
 			} elseif (GETPOST('factureid') > 0) {
 				// Define cost price for margin calculation
 				$buyprice = 0;
-				if (($result = $facture->defineBuyPrice($pu_ht, GETPOST('remise_percent'), $object->id)) < 0)
+				if (($result = $facture->defineBuyPrice($pu_ht, GETPOST('remise_percent', 2), $object->id)) < 0)
 				{
 					dol_syslog($langs->trans('FailedToGetCostPrice'));
 					setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
@@ -833,12 +836,12 @@ if (empty($reshook))
 				$result = $facture->addline(
 					$desc,
 					$pu_ht,
-					GETPOST('qty'),
+					price2nm(GETPOST('qty'), 'MS'),
 					$tva_tx,
 					$localtax1_tx,
 					$localtax2_tx,
 					$object->id,
-					GETPOST('remise_percent'),
+					price2num(GETPOST('remise_percent'), 2),
 					'',
 					'',
 					'',
@@ -1049,7 +1052,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			if ($conf->browser->layout == 'phone') print '</tr><tr>';
 			print '<td>'.$langs->trans("BarcodeValue").'</td><td>';
 			$tmpcode = GETPOSTISSET('barcode') ? GETPOST('barcode') : $object->barcode;
-			if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) $tmpcode = $modBarCodeProduct->getNextValue($object, $type);
+			if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) $tmpcode = $modBarCodeProduct->getNextValue($object, $fk_barcode_type);
 			print '<input class="maxwidth100" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
 			print '</td></tr>';
 		}
@@ -1308,12 +1311,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			// Accountancy_code_buy
 			print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
 			print '<td>';
-			if ($type == 0)
-			{
-				$accountancy_code_buy = (GETPOST('accountancy_code_buy', 'alpha') ? (GETPOST('accountancy_code_buy', 'alpha')) : $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT);
-			} else {
-				$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
-			}
+            if ($type == 0) {
+                $accountancy_code_buy = (GETPOST('accountancy_code_buy', 'alpha') ? (GETPOST('accountancy_code_buy', 'alpha')) : $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT);
+            } else {
+                $accountancy_code_buy = (GETPOST('accountancy_code_buy', 'alpha') ? (GETPOST('accountancy_code_buy', 'alpha')) : $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT);
+            }
 			print $formaccounting->select_account($accountancy_code_buy, 'accountancy_code_buy', 1, null, 1, 1, '');
 			print '</td></tr>';
 
@@ -1510,7 +1512,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				print $formbarcode->selectBarcodeType($fk_barcode_type, 'fk_barcode_type', 1);
 				print '</td><td>'.$langs->trans("BarcodeValue").'</td><td>';
 				$tmpcode = GETPOSTISSET('barcode') ? GETPOST('barcode') : $object->barcode;
-				if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) $tmpcode = $modBarCodeProduct->getNextValue($object, $type);
+				if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) $tmpcode = $modBarCodeProduct->getNextValue($object, $fk_barcode_type);
 				print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
 				print '</td></tr>';
 			}
@@ -1835,11 +1837,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 					require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
 					$formbarcode = new FormBarCode($db);
 				}
+
+				$fk_barcode_type='';
 				if ($action == 'editbarcodetype')
 				{
 					print $formbarcode->formBarcodeType($_SERVER['PHP_SELF'].'?id='.$object->id, $object->barcode_type, 'fk_barcode_type');
+					$fk_barcode_type = $object->barcode_type;
 				} else {
 					$object->fetch_barcode();
+					$fk_barcode_type = $object->barcode_type;
 					print $object->barcode_type_label ? $object->barcode_type_label : ($object->barcode ? '<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>' : '');
 				}
 				print '</td></tr>'."\n";
@@ -1855,7 +1861,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				if ($action == 'editbarcode')
 				{
 					$tmpcode = GETPOSTISSET('barcode') ? GETPOST('barcode') : $object->barcode;
-					if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) $tmpcode = $modBarCodeProduct->getNextValue($object, $type);
+					if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) $tmpcode = $modBarCodeProduct->getNextValue($object, $fk_barcode_type);
 
 					print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
 					print '<input type="hidden" name="token" value="'.newToken().'">';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index d0314fb9c45..9a71faa5665 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1649,6 +1649,7 @@ class Product extends CommonObject
 			if ($result) {
 				if (count($prodcustprice->lines) > 0) {
 					$pu_ht = price($prodcustprice->lines[0]->price);
+					$price_min = price($prodcustprice->lines[0]->price_min);
 					$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
 					$price_base_type = $prodcustprice->lines[0]->price_base_type;
 					$tva_tx = $prodcustprice->lines[0]->tva_tx;
@@ -4334,6 +4335,7 @@ class Product extends CommonObject
 	public function getFather()
 	{
 		$sql = "SELECT p.rowid, p.label as label, p.ref as ref, pa.fk_product_pere as id, p.fk_product_type, pa.qty, pa.incdec, p.entity";
+		$sql .= ", 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 .= " WHERE p.rowid = pa.fk_product_pere";
@@ -4342,8 +4344,7 @@ class Product extends CommonObject
 		$res = $this->db->query($sql);
 		if ($res) {
 			$prods = array();
-			while ($record = $this->db->fetch_array($res))
-			{
+			while ($record = $this->db->fetch_array($res)) {
 				// $record['id'] = $record['rowid'] = id of father
 				$prods[$record['id']]['id'] = $record['rowid'];
 				$prods[$record['id']]['ref'] = $record['ref'];
@@ -4352,6 +4353,8 @@ class Product extends CommonObject
 				$prods[$record['id']]['incdec'] = $record['incdec'];
 				$prods[$record['id']]['fk_product_type'] = $record['fk_product_type'];
 				$prods[$record['id']]['entity'] = $record['entity'];
+				$prods[$record['id']]['status'] = $record['status'];
+				$prods[$record['id']]['status_buy'] = $record['status_buy'];
 			}
 			return $prods;
 		} else {
@@ -5428,7 +5431,6 @@ class Product extends CommonObject
 		$langs->load('products');
 
 		$label_type = 'label';
-
 		if ($type == 'short') {
 			$label_type = 'short_label';
 		}
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 55018f1fc8f..af767c98cd6 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -56,6 +56,11 @@ class Productcustomerprice extends CommonObject
 	 */
 	public $fk_soc;
 
+	/**
+	 * @var string Customer reference
+	 */
+	public $ref_customer;
+
 	public $price;
 	public $price_ttc;
 	public $price_min;
@@ -108,6 +113,8 @@ class Productcustomerprice extends CommonObject
 			$this->fk_product = trim($this->fk_product);
 		if (isset($this->fk_soc))
 			$this->fk_soc = trim($this->fk_soc);
+		if (isset($this->ref_customer))
+			$this->ref_customer = trim($this->ref_customer);
 		if (isset($this->price))
 			$this->price = trim($this->price);
 		if (isset($this->price_ttc))
@@ -171,6 +178,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= "datec,";
 		$sql .= "fk_product,";
 		$sql .= "fk_soc,";
+		$sql .= 'ref_customer,';
 		$sql .= "price,";
 		$sql .= "price_ttc,";
 		$sql .= "price_min,";
@@ -190,6 +198,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= " '".$this->db->idate(dol_now())."',";
 		$sql .= " ".(!isset($this->fk_product) ? 'NULL' : "'".$this->db->escape($this->fk_product)."'").",";
 		$sql .= " ".(!isset($this->fk_soc) ? 'NULL' : "'".$this->db->escape($this->fk_soc)."'").",";
+		$sql .= " ".(!isset($this->ref_customer) ? 'NULL' : "'".$this->db->escape($this->ref_customer)."'").",";
 		$sql .= " ".(empty($this->price) ? '0' : "'".$this->db->escape($this->price)."'").",";
 		$sql .= " ".(empty($this->price_ttc) ? '0' : "'".$this->db->escape($this->price_ttc)."'").",";
 		$sql .= " ".(empty($this->price_min) ? '0' : "'".$this->db->escape($this->price_min)."'").",";
@@ -264,6 +273,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= " t.tms,";
 		$sql .= " t.fk_product,";
 		$sql .= " t.fk_soc,";
+		$sql .= " t.ref_customer,";
 		$sql .= " t.price,";
 		$sql .= " t.price_ttc,";
 		$sql .= " t.price_min,";
@@ -293,6 +303,7 @@ class Productcustomerprice extends CommonObject
 				$this->tms = $this->db->jdate($obj->tms);
 				$this->fk_product = $obj->fk_product;
 				$this->fk_soc = $obj->fk_soc;
+				$this->ref_customer = $obj->ref_customer;
 				$this->price = $obj->price;
 				$this->price_ttc = $obj->price_ttc;
 				$this->price_min = $obj->price_min;
@@ -341,6 +352,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= " t.tms,";
 		$sql .= " t.fk_product,";
 		$sql .= " t.fk_soc,";
+		$sql .= " t.ref_customer,";
 		$sql .= " t.price,";
 		$sql .= " t.price_ttc,";
 		$sql .= " t.price_min,";
@@ -400,6 +412,7 @@ class Productcustomerprice extends CommonObject
 				$line->tms = $this->db->jdate($obj->tms);
 				$line->fk_product = $obj->fk_product;
 				$line->fk_soc = $obj->fk_soc;
+				$line->ref_customer = $obj->ref_customer;
 				$line->price = $obj->price;
 				$line->price_ttc = $obj->price_ttc;
 				$line->price_min = $obj->price_min;
@@ -454,6 +467,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= " t.datec,";
 		$sql .= " t.fk_product,";
 		$sql .= " t.fk_soc,";
+		$sql .= " t.ref_customer,";
 		$sql .= " t.price,";
 		$sql .= " t.price_ttc,";
 		$sql .= " t.price_min,";
@@ -509,6 +523,7 @@ class Productcustomerprice extends CommonObject
 				$line->tms = $this->db->jdate($obj->tms);
 				$line->fk_product = $obj->fk_product;
 				$line->fk_soc = $obj->fk_soc;
+				$line->ref_customer = $obj->ref_customer;
 				$line->price = $obj->price;
 				$line->price_ttc = $obj->price_ttc;
 				$line->price_min = $obj->price_min;
@@ -557,6 +572,8 @@ class Productcustomerprice extends CommonObject
 			$this->fk_product = trim($this->fk_product);
 		if (isset($this->fk_soc))
 			$this->fk_soc = trim($this->fk_soc);
+		if (isset($this->ref_customer))
+			$this->ref_customer = trim($this->ref_customer);
 		if (isset($this->price))
 			$this->price = trim($this->price);
 		if (isset($this->price_ttc))
@@ -622,6 +639,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= "datec,";
 		$sql .= "fk_product,";
 		$sql .= "fk_soc,";
+		$sql .= "ref_customer,";
 		$sql .= "price,";
 		$sql .= "price_ttc,";
 		$sql .= "price_min,";
@@ -644,6 +662,7 @@ class Productcustomerprice extends CommonObject
 		$sql .= " t.datec,";
 		$sql .= " t.fk_product,";
 		$sql .= " t.fk_soc,";
+		$sql .= " t.ref_customer,";
 		$sql .= " t.price,";
 		$sql .= " t.price_ttc,";
 		$sql .= " t.price_min,";
@@ -678,6 +697,7 @@ class Productcustomerprice extends CommonObject
 		$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 .= " 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").",";
@@ -797,6 +817,7 @@ class Productcustomerprice extends CommonObject
 						// If line do not exits then create it
 						$prodsocpricenew = new Productcustomerprice($this->db);
 						$prodsocpricenew->fk_soc = $obj->rowid;
+						$prodsocpricenew->ref_customer = $obj->ref_customer;
 						$prodsocpricenew->fk_product = $this->fk_product;
 						$prodsocpricenew->price = $this->price;
 						$prodsocpricenew->price_min = $this->price_min;
@@ -938,6 +959,7 @@ class Productcustomerprice extends CommonObject
 		$this->tms = '';
 		$this->fk_product = '';
 		$this->fk_soc = '';
+		$this->ref_customer = '';
 		$this->price = '';
 		$this->price_ttc = '';
 		$this->price_min = '';
@@ -976,6 +998,11 @@ class PriceByCustomerLine
 	 */
 	public $fk_product;
 
+	/**
+	 * @var string Customer reference
+	 */
+	public $ref_customer;
+
 	/**
 	 * @var int Thirdparty ID
 	 */
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 8459fa3e479..620bd69f60a 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -138,18 +138,17 @@ if ($action == 'search')
 
 	$sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.fk_product_type as type, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
 	$sql .= ' p.fk_product_type, p.tms as datem, p.tobatch';
+	$sql .= ', p.tosell as status, p.tobuy as status_buy';
 	if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= ', pl.label as labelm, pl.description as descriptionm';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON p.rowid = cp.fk_product';
 	if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND lang='".($current_lang)."'";
 	$sql .= ' WHERE p.entity IN ('.getEntity('product').')';
-	if ($key != "")
-	{
+	if ($key != "") {
 		// For natural search
 		$params = array('p.ref', 'p.label', 'p.description', 'p.note');
 		// multilang
-		if (!empty($conf->global->MAIN_MULTILANGS))
-		{
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
 			$params[] = 'pl.label';
 			$params[] = 'pl.description';
 			$params[] = 'pl.note';
@@ -159,8 +158,7 @@ if ($action == 'search')
 		}
 		$sql .= natural_search($params, $key);
 	}
-	if (!empty($conf->categorie->enabled) && !empty($parent) && $parent != -1)
-	{
+	if (!empty($conf->categorie->enabled) && !empty($parent) && $parent != -1) {
 		$sql .= " AND cp.fk_categorie ='".$db->escape($parent)."'";
 	}
 	$sql .= " ORDER BY p.ref ASC";
@@ -171,13 +169,11 @@ if ($action == 'search')
 $title = $langs->trans('ProductServiceCard');
 $helpurl = '';
 $shortlabel = dol_trunc($object->label, 16);
-if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT))
-{
+if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) {
 	$title = $langs->trans('Product')." ".$shortlabel." - ".$langs->trans('AssociatedProducts');
 	$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
 }
-if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE))
-{
+if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) {
 	$title = $langs->trans('Service')." ".$shortlabel." - ".$langs->trans('AssociatedProducts');
 	$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 }
@@ -269,16 +265,16 @@ if ($id > 0 || !empty($ref))
 		print '<td>'.$langs->trans('Label').'</td>';
 		print '<td>'.$langs->trans('Qty').'</td>';
 		print '</td>';
-		if (count($prodsfather) > 0)
-		{
-			foreach ($prodsfather as $value)
-			{
+		if (count($prodsfather) > 0) {
+			foreach ($prodsfather as $value) {
 				$idprod = $value["id"];
 				$productstatic->id = $idprod; // $value["id"];
 				$productstatic->type = $value["fk_product_type"];
 				$productstatic->ref = $value['ref'];
 				$productstatic->label = $value['label'];
 				$productstatic->entity = $value['entity'];
+				$productstatic->status = $value['status'];
+				$productstatic->status_buy = $value['status_buy'];
 
 				print '<tr class="oddeven">';
 				print '<td>'.$productstatic->getNomUrl(1, 'composition').'</td>';
@@ -532,24 +528,19 @@ if ($id > 0 || !empty($ref))
 						$prod_arbo = new Product($db);
 						$prod_arbo->id = $objp->rowid;
 						// This type is not supported (not required to have virtual products working).
-						if ($prod_arbo->type == Product::TYPE_ASSEMBLYKIT || $prod_arbo->type == Product::TYPE_STOCKKIT)
-						{
+						if ($prod_arbo->type == Product::TYPE_ASSEMBLYKIT || $prod_arbo->type == Product::TYPE_STOCKKIT) {
 							$is_pere = 0;
 							$prod_arbo->get_sousproduits_arbo();
 							// associations sousproduits
 							$prods_arbo = $prod_arbo->get_arbo_each_prod();
-							if (count($prods_arbo) > 0)
-							{
-								foreach ($prods_arbo as $key => $value)
-								{
-									if ($value[1] == $id)
-									{
+							if (count($prods_arbo) > 0) {
+								foreach ($prods_arbo as $key => $value) {
+									if ($value[1] == $id) {
 										$is_pere = 1;
 									}
 								}
 							}
-							if ($is_pere == 1)
-							{
+							if ($is_pere == 1) {
 								$i++;
 								continue;
 							}
@@ -563,6 +554,8 @@ if ($id > 0 || !empty($ref))
 						$productstatic->label = $objp->label;
 						$productstatic->type = $objp->type;
 						$productstatic->entity = $objp->entity;
+						$productstatic->status = $objp->status;
+						$productstatic->status_buy = $objp->status_buy;
 						$productstatic->status_batch = $objp->tobatch;
 
 						print '<td>'.$productstatic->getNomUrl(1, '', 24).'</td>';
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 2aadd4b3813..88c5259f48d 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -160,7 +160,7 @@ if (empty($reshook))
 		if (empty($ref_fourn_old)) $ref_fourn_old = $ref_fourn;
 		$quantity = price2num(GETPOST("qty", 'nohtml'), 'MS');
 		$remise_percent = price2num(GETPOST('remise_percent', 'alpha'));
-		$npr = preg_match('/\*/', $_POST['tva_tx']) ? 1 : 0;
+		$npr = preg_match('/\*/', GETPOST('tva_tx', 'alpha')) ? 1 : 0;
 		$tva_tx = str_replace('*', '', GETPOST('tva_tx', 'alpha'));
 		$tva_tx = price2num($tva_tx);
 		$price_expression = GETPOST('eid', 'int') ? GETPOST('eid', 'int') : ''; // Discard expression if not in expression mode
@@ -697,14 +697,14 @@ END;
 					print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>';
 					print '<td><input class="flat" name="price" size="8" value="'.(GETPOST('price') ? price(GETPOST('price')) : (isset($object->fourn_price) ? price($object->fourn_price) : '')).'">';
 					print '&nbsp;';
-					print $form->selectPriceBaseType((GETPOST('price_base_type') ? GETPOST('price_base_type') : 'HT'), "price_base_type"); // We keep 'HT' here, price_base_type is not yet supported for supplier prices
+					print $form->selectPriceBaseType((GETPOSTISSET('price_base_type') ? GETPOST('price_base_type') : 'HT'), "price_base_type"); // We keep 'HT' here, price_base_type is not yet supported for supplier prices
 					print '</td></tr>';
 				}
 
 
 				// Discount qty min
 				print '<tr><td>'.$langs->trans("DiscountQtyMin").'</td>';
-				print '<td><input class="flat" name="remise_percent" size="4" value="'.(GETPOST('remise_percent') ?vatrate(GETPOST('remise_percent')) : (isset($object->fourn_remise_percent) ?vatrate($object->fourn_remise_percent) : '')).'"> %';
+				print '<td><input class="flat" name="remise_percent" size="4" value="'.(GETPOSTISSET('remise_percent') ? vatrate(price2num(GETPOST('remise_percent'), 2)) : (isset($object->fourn_remise_percent) ?vatrate($object->fourn_remise_percent) : '')).'"> %';
 				print '</td>';
 				print '</tr>';
 
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index b92c0508ffa..d081c07b2c8 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -487,7 +487,11 @@ if ($resql)
 		}
 	}
 
-	llxHeader('', $title, $helpurl, '');
+    foreach ($searchCategoryProductList as $searchCategoryProduct) {
+        $paramsCat .= "&search_category_product_list[]=".urlencode($searchCategoryProduct);
+    }
+    llxHeader('', $title, $helpurl, '', 0, 0, "", "", $paramsCat);
+
 
 	// Displays product removal confirmation
 	if (GETPOST('delprod')) {
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 5036a7d0bb8..89695690d38 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -419,10 +419,10 @@ if (empty($reshook))
 		// Récupération des variables
 		$rowid = GETPOST('rowid', 'int');
 		$priceid = GETPOST('priceid', 'int');
-		$newprice = price2num(GETPOST("price", 'alpha'), 'MU');
+		$newprice = price2num(GETPOST("price"), 'MU');
 		// $newminprice=price2num(GETPOST("price_min"),'MU'); // TODO : Add min price management
-		$quantity = GETPOST('quantity', 'int');
-		$remise_percent = price2num(GETPOST('remise_percent', 'alpha'));
+		$quantity = price2num(GETPOST('quantity'), 'MS');
+		$remise_percent = price2num(GETPOST('remise_percent'), 2);
 		$remise = 0; // TODO : allow discount by amount when available on documents
 
 		if (empty($quantity)) {
@@ -507,6 +507,7 @@ if (empty($reshook))
 
 		// add price by customer
 		$prodcustprice->fk_soc = GETPOST('socid', 'int');
+		$prodcustprice->ref_customer = GETPOST('ref_customer', 'alpha');
 		$prodcustprice->fk_product = $object->id;
 		$prodcustprice->price = price2num(GETPOST("price"), 'MU');
 		$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
@@ -608,6 +609,7 @@ if (empty($reshook))
 		$prodcustprice->fetch(GETPOST('lineid', 'int'));
 
 		// update price by customer
+		$prodcustprice->ref_customer = GETPOST('ref_customer', 'alpha');
 		$prodcustprice->price = price2num(GETPOST("price"), 'MU');
 		$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
 		$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
@@ -1667,6 +1669,10 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '</td>';
 		print '</tr>';
 
+		// Ref. Customer
+		print '<tr><td>' . $langs->trans('RefCustomer') . '</td>';
+		print '<td><input name="ref_customer" size="12"></td></tr>';
+
 		// VAT
 		print '<tr><td class="fieldrequired">'.$langs->trans("DefaultTaxRate").'</td><td>';
 		print $form->load_tva("tva_tx", $object->default_vat_code ? $object->tva_tx.' ('.$object->default_vat_code.')' : $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr, $object->type, false, 1);
@@ -1753,6 +1759,10 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print "<td colspan='2'>".$staticsoc->getNomUrl(1)."</td>";
 		print '</tr>';
 
+		// 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>';
+
 		// VAT
 		print '<tr><td>'.$langs->trans("DefaultTaxRate").'</td><td colspan="2">';
 		print $form->load_tva("tva_tx", $prodcustprice->default_vat_code ? $prodcustprice->tva_tx.' ('.$prodcustprice->default_vat_code.')' : $prodcustprice->tva_tx, $mysoc, '', $object->id, $prodcustprice->recuperableonly, $object->type, false, 1);
@@ -1859,6 +1869,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 			print '<tr class="liste_titre">';
 			print '<td>'.$langs->trans("ThirdParty").'</td>';
+			print '<td>'.$langs->trans('RefCustomer').'</td>';
 			print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
 			print '<td class="center">'.$langs->trans("PriceBase").'</td>';
 			print '<td class="right">'.$langs->trans("DefaultTaxRate").'</td>';
@@ -1906,6 +1917,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				print '<tr class="oddeven">';
 
 				print "<td>".$staticsoc->getNomUrl(1)."</td>";
+				print '<td>' . $line->ref_customer . '</td>';
 				print "<td>".dol_print_date($line->datec, "dayhour")."</td>";
 				print '<td class="center">'.$langs->trans($line->price_base_type)."</td>";
 				print '<td class="right">';
@@ -1974,7 +1986,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 		if (count($prodcustprice->lines) > 0 || $search_soc)
 		{
-			$colspan = 8;
+			$colspan = 9;
 			//if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") $colspan++;
 
 			print '<tr class="liste_titre">';
@@ -1990,6 +2002,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("ThirdParty").'</td>';
+		print '<td>' . $langs->trans('RefCustomer') . '</td>';
 		print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
 		print '<td class="center">'.$langs->trans("PriceBase").'</td>';
 		print '<td class="right">'.$langs->trans("DefaultTaxRate").'</td>';
@@ -2028,8 +2041,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		$total_ttc = $resultarray[2];
 
 		print '<tr class="oddeven">';
-		print "<td>".$langs->trans("Default")."</td>";
-		print "<td></td>";
+		print '<td colspan="3">' . $langs->trans('Default') . '</td>';
 
 		print '<td class="center">'.$langs->trans($object->price_base_type)."</td>";
 		print '<td class="right">';
@@ -2107,6 +2119,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				print '<tr class="oddeven">';
 
 				print "<td>".$staticsoc->getNomUrl(1)."</td>";
+				print '<td>' . $line->ref_customer . '</td>';
 				print "<td>".dol_print_date($line->datec, "dayhour")."</td>";
 
 				print '<td class="center">'.$langs->trans($line->price_base_type)."</td>";
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index f975eaabc67..ac3ce4636e6 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -119,24 +119,24 @@ class Entrepot extends CommonObject
 	public $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>10),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>15),
-		'ref' =>array('type'=>'varchar(255)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'showoncombobox'=>1, 'position'=>25),
+		'ref' =>array('type'=>'varchar(255)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'showoncombobox'=>1, 'position'=>25, 'searchall'=>1),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>30),
-		'description' =>array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-2, 'position'=>35),
-		'lieu' =>array('type'=>'varchar(64)', 'label'=>'LocationSummary', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'showoncombobox'=>1),
+		'description' =>array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-2, 'position'=>35, 'searchall'=>1),
+		'lieu' =>array('type'=>'varchar(64)', 'label'=>'LocationSummary', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'showoncombobox'=>1, 'searchall'=>1),
 		'fk_parent' =>array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:1:statut=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ParentWarehouse', 'enabled'=>1, 'visible'=>-2, 'position'=>41),
-		'address' =>array('type'=>'varchar(255)', 'label'=>'Address', 'enabled'=>1, 'visible'=>-2, 'position'=>45),
-		'zip' =>array('type'=>'varchar(10)', 'label'=>'Zip', 'enabled'=>1, 'visible'=>-2, 'position'=>50),
-		'town' =>array('type'=>'varchar(50)', 'label'=>'Town', 'enabled'=>1, 'visible'=>-2, 'position'=>55),
+		'address' =>array('type'=>'varchar(255)', 'label'=>'Address', 'enabled'=>1, 'visible'=>-2, 'position'=>45, 'searchall'=>1),
+		'zip' =>array('type'=>'varchar(10)', 'label'=>'Zip', 'enabled'=>1, 'visible'=>-2, 'position'=>50, 'searchall'=>1),
+		'town' =>array('type'=>'varchar(50)', 'label'=>'Town', 'enabled'=>1, 'visible'=>-2, 'position'=>55, 'searchall'=>1),
 		'fk_departement' =>array('type'=>'sellist:c_departements:label:rowid::active=1', 'label'=>'State', 'enabled'=>1, 'visible'=>0, 'position'=>60),
 		'fk_pays' =>array('type'=>'sellist:c_country:label:rowid::active=1', 'label'=>'Country', 'enabled'=>1, 'visible'=>-2, 'position'=>65),
-		'phone' =>array('type'=>'varchar(20)', 'label'=>'Phone', 'enabled'=>1, 'visible'=>-2, 'position'=>70),
-		'fax' =>array('type'=>'varchar(20)', 'label'=>'Fax', 'enabled'=>1, 'visible'=>-2, 'position'=>75),
+		'phone' =>array('type'=>'varchar(20)', 'label'=>'Phone', 'enabled'=>1, 'visible'=>-2, 'position'=>70, 'searchall'=>1),
+		'fax' =>array('type'=>'varchar(20)', 'label'=>'Fax', 'enabled'=>1, 'visible'=>-2, 'position'=>75, 'searchall'=>1),
 		//'fk_user_author' =>array('type'=>'integer', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-2, 'position'=>82),
-		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>500),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
+		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>300),
+		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>301),
 		//'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000),
 		//'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'ModelPDF', 'enabled'=>1, 'visible'=>0, 'position'=>1010),
-		'statut' =>array('type'=>'tinyint(4)', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>200),
+		'statut' =>array('type'=>'tinyint(4)', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>500),
 	);
 
 	/**
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 2429a4c09c5..4e1c8a4e57f 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -666,7 +666,6 @@ class MouvementStock extends CommonObject
 			}
 
 			// Retrieve all extrafield
-			// fetch optionals attributes and labels
 			$this->fetch_optionals();
 
 			// $this->fetch_lines();
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 1470bdc2aa0..c823042eba0 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -86,18 +86,6 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 
-// List of fields to search into when doing a "search in all"
-$fieldstosearchall = array(
-	't.ref'=>"Ref",
-	't.lieu'=>"LocationSummary",
-	't.description'=>"Description",
-	't.address'=>"Address",
-	't.zip'=>'Zip',
-	't.town'=>'Town',
-	't.phone'=>'Phone',
-	't.fax'=>'Fax',
-);
-
 // Initialize array of search criterias
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
@@ -108,37 +96,39 @@ foreach ($object->fields as $key => $val)
 	if (GETPOST('search_'.$search_key, 'alpha') !== '') $search[$search_key] = GETPOST('search_'.$search_key, 'alpha');
 }
 
-// Definition of fields for list
-$arrayfields = array(
-	'stockqty'=>array('type'=>'float', 'label'=>'PhysicalStock', 'enabled'=>1, 'visible'=>-2, 'position'=>70),
-	'estimatedvalue'=>array('type'=>'float', 'label'=>'EstimatedStockValue', 'enabled'=>1, 'visible'=>-2, 'position'=>71),
-	'estimatedstockvaluesell'=>array('type'=>'float', 'label'=>'EstimatedStockValueSell', 'enabled'=>1, 'visible'=>-2, 'position'=>72),
-);
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array();
 foreach ($object->fields as $key => $val)
 {
-	// If $val['visible']==0, then we never show the field
-	if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>($val['enabled'] && ($val['visible'] != 3)), 'position'=>$val['position']);
+	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
 }
-// Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
-			$arrayfields["ef.".$key] = array(
-				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
-				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
-				'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
-				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key])
-			);
-		}
+
+// Definition of array of fields for columns
+$arrayfields = array(
+	'stockqty'=>array('type'=>'float', 'label'=>'PhysicalStock', 'enabled'=>1, 'visible'=>-2, 'checked'=>0, 'position'=>170),
+	'estimatedvalue'=>array('type'=>'float', 'label'=>'EstimatedStockValue', 'enabled'=>1, 'visible'=>1, 'checked'=>1, 'position'=>171),
+	'estimatedstockvaluesell'=>array('type'=>'float', 'label'=>'EstimatedStockValueSell', 'enabled'=>1, 'checked'=>1, 'visible'=>2, 'position'=>172),
+);
+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'=>$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');
 
 
-
 /*
  * Actions
  */
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 89df906feda..d1c1ea99ff7 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -636,13 +636,13 @@ if ($id > 0 || $ref)
 			// Real stock
 			$text_stock_options = $langs->trans("RealStockDesc").'<br>';
 			$text_stock_options .= $langs->trans("RealStockWillAutomaticallyWhen").'<br>';
-			$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE) ? $langs->trans("DeStockOnShipment").'<br>' : '');
-			$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) ? $langs->trans("DeStockOnValidateOrder").'<br>' : '');
-			$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_BILL) ? $langs->trans("DeStockOnBill").'<br>' : '');
-			$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) ? $langs->trans("ReStockOnBill").'<br>' : '');
-			$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) ? $langs->trans("ReStockOnValidateOrder").'<br>' : '');
-			$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) ? $langs->trans("ReStockOnDispatchOrder").'<br>' : '');
-	   		$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE) ? $langs->trans("StockOnReception").'<br>' : '');
+			$text_stock_options .= (!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><td>';
 			print $form->textwithpicto($langs->trans("PhysicalStock"), $text_stock_options, 1);
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index ed537f1bd4e..64dd485671d 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -538,9 +538,9 @@ print dol_get_fiche_head($head, 'replenish', '', -1, '');
 
 print '<span class="opacitymedium">'.$langs->trans("ReplenishmentStatusDesc").'</span>'."\n";
 if (empty($fk_warhouse) && !empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE)) {
-	print '<span class="opacitymedium">'.$langs->trans("ReplenishmentStatusDescPerWarehouse").'</span>'."<br>\n";
+	print '<span class="opacitymedium">'.$langs->trans("ReplenishmentStatusDescPerWarehouse").'</span>'."\n";
 }
-print '<br>';
+print '<br><br>';
 if ($usevirtualstock == 1)
 {
 	print $langs->trans("CurentSelectionMode").': ';
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 24ac982896e..c6b38390ac9 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2010      François Legastelois <flegastelois@teclib.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
@@ -433,7 +433,7 @@ $nav .= ' '.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1).' ';
 //$nav .= ' <input type="submit" name="submitdateselect" class="button valignmiddle" value="'.$langs->trans("Refresh").'">';
 $nav .= ' <button type="submit" name="button_search_x" value="x" class="bordertransp"><span class="fa fa-search"></span></button>';
 
-$picto = 'calendarweek';
+$picto = 'clock';
 
 print '<form name="addtime" method="POST" action="'.$_SERVER["PHP_SELF"].($project->id > 0 ? '?id='.$project->id : '').'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -447,7 +447,7 @@ print '<input type="hidden" name="addtimemonth" value="'.$tmp['mon'].'">';
 print '<input type="hidden" name="addtimeday" value="'.$tmp['mday'].'">';
 
 $head = project_timesheet_prepare_head($mode, $usertoprocess);
-print dol_get_fiche_head($head, 'inputperday', $langs->trans('TimeSpent'), -1, 'projecttask');
+print dol_get_fiche_head($head, 'inputperday', $langs->trans('TimeSpent'), -1, $picto);
 
 // Show description of content
 print '<div class="hideonsmartphone opacitymedium">';
@@ -476,6 +476,7 @@ print '<div class="colorbacktimesheet float valignmiddle">';
 $titleassigntask = $langs->transnoentities("AssignTaskToMe");
 if ($usertoprocess->id != $user->id) $titleassigntask = $langs->transnoentities("AssignTaskToUser", $usertoprocess->getFullName($langs));
 print '<div class="taskiddiv inline-block">';
+print img_picto('', 'projecttask');
 $formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, '-- '.$langs->trans("ChooseANotYetAssignedTask").' --', 1, 0, 0, '', '', 'all', $usertoprocess);
 print '</div>';
 print ' ';
@@ -500,22 +501,22 @@ $moreforfilter = '';
 
 // If the user can view user other than himself
 $moreforfilter .= '<div class="divsearchfield">';
-$moreforfilter .= '<div class="inline-block hideonsmartphone">'.$langs->trans('User').' </div>';
+$moreforfilter .= '<div class="inline-block hideonsmartphone"></div>';
 $includeonly = 'hierarchyme';
 if (empty($user->rights->user->user->lire)) $includeonly = array($user->id);
-$moreforfilter .= $form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', $user->rights->user->user->lire ? 0 : 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200 marginleftonly');
+$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('User'), 'user').$form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', $user->rights->user->user->lire ? 0 : 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200 marginleftonly');
 $moreforfilter .= '</div>';
 
 if (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
 {
 	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= '<div class="inline-block">'.$langs->trans('Project').' </div>';
-	$moreforfilter .= '<input type="text" size="4" name="search_project_ref" class="marginleftonly" value="'.dol_escape_htmltag($search_project_ref).'">';
+	$moreforfilter .= '<div class="inline-block"></div>';
+	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('Project'), 'project').'<input type="text" size="4" name="search_project_ref" class="marginleftonly" value="'.dol_escape_htmltag($search_project_ref).'">';
 	$moreforfilter .= '</div>';
 
 	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= '<div class="inline-block">'.$langs->trans('ThirdParty').' </div>';
-	$moreforfilter .= '<input type="text" size="4" name="search_thirdparty" class="marginleftonly" value="'.dol_escape_htmltag($search_thirdparty).'">';
+	$moreforfilter .= '<div class="inline-block"></div>';
+	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('ThirdParty'), 'company').'<input type="text" size="4" name="search_thirdparty" class="marginleftonly" value="'.dol_escape_htmltag($search_thirdparty).'">';
 	$moreforfilter .= '</div>';
 }
 
@@ -593,7 +594,7 @@ if (!empty($arrayfields['t.progress']['checked']))
 if ($usertoprocess->id == $user->id) print '<td class="right maxwidth100">'.$langs->trans("TimeSpentByYou").'</td>';
 else print '<td class="right maxwidth100">'.$langs->trans("TimeSpentByUser").'</td>';*/
 print '<th class="right maxwidth100">'.$langs->trans("TimeSpent").'<br><span class="opacitymedium">'.$langs->trans("Everybody").'</span></th>';
-print '<th class="right maxwidth100">'.$langs->trans("TimeSpent").($usertoprocess->firstname ? '<br><span class="opacitymedium">'.dol_trunc($usertoprocess->firstname, 10).'</span>' : '').'</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="center leftborder">'.$langs->trans("HourStart").'</td>';
 
 // By default, we can edit only tasks we are assigned to
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index 4904e2379f0..626634b13cd 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -361,7 +361,7 @@ $nav .= ' '.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1).' ';
 //$nav.=' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
 $nav .= ' <button type="submit" name="button_search_x" value="x" class="bordertransp"><span class="fa fa-search"></span></button>';
 
-$picto = 'calendarweek';
+$picto = 'clock';
 
 print '<form name="addtime" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -372,7 +372,7 @@ print '<input type="hidden" name="month" value="'.$month.'">';
 print '<input type="hidden" name="year" value="'.$year.'">';
 
 $head = project_timesheet_prepare_head($mode, $usertoprocess);
-print dol_get_fiche_head($head, 'inputpermonth', $langs->trans('TimeSpent'), -1, 'projecttask');
+print dol_get_fiche_head($head, 'inputpermonth', $langs->trans('TimeSpent'), -1, $picto);
 
 // Show description of content
 print '<div class="hideonsmartphone opacitymedium">';
@@ -400,6 +400,7 @@ print '<div class="colorbacktimesheet float valignmiddle">';
 $titleassigntask = $langs->transnoentities("AssignTaskToMe");
 if ($usertoprocess->id != $user->id) $titleassigntask = $langs->transnoentities("AssignTaskToUser", $usertoprocess->getFullName($langs));
 print '<div class="taskiddiv inline-block">';
+print img_picto('', 'projecttask');
 $formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, '-- '.$langs->trans("ChooseANotYetAssignedTask").' --', 1);
 print '</div>';
 print ' ';
@@ -425,22 +426,22 @@ if (! empty($conf->categorie->enabled))
 
 // If the user can view user other than himself
 $moreforfilter .= '<div class="divsearchfield">';
-$moreforfilter .= '<div class="inline-block hideonsmartphone">'.$langs->trans('User').' </div>';
+$moreforfilter .= '<div class="inline-block hideonsmartphone"></div>';
 $includeonly = 'hierachyme';
 if (empty($user->rights->user->user->lire)) $includeonly = array($user->id);
-$moreforfilter .= $form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', $user->rights->user->user->lire ? 0 : 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
+$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('User'), 'user').$form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', $user->rights->user->user->lire ? 0 : 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter .= '</div>';
 
 if (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
 {
 	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= '<div class="inline-block">'.$langs->trans('Project').' </div>';
-	$moreforfilter .= '<input type="text" size="4" name="search_project_ref" class="marginleftonly" value="'.dol_escape_htmltag($search_project_ref).'">';
+	$moreforfilter .= '<div class="inline-block"></div>';
+	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('Project'), 'project').'<input type="text" size="4" name="search_project_ref" class="marginleftonly" value="'.dol_escape_htmltag($search_project_ref).'">';
 	$moreforfilter .= '</div>';
 
 	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= '<div class="inline-block">'.$langs->trans('ThirdParty').' </div>';
-	$moreforfilter .= '<input type="text" size="4" name="search_thirdparty" class="marginleftonly" value="'.dol_escape_htmltag($search_thirdparty).'">';
+	$moreforfilter .= '<div class="inline-block"></div>';
+	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('ThirdParty'), 'company').'<input type="text" size="4" name="search_thirdparty" class="marginleftonly" value="'.dol_escape_htmltag($search_thirdparty).'">';
 	$moreforfilter .= '</div>';
 }
 
@@ -487,7 +488,7 @@ print '<td align="right" class="maxwidth75">'.$langs->trans("ProgressDeclared").
  if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpentByYou").'</td>';
  else print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpentByUser").'</td>';*/
 print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").'<br><span class="opacitymedium">'.$langs->trans("Everybody").'</span></td>';
-print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").($usertoprocess->firstname ? '<br><span class="opacitymedium">'.dol_trunc($usertoprocess->firstname, 10).'</span>' : '').'</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>';
 
 foreach ($TWeek as $week_number)
 {
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 4f8fbb8d865..f001a73d0f4 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2010      François Legastelois <flegastelois@teclib.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
@@ -451,7 +451,7 @@ $nav .= ' '.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1).' ';
 //$nav .= ' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
 $nav .= ' <button type="submit" name="submitdateselect" value="x" class="bordertransp"><span class="fa fa-search"></span></button>';
 
-$picto = 'calendarweek';
+$picto = 'clock';
 
 print '<form name="addtime" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -464,7 +464,7 @@ print '<input type="hidden" name="month" value="'.$month.'">';
 print '<input type="hidden" name="year" value="'.$year.'">';
 
 $head = project_timesheet_prepare_head($mode, $usertoprocess);
-print dol_get_fiche_head($head, 'inputperweek', $langs->trans('TimeSpent'), -1, 'projecttask');
+print dol_get_fiche_head($head, 'inputperweek', $langs->trans('TimeSpent'), -1, $picto);
 
 // Show description of content
 print '<div class="hideonsmartphone opacitymedium">';
@@ -492,6 +492,7 @@ print '<div class="colorbacktimesheet float valignmiddle">';
 $titleassigntask = $langs->transnoentities("AssignTaskToMe");
 if ($usertoprocess->id != $user->id) $titleassigntask = $langs->transnoentities("AssignTaskToUser", $usertoprocess->getFullName($langs));
 print '<div class="taskiddiv inline-block">';
+print img_picto('', 'projecttask');
 $formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, '-- '.$langs->trans("ChooseANotYetAssignedTask").' --', 1, 0, 0, '', '', 'all', $usertoprocess);
 print '</div>';
 print ' ';
@@ -555,22 +556,22 @@ if (! empty($conf->categorie->enabled))
 
 // If the user can view user other than himself
 $moreforfilter .= '<div class="divsearchfield">';
-$moreforfilter .= '<div class="inline-block hideonsmartphone">'.$langs->trans('User').' </div>';
+$moreforfilter .= '<div class="inline-block hideonsmartphone"></div>';
 $includeonly = 'hierarchyme';
 if (empty($user->rights->user->user->lire)) $includeonly = array($user->id);
-$moreforfilter .= $form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', $user->rights->user->user->lire ? 0 : 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
+$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('User'), 'user').$form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', $user->rights->user->user->lire ? 0 : 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter .= '</div>';
 
 if (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
 {
 	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= '<div class="inline-block">'.$langs->trans('Project').' </div>';
-	$moreforfilter .= '<input type="text" size="4" name="search_project_ref" class="marginleftonly" value="'.dol_escape_htmltag($search_project_ref).'">';
+	$moreforfilter .= '<div class="inline-block"></div>';
+	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('Project'), 'project').'<input type="text" size="4" name="search_project_ref" class="marginleftonly" value="'.dol_escape_htmltag($search_project_ref).'">';
 	$moreforfilter .= '</div>';
 
 	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= '<div class="inline-block">'.$langs->trans('ThirdParty').' </div>';
-	$moreforfilter .= '<input type="text" size="4" name="search_thirdparty" class="marginleftonly" value="'.dol_escape_htmltag($search_thirdparty).'">';
+	$moreforfilter .= '<div class="inline-block"></div>';
+	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('ThirdParty'), 'company').'<input type="text" size="4" name="search_thirdparty" class="marginleftonly" value="'.dol_escape_htmltag($search_thirdparty).'">';
 	$moreforfilter .= '</div>';
 }
 
@@ -651,7 +652,7 @@ if (!empty($arrayfields['t.progress']['checked']))
  if ($usertoprocess->id == $user->id) print '<td class="maxwidth75 right">'.$langs->trans("TimeSpentByYou").'</td>';
  else print '<td class="maxwidth75 right">'.$langs->trans("TimeSpentByUser").'</td>';*/
 print '<th class="maxwidth75 right">'.$langs->trans("TimeSpent").'<br><span class="opacitymedium">'.$langs->trans("Everybody").'</span></th>';
-print '<th class="maxwidth75 right">'.$langs->trans("TimeSpent").($usertoprocess->firstname ? '<br><span class="opacitymedium">'.dol_trunc($usertoprocess->firstname, 10).'</span>' : '').'</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>';
 
 for ($idw = 0; $idw < 7; $idw++)
 {
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index a46c64464f8..f36aae34c4f 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -58,7 +58,7 @@ if ($action == 'updateMask')
 
 	if ($maskconstproject)  $res = dolibarr_set_const($db, $maskconstproject, $maskproject, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if (!$error)
 	{
@@ -75,7 +75,7 @@ if ($action == 'updateMaskTask')
 
 	if ($maskconstmasktask)  $res = dolibarr_set_const($db, $maskconstmasktask, $masktaskt, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if (!$error)
 	{
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 653083bed04..364cb30633a 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -174,7 +174,8 @@ if (empty($reshook))
 			if (!$error && $result > 0)
 			{
 				// Add myself as project leader
-				$result = $object->add_contact($user->id, 'PROJECTLEADER', 'internal');
+				$typeofcontact = 'PROJECTLEADER';	// TODO If use rename this code in dictionary, the add_contact will generate an error.
+				$result = $object->add_contact($user->id, $typeofcontact, 'internal');
 				if ($result < 0)
 				{
 					$langs->load("errors");
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index e298adcd40c..a7cb95ec666 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -24,6 +24,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
@@ -53,35 +54,155 @@ $result = restrictedArea($user, 'projet', $id, 'projet&project');
 
 $hookmanager->initHooks(array('projectcontactcard', 'globalcard'));
 
+
 /*
  * Actions
  */
 
+// Test if we can add contact to the tasks at the same times, if not or not required, make a redirect
+$formconfirmtoaddtasks = '';
+if ($action == 'addcontact') {
+	$form = new Form($db);
+
+	$source=GETPOST("source", 'aZ09');
+
+	$taskstatic = new Task($db);
+	$task_array = $taskstatic->getTasksArray(0, 0, $object->id, 0, 0);
+	$nbTasks = count($task_array);
+
+	//If no task avaiblable, redirec to to add confirm
+	$type_to = (GETPOST('typecontact') ? 'typecontact='.GETPOST('typecontact') : 'type='.GETPOST('type'));
+	$personToAffect = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+	$affect_to = (GETPOST('userid') ? 'userid='.$personToAffect : 'contactid='.$personToAffect);
+	$url_redirect='?id='.$object->id.'&'.$affect_to.'&'.$type_to.'&source='.$source;
+
+	if ($personToAffect > 0 && (empty($conf->global->PROJECT_HIDE_TASKS) || $nbTasks > 0)) {
+		$text = $langs->trans('AddPersonToTask');
+		$textbody = $text.' (<a href="#" class="selectall">'.$langs->trans("SelectAll").'</a>)';
+		$formquestion = array('text' => $textbody);
+
+		$task_to_affect = array();
+		foreach ($task_array as $task) {
+			$task_already_affected=false;
+			$personsLinked = $task->liste_contact(-1, $source);
+			if (!is_array($personsLinked) && coun($personsLinked) < 0) {
+				setEventMessage($object->error, 'errors');
+			} else {
+				foreach ($personsLinked as $person) {
+					if ($person['id']==$personToAffect) {
+						$task_already_affected = true;
+						break;
+					}
+				}
+				if (!$task_already_affected) {
+					$task_to_affect[$task->id] = $task->id;
+				}
+			}
+		}
+
+		if (empty($task_to_affect)) {
+			$action = 'addcontact_confirm';
+		} else {
+			$formcompany = new FormCompany($db);
+			foreach ($task_array as $task) {
+				$key = $task->id;
+				$val = $task->ref . ' '.dol_trunc($task->label);
+				$formquestion[] = array(
+					'type' => 'other',
+					'name' => 'person_'.$key.',person_role_'.$key,
+					'label' => '<input type="checkbox" class="flat'.(in_array($key, $task_to_affect) ? ' taskcheckboxes"' : '" checked disabled').' id="person_'.$key.'" name="person_'.$key.'" value="1"> <label for="person_'.$key.'">'.$val.'<label>',
+					'value' => $formcompany->selectTypeContact($taskstatic, '', 'person_role_'.$key, $source, 'position', 0, 'minwidth100imp', 0, 1)
+				);
+			}
+			$formquestion[] = array('type'=> 'other', 'name'=>'tasksavailable', 'label'=>'', 'value' => '<input type="hidden" id="tasksavailable" name="tasksavailable" value="'.implode(',', array_keys($task_to_affect)).'">');
+		}
+
+		$formconfirmtoaddtasks = $form->formconfirm($_SERVER['PHP_SELF'] . $url_redirect, $text, '', 'addcontact_confirm', $formquestion, '', 1, 300, 590);
+		$formconfirmtoaddtasks .='
+		 <script>
+		 $(document).ready(function() {
+			var saveprop = false;
+		 	$(".selectall").click(function(){
+				console.log("We click on select all with "+saveprop);
+				if (!saveprop) {
+					$(".taskcheckboxes").prop("checked", true);
+					saveprop = true;
+				} else {
+					$(".taskcheckboxes").prop("checked", false);
+					saveprop = false;
+				}
+			});
+		 });
+		 </script>';
+	} else {
+		$action = 'addcontact_confirm';
+	}
+}
+
 // Add new contact
-if ($action == 'addcontact' && $user->rights->projet->creer)
+if ($action == 'addcontact_confirm' && $user->rights->projet->creer)
 {
+	$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+	$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+
+	if (! ($contactid > 0)) {
+		$error++;
+		$langs->load("errors");
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Contact")), null, 'errors');
+	}
+
 	$result = 0;
 	$result = $object->fetch($id);
 
-	if ($result > 0 && $id > 0)
+	if (!$error && $result > 0 && $id > 0)
 	{
-  		$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-  		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
   		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+
+  		if ($result == 0) {
+  			$langs->load("errors");
+  			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+  		}
+  		elseif ($result < 0) {
+			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$langs->load("errors");
+				setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+
+  		$affecttotask=GETPOST('tasksavailable', 'intcomma');
+		if (!empty($affecttotask)) {
+			require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+			$task_to_affect = explode(',', $affecttotask);
+			if (!empty($task_to_affect)) {
+				foreach ($task_to_affect as $task_id) {
+					if (GETPOSTISSET('person_'.$task_id, 'san_alpha') && GETPOST('person_'.$task_id, 'san_alpha')) {
+						$tasksToAffect = new Task($db);
+						$result=$tasksToAffect->fetch($task_id);
+						if ($result < 0) {
+							setEventMessages($tasksToAffect->error, null, 'errors');
+						} else {
+							$result = $tasksToAffect->add_contact($contactid, GETPOST('person_role_'.$task_id), GETPOST("source", 'aZ09'));
+							if ($result < 0) {
+								if ($tasksToAffect->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+									$langs->load("errors");
+									setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+								} else {
+									setEventMessages($tasksToAffect->error, $tasksToAffect->errors, 'errors');
+								}
+							}
+						}
+					}
+				}
+			}
+		}
 	}
 
 	if ($result >= 0)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	} else {
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		} else {
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
 	}
 }
 
@@ -112,6 +233,7 @@ if (($action == 'deleteline' || $action == 'deletecontact') && $user->rights->pr
 }
 
 
+
 /*
  * View
  */
@@ -122,7 +244,6 @@ $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
 llxHeader('', $title, $help_url);
 
 $form = new Form($db);
-$formcompany = new FormCompany($db);
 $contactstatic = new Contact($db);
 $userstatic = new User($db);
 
@@ -145,6 +266,16 @@ if ($id > 0 || !empty($ref))
 	$head = project_prepare_head($object);
 	print dol_get_fiche_head($head, 'contact', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
 
+	$formconfirm = $formconfirmtoaddtasks;
+
+	// 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;
 
 	// Project card
 
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index aa01ef5d3ef..3df802018ef 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -774,7 +774,6 @@ foreach ($listofreferent as $key => $value)
 			// Each element with at least one line is output
 			$qualifiedforfinalprofit = true;
 			if ($key == 'intervention' && empty($conf->global->PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT)) $qualifiedforfinalprofit = false;
-			if ($key == 'propal' && $element->status != Propal::STATUS_SIGNED && $element->status != Propal::STATUS_BILLED) $qualifiedforfinalprofit = false;
 			//var_dump($key.' '.$qualifiedforfinalprofit);
 
 			// Calculate margin
@@ -783,7 +782,7 @@ foreach ($listofreferent as $key => $value)
 					$total_revenue_ht += $total_ht;
 				}
 
-				if ($margin != "add")	{ // Revert sign
+				if ($margin != "add") {	// Revert sign
 					$total_ht = -$total_ht;
 					$total_ttc = -$total_ttc;
 				}
@@ -1361,7 +1360,6 @@ if ($conf->use_javascript_ajax)
 {
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 	$comboenhancement = ajax_combobox('.elementselect');
-	$out .= $comboenhancement;
 
 	print $comboenhancement;
 }
diff --git a/htdocs/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php
index 0d34db55fa1..66b04527772 100644
--- a/htdocs/projet/graph_opportunities.inc.php
+++ b/htdocs/projet/graph_opportunities.inc.php
@@ -20,9 +20,8 @@
 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, ".MAIN_DB_PREFIX."c_lead_status as cls";
+	$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_opp_status = cls.rowid";
 	$sql .= " AND p.fk_statut = 1"; // Opend projects only
 	if ($mine || empty($user->rights->projet->all->lire)) $sql .= " AND p.rowid IN (".$projectsListId.")";
 	if ($socid)	$sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
@@ -64,16 +63,25 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 		$ponderated_opp_amount = $ponderated_opp_amount / 100;
 
 		print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder nohover centpercent">';
-		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("OpportunitiesStatusForOpenedProjects").'</th></tr>'."\n";
-		$listofstatus = array_keys($listofoppstatus);
-		foreach ($listofstatus as $status)
-		{
-			$labelStatus = '';
+	    print '<table class="noborder nohover centpercent">';
+	    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("OpportunitiesStatusForOpenedProjects").'</th></tr>'."\n";
+
+	    $listofstatus = array_keys($listofoppstatus);
+		// Complete with values found into database and not into the dictionary
+	    foreach ($valsamount as $key => $val) {
+	    	if (!in_array($key, $listofstatus) && $key) {
+	    		$listofstatus[] = $key;
+	    	}
+	    }
+
+	    foreach ($listofstatus as $status)
+	    {
+	    	$labelStatus = '';
 
 			$code = dol_getIdFromCode($db, $status, 'c_lead_status', 'rowid', 'code');
-			if ($code) $labelStatus = $langs->transnoentitiesnoconv("OppStatus".$code);
-			if (empty($labelStatus)) $labelStatus = $listofopplabel[$status];
+	        if ($code) $labelStatus = $langs->transnoentitiesnoconv("OppStatus".$code);
+	        if (empty($labelStatus)) $labelStatus = $listofopplabel[$status];
+	        if (empty($labelStatus)) $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]).')';
 			//$labelStatus .= ' - '.price2num($listofoppstatus[$status]).'%';
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 6c376fc35f3..f2b1820c019 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -322,7 +322,7 @@ $sql .= " WHERE p.entity IN (".getEntity('project').")";
 $sql .= " AND p.fk_statut = 1";
 if ($mine || empty($user->rights->projet->all->lire)) $sql .= " AND p.rowid IN (".$projectsListId.")"; // If we have this test true, it also means projectset is not 2
 if ($socid)	$sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-$sql .= " GROUP BY s.rowid, s.nom, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.canvas, s.status";
+$sql .= " GROUP BY s.rowid, s.nom, s.name_alias, s.code_client, s.code_compta, s.client, s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur, s.logo, s.email, s.entity, s.canvas, s.status";
 $sql .= $db->order($sortfield, $sortorder);
 //$sql .= $db->plimit($max + 1, 0);
 
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index 5b408717f40..e87aa25dadb 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -160,7 +160,7 @@ $morehtmlcenter = '';
 if (!empty($conf->agenda->enabled))
 {
 	$addActionBtnRight = !empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create);
-	$morehtmlcenter .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $addActionBtnRight);
+    $morehtmlcenter .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&socid='.$object->socid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $addActionBtnRight);
 }
 
 //print '</div>';
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index b246d88de93..ad8418dfc0e 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -563,11 +563,10 @@ if (!empty($arrayfields['p.title']['checked']))
 if (!empty($arrayfields['s.nom']['checked']))
 {
 	print '<td class="liste_titre">';
-	if ($socid > 0)
-	{
+	if ($socid > 0) {
 		$tmpthirdparty = new Societe($db);
 		$tmpthirdparty->fetch($socid);
-		$search_societe = $tmpthirdparty->nom;
+		$search_societe = $tmpthirdparty->name;
 	}
 	print '<input type="text" class="flat" name="search_societe" size="8" value="'.dol_escape_htmltag($search_societe).'">';
 	print '</td>';
@@ -766,8 +765,7 @@ while ($i < min($num, $limit))
 		if (!empty($arrayfields['s.nom']['checked']))
 		{
 			print '<td class="tdoverflowmax100">';
-			if ($obj->socid)
-			{
+			if ($obj->socid) {
 				print $socstatic->getNomUrl(1);
 			} else {
 				print '&nbsp;';
@@ -776,24 +774,20 @@ while ($i < min($num, $limit))
 			if (!$i) $totalarray['nbfield']++;
 		}
 		// Sales Representatives
-		if (!empty($arrayfields['commercial']['checked']))
-		{
+		if (!empty($arrayfields['commercial']['checked'])) {
 			print '<td>';
-			if ($obj->socid)
-			{
+			if ($obj->socid) {
 				$socstatic->id = $obj->socid;
 				$socstatic->name = $obj->name;
 				$listsalesrepresentatives = $socstatic->getSalesRepresentatives($user);
 				$nbofsalesrepresentative = count($listsalesrepresentatives);
-				if ($nbofsalesrepresentative > 3)   // We print only number
-				{
+				if ($nbofsalesrepresentative > 6) {
+					// We print only number
 					print $nbofsalesrepresentative;
-				} elseif ($nbofsalesrepresentative > 0)
-				{
+				} elseif ($nbofsalesrepresentative > 0) {
 					$userstatic = new User($db);
 					$j = 0;
-					foreach ($listsalesrepresentatives as $val)
-					{
+					foreach ($listsalesrepresentatives as $val) {
 						$userstatic->id = $val['id'];
 						$userstatic->lastname = $val['lastname'];
 						$userstatic->firstname = $val['firstname'];
@@ -801,15 +795,20 @@ while ($i < min($num, $limit))
 						$userstatic->statut = $val['statut'];
 						$userstatic->entity = $val['entity'];
 						$userstatic->photo = $val['photo'];
-						print $userstatic->getNomUrl(1, '', 0, 0, 12);
-						//print $userstatic->getNomUrl(-2);
+						$userstatic->login = $val['login'];
+						$userstatic->phone = $val['phone'];
+						$userstatic->job = $val['job'];
+						$userstatic->gender = $val['gender'];
+						print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);
 						$j++;
-						if ($j < $nbofsalesrepresentative) print ' ';
+						if ($j < $nbofsalesrepresentative) {
+							print ' ';
+						}
 					}
 				}
 				//else print $langs->trans("NoSalesRepresentativeAffected");
 			} else {
-				print '&nbsp';
+				print '&nbsp;';
 			}
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 52e105c1443..c9994dcf108 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -46,6 +46,16 @@ $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $taskref = GETPOST('taskref', 'alpha');
 
+// Load variable for pagination
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
 $backtopage = GETPOST('backtopage', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 
@@ -83,6 +93,12 @@ if ($id > 0 || !empty($ref))
 $extrafields->fetch_name_optionals_label($taskstatic->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($taskstatic->table_element, '', 'search_');
 
+
+// Default sort order (if not yet defined by previous GETPOST)
+if (!$sortfield) { reset($object->fields); $sortfield="t.".key($object->fields); }   // Set here default search field. By default 1st field in definition. Reset is required to avoid key() to return null.
+if (!$sortorder) $sortorder = "ASC";
+
+
 // 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.
@@ -772,11 +788,11 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	if (!empty($arrayfields['t.description']['checked'])) print_liste_field_titre($arrayfields['t.description']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, '');
 	if (!empty($arrayfields['t.dateo']['checked'])) print_liste_field_titre($arrayfields['t.dateo']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['t.datee']['checked'])) print_liste_field_titre($arrayfields['t.datee']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['t.planned_workload']['checked'])) print_liste_field_titre($arrayfields['t.planned_workload']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['t.duration_effective']['checked'])) print_liste_field_titre($arrayfields['t.duration_effective']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['t.progress_calculated']['checked'])) print_liste_field_titre($arrayfields['t.progress_calculated']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['t.progress']['checked']))  print_liste_field_titre($arrayfields['t.progress']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['t.progress_summary']['checked'])) print_liste_field_titre($arrayfields['t.progress_summary']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ');
+	if (!empty($arrayfields['t.planned_workload']['checked'])) print_liste_field_titre($arrayfields['t.planned_workload']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ', '', 1);
+	if (!empty($arrayfields['t.duration_effective']['checked'])) print_liste_field_titre($arrayfields['t.duration_effective']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ', '', 1);
+	if (!empty($arrayfields['t.progress_calculated']['checked'])) print_liste_field_titre($arrayfields['t.progress_calculated']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ', '', 1);
+	if (!empty($arrayfields['t.progress']['checked']))  print_liste_field_titre($arrayfields['t.progress']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ', '', 1);
+	if (!empty($arrayfields['t.progress_summary']['checked'])) print_liste_field_titre($arrayfields['t.progress_summary']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ', '', 1);
 	if ($object->usage_bill_time)
 	{
 		if (!empty($arrayfields['t.tobill']['checked']))  print_liste_field_titre($arrayfields['t.tobill']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ');
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 253c2c787e4..1b12bf166f2 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -57,11 +57,22 @@ $projectstatic = new Project($db);
 // Add new contact
 if ($action == 'addcontact' && $user->rights->projet->creer)
 {
+	$source  = 'internal';
+	if (GETPOST("addsourceexternal")) {
+		$source  ='external';
+	}
+
 	$result = $object->fetch($id, $ref);
 
 	if ($result > 0 && $id > 0)
 	{
-		$idfortaskuser = (GETPOST("contactid") != 0) ?GETPOST("contactid") : GETPOST("userid"); // GETPOST('contactid') may val -1 to mean empty or -2 to means "everybody"
+		if ($source == 'internal') {
+			$idfortaskuser = ((GETPOST("userid") != 0 && GETPOST('userid') != -1) ? GETPOST("userid") : 0); // GETPOST('contactid') may val -1 to mean empty or -2 to means "everybody"
+			$typeid = GETPOST('type');
+		} else {
+			$idfortaskuser = ((GETPOST("contactid") > 0) ? GETPOST("contactid", 'int') : 0); // GETPOST('contactid') may val -1 to mean empty or -2 to means "everybody"
+			$typeid = GETPOST('typecontact');
+		}
 		if ($idfortaskuser == -2)
 		{
 			$result = $projectstatic->fetch($object->fk_project);
@@ -72,13 +83,11 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 				$contactsofproject = $projectstatic->getListContactId('internal');
 				foreach ($contactsofproject as $key => $val)
 				{
-					$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
-					$result = $object->add_contact($val, $type, GETPOST("source", 'aZ09'));
+					$result = $object->add_contact($val, $typeid, $source);
 				}
 			}
 		} else {
-			$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
-			$result = $object->add_contact($idfortaskuser, $typeid, GETPOST("source", 'aZ09'));
+			$result = $object->add_contact($idfortaskuser, $typeid, $source);
 		}
 	}
 
@@ -353,6 +362,12 @@ if ($id > 0 || !empty($ref))
 		/*
 		 * Add a new contact line
 		 */
+		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="addcontact">';
+		print '<input type="hidden" name="id" value="'.$id.'">';
+		if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">';
+
 		print '<table class="noborder centpercent">';
 
 		if ($action != 'editline' && $user->rights->projet->creer)
@@ -365,13 +380,6 @@ if ($id > 0 || !empty($ref))
 			print '<td colspan="3">&nbsp;</td>';
 			print "</tr>\n";
 
-			print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="POST">';
-			print '<input type="hidden" name="token" value="'.newToken().'">';
-			print '<input type="hidden" name="action" value="addcontact">';
-			print '<input type="hidden" name="source" value="internal">';
-			print '<input type="hidden" name="id" value="'.$id.'">';
-			if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">';
-
 			// Ligne ajout pour contact interne
 			print '<tr class="oddeven nohover">';
 
@@ -387,26 +395,17 @@ if ($id > 0 || !empty($ref))
 			// On recupere les id des users deja selectionnes
 			if ($object->project->public) $contactsofproject = ''; // Everybody
 			else $contactsofproject = $projectstatic->getListContactId('internal');
-			print $form->select_dolusers((GETPOST('contactid') ?GETPOST('contactid') : $user->id), 'contactid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 1, $langs->trans("ResourceNotAssignedToProject"));
+			print $form->select_dolusers((GETPOSTISSET('userid') ? GETPOST('userid', 'int') : $user->id), 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 1, $langs->trans("ResourceNotAssignedToProject"));
 			print '</td>';
 			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").'"></td>';
+			print '<td class="right" colspan="3" ><input type="submit" class="button" value="'.$langs->trans("Add").'" name="addsourceinternal"></td>';
 			print '</tr>';
 
-			print '</form>';
-
 			// Line to add an external contact. Only if project linked to a third party.
 			if ($projectstatic->socid)
 			{
-				print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
-				print '<input type="hidden" name="token" value="'.newToken().'">';
-				print '<input type="hidden" name="action" value="addcontact">';
-				print '<input type="hidden" name="source" value="external">';
-				print '<input type="hidden" name="id" value="'.$object->id.'">';
-				if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">';
-
 				print '<tr class="oddeven">';
 
 				print '<td class="nowrap">';
@@ -421,18 +420,16 @@ if ($id > 0 || !empty($ref))
 
 				print '<td>';
 				$contactofproject = $projectstatic->getListContactId('external');
-				print $form->selectcontacts($selectedCompany, '', 'contactid', 0, '', $contactofproject);
+				print $form->selectcontacts($selectedCompany, '', 'contactid', 0, '', $contactofproject, 0, '', false, 0, 0);
 				$nbofcontacts = $form->num;
 				print '</td>';
 				print '<td>';
-				$formcompany->selectTypeContact($object, '', 'type', 'external', 'rowid');
+				$formcompany->selectTypeContact($object, '', 'typecontact', 'external', 'rowid');
 				print '</td>';
-				print '<td class="right" colspan="3" ><input type="submit" class="button" id="add-customer-contact" value="'.$langs->trans("Add").'"';
+				print '<td class="right" colspan="3" ><input type="submit" class="button" id="add-customer-contact" name="addsourceexternal" value="'.$langs->trans("Add").'"';
 				if (!$nbofcontacts) print ' disabled';
 				print '></td>';
 				print '</tr>';
-
-				print "</form>";
 			}
 		}
 
@@ -535,6 +532,8 @@ if ($id > 0 || !empty($ref))
 			}
 		}
 		print "</table>";
+
+		print "</form>";
 	} else {
 		print "ErrorRecordNotFound";
 	}
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 1951df8c0e1..b318b44f053 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -511,7 +511,7 @@ if (!empty($arrayfields['t.label']['checked']))
 	print '<input type="text" class="flat" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'" size="8">';
 	print '</td>';
 }
-//Task Description
+// Task Description
 if (!empty($arrayfields['t.description']['checked']))
 {
 	print '<td class="liste_titre">';
@@ -728,7 +728,7 @@ while ($i < min($num, $limit))
 		// Project ref
 		if (!empty($arrayfields['p.ref']['checked']))
 		{
-			print '<td class="nowrap">';
+			print '<td class="nowraponall tdoverflowmax150">';
 			print $projectstatic->getNomUrl(1, 'task');
 			if ($projectstatic->hasDelay()) print img_warning("Late");
 			print '</td>';
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 230dd126de8..cd10b43f0c0 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -634,7 +634,8 @@ if ($id > 0 || !empty($ref))
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
-			$somethingshown = $formactions->showactions($object, 'task', $socid, 1, '', 10, 'withproject='.$withproject);
+			$defaultthirdpartyid = $socid > 0 ? $socid : $object->project->socid;
+			$formactions->showactions($object, 'task', $defaultthirdpartyid, 1, '', 10, 'withproject='.$withproject);
 
 			print '</div></div></div>';
 		}
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index cb92be401c1..5cca624d11f 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1046,13 +1046,13 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 
 				$title = $langs->trans("ListTaskTimeUserProject");
 
-				print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $linktocreatetime, '', $limit, 0, 0, 1);
+				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";
 
 				$title = $langs->trans("ListTaskTimeForTask");
 
-				print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $linktocreatetime, '', $limit, 0, 0, 1);
+				print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'clock', 0, $linktocreatetime, '', $limit, 0, 0, 1);
 			}
 
 			$i = 0;
@@ -1120,7 +1120,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				else $userid = $contactsofproject[0];
 
 				if ($projectstatic->public) $contactsofproject = array();
-				print $form->select_dolusers((GETPOST('userid', 'int') ? GETPOST('userid', 'int') : $userid), 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, $langs->trans("ResourceNotAssignedToProject"), 'maxwidth200');
+				print $form->select_dolusers((GETPOST('userid', 'int') ? GETPOST('userid', 'int') : $userid), 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, $langs->trans("ResourceNotAssignedToProject"), 'maxwidth250');
 			} else {
 				if ($nboftasks) {
 					print img_error($langs->trans('FirstAddRessourceToAllocateTime')).' '.$langs->trans('FirstAddRessourceToAllocateTime');
@@ -1204,7 +1204,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			if (!empty($arrayfields['t.task_label']['checked'])) print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
 		}
 		// Author
-		if (!empty($arrayfields['author']['checked'])) print '<td class="liste_titre">'.$form->select_dolusers(($search_user > 0 ? $search_user : -1), 'search_user', 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth150').'</td>';
+		if (!empty($arrayfields['author']['checked'])) print '<td class="liste_titre">'.$form->select_dolusers(($search_user > 0 ? $search_user : -1), 'search_user', 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250').'</td>';
 		// Note
 		if (!empty($arrayfields['t.note']['checked'])) print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_note" value="'.dol_escape_htmltag($search_note).'"></td>';
 		// Duration
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 1a643323dce..8672fa1c2bf 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1855,7 +1855,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 			{
 				$noidempotency_key = (GETPOSTISSET('noidempotency') ? GETPOST('noidempotency', 'int') : 0); // By default noidempotency is unset, so we must use a different tag/ref for each payment. If set, we can pay several times the same tag/ref.
 				$paymentintent = $stripe->getPaymentIntent($amount, $currency, $tag, 'Stripe payment: '.$fulltag.(is_object($object) ? ' ref='.$object->ref : ''), $object, $stripecu, $stripeacc, $servicestatus, 0, 'automatic', false, null, 0, $noidempotency_key);
-				// The paymentintnent has status 'requires_payment_method' (even if paymentintent was already payed)
+				// The paymentintnent has status 'requires_payment_method' (even if paymentintent was already paid)
 				//var_dump($paymentintent);
 				if ($stripe->error) setEventMessages($stripe->error, null, 'errors');
 			}
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index ac92c958931..b99c4a39392 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -31,7 +31,7 @@ if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined
 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
+// Do not use GETPOST here, function is not defined and this test 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['e']) ? (int) $_GET['e'] : (!empty($_POST['e']) ? (int) $_POST['e'] : 1));
 if (is_numeric($entity)) define("DOLENTITY", $entity);
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index ef4931c4b4a..f4b9f0feb5b 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -409,7 +409,7 @@ if ($ispaymentok)
 						$postactionmessages[] = $errmsg;
 						$ispostactionok = -1;
 					} else {
-						$postactionmessages[] = 'Subscription created';
+						$postactionmessages[] = 'Subscription created (id='.$crowid.')';
 						$ispostactionok = 1;
 					}
 				}
@@ -614,7 +614,7 @@ if ($ispaymentok)
 				$ispostactionok = -1;
 			}
 		} else {
-			$postactionmessages[] = 'Member '.$tmptag['MEM'].' for subscription payed was not found';
+			$postactionmessages[] = 'Member '.$tmptag['MEM'].' for subscription paid was not found';
 			$ispostactionok = -1;
 		}
 	} elseif (array_key_exists('INV', $tmptag) && $tmptag['INV'] > 0)
@@ -718,7 +718,7 @@ if ($ispaymentok)
 				$ispostactionok = -1;
 			}
 		} else {
-			$postactionmessages[] = 'Invoice payed '.$tmptag['INV'].' was not found';
+			$postactionmessages[] = 'Invoice paid '.$tmptag['INV'].' was not found';
 			$ispostactionok = -1;
 		}
 	} else {
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index bfb1bc99c5a..0b5f14c9217 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -361,7 +361,7 @@ if ($event->type == 'payout.created') {
 	}
 } elseif ($event->type == 'payment_method.detached') {
 	$db->begin();
-	$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_rib WHERE ref = '".$db->escape($event->data->object->id)."' and status = ".$servicestatus;
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_rib WHERE number = '".$db->escape($event->data->object->id)."' and status = ".$servicestatus;
 	$db->query($sql);
 	$db->commit();
 } elseif ($event->type == 'charge.succeeded') {
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 0cf53b7dd4f..41e8f60e634 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -506,7 +506,7 @@ if (empty($reshook))
 	} elseif ($action == 'classifybilled')
 	{
 		$object->fetch($id);
-		$result = $object->set_billed();
+		$result = $object->setBilled();
 		if ($result >= 0) {
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit();
@@ -860,13 +860,13 @@ if ($action == 'create')
 
 			// Document model
 			include_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
-			$liste = ModelePdfReception::liste_modeles($db);
+			$list = ModelePdfReception::liste_modeles($db);
 
-			if (count($liste) > 1)
+			if (count($list) > 1)
 			{
 				print "<tr><td>".$langs->trans("DefaultModel")."</td>";
 				print '<td colspan="3">';
-				print $form->selectarray('model', $liste, $conf->global->RECEPTION_ADDON_PDF);
+				print $form->selectarray('model', $list, $conf->global->RECEPTION_ADDON_PDF);
 				print "</td></tr>\n";
 			}
 
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index ef12d844ddc..f53c2bc466d 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -1551,11 +1551,24 @@ class Reception extends CommonObject
 	/**
 	 *	Classify the reception as invoiced (used when WORKFLOW_BILL_ON_RECEPTION is on)
 	 *
+	 *	@deprecated
+	 *  @see setBilled()
 	 *	@return     int     <0 if ko, >0 if ok
 	 */
 	public function set_billed()
 	{
 		// phpcs:enable
+		dol_syslog(get_class($this)."::set_billed is deprecated, use setBilled instead", LOG_NOTICE);
+		return $this->setBilled();
+	}
+
+	/**
+	 *	Classify the reception as invoiced (used when WORKFLOW_BILL_ON_RECEPTION is on)
+	 *
+	 *	@return     int     <0 if ko, >0 if ok
+	 */
+	public function setBilled()
+	{
 		global $user;
 		$error = 0;
 
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index 30d31291a74..cb9bc100f79 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -447,7 +447,7 @@ if ($search_town)  $sql .= natural_search('s.town', $search_town);
 if ($search_zip)   $sql .= natural_search("s.zip", $search_zip);
 if ($search_state) $sql .= natural_search("state.nom", $search_state);
 if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
-if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
+if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
 if ($search_ref_rcp) $sql .= natural_search('e.ref', $search_ref_rcp);
 if ($search_ref_liv) $sql .= natural_search('l.ref', $search_ref_liv);
 if ($search_company) $sql .= natural_search('s.nom', $search_company);
@@ -656,7 +656,7 @@ if ($resql)
 	if (!empty($arrayfields['typent.code']['checked']))
 	{
 		print '<td class="liste_titre maxwidthonsmartphone center">';
-		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
+		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 		print '</td>';
 	}
 	// Date delivery planned
diff --git a/htdocs/recruitment/admin/public_interface.php b/htdocs/recruitment/admin/public_interface.php
index a457c2a4427..31925608811 100644
--- a/htdocs/recruitment/admin/public_interface.php
+++ b/htdocs/recruitment/admin/public_interface.php
@@ -52,7 +52,7 @@ if ($action == 'update') {
 
 	$res = dolibarr_set_const($db, "RECRUITMENT_ENABLE_PUBLIC_INTERFACE", $public, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
index 342d32840c5..1c2d76ffd40 100644
--- a/htdocs/recruitment/admin/setup.php
+++ b/htdocs/recruitment/admin/setup.php
@@ -83,7 +83,7 @@ if ($action == 'updateMask')
 
 	if ($maskconstorder) $res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if (!$error)
 	{
diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
index 818e1479f0a..9bc3cd96d5a 100644
--- a/htdocs/recruitment/admin/setup_candidatures.php
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -83,7 +83,7 @@ if ($action == 'updateMask')
 
 	if ($maskconstorder) $res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if (!$error)
 	{
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 3049f83a053..9e99cbc29fb 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -115,7 +115,7 @@ class RecruitmentCandidature extends CommonObject
 		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
 		'lastname' => array('type'=>'varchar(128)', 'label'=>'Lastname', 'enabled'=>'1', 'position'=>20, 'notnull'=>0, 'visible'=>1,),
 		'firstname' => array('type'=>'varchar(128)', 'label'=>'Firstname', 'enabled'=>'1', 'position'=>21, 'notnull'=>0, 'visible'=>1,),
-		'email' => array('type'=>'varchar(255)', 'label'=>'EMail', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1,),
+		'email' => array('type'=>'varchar(255)', 'label'=>'EMail', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'picto'=>'email'),
 		'phone' => array('type'=>'varchar(64)', 'label'=>'Phone', 'enabled'=>'1', 'position'=>31, 'notnull'=>0, 'visible'=>1,),
 		'date_birth' => array('type'=>'date', 'label'=>'DateOfBirth', 'enabled'=>'1', 'position'=>70, 'visible'=>-1,),
 		'email_msgid' => array('type'=>'varchar(255)', 'label'=>'EmailMsgID', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'help'=>'EmailMsgIDDesc'),
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index c202a523e58..6861717d825 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -103,13 +103,13 @@ class RecruitmentJobPosition extends CommonObject
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'position'=>5, 'notnull'=>1, 'default'=>'1', 'index'=>1),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
 		'label' => array('type'=>'varchar(255)', 'label'=>'JobLabel', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth500', 'csslist'=>'tdoverflowmax300', 'showoncombobox'=>'1', 'autofocusoncreate'=>1),
-		'qty' => array('type'=>'integer', 'label'=>'NbOfEmployeesExpected', 'enabled'=>'1', 'position'=>45, 'notnull'=>1, 'visible'=>1, 'default'=>'1', 'isameasure'=>'1', 'css'=>'maxwidth75imp',),
-		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'1', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1,),
+		'qty' => array('type'=>'integer', 'label'=>'NbOfEmployeesExpected', 'enabled'=>'1', 'position'=>45, 'notnull'=>1, 'visible'=>1, 'default'=>'1', 'isameasure'=>'1', 'css'=>'maxwidth75imp'),
+		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'1', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'css'=>'maxwidth500', 'picto'=>'project'),
 		'fk_user_recruiter' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'ResponsibleOfRecruitement', 'enabled'=>'1', 'position'=>54, 'notnull'=>1, 'visible'=>1, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax150'),
-		'email_recruiter' => array('type'=>'varchar(255)', 'label'=>'EmailRecruiter', 'enabled'=>'1', 'position'=>54, 'notnull'=>0, 'visible'=>-1, 'help'=>'ToUseAGenericEmail'),
+		'email_recruiter' => array('type'=>'varchar(255)', 'label'=>'EmailRecruiter', 'enabled'=>'1', 'position'=>54, 'notnull'=>0, 'visible'=>-1, 'help'=>'ToUseAGenericEmail', 'picto'=>'email'),
 		'fk_user_supervisor' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'FutureManager', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'user.rowid',),
 		'fk_establishment' => array('type'=>'integer:Establishment:hrm/class/establishment.class.php', 'label'=>'Establishment', 'enabled'=>'$conf->hrm->enabled', 'position'=>56, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'establishment.rowid',),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'WorkPlace', 'enabled'=>'1', 'position'=>57, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'help'=>"IfJobIsLocatedAtAPartner",),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'WorkPlace', 'enabled'=>'1', 'position'=>57, 'notnull'=>-1, 'visible'=>-1, 'css'=>'maxwidth500', 'index'=>1, 'help'=>"IfJobIsLocatedAtAPartner", 'picto'=>'company'),
 		'date_planned' => array('type'=>'date', 'label'=>'DateExpected', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>1,),
 		'remuneration_suggested' => array('type'=>'varchar(255)', 'label'=>'Remuneration', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>1,),
 		'description' => array('type'=>'html', 'label'=>'Description', 'enabled'=>'1', 'position'=>65, 'notnull'=>0, 'visible'=>3,),
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 59ea51466b6..0a8fb1bab0f 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
@@ -48,9 +48,9 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 
 	/**
 	 * @var array Minimum version of PHP required by module.
-	 * e.g.: PHP ≥ 5.5 = array(5, 5)
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
 	 */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
 	 * @var string Dolibarr version of the loaded document
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
index 5f257f594cf..918fc9f727d 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -70,9 +70,9 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 
 	/**
 	 * @var array Minimum version of PHP required by module.
-	 * e.g.: PHP ≥ 5.5 = array(5, 5)
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
 	 */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
 	 * Dolibarr version of the loaded document
@@ -128,7 +128,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 
 
 	/**
-	 * @var array of document table collumns
+	 * @var array of document table columns
 	 */
 	public $cols;
 
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index 0909dd93b8e..13789173094 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -320,10 +320,6 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 		print '<td>';
 		print $object->description;
 		print '</td>';
-
-		// Other attributes
-		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
-
 		print '</tr>';
 
 		// Origin country code
@@ -332,6 +328,11 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 		print '<td>';
 		print getCountry($object->country_id, 0, $db);
 		print '</td>';
+
+
+		// Other attributes
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+
 		print '</tr>';
 
 		print '</table>';
diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php
index 0b6239b01e4..30d7a13a194 100644
--- a/htdocs/resource/class/html.formresource.class.php
+++ b/htdocs/resource/class/html.formresource.class.php
@@ -75,9 +75,10 @@ class FormResource
 	 *  @param	int		$outputmode		0=HTML select string, 1=Array, 2=without form tag
 	 *  @param	int		$limit			Limit number of answers
 	 *  @param	string	$morecss		More css
+	 * 	@param	bool	$multiple       add [] in the name of element and add 'multiple' attribut
 	 * 	@return	string					HTML string with
 	 */
-	public function select_resource_list($selected = '', $htmlname = 'fk_resource', $filter = '', $showempty = 0, $showtype = 0, $forcecombo = 0, $event = array(), $filterkey = '', $outputmode = 0, $limit = 20, $morecss = '')
+	public function select_resource_list($selected = '', $htmlname = 'fk_resource', $filter = '', $showempty = 0, $showtype = 0, $forcecombo = 0, $event = array(), $filterkey = '', $outputmode = 0, $limit = 20, $morecss = '', $multiple = false)
 	{
 		// phpcs:enable
 		global $conf, $user, $langs;
@@ -89,6 +90,8 @@ class FormResource
 
 		$resources_used = $resourcestat->fetch_all('ASC', 't.rowid', $limit, 0, $filter);
 
+		if (!is_array($selected)) $selected = array($selected);
+
 		if ($outputmode != 2)
 		{
 			$out = '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
@@ -106,7 +109,7 @@ class FormResource
 			}
 
 			// Construct $out and $outarray
-			$out .= '<select id="'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">'."\n";
+			$out .= '<select id="'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').'>'."\n";
 			if ($showempty) $out .= '<option value="-1">&nbsp;</option>'."\n";
 
 			$num = 0;
@@ -123,7 +126,7 @@ class FormResource
 					$label = $resourcestat->lines[$i]->ref ? $resourcestat->lines[$i]->ref : ''.$resourcestat->lines[$i]->label;
 					if ($resourceclass != 'Dolresource') $label .= ' ('.$langs->trans($resourceclass).')';
 
-					if ($selected > 0 && $selected == $resourcestat->lines[$i]->id)
+					if ((is_object($selected[0]) && $selected[0]->id == $resourcestat->lines[$i]->id) || (!is_object($selected[0]) && in_array($resourcestat->lines[$i]->id, $selected)))
 					{
 						$out .= '<option value="'.$resourcestat->lines[$i]->id.'" selected>'.$label.'</option>';
 					} else {
diff --git a/htdocs/robots.txt b/htdocs/robots.txt
index a6a27039016..a88521ec582 100644
--- a/htdocs/robots.txt
+++ b/htdocs/robots.txt
@@ -1,6 +1,7 @@
 User-agent: *
 Allow: /public/agenda/agendaexport.php
 Allow: /public/demo/
+Allow: /public/members/new.php
 Allow: /index.php
 #Allow: /$
 Disallow: /
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 7fb8427a517..2fc71bec099 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -256,7 +256,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
-	print load_fiche_titre($langs->trans("NewSalaryPayment"), '', 'object_payment');
+	print load_fiche_titre($langs->trans("NewSalaryPayment"), '', 'salary');
 
 	print dol_get_fiche_head('', '');
 
@@ -375,7 +375,7 @@ if ($id)
 {
 	$head = salaries_prepare_head($object);
 
-	print dol_get_fiche_head($head, 'card', $langs->trans("SalaryPayment"), -1, 'payment');
+	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>';
 
@@ -425,7 +425,7 @@ if ($id)
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-	print '<table class="border centpercent">';
+	print '<table class="border centpercent tableforfield">';
 
 	// Label
 	print '<tr><td class="titlefield">'.$langs->trans("Label").'</td><td>'.$object->label.'</td></tr>';
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 8b5bcc13920..59cf90e72e7 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -44,7 +44,7 @@ class PaymentSalary extends CommonObject
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
-	public $picto = 'payment';
+	public $picto = 'salary';
 
 	public $tms;
 
diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index 6cc482f1304..dc86a274837 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -90,7 +90,7 @@ if ($object->id)
 
 	$head = salaries_prepare_head($object);
 
-	print dol_get_fiche_head($head, 'documents', $langs->trans("SalaryPayment"), -1, 'payment');
+	print dol_get_fiche_head($head, 'documents', $langs->trans("SalaryPayment"), -1, 'salary');
 
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
diff --git a/htdocs/salaries/info.php b/htdocs/salaries/info.php
index 9461bae867e..c7a5090072e 100644
--- a/htdocs/salaries/info.php
+++ b/htdocs/salaries/info.php
@@ -52,7 +52,7 @@ $object->info($id);
 
 $head = salaries_prepare_head($object);
 
-print dol_get_fiche_head($head, 'info', $langs->trans("SalaryPayment"), -1, 'payment');
+print dol_get_fiche_head($head, 'info', $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>';
 
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 2b700108d10..119b224e76b 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -342,13 +342,15 @@ if (!empty($socid)) {
 }
 $newcardbutton = dolGetButtonTitle($langs->trans('NewSalaryPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->salaries->write);
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $totalnboflines, 'object_payment', 0, $newcardbutton, '', $limit, 0, 0, 1);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'salary', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 //$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 $selectedfields = '';
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
+$moreforfilter = '';
+
 print '<div class="div-table-responsive">';
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
@@ -453,9 +455,6 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
-	// Show here line of result
-	print '<tr class="oddeven">';
-
 	$userstatic->id = $obj->uid;
 	$userstatic->lastname = $obj->lastname;
 	$userstatic->firstname = $obj->firstname;
@@ -468,6 +467,9 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	$salstatic->id = $obj->rowid;
 	$salstatic->ref = $obj->rowid;
 
+	// Show here line of result
+	print '<tr class="oddeven">';
+
 	// Ref
 	print "<td>".$salstatic->getNomUrl(1)."</td>\n";
 	if (!$i) {
diff --git a/htdocs/salaries/stats/index.php b/htdocs/salaries/stats/index.php
index 1f0598f4245..99b2fd9042f 100644
--- a/htdocs/salaries/stats/index.php
+++ b/htdocs/salaries/stats/index.php
@@ -60,7 +60,7 @@ llxHeader();
 $title = $langs->trans("SalariesStatistics");
 $dir = $conf->salaries->dir_temp;
 
-print load_fiche_titre($title, '', 'object_payment');
+print load_fiche_titre($title, '', 'salary');
 
 dol_mkdir($dir);
 
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 49b58d61d08..daaf9fbd623 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -75,7 +75,7 @@ if ($action == 'updateoptions')
 	{
 		$companysearch = GETPOST('activate_COMPANY_USE_SEARCH_TO_SELECT', 'alpha');
 		$res = dolibarr_set_const($db, "COMPANY_USE_SEARCH_TO_SELECT", $companysearch, 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) $error++;
+		if (!($res > 0)) $error++;
 		if (!$error)
 		{
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -88,7 +88,7 @@ if ($action == 'updateoptions')
 	{
 		$contactsearch = GETPOST('activate_CONTACT_USE_SEARCH_TO_SELECT', 'alpha');
 		$res = dolibarr_set_const($db, "CONTACT_USE_SEARCH_TO_SELECT", $contactsearch, 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) $error++;
+		if (!($res > 0)) $error++;
 		if (!$error)
 		{
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -101,7 +101,7 @@ if ($action == 'updateoptions')
 	{
 		$customertypedefault = GETPOST('defaultcustomertype', 'int');
 		$res = dolibarr_set_const($db, "THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT", $customertypedefault, 'chaine', 0, '', $conf->entity);
-		if (!$res > 0) $error++;
+		if (!($res > 0)) $error++;
 		if (!$error)
 		{
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -176,7 +176,7 @@ if ($action == 'setdoc')
 if ($action == "setaddrefinlist") {
 	$setaddrefinlist = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "SOCIETE_ADD_REF_IN_LIST", $setaddrefinlist, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -189,7 +189,7 @@ if ($action == "setaddrefinlist") {
 if ($action == "setaddadressinlist") {
 	$val = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "COMPANY_SHOW_ADDRESS_SELECTLIST", $val, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -202,7 +202,7 @@ if ($action == "setaddadressinlist") {
 if ($action == "setaddemailphonetownincontactlist") {
 	$val = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST", $val, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -214,7 +214,7 @@ if ($action == "setaddemailphonetownincontactlist") {
 if ($action == "setaskforshippingmet") {
 	$setaskforshippingmet = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "SOCIETE_ASK_FOR_SHIPPING_METHOD", $setaskforshippingmet, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -227,7 +227,7 @@ if ($action == "setaskforshippingmet") {
 if ($action == "setdisableprospectcustomer") {
 	$setdisableprospectcustomer = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "SOCIETE_DISABLE_PROSPECTSCUSTOMERS", $setdisableprospectcustomer, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -297,7 +297,7 @@ if ($action == 'sethideinactivethirdparty')
 if ($action == 'setonsearchandlistgooncustomerorsuppliercard') {
 	$setonsearchandlistgooncustomerorsuppliercard = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD", $setonsearchandlistgooncustomerorsuppliercard, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -784,7 +784,7 @@ print '</tr>';
 
 print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("AddRefInList").'</td>';
-print '<td>&nbsp</td>';
+print '<td>&nbsp;</td>';
 print '<td class="center">';
 if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST))
 {
@@ -799,7 +799,7 @@ print '</tr>';
 
 print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("AddAdressInList").'</td>';
-print '<td>&nbsp</td>';
+print '<td>&nbsp;</td>';
 print '<td class="center">';
 if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST))
 {
@@ -814,7 +814,7 @@ print '</tr>';
 
 print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("AddEmailPhoneTownInContactList").'</td>';
-print '<td>&nbsp</td>';
+print '<td>&nbsp;</td>';
 print '<td class="center">';
 if (!empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddemailphonetownincontactlist&token='.newToken().'&value=0">';
@@ -830,7 +830,7 @@ 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)
 		print '<tr class="oddeven">';
 		print '<td width="80%">'.$langs->trans("AskForPreferredShippingMethod").'</td>';
-		print '<td>&nbsp</td>';
+		print '<td>&nbsp;</td>';
 		print '<td class="center">';
 		if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD))
 		{
@@ -848,7 +848,7 @@ if (!empty($conf->expedition->enabled)) {
 // Disable Prospect/Customer thirdparty type
 print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("DisableProspectCustomerType").'</td>';
-print '<td>&nbsp</td>';
+print '<td>&nbsp;</td>';
 print '<td class="center">';
 if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS))
 {
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index 83309e0faf1..5686b3660d1 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -303,8 +303,7 @@ abstract class ActionsCardCommon
 			if ($nbofsalesrepresentative > 3)   // We print only number
 			{
 				$this->tpl['sales_representatives'] .= $nbofsalesrepresentative;
-			} elseif ($nbofsalesrepresentative > 0)
-			{
+			} elseif ($nbofsalesrepresentative > 0) {
 				$userstatic = new User($this->db);
 				$i = 0;
 				foreach ($listsalesrepresentatives as $val)
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 6d87766f000..b471ca23ead 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -46,6 +46,9 @@ 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->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 
 $langs->loadLangs(array("companies", "commercial", "bills", "banks", "users"));
 if (!empty($conf->adherent->enabled)) $langs->load("members");
@@ -249,7 +252,7 @@ if (empty($reshook))
 						'FactureFournisseur' => '/fourn/class/fournisseur.facture.class.php',
 						'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php',
 						'ProductFournisseur' => '/fourn/class/fournisseur.product.class.php',
-						'Livraison' => '/delivery/class/delivery.class.php',
+						'Delivery' => '/delivery/class/delivery.class.php',
 						'Product' => '/product/class/product.class.php',
 						'Project' => '/projet/class/project.class.php',
 						'Ticket' => '/ticket/class/ticket.class.php',
@@ -394,6 +397,16 @@ if (empty($reshook))
 			$error++;
 		}
 
+		if (!empty($conf->mailing->enabled) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1 && GETPOST('contact_no_email', 'int')==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email")), null, 'errors');
+		}
+
+		if (!empty($conf->mailing->enabled) && GETPOST("private", 'int') == 1 && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1 && GETPOST('contact_no_email', 'int')==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email")), null, 'errors');
+		}
+
 		if (!$error)
 		{
 			if ($action == 'update')
@@ -476,6 +489,9 @@ if (empty($reshook))
 			$object->webservices_url		= GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
 			$object->webservices_key		= GETPOST('webservices_key', 'san_alpha');
 
+			if (GETPOSTISSET('accountancy_code_sell')) $object->accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+			if (GETPOSTISSET('accountancy_code_buy')) $object->accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+
 			// Incoterms
 			if (!empty($conf->incoterm->enabled))
 			{
@@ -562,7 +578,9 @@ if (empty($reshook))
 					if ($object->particulier)
 					{
 						dol_syslog("We ask to create a contact/address too", LOG_DEBUG);
-						$result = $object->create_individual($user);
+						$contcats = GETPOST('contcats', 'array');
+						$no_email = GETPOST('contact_no_email', 'int');
+						$result = $object->create_individual($user, $no_email, $contcats);
 						if ($result < 0)
 						{
 							setEventMessages($object->error, $object->errors, 'errors');
@@ -903,6 +921,7 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $formadmin = new FormAdmin($db);
 $formcompany = new FormCompany($db);
+if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
 
 if ($socid > 0 && empty($object->id))
 {
@@ -1043,6 +1062,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$object->commercial_id = GETPOST('commercial_id', 'int');
 		$object->default_lang = GETPOST('default_lang');
 
+		if (GETPOSTISSET('accountancy_code_sell')) $object->accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+		if (GETPOSTISSET('accountancy_code_buy')) $object->accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+
 		$object->logo = (isset($_FILES['photo']) ?dol_sanitizeFileName($_FILES['photo']['name']) : '');
 
 		// Gestion du logo de la société
@@ -1146,8 +1168,22 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
                         $("#selectcountry_id").change(function() {
                         	document.formsoc.action.value="create";
                         	document.formsoc.submit();
-                        });
-                     });';
+                        });';
+				if ($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1) {
+					print '
+						function init_check_no_email(input) {
+							if (input.val()!="") {
+								$(".noemail").addClass("fieldrequired");
+							} else {
+								$(".noemail").removeClass("fieldrequired");
+							}
+						}
+						$("#email").keyup(function() {
+							init_check_no_email($(this));
+						});
+						init_check_no_email($("#email"));';
+				}
+				print '});';
 				print '</script>'."\n";
 
 				print '<div id="selectthirdpartytype">';
@@ -1199,9 +1235,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<table class="border centpercent">';
 
 		// Name, firstname
-		print '<tr class="tr-field-thirdparty-name"><td class="titlefieldcreate tdtop">';
-		if ($object->particulier || $private)
-		{
+		print '<tr class="tr-field-thirdparty-name"><td class="titlefieldcreate">';
+		if ($object->particulier || $private) {
 			print '<span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName', 'name').'</span>';
 		} else {
 			print '<span id="TypeName" class="fieldrequired">'.$form->editfieldkey('ThirdPartyName', 'name', '', $object, 0).'</span>';
@@ -1317,7 +1352,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		// Zip / Town
 		print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td>';
-		print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
+		print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100');
 		print '</td>';
 		if ($conf->browser->layout == 'phone') print '</tr><tr>';
 		print '<td class="tdtop">'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td>';
@@ -1356,7 +1391,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		// 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 colspan="3">'.img_picto('', 'object_email').' <input type="text" class="maxwidth500 widthcentpercentminusx" name="email" id="email" value="'.$object->email.'"></td></tr>';
+		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>';
+		if (!empty($conf->mailing->enabled) && !empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION)) {
+			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			print '<td class="individualline noemail">'.$form->editfieldkey($langs->trans('No_Email') .' ('.$langs->trans('Contact').')', 'contact_no_email', '', $object, 0).'</td>';
+			print '<td class="individualline" '.(($conf->browser->layout == 'phone') || empty($conf->mailing->enabled) ? ' colspan="3"' : '').'>'.$form->selectyesno('contact_no_email', (GETPOSTISSET("contact_no_email") ?GETPOST("contact_no_email", 'alpha') : $object->no_email), 1, false, 1).'</td>';
+		}
+		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>';
 
@@ -1456,7 +1497,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		// Type - Workforce/Staff
 		print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'."\n";
 		$sortparam = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
-		print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam, '', 1);
+		print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 1, 0, 0, '', 0, 0, 0, $sortparam, '', 1);
 		if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		print '</td>';
 		if ($conf->browser->layout == 'phone') print '</tr><tr>';
@@ -1512,13 +1553,29 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			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 "</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 "</td></tr>";
+			}
+
 			// Supplier
-			//if ($object->fournisseur) {
-			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 "</td></tr>";
-			//}
+			if (!empty($conf->fournisseur->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 "</td></tr>";
+			}
 		}
 
 		// Multicurrency
@@ -1555,6 +1612,42 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		print '</table>'."\n";
 
+		// Accountancy codes
+		if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
+			print '<table class="border" width="100%">';
+
+			if (! empty($conf->accounting->enabled))
+			{
+				// Accountancy_code_sell
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
+				print '<td>';
+				$accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
+				print $formaccounting->select_account($accountancy_code_sell, 'accountancy_code_sell', 1, null, 1, 1, '');
+				print '</td></tr>';
+
+				// Accountancy_code_buy
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyCode").'</td>';
+				print '<td>';
+				$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
+				print $formaccounting->select_account($accountancy_code_buy, 'accountancy_code_buy', 1, null, 1, 1, '');
+				print '</td></tr>';
+			}
+			else // For external software
+			{
+				// Accountancy_code_sell
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
+				print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_sell" value="'.$object->accountancy_code_sell.'">';
+				print '</td></tr>';
+
+				// Accountancy_code_buy
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyCode").'</td>';
+				print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_buy" value="'.$object->accountancy_code_buy.'">';
+				print '</td></tr>';
+			}
+
+			print '</table>';
+		}
+
 		print dol_get_fiche_end();
 
 		print '<div class="center">';
@@ -1669,6 +1762,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				$object->webservices_url        = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
 				$object->webservices_key        = GETPOST('webservices_key', 'san_alpha');
 
+				if (GETPOSTISSET('accountancy_code_sell')) $object->accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+				if (GETPOSTISSET('accountancy_code_buy')) $object->accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+
 				//Incoterms
 				if (!empty($conf->incoterm->enabled))
 				{
@@ -1913,7 +2009,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			// Zip / Town
 			print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td>';
-			print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth50onsmartphone');
+			print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100');
 			print '</td>';
 			if ($conf->browser->layout == 'phone') print '</tr><tr>';
 			print '<td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td>';
@@ -1924,7 +2020,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			// Country
 			print '<tr><td>'.$form->editfieldkey('Country', 'selectcounty_id', '', $object, 0).'</td><td colspan="3">';
 			print img_picto('', 'globe-americas', 'class="paddingrightonly"');
-			print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 widthcentpercentminusx');
+			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);
 			print '</td></tr>';
 
@@ -1951,9 +2047,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			// EMail / Web
 			print '<tr><td>'.$form->editfieldkey('EMail', 'email', GETPOST('email', 'alpha'), $object, 0, 'string', '', (!empty($conf->global->SOCIETE_EMAIL_MANDATORY))).'</td>';
-			print '<td colspan="3">'.img_picto('', 'object_email').' <input type="text" name="email" id="email" class="maxwidth200onsmartphone widthcentpercentminusx" value="'.(GETPOSTISSET('email') ?GETPOST('email', 'alpha') : $object->email).'"></td></tr>';
+			print '<td colspan="3">'.img_picto('', 'object_email').' <input type="text" name="email" id="email" class="maxwidth200onsmartphone maxwidth500 widthcentpercentminusx" value="'.(GETPOSTISSET('email') ?GETPOST('email', 'alpha') : $object->email).'"></td></tr>';
 			print '<tr><td>'.$form->editfieldkey('Web', 'url', GETPOST('url', 'alpha'), $object, 0).'</td>';
-			print '<td colspan="3">'.img_picto('', 'globe').' <input type="text" name="url" id="url" class="maxwidth200onsmartphone widthcentpercentminusx " value="'.(GETPOSTISSET('url') ?GETPOST('url', 'alpha') : $object->url).'"></td></tr>';
+			print '<td colspan="3">'.img_picto('', 'globe').' <input type="text" name="url" id="url" class="maxwidth200onsmartphone maxwidth500 widthcentpercentminusx " value="'.(GETPOSTISSET('url') ?GETPOST('url', 'alpha') : $object->url).'"></td></tr>';
 
 			if (!empty($conf->socialnetworks->enabled)) {
 				foreach ($socialnetworks as $key => $value) {
@@ -2077,7 +2173,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			// Type - Workforce/Staff
 			print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
-			print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
+			print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			print '</td>';
 			if ($conf->browser->layout == 'phone') print '</tr><tr>';
@@ -2133,17 +2229,19 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				print "</td></tr>";
 
 				// Supplier
-				print '<tr class="visibleifsupplier"><td>'.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).'</td>';
-				print '<td colspan="3">';
-				$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, null, null, null, 1);
-				$c = new Categorie($db);
-				$cats = $c->containing($object->id, Categorie::TYPE_SUPPLIER);
-				$arrayselected = array();
-				foreach ($cats as $cat) {
-					$arrayselected[] = $cat->id;
+				if (!empty($conf->fournisseur->enabled)) {
+					print '<tr class="visibleifsupplier"><td>'.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).'</td>';
+					print '<td colspan="3">';
+					$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, null, null, null, 1);
+					$c = new Categorie($db);
+					$cats = $c->containing($object->id, Categorie::TYPE_SUPPLIER);
+					$arrayselected = array();
+					foreach ($cats as $cat) {
+						$arrayselected[] = $cat->id;
+					}
+					print img_picto('', 'category').$form->multiselectarray('suppcats', $cate_arbo, $arrayselected, 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+					print "</td></tr>";
 				}
-				print img_picto('', 'category').$form->multiselectarray('suppcats', $cate_arbo, $arrayselected, 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
-				print "</td></tr>";
 			}
 
 			// Multicurrency
@@ -2197,9 +2295,43 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '</td></tr>';
 
 			print '</table>';
+
+			if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
+				print '<br>';
+				print '<table class="border centpercent">';
+
+				if (! empty($conf->accounting->enabled))
+				{
+					// Accountancy_code_sell
+					print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
+					print '<td>';
+					print $formaccounting->select_account($object->accountancy_code_sell, 'accountancy_code_sell', 1, '', 1, 1);
+					print '</td></tr>';
+
+					// Accountancy_code_buy
+					print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
+					print '<td>';
+					print $formaccounting->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 1, 1);
+					print '</td></tr>';
+				}
+				else // For external software
+				{
+					// Accountancy_code_sell
+					print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
+					print '<td><input name="accountancy_code_sell" class="maxwidth200" value="'.$object->accountancy_code_sell.'">';
+					print '</td></tr>';
+
+					// Accountancy_code_buy
+					print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
+					print '<td><input name="accountancy_code_buy" class="maxwidth200" value="'.$object->accountancy_code_buy.'">';
+					print '</td></tr>';
+				}
+				print '</table>';
+			}
+
 			print '</div>';
 
-			  print dol_get_fiche_end();
+			print dol_get_fiche_end();
 
 			print '<div class="center">';
 			print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
@@ -2266,23 +2398,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border tableforfield" width="100%">';
 
-		// Prospect/Customer
-		print '<tr><td class="titlefield">'.$langs->trans('ProspectCustomer').'</td><td>';
-		print $object->getLibCustProspStatut();
+		// Type Prospect/Customer/Supplier
+		print '<tr><td class="titlefield">'.$langs->trans('NatureOfThirdParty').'</td><td>';
+		print $object->getTypeUrl(1);
 		print '</td></tr>';
 
-		// Supplier
-   		if (!empty($conf->fournisseur->enabled) || !empty($conf->supplier_proposal->enabled))
-		{
-			print '<tr><td>'.$langs->trans('Supplier').'</td><td>';
-			print yn($object->fournisseur);
-			print '</td></tr>';
-		}
-
 		// Prefix
 		if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
 		{
-			print '<tr><td>'.$langs->trans('Prefix').'</td><td>'.$object->prefix_comm.'</td>';
+			print '<tr><td>'.$langs->trans('Prefix').'</td><td>'.dol_escape_htmltag($object->prefix_comm).'</td>';
 			print '</tr>';
 		}
 
@@ -2290,8 +2414,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		if ($object->client)
 		{
 			print '<tr><td>';
-			print $langs->trans('CustomerCode').'</td><td>';
-			print $object->code_client;
+			print $langs->trans('CustomerCode');
+			print '</td>';
+			print '<td>';
+			print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_client));
+			print '</td>';
 			$tmpcheck = $object->check_codeclient();
 			if ($tmpcheck != 0 && $tmpcheck != -5) {
 				print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
@@ -2305,7 +2432,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		{
 			print '<tr><td>';
 			print $langs->trans('SupplierCode').'</td><td>';
-			print $object->code_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>';
@@ -2318,7 +2445,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		if (!empty($conf->barcode->enabled))
 		{
 			print '<tr><td>';
-			print $langs->trans('Gencod').'</td><td>'.dol_escape_htmltag($object->barcode);
+			print $langs->trans('Gencod').'</td><td>'.showValueWithClipboardCPButton(dol_escape_htmltag($object->barcode));
 			print '</td>';
 			print '</tr>';
 		}
@@ -2334,7 +2461,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				print '<tr>';
 				print '<td>'.$idprof.'</td><td>';
 				$key = 'idprof'.$i;
-				print $object->$key;
+				print showValueWithClipboardCPButton(dol_escape_htmltag($object->$key));
 				if ($object->$key)
 				{
 					if ($object->id_prof_check($i, $object) > 0) print ' &nbsp; '.$object->id_prof_url($i, $object);
@@ -2520,7 +2647,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			}
 
 			// Supplier
-			if ($object->fournisseur) {
+			if (!empty($conf->fournisseur->enabled) && $object->fournisseur) {
 				print '<tr><td>'.$langs->trans("SuppliersCategoriesShort").'</td>';
 				print '<td>';
 				print $form->showCategories($object->id, Categorie::TYPE_SUPPLIER, 1);
@@ -2577,16 +2704,55 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '</td></tr>';
 		}
 
+		if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
+			// Accountancy sell code
+			print '<tr><td class="nowrap">';
+			print $langs->trans("ProductAccountancySellCode");
+			print '</td><td colspan="2">';
+			if (! empty($conf->accounting->enabled))
+			{
+				if (! empty($object->accountancy_code_sell))
+				{
+					$accountingaccount = new AccountingAccount($db);
+					$accountingaccount->fetch('', $object->accountancy_code_sell, 1);
+
+					print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
+				}
+			} else {
+				print $object->accountancy_code_sell;
+			}
+			print '</td></tr>';
+
+			// Accountancy buy code
+			print '<tr><td class="nowrap">';
+			print $langs->trans("ProductAccountancyBuyCode");
+			print '</td><td colspan="2">';
+			if (! empty($conf->accounting->enabled))
+			{
+				if (! empty($object->accountancy_code_buy))
+				{
+					$accountingaccount2 = new AccountingAccount($db);
+					$accountingaccount2->fetch('', $object->accountancy_code_buy, 1);
+
+					print $accountingaccount2->getNomUrl(0, 1, 1, '', 1);
+				}
+			} else {
+				print $object->accountancy_code_buy;
+			}
+			print '</td></tr>';
+		}
+
 		// Other attributes
 		$parameters = array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 		// Parent company
-		if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY))
-		{
+		if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY)) {
 			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>';
+			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 '</tr></table>';
 			print '</td><td>';
 			$html_name = ($action == 'editparentcompany') ? 'parent_id' : 'none';
@@ -2598,17 +2764,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
 
 		// Module Adherent
-		if (!empty($conf->adherent->enabled))
-		{
+		if (!empty($conf->adherent->enabled)) {
 			$langs->load("members");
 			print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
 			print '<td>';
 			$adh = new Adherent($db);
 			$result = $adh->fetch('', '', $object->id);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$adh->ref = $adh->getFullName($langs);
-				print $adh->getNomUrl(1);
+				print $adh->getNomUrl(-1);
 			} else {
 				print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
 			}
@@ -2765,7 +2929,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 	}
 }
-
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 81a1c167a02..3e8a6c91f92 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1068,7 +1068,7 @@ class Thirdparties extends DolibarrApi
 	/**
 	 * Return list of invoices qualified to be corrected by a credit note.
 	 * Invoices matching the following rules are returned
-	 * (validated + payment on process) or classified (payed completely or payed partialy) + not already replaced + not already a credit note
+	 * (validated + payment on process) or classified (paid completely or paid partialy) + not already replaced + not already a credit note
 	 *
 	 * @param int   $id             Id of thirdparty
 	 *
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 22763134e22..c4d355ab62c 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -126,6 +126,33 @@ class Societe extends CommonObject
 	 */
 	public $restrictiononfksoc = 1;
 
+
+	/**
+	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  'picto' is code of a picto to show before value in forms
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
+	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
+
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
@@ -152,17 +179,8 @@ class Societe extends CommonObject
 		'url' =>array('type'=>'varchar(255)', 'label'=>'Url', 'enabled'=>1, 'visible'=>-1, 'position'=>110),
 		'email' =>array('type'=>'varchar(128)', 'label'=>'Email', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
 		'socialnetworks' =>array('type'=>'text', 'label'=>'Socialnetworks', 'enabled'=>1, 'visible'=>-1, 'position'=>120),
-		/*'skype' =>array('type'=>'varchar(255)', 'label'=>'Skype', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
-		'whatsapp' =>array('type'=>'varchar(255)', 'label'=>'Whatsapp', 'enabled'=>1, 'visible'=>-1, 'position'=>130),
-		'linkedin' =>array('type'=>'varchar(255)', 'label'=>'Linkedin', 'enabled'=>1, 'visible'=>-1, 'position'=>135),
-		'youtube' =>array('type'=>'varchar(255)', 'label'=>'Youtube', 'enabled'=>1, 'visible'=>-1, 'position'=>140),
-		'googleplus' =>array('type'=>'varchar(255)', 'label'=>'Googleplus', 'enabled'=>1, 'visible'=>-1, 'position'=>145),
-		'snapchat' =>array('type'=>'varchar(255)', 'label'=>'Snapchat', 'enabled'=>1, 'visible'=>-1, 'position'=>150),
-		'instagram' =>array('type'=>'varchar(255)', 'label'=>'Instagram', 'enabled'=>1, 'visible'=>-1, 'position'=>155),
-		'facebook' =>array('type'=>'varchar(255)', 'label'=>'Facebook', 'enabled'=>1, 'visible'=>-1, 'position'=>160),
-		'twitter' =>array('type'=>'varchar(255)', 'label'=>'Twitter', 'enabled'=>1, 'visible'=>-1, 'position'=>165),*/
 		'fk_effectif' =>array('type'=>'integer', 'label'=>'Workforce', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
-		'fk_typent' =>array('type'=>'integer', 'label'=>'TypeOfCompany', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
+		'fk_typent' =>array('type'=>'integer', 'label'=>'TypeOfCompany', 'enabled'=>1, 'visible'=>-1, 'position'=>175, 'csslist'=>'minwidth200'),
 		'fk_forme_juridique' =>array('type'=>'integer', 'label'=>'JuridicalStatus', 'enabled'=>1, 'visible'=>-1, 'position'=>180),
 		'fk_currency' =>array('type'=>'varchar(3)', 'label'=>'Currency', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
 		'siren' =>array('type'=>'varchar(128)', 'label'=>'Idprof1', 'enabled'=>1, 'visible'=>-1, 'position'=>190),
@@ -214,7 +232,7 @@ class Societe extends CommonObject
 		'fk_multicurrency' =>array('type'=>'integer', 'label'=>'Fk multicurrency', 'enabled'=>1, 'visible'=>-1, 'position'=>440),
 		'multicurrency_code' =>array('type'=>'varchar(255)', 'label'=>'Multicurrency code', 'enabled'=>1, 'visible'=>-1, 'position'=>445),
 		'fk_account' =>array('type'=>'integer', 'label'=>'Fk account', 'enabled'=>1, 'visible'=>-1, 'position'=>450),
-		'fk_entrepot' =>array('type'=>'integer', 'label'=>'Fk entrepot', 'enabled'=>1, 'visible'=>-1, 'position'=>455),
+		'fk_warehouse' =>array('type'=>'integer', 'label'=>'warehouse', 'enabled'=>1, 'visible'=>-1, 'position'=>455),
 		'logo' =>array('type'=>'varchar(255)', 'label'=>'Logo', 'enabled'=>1, 'visible'=>-1, 'position'=>400),
 		'logo_squarred' =>array('type'=>'varchar(255)', 'label'=>'Logo squarred', 'enabled'=>1, 'visible'=>-1, 'position'=>401),
 		'status' =>array('type'=>'tinyint(4)', 'label'=>'Status', 'enabled'=>1, 'visible'=>-1, 'position'=>500),
@@ -693,6 +711,15 @@ class Societe extends CommonObject
 	 */
 	public $logo_squarred_mini;
 
+	/**
+	 * @var string Accountancy account for sales
+	 */
+	public $accountancy_code_sell;
+
+	/**
+	 * @var string Accountancy account for bought
+	 */
+	public $accountancy_code_buy;
 
 	// Multicurrency
 	/**
@@ -700,6 +727,12 @@ class Societe extends CommonObject
 	 */
 	public $fk_multicurrency;
 
+	// Warehouse
+	/**
+	 * @var int ID
+	 */
+	public $fk_warehouse;
+
 	/**
 	 * @var string Multicurrency code
 	 */
@@ -798,6 +831,9 @@ class Societe extends CommonObject
 		}
 		$this->import_key = trim($this->import_key);
 
+		$this->accountancy_code_buy = trim($this->accountancy_code_buy);
+		$this->accountancy_code_sell= trim($this->accountancy_code_sell);
+
 		if (!empty($this->multicurrency_code)) {
 			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
 		}
@@ -827,8 +863,24 @@ class Societe extends CommonObject
 		if ($result >= 0) {
 			$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
 
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)";
-			$sql .= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$this->db->escape($this->entity).", '".$this->db->idate($now)."'";
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (";
+			$sql .= "nom";
+			$sql .= ", name_alias";
+			$sql .= ", entity";
+			$sql .= ", datec";
+			$sql .= ", fk_user_creat";
+			$sql .= ", canvas";
+			$sql .= ", status";
+			$sql .= ", ref_ext";
+			$sql .= ", fk_stcomm";
+			$sql .= ", fk_incoterms";
+			$sql .= ", location_incoterms";
+			$sql .= ", import_key";
+			$sql .= ", fk_multicurrency";
+			$sql .= ", multicurrency_code";
+			$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 .= ", ".(!empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'" : "null");
 			$sql .= ", ".$this->status;
@@ -838,7 +890,10 @@ class Societe extends CommonObject
 			$sql .= ", '".$this->db->escape($this->location_incoterms)."'";
 			$sql .= ", ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
 			$sql .= ", ".(int) $this->fk_multicurrency;
-			$sql .= ", '".$this->db->escape($this->multicurrency_code)."')";
+			$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+			$sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";
+			$sql .= ", '".$this->db->escape($this->accountancy_code_sell)."'";
+			$sql .= ")";
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 			$result = $this->db->query($sql);
@@ -900,10 +955,18 @@ class Societe extends CommonObject
 	 * Create a contact/address from thirdparty
 	 *
 	 * @param 	User	$user		Object user
+	 * @param 	int		$no_email	1=Do not send mailing, 0=Ok to recieve mailling
+	 * @param 	array	$tags		Array of tag to affect to contact
 	 * @return 	int					<0 if KO, >0 if OK
 	 */
-	public function create_individual(User $user)
+	public function create_individual(User $user, $no_email, $tags = array())
 	{
+		global $conf;
+
+		$error = 0;
+
+		$this->db->begin();
+
 		// phpcs:enable
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 		$contact = new Contact($this->db);
@@ -923,14 +986,43 @@ class Societe extends CommonObject
 		$contact->town              = $this->town;
 		$contact->phone_pro         = $this->phone;
 
-		$result = $contact->create($user);
-		if ($result < 0) {
+		$contactId = $contact->create($user);
+		if ($contactId < 0) {
+			$error++;
 			$this->error = $contact->error;
 			$this->errors = $contact->errors;
 			dol_syslog(get_class($this)."::create_individual ERROR:".$this->error, LOG_ERR);
 		}
 
-		return $result;
+		if (empty($error) && is_array($tags) && !empty($tags)) {
+			$result = $contact->setCategories($tags);
+			if ($result < 0) {
+				$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);
+				$contactId = $result;
+			}
+		}
+
+		if (empty($error) && !empty($conf->mailing->enabled) && !empty($contact->email) && isset($no_email)) {
+			$result = $contact->setNoEmail($no_email);
+			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);
+				$contactId = $result;
+			}
+		}
+
+		if (!empty($error)) {
+			dol_syslog(get_class($this)."::create_individual success");
+			$this->db->commit();
+		} else {
+			$this->db->rollback();
+		}
+
+		return $contactId;
 	}
 
 	/**
@@ -1193,6 +1285,9 @@ class Societe extends CommonObject
 		$this->webservices_url = $this->webservices_url ?clean_url($this->webservices_url, 0) : '';
 		$this->webservices_key = trim($this->webservices_key);
 
+		$this->accountancy_code_buy = trim($this->accountancy_code_buy);
+		$this->accountancy_code_sell= trim($this->accountancy_code_sell);
+
 		//Incoterms
 		$this->fk_incoterms = (int) $this->fk_incoterms;
 		$this->location_incoterms = trim($this->location_incoterms);
@@ -1318,6 +1413,9 @@ 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)."'";
 
+			$sql.= ", accountancy_code_buy = '" . $this->db->escape($this->accountancy_code_buy)."'";
+			$sql.= ", accountancy_code_sell= '" . $this->db->escape($this->accountancy_code_sell)."'";
+
 			$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");
 
@@ -1477,7 +1575,7 @@ class Societe extends CommonObject
 		}
 
 		$sql = 'SELECT s.rowid, s.nom as name, s.name_alias, s.entity, s.ref_ext, s.address, s.datec as date_creation, s.prefix_comm';
-		$sql .= ', s.status';
+		$sql .= ', s.status, s.fk_warehouse';
 		$sql .= ', s.price_level';
 		$sql .= ', s.tms as date_modification, s.fk_user_creat, s.fk_user_modif';
 		$sql .= ', s.phone, s.fax, s.email';
@@ -1489,6 +1587,7 @@ class Societe extends CommonObject
 		$sql .= ', s.fk_effectif as effectif_id';
 		$sql .= ', s.fk_forme_juridique as forme_juridique_code';
 		$sql .= ', s.webservices_url, s.webservices_key';
+		$sql .= ', s.accountancy_code_buy, s.accountancy_code_sell';
 		$sql .= ', s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur, s.parent, s.barcode';
 		$sql .= ', s.fk_departement as state_id, s.fk_pays as country_id, s.fk_stcomm, s.remise_supplier, s.mode_reglement, s.cond_reglement, s.transport_mode';
 		$sql .= ', s.fk_account, s.tva_assuj';
@@ -1673,6 +1772,9 @@ class Societe extends CommonObject
 				$this->webservices_url = $obj->webservices_url;
 				$this->webservices_key = $obj->webservices_key;
 
+				$this->accountancy_code_buy     = $obj->accountancy_code_buy;
+				$this->accountancy_code_sell    = $obj->accountancy_code_sell;
+
 				$this->outstanding_limit		= $obj->outstanding_limit;
 				$this->order_min_amount			= $obj->order_min_amount;
 				$this->supplier_order_min_amount = $obj->supplier_order_min_amount;
@@ -1680,6 +1782,9 @@ class Societe extends CommonObject
 				// multiprix
 				$this->price_level = $obj->price_level;
 
+				// warehouse
+				$this->fk_warehouse = $obj->fk_warehouse;
+
 				$this->import_key = $obj->import_key;
 
 				//Incoterms
@@ -2110,7 +2215,7 @@ class Societe extends CommonObject
 
 		$reparray = array();
 
-		$sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.office_phone, u.job, u.email, u.statut as status, u.entity, u.photo";
+		$sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.office_phone, u.job, u.email, u.statut as status, u.entity, u.photo, u.gender";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
 		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 			$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
@@ -2147,6 +2252,7 @@ class Societe extends CommonObject
 					$reparray[$i]['entity'] = $obj->entity;
 					$reparray[$i]['login'] = $obj->login;
 					$reparray[$i]['photo'] = $obj->photo;
+					$reparray[$i]['gender'] = $obj->gender;
 				} else {
 					$reparray[] = $obj->rowid;
 				}
@@ -2501,6 +2607,41 @@ class Societe extends CommonObject
 		return $result;
 	}
 
+	/**
+	 *    	Return link(s) on type of thirdparty (with picto)
+	 *
+	 *		@param	int		$withpicto		          Add picto into link (0=No picto, 1=Include picto with link, 2=Picto only)
+	 *		@param	string	$option					  ''=All
+	 *      @param	int  	$notooltip		          1=Disable tooltip
+	 *		@return	string					          String with URL
+	 */
+	public function getTypeUrl($withpicto = 0, $option = '', $notooltip = 0)
+	{
+		global $conf, $langs;
+
+		$s = '';
+		if (empty($option) || preg_match('/prospect/', $option)) {
+			if (($this->client == 2 || $this->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
+			{
+				$s .= '<a class="customer-back opacitymedium" title="'.$langs->trans("Prospect").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id.'">'.dol_substr($langs->trans("Prospect"), 0, 1).'</a>';
+			}
+		}
+		if (empty($option) || preg_match('/customer/', $option)) {
+			if (($this->client == 1 || $this->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
+			{
+				$s .= '<a class="customer-back" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id.'">'.dol_substr($langs->trans("Customer"), 0, 1).'</a>';
+			}
+		}
+		if (empty($option) || preg_match('/supplier/', $option)) {
+			if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $this->fournisseur)
+			{
+				$s .= '<a class="vendor-back" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id.'">'.dol_substr($langs->trans("Supplier"), 0, 1).'</a>';
+			}
+		}
+		return $s;
+	}
+
+
 	/**
 	 *    Return label of status (activity, closed)
 	 *
@@ -3621,8 +3762,8 @@ class Societe extends CommonObject
 	 */
 	public function create_from_member(Adherent $member, $socname = '', $socalias = '', $customercode = '')
 	{
-		// phpcs:enable
-		global $user, $langs;
+        // phpcs:enable
+		global $conf, $user, $langs;
 
 		dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
 
@@ -3656,6 +3797,23 @@ class Societe extends CommonObject
 		// Cree et positionne $this->id
 		$result = $this->create($user);
 		if ($result >= 0) {
+			// Auto-create contact on thirdparty creation
+			if (!empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT)) {
+				// Fill fields needed by contact
+				$this->name_bis = $member->lastname;
+				$this->firstname = $member->firstname;
+				$this->civility_id = $member->civility_id;
+
+				dol_syslog("We ask to create a contact/address too", LOG_DEBUG);
+				$result = $this->create_individual($user);
+				if ($result < 0)
+				{
+					setEventMessages($this->error, $this->errors, 'errors');
+					$this->db->rollback();
+					return -1;
+				}
+			}
+
 			$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
 			$sql .= " SET fk_soc=".$this->id;
 			$sql .= " WHERE rowid=".$member->id;
@@ -3733,9 +3891,8 @@ class Societe extends CommonObject
 			if (!empty($tmp[1])) {   // If $conf->global->MAIN_INFO_SOCIETE_STATE is "id:code:label"
 				$state_code = $tmp[1];
 				$state_label = $tmp[2];
-			} else // For backward compatibility
-			{
-				dol_syslog("Your state setup use an old syntax. Reedit it using setup area.", LOG_ERR);
+			} else { // For backward compatibility
+				dol_syslog("Your state setup use an old syntax (entity=".$conf->entity."). Reedit it using setup area.", 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
@@ -4244,6 +4401,7 @@ class Societe extends CommonObject
 	 * Return label of status customer is prospect/customer
 	 *
 	 * @return   string        	Label
+	 * @see getTypeUrl()
 	 */
 	public function getLibCustProspStatut()
 	{
@@ -4473,4 +4631,57 @@ class Societe extends CommonObject
 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
+
+	/**
+	 * Sets an accountancy code for a thirdparty.
+	 * Also calls COMPANY_MODIFY trigger when modified
+	 *
+	 * @param   string  $type   It can be only 'buy' or 'sell'
+	 * @param   string  $value  Accountancy code
+	 * @return  int             <0 KO >0 OK
+	 */
+	public function setAccountancyCode($type, $value)
+	{
+		global $user, $langs, $conf;
+
+		$this->db->begin();
+
+		if ($type == 'buy') {
+			$field = 'accountancy_code_buy';
+		} elseif ($type == 'sell') {
+			$field = 'accountancy_code_sell';
+		} else {
+			return -1;
+		}
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ";
+		$sql.= "$field = '".$this->db->escape($value)."'";
+		$sql.= " WHERE rowid = ".$this->id;
+
+		dol_syslog(get_class($this)."::".__FUNCTION__." sql=".$sql, 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);
+			if ($result < 0) {
+				$this->errors=$interface->errors;
+				$this->db->rollback();
+				return -1;
+			}
+			// End call triggers
+
+			$this->$field = $value;
+
+			$this->db->commit();
+			return 1;
+		}
+		else {
+			$this->error=$this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 }
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 779bf573341..fe8c2adb7bc 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -148,7 +148,7 @@ if ($object->client)
 	if ($conf->contrat->enabled && $user->rights->contrat->lire) $elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
 }
 
-if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) $elementTypeArray['fichinter'] = $langs->transnoentitiesnoconv('Interventions');
+if (!empty($conf->ficheinter->enabled) && !empty($user->rights->ficheinter->lire)) $elementTypeArray['fichinter'] = $langs->transnoentitiesnoconv('Interventions');
 
 if ($object->fournisseur)
 {
@@ -433,15 +433,15 @@ if ($sql_select)
 
 		// Status
 		print '<td class="center">';
-		if ($type_element == 'contract')
-		{
-			print $documentstaticline->getLibStatut(2);
+		if ($type_element == 'contract') {
+			print $documentstaticline->getLibStatut(5);
 		} else {
-			print $documentstatic->getLibStatut(2);
+			print $documentstatic->getLibStatut(5);
 		}
 		print '</td>';
 
-		print '<td>';
+		// Label
+		print '<td class="tdoverflowmax300">';
 
 		// Define text, description and type
 		$text = ''; $description = ''; $type = 0;
@@ -606,9 +606,10 @@ if ($sql_select)
 		print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
 	}
 	$db->free($resql);
-} elseif (empty($type_element) || $type_element == -1)
+}
+elseif (empty($type_element) || $type_element == -1)
 {
-	print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
+	print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', (!empty($num) ? $num : 0), '', '');
 
 	print '<table class="liste centpercent">'."\n";
 	// Titles with sort buttons
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index ddd865521d7..9ce38458c7f 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -289,21 +289,7 @@ if ($result)
 			print "</td>\n";
 			// Type
 			print '<td class="center">';
-			$obj = $thirdparty_static;
-			$s = '';
-			if (($obj->client == 2 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
-			{
-				$s .= '<a class="customer-back opacitymedium" title="'.$langs->trans("Prospect").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$thirdparty_static->id.'">'.dol_substr($langs->trans("Prospect"), 0, 1).'</a>';
-			}
-			if (($obj->client == 1 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
-			{
-				$s .= '<a class="customer-back" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$thirdparty_static->id.'">'.dol_substr($langs->trans("Customer"), 0, 1).'</a>';
-			}
-			if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $obj->fournisseur)
-			{
-				$s .= '<a class="vendor-back" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$thirdparty_static->id.'">'.dol_substr($langs->trans("Supplier"), 0, 1).'</a>';
-			}
-			print $s;
+			print $thirdparty_static->getTypeUrl();
 			print '</td>';
 			// Last modified date
 			print '<td class="right tddate">';
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index f4ddb7e571f..e62b17559ee 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -78,7 +78,7 @@ $search_zip = trim(GETPOST("search_zip", 'alpha'));
 $search_state = trim(GETPOST("search_state", 'alpha'));
 $search_region = trim(GETPOST("search_region", 'alpha'));
 $search_email = trim(GETPOST('search_email', 'alpha'));
-$search_phone = trim(GETPOST('search_phone', 'alpha'));
+$search_phone = trim(GETPOST('search_phone', 'ahttps://wiki.dolibarr.org/index.php?title=Migrer_mon_Dolibarr_vers_une_offre_Cloudlpha'));
 $search_fax = trim(GETPOST('search_fax', 'alpha'));
 $search_url = trim(GETPOST('search_url', 'alpha'));
 $search_idprof1 = trim(GETPOST('search_idprof1', 'alpha'));
@@ -93,6 +93,7 @@ $search_categ_cus = trim(GETPOST("search_categ_cus", 'int'));
 $search_categ_sup = trim(GETPOST("search_categ_sup", 'int'));
 $search_country = GETPOST("search_country", 'intcomma');
 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
+$search_price_level = GETPOST('search_prive_level', 'int');
 $search_staff = GETPOST("search_staff", 'int');
 $search_status = GETPOST("search_status", 'int');
 $search_type = GETPOST('search_type', 'alpha');
@@ -188,8 +189,8 @@ $arrayfields = array(
 	's.code_compta'=>array('label'=>"CustomerAccountancyCodeShort", 'position'=>13, 'checked'=>$checkedcustomeraccountcode),
 	's.code_compta_fournisseur'=>array('label'=>"SupplierAccountancyCodeShort", 'position'=>14, 'checked'=>$checkedsupplieraccountcode, 'enabled'=>(!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))),
 	's.address'=>array('label'=>"Address", 'position'=>19, 'checked'=>0),
-	's.town'=>array('label'=>"Town", 'position'=>20, 'checked'=>0),
-	's.zip'=>array('label'=>"Zip", 'position'=>21, 'checked'=>1),
+	's.zip'=>array('label'=>"Zip", 'position'=>20, 'checked'=>1),
+	's.town'=>array('label'=>"Town", 'position'=>21, 'checked'=>0),
 	'state.nom'=>array('label'=>"State", 'position'=>22, 'checked'=>0),
 	'region.nom'=>array('label'=>"Region", 'position'=>23, 'checked'=>0),
 	'country.code_iso'=>array('label'=>"Country", 'position'=>24, 'checked'=>0),
@@ -198,7 +199,7 @@ $arrayfields = array(
 	's.phone'=>array('label'=>"Phone", 'position'=>27, 'checked'=>1),
 	's.fax'=>array('label'=>"Fax", 'position'=>28, 'checked'=>0),
 	'typent.code'=>array('label'=>"ThirdPartyType", 'position'=>29, 'checked'=>$checkedtypetiers),
-	'staff.code'=>array('label'=>"Staff", 'position'=>30, 'checked'=>0),
+	'staff.code'=>array('label'=>"Staff", 'position'=>31, 'checked'=>0),
 	's.siren'=>array('label'=>"ProfId1Short", 'position'=>40, 'checked'=>$checkedprofid1),
 	's.siret'=>array('label'=>"ProfId2Short", 'position'=>41, 'checked'=>$checkedprofid2),
 	's.ape'=>array('label'=>"ProfId3Short", 'position'=>42, 'checked'=>$checkedprofid3),
@@ -215,6 +216,11 @@ $arrayfields = array(
 	's.status'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 	's.import_key'=>array('label'=>"ImportId", 'checked'=>0, 'position'=>1100),
 );
+if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
+{
+	$arrayfields['s.price_level'] =array('label'=>"PriceLevel", 'position'=>30, 'checked'=>0);
+}
+
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
@@ -308,6 +314,7 @@ if (empty($reshook))
 		$search_idprof6 = '';
 		$search_vat = '';
 		$search_type = '';
+		$search_prive_level = '';
 		$search_type_thirdparty = '';
 		$search_staff = '';
 		$search_status = -1;
@@ -395,7 +402,7 @@ $sql .= " s.entity,";
 $sql .= " st.libelle as stcomm, st.picto as stcomm_picto, s.fk_stcomm as stcomm_id, s.fk_prospectlevel, s.prefix_comm, s.client, s.fournisseur, s.canvas, s.status as status,";
 $sql .= " s.email, s.phone, s.fax, s.url, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4 as idprof4, s.idprof5 as idprof5, s.idprof6 as idprof6, s.tva_intra, s.fk_pays,";
 $sql .= " s.tms as date_update, s.datec as date_creation,";
-$sql .= " s.code_compta, s.code_compta_fournisseur, s.parent as fk_parent,";
+$sql .= " s.code_compta, s.code_compta_fournisseur, s.parent as fk_parent,s.price_level,";
 $sql .= " s2.nom as name2,";
 $sql .= " typent.code as typent_code,";
 $sql .= " staff.code as staff_code,";
@@ -429,13 +436,15 @@ if (!empty($search_categ_sup)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_f
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."c_stcomm as st ON s.fk_stcomm = st.id";
 // We'll need this table joined to the select in order to filter by sale
 if ($search_sale == -2) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
-elseif ($search_sale || (!$user->rights->societe->client->voir && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+//elseif ($search_sale || (empty($user->rights->societe->client->voir) && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->societe->client->readallthirdparties_advance)) && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+elseif ($search_sale || (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)	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+//if (empty($user->rights->societe->client->voir) && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->societe->client->readallthirdparties_advance)) && !$socid)	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if (empty($user->rights->societe->client->voir) && !$socid)	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 if ($search_sale && $search_sale != -2)    $sql .= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
 if (!$user->rights->fournisseur->lire) $sql .= " AND (s.fournisseur <> 1 OR s.client <> 0)"; // client=0, fournisseur=0 must be visible
 if ($search_sale == -2)    $sql .= " AND sc.fk_user IS NULL";
-elseif ($search_sale)          $sql .= " AND sc.fk_user = ".$db->escape($search_sale);
+elseif ($search_sale > 0)  $sql .= " AND sc.fk_user = ".$db->escape($search_sale);
 if ($search_categ_cus > 0) $sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
 if ($search_categ_sup > 0) $sql .= " AND cs.fk_categorie = ".$db->escape($search_categ_sup);
 if ($search_categ_cus == -2)   $sql .= " AND cc.fk_categorie IS NULL";
@@ -475,7 +484,8 @@ if ($search_type > 0 && in_array($search_type, array('4')))         $sql .= " AN
 if ($search_type == '0') $sql .= " AND s.client = 0 AND s.fournisseur = 0";
 if ($search_status != '' && $search_status >= 0) $sql .= natural_search("s.status", $search_status, 2);
 if (!empty($conf->barcode->enabled) && $search_barcode) $sql .= natural_search("s.barcode", $search_barcode);
-if ($search_type_thirdparty && $search_type_thirdparty != '-1') $sql .= natural_search("s.fk_typent", $search_type_thirdparty, 2);
+if ($search_prive_level && $search_prive_level != '-1') $sql .= natural_search("s.price_level", $search_prive_level, 2);
+if ($search_type_thirdparty && $search_type_thirdparty > 0) $sql .= natural_search("s.fk_typent", $search_type_thirdparty, 2);
 if (!empty($search_staff) && $search_staff != '-1')            $sql .= natural_search("s.fk_effectif", $search_staff, 2);
 if ($search_level)  $sql .= natural_search("s.fk_prospectlevel", join(',', $search_level), 3);
 if ($search_parent_name)   $sql .= natural_search("s2.nom", $search_parent_name);
@@ -571,7 +581,8 @@ if ($search_idprof4 != '') $param .= '&search_idprof4='.urlencode($search_idprof
 if ($search_idprof5 != '') $param .= '&search_idprof5='.urlencode($search_idprof5);
 if ($search_idprof6 != '') $param .= '&search_idprof6='.urlencode($search_idprof6);
 if ($search_vat != '')     $param .= '&search_vat='.urlencode($search_vat);
-if ($search_type_thirdparty != '')    $param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+if ($search_prive_level != '')    $param .= '&search_prive_level='.urlencode($search_prive_level);
+if ($search_type_thirdparty != '' && $search_type_thirdparty > 0)    $param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
 if ($search_type != '')    $param .= '&search_type='.urlencode($search_type);
 if (is_array($search_level) && count($search_level)) foreach ($search_level as $slevel) $param .= '&search_level[]='.urlencode($slevel);
 if ($search_status != '')  $param .= '&search_status='.urlencode($search_status);
@@ -671,7 +682,7 @@ if (empty($type) || $type == 'c' || $type == 'p')
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
-	 	$moreforfilter .= $langs->trans('CustomersProspectsCategoriesShort').': ';
+	 	$moreforfilter .= img_picto('', 'category', 'class="pictofixedwidth"');
 		$moreforfilter .= $formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $langs->trans('CustomersProspectsCategoriesShort'));
 	 	$moreforfilter .= '</div>';
 	}
@@ -682,8 +693,8 @@ if (empty($type) || $type == 'f')
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
-		$moreforfilter .= $langs->trans('SuppliersCategoriesShort').': ';
-		$moreforfilter .= $formother->select_categories('supplier', $search_categ_sup, 'search_categ_sup', 1);
+		$moreforfilter .= img_picto('', 'category', 'class="pictofixedwidth"');
+		$moreforfilter .= $formother->select_categories('supplier', $search_categ_sup, 'search_categ_sup', 1, $langs->trans('SuppliersCategoriesShort'));
 		$moreforfilter .= '</div>';
 	}
 }
@@ -692,8 +703,8 @@ if (empty($type) || $type == 'f')
 if ($user->rights->societe->client->voir || $socid)
 {
  	$moreforfilter .= '<div class="divsearchfield">';
- 	$moreforfilter .= $langs->trans('SalesRepresentatives').': ';
-	$moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300', 1);
+ 	$moreforfilter .= img_picto('', 'user', 'class="pictofixedwidth"');
+ 	$moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $langs->trans('SalesRepresentatives'), 'maxwidth300', 1);
 	$moreforfilter .= '</div>';
 }
 if ($moreforfilter)
@@ -779,13 +790,6 @@ if (!empty($arrayfields['s.address']['checked']))
 	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_address" value="'.dol_escape_htmltag($search_address).'">';
 	print '</td>';
 }
-// Town
-if (!empty($arrayfields['s.town']['checked']))
-{
-	print '<td class="liste_titre">';
-	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_town" value="'.dol_escape_htmltag($search_town).'">';
-	print '</td>';
-}
 // Zip
 if (!empty($arrayfields['s.zip']['checked']))
 {
@@ -793,6 +797,13 @@ if (!empty($arrayfields['s.zip']['checked']))
 	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_zip" value="'.dol_escape_htmltag($search_zip).'">';
 	print '</td>';
 }
+// Town
+if (!empty($arrayfields['s.town']['checked']))
+{
+	print '<td class="liste_titre">';
+	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_town" value="'.dol_escape_htmltag($search_town).'">';
+	print '</td>';
+}
 // State
 if (!empty($arrayfields['state.nom']['checked']))
 {
@@ -818,7 +829,15 @@ if (!empty($arrayfields['country.code_iso']['checked']))
 if (!empty($arrayfields['typent.code']['checked']))
 {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
-	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), 'maxwidth75', 1);
+	// 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, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), 'minwidth50 maxwidth100', 1);
+	print '</td>';
+}
+// Multiprice level
+if (!empty($arrayfields['s.price_level']['checked']))
+{
+	print '<td class="liste_titre">';
+	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_prive_level" value="'.dol_escape_htmltag($search_prive_level).'">';
 	print '</td>';
 }
 // Staff
@@ -906,7 +925,7 @@ if (!empty($arrayfields['s.tva_intra']['checked']))
 	print '</td>';
 }
 
-// Type (customer/prospect/supplier)
+// Nature (customer/prospect/supplier)
 if (!empty($arrayfields['customerorsupplier']['checked']))
 {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
@@ -978,7 +997,6 @@ print $searchpicto;
 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, "", $sortfield, $sortorder);
 if (!empty($arrayfields['s.nom']['checked']))                     print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder);
@@ -989,16 +1007,17 @@ if (!empty($arrayfields['s.code_fournisseur']['checked']))        print_liste_fi
 if (!empty($arrayfields['s.code_compta']['checked']))             print_liste_field_titre($arrayfields['s.code_compta']['label'], $_SERVER["PHP_SELF"], "s.code_compta", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['s.code_compta_fournisseur']['checked'])) print_liste_field_titre($arrayfields['s.code_compta_fournisseur']['label'], $_SERVER["PHP_SELF"], "s.code_compta_fournisseur", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['s.address']['checked']))		 print_liste_field_titre($arrayfields['s.address']['label'], $_SERVER['PHP_SELF'], 's.address', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], "s.town", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], "s.zip", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], "s.town", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['region.nom']['checked']))       print_liste_field_titre($arrayfields['region.nom']['label'], $_SERVER["PHP_SELF"], "region.nom", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, "", $sortfield, $sortorder, 'center ');
 if (!empty($arrayfields['staff.code']['checked']))       print_liste_field_titre($arrayfields['staff.code']['label'], $_SERVER["PHP_SELF"], "staff.code", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['s.price_level']['checked']))    print_liste_field_titre($arrayfields['s.price_level']['label'], $_SERVER["PHP_SELF"], "s.price_level", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['s.email']['checked']))          print_liste_field_titre($arrayfields['s.email']['label'], $_SERVER["PHP_SELF"], "s.email", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['s.phone']['checked']))          print_liste_field_titre($arrayfields['s.phone']['label'], $_SERVER["PHP_SELF"], "s.phone", "", $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['s.fax']['checked'])) print_liste_field_titre($arrayfields['s.fax']['label'], $_SERVER["PHP_SELF"], "s.fax", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['s.fax']['checked']))			 print_liste_field_titre($arrayfields['s.fax']['label'], $_SERVER["PHP_SELF"], "s.fax", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['s.url']['checked']))            print_liste_field_titre($arrayfields['s.url']['label'], $_SERVER["PHP_SELF"], "s.url", "", $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['s.siren']['checked']))          print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"), $textprofid[1], 1, 0), $_SERVER["PHP_SELF"], "s.siren", "", $param, '', $sortfield, $sortorder, 'nowrap ');
 if (!empty($arrayfields['s.siret']['checked']))          print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"), $textprofid[2], 1, 0), $_SERVER["PHP_SELF"], "s.siret", "", $param, '', $sortfield, $sortorder, 'nowrap ');
@@ -1011,6 +1030,7 @@ if (!empty($arrayfields['customerorsupplier']['checked']))        print_liste_fi
 if (!empty($arrayfields['s.fk_prospectlevel']['checked']))        print_liste_field_titre($arrayfields['s.fk_prospectlevel']['label'], $_SERVER["PHP_SELF"], "s.fk_prospectlevel", "", $param, '', $sortfield, $sortorder, 'center ');
 if (!empty($arrayfields['s.fk_stcomm']['checked']))               print_liste_field_titre($arrayfields['s.fk_stcomm']['label'], $_SERVER["PHP_SELF"], "s.fk_stcomm", "", $param, '', $sortfield, $sortorder, 'center ');
 if (!empty($arrayfields['s2.nom']['checked']))           print_liste_field_titre($arrayfields['s2.nom']['label'], $_SERVER["PHP_SELF"], "s2.nom", "", $param, '', $sortfield, $sortorder, 'center ');
+
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
@@ -1123,18 +1143,18 @@ while ($i < min($num, $limit))
 		print '<td>'.$obj->address.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
-	// Town
-	if (!empty($arrayfields['s.town']['checked']))
-	{
-		print "<td>".$obj->town."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
-	}
 	// Zip
 	if (!empty($arrayfields['s.zip']['checked']))
 	{
 		print "<td>".$obj->zip."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
+	// Town
+	if (!empty($arrayfields['s.town']['checked']))
+	{
+		print "<td>".$obj->town."</td>\n";
+		if (!$i) $totalarray['nbfield']++;
+	}
 	// State
 	if (!empty($arrayfields['state.nom']['checked']))
 	{
@@ -1165,6 +1185,12 @@ while ($i < min($num, $limit))
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
+	// Multiprice level
+	if (!empty($arrayfields['s.price_level']['checked']))
+	{
+		print '<td class="center">'.$obj->price_level."</td>\n";
+		if (!$i) $totalarray['nbfield']++;
+	}
 	// Staff
 	if (!empty($arrayfields['staff.code']['checked']))
 	{
@@ -1181,17 +1207,17 @@ while ($i < min($num, $limit))
 	}
 	if (!empty($arrayfields['s.phone']['checked']))
 	{
-		print "<td>".dol_print_phone($obj->phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL')."</td>\n";
+		print "<td>".dol_print_phone($obj->phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone')."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['s.fax']['checked']))
 	{
-		print "<td>".dol_print_phone($obj->fax, $obj->country_code, 0, $obj->rowid, 'AC_TEL')."</td>\n";
+		print "<td>".dol_print_phone($obj->fax, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'fax')."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['s.url']['checked']))
 	{
-		print "<td>".$obj->url."</td>\n";
+		print "<td>".dol_print_url($obj->url, '', '', 1)."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['s.siren']['checked']))
@@ -1240,20 +1266,7 @@ while ($i < min($num, $limit))
 	if (!empty($arrayfields['customerorsupplier']['checked']))
 	{
 		print '<td class="center">';
-		$s = '';
-		if (($obj->client == 2 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
-		{
-			$s .= '<a class="customer-back opacitymedium" title="'.$langs->trans("Prospect").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Prospect"), 0, 1).'</a>';
-		}
-		if (($obj->client == 1 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
-		{
-			$s .= '<a class="customer-back" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Customer"), 0, 1).'</a>';
-		}
-		if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $obj->fournisseur)
-		{
-			$s .= '<a class="vendor-back" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Supplier"), 0, 1).'</a>';
-		}
-		print $s;
+		print $companystatic->getTypeUrl(1);
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
@@ -1285,7 +1298,7 @@ while ($i < min($num, $limit))
 	// Parent company
 	if (!empty($arrayfields['s2.nom']['checked']))
 	{
-		print '<td class="center">';
+		print '<td class="center tdoverflowmax100">';
 		if ($companystatic->fk_parent > 0)
 		{
 			$companyparent->fetch($companystatic->fk_parent);
@@ -1345,6 +1358,14 @@ while ($i < min($num, $limit))
 	$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);
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 5730d8f1ff4..b911bfb034e 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/triggers/interface_50_modNotification_Notification.class.php';
 
-$langs->loadLangs(array("companies", "mails", "admin", "other"));
+$langs->loadLangs(array("companies", "mails", "admin", "other", "errors"));
 
 $socid     = GETPOST("socid", 'int');
 $action    = GETPOST('action', 'aZ09');
@@ -139,6 +139,7 @@ $result = $object->fetch($socid);
 $title = $langs->trans("ThirdParty").' - '.$langs->trans("Notification");
 if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name.' - '.$langs->trans("Notification");
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+
 llxHeader('', $title, $help_url);
 
 
@@ -157,7 +158,7 @@ if ($result > 0)
 	print '<div class="fichecenter">';
 
 	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
+	print '<table class="border centpercent tableforfield">';
 
 	// Prefix
 	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
@@ -208,72 +209,15 @@ if ($result > 0)
 	print "\n";
 
 	// Help
-	print '<div class="opacitymedium">';
+	print '<div class="opacitymedium hideonsmartphone">';
 	print $langs->trans("NotificationsDesc");
 	print '<br>'.$langs->trans("NotificationsDescUser");
 	print '<br>'.$langs->trans("NotificationsDescContact");
 	print '<br>'.$langs->trans("NotificationsDescGlobal");
+	print '<br>';
 	print '</div>';
 
-	print '<br><br>'."\n";
-
-
-	// Add notification form
-	print load_fiche_titre($langs->trans("AddNewNotification"), '', '');
-
-	print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$socid.'" method="post">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="add">';
-
-	$param = "&socid=".$socid;
-
-	// Line with titles
-	print '<table width="100%" class="noborder">';
-	print '<tr class="liste_titre">';
-	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
-	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
-	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
-	print_liste_field_titre('');
-	print "</tr>\n";
-
-	$var = false;
-	$listofemails = $object->thirdparty_and_contact_email_array();
-	if (count($listofemails) > 0)
-	{
-		$actions = array();
-
-		// Load array of available notifications
-		$notificationtrigger = new InterfaceNotification($db);
-		$listofmanagedeventfornotification = $notificationtrigger->getListOfManagedEvents();
-
-		foreach ($listofmanagedeventfornotification as $managedeventfornotification)
-		{
- 			$label = ($langs->trans("Notify_".$managedeventfornotification['code']) != "Notify_".$managedeventfornotification['code'] ? $langs->trans("Notify_".$managedeventfornotification['code']) : $managedeventfornotification['label']);
-			$actions[$managedeventfornotification['rowid']] = $label;
-		}
-		print '<tr class="oddeven nohover"><td class="maxwidthonsmartphone">';
-		print img_picto('', 'contact', '', false, 0, 0, '', 'paddingright').$form->selectarray("contactid", $listofemails, '', 0, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
-		print '</td>';
-		print '<td class="maxwidthonsmartphone">';
-		print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$form->selectarray("actionid", $actions, '', 1, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
-		print '</td>';
-		print '<td>';
-		$type = array('email'=>$langs->trans("EMail"));
-		print $form->selectarray("typeid", $type);
-		print '</td>';
-		print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
-		print '</tr>';
-	} else {
-		print '<tr class="oddeven"><td colspan="4" class="opacitymedium">';
-		print $langs->trans("YouMustCreateContactFirst");
-		print '</td></tr>';
-	}
-
-	print '</table>';
-
-
-	print '</form>';
-	print '<br>';
+	print '<br>'."\n";
 
 
 	// List of notifications enabled for contacts
@@ -295,20 +239,60 @@ if ($result > 0)
 		dol_print_error($db);
 	}
 
-	// List of active notifications
-	print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')', '', '');
+
+	// Add notification form
+	print load_fiche_titre($langs->trans("ListOfActiveNotifications").' <span class="opacitymedium colorblack paddingleft">('.$num.')</span>', '', '');
+
+	print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$socid.'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
+
+	$param = "&socid=".$socid;
 
 	// Line with titles
-	print '<table width="100%" class="noborder">';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="centpercent noborder">';
 	print '<tr class="liste_titre">';
-	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
-	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
-	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
-	print_liste_field_titre('', '', '');
-	print '</tr>';
+	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, 'width="45%"', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, 'width="35%"', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, 'width="10%"', $sortfield, $sortorder);
+	print_liste_field_titre('');
+	print "</tr>\n";
+
+	// Line to add a new subscription
+	$listofemails = $object->thirdparty_and_contact_email_array();
+	if (count($listofemails) > 0)
+	{
+		$actions = array();
+
+		// Load array of available notifications
+		$notificationtrigger = new InterfaceNotification($db);
+		$listofmanagedeventfornotification = $notificationtrigger->getListOfManagedEvents();
+
+		foreach ($listofmanagedeventfornotification as $managedeventfornotification)
+		{
+ 			$label = ($langs->trans("Notify_".$managedeventfornotification['code']) != "Notify_".$managedeventfornotification['code'] ? $langs->trans("Notify_".$managedeventfornotification['code']) : $managedeventfornotification['label']);
+			$actions[$managedeventfornotification['rowid']] = $label;
+		}
+		print '<tr class="oddeven nohover">';
+		print '<td class="nowraponall">';
+		print img_picto('', 'contact', '', false, 0, 0, '', 'paddingright').$form->selectarray("contactid", $listofemails, '', 1, 0, 0, '', 0, 0, 0, '', 'minwidth100imp maxwidthonsmartphone');
+		print '</td>';
+		print '<td class="nowraponall">';
+		print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$form->selectarray("actionid", $actions, '', 1, 0, 0, '', 0, 0, 0, '', 'minwidth100imp maxwidthonsmartphone');
+		print '</td>';
+		print '<td>';
+		$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 '</tr>';
+	} else {
+		print '<tr class="oddeven"><td colspan="4" class="opacitymedium">';
+		print $langs->trans("YouMustCreateContactFirst");
+		print '</td></tr>';
+	}
 
-	$langs->load("errors");
-	$langs->load("other");
 
 	if ($num)
 	{
@@ -323,7 +307,9 @@ if ($result > 0)
 			$contactstatic->id = $obj->contact_id;
 			$contactstatic->lastname = $obj->lastname;
 			$contactstatic->firstname = $obj->firstname;
-			print '<tr class="oddeven"><td>'.$contactstatic->getNomUrl(1);
+
+			print '<tr class="oddeven">';
+			print '<td>'.$contactstatic->getNomUrl(1);
 			if ($obj->type == 'email')
 			{
 				if (isValidEmail($obj->email))
@@ -331,11 +317,11 @@ if ($result > 0)
 					print ' &lt;'.$obj->email.'&gt;';
 				} else {
 					$langs->load("errors");
-					print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
+					print ' '.img_warning().' <span class="warning">'.$langs->trans("ErrorBadEMail", $obj->email).'</span>';
 				}
 			}
 			print '</td>';
-			print '<td>';
+			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($label).'">';
 			$label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
 			print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$label;
 			print '</td>';
@@ -355,7 +341,6 @@ if ($result > 0)
     foreach($conf->global as $key => $val)
     {
     	if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue;
-    	$var = ! $var;
 		print '<tr class="oddeven"><td>';
 		$listtmp=explode(',',$val);
 		$first=1;
@@ -372,7 +357,8 @@ if ($result > 0)
 			}
 			else
 			{
-				print ' '.img_warning().' '.$langs->trans("ErrorBadEMail",$valemail);
+				$langs->load("errors");
+				print ' '.img_warning().' <span class="warning">'.$langs->trans("ErrorBadEMail",$valemail).'</span>;
 			}
 		}
 		print '</td>';
@@ -395,14 +381,14 @@ if ($result > 0)
 
 	/*if ($user->admin)
     {
-	    $var = ! $var;
 		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>';
     }*/
 
 	print '</table>';
-
+	print '</div>';
+	print '</form>';
 
 	print '<br><br>'."\n";
 
@@ -458,7 +444,8 @@ if ($result > 0)
 	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
 	// Line with titles
-	print '<table width="100%" class="noborder">';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="centpercent noborder">';
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder);
@@ -517,6 +504,7 @@ if ($result > 0)
 	}
 
 	print '</table>';
+	print '</div>';
 
 	print '</form>';
 } else dol_print_error('', 'RecordNotFound');
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index ee4ca01e7ee..8956a80d0d8 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -6,7 +6,7 @@
  * 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      ptibogxiv            <support@ptibogxiv.net>
+ * Copyright (C) 2018 -2021Thibault 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
@@ -99,7 +99,7 @@ if ($cancel)
 	$action = '';
 }
 
-$parameters = array('id'=>$socid, 'objcanvas'=>$objcanvas);
+$parameters = array('id'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
@@ -937,7 +937,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		{
 			try {
 				$customerstripe = $stripe->customerStripe($object, $stripeacc, $servicestatus);
-				if ($customerstripe->id) {
+				if (!empty($customerstripe->id)) {
 					// When using the Charge API architecture
 					if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
 					{
@@ -957,12 +957,16 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 
 						try {
 							if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
-								$paymentmethodobjs = \Stripe\PaymentMethod::all(array("customer" => $customerstripe->id, "type" => "card"));
+								$paymentmethodobjsA = \Stripe\PaymentMethod::all(array("customer" => $customerstripe->id, "type" => "card"));
+								$paymentmethodobjsB = \Stripe\PaymentMethod::all(array("customer" => $customerstripe->id, "type" => "sepa_debit"));
 							} else {
-								$paymentmethodobjs = \Stripe\PaymentMethod::all(array("customer" => $customerstripe->id, "type" => "card"), array("stripe_account" => $stripeacc));
+								$paymentmethodobjsA = \Stripe\PaymentMethod::all(array("customer" => $customerstripe->id, "type" => "card"), array("stripe_account" => $stripeacc));
+								$paymentmethodobjsB = \Stripe\PaymentMethod::all(array("customer" => $customerstripe->id, "type" => "sepa_debit"), array("stripe_account" => $stripeacc));
 							}
 
-							$listofsources = $paymentmethodobjs->data;
+							if ($paymentmethodobjsA->data != null && $paymentmethodobjsB->data != null) { $listofsources = array_merge((array) $paymentmethodobjsA->data, (array) $paymentmethodobjsB->data);
+							} elseif ($paymentmethodobjsB->data != null) { $listofsources = $paymentmethodobjsB->data; }
+							else { $listofsources = $paymentmethodobjsA->data; }
 						} catch (Exception $e)
 						{
 							$error++;
@@ -1114,22 +1118,21 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						$i++;
 					}
 				}
-			} else dol_print_error($db);
+			} else {
+				dol_print_error($db);
+			}
 		}
 
 		// Show remote sources (not already shown as local source)
-		if (is_array($listofsources) && count($listofsources))
-		{
-			foreach ($listofsources as $src)
-			{
+		if (is_array($listofsources) && count($listofsources)) {
+			foreach ($listofsources as $src) {
 				if (!empty($arrayofstripecard[$src->id])) continue; // Already in previous list
 
 				$nbremote++;
 
 				print '<tr class="oddeven">';
 				// Local ID
-				if (!empty($conf->global->STRIPE_ALLOW_LOCAL_CARD))
-				{
+				if (!empty($conf->global->STRIPE_ALLOW_LOCAL_CARD)) {
 					print '<td>';
 					print '</td>';
 				}
@@ -1142,8 +1145,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				if (!empty($stripeacc)) $connect = $stripeacc.'/';
 				//$url='https://dashboard.stripe.com/'.$connect.'test/sources/'.$src->id;
 				$url = 'https://dashboard.stripe.com/'.$connect.'test/search?query='.$src->id;
-				if ($servicestatus)
-				{
+				if ($servicestatus) {
 					//$url='https://dashboard.stripe.com/'.$connect.'sources/'.$src->id;
 					$url = 'https://dashboard.stripe.com/'.$connect.'search?query='.$src->id;
 				}
@@ -1151,73 +1153,58 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				print '</td>';
 				// Img of credit card
 				print '<td>';
-				if ($src->object == 'card')
-				{
+				if ($src->object == 'card') {
 					print img_credit_card($src->brand);
-				} elseif ($src->object == 'source' && $src->type == 'card')
-				{
+				} elseif ($src->object == 'source' && $src->type == 'card') {
 					print img_credit_card($src->card->brand);
-				} elseif ($src->object == 'source' && $src->type == 'sepa_debit')
-				{
+				} elseif ($src->object == 'source' && $src->type == 'sepa_debit') {
 					print '<span class="fa fa-university fa-2x fa-fw"></span>';
-				} elseif ($src->object == 'payment_method' && $src->type == 'card')
-				{
+				} elseif ($src->object == 'payment_method' && $src->type == 'card') {
 					print img_credit_card($src->card->brand);
-				} elseif ($src->object == 'payment_method' && $src->type == 'sepa_debit')
-				{
+				} elseif ($src->object == 'payment_method' && $src->type == 'sepa_debit') {
 					print '<span class="fa fa-university fa-2x fa-fw"></span>';
 				}
 				print'</td>';
 				// Information
 				print '<td valign="middle">';
-				if ($src->object == 'card')
-				{
+				if ($src->object == 'card') {
 					print '....'.$src->last4.' - '.$src->exp_month.'/'.$src->exp_year.'';
 					print '</td><td>';
-					if ($src->country)
-					{
+					if ($src->country) {
 						$img = picto_from_langcode($src->country);
 						print $img ? $img.' ' : '';
 						print getCountry($src->country, 1);
 					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				} elseif ($src->object == 'source' && $src->type == 'card')
-				{
+				} elseif ($src->object == 'source' && $src->type == 'card') {
 					print '<span class="opacitymedium">'.$src->owner->name.'</span><br>....'.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
 					print '</td><td>';
 
-				 	if ($src->card->country)
-					{
+				 	if ($src->card->country) {
 						$img = picto_from_langcode($src->card->country);
 						print $img ? $img.' ' : '';
 						print getCountry($src->card->country, 1);
 					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				} elseif ($src->object == 'source' && $src->type == 'sepa_debit')
-				{
-					print 'SEPA debit';
+				} elseif ($src->object == 'source' && $src->type == 'sepa_debit') {
+					print '<span class="opacitymedium">'.$src->billing_details->name.'</span><br>....'.$src->sepa_debit->last4;
 					print '</td><td>';
-					if ($src->sepa_debit->country)
-					{
+					if ($src->sepa_debit->country) {
 							$img = picto_from_langcode($src->sepa_debit->country);
 							print $img ? $img.' ' : '';
 							print getCountry($src->sepa_debit->country, 1);
 					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				} elseif ($src->object == 'payment_method' && $src->type == 'card')
-				{
+				} elseif ($src->object == 'payment_method' && $src->type == 'card') {
 					print '<span class="opacitymedium">'.$src->billing_details->name.'</span><br>....'.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
 					print '</td><td>';
 
-					if ($src->card->country)
-					{
+					if ($src->card->country) {
 						$img = picto_from_langcode($src->card->country);
 						print $img ? $img.' ' : '';
 						print getCountry($src->card->country, 1);
 					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				} elseif ($src->object == 'payment_method' && $src->type == 'sepa_debit')
-				{
-					print 'SEPA debit';
+				} elseif ($src->object == 'payment_method' && $src->type == 'sepa_debit') {
+					print '<span class="opacitymedium">'.$src->billing_details->name.'</span><br>....'.$src->sepa_debit->last4;
 					print '</td><td>';
-					if ($src->sepa_debit->country)
-					{
+					if ($src->sepa_debit->country) {
 						$img = picto_from_langcode($src->sepa_debit->country);
 						print $img ? $img.' ' : '';
 						print getCountry($src->sepa_debit->country, 1);
@@ -1229,8 +1216,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				// Default
 				print '<td class="center" width="50">';
 				if ((empty($customerstripe->invoice_settings) && $customerstripe->default_source != $src->id) ||
-					(!empty($customerstripe->invoice_settings) && $customerstripe->invoice_settings->default_payment_method != $src->id))
-				{
+					(!empty($customerstripe->invoice_settings) && $customerstripe->invoice_settings->default_payment_method != $src->id)) {
 					print '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&source='.$src->id.'&action=setassourcedefault&token='.newToken().'">';
 					print img_picto($langs->trans("Default"), 'off');
 					print '</a>';
@@ -1252,8 +1238,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 ($user->rights->societe->creer) {
 					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>';
@@ -1264,10 +1249,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			}
 		}
 
-		if ($nbremote == 0 && $nblocal == 0)
-		{
-			$colspan = 8;
-			if (!empty($conf->global->STRIPE_ALLOW_LOCAL_CARD)) $colspan++;
+		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 "</table>";
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 0afe58ece05..dfcfde06c6c 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -88,6 +88,7 @@ if (empty($reshook))
 
 			// add price by customer
 			$prodcustprice->fk_soc = $socid;
+			$prodcustprice->ref_customer = GETPOST('ref_customer', 'alpha');
 			$prodcustprice->fk_product = GETPOST('prodid', 'int');
 			$prodcustprice->price = price2num(GETPOST("price"), 'MU');
 			$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
@@ -162,6 +163,7 @@ if (empty($reshook))
 		$update_child_soc = GETPOST('updatechildprice');
 
 		// update price by customer
+		$prodcustprice->ref_customer = GETPOST('ref_customer', 'alpha');
 		$prodcustprice->price = price2num(GETPOST("price"), 'MU');
 		$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
 		$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
@@ -298,6 +300,10 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print '</td>';
 		print '</tr>';
 
+		// Ref. Customer
+		print '<tr><td>'.$langs->trans('RefCustomer').'</td>';
+		print '<td><input name="ref_customer" size="12"></td></tr>';
+
 		// VAT
 		print '<tr><td>'.$langs->trans("VATRate").'</td><td>';
 		print $form->load_tva("tva_tx", $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr, '', false, 1);
@@ -376,6 +382,10 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print "<td>".$staticprod->getNomUrl(1)."</td>";
 		print '</tr>';
 
+		// 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>';
+
 		// VAT
 		print '<tr><td>'.$langs->trans("VATRate").'</td><td>';
 		print $form->load_tva("tva_tx", $prodcustprice->tva_tx, $mysoc, '', $staticprod->id, $prodcustprice->recuperableonly);
@@ -465,6 +475,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 			print '<tr class="liste_titre">';
 			print '<td>'.$langs->trans("Product").'</td>';
+			print '<td>'.$langs->trans('RefCustomer').'</td>';
 			print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
 			print '<td class="center">'.$langs->trans("PriceBase").'</td>';
 			print '<td class="right">'.$langs->trans("VAT").'</td>';
@@ -482,6 +493,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 				$staticprod->fetch($line->fk_product);
 
 				print "<td>".$staticprod->getNomUrl(1)."</td>";
+				print '<td>'.$line->ref_customer.'</td>';
 				print "<td>".dol_print_date($line->datec, "dayhour")."</td>";
 
 				print '<td class="center">'.$langs->trans($line->price_base_type)."</td>";
@@ -551,6 +563,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("Ref").'</td>';
 		print '<td>'.$langs->trans("Product").'</td>';
+		print '<td>'.$langs->trans('RefCustomer').'</td>';
 		print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
 		print '<td class="center">'.$langs->trans("PriceBase").'</td>';
 		print '<td class="right">'.$langs->trans("VAT").'</td>';
@@ -567,7 +580,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 			print '<tr class="liste_titre">';
 			print '<td class="liste_titre"><input type="text" class="flat" name="search_prod" value="'.$search_prod.'" size="20"></td>';
 			print '<td class="liste_titre" ><input type="text" class="flat" name="search_label" value="'.$search_label.'" size="20"></td>';
-			print '<td class="liste_titre" colspan="3">&nbsp;</td>';
+			print '<td class="liste_titre" colspan="4">&nbsp;</td>';
 			print '<td class="liste_titre" align="right"><input type="text" class="flat" name="search_price" value="'.$search_price.'" size="10"></td>';
 			print '<td class="liste_titre" align="right"><input type="text" class="flat" name="search_price_ttc" value="'.$search_price_ttc.'" size="10"></td>';
 			print '<td class="liste_titre" colspan="3">&nbsp;</td>';
@@ -590,6 +603,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 				print "<td>".$staticprod->getNomUrl(1)."</td>";
 				print "<td>".$staticprod->label."</td>";
+				print '<td>'.$line->ref_customer.'</td>';
 				print "<td>".dol_print_date($line->datec, "dayhour")."</td>";
 
 				print '<td class="center">'.$langs->trans($line->price_base_type)."</td>";
@@ -627,7 +641,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 				print "</tr>\n";
 			}
 		} else {
-			$colspan = 9;
+			$colspan = 10;
 			if ($user->rights->produit->supprimer || $user->rights->service->supprimer) $colspan += 1;
 			print '<tr class="oddeven"><td colspan="'.$colspan.'">'.$langs->trans('None').'</td></tr>';
 		}
diff --git a/htdocs/societe/tpl/linesalesrepresentative.tpl.php b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
index 4f09bebfe71..1eca5b22623 100644
--- a/htdocs/societe/tpl/linesalesrepresentative.tpl.php
+++ b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
@@ -16,8 +16,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -42,7 +41,9 @@ if ($action == 'editsalesrepresentatives') {
 	print '<input type="hidden" name="socid" value="'.$object->id.'" />';
 	$userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 1);
 	$arrayselected = GETPOST('commercial', 'array');
-	if (empty($arrayselected)) $arrayselected = $object->getSalesRepresentatives($user, 1);
+	if (empty($arrayselected)) {
+		$arrayselected = $object->getSalesRepresentatives($user, 1);
+	}
 	print $form->multiselectarray('commercial', $userlist, $arrayselected, null, null, null, null, "90%");
 	print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'" />';
 	print '</form>';
@@ -62,6 +63,7 @@ if ($action == 'editsalesrepresentatives') {
 			$userstatic->phone = $val['phone'];
 			$userstatic->job = $val['job'];
 			$userstatic->entity = $val['entity'];
+			$userstatic->gender = $val['gender'];
 			print $userstatic->getNomUrl(-1);
 			print ' ';
 		}
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index c304a00ce3f..6a52b57268b 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2017		Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2017		Olivier Geffroy			<jeff@jeffinfo.com>
  * Copyright (C) 2017		Saasprov				<saasprov@gmail.com>
- * Copyright (C) 2018-2019  Thibault FOUCART		<support@ptibogxiv.net>
+ * Copyright (C) 2018-2021  Thibault FOUCART		<support@ptibogxiv.net>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -387,6 +387,21 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
 	print '</td></tr>';
 }
 
+// Activate Bancontact
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
+{
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("STRIPE_BANCONTACT").'</td><td>';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STRIPE_BANCONTACT');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STRIPE_BANCONTACT", $arrval, $conf->global->STRIPE_BANCONTACT);
+	}
+	print ' &nbsp; <span class="opacitymedium">'.$langs->trans("ExampleOnlyForBECustomers").'</span>';
+	print '</td></tr>';
+}
+
 // Activate iDEAL
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
 {
@@ -402,6 +417,36 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
 	print '</td></tr>';
 }
 
+// Activate Giropay
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
+{
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("STRIPE_GIROPAY").'</td><td>';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STRIPE_GIROPAY');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STRIPE_GIROPAY", $arrval, $conf->global->STRIPE_GIROPAY);
+	}
+	print ' &nbsp; <span class="opacitymedium">'.$langs->trans("ExampleOnlyForDECustomers").'</span>';
+	print '</td></tr>';
+}
+
+// Activate Sofort
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
+{
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("STRIPE_SOFORT").'</td><td>';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STRIPE_SOFORT');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STRIPE_SOFORT", $arrval, $conf->global->STRIPE_SOFORT);
+	}
+	print ' &nbsp; <span class="opacitymedium">'.$langs->trans("ExampleOnlyForATBEDEITNLESCustomers").'</span>';
+	print '</td></tr>';
+}
+
 // Warehouse for automatic decrement
 //if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// warehouse to reduce stock for online payment
 //{
@@ -493,7 +538,7 @@ $token = '';
 
 include DOL_DOCUMENT_ROOT.'/core/tpl/onlinepaymentlinks.tpl.php';
 
-print info_admin($langs->trans("ExampleOfTestCreditCard", '4242424242424242 (no 3DSecure) or 4000000000003063 (3DSecure required) or 4000002760003184 (3DSecure2 required on all transaction) or 4000003800000446 (3DSecure2 required the off-seesion allowed)', '4000000000000101', '4000000000000069', '4000000000000341'));
+print info_admin($langs->trans("ExampleOfTestCreditCard", '4242424242424242 (no 3DSecure) or 4000000000003063 (3DSecure required) or 4000002760003184 (3DSecure2 required on all transaction) or 4000003800000446 (3DSecure2 required, the off-session allowed)', '4000000000000101', '4000000000000069', '4000000000000341'));
 
 if (!empty($conf->use_javascript_ajax))
 {
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index db225196ea7..259e1cea935 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2018-2019 	Thibault FOUCART       <support@ptibogxiv.net>
+/* Copyright (C) 2018-2021 	Thibault FOUCART       <support@ptibogxiv.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -317,15 +317,15 @@ class Stripe extends CommonObject
 	 * @param	int		$mode		                        automatic=automatic confirmation/payment when conditions are ok, manual=need to call confirm() on intent
 	 * @param   boolean $confirmnow                         false=default, true=try to confirm immediatly after create (if conditions are ok)
 	 * @param   string  $payment_method                     'pm_....' (if known)
-	 * @param   string  $off_session                        If we use an already known payment method to pay off line.
+	 * @param   string  $off_session                        If we use an already known payment method to pay when customer is not available during the checkout flow.
 	 * @param	string	$noidempotency_key					Do not use the idempotency_key when creating the PaymentIntent
 	 * @return 	\Stripe\PaymentIntent|null 			        Stripe PaymentIntent or null if not found and failed to create
 	 */
-	public function getPaymentIntent($amount, $currency_code, $tag, $description = '', $object = null, $customer = null, $key = null, $status = 0, $usethirdpartyemailforreceiptemail = 0, $mode = 'automatic', $confirmnow = false, $payment_method = null, $off_session = 0, $noidempotency_key = 0)
+	public function getPaymentIntent($amount, $currency_code, $tag, $description = '', $object = null, $customer = null, $key = null, $status = 0, $usethirdpartyemailforreceiptemail = 0, $mode = 'automatic', $confirmnow = false, $payment_method = null, $off_session = 0, $noidempotency_key = 1)
 	{
 		global $conf, $user;
 
-		dol_syslog("getPaymentIntent", LOG_INFO, 1);
+		dol_syslog(get_class($this)."::getPaymentIntent", LOG_INFO, 1);
 
 		$error = 0;
 
@@ -397,6 +397,7 @@ class Stripe extends CommonObject
 
 		if (empty($paymentintent))
 		{
+			// Try to create intent. See https://stripe.com/docs/api/payment_intents/create
 			$ipaddress = getUserRemoteIP();
 			$metadata = array('dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress);
 			if (is_object($object))
@@ -409,7 +410,10 @@ class Stripe extends CommonObject
 			// list of payment method types
 			$paymentmethodtypes = array("card");
 			if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) $paymentmethodtypes[] = "sepa_debit"; //&& ($object->thirdparty->isInEEC())
-			if (!empty($conf->global->STRIPE_IDEAL)) $paymentmethodtypes[] = "ideal"; //&& ($object->thirdparty->isInEEC())
+			if (!empty($conf->global->STRIPE_BANCONTACT)) $paymentmethodtypes[] = "bancontact";
+			if (!empty($conf->global->STRIPE_IDEAL)) $paymentmethodtypes[] = "ideal";
+			if (!empty($conf->global->STRIPE_GIROPAY)) $paymentmethodtypes[] = "giropay";
+			if (!empty($conf->global->STRIPE_SOFORT)) $paymentmethodtypes[] = "sofort";
 
 			$dataforintent = array(
 				"confirm" => $confirmnow, // Do not confirm immediatly during creation of intent
@@ -430,8 +434,13 @@ class Stripe extends CommonObject
 			if ($off_session)
 			{
 				unset($dataforintent['setup_future_usage']);
+				// We can't use both "setup_future_usage" = "off_session" and "off_session" = true.
+				// Because $off_session parameter is dedicated to create paymentintent off_line (and not future payment), we need to use "off_session" = true.
+				//$dataforintent["setup_future_usage"] = "off_session";
 				$dataforintent["off_session"] = true;
 			}
+			if (!empty($conf->global->STRIPE_GIROPAY)) unset($dataforintent['setup_future_usage']);
+
 			if (!is_null($payment_method))
 			{
 				$dataforintent["payment_method"] = $payment_method;
@@ -460,6 +469,9 @@ class Stripe extends CommonObject
 				if (!empty($key)) {				// If the Stripe connect account not set, we use common API usage
 					$arrayofoptions["stripe_account"] = $key;
 				}
+
+				dol_syslog("dataforintent to create paymentintent = ".var_export($dataforintent, true));
+
 				$paymentintent = \Stripe\PaymentIntent::create($dataforintent, $arrayofoptions);
 
 				// Store the payment intent
@@ -522,10 +534,9 @@ class Stripe extends CommonObject
 			}
 		}
 
-		dol_syslog("getPaymentIntent return error=".$error." this->error=".$this->error, LOG_INFO, -1);
+		dol_syslog(get_class($this)."::getPaymentIntent return error=".$error." this->error=".$this->error, LOG_INFO, -1);
 
-		if (!$error)
-		{
+		if (!$error) {
 			return $paymentintent;
 		} else {
 			return null;
@@ -578,7 +589,10 @@ class Stripe extends CommonObject
 			// list of payment method types
 			$paymentmethodtypes = array("card");
 			if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) $paymentmethodtypes[] = "sepa_debit"; //&& ($object->thirdparty->isInEEC())
-			// iDEAL not supported with setupIntent
+			if (!empty($conf->global->STRIPE_BANCONTACT)) $paymentmethodtypes[] = "bancontact";
+			if (!empty($conf->global->STRIPE_IDEAL)) $paymentmethodtypes[] = "ideal";
+			// Giropay not possible for setup intent
+			if (!empty($conf->global->STRIPE_SOFORT)) $paymentmethodtypes[] = "sofort";
 
 			$dataforintent = array(
 				"confirm" => $confirmnow, // Do not confirm immediatly during creation of intent
@@ -922,7 +936,7 @@ class Stripe extends CommonObject
 					dol_syslog("* createPaymentStripe get stripeacc", LOG_DEBUG);
 					$stripeacc = $stripe->getStripeAccount($service); // Get Stripe OAuth connect account if it exists (no network access here)
 
-					dol_syslog("* createPaymentStripe Create payment on card ".$stripecard->id.", amounttopay=".$amounttopay.", amountstripe=".$amountstripe.", FULLTAG=".$FULLTAG, LOG_DEBUG);
+					dol_syslog("* createPaymentStripe Create payment for customer ".$customer->id." on source card ".$stripecard->id.", amounttopay=".$amounttopay.", amountstripe=".$amountstripe.", FULLTAG=".$FULLTAG, LOG_DEBUG);
 
 					// Create payment intent and charge payment (confirmnow = true)
 					$paymentintent = $stripe->getPaymentIntent($amounttopay, $currency, $FULLTAG, $description, $invoice, $customer->id, $stripeacc, $servicestatus, 0, 'automatic', true, $stripecard->id, 1);
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index a571a207bc5..92d38c519de 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -263,8 +263,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_percent = GETPOST('remise_percent');
-					$object->remise_absolue = GETPOST('remise_absolue');
+					$object->remise_percent = price2num(GETPOST('remise_percent'), 2);
+					$object->remise_absolue = price2num(GETPOST('remise_absolue'), 'MU');
 					$object->socid = GETPOST('socid');
 					$object->fk_project = GETPOST('projectid', 'int');
 					$object->model_pdf = GETPOST('model');
@@ -555,9 +555,9 @@ if (empty($reshook))
 			$tva_tx = '';
 		}
 
-		$qty = price2num(GETPOST('qty'.$predef), 'alpha');
-		$remise_percent = GETPOST('remise_percent'.$predef);
-		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CR');
+		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
+		$remise_percent = price2num(GETPOST('remise_percent'.$predef), 2);
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU');
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -869,7 +869,7 @@ if (empty($reshook))
 		}
 
 		$price_base_type = 'HT';
-		$pu_ht_devise = GETPOST('multicurrency_subprice');
+		$pu_ht_devise = price2num(GETPOST('multicurrency_subprice'), 'CU');
 
 		// Add buying price
 		$fournprice = (GETPOST('fournprice') ? GETPOST('fournprice') : '');
@@ -929,10 +929,10 @@ if (empty($reshook))
 			$fk_unit = GETPOST('units');
 
 			$result = $object->updateline(
-				GETPOST('lineid'),
+				GETPOST('lineid', 'int'),
 				$ht,
-				GETPOST('qty'),
-				GETPOST('remise_percent'),
+				price2num(GETPOST('qty'), 'MS'),
+				price2num(GETPOST('remise_percent'), 2),
 				$vat_rate,
 				$localtax1_rate,
 				$localtax2_rate,
@@ -940,7 +940,7 @@ if (empty($reshook))
 				$price_base_type,
 				$info_bits,
 				$special_code,
-				GETPOST('fk_parent_line'),
+				GETPOST('fk_parent_line', 'int'),
 				0,
 				$fournprice,
 				$buyingprice,
@@ -1018,9 +1018,9 @@ if (empty($reshook))
 	elseif ($action == 'setconditions' && $usercancreate) {
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
 	} elseif ($action == 'setremisepercent' && $usercancreate) {
-		$result = $object->set_remise_percent($user, GETPOST('remise_percent', 'alpha'));
+		$result = $object->set_remise_percent($user, price2num(GETPOST('remise_percent'), 2));
 	} elseif ($action == 'setremiseabsolue' && $usercancreate) {
-		$result = $object->set_remise_absolue($user, GETPOST('remise_absolue', 'alpha'));
+		$result = $object->set_remise_absolue($user, price2num(GETPOST('remise_absolue'), 'MU'));
 	}
 
 	// Payment mode
@@ -1151,7 +1151,7 @@ if ($action == 'create')
 		print '</td>';
 	} else {
 		print '<td colspan="2">';
-		print $form->select_company('', 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
+		print img_picto('', 'company').$form->select_company('', 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		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>';
 	}
@@ -1216,8 +1216,9 @@ if ($action == 'create')
 	print '<tr>';
 	print '<td>'.$langs->trans("DefaultModel").'</td>';
 	print '<td colspan="2">';
-	$liste = ModelePDFSupplierProposal::liste_modeles($db);
-	print $form->selectarray('model', $liste, ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT : $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF));
+	$list = ModelePDFSupplierProposal::liste_modeles($db);
+	$preselected = ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT : $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF);
+	print $form->selectarray('model', $list, $preselected, 0, 0, 0, '', 0, 0, 0, '', '', 1);
 	print "</td></tr>";
 
 	// Project
@@ -1231,8 +1232,7 @@ if ($action == 'create')
 
 		print '<tr>';
 		print '<td>'.$langs->trans("Project").'</td><td colspan="2">';
-
-		$numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
+		print img_picto('', 'project').$formproject->select_projects(($soc->id > 0 ? $soc->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='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 
 		print '</td>';
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index a939b95ffca..405c34734f3 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -481,12 +481,14 @@ class SupplierProposal extends CommonObject
 						if ($result < -1)
 						{
 							$this->error = $prod->error;
+			                $this->errors = $prod->errors;
 							$this->db->rollback();
 							dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
 							return -1;
 						}
 					} else {
 						$this->error = $prod->error;
+		                $this->errors = $prod->errors;
 						$this->db->rollback();
 						return -1;
 					}
@@ -622,12 +624,14 @@ class SupplierProposal extends CommonObject
 					$this->db->commit();
 					return $this->line->id;
 				} else {
-					$this->error = $this->db->error();
+					$this->error = $this->error();
+					$this->errors = $this->errors();
 					$this->db->rollback();
 					return -1;
 				}
 			} else {
 				$this->error = $this->line->error;
+                $this->errors = $this->line->errors;
 				$this->db->rollback();
 				return -2;
 			}
@@ -1699,13 +1703,13 @@ class SupplierProposal extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED : (empty($this->modelpdf) ? '' : $this->modelpdf);
+			$modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED : (empty($this->model_pdf) ? '' : $this->model_pdf);
 			$triggerName = 'PROPOSAL_SUPPLIER_CLOSE_REFUSED';
 
 			if ($status == 2)
 			{
 				$triggerName = 'PROPOSAL_SUPPLIER_CLOSE_SIGNED';
-				$modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL : (empty($this->modelpdf) ? '' : $this->modelpdf);
+				$modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL : (empty($this->model_pdf) ? '' : $this->model_pdf);
 
 				if (!empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL))     // TODO This option was not tested correctly. Error if product ref does not exists
 				{
@@ -2183,16 +2187,16 @@ class SupplierProposal extends CommonObject
 		{
 			global $langs;
 			$langs->load("supplier_proposal");
-			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans("SupplierProposalStatusDraft");
-			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans("SupplierProposalStatusValidated");
-			$this->labelStatus[self::STATUS_SIGNED] = $langs->trans("SupplierProposalStatusSigned");
-			$this->labelStatus[self::STATUS_NOTSIGNED] = $langs->trans("SupplierProposalStatusNotSigned");
-			$this->labelStatus[self::STATUS_CLOSE] = $langs->trans("SupplierProposalStatusClosed");
-			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans("SupplierProposalStatusDraftShort");
-			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans("Opened");
-			$this->labelStatusShort[self::STATUS_SIGNED] = $langs->trans("SupplierProposalStatusSignedShort");
-			$this->labelStatusShort[self::STATUS_NOTSIGNED] = $langs->trans("SupplierProposalStatusNotSignedShort");
-			$this->labelStatusShort[self::STATUS_CLOSE] = $langs->trans("SupplierProposalStatusClosedShort");
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv("SupplierProposalStatusDraft");
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv("SupplierProposalStatusValidated");
+			$this->labelStatus[self::STATUS_SIGNED] = $langs->transnoentitiesnoconv("SupplierProposalStatusSigned");
+			$this->labelStatus[self::STATUS_NOTSIGNED] = $langs->transnoentitiesnoconv("SupplierProposalStatusNotSigned");
+			$this->labelStatus[self::STATUS_CLOSE] = $langs->transnoentitiesnoconv("SupplierProposalStatusClosed");
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv("SupplierProposalStatusDraftShort");
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv("Opened");
+			$this->labelStatusShort[self::STATUS_SIGNED] = $langs->transnoentitiesnoconv("SupplierProposalStatusSignedShort");
+			$this->labelStatusShort[self::STATUS_NOTSIGNED] = $langs->transnoentitiesnoconv("SupplierProposalStatusNotSignedShort");
+			$this->labelStatusShort[self::STATUS_CLOSE] = $langs->transnoentitiesnoconv("SupplierProposalStatusClosedShort");
 		}
 
 		$statusnew = '';
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index d74f2fbdec3..9826c2a409d 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -249,7 +249,7 @@ $help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
 //llxHeader('',$langs->trans('CommRequest'),$help_url);
 
 $sql = 'SELECT';
-if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
+if ($sall || $search_product_category > 0 || $search_user > 0) $sql = 'SELECT DISTINCT';
 $sql .= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
@@ -294,7 +294,7 @@ if ($search_town)  $sql .= natural_search('s.town', $search_town);
 if ($search_zip)   $sql .= natural_search("s.zip", $search_zip);
 if ($search_state) $sql .= natural_search("state.nom", $search_state);
 if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
-if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
+if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
 if ($search_ref)     $sql .= natural_search('sp.ref', $search_ref);
 if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
 if ($search_login)  $sql .= natural_search('u.login', $search_login);
@@ -395,6 +395,7 @@ if ($resql)
 	if ($socid > 0)          $param .= '&socid='.urlencode($socid);
 	if ($search_status != '') $param .= '&search_status='.urlencode($search_status);
 	if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+	if ($search_type_thirdparty != '' && $search_type_thirdparty > 0)   $param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -518,7 +519,7 @@ if ($resql)
 	if (!empty($arrayfields['typent.code']['checked']))
 	{
 		print '<td class="liste_titre maxwidthonsmartphone center">';
-		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
+		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 		print '</td>';
 	}
 	// Date
diff --git a/htdocs/takepos/admin/appearance.php b/htdocs/takepos/admin/appearance.php
index baceed47f3e..eb956ea9f32 100644
--- a/htdocs/takepos/admin/appearance.php
+++ b/htdocs/takepos/admin/appearance.php
@@ -47,7 +47,7 @@ if (GETPOST('action', 'alpha') == 'set')
 
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
diff --git a/htdocs/takepos/admin/other.php b/htdocs/takepos/admin/other.php
index 6874665ace7..e0beeedf502 100644
--- a/htdocs/takepos/admin/other.php
+++ b/htdocs/takepos/admin/other.php
@@ -86,7 +86,7 @@ if (GETPOST('action', 'alpha') == 'set') {
 
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
 	if (!$error) {
 		$db->commit();
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 30a9d45ad5a..01873d317c4 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -52,7 +52,7 @@ if (GETPOST('action', 'alpha') == 'set')
 
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 84efe32839e..f3c17f6ee23 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -85,7 +85,7 @@ if ($action == 'set')
 
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
@@ -97,7 +97,7 @@ if ($action == 'set')
 	$maskconst = GETPOST('maskconst', 'alpha');
 	$maskvalue = GETPOST('maskvalue', 'alpha');
 	if ($maskconst) $res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 	}
 } elseif ($action == 'setrefmod') {
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index d8ad03a057c..ed4ef31af36 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -101,7 +101,7 @@ if (GETPOST('action', 'alpha') == 'set')
 
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
 
-	if (!$res > 0) $error++;
+	if (!($res > 0)) $error++;
 
  	if (!$error)
 	{
diff --git a/htdocs/takepos/freezone.php b/htdocs/takepos/freezone.php
index 4cca5816fab..f8ed00c5590 100644
--- a/htdocs/takepos/freezone.php
+++ b/htdocs/takepos/freezone.php
@@ -95,7 +95,7 @@ top_htmlhead($head, '', 0, 0, $arrayofjs, $arrayofcss);
 	 */
 	function Save() {
 		console.log("We click so we call page invoice.php with place=<?php echo $place; ?> tva_tx="+vatRate);
-		$.get( "invoice.php", { action: "<?php echo $action; ?>", place: "<?php echo $place; ?>", desc:$('#desc').val(), number:$('#number').val(), tva_tx: vatRate} );
+		parent.$("#poslines").load("invoice.php?action=freezone&place=<?php echo $place; ?>&number="+$('#number').val()+"&tva_tx="+vatRate, {desc:$('#desc').val()});
 		parent.$.colorbox.close();
 	}
 
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index ec012a8ddcd..a08df6d2b43 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -40,6 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Bar or Restaurant or multiple sales
 $action = GETPOST('action', 'aZ09');
@@ -475,7 +476,7 @@ function Floors() {
 
 function FreeZone() {
 	console.log("Open box to enter a free product");
-	$.colorbox({href:"freezone.php?action=freezone&place="+place, onClosed: function () { Refresh(); },width:"80%", height:"200px", transition:"none", iframe:"true", title:"<?php echo $langs->trans("FreeZone"); ?>"});
+	$.colorbox({href:"freezone.php?action=freezone&place="+place, width:"80%", height:"200px", transition:"none", iframe:"true", title:"<?php echo $langs->trans("FreeZone"); ?>"});
 }
 
 function TakeposOrderNotes() {
@@ -776,11 +777,10 @@ $( document ).ready(function() {
 	{
 		print "ModalBox('ModalTerminal');";
 	}
-	if ($conf->global->TAKEPOS_CONTROL_CASH_OPENING)
-	{
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE ";
-		$sql .= "date(date_creation) = CURDATE() ";
-		$sql .= "";
+	if ($conf->global->TAKEPOS_CONTROL_CASH_OPENING) {
+	    $sql = "SELECT rowid, status FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE";
+	    $sql .= " entity = ".$conf->entity." AND ";
+	    $sql .= " date_creation > '".$db->idate(dol_get_first_hour(dol_now()))."'";
 		$resql = $db->query($sql);
 		if ($resql) {
 			$obj = $db->fetch_object($resql);
@@ -1026,8 +1026,9 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
 	);
 }
 
-$sql = "SELECT rowid, status FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE ";
-$sql .= "date(date_creation) = CURDATE() ";
+$sql = "SELECT rowid, status, entity FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE";
+$sql .= " entity = ".$conf->entity." AND ";
+$sql .= " date_creation > '".$db->idate(dol_get_first_hour(dol_now()))."'";
 $resql = $db->query($sql);
 if ($resql)
 {
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 33c00190655..8ca516288c1 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -270,7 +270,7 @@ if ($action == 'valid' && $user->rights->facture->creer)
 
 		if ($remaintopay == 0) {
 			dol_syslog("Invoice is paid, so we set it to status Paid");
-			$result = $invoice->set_paid($user);
+			$result = $invoice->setPaid($user);
 			if ($result > 0) $invoice->paye = 1;
 			// set payment method
 			$invoice->setPaymentMethods($paiementid);
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index 364723e2152..d6a2251b390 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -58,7 +58,9 @@ div.tabsActionNoBottom > a.butAction, div.tabsActionNoBottom > a.butActionRefuse
 span.butAction, span.butActionDelete {
     cursor: pointer;
 }
-
+.paginationafterarrows .butAction {
+    font-size: 0.9em;
+}
 .butAction {
     background: var(--butactionbg);
     color: #FFF !important;
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 79e327dd818..d39e7a3e1b5 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -125,6 +125,10 @@ th.liste_titre a div div:hover, th.liste_titre_sel a div div:hover { text-decora
 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; }
 /* th.liste_titre_sel a, th.liste_titre a, td.liste_titre_sel a, td.liste_titre a { color: #766; } */
+
+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);
@@ -174,9 +178,12 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
 
 input {
     line-height: 1.3em;
-	padding: 5px;
+	padding: 4px;
 	padding-left: 5px;
 }
+.liste_titre input {
+	padding: 5px;
+}
 select {
 	padding-top: 5px;
 	padding-right: 4px;
@@ -440,8 +447,12 @@ input:-webkit-autofill {
 	background-image:none !important;
 	-webkit-box-shadow: 0 0 0 50px #FDFFF0 inset;
 }
-::-webkit-input-placeholder { color:#ccc; }
-input:-moz-placeholder { color:#ccc; }
+
+/* CSS for placeholder */
+.placeholder { color: #ccc; }
+::-webkit-input-placeholder { color: #ccc; }
+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; }
 .legendforfieldsetstep { padding-bottom: 10px; }
@@ -670,6 +681,15 @@ textarea.centpercent {
 .nounderline {
     text-decoration: none;
 }
+.nopadding {
+	padding: 0;
+}
+.nopaddingleft {
+	padding-left: 0;
+}
+.nopaddingright {
+	padding-right: 0;
+}
 .paddingleft {
 	padding-<?php print $left; ?>: 4px;
 }
@@ -787,12 +807,24 @@ span.fa.fa-plus-circle.paddingleft {
 {
 	border-right: 1px solid #DDD;
 }
+.borderleftlight
+{
+	border-left: 1px solid #DDD;
+}
 #formuserfile {
 	margin-top: 4px;
 }
 #formuserfile input[type='file'] {
     font-size: 1em;
+    /* opacity: 0.5em; */
 }
+/*#formuserfile input[type='file']:valid {
+	color: #a00;
+}
+#formuserfile input[type='file']:empty {
+	color: #0a0;
+}*/
+
 #formuserfile_link {
 	margin-left: 1px;
 }
@@ -1304,11 +1336,11 @@ table[summary="list_of_modules"] .fa-cog {
     .minwidth500imp { min-width: 250px !important; }
 }
 
-select.widthcentpercentminusx, input.widthcentpercentminusx {
+select.widthcentpercentminusx, span.widthcentpercentminusx:not(.select2-selection), input.widthcentpercentminusx {
 	width: calc(100% - 52px) !important;
 	display: inline-block;
 }
-select.widthcentpercentminusxx, input.widthcentpercentminusxx {
+select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-selection), input.widthcentpercentminusxx {
 	width: calc(100% - 70px) !important;
 	display: inline-block;
 }
@@ -1915,6 +1947,12 @@ span.widthpictotitle.pictotitle {
 .tagtdnote span.pictoedit {
     opacity: 0.4;
 }
+.pictofixedwidth {
+    text-align: left;
+    width: 18px;
+    padding-right: 0;
+}
+
 .colorthumb {
 	padding-left: 1px !important;
 	padding-right: 1px;
@@ -2568,6 +2606,9 @@ img.userphotosmall {			/* size for user photo in lists */
 img.userphoto[alt="Gravatar avatar"], img.photouserphoto.dropdown-user-image[alt="Gravatar avatar"] {
     background: #fff;
 }
+form[name="addtime"] img.userphoto {
+    border: 1px solid #444;
+}
 .span-icon-user {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png', 1); ?>);
 	background-repeat: no-repeat;
@@ -3043,6 +3084,9 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
 .smallpaddingimp {
     padding: 4px !important;
 }
+input.button.smallpaddingimp {
+    font-size: 0.8em;
+}
 .nopaddingleft {
 	padding-<?php print $left; ?>: 0px;
 }
@@ -3269,6 +3313,12 @@ td.borderright {
 	border-right-color: #BBB !important;
 	border-right-style: solid !important;
 }
+td.borderleft {
+    border: none;	/* to erase value for table.nobordernopadding td */
+	border-left-width: 1px !important;
+	border-left-color: #BBB !important;
+	border-left-style: solid !important;
+}
 
 
 /* For table with no filter before */
@@ -3388,13 +3438,13 @@ div.pagination li:first-child span {
   border-bottom-left-radius: 4px;*/
 }
 
-div.pagination li a:hover,
-div.pagination li:not(.paginationafterarrows,.title-button) span:hover,
+/*div.pagination li a:hover,
+div.pagination li:not(.paginationbeforearrows,.paginationafterarrows,.title-button) span:hover,
 div.pagination li a:focus,
-div.pagination li:not(.paginationafterarrows,.title-button) span:focus {
+div.pagination li:not(.paginationbeforearrows,.paginationafterarrows,.title-button) span:focus {
   -webkit-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
   box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
-}
+}*/
 div.pagination li .active a,
 div.pagination li .active span,
 div.pagination li .active a:hover,
@@ -4127,7 +4177,7 @@ div.boximport {
 
 .fieldrequired { font-weight: bold; color: var(--fieldrequiredcolor) !important; }
 
-td.widthpictotitle { width: 26px; text-align: <?php echo $left; ?>; }
+td.widthpictotitle { width: 38px; text-align: <?php echo $left; ?>; }
 span.widthpictotitle { font-size: 1.7em; }
 table.titlemodulehelp tr td img.widthpictotitle { width: 80px; }
 
@@ -4372,6 +4422,16 @@ div.ui-tooltip.mytooltip {
 /* Calendar                                                                       */
 /* ============================================================================== */
 
+/*div.divfordateinput img.ui-datepicker-trigger {
+    float: left;
+    display: inline-block;
+    vertical-align: middle;
+    padding-top: 10px;
+}
+.hasDatepicker {
+    padding-bottom: 6px;
+}*/
+
 .ui-datepicker-calendar .ui-state-default, .ui-datepicker-calendar .ui-widget-content .ui-state-default,
 .ui-datepicker-calendar .ui-widget-header .ui-state-default, .ui-datepicker-calendar .ui-button,
 html .ui-datepicker-calendar .ui-button.ui-state-disabled:hover, html .ui-button.ui-state-disabled:active
@@ -5629,6 +5689,8 @@ a span.select2-chosen
 }
 span#select2-boxbookmark-container, span#select2-boxcombo-container {
     text-align: <?php echo $left; ?>;
+}
+span#select2-boxbookmark-container {
     opacity: 0.4;
 }
 .select2-container .select2-selection--single .select2-selection__rendered {
@@ -6540,6 +6602,15 @@ div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before
 }
 
 
+/* ============================================================================== */
+/* For copypaste feature                                                          */
+/* ============================================================================== */
+
+.clipboardCPShowOnHover .clipboardCPButton {
+	display: none;
+}
+
+
 /* ============================================================================== */
 /* CSS style used for small screen                                                */
 /* ============================================================================== */
diff --git a/htdocs/theme/eldy/manifest.json.php b/htdocs/theme/eldy/manifest.json.php
index d7f01b3375e..8af5af5a756 100644
--- a/htdocs/theme/eldy/manifest.json.php
+++ b/htdocs/theme/eldy/manifest.json.php
@@ -26,7 +26,6 @@
  */
 
 if (!defined('NOREQUIREUSER'))   define('NOREQUIREUSER', '1');
-if (!defined('NOREQUIREDB'))     define('NOREQUIREDB', '1');
 if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
 if (!defined('NOREQUIRETRAN'))   define('NOREQUIRETRAN', '1');
 if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', '1');
@@ -38,22 +37,86 @@ if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
 
 require_once __DIR__.'/../../main.inc.php';
 
-$appli = constant('DOL_APPLICATION_TITLE');
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli = $conf->global->MAIN_APPLICATION_TITLE;
 
 top_httphead('text/json');
 
-?>
-{
-    "name": "<?php echo $appli; ?>",
-    "icons": [
-        {
-            "src": "<?php echo DOL_URL_ROOT.'/theme/dolibarr_256x256_color.png'; ?>",
-            "sizes": "256x256",
-            "type": "image/png"
-        }
-    ],
-    "theme_color": "#ffffff",
-    "background_color": "#ffffff",
-    "display": "standalone"
-}
\ No newline at end of file
+
+$manifest = new stdClass();
+
+
+$manifest->name = constant('DOL_APPLICATION_TITLE');
+if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $manifest->name = $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->display = "standalone";
+$manifest->splash_pages = null;
+$manifest->icons = array();
+
+if (!empty($conf->global->MAIN_MANIFEST_APPLI_LOGO_URL)){
+	$icon = new stdClass();
+	$icon->src = $conf->global->MAIN_MANIFEST_APPLI_LOGO_URL;
+	if ($conf->global->MAIN_MANIFEST_APPLI_LOGO_URL_SIZE) { $icon->sizes = $conf->global->MAIN_MANIFEST_APPLI_LOGO_URL_SIZE."x".$conf->global->MAIN_MANIFEST_APPLI_LOGO_URL_SIZE; }
+	else { $icon->sizes = "512x512"; }
+	$icon->type = "image/png";
+	$manifest->icons[] = $icon;
+}
+elseif (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED)){
+	if (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI)){
+		$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){
+				$icon = new stdClass();
+				$icon->src = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode($iconRelativePath);
+				$icon->sizes = $imgSize[0]."x".$imgSize[1];
+				$icon->type = "image/png";
+				$manifest->icons[] = $icon;
+			}
+		}
+	}
+
+	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;
+		if (is_readable($iconPath)) {
+			$imgSize = getimagesize($iconPath);
+			if ($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];
+				$icon->type = "image/png";
+				$manifest->icons[] = $icon;
+			}
+		}
+	}
+
+	if (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED)){
+		$iconRelativePath 	= 'logos/'.$conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED;
+		$iconPath 	= $conf->mycompany->dir_output.'/'.$iconRelativePath;
+		if (is_readable($iconPath)) {
+			$imgSize = getimagesize($iconPath);
+			if ($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];
+				$icon->type = "image/png";
+				$manifest->icons[] = $icon;
+			}
+		}
+	}
+}
+
+// Add Dolibarr std icon
+if (empty($manifest->icons)){
+	$icon = new stdClass();
+	$icon->src = DOL_URL_ROOT.'/theme/dolibarr_256x256_color.png';
+	$icon->sizes = "256x256";
+	$icon->type = "image/png";
+	$manifest->icons[] = $icon;
+}
+
+
+print json_encode($manifest);
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 0f251bb3067..623ecb2a779 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -297,6 +297,9 @@ a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; fo
 a:hover { text-decoration: underline; color: rgb(<?php print $colortextlink; ?>); }
 a.commonlink { color: rgb(<?php print $colortextlink; ?>) !important; text-decoration: none; }
 
+input {
+	font-size: unset;
+}
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
     background-color: #FDFDFD;
 }
@@ -568,11 +571,15 @@ input:-webkit-autofill {
 	background-image:none !important;
 	-webkit-box-shadow: 0 0 0 50px #FBFFEA inset;
 }
+
+/* CSS for placeholder */
+.placeholder { color: #ccc; }
 ::-webkit-input-placeholder { color:#ccc; }
 :-moz-placeholder { color:#bbb; } 			/* firefox 18- */
 ::-moz-placeholder { color:#bbb; } 			/* firefox 19+ */
 :-ms-input-placeholder { color:#ccc; } 		/* ie */
 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; }
 .legendforfieldsetstep { padding-bottom: 10px; }
@@ -770,6 +777,15 @@ textarea.centpercent {
 .nounderline {
     text-decoration: none;
 }
+.nopadding {
+	padding: 0;
+}
+.nopaddingleft {
+	padding-left: 0;
+}
+.nopaddingright {
+	padding-right: 0;
+}
 .paddingleft {
 	padding-<?php print $left; ?>: 4px;
 }
@@ -859,6 +875,11 @@ body[class*="colorblind-"] .text-success{
 {
 	border-right: 1px solid #f4f4f4;
 }
+.borderleftlight
+{
+	border-left: 1px solid #f4f4f4;
+}
+
 #formuserfile {
 	margin-top: 4px;
 }
@@ -1295,7 +1316,7 @@ table[summary="list_of_modules"] .fa-cog {
     .minwidth500imp { min-width: 250px !important; }
 }
 
-/* Set a width. Note: add also a max-width that will be used in priority */ 
+/* Set a width. Note: add also a max-width, for example maxwidth500, that will be used in priority */
 .widthcentpercentminusx {
 	width: calc(100% - 50px) !important;
 	display: inline-block;
@@ -1335,7 +1356,7 @@ table[summary="list_of_modules"] .fa-cog {
     	padding-left: 0;
     }
     .login_table input#username, .login_table input#password, .login_table input#securitycode {
-		margin-left: 5px !important;    
+		margin-left: 5px !important;
     }
 	div#login_left, div#login_right {
 	    min-width: 150px !important;
@@ -1850,6 +1871,11 @@ div.nopadding {
 img.hideonsmartphone.pictoactionview {
     vertical-align: bottom;
 }
+.pictofixedwidth {
+    text-align: left;
+    width: 16px;
+}
+
 .colorthumb {
 	padding-left: 1px !important;
 	padding-right: 1px;
@@ -2383,7 +2409,7 @@ form#login {
     border-radius: 2px;
 }
 .login_table .tdinputlogin {
-	border-bottom: 1px solid #ccc; 
+	border-bottom: 1px solid #ccc;
 }
 .login_table .tdinputlogin .fa {
 	padding-left: 10px;
@@ -2559,6 +2585,9 @@ img.userphotosmall {			/* size for user photo in lists */
 img.userphoto[alt="Gravatar avatar"] {
     background: #fff;
 }
+form[name="addtime"] img.userphoto {
+    border: 1px solid #444;
+}
 .span-icon-user {
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/object_user.png', 1); ?>);
 	background-repeat: no-repeat;
@@ -3230,6 +3259,12 @@ td.borderright {
 	border-right-color: #BBB !important;
 	border-right-style: solid !important;
 }
+td.borderleft {
+    border: none;	/* to erase value for table.nobordernopadding td */
+	border-left-width: 1px !important;
+	border-left-color: #BBB !important;
+	border-left-style: solid !important;
+}
 
 /* For table with no filter before */
 table.listwithfilterbefore {
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 84bec78bf30..6d14d29202f 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -586,16 +586,16 @@ if (empty($reshook)) {
 
 		if (!$error) {
 			$result = $object->insertExtraFields(empty($triggermodname) ? '' : $triggermodname, $user);
-			if ($result > 0) {
-				setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-				$action = 'view';
-			} else {
-				$error++;
-				setEventMessages($object->error, $object->errors, 'errors');
-			}
+			if ($result < 0) { $error++; }
 		}
 
-		if ($error) $action = 'edit_extras';
+		if ($error) {
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = 'edit_extras';
+		} else {
+			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+			$action = 'view';
+		}
 	}
 
 	if ($action == "change_property" && GETPOST('btn_update_ticket_prop', 'alpha') && $user->rights->ticket->write) {
@@ -637,6 +637,7 @@ if (empty($reshook)) {
 	if (GETPOSTISSET('actionbis') && $action == 'presend') $action = 'presend_addmessage';
 }
 
+
 /*
  * View
  */
@@ -937,14 +938,14 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 
 		// Creation date
 		print '<tr><td>'.$langs->trans("DateCreation").'</td><td>';
-		print dol_print_date($object->datec, 'dayhour');
+		print dol_print_date($object->datec, 'dayhour', 'tzuser');
 		print '<span class="opacitymedium"> - '.$langs->trans("TimeElapsedSince").': <i>'.convertSecondToTime(roundUpToNextMultiple($now - $object->datec, 60)).'</i></span>';
 		print '</td></tr>';
 
 		// Read date
 		print '<tr><td>'.$langs->trans("TicketReadOn").'</td><td>';
 		if (!empty($object->date_read)) {
-			print dol_print_date($object->date_read, 'dayhour');
+			print dol_print_date($object->date_read, 'dayhour', 'tzuser');
 			print '<span class="opacitymedium"> - '.$langs->trans("TicketTimeToRead").': <i>'.convertSecondToTime(roundUpToNextMultiple($object->date_read - $object->datec, 60)).'</i>';
 			print ' - '.$langs->trans("TimeElapsedSince").': <i>'.convertSecondToTime(roundUpToNextMultiple($now - $object->date_read, 60)).'</i></span>';
 		}
@@ -953,7 +954,7 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
 		// Close date
 		print '<tr><td>'.$langs->trans("TicketCloseOn").'</td><td>';
 		if (!empty($object->date_close)) {
-			print dol_print_date($object->date_close, 'dayhour');
+			print dol_print_date($object->date_close, 'dayhour', 'tzuser');
 		}
 		print '</td></tr>';
 
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 03e87067d10..306f861097b 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -223,9 +223,10 @@ class Ticket extends CommonObject
 
 
 	/**
-	 *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *  'type' 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).
@@ -236,8 +237,8 @@ class Ticket extends CommonObject
 	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-	 *  'css' and 'cssview' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. For example: 'maxwidth200', 'wordbreak'
-	 *  'help' is a string visible as a tooltip on field
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
+	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
 	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
@@ -255,16 +256,16 @@ class Ticket extends CommonObject
 		'track_id' => array('type'=>'varchar(255)', 'label'=>'TicketTrackId', 'visible'=>-2, 'enabled'=>1, 'position'=>11, 'notnull'=>-1, 'searchall'=>1, 'help'=>"Help text"),
 		'fk_user_create' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Author', 'visible'=>1, 'enabled'=>1, 'position'=>15, 'notnull'=>1, 'css'=>'tdoverflowmax150 maxwidth150onsmartphone'),
 		'origin_email' => array('type'=>'mail', 'label'=>'OriginEmail', 'visible'=>-2, 'enabled'=>1, 'position'=>16, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'css'=>'tdoverflowmax150'),
-		'subject' => array('type'=>'varchar(255)', 'label'=>'Subject', 'visible'=>1, 'enabled'=>1, 'position'=>18, 'notnull'=>-1, 'searchall'=>1, 'help'=>"", 'css'=>'maxwidth200', 'autofocusoncreate'=>1),
-		'type_code' => array('type'=>'varchar(32)', 'label'=>'Type', 'visible'=>1, 'enabled'=>1, 'position'=>20, 'notnull'=>-1, 'help'=>"", 'css'=>'maxwidth150 tdoverflowmax50'),
+		'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'),
 		'severity_code' => array('type'=>'varchar(32)', 'label'=>'Severity', 'visible'=>1, 'enabled'=>1, 'position'=>22, 'notnull'=>-1, 'help'=>"", 'css'=>'maxwidth100'),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'visible'=>1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'searchall'=>1, 'help'=>"LinkToThirparty", 'css'=>'tdoverflowmax150 maxwidth150onsmartphone'),
+		'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'=>""),
 		'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_read' => array('type'=>'datetime', 'label'=>'TicketReadOn', 'visible'=>-1, 'enabled'=>1, 'position'=>501, 'notnull'=>1),
 		'fk_user_assign' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'AssignedTo', 'visible'=>1, 'enabled'=>1, 'position'=>505, 'notnull'=>1, 'css'=>'tdoverflowmax150'),
 		'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),
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 4d3aaafc4e5..0c6db4a4a2d 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -339,6 +339,7 @@ foreach ($search as $key => $val)
 		}
 		if ($search['fk_statut'] == 'openall' || in_array('openall', $search['fk_statut'])) {
 			$newarrayofstatus[] = Ticket::STATUS_NOT_READ;
+			$newarrayofstatus[] = Ticket::STATUS_READ;
 			$newarrayofstatus[] = Ticket::STATUS_ASSIGNED;
 			$newarrayofstatus[] = Ticket::STATUS_IN_PROGRESS;
 			$newarrayofstatus[] = Ticket::STATUS_NEED_MORE_INFO;
@@ -427,7 +428,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'classforhorizontalscrolloftabs');
 
 
 if ($socid && !$projectid && !$project_ref && $user->rights->societe->lire) {
@@ -810,6 +811,12 @@ while ($i < min($num, $limit))
 			if ($cssforfield || $val['css']) print '"';
 			print '>';
 			if ($key == 'fk_statut') print $object->getLibStatut(5);
+			elseif ($key == 'subject') {
+				$s = $obj->subject;
+				print '<span title="'.$s.'">';
+				print $s;
+				print '</span>';
+			}
 			elseif ($key == 'type_code') {
 				$s = $langs->getLabelFromKey($db, 'TicketTypeShort'.$object->type_code, 'c_ticket_type', 'code', 'label', $object->type_code);
 				print '<span title="'.$s.'">';
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index a35ffbad1b5..c5820db60b7 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -768,7 +768,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	   	print '<input type="hidden" name="action" value="adduserldap">';
 		if (is_array($liste) && count($liste))
 		{
-			print $form->selectarray('users', $liste, '', 1);
+			print $form->selectarray('users', $liste, '', 1, 0, 0, '', 0, 0, 0, '', 'maxwidth500');
 			print ajax_combobox('users');
 		}
 	   	print '</td><td class="center">';
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index e7c94bc7f33..8f8f8c67ca8 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1419,11 +1419,12 @@ class User extends CommonObject
 		if ($result > 0) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."user";
 			$sql .= " SET fk_socpeople=".$contact->id;
-			$sql .= ", civility=".$contact->civility_code;
-			if ($contact->socid) {
+			$sql .= ", civility='".$this->db->escape($contact->civility_code)."'";
+			if ($contact->socid > 0) {
 				$sql .= ", fk_soc=".$contact->socid;
 			}
-			$sql .= " WHERE rowid=".$this->id;
+			$sql .= " WHERE rowid=".((int) $this->id);
+
 			$resql = $this->db->query($sql);
 
 			dol_syslog(get_class($this)."::create_from_contact", LOG_DEBUG);
@@ -2397,53 +2398,54 @@ class User extends CommonObject
 		$label .= '<div class="centpercent">';
 		$label .= img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("User").'</u>';
 		$label .= ' '.$this->getLibStatut(4);
-		$label .= '<br><b>'.$langs->trans('Name').':</b> '.$this->getFullName($langs, '');
+		$label .= '<br><b>'.$langs->trans('Name').':</b> '.dol_string_nohtmltag($this->getFullName($langs, ''));
 		if (!empty($this->login)) {
-			$label .= '<br><b>'.$langs->trans('Login').':</b> '.$this->login;
+			$label .= '<br><b>'.$langs->trans('Login').':</b> '.dol_string_nohtmltag($this->login);
 		}
 		if (!empty($this->job)) {
-			$label .= '<br><b>'.$langs->trans("Job").':</b> '.$this->job;
+			$label .= '<br><b>'.$langs->trans("Job").':</b> '.dol_string_nohtmltag($this->job);
 		}
-		$label .= '<br><b>'.$langs->trans("Email").':</b> '.$this->email;
+		$label .= '<br><b>'.$langs->trans("Email").':</b> '.dol_string_nohtmltag($this->email);
 		if (!empty($this->phone)) {
-			$label .= '<br><b>'.$langs->trans("Phone").':</b> '.$this->phone;
+			$label .= '<br><b>'.$langs->trans("Phone").':</b> '.dol_string_nohtmltag($this->phone);
 		}
 		if (!empty($this->admin)) {
 			$label .= '<br><b>'.$langs->trans("Administrator").'</b>: '.yn($this->admin);
 		}
+		$company = '';
 		if (!empty($this->socid)) {	// Add thirdparty for external users
 			$thirdpartystatic = new Societe($db);
 			$thirdpartystatic->fetch($this->socid);
 			if (empty($hidethirdpartylogo)) {
 				$companylink = ' '.$thirdpartystatic->getNomUrl(2, (($option == 'nolink') ? 'nolink' : '')); // picto only of company
 			}
-			$company = ' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';
+			$company = ' ('.$langs->trans("Company").': '.dol_string_nohtmltag($thirdpartystatic->name).')';
 		}
 		$type = ($this->socid ? $langs->trans("External").$company : $langs->trans("Internal"));
-		$label .= '<br><b>'.$langs->trans("Type").':</b> '.$type;
+		$label .= '<br><b>'.$langs->trans("Type").':</b> '.dol_string_nohtmltag($type);
 		$label .= '</div>';
 		if ($infologin > 0) {
 			$label .= '<br>';
 			$label .= '<br><u>'.$langs->trans("Session").'</u>';
-			$label .= '<br><b>'.$langs->trans("IPAddress").'</b>: '.$_SERVER["REMOTE_ADDR"];
+			$label .= '<br><b>'.$langs->trans("IPAddress").'</b>: '.dol_string_nohtmltag(getUserRemoteIP());
 			if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY)) {
-				$label .= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (user entity '.$this->entity.')';
+				$label .= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (User entity '.$this->entity.')';
 			}
-			$label .= '<br><b>'.$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo) ? '' : ' (demo)');
+			$label .= '<br><b>'.$langs->trans("AuthenticationMode").':</b> '.dol_string_nohtmltag($_SESSION["dol_authmode"].(empty($dolibarr_main_demo) ? '' : ' (demo)'));
 			$label .= '<br><b>'.$langs->trans("ConnectedSince").':</b> '.dol_print_date($this->datelastlogin, "dayhour", 'tzuser');
 			$label .= '<br><b>'.$langs->trans("PreviousConnexion").':</b> '.dol_print_date($this->datepreviouslogin, "dayhour", 'tzuser');
-			$label .= '<br><b>'.$langs->trans("CurrentTheme").':</b> '.$conf->theme;
-			$label .= '<br><b>'.$langs->trans("CurrentMenuManager").':</b> '.$menumanager->name;
+			$label .= '<br><b>'.$langs->trans("CurrentTheme").':</b> '.dol_string_nohtmltag($conf->theme);
+			$label .= '<br><b>'.$langs->trans("CurrentMenuManager").':</b> '.dol_string_nohtmltag($menumanager->name);
 			$s = picto_from_langcode($langs->getDefaultLang());
-			$label .= '<br><b>'.$langs->trans("CurrentUserLanguage").':</b> '.($s ? $s.' ' : '').$langs->getDefaultLang();
-			$label .= '<br><b>'.$langs->trans("Browser").':</b> '.$conf->browser->name.($conf->browser->version ? ' '.$conf->browser->version : '').' ('.$_SERVER['HTTP_USER_AGENT'].')';
-			$label .= '<br><b>'.$langs->trans("Layout").':</b> '.$conf->browser->layout;
-			$label .= '<br><b>'.$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
+			$label .= '<br><b>'.$langs->trans("CurrentUserLanguage").':</b> '.dol_string_nohtmltag(($s ? $s.' ' : '').$langs->getDefaultLang());
+			$label .= '<br><b>'.$langs->trans("Browser").':</b> '.dol_string_nohtmltag($conf->browser->name.($conf->browser->version ? ' '.$conf->browser->version : '').' ('.$_SERVER['HTTP_USER_AGENT'].')');
+			$label .= '<br><b>'.$langs->trans("Layout").':</b> '.dol_string_nohtmltag($conf->browser->layout);
+			$label .= '<br><b>'.$langs->trans("Screen").':</b> '.dol_string_nohtmltag($_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight']);
 			if ($conf->browser->layout == 'phone') {
 				$label .= '<br><b>'.$langs->trans("Phone").':</b> '.$langs->trans("Yes");
 			}
 			if (!empty($_SESSION["disablemodules"])) {
-				$label .= '<br><b>'.$langs->trans("DisabledModules").':</b> <br>'.join(', ', explode(',', $_SESSION["disablemodules"]));
+				$label .= '<br><b>'.$langs->trans("DisabledModules").':</b> <br>'.dol_string_nohtmltag(join(', ', explode(',', $_SESSION["disablemodules"])));
 			}
 		}
 		if ($infologin < 0) {
@@ -2507,12 +2509,12 @@ class User extends CommonObject
 		}
 		if ($withpictoimg > -2 && $withpictoimg != 2) {
 			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
-				$result .= '<span class=" nopadding usertext'.((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled').($morecss ? ' '.$morecss : '').'">';
+				$result .= '<span class="nopadding usertext'.((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled').($morecss ? ' '.$morecss : '').'">';
 			}
 			if ($mode == 'login') {
-				$result .= dol_trunc($this->login, $maxlen);
+				$result .= dol_string_nohtmltag(dol_trunc($this->login, $maxlen));
 			} else {
-				$result .= $this->getFullName($langs, '', ($mode == 'firstelselast' ? 3 : ($mode == 'firstname' ? 2 : -1)), $maxlen);
+				$result .= dol_string_nohtmltag($this->getFullName($langs, '', ($mode == 'firstelselast' ? 3 : ($mode == 'firstname' ? 2 : -1)), $maxlen));
 			}
 			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$result .= '</span>';
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index fff39a3d45f..cb113166cad 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -185,7 +185,7 @@ if ($id > 0)
 	{
 		print '<br>';
 		print '<div class="center"><input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp&nbsp;';
+		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 		print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 	}
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index badf3840582..ee60b90b994 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -340,7 +340,7 @@ if ($object->id > 0)
 						print img_picto($langs->trans("Add"), 'switch_off');
 						print '</a></td>';
 					}
-					print '<td>&nbsp</td>';
+					print '<td>&nbsp;</td>';
 				}
 			} else {
 				// Do not own permission
@@ -351,7 +351,7 @@ if ($object->id > 0)
 					print img_picto($langs->trans("Add"), 'switch_off');
 					print '</a></td>';
 				}
-				print '<td>&nbsp</td>';
+				print '<td>&nbsp;</td>';
 			}
 
 			$permlabel = ($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $langs->trans($obj->label)));
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 4d215685f53..b10bd9267f8 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -128,7 +128,7 @@ if ($resql)
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("LastUsersCreated", min($num, $max)).'</td>';
 	print '<td class="right" colspan="2"><a class="commonlink" href="'.DOL_URL_ROOT.'/user/list.php?sortfield=u.datec&sortorder=DESC">'.$langs->trans("FullList").'</td>';
-	print '</tr>';
+	print '</tr>'."\n";
 	$i = 0;
 
 	while ($i < $num && $i < $max)
@@ -277,7 +277,6 @@ if ($canreadperms)
 	}
 }
 
-//print '</td></tr></table>';
 print '</div></div></div>';
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index d3012f855f2..1f471cd3ad9 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -36,7 +36,7 @@ if (!$user->rights->user->user->lire && !$user->admin) {
 }
 
 // Load translation files required by page
-$langs->loadLangs(array('users', 'companies', 'hrm'));
+$langs->loadLangs(array('users', 'companies', 'hrm', 'salaries'));
 
 $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)
@@ -99,6 +99,8 @@ $fieldstosearchall = array(
 	'u.lastname'=>"Lastname",
 	'u.firstname'=>"Firstname",
 	'u.accountancy_code'=>"AccountancyCode",
+	'u.office_phone'=>"PhonePro",
+	'u.user_mobile'=>"PhoneMobile",
 	'u.email'=>"EMail",
 	'u.note'=>"Note",
 );
@@ -117,6 +119,8 @@ $arrayfields = array(
     'u.employee'=>array('label'=>"Employee", 'checked'=>($mode == 'employee' ? 1 : 0), 'position'=>25),
     'u.fk_user'=>array('label'=>"HierarchicalResponsible", 'checked'=>1, 'position'=>27),
     'u.accountancy_code'=>array('label'=>"AccountancyCode", 'checked'=>0, 'position'=>30),
+	'u.office_phone'=>array('label'=>"PhonePro", 'checked'=>1, 'position'=>31),
+	'u.user_mobile'=>array('label'=>"PhoneMobile", 'checked'=>1, 'position'=>32),
     'u.email'=>array('label'=>"EMail", 'checked'=>1, 'position'=>35),
     'u.api_key'=>array('label'=>"ApiKey", 'checked'=>0, 'position'=>40, "enabled"=>($conf->api->enabled && $user->admin)),
     'u.fk_soc'=>array('label'=>"Company", 'checked'=>($contextpage == 'employeelist' ? 0 : 1), 'position'=>45),
@@ -142,6 +146,8 @@ $search_firstname = GETPOST('search_firstname', 'alpha');
 $search_gender = GETPOST('search_gender', 'alpha');
 $search_employee = GETPOST('search_employee', 'alpha');
 $search_accountancy_code = GETPOST('search_accountancy_code', 'alpha');
+$search_phonepro = GETPOST('search_phonepro', 'alpha');
+$search_phonemobile = GETPOST('search_phonemobile', 'alpha');
 $search_email = GETPOST('search_email', 'alpha');
 $search_api_key = GETPOST('search_api_key', 'alphanohtml');
 $search_statut = GETPOST('search_statut', 'intcomma');
@@ -199,6 +205,8 @@ if (empty($reshook))
 		$search_gender = "";
 		$search_employee = "";
 		$search_accountancy_code = "";
+		$search_phonepro = "";
+		$search_phonemobile = "";
 		$search_email = "";
 		$search_statut = "";
 		$search_thirdparty = "";
@@ -296,24 +304,27 @@ if ($contextpage == 'employeelist' && $search_employee == 1) {
 
 $user2 = new User($db);
 
-$sql = "SELECT DISTINCT u.rowid, u.lastname, u.firstname, u.admin, u.fk_soc, u.login, u.email, u.api_key, u.accountancy_code, u.gender, u.employee, u.photo,";
+$sql = "SELECT DISTINCT u.rowid, u.lastname, u.firstname, u.admin, u.fk_soc, u.login, u.office_phone, u.user_mobile, u.email, u.api_key, u.accountancy_code, u.gender, u.employee, u.photo,";
 $sql .= " u.salary, u.datelastlogin, u.datepreviouslogin,";
 $sql .= " u.ldap_sid, u.statut, u.entity,";
 $sql .= " u.tms as date_update, u.datec as date_creation,";
-$sql .= " u2.rowid as id2, u2.login as login2, u2.firstname as firstname2, u2.lastname as lastname2, u2.admin as admin2, u2.fk_soc as fk_soc2, u2.email as email2, u2.gender as gender2, u2.photo as photo2, u2.entity as entity2, u2.statut as statut2,";
-$sql .= " s.nom as name, s.canvas";
+$sql .= " u2.rowid as id2, u2.login as login2, u2.firstname as firstname2, u2.lastname as lastname2, u2.admin as admin2, u2.fk_soc as fk_soc2, u2.office_phone as ofice_phone2, u2.user_mobile as user_mobile2, u2.email as email2, u2.gender as gender2, u2.photo as photo2, u2.entity as entity2, u2.statut as statut2,";
+$sql .= " s.nom as name, s.canvas,";
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+	}
 }
 // Add fields from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
-$sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (u.rowid = ef.fk_object)";
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (u.rowid = ef.fk_object)";
+}
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_soc = s.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u2 ON u.fk_user = u2.rowid";
 if (!empty($search_categ) || !empty($catid)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_user as cu ON u.rowid = cu.fk_user"; // We'll need this table joined to the select in order to filter by categ
@@ -337,6 +348,8 @@ if (is_numeric($search_employee) && $search_employee >= 0) {
 	$sql .= ' AND u.employee = '.(int) $search_employee;
 }
 if ($search_accountancy_code != '')  $sql .= natural_search("u.accountancy_code", $search_accountancy_code);
+if ($search_phonepro != '')          $sql .= natural_search("u.office_phone", $search_phonepro);
+if ($search_phonemobile != '')       $sql .= natural_search("u.user_mobile", $search_phonemobile);
 if ($search_email != '')             $sql .= natural_search("u.email", $search_email);
 if ($search_api_key != '')           $sql .= natural_search("u.api_key", $search_api_key);
 if ($search_statut != '' && $search_statut >= 0) $sql .= " AND u.statut IN (".$db->sanitize($db->escape($search_statut)).")";
@@ -408,6 +421,8 @@ if ($search_firstname != '') $param .= "&amp;search_firstname=".urlencode($searc
 if ($search_gender != '') $param .= "&amp;search_gender=".urlencode($search_gender);
 if ($search_employee != '') $param .= "&amp;search_employee=".urlencode($search_employee);
 if ($search_accountancy_code != '') $param .= "&amp;search_accountancy_code=".urlencode($search_accountancy_code);
+if ($search_phonepro != '') $param .= "&amp;search_phonepro=".urlencode($search_phonepro);
+if ($search_phonemobile != '') $param .= "&amp;search_phonemobile=".urlencode($search_phonemobile);
 if ($search_email != '') $param .= "&amp;search_email=".urlencode($search_email);
 if ($search_api_key != '') $param .= "&amp;search_api_key=".urlencode($search_api_key);
 if ($search_supervisor > 0) $param .= "&amp;search_supervisor=".urlencode($search_supervisor);
@@ -543,6 +558,14 @@ if (!empty($arrayfields['u.accountancy_code']['checked']))
 {
 	print '<td class="liste_titre"><input type="text" name="search_accountancy_code" class="maxwidth50" value="'.$search_accountancy_code.'"></td>';
 }
+if (!empty($arrayfields['u.office_phone']['checked']))
+{
+	print '<td class="liste_titre"><input type="text" name="search_phonepro" class="maxwidth75" value="'.$search_phonepro.'"></td>';
+}
+if (!empty($arrayfields['u.user_mobile']['checked']))
+{
+	print '<td class="liste_titre"><input type="text" name="search_phonemobile" class="maxwidth75" value="'.$search_phonemobile.'"></td>';
+}
 if (!empty($arrayfields['u.email']['checked']))
 {
 	print '<td class="liste_titre"><input type="text" name="search_email" class="maxwidth75" value="'.$search_email.'"></td>';
@@ -612,6 +635,8 @@ if (!empty($arrayfields['u.gender']['checked']))         print_liste_field_titre
 if (!empty($arrayfields['u.employee']['checked']))       print_liste_field_titre("Employee", $_SERVER['PHP_SELF'], "u.employee", $param, "", "", $sortfield, $sortorder);
 if (!empty($arrayfields['u.fk_user']['checked']))        print_liste_field_titre("HierarchicalResponsible", $_SERVER['PHP_SELF'], "u.fk_user", $param, "", "", $sortfield, $sortorder);
 if (!empty($arrayfields['u.accountancy_code']['checked'])) print_liste_field_titre("AccountancyCode", $_SERVER['PHP_SELF'], "u.accountancy_code", $param, "", "", $sortfield, $sortorder);
+if (!empty($arrayfields['u.office_phone']['checked']))   print_liste_field_titre("PhonePro", $_SERVER['PHP_SELF'], "u.office_phone", $param, "", "", $sortfield, $sortorder);
+if (!empty($arrayfields['u.user_mobile']['checked']))    print_liste_field_titre("PhoneMobile", $_SERVER['PHP_SELF'], "u.user_mobile", $param, "", "", $sortfield, $sortorder);
 if (!empty($arrayfields['u.email']['checked']))          print_liste_field_titre("EMail", $_SERVER['PHP_SELF'], "u.email", $param, "", "", $sortfield, $sortorder);
 if (!empty($arrayfields['u.api_key']['checked']))        print_liste_field_titre("ApiKey", $_SERVER['PHP_SELF'], "u.api_key", $param, "", "", $sortfield, $sortorder);
 if (!empty($arrayfields['u.fk_soc']['checked']))         print_liste_field_titre("Company", $_SERVER['PHP_SELF'], "u.fk_soc", $param, "", "", $sortfield, $sortorder);
@@ -662,6 +687,8 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	$userstatic->ref = $obj->label;
 	$userstatic->login = $obj->login;
 	$userstatic->statut = $obj->statut;
+	$userstatic->office_phone = $obj->office_phone;
+	$userstatic->user_mobile = $obj->user_mobile;
 	$userstatic->email = $obj->email;
 	$userstatic->gender = $obj->gender;
 	$userstatic->socid = $obj->fk_soc;
@@ -724,6 +751,8 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	        $user2->gender = $obj->gender2;
 	        $user2->photo = $obj->photo2;
 	        $user2->admin = $obj->admin2;
+			$user2->office_phone = $obj->office_phone;
+			$user2->user_mobile = $obj->user_mobile;
 	        $user2->email = $obj->email2;
 	        $user2->socid = $obj->fk_soc2;
 	        $user2->statut = $obj->statut2;
@@ -745,9 +774,19 @@ while ($i < ($limit ? min($num, $limit) : $num))
 		print '<td>'.$obj->accountancy_code.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
+	if (!empty($arrayfields['u.office_phone']['checked']))
+	{
+		print "<td>".dol_print_phone($obj->office_phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone')."</td>\n";
+		if (!$i) $totalarray['nbfield']++;
+	}
+	if (!empty($arrayfields['u.user_mobile']['checked']))
+	{
+		print "<td>".dol_print_phone($obj->user_mobile, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'mobile')."</td>\n";
+		if (!$i) $totalarray['nbfield']++;
+	}
 	if (!empty($arrayfields['u.email']['checked']))
 	{
-		print '<td>'.$obj->email.'</td>';
+		print '<td class="tdoverflowmax150">'.dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 0, 0, 1)."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['u.api_key']['checked']))
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 3c7395fe1e8..d09ee52077f 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -195,9 +195,9 @@ if ($result > 0)
 	// Line with titles
 	print '<table width="100%" class="noborder">';
 	print '<tr class="liste_titre">';
-	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
-	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
-	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
+	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, 'width="45%"', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, 'width="35%"', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, 'width="10%"', $sortfield, $sortorder);
 	print_liste_field_titre('');
 	print "</tr>\n";
 
@@ -271,9 +271,9 @@ if ($result > 0)
 	// Line with titles
 	print '<table width="100%" class="noborder">';
 	print '<tr class="liste_titre">';
-	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
-	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
-	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
+	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, 'width="45%"', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, 'width="35%"', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, 'width="10%"', $sortfield, $sortorder);
 	print_liste_field_titre('', '', '');
 	print '</tr>';
 
@@ -322,10 +322,8 @@ if ($result > 0)
 
 	// List of notifications enabled for fixed email
 	/*
-    foreach($conf->global as $key => $val)
-    {
+    foreach($conf->global as $key => $val) {
     	if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue;
-    	$var = ! $var;
 		print '<tr class="oddeven"><td>';
 		$listtmp=explode(',',$val);
 		$first=1;
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index b058bae9743..a05fd76df7b 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -325,8 +325,8 @@ if ($result)
 				// TODO Define familyposition
 				$family = $modules[$obj->module]->family_position;
 				$familyposition = 0;
-				$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX."rights_def SET module_position = ".$modules[$obj->module]->module_position.",";
-				$sqlupdate .= " family_position = ".$familyposition;
+				$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX."rights_def SET module_position = ".((int) $modules[$obj->module]->module_position).",";
+				$sqlupdate .= " family_position = ".((int) $familyposition);
 				$sqlupdate .= " WHERE module_position = 0 AND module = '".$db->escape($obj->module)."'";
 				$db->query($sqlupdate);
 			}
@@ -424,7 +424,7 @@ if ($result)
 					print img_picto($langs->trans("Add"), 'switch_off');
 					print '</a></td>';
 				}
-				print '<td>&nbsp</td>';
+				print '<td>&nbsp;</td>';
 			}
 		} else {
 			// Do not own permission
@@ -435,12 +435,19 @@ if ($result)
 				print img_picto($langs->trans("Add"), 'switch_off');
 				print '</a></td>';
 			}
-			print '<td>&nbsp</td>';
+			print '<td>&nbsp;</td>';
 		}
 
-		// Label
-		$permlabel = ($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $langs->trans($obj->label)));
-		print '<td class="maxwidthonsmartphone">'.$permlabel.'</td>';
+		// Label of permission
+		$permlabel = (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ($langs->trans("PermissionAdvanced".$obj->id) != ("PermissionAdvanced".$obj->id)) ? $langs->trans("PermissionAdvanced".$obj->id) : (($langs->trans("Permission".$obj->id) != ("Permission".$obj->id)) ? $langs->trans("Permission".$obj->id) : $langs->trans($obj->label)));
+		print '<td class="maxwidthonsmartphone">';
+		print $permlabel;
+		if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+			if (preg_match('/_advance$/', $obj->perms)) {
+				print ' <span class="opacitymedium">('.$langs->trans("AdvancedModeOnly").')</span>';
+			}
+		}
+		print '</td>';
 
 		// Permission id
 		if ($user->admin) print '<td class="right"><span class="opacitymedium">'.$obj->id.'</span></td>';
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 24da596f3c2..933d379e48a 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -107,7 +107,9 @@ if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST(
 	$features = $_SESSION['addvariant_'.$object->id];
 
 	if (!$features) {
-		setEventMessages($langs->trans('ErrorFieldsRequired'), null, 'errors');
+		if ($action == 'create') {
+			setEventMessages($langs->trans('ErrorFieldsRequired'), null, 'errors');
+		}
 	} else {
 		$reference = trim($reference);
 		if (empty($reference)) {
@@ -763,11 +765,11 @@ if (!empty($id) || !empty($ref))
 
 		print '	<div class="inline-block divButAction">';
 
-		print '<a href="combinations.php?id='.$object->id.'&action=add" class="butAction">'.$langs->trans('NewProductCombination').'</a>'; // NewVariant
+		print '<a href="combinations.php?id='.$object->id.'&action=add&token='.newToken().'" class="butAction">'.$langs->trans('NewProductCombination').'</a>'; // NewVariant
 
 		if ($productCombinations)
 		{
-			print '<a href="combinations.php?id='.$object->id.'&action=copy" class="butAction">'.$langs->trans('PropagateVariant').'</a>';
+			print '<a href="combinations.php?id='.$object->id.'&action=copy&token='.newToken().'" class="butAction">'.$langs->trans('PropagateVariant').'</a>';
 		}
 
 		print '	</div>';
diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 7397b8ca2a6..e696258e5d9 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -778,15 +778,15 @@ function updateInvoice($authentication, $invoice)
 					}
 				}
 				if ($invoice['status'] == Facture::STATUS_CLOSED) {
-					$result = $object->set_paid($fuser, $invoice['close_code'], $invoice['close_note']);
+					$result = $object->setPaid($fuser, $invoice['close_code'], $invoice['close_note']);
+				}
+				if ($invoice['status'] == Facture::STATUS_ABANDONED) {
+					$result = $object->setCanceled($fuser, $invoice['close_code'], $invoice['close_note']);
 				}
-				if ($invoice['status'] == Facture::STATUS_ABANDONED)
-					$result = $object->set_canceled($fuser, $invoice['close_code'], $invoice['close_note']);
 			}
 		}
 
-		if ((!$error) && ($objectfound))
-		{
+		if ((!$error) && ($objectfound)) {
 			$db->commit();
 			$objectresp = array(
 					'result'=>array('result_code'=>'OK', 'result_label'=>''),
@@ -794,9 +794,7 @@ function updateInvoice($authentication, $invoice)
 					'ref'=>$object->ref,
 					'ref_ext'=>$object->ref_ext
 			);
-		}
-		elseif ($objectfound)
-		{
+		} elseif ($objectfound) {
 			$db->rollback();
 			$error++;
 			$errorcode = 'KO';
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 42b39e7e902..34cc78e9a05 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -757,7 +757,7 @@ class Website extends CommonObject
 			// Restore id of home page
 			$object->fk_default_home = $newidforhome;
 			$res = $object->update($user);
-			if (!$res > 0)
+			if (!($res > 0))
 			{
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -1300,7 +1300,7 @@ class Website extends CommonObject
 		$object = $this;
 		if (empty($object->ref))
 		{
-			$this->error = 'Function importWebSite called on object not loaded (object->ref is empty)';
+			$this->error = 'Function rebuildWebSiteFiles called on object not loaded (object->ref is empty)';
 			return -1;
 		}
 
@@ -1316,6 +1316,7 @@ class Website extends CommonObject
 
 		$num = $this->db->num_rows($resql);
 
+		// Loop on each container/page
 		$i = 0;
 		while ($i < $num) {
 			$obj = $this->db->fetch_object($resql);
@@ -1333,13 +1334,15 @@ class Website extends CommonObject
 				$error++;
 			}
 
-			// Regenerate alternative aliases pages
-			if (is_array($aliasesarray))
-			{
-				foreach ($aliasesarray as $aliasshortcuttocreate)
-				{
-					if (trim($aliasshortcuttocreate))
-					{
+			// Add main alias to list of alternative aliases
+			if (!empty($objectpagestatic->pageurl) && !in_array($objectpagestatic->pageurl, $aliasesarray)) {
+				$aliasesarray[] = $objectpagestatic->pageurl;
+			}
+
+			// Regenerate all aliases pages (pages with a natural name)
+			if (is_array($aliasesarray)) {
+				foreach ($aliasesarray as $aliasshortcuttocreate) {
+					if (trim($aliasshortcuttocreate)) {
 						$filealias = $conf->website->dir_output.'/'.$object->ref.'/'.trim($aliasshortcuttocreate).'.php';
 						$result = dolSavePageAlias($filealias, $object, $objectpagestatic);
 						if (!$result) {
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 30961013806..bacc4664791 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -161,7 +161,7 @@ class WebsitePage extends CommonObject
 		//'status'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'index'=>true,   'position'=>1000),
 		'fk_website'     =>array('type'=>'integer', 'label'=>'WebsiteId', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>40, 'searchall'=>0, 'foreignkey'=>'websitepage.rowid'),
 		'fk_page'        =>array('type'=>'integer', 'label'=>'ParentPageId', 'enabled'=>1, 'visible'=>1, 'notnull'=>-1, 'position'=>45, 'searchall'=>0, 'foreignkey'=>'website.rowid'),
-		'allowed_in_frames'   =>array('type'=>'integer', 'label'=>'AllowedInFrames', 'enabled'=>1, 'visible'=>-1, 'position'=>48, 'searchall'=>0),
+		'allowed_in_frames'   =>array('type'=>'integer', 'label'=>'AllowedInFrames', 'enabled'=>1, 'visible'=>-1, 'position'=>48, 'searchall'=>0, 'default'=>0),
 		'htmlheader'     =>array('type'=>'text', 'label'=>'HtmlHeader', 'enabled'=>1, 'visible'=>0, 'position'=>50, 'searchall'=>0),
 		'content'        =>array('type'=>'mediumtext', 'label'=>'Content', 'enabled'=>1, 'visible'=>0, 'position'=>51, 'searchall'=>0),
 		'grabbed_from'   =>array('type'=>'varchar(255)', 'label'=>'GrabbedFrom', 'enabled'=>1, 'visible'=>1, 'index'=>1, 'position'=>400, 'comment'=>'URL page content was grabbed from'),
@@ -400,7 +400,7 @@ class WebsitePage extends CommonObject
 		$sql .= " t.fk_object";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.fk_website = '.$websiteid;
-		// Manage filter
+		// Manage filter (same than into countAll)
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
@@ -501,14 +501,27 @@ class WebsitePage extends CommonObject
 		$sql = 'SELECT COUNT(t.rowid) as nb';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.fk_website = '.$websiteid;
-		// Manage filter
+		// Manage filter (same than into fetchAll)
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
-				if ($key == 't.rowid' || $key == 't.fk_website') {
-					$sqlwhere[] = $key.'='.$value;
+				if ($key == 't.rowid' || $key == 't.fk_website' || $key == 'status') {
+					$sqlwhere[] = $key.' = '.$value;
+				} elseif ($key == 'type_container') {
+					$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
 				} elseif ($key == 'lang' || $key == 't.lang') {
-					$sqlwhere[] = $key." = '".$this->db->escape(substr($value, 0, 2))."'";
+					$listoflang = array();
+					$foundnull = 0;
+					foreach (explode(',', $value) as $tmpvalue) {
+						if ($tmpvalue == 'null') {
+							$foundnull++;
+							continue;
+						}
+						$listoflang[] = "'".$this->db->escape(substr(str_replace("'", '', $tmpvalue), 0, 2))."'";
+					}
+					$stringtouse = $key." IN (".join(',', $listoflang).")";
+					if ($foundnull) $stringtouse = '('.$stringtouse.' OR '.$key.' IS NULL)';
+					$sqlwhere[] = $stringtouse;
 				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 1b477a0272b..ebcf31ad2c5 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -1576,7 +1576,7 @@ if ($action == 'setashome')
 
 	$object->fk_default_home = $pageid;
 	$res = $object->update($user);
-	if (!$res > 0)
+	if (! ($res > 0))
 	{
 		$error++;
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -1752,7 +1752,6 @@ if ($action == 'updatemeta')
 
 		dol_mkdir($pathofwebsite);
 
-
 		// Now generate the master.inc.php page
 		$result = dolSaveMasterFile($filemaster);
 		if (!$result) setEventMessages('Failed to write file '.$filemaster, null, 'errors');
@@ -1762,6 +1761,17 @@ if ($action == 'updatemeta')
 		{
 			dol_syslog("We delete old alias page name=".$fileoldalias." to build a new alias page=".$filealias);
 			dol_delete_file($fileoldalias);
+
+			// Delete also pages into language subdirectories
+			if (empty($objectpage->lang) || !in_array($objectpage->lang, explode(',', $object->otherlang))) {
+				$dirname = dirname($fileoldalias);
+				$filename = basename($fileoldalias);
+				$sublangs = explode(',', $object->otherlang);
+				foreach ($sublangs as $sublang) {
+					$fileoldaliassub = $dirname.'/'.$sublang.'/'.$filename;
+					dol_delete_file($fileoldaliassub);
+				}
+			}
 		}
 		// Now delete the alternative alias.php pages
 		if (!empty($objectpage->old_object->aliasalt))
@@ -1773,11 +1783,22 @@ if ($action == 'updatemeta')
 				{
 					dol_syslog("We delete old alt alias pages name=".trim($tmpaliasalt));
 					dol_delete_file($pathofwebsite.'/'.trim($tmpaliasalt).'.php');
+
+					// Delete also pages into language subdirectories
+					if (empty($objectpage->lang) || !in_array($objectpage->lang, explode(',', $object->otherlang))) {
+						$dirname = dirname($pathofwebsite.'/'.trim($tmpaliasalt).'.php');
+						$filename = basename($pathofwebsite.'/'.trim($tmpaliasalt).'.php');
+						$sublangs = explode(',', $object->otherlang);
+						foreach ($sublangs as $sublang) {
+							$fileoldaliassub = $dirname.'/'.$sublang.'/'.$filename;
+							dol_delete_file($fileoldaliassub);
+						}
+					}
 				}
 			}
 		}
 
-		// Save page alias
+		// Save page main alias
 		$result = dolSavePageAlias($filealias, $object, $objectpage);
 		if (!$result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
 		// Save alt aliases
@@ -2025,19 +2046,28 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 
 				dol_mkdir($pathofwebsite);
 
-
 				// Now generate the master.inc.php page
 				$result = dolSaveMasterFile($filemaster);
 
 				if (!$result) setEventMessages('Failed to write the master file file '.$filemaster, null, 'errors');
 
-
-				// Now generate the alias.php page
-				if (!empty($fileoldalias))
+				// Now delete the old alias.php page if we removed one
+				/*if (!empty($fileoldalias))
 				{
 					dol_syslog("We regenerate alias page new name=".$filealias.", old name=".$fileoldalias);
 					dol_delete_file($fileoldalias);
-				}
+
+					// Delete also pages into language subdirectories
+					if (empty($objectpage->lang) || !in_array($objectpage->lang, explode(',', $object->otherlang))) {
+						$dirname = dirname($fileoldalias);
+						$filename = basename($fileoldalias);
+						$sublangs = explode(',', $object->otherlang);
+						foreach ($sublangs as $sublang) {
+							$fileoldaliassub = $dirname.'/'.$sublang.'/'.$filename;
+							dol_delete_file($fileoldaliassub);
+						}
+					}
+				}*/
 
 				// Save page alias
 				$result = dolSavePageAlias($filealias, $object, $objectpage);
@@ -2429,15 +2459,17 @@ if (!GETPOST('hide_websitemenu'))
 
 			//print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditMenu")).'" name="editmenu">';
 			print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($exportlabel).'" name="exportsite">';
+
 			print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("CloneSite")).'" name="createfromclone">';
 
 			print '<input type="submit" class="buttonDelete bordertransp" name="deletesite" value="'.$langs->trans("Delete").'"'.($atleastonepage ? ' disabled="disabled"' : '').'>';
 
+			// Regenerate all pages
+			print '<a href="'.$_SERVER["PHP_SEFL"].'?action=regeneratesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("RegenerateWebsiteContent")).'"><span class="fa fa-cogs"><span></a>';
+
 			print ' &nbsp; ';
 
 			print '<a href="'.$_SERVER["PHP_SEFL"].'?action=replacesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("ReplaceWebsiteContent")).'"><span class="fa fa-search"><span></a>';
-
-			print '<a href="'.$_SERVER["PHP_SEFL"].'?action=regeneratesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("RegenerateWebsiteContent")).'"><span class="fa fa-cogs"><span></a>';
 		}
 
 		print '</span>';
@@ -3628,11 +3660,11 @@ if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of
 
 		print '<tr><td class="toptd">'.$form->editfieldkey('Categories', 'categories', '', $objectpage, 0).'</td><td>';
 		print img_picto('', 'category', 'class="paddingright"');
-		print $form->multiselectarray('categories', $cate_arbo, (GETPOSTISSET('categories') ? GETPOST('categories', 'array') : $arrayselected), null, null, 'quatrevingtpercent widthcentpercentminusx');
+		print $form->multiselectarray('categories', $cate_arbo, (GETPOSTISSET('categories') ? GETPOST('categories', 'array') : $arrayselected), null, null, 'minwidth200 widthcentpercentminusxx');
 		print "</td></tr>";
 	}
 
-	if (!empty($conf->global->WEBSITE_PAGE_SHOW_INTERNAL_LINKS_TO_OBJECT)) {
+	if (!empty($conf->global->WEBSITE_PAGE_SHOW_INTERNAL_LINKS_TO_OBJECT)) {	// TODO Replace this with link into element_element ?
 		print '<tr><td class="titlefieldcreate">';
 		print 'ObjectClass';
 		print '</td><td>';
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
new file mode 100755
index 00000000000..31497cbc919
--- /dev/null
+++ b/htdocs/workstation/class/workstation.class.php
@@ -0,0 +1,1054 @@
+<?php
+/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/workstation.class.php
+ * \ingroup     workstation
+ * \brief       This file is a CRUD class file for Workstation (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 Workstation
+ */
+class Workstation extends CommonObject
+{
+	/**
+	 * @var string ID of module.
+	 */
+	public $module = 'workstation';
+
+	/**
+	 * @var string ID to identify managed object.
+	 */
+	public $element = 'workstation';
+
+	/**
+	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
+	 */
+	public $table_element = 'workstation_workstation';
+
+	/**
+	 * @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 workstation. Must be the part after the 'object_' into object_workstation.png
+	 */
+	public $picto = 'mrp';
+
+
+	const STATUS_DISABLED = 0;
+	const STATUS_ENABLED = 1;
+
+
+	/**
+	 *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  'picto' is code of a picto to show before value in forms
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
+	 *  'help' is a string visible as a tooltip on field
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
+
+	// BEGIN MODULEBUILDER PROPERTIES
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields=array(
+		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
+		'ref' => array('type'=>'varchar(128)', 'picto'=>'mrp', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>1, 'noteditable'=>'0', 'default'=>'', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
+		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'showoncombobox'=>'1',),
+		'type' => array('type'=>'select', 'label'=>'Type', 'enabled'=>'1', 'position'=>32, 'default'=>1, 'notnull'=>1, 'visible'=>1, 'arrayofkeyval'=>array('HUMAN'=>'Human', 'MACHINE'=>'Machine', 'BOTH'=>'HumanMachine'),),
+		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
+		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
+		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
+		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
+		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
+		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
+		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>512, 'notnull'=>-1, 'visible'=>-2,),
+		'nb_operators_required' => array('type'=>'integer', 'label'=>'NbOperatorsRequired', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1,),
+		'thm_operator_estimated' => array('type'=>'double', 'help'=>'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,),
+		'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;
+	public $ref;
+	public $label;
+	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 $nb_operators_required;
+	public $thm_operator_estimated;
+	public $thm_machine_estimated;
+	// END MODULEBUILDER PROPERTIES
+
+
+	// If this object has a subtable with lines
+
+	/**
+	 * @var int    Name of subtable line
+	 */
+	//public $table_element_line = 'workstation_workstationline';
+
+	/**
+	 * @var int    Field with ID of parent key if this object has a parent
+	 */
+	//public $fk_element = 'fk_workstation';
+
+	/**
+	 * @var int    Name of subtable class that manage subtable lines
+	 */
+	//public $class_element_line = 'Workstationline';
+
+	/**
+	 * @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('workstation_workstationdet');
+
+	/**
+	 * @var WorkstationLine[]     Array of subtable lines
+	 */
+	//public $lines = array();
+
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		global $conf, $langs;
+
+		dol_include_once('/workstation/class/workstationusergroup.class.php');
+		dol_include_once('/workstation/class/workstationresource.class.php');
+
+		$this->db = $db;
+
+		$this->fields['ref']['default'] = $this->getNextNumRef();
+
+		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->workstation->workstation->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 $db;
+
+		$id = $this->createCommon($user, $notrigger);
+
+		// Usergroups
+		$groups = GETPOST('groups');
+		if (empty($groups)) $groups = $this->usergroups; // createFromClone
+		if (!empty($groups)) {
+			foreach ($groups as $id_group) {
+				$ws_usergroup = new WorkstationUserGroup($db);
+				$ws_usergroup->fk_workstation = $id;
+				$ws_usergroup->fk_usergroup = $id_group;
+				$ws_usergroup->createCommon($user);
+				$this->usergroups[] = $id_group;
+			}
+		}
+
+		// Resources
+		$resources = GETPOST('resources');
+		if (empty($resources)) $resources = $this->resources; // createFromClone
+		if (!empty($resources)) {
+			foreach ($resources as $id_resource) {
+				$ws_resource = new WorkstationResource($db);
+				$ws_resource->fk_workstation = $id;
+				$ws_resource->fk_resource = $id_resource;
+				$ws_resource->createCommon($user);
+				$this->resources[] = $id_resource;
+			}
+		}
+
+		return $id;
+	}
+
+	/**
+	 * 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->fetch($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_DISABLED; }
+		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->create($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
+
+		if (!$error)
+		{
+			// copy internal contacts
+			if ($this->copy_linked_contact($object, 'internal') < 0)
+			{
+				$error++;
+			}
+		}
+
+		if (!$error)
+		{
+			// copy external contacts if same company
+			if (property_exists($this, 'socid') && $this->socid == $object->socid)
+			{
+				if ($this->copy_linked_contact($object, 'external') < 0)
+					$error++;
+			}
+		}
+
+		unset($object->context['createfromclone']);
+
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id   Id object
+	 * @param string $ref  Ref
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id, $ref = null)
+	{
+		$result = $this->fetchCommon($id, $ref);
+
+		$this->usergroups = WorkstationUserGroup::getAllGroupsOfWorkstation($this->id);
+		$this->resources = WorkstationResource::getAllResourcesOfWorkstation($this->id);
+
+		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
+		return $result;
+	}
+
+	/**
+	 * Load object lines in memory from the database
+	 *
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetchLines()
+	{
+		$this->lines = array();
+
+		$result = $this->fetchLinesCommon();
+		return $result;
+	}
+
+
+	/**
+	 * Load list of objects in memory from the database.
+	 *
+	 * @param  string      $sortorder    Sort Order
+	 * @param  string      $sortfield    Sort field
+	 * @param  int         $limit        limit
+	 * @param  int         $offset       Offset
+	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
+	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @return array|int                 int <0 if KO, array of pages if OK
+	 */
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	{
+		global $conf;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$records = array();
+
+		$sql = 'SELECT ';
+		$sql .= $this->getFieldList();
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+		else $sql .= ' WHERE 1 = 1';
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				if ($key == 't.rowid') {
+					$sqlwhere[] = $key.'='.$value;
+				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+				} elseif ($key == 'customsql') {
+					$sqlwhere[] = $value;
+				} elseif (strpos($value, '%') === false) {
+					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
+				} else {
+					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				}
+			}
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+		}
+
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
+		if (!empty($limit)) {
+			$sql .= ' '.$this->db->plimit($limit, $offset);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < ($limit ? min($limit, $num) : $num))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$record = new self($this->db);
+				$record->setVarsFromFetchObj($obj);
+
+				$records[$record->id] = $record;
+
+				$i++;
+			}
+			$this->db->free($resql);
+
+			return $records;
+		} else {
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+
+			return -1;
+		}
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+
+		// Usergroups
+		$groups = GETPOST('groups');
+		WorkstationUserGroup::deleteAllGroupsOfWorkstation($this->id);
+		$this->usergroups=array();
+
+		foreach ($groups as $id_group) {
+			$ws_usergroup = new WorkstationUserGroup($this->db);
+			$ws_usergroup->fk_workstation = $this->id;
+			$ws_usergroup->fk_usergroup = $id_group;
+			$ws_usergroup->createCommon($user);
+			$this->usergroups[] = $id_group;
+		}
+
+		// Resources
+		$resources = GETPOST('resources');
+		WorkstationResource::deleteAllResourcesOfWorkstation($this->id);
+		$this->resources=array();
+		if (!empty($resources)) {
+			foreach ($resources as $id_resource) {
+				$ws_resource = new WorkstationResource($this->db);
+				$ws_resource->fk_workstation = $this->id;
+				$ws_resource->fk_resource = $id_resource;
+				$ws_resource->createCommon($user);
+				$this->resources[] = $id_resource;
+			}
+		}
+
+		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->workstation->workstation->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->workstation->workstation->workstation_advance->validate))))
+		 {
+		 $this->error='NotEnoughPermissions';
+		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
+		 return -1;
+		 }*/
+
+		$now = dol_now();
+
+		$this->db->begin();
+
+		// Define new ref
+		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+		{
+			$num = $this->getNextNumRef();
+		} else {
+			$num = $this->ref;
+		}
+		$this->newref = $num;
+
+		if (!empty($num)) {
+			// Validate
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET ref = '".$this->db->escape($num)."',";
+			$sql .= " status = ".self::STATUS_VALIDATED;
+			if (!empty($this->fields['date_validation'])) $sql .= ", date_validation = '".$this->db->idate($now)."'";
+			if (!empty($this->fields['fk_user_valid'])) $sql .= ", fk_user_valid = ".$user->id;
+			$sql .= " WHERE rowid = ".$this->id;
+
+			dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				dol_print_error($this->db);
+				$this->error = $this->db->lasterror();
+				$error++;
+			}
+
+			if (!$error && !$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('WORKSTATION_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 = 'workstation/".$this->db->escape($this->newref)."'";
+				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'workstation/".$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->workstation->dir_output.'/workstation/'.$oldref;
+				$dirdest = $conf->workstation->dir_output.'/workstation/'.$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->workstation->dir_output.'/workstation/'.$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	int	$status			New status to set
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function setStatus($status, $notrigger = 0)
+	{
+		global $user;
+
+		$this->status = $status;
+
+		if (empty($status)) return $this->setDisabled($user, $notrigger);
+		else return $this->setEnabled($user, $notrigger);
+	}
+
+
+	/**
+	 *	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 setEnabled($user, $notrigger = 0)
+	{
+		return $this->setStatusCommon($user, self::STATUS_ENABLED, $notrigger, 'WORKSTATION_ENABLED');
+	}
+
+
+	/**
+	 *	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 setDisabled($user, $notrigger = 0)
+	{
+		return $this->setStatusCommon($user, self::STATUS_DISABLED, $notrigger, 'WORKSTATION_DISABLED');
+	}
+
+	/**
+	 *  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("Workstation").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		if (isset($this->status)) {
+			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+		}
+
+		$url = dol_buildpath('/workstation/workstation_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("ShowWorkstation");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
+
+		$result .= $linkstart;
+
+		if (empty($this->showphoto_on_popup)) {
+			if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'mrp'), ($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 : 'mrp'), ($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('workstationdao'));
+		$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("workstation@workstation");
+			$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled');
+			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled');
+		}
+
+		$statusType = 'status'.$status;
+		//if ($status == self::STATUS_VALIDATED) $statusType = 'status1';
+		//if ($status == self::STATUS_CANCELED) $statusType = 'status6';
+
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
+	}
+
+	/**
+	 *	Load the info information in the object
+	 *
+	 *	@param  int		$id       Id of object
+	 *	@return	void
+	 */
+	public function info($id)
+	{
+		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
+		$sql .= ' fk_user_creat, fk_user_modif';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= ' WHERE t.rowid = '.$id;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+				if ($obj->fk_user_author)
+				{
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+
+				if ($obj->fk_user_valid)
+				{
+					$vuser = new User($this->db);
+					$vuser->fetch($obj->fk_user_valid);
+					$this->user_validation = $vuser;
+				}
+
+				if ($obj->fk_user_cloture)
+				{
+					$cluser = new User($this->db);
+					$cluser->fetch($obj->fk_user_cloture);
+					$this->user_cloture = $cluser;
+				}
+
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_validation   = $this->db->jdate($obj->datev);
+			}
+
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->initAsSpecimenCommon();
+	}
+
+	/**
+	 * 	Create an array of lines
+	 *
+	 * 	@return array|int		array of lines if OK, <0 if KO
+	 */
+	public function getLinesArray()
+	{
+		$this->lines = array();
+
+		$objectline = new WorkstationLine($this->db);
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_workstation = '.$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("workstation@workstation");
+
+		if (empty($conf->global->WORKSTATION_WORKSTATION_ADDON)) {
+			$conf->global->WORKSTATION_WORKSTATION_ADDON = 'mod_workstation_standard';
+		}
+
+		if (!empty($conf->global->WORKSTATION_WORKSTATION_ADDON))
+		{
+			$mybool = false;
+
+			$file = $conf->global->WORKSTATION_WORKSTATION_ADDON.".php";
+			$classname = $conf->global->WORKSTATION_WORKSTATION_ADDON;
+
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir)
+			{
+				$dir = dol_buildpath($reldir."core/modules/workstation/");
+
+				// 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("workstation@workstation");
+
+		if (!dol_strlen($modele)) {
+			$modele = 'standard_workstation';
+
+			if ($this->model_pdf) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($conf->global->WORKSTATION_ADDON_PDF)) {
+				$modele = $conf->global->WORKSTATION_ADDON_PDF;
+			}
+		}
+
+		$modelpath = "core/modules/workstation/doc/";
+
+		if ($includedocgeneration) {
+			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Action executed by scheduler
+	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
+	 * Use public function doScheduledJob($param1, $param2, ...) to get parameters
+	 *
+	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
+	 */
+	public function doScheduledJob()
+	{
+		global $conf, $langs;
+
+		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
+
+		$error = 0;
+		$this->output = '';
+		$this->error = '';
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$now = dol_now();
+
+		$this->db->begin();
+
+		// ...
+
+		$this->db->commit();
+
+		return $error;
+	}
+}
diff --git a/htdocs/workstation/class/workstationresource.class.php b/htdocs/workstation/class/workstationresource.class.php
new file mode 100644
index 00000000000..6e6860f2230
--- /dev/null
+++ b/htdocs/workstation/class/workstationresource.class.php
@@ -0,0 +1,117 @@
+<?php
+/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/workstationresource.class.php
+ * \ingroup     workstation
+ * \brief       This file is a CRUD class file for WorkstationResource (Create/Read/Update/Delete)
+ */
+
+
+/**
+ * Class to link resource with Workstations
+ */
+class WorkstationResource extends CommonObject
+{
+	/** @var string $table_element Table name in SQL */
+	public $table_element = 'workstation_workstation_resource';
+
+	/** @var string $element Name of the element (tip for better integration in Dolibarr: this value should be the reflection of the class name with ucfirst() function) */
+	public $element = 'workstationresource';
+
+	/**
+	 * @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')
+	);
+
+	/**
+	 * @var int ID of workstation
+	 */
+	public $fk_workstation;
+
+	/**
+	 * @var int ID of dolresource
+	 */
+	public $fk_resource;
+
+
+	/**
+	 * WorkstationResource constructor.
+	 *
+	 * @param DoliDB    $db    Database connector
+	 */
+	public function __construct($db)
+	{
+		global $langs;
+
+		$this->db = $db;
+
+		// 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);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Function used to get an array with all resources linked to a workstation
+	 *
+	 * @param	int		$fk_workstation		Id of workstation we need to get linked resources
+	 * @return 	array						Array of record
+	 */
+	static public function getAllResourcesOfWorkstation($fk_workstation)
+	{
+		global $db;
+		$obj = new self($db);
+		return parent::getAllItemsLinkedByObjectID($fk_workstation, 'fk_resource', 'fk_workstation', $obj->table_element);
+	}
+
+	/**
+	 * Function used to remove all resources linked to a workstation
+	 *
+	 * @param	int		$fk_workstation		Id of workstation we need to remove linked resources
+	 * @return 	int							<0 if KO, 0 if nothing done, >0 if OK and something done
+	 */
+	static public function deleteAllResourcesOfWorkstation($fk_workstation)
+	{
+		global $db;
+		$obj = new self($db);
+		return parent::deleteAllItemsLinkedByObjectID($fk_workstation, 'fk_workstation', $obj->table_element);
+	}
+}
diff --git a/htdocs/workstation/class/workstationusergroup.class.php b/htdocs/workstation/class/workstationusergroup.class.php
new file mode 100644
index 00000000000..920fb896bdc
--- /dev/null
+++ b/htdocs/workstation/class/workstationusergroup.class.php
@@ -0,0 +1,118 @@
+<?php
+/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/workstationusergroup.class.php
+ * \ingroup     workstation
+ * \brief       This file is a CRUD class file for WorkstationUserGroup (Create/Read/Update/Delete)
+ */
+
+/**
+ * Class to link User groups and Workstations
+ */
+class WorkstationUserGroup extends CommonObject
+{
+	/** @var string $table_element Table name in SQL */
+	public $table_element = 'workstation_workstation_usergroup';
+
+	/** @var string $element Name of the element (tip for better integration in Dolibarr: this value should be the reflection of the class name with ucfirst() function) */
+	public $element = 'workstationusergroup';
+
+	/**
+	 * @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')
+	);
+
+	/**
+	 * @var int ID of workstation
+	 */
+	public $fk_workstation;
+
+	/**
+	 * @var int ID of user group
+	 */
+	public $fk_usergroup;
+
+
+	/**
+	 * WorkstationUserGroup constructor.
+	 *
+	 * @param DoliDB    $db    Database connector
+	 */
+	public function __construct($db)
+	{
+		global $langs;
+
+		$this->db = $db;
+
+		// 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);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Function used to get an array with all usergroups linked to a workstation
+	 *
+	 * @param	int		$fk_workstation		id of workstation we need to get linked usergroups
+	 * @return 	array						Array of record
+	 */
+	static public function getAllGroupsOfWorkstation($fk_workstation)
+	{
+		global $db;
+
+		$obj = new self($db);
+		return parent::getAllItemsLinkedByObjectID($fk_workstation, 'fk_usergroup', 'fk_workstation', $obj->table_element);
+	}
+
+	/**
+	 * Function used to remove all usergroups linked to a workstation
+	 *
+	 * @param	int		$fk_workstation		Id of workstation we need to remove linked usergroups
+	 * @return 	int							<0 if KO, 0 if nothing done, >0 if OK and something done
+	 */
+	static public function deleteAllGroupsOfWorkstation($fk_workstation)
+	{
+		global $db;
+
+		$obj = new self($db);
+		return parent::deleteAllItemsLinkedByObjectID($fk_workstation, 'fk_workstation', $obj->table_element);
+	}
+}
diff --git a/htdocs/workstation/lib/workstation.lib.php b/htdocs/workstation/lib/workstation.lib.php
new file mode 100755
index 00000000000..18307d0cd3a
--- /dev/null
+++ b/htdocs/workstation/lib/workstation.lib.php
@@ -0,0 +1,65 @@
+<?php
+/* 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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    workstation/lib/workstation.lib.php
+ * \ingroup workstation
+ * \brief   Library files with common functions for Workstation
+ */
+
+/**
+ * Prepare admin pages header
+ *
+ * @return array
+ */
+function workstationAdminPrepareHead()
+{
+	global $langs, $conf;
+
+	$langs->load("workstation@workstation");
+
+	$h = 0;
+	$head = array();
+	$head[$h][0] = DOL_URL_ROOT . "/admin/workstation.php";
+	$head[$h][1] = $langs->trans("Settings");
+	$head[$h][2] = 'settings';
+	$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, 'workstation');
+
+	return $head;
+}
diff --git a/htdocs/workstation/lib/workstation_workstation.lib.php b/htdocs/workstation/lib/workstation_workstation.lib.php
new file mode 100755
index 00000000000..cc7fcc58f89
--- /dev/null
+++ b/htdocs/workstation/lib/workstation_workstation.lib.php
@@ -0,0 +1,85 @@
+<?php
+/* 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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/workstation_workstation.lib.php
+ * \ingroup workstation
+ * \brief   Library files with common functions for Workstation
+ */
+
+/**
+ * Prepare array of tabs for Workstation
+ *
+ * @param	Workstation	$object		Workstation
+ * @return 	array					Array of tabs
+ */
+function workstationPrepareHead($object)
+{
+	global $db, $langs, $conf;
+
+	$langs->load("workstation@workstation");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = dol_buildpath("/workstation/workstation_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('/workstation/workstation_note.php', 1).'?id='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
+		if ($nbNote > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+		$head[$h][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->workstation->dir_output."/workstation/".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("/workstation/workstation_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("/workstation/workstation_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:@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, $object, $head, $h, 'workstation@workstation');
+
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'workstation@workstation', 'remove');
+
+	return $head;
+}
diff --git a/htdocs/workstation/workstation_agenda.php b/htdocs/workstation/workstation_agenda.php
new file mode 100755
index 00000000000..e2951554488
--- /dev/null
+++ b/htdocs/workstation/workstation_agenda.php
@@ -0,0 +1,276 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       workstation_agenda.php
+ *  \ingroup    workstation
+ *  \brief      Tab of events on Workstation
+ */
+
+//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
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+dol_include_once('/workstation/class/workstation.class.php');
+dol_include_once('/workstation/lib/workstation_workstation.lib.php');
+
+
+// Load translation files required by the page
+$langs->loadLangs(array("workstation@workstation", "other"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref        = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel     = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+if (GETPOST('actioncode', 'array')) {
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
+} else {
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+}
+$search_agenda_label = GETPOST('search_agenda_label');
+
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortfield) $sortfield = 'a.datep,a.id';
+if (!$sortorder) $sortorder = 'DESC,DESC';
+
+// Initialize technical objects
+$object = new Workstation($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->workstation->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('workstationagenda', '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->workstation->multidir_output[$object->entity]."/".$object->id;
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'workstation', $object->id);
+
+$permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php
+
+
+/*
+ *  Actions
+ */
+
+$parameters = array('id'=>$id);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$actioncode = '';
+		$search_agenda_label = '';
+	}
+}
+
+
+
+/*
+ *	View
+ */
+
+$form = new Form($db);
+
+if ($object->id > 0)
+{
+	$title = $langs->trans("Agenda");
+	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	$help_url = '';
+	llxHeader('', $title, $help_url);
+
+	if (!empty($conf->notification->enabled)) $langs->load("mails");
+	$head = workstationPrepareHead($object);
+
+
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("Workstation"), -1, 'mrp');
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/workstation/workstation_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	// Ref customer
+	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	// Thirdparty
+	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	// Project
+	if (! empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+		if ($permissiontoadd)
+		{
+			if ($action != 'classify')
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			$morehtmlref.=' : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref.='<input type="hidden" name="action" value="classin">';
+				$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref.='</form>';
+			} else {
+				$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (! empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= ': '.$proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}*/
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+	print '<div class="fichecenter">';
+	print '<div class="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("ActionsOnWorkstation"), '', '');
+
+		// 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/workstation/workstation_card.php b/htdocs/workstation/workstation_card.php
new file mode 100755
index 00000000000..e5d51b20c84
--- /dev/null
+++ b/htdocs/workstation/workstation_card.php
@@ -0,0 +1,504 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       workstation_card.php
+ *		\ingroup    workstation
+ *		\brief      Page to create/edit/view workstation
+ */
+
+//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
+$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.'/resource/class/html.formresource.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
+dol_include_once('/workstation/class/workstation.class.php');
+dol_include_once('/workstation/lib/workstation_workstation.lib.php');
+dol_include_once('/workstation/class/workstationusergroup.class.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("workstation@workstation", "other"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref        = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$confirm    = GETPOST('confirm', 'alpha');
+$cancel     = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'workstationcard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+$groups	= GETPOST('groups');
+$resources	= GETPOST('resources');
+//$lineid   = GETPOST('lineid', 'int');
+
+// Initialize technical objects
+$object = new Workstation($db);
+//$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->workstation->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('workstationcard', 'globalcard')); // Note that conf->hooks_modules contains array
+
+// 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->workstation->workstation->read;
+$permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->workstation->workstation->delete;
+$permissionnote = $user->rights->workstation->workstation->write; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->workstation->workstation->write; // Used by the include of actions_dellink.inc.php
+$upload_dir = $conf->workstation->multidir_output[isset($object->entity) ? $object->entity : 1];
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$isdraft = (($object->statut == $object::STATUS_DRAFT) ? 1 : 0);
+//$result = restrictedArea($user, 'workstation', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
+
+if (!$permissiontoread) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+	$error = 0;
+
+	$backurlforlist = dol_buildpath('/workstation/workstation_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('/workstation/workstation_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+		}
+	}
+
+	$triggermodname = 'WORKSTATION_WORKSTATION_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 == 'confirm_enable' && $confirm == "yes" && $permissiontoadd) {
+		if (!empty($object->id)) $object->setStatus(1);
+	} elseif ($action == 'confirm_disable' && $confirm == "yes" && $permissiontoadd) {
+		if (!empty($object->id)) $object->setStatus(0);
+	}
+}
+
+
+
+
+/*
+ * View
+ *
+ * Put here all code to build page
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+$formresource = new FormResource($db);
+
+$title = $langs->trans("Workstation");
+$help_url = '';
+llxHeader('', $title, $help_url);
+
+// Example : Adding jquery code
+?>
+	<script type="text/javascript" language="javascript">
+
+		jQuery(document).ready(function() {
+			jQuery("#type").change(function() {
+				if($(this).val() === 'MACHINE') {
+                    $('#usergroups').hide();
+                    $('#nb_operators_required').parent('td').parent('tr').hide();
+					$('#wsresources').show();
+                } else if($(this).val() === 'HUMAN') {
+					$('#wsresources').hide();
+					$('#nb_operators_required').parent('td').parent('tr').show();
+					$('#usergroups').show();
+				}
+				else {
+					$('#usergroups').show();
+					$('#wsresources').show();
+					$('#nb_operators_required').parent('td').parent('tr').show();
+				}
+			});
+			jQuery("#type").trigger('change');
+		});
+
+	</script>
+<?php
+
+// Part to create
+if ($action == 'create')
+{
+	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("Workstation")), '', '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';
+
+	print '<tr id="usergroups"';
+	print ' ><td>';
+	print $langs->trans('Groups');
+	print '</td>';
+	print '<td>';
+	print img_picto('', 'group');
+	print $form->select_dolgroups($groups, 'groups', 1, '', 0, '', '', $object->entity, true);
+	print '</td></tr>';
+
+	print '<tr id="wsresources"><td>';
+	print $langs->trans('Machines');
+	print '</td>';
+	print '<td>';
+	print img_picto('', 'resource');
+	print $formresource->select_resource_list($resources, 'resources', '', '', 0, '', '', $object->entity, true, 0, '', true);
+	print '</td></tr>';
+
+	// Other attributes
+	//include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+
+	print '</table>'."\n";
+
+	print dol_get_fiche_end();
+
+	print '<div class="center">';
+	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
+	print '&nbsp; ';
+	print '<input type="'.($backtopage ? "submit" : "button").'" class="button 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("Workstation"), '', '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 '<tr id="usergroups"';
+	print '><td>';
+	print $langs->trans('Groups');
+	print '</td>';
+	print '<td>';
+	print img_picto('', 'group');
+	print $form->select_dolgroups(empty($groups) ? $object->usergroups : $groups, 'groups', 1, '', 0, '', '', $object->entity, true);
+	print '</td></tr>';
+
+	print '<tr id="wsresources"><td>';
+	print $langs->trans('Machines');
+	print '</td>';
+	print '<td>';
+	print img_picto('', 'resource');
+	print $formresource->select_resource_list(empty($resources) ? $object->resources : $resources, 'resources', '', '', 0, '', '', $object->entity, true, 0, '', true);
+	print '</td></tr>';
+
+	// 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 = workstationPrepareHead($object);
+	print dol_get_fiche_head($head, 'card', $langs->trans("Workstation"), -1, $object->picto);
+
+	$formconfirm = '';
+
+	// Confirmation to delete
+	if ($action == 'delete') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteWorkstation'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
+	}
+	// 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 == 'enable')
+	{
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('EnableAWorkstation'), $langs->trans("ConfirmEnableWorkstation", $object->ref), 'confirm_enable', $formquestion, 0, 1, 220);
+	} elseif ($action == 'disable')
+	{
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DisableAWorkstation'), $langs->trans("ConfirmDisableWorkstation", $object->ref), 'confirm_disable', $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('/workstation/workstation_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 //if ($action != 'classify') $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> ';
+	 $morehtmlref .= ' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref .= '<input type="hidden" name="action" value="classin">';
+	 $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref .= '</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">'."\n";
+
+	// Common attributes
+	//$keyforbreak='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
+	if ($object->type === 'MACHINE') $object->fields['nb_operators_required']['visible'] = 0;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+
+	// Groups
+	if ($object->type !== 'MACHINE') {
+		$toprint = array();
+		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>';
+		}
+		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 '</td></tr>';
+	}
+
+	// Resources
+	if ($object->type !== 'HUMAN') {
+		$toprint = array();
+		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>';
+		}
+		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 '</td></tr>';
+	}
+
+	// Other attributes. Fields from hook formObjectOptions and Extrafields.
+	//include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+
+	print '</table>';
+	print '</div>';
+	print '</div>';
+
+	print '<div class="clearboth"></div>';
+
+	print dol_get_fiche_end();
+
+
+	// 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))
+		{
+			// Modify
+			if ($permissiontoadd) {
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit">'.$langs->trans("Modify").'</a>'."\n";
+			} else {
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
+			}
+
+			// Clone
+			if ($permissiontoadd) {
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=workstation">'.$langs->trans("ToClone").'</a>'."\n";
+			}
+
+
+			if ($permissiontoadd)
+			{
+				if ($object->status == $object::STATUS_ENABLED) {
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable">'.$langs->trans("Disable").'</a>'."\n";
+				} else {
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable">'.$langs->trans("Enable").'</a>'."\n";
+				}
+			}
+
+
+			// Delete (need delete permission, or if draft, just need create/modify permission)
+			if ($permissiontodelete)
+			{
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
+			} else {
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
+			}
+		}
+		print '</div>'."\n";
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/workstation/workstation_document.php b/htdocs/workstation/workstation_document.php
new file mode 100755
index 00000000000..89a34f55549
--- /dev/null
+++ b/htdocs/workstation/workstation_document.php
@@ -0,0 +1,228 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       workstation_document.php
+ *  \ingroup    workstation
+ *  \brief      Tab for documents linked to Workstation
+ */
+
+//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
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+dol_include_once('/workstation/class/workstation.class.php');
+dol_include_once('/workstation/lib/workstation_workstation.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("workstation@workstation", "companies", "other", "mails"));
+
+
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm');
+$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$ref = GETPOST('ref', 'alpha');
+
+// Get parameters
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "name";
+//if (! $sortfield) $sortfield="position_name";
+
+// Initialize technical objects
+$object = new Workstation($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->workstation->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('workstationdocument', '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->workstation->multidir_output[$object->entity ? $object->entity : $conf->entity]."/workstation/".get_exdir(0, 0, 0, 1, $object);
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'workstation', $object->id);
+
+$permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php
+
+
+
+/*
+ * Actions
+ */
+
+include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$title = $langs->trans("Workstation").' - '.$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 = workstationPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'document', $langs->trans("Workstation"), -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('/workstation/workstation_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 $morehtmlref.=' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref.='</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	$morehtmlref .= '</div>';
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+	print '<div class="fichecenter">';
+
+	print '<div class="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 = 'workstation';
+	//$permission = $user->rights->workstation->workstation->write;
+	$permission = 1;
+	//$permtoedit = $user->rights->workstation->workstation->write;
+	$permtoedit = 1;
+	$param = '&id='.$object->id;
+
+	//$relativepathwithnofile='workstation/' . dol_sanitizeFileName($object->id).'/';
+	$relativepathwithnofile = 'workstation/'.dol_sanitizeFileName($object->ref).'/';
+
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+} else {
+	accessforbidden('', 0, 1);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/workstation/workstation_list.php b/htdocs/workstation/workstation_list.php
new file mode 100755
index 00000000000..996e7dc34fd
--- /dev/null
+++ b/htdocs/workstation/workstation_list.php
@@ -0,0 +1,687 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       workstation_list.php
+ *		\ingroup    workstation
+ *		\brief      List page for workstation
+ */
+
+//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
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php';
+
+// load workstation libraries
+require_once __DIR__.'/class/workstation.class.php';
+
+// for other modules
+//dol_include_once('/othermodule/class/otherobject.class.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("workstation@workstation", "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') : 'workstationlist'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
+$optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+
+$id = GETPOST('id', 'int');
+
+// Load variable for pagination
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+// Initialize technical objects
+$object = new Workstation($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->workstation->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('workstationlist')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+//$extrafields->fetch_name_optionals_label($object->table_element_line);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Default sort order (if not yet defined by previous GETPOST)
+if (!$sortfield) $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
+if (!$sortorder) $sortorder = "ASC";
+
+// Initialize array of search criterias
+$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
+$search = array();
+
+foreach ($object->fields as $key => $val)
+{
+	if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
+	if (in_array($key, array('type', 'status')) && GETPOST('search_'.$key, 'alpha') == -1) $search[$key] = '';
+}
+
+$groups = GETPOST('groups');
+$resources = GETPOST('resources');
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array();
+foreach ($object->fields as $key => $val)
+{
+	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
+}
+
+// Definition of array of fields for columns
+$arrayfields = array();
+foreach ($object->fields as $key => $val)
+{
+	// If $val['visible']==0, then we never show the field
+	if (!empty($val['visible'])) {
+		$visible = dol_eval($val['visible'], 1);
+		$arrayfields['t.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'position'=>$val['position'],
+			'help'=>$val['help']
+		);
+	}
+}
+
+$arrayfields['wug.fk_usergroup'] = array(
+	'label'=>$langs->trans('Groups'),
+	'checked'=>(($visible < 0) ? 0 : 1),
+	'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+	'position'=>1000,
+	'help'=>$val['help']
+);
+
+$arrayfields['wr.fk_resource'] = array(
+	'label'=>$langs->trans('Resources'),
+	'checked'=>(($visible < 0) ? 0 : 1),
+	'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+	'position'=>1001,
+	'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->workstation->workstation->read;
+$permissiontoadd = $user->rights->workstation->workstation->write;
+$permissiontodelete = $user->rights->workstation->workstation->delete;
+
+// Security check
+if (empty($conf->workstation->enabled)) accessforbidden('Module not enabled');
+$socid = 0;
+if ($user->socid > 0)	// Protection if external user
+{
+	//$socid = $user->socid;
+	accessforbidden();
+}
+//$result = restrictedArea($user, 'workstation', $id, '');
+//if (!$permissiontoread) accessforbidden();
+
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		foreach ($object->fields as $key => $val)
+		{
+			$search[$key] = '';
+		}
+		$groups=$resources=array();
+		$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 = 'Workstation';
+	$objectlabel = 'Workstation';
+	$uploaddir = $conf->workstation->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formresource = new FormResource($db);
+
+$now = dol_now();
+
+//$help_url="EN:Module_Workstation|FR:Module_Workstation_FR|ES:Módulo_Workstation";
+$help_url = '';
+$title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Workstations"));
+
+
+// Build and execute select
+// --------------------------------------------------------------------
+$sql = 'SELECT ';
+foreach ($object->fields as $key => $val)
+{
+	$sql .= 't.'.$key.', ';
+}
+// Add fields from extrafields
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+}
+// Add fields from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql = preg_replace('/,\s*$/', '', $sql);
+$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
+if (!empty($groups)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'workstation_workstation_usergroup wug ON (wug.fk_workstation = t.rowid)';
+if (!empty($resources)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'workstation_workstation_resource wr ON (wr.fk_workstation = t.rowid)';
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity($object->element).")";
+else $sql .= " WHERE 1 = 1";
+foreach ($search as $key => $val)
+{
+	if ($key == 'status' && $search[$key] == -1) continue;
+	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
+	if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
+		if ($search[$key] == '-1') $search[$key] = '';
+		$mode_search = 2;
+	}
+	if ($search[$key] != '') $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+}
+if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+//$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
+// Add where from extra fields
+
+// usergroups
+if (!empty($groups)) $sql.= ' AND wug.fk_usergroup IN('.implode(',', $groups).')';
+
+// resources
+if (!empty($resources)) $sql.= ' AND wr.fk_resource IN('.implode(',', $resources).')';
+
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
+$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.= ' GROUP BY t.rowid';
+$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('/workstation/workstation_card.php', 1).'?id='.$id);
+	exit;
+}
+
+
+// Output page
+// --------------------------------------------------------------------
+
+llxHeader('', $title, $help_url);
+
+// Example : Adding jquery code
+print '<script type="text/javascript" language="javascript">
+jQuery(document).ready(function() {
+	function init_myfunc()
+	{
+		jQuery("#myid").removeAttr(\'disabled\');
+		jQuery("#myid").attr(\'disabled\',\'disabled\');
+	}
+	init_myfunc();
+	jQuery("#mybutton").click(function() {
+		init_myfunc();
+	});
+});
+</script>';
+
+$arrayofselected = is_array($toselect) ? $toselect : array();
+
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+foreach ($search as $key => $val)
+{
+	if (is_array($search[$key]) && count($search[$key])) foreach ($search[$key] as $skey) $param .= '&search_'.$key.'[]='.urlencode($skey);
+	else $param .= '&search_'.$key.'='.urlencode($search[$key]);
+}
+if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
+// Add $param from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// 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'=>$langs->trans("Validate"),
+	//'generate_doc'=>$langs->trans("ReGeneratePDF"),
+	//'builddoc'=>$langs->trans("PDFMerge"),
+	//'presend'=>$langs->trans("SendByMail"),
+);
+if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/workstation/workstation_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+// Add code for pre mass action (confirmation or email presend form)
+$topicmail = "SendWorkstationRef";
+$modelmail = "workstation";
+$objecttmp = new Workstation($db);
+$trackid = 'xxxx'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
+if ($search_all)
+{
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+}
+
+$moreforfilter = '';
+/*$moreforfilter.='<div class="divsearchfield">';
+$moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
+$moreforfilter.= '</div>';*/
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
+else $moreforfilter = $hookmanager->resPrint;
+
+if (!empty($moreforfilter))
+{
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
+}
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+
+// Fields title search
+// --------------------------------------------------------------------
+
+print '<tr class="liste_titre">';
+foreach ($object->fields as $key => $val)
+{
+	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+	elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
+	elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
+	if (!empty($arrayfields['t.'.$key]['checked']))
+	{
+		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+		if (!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_', 'maxwidth125', 1);
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		print '</td>';
+	}
+}
+
+// usergroups
+if (!empty($arrayfields['wug.fk_usergroup']['checked'])) {
+	print '<td class="liste_titre">';
+	print $form->select_dolgroups($groups, 'groups', 1, '', 0, '', '', $conf->entity, true);
+	print '</td>';
+}
+
+// resources
+if (!empty($arrayfields['wr.fk_resource']['checked'])) {
+	print '<td class="liste_titre">';
+	print $formresource->select_resource_list($resources, 'resources', '', '', 0, '', '', $conf->entity, true, 0, '', true);
+	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') $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";
+	}
+}
+
+// usergroups
+if (!empty($arrayfields['wug.fk_usergroup']['checked'])) {
+	print getTitleFieldOfList($arrayfields['wug.fk_usergroup']['label'], 0, $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, '') . "\n";
+}
+
+// resources
+if (!empty($arrayfields['wr.fk_resource']['checked'])) {
+	print getTitleFieldOfList($arrayfields['wr.fk_resource']['label'], 0, $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, '') . "\n";
+}
+
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Action column
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+print '</tr>'."\n";
+
+
+// Detect if we need a fetch on each output line
+$needToFetchEachLine = 0;
+if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0)
+{
+	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val)
+	{
+		if (preg_match('/\$object/', $val)) $needToFetchEachLine++; // There is at least one compute field that use $object
+	}
+}
+
+
+// Loop on record
+// --------------------------------------------------------------------
+$i = 0;
+$totalarray = array();
+while ($i < ($limit ? min($num, $limit) : $num))
+{
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) break; // Should not happen
+
+	// Store properties in $object
+	$object->setVarsFromFetchObj($obj);
+	$object->usergroups = WorkstationUserGroup::getAllGroupsOfWorkstation($obj->rowid);
+	$object->resources = WorkstationResource::getAllResourcesOfWorkstation($obj->rowid);
+
+	// Show here line of result
+	print '<tr class="oddeven">';
+	foreach ($object->fields as $key => $val)
+	{
+		$cssforfield = (empty($val['css']) ? '' : $val['css']);
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
+		elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+
+		if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) $cssforfield .= ($cssforfield ? ' ' : '').'right';
+		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
+
+		if (!empty($arrayfields['t.'.$key]['checked']))
+		{
+			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
+			if ($key == 'status') print $object->getLibStatut(5);
+			else print $object->showOutputField($val, $key, $object->$key, '');
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+			if (!empty($val['isameasure']))
+			{
+				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+				$totalarray['val']['t.'.$key] += $object->$key;
+			}
+		}
+	}
+
+	if (!empty($arrayfields['wug.fk_usergroup']['checked'])) {
+		$toprint = array();
+		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>';
+		}
+		print '<td>';
+		print '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+		print '</td>';
+	}
+
+	if (!empty($arrayfields['wr.fk_resource']['checked'])) {
+		$toprint = array();
+		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>';
+		}
+		print '<td>';
+		print '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+		print '</td>';
+	}
+
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// Action column
+	print '<td class="nowrap center">';
+	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+	{
+		$selected = 0;
+		if (in_array($object->id, $arrayofselected)) $selected = 1;
+		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+	}
+	print '</td>';
+	if (!$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_workstation', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/workstation/workstation_note.php b/htdocs/workstation/workstation_note.php
new file mode 100755
index 00000000000..a9d8a7f3fc2
--- /dev/null
+++ b/htdocs/workstation/workstation_note.php
@@ -0,0 +1,183 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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       workstation_note.php
+ *  \ingroup    workstation
+ *  \brief      Tab for notes on Workstation
+ */
+
+//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
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+dol_include_once('/workstation/class/workstation.class.php');
+dol_include_once('/workstation/lib/workstation_workstation.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("workstation@workstation", "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 Workstation($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->workstation->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('workstationnote', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'workstation', $id);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) $upload_dir = $conf->workstation->multidir_output[$object->entity]."/".$object->id;
+
+$permissionnote = $user->rights->workstation->workstation->write; // Used by the include of actions_setnotes.inc.php
+$permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php
+
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+//$help_url='EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes';
+$help_url = '';
+llxHeader('', $langs->trans('Workstation'), $help_url);
+
+if ($id > 0 || !empty($ref))
+{
+	$object->fetch_thirdparty();
+
+	$head = workstationPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'note', $langs->trans("Workstation"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/workstation/workstation_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 $morehtmlref.=' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref.='</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	 $morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
+	print '<div class="fichecenter">';
+	print '<div class="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/scripts/emailings/reset-invalid-emails.php b/scripts/emailings/reset-invalid-emails.php
index bc35f0f4240..8730d66b96d 100755
--- a/scripts/emailings/reset-invalid-emails.php
+++ b/scripts/emailings/reset-invalid-emails.php
@@ -62,7 +62,7 @@ $user = new User($db);
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 
-if (!in_array($type, array('thirdparties', 'contacts', 'users', 'members'))) {
+if (!in_array($type, array('all', 'thirdparties', 'contacts', 'users', 'members'))) {
 	print "Bad value for parameter type.\n";
 	exit(-1);
 }
diff --git a/test/phpunit/AccountingAccountTest.php b/test/phpunit/AccountingAccountTest.php
index 622bd346872..52efe3a0147 100644
--- a/test/phpunit/AccountingAccountTest.php
+++ b/test/phpunit/AccountingAccountTest.php
@@ -30,9 +30,9 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/accountancy/class/accountingaccount.class.php';
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -46,194 +46,196 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class AccountingAccountTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return AccountingAccountTest
-     */
-    public function __construct()
-    {
-        parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return AccountingAccountTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-        //$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        if (empty($conf->accounting->enabled)) { print __METHOD__." module accouting must be enabled.\n"; exit(-1); }
+		if (empty($conf->accounting->enabled)) {
+			print __METHOD__." module accouting must be enabled.\n"; exit(-1);
+		}
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-        //print $db->getVersion()."\n";
-    }
+		print __METHOD__."\n";
+		//print $db->getVersion()."\n";
+	}
 
-    /**
-     * End phpunit tests
-     *
-     * @return  void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+	/**
+	 * End phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testAccountingAccountCreate
-     *
-     * @return  int		Id of created object
-     */
-    public function testAccountingAccountCreate()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testAccountingAccountCreate
+	 *
+	 * @return  int		Id of created object
+	 */
+	public function testAccountingAccountCreate()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new AccountingAccount($this->savdb);
-        $localobject->fk_pcg_version = 'PCG99-ABREGE';
-        $localobject->account_category = 0;
-        $localobject->pcg_type = 'XXXXX';
-        $localobject->pcg_subtype = 'XXXXX';
-        $localobject->account_number = '411123456';
-        $localobject->account_parent = 0;
-        $localobject->label = 'Account specimen';
-        $localobject->active = 0;
-        $result=$localobject->create($user);
+		$localobject=new AccountingAccount($this->savdb);
+		$localobject->fk_pcg_version = 'PCG99-ABREGE';
+		$localobject->account_category = 0;
+		$localobject->pcg_type = 'XXXXX';
+		$localobject->pcg_subtype = 'XXXXX';
+		$localobject->account_number = '411123456';
+		$localobject->account_parent = 0;
+		$localobject->label = 'Account specimen';
+		$localobject->active = 0;
+		$result=$localobject->create($user);
 
-        print __METHOD__." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testAccountingAccountFetch
-     *
-     * @param   int $id     Id accounting account
-     * @return  AccountingAccount
-     *
-     * @depends	testAccountingAccountCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testAccountingAccountFetch($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testAccountingAccountFetch
+	 *
+	 * @param   int $id     Id accounting account
+	 * @return  AccountingAccount
+	 *
+	 * @depends	testAccountingAccountCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testAccountingAccountFetch($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new AccountingAccount($this->savdb);
-        $result=$localobject->fetch($id);
+		$localobject=new AccountingAccount($this->savdb);
+		$result=$localobject->fetch($id);
 
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testAccountingAccountUpdate
-     *
-     * @param	Object		$localobject	AccountingAccount
-     * @return	int							ID accounting account
-     *
-     * @depends	testAccountingAccountFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testAccountingAccountUpdate($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testAccountingAccountUpdate
+	 *
+	 * @param	AccountingAccount		$localobject	AccountingAccount
+	 * @return	int							ID accounting account
+	 *
+	 * @depends	testAccountingAccountFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testAccountingAccountUpdate($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject->label='New label';
-        $result=$localobject->update($user);
+		$localobject->label='New label';
+		$result=$localobject->update($user);
 
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        return $localobject->id;
-    }
+		return $localobject->id;
+	}
 
-    /**
-     * testAccountingAccountDelete
-     *
-     * @param   int $id         Id of accounting account
-     * @return  int				Result of delete
-     *
-     * @depends testAccountingAccountUpdate
-     * The depends says test is run only if previous is ok
-     */
-    public function testAccountingAccountDelete($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testAccountingAccountDelete
+	 *
+	 * @param   int $id         Id of accounting account
+	 * @return  int				Result of delete
+	 *
+	 * @depends testAccountingAccountUpdate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testAccountingAccountDelete($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new AccountingAccount($this->savdb);
-        $result=$localobject->fetch($id);
-        $result=$localobject->delete($user);
+		$localobject=new AccountingAccount($this->savdb);
+		$result=$localobject->fetch($id);
+		$result=$localobject->delete($user);
 
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        return $result;
-    }
+		return $result;
+	}
 }
diff --git a/test/phpunit/ActionCommTest.php b/test/phpunit/ActionCommTest.php
index abebfd728bf..cb908416535 100644
--- a/test/phpunit/ActionCommTest.php
+++ b/test/phpunit/ActionCommTest.php
@@ -30,9 +30,9 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/comm/action/class/actioncomm.class.php';
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -46,210 +46,212 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class ActionCommTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return ActionCommTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return ActionCommTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        if (empty($conf->agenda->enabled)) { print __METHOD__." module agenda must be enabled.\n"; die(); }
+		if (empty($conf->agenda->enabled)) {
+			print __METHOD__." module agenda must be enabled.\n"; die();
+		}
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-        //print $db->getVersion()."\n";
-    }
+		print __METHOD__."\n";
+		//print $db->getVersion()."\n";
+	}
 
-    /**
-     * End phpunit tests
-     *
-     * @return  void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+	/**
+	 * End phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testActionCommCreate
-     *
-     * @return  int		Id of created object
-     */
-    public function testActionCommCreate()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testActionCommCreate
+	 *
+	 * @return  int		Id of created object
+	 */
+	public function testActionCommCreate()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        $localobject=new ActionComm($this->savdb);
+		$localobject=new ActionComm($this->savdb);
 
-        $localobject->type_code   = 'AC_OTH_AUTO';		// Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
-        $localobject->code        = 'AC_PHPUNITTEST';
-        $localobject->label       = 'This is a description';
-        $localobject->note_private = 'This is note';
-        $localobject->fk_project  = 0;
-        $localobject->datep       = $now;
-        $localobject->datef       = $now;
-        $localobject->percentage  = -1;   // Not applicable
-        $localobject->socid       = 0;
-        $localobject->contactid   = 0;
-        $localobject->authorid    = $user->id;   // User saving action
-        $localobject->userownerid = $user->id;	// Owner of action
-        // Fields when action is en email (content should be added into note)
-        /*$localobject->email_msgid = $object->email_msgid;
-         $localobject->email_from  = $object->email_from;
-         $localobject->email_sender= $object->email_sender;
-         $localobject->email_to    = $object->email_to;
-         $localobject->email_tocc  = $object->email_tocc;
-         $localobject->email_tobcc = $object->email_tobcc;
-         $localobject->email_subject = $object->email_subject;
-         $localobject->errors_to   = $object->errors_to;*/
-        //$localobject->fk_element  = $invoice->id;
-        //$localobject->elementtype = $invoice->element;
-        $localobject->extraparams = 'Extra params';
+		$localobject->type_code   = 'AC_OTH_AUTO';		// Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+		$localobject->code        = 'AC_PHPUNITTEST';
+		$localobject->label       = 'This is a description';
+		$localobject->note_private = 'This is note';
+		$localobject->fk_project  = 0;
+		$localobject->datep       = $now;
+		$localobject->datef       = $now;
+		$localobject->percentage  = -1;   // Not applicable
+		$localobject->socid       = 0;
+		$localobject->contactid   = 0;
+		$localobject->authorid    = $user->id;   // User saving action
+		$localobject->userownerid = $user->id;	// Owner of action
+		// Fields when action is en email (content should be added into note)
+		/*$localobject->email_msgid = $object->email_msgid;
+		 $localobject->email_from  = $object->email_from;
+		 $localobject->email_sender= $object->email_sender;
+		 $localobject->email_to    = $object->email_to;
+		 $localobject->email_tocc  = $object->email_tocc;
+		 $localobject->email_tobcc = $object->email_tobcc;
+		 $localobject->email_subject = $object->email_subject;
+		 $localobject->errors_to   = $object->errors_to;*/
+		//$localobject->fk_element  = $invoice->id;
+		//$localobject->elementtype = $invoice->element;
+		$localobject->extraparams = 'Extra params';
 
-        $result = $localobject->create($user);
+		$result = $localobject->create($user);
 
-        $this->assertLessThan($result, 0);
-        print __METHOD__." result=".$result."\n";
-        return $result;
-    }
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
+		return $result;
+	}
 
-    /**
-     * testActionCommFetch
-     *
-     * @param   int $id     Id action comm
-     * @return  ActionComm
-     *
-     * @depends	testActionCommCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testActionCommFetch($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testActionCommFetch
+	 *
+	 * @param   int $id     Id action comm
+	 * @return  ActionComm
+	 *
+	 * @depends	testActionCommCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testActionCommFetch($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new ActionComm($this->savdb);
-        $result=$localobject->fetch($id);
+		$localobject=new ActionComm($this->savdb);
+		$result=$localobject->fetch($id);
 
-        $this->assertLessThan($result, 0);
-        print __METHOD__." id=".$id." result=".$result."\n";
-        return $localobject;
-    }
+		$this->assertLessThan($result, 0);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		return $localobject;
+	}
 
-    /**
-     * testActionCommUpdate
-     *
-     * @param	Object		$localobject	ActionComm
-     * @return	int							Id action comm updated
-     *
-     * @depends	testActionCommFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testActionCommUpdate($localobject)
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+	/**
+	 * testActionCommUpdate
+	 *
+	 * @param	ActionComm		$localobject	ActionComm
+	 * @return	int							Id action comm updated
+	 *
+	 * @depends	testActionCommFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testActionCommUpdate($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-    	$localobject->label='New label';
-    	$result=$localobject->update($user);
+		$localobject->label='New label';
+		$result=$localobject->update($user);
 
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	return $localobject->id;
-    }
+		$this->assertLessThan($result, 0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		return $localobject->id;
+	}
 
-    /**
-     * testActionCommDelete
-     *
-     * @param   int $id         Id of action comm
-     * @return  int				Result of delete
-     *
-     * @depends testActionCommUpdate
-     * The depends says test is run only if previous is ok
-     */
-    public function testActionCommDelete($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testActionCommDelete
+	 *
+	 * @param   int $id         Id of action comm
+	 * @return  int				Result of delete
+	 *
+	 * @depends testActionCommUpdate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testActionCommDelete($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new ActionComm($this->savdb);
-        $result=$localobject->fetch($id);
-        $result=$localobject->delete($user);
+		$localobject=new ActionComm($this->savdb);
+		$result=$localobject->fetch($id);
+		$result=$localobject->delete($user);
 
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $result;
-    }
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $result;
+	}
 }
diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index 384ce5fe6c6..d9ba2e267e9 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -32,9 +32,9 @@ require_once dirname(__FILE__).'/../../htdocs/adherents/class/adherent.class.php
 require_once dirname(__FILE__).'/../../htdocs/adherents/class/adherent_type.class.php';
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -48,538 +48,542 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class AdherentTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return AdherentTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return AdherentTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        if (! empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) {
-            print "\n".__METHOD__." Company must be setup to have name-firstname in order 'Firstname Lastname'\n";
-            die();
-        }
-        if (! empty($conf->global->MAIN_MODULE_LDAP)) { print "\n".__METHOD__." module LDAP must be disabled.\n"; die(); }
-        if (! empty($conf->global->MAIN_MODULE_MAILMANSPIP)) { print "\n".__METHOD__." module MailmanSpip must be disabled.\n"; die(); }
+		if (! empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) {
+			print "\n".__METHOD__." Company must be setup to have name-firstname in order 'Firstname Lastname'\n";
+			die();
+		}
+		if (! empty($conf->global->MAIN_MODULE_LDAP)) {
+			print "\n".__METHOD__." module LDAP must be disabled.\n"; die();
+		}
+		if (! empty($conf->global->MAIN_MODULE_MAILMANSPIP)) {
+			print "\n".__METHOD__." module MailmanSpip must be disabled.\n"; die();
+		}
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
-    /**
-     * End phpunit tests
-     *
-     * @return	void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testAdherentTypeCreate
-     *
-     * @return void
-     */
-    public function testAdherentTypeCreate()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testAdherentTypeCreate
+	 *
+	 * @return void
+	 */
+	public function testAdherentTypeCreate()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new AdherentType($this->savdb);
-        $localobject->statut=1;
-        $localobject->label='Adherent type test';
-        $localobject->subscription=1;
-        $localobject->vote=1;
-        $localobject->company='Old company label';
-        $result=$localobject->create($user);
-        print __METHOD__." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		$localobject=new AdherentType($this->savdb);
+		$localobject->statut=1;
+		$localobject->label='Adherent type test';
+		$localobject->subscription=1;
+		$localobject->vote=1;
+		$localobject->company='Old company label';
+		$result=$localobject->create($user);
+		print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        return $localobject->id;
-    }
+		return $localobject->id;
+	}
 
-    /**
-     * testAdherentCreate
-     *
-     * @param   int $fk_adherent_type       Id type of member
-     * @return  int
-     *
-     * @depends	testAdherentTypeCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testAdherentCreate($fk_adherent_type)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testAdherentCreate
+	 *
+	 * @param   int $fk_adherent_type       Id type of member
+	 * @return  int
+	 *
+	 * @depends	testAdherentTypeCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testAdherentCreate($fk_adherent_type)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Adherent($this->savdb);
-        $localobject->initAsSpecimen();
-        $localobject->typeid=$fk_adherent_type;
-        $result=$localobject->create($user);
+		$localobject=new Adherent($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->typeid=$fk_adherent_type;
+		$result=$localobject->create($user);
 		print __METHOD__." result=".$result."\n";
 		if ($result < 0) {
 			print $localobject->error;
 		}
-        $this->assertLessThan($result, 0);
+		$this->assertLessThan($result, 0);
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testAdherentFetch
-     *
-     * @param   int     $id     Id of object to fetch
-     * @return  object          Fetched object
-     *
-     * @depends	testAdherentCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testAdherentFetch($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testAdherentFetch
+	 *
+	 * @param   int     $id     Id of object to fetch
+	 * @return  object          Fetched object
+	 *
+	 * @depends	testAdherentCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testAdherentFetch($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Adherent($this->savdb);
-        $result=$localobject->fetch($id);
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $localobject;
-    }
+		$localobject=new Adherent($this->savdb);
+		$result=$localobject->fetch($id);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
 
-    /**
-     * testAdherentFetchLogin
-     *
-     * @param   Adherent    $localobject    Member instance
-     * @return  Adherent
-     *
-     * @depends testAdherentFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testAdherentFetchLogin(Adherent $localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testAdherentFetchLogin
+	 *
+	 * @param   Adherent    $localobject    Member instance
+	 * @return  Adherent
+	 *
+	 * @depends testAdherentFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testAdherentFetchLogin(Adherent $localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $newobject = new Adherent($this->savdb);
-        $result = $newobject->fetch_login($localobject->login);
+		$newobject = new Adherent($this->savdb);
+		$result = $newobject->fetch_login($localobject->login);
 
-        $this->assertEquals($newobject, $localobject);
+		$this->assertEquals($newobject, $localobject);
 
-        return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testAdherentUpdate
-     *
-     * @param   Adherent    $localobject    Member instance
-     * @return  Adherent
-     *
-     * @depends testAdherentFetchLogin
-     * The depends says test is run only if previous is ok
-     */
-    public function testAdherentUpdate(Adherent $localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testAdherentUpdate
+	 *
+	 * @param   Adherent    $localobject    Member instance
+	 * @return  Adherent
+	 *
+	 * @depends testAdherentFetchLogin
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testAdherentUpdate(Adherent $localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $timestamp = dol_now();
+		$timestamp = dol_now();
 
-        $localobject->civility_id = 0;
-        $localobject->login='newlogin';
-        $localobject->company='New company label';
-        $localobject->note_public='New note public after update';
-        $localobject->note_private='New note private after update';
-        $localobject->lastname='New name';
-        $localobject->firstname='New firstname';
-        $localobject->gender='man';
-        $localobject->address='New address';
-        $localobject->zip='New zip';
-        $localobject->town='New town';
-        $localobject->country_id=2;
-        $localobject->statut=0;
-        $localobject->morphy=0;
-        $localobject->phone='New tel pro';
-        $localobject->phone_perso='New tel perso';
-        $localobject->phone_mobile='New tel mobile';
-        $localobject->email='newemail@newemail.com';
-        $localobject->birth=$timestamp;
-        $result=$localobject->update($user);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        $result=$localobject->update_note($localobject->note_private, '_private');
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		$localobject->civility_id = 0;
+		$localobject->login='newlogin';
+		$localobject->company='New company label';
+		$localobject->note_public='New note public after update';
+		$localobject->note_private='New note private after update';
+		$localobject->lastname='New name';
+		$localobject->firstname='New firstname';
+		$localobject->gender='man';
+		$localobject->address='New address';
+		$localobject->zip='New zip';
+		$localobject->town='New town';
+		$localobject->country_id=2;
+		$localobject->statut=0;
+		$localobject->morphy=0;
+		$localobject->phone='New tel pro';
+		$localobject->phone_perso='New tel perso';
+		$localobject->phone_mobile='New tel mobile';
+		$localobject->email='newemail@newemail.com';
+		$localobject->birth=$timestamp;
+		$result=$localobject->update($user);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		$result=$localobject->update_note($localobject->note_private, '_private');
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 		$result=$localobject->update_note($localobject->note_public, '_public');
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        $newobject=new Adherent($this->savdb);
-        $result=$newobject->fetch($localobject->id);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		$newobject=new Adherent($this->savdb);
+		$result=$newobject->fetch($localobject->id);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        $this->assertEquals($localobject->civility_id, $newobject->civility_id);
-        $this->assertEquals($localobject->login, $newobject->login);
-        $this->assertEquals($localobject->company, $newobject->company);
-        $this->assertEquals($localobject->note_public, $newobject->note_public);
-        $this->assertEquals($localobject->note_private, $newobject->note_private);
-        $this->assertEquals($localobject->lastname, $newobject->lastname);
-        $this->assertEquals($localobject->firstname, $newobject->firstname);
-        $this->assertEquals($localobject->gender, $newobject->gender);
-        $this->assertEquals($localobject->address, $newobject->address);
-        $this->assertEquals($localobject->zip, $newobject->zip);
-        $this->assertEquals($localobject->town, $newobject->town);
-        $this->assertEquals($localobject->country_id, $newobject->country_id);
-        $this->assertEquals('BE', $newobject->country_code);
-        $this->assertEquals('Belgium', $newobject->country);
-        $this->assertEquals($localobject->statut, $newobject->statut);
-        $this->assertEquals($localobject->phone, $newobject->phone);
-        $this->assertEquals($localobject->phone_perso, $newobject->phone_perso);
-        $this->assertEquals($localobject->phone_mobile, $newobject->phone_mobile);
-        $this->assertEquals($localobject->email, $newobject->email);
-        $this->assertEquals($localobject->birth, $timestamp);
-        $this->assertEquals($localobject->morphy, $newobject->morphy);
+		$this->assertEquals($localobject->civility_id, $newobject->civility_id);
+		$this->assertEquals($localobject->login, $newobject->login);
+		$this->assertEquals($localobject->company, $newobject->company);
+		$this->assertEquals($localobject->note_public, $newobject->note_public);
+		$this->assertEquals($localobject->note_private, $newobject->note_private);
+		$this->assertEquals($localobject->lastname, $newobject->lastname);
+		$this->assertEquals($localobject->firstname, $newobject->firstname);
+		$this->assertEquals($localobject->gender, $newobject->gender);
+		$this->assertEquals($localobject->address, $newobject->address);
+		$this->assertEquals($localobject->zip, $newobject->zip);
+		$this->assertEquals($localobject->town, $newobject->town);
+		$this->assertEquals($localobject->country_id, $newobject->country_id);
+		$this->assertEquals('BE', $newobject->country_code);
+		$this->assertEquals('Belgium', $newobject->country);
+		$this->assertEquals($localobject->statut, $newobject->statut);
+		$this->assertEquals($localobject->phone, $newobject->phone);
+		$this->assertEquals($localobject->phone_perso, $newobject->phone_perso);
+		$this->assertEquals($localobject->phone_mobile, $newobject->phone_mobile);
+		$this->assertEquals($localobject->email, $newobject->email);
+		$this->assertEquals($localobject->birth, $timestamp);
+		$this->assertEquals($localobject->morphy, $newobject->morphy);
 
-        //We return newobject because of new values
-        return $newobject;
-    }
+		//We return newobject because of new values
+		return $newobject;
+	}
 
-    /**
-     * testAdherentMakeSubstitution
-     *
-     * @param   Adherent    $localobject    Member instance
-     * @return  Adherent
-     *
-     * @depends testAdherentUpdate
-     * The depends says test is run only if previous is ok
-     */
-    public function testAdherentMakeSubstitution(Adherent $localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testAdherentMakeSubstitution
+	 *
+	 * @param   Adherent    $localobject    Member instance
+	 * @return  Adherent
+	 *
+	 * @depends testAdherentUpdate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testAdherentMakeSubstitution(Adherent $localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $conf->global->MAIN_FIRSTNAME_NAME_POSITION = 0;	// Force setup for firstname+lastname
+		$conf->global->MAIN_FIRSTNAME_NAME_POSITION = 0;	// Force setup for firstname+lastname
 
-        $template = '__CIVILITY__,__FIRSTNAME__,__LASTNAME__,__FULLNAME__,__COMPANY__,';
-        $template .= '__ADDRESS__,__ZIP__,__TOWN__,__COUNTRY__,__EMAIL__,__BIRTH__,__PHOTO__,__LOGIN__';
+		$template = '__CIVILITY__,__FIRSTNAME__,__LASTNAME__,__FULLNAME__,__COMPANY__,';
+		$template .= '__ADDRESS__,__ZIP__,__TOWN__,__COUNTRY__,__EMAIL__,__BIRTH__,__PHOTO__,__LOGIN__';
 
-        // If option to store clear password has been set, we get 'dolibspec' into PASSWORD field.
-        $expected = ',New firstname,New name,New firstname New name,';
-        $expected .= 'New company label,New address,New zip,New town,Belgium,newemail@newemail.com,'.dol_print_date($localobject->birth, 'day').',,';
-        $expected .= 'newlogin';
+		// If option to store clear password has been set, we get 'dolibspec' into PASSWORD field.
+		$expected = ',New firstname,New name,New firstname New name,';
+		$expected .= 'New company label,New address,New zip,New town,Belgium,newemail@newemail.com,'.dol_print_date($localobject->birth, 'day').',,';
+		$expected .= 'newlogin';
 
-        $result = $localobject->makeSubstitution($template);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($expected, $result);
+		$result = $localobject->makeSubstitution($template);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($expected, $result);
 
-        return $localobject;
-    }
+		return $localobject;
+	}
 
-     /**
-     * testAdherentSetUserId
-     *
-     * @param   Adherent    $localobject    Member instance
-     * @return  Adherent
-     *
-     * @depends testAdherentMakeSubstitution
-     * The depends says test is run only if previous is ok
-     */
-    public function testAdherentSetUserId(Adherent $localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	 /**
+	 * testAdherentSetUserId
+	 *
+	 * @param   Adherent    $localobject    Member instance
+	 * @return  Adherent
+	 *
+	 * @depends testAdherentMakeSubstitution
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testAdherentSetUserId(Adherent $localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        //We associate member with user
-        $result = $localobject->setUserId($user->id);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertEquals($result, 1);
+		//We associate member with user
+		$result = $localobject->setUserId($user->id);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertEquals($result, 1);
 
-        //We update user object
-        $user->fetch($user->id);
-        print __METHOD__." user id=".$user->id." fk_member=".$user->fk_member."\n";
+		//We update user object
+		$user->fetch($user->id);
+		print __METHOD__." user id=".$user->id." fk_member=".$user->fk_member."\n";
 
-        $this->assertEquals($user->fk_member, $localobject->id);
+		$this->assertEquals($user->fk_member, $localobject->id);
 
-        //We remove association with user
-        $result = $localobject->setUserId(0);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertEquals($result, 1);
+		//We remove association with user
+		$result = $localobject->setUserId(0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertEquals($result, 1);
 
-        //We update user object
-        $user->fetch($user->id);
-        print __METHOD__." user id=".$user->id." fk_member=".$user->fk_member."\n";
+		//We update user object
+		$user->fetch($user->id);
+		print __METHOD__." user id=".$user->id." fk_member=".$user->fk_member."\n";
 
-        $this->assertNull($user->fk_member);
+		$this->assertNull($user->fk_member);
 
-        return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testAdherentSetThirdPartyId
-     *
-     * @param   Adherent    $localobject    Member instance
-     * @return  Adherent
-     *
-     * @depends testAdherentSetUserId
-     * The depends says test is run only if previous is ok
-     */
-    public function testAdherentSetThirdPartyId(Adherent $localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testAdherentSetThirdPartyId
+	 *
+	 * @param   Adherent    $localobject    Member instance
+	 * @return  Adherent
+	 *
+	 * @depends testAdherentSetUserId
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testAdherentSetThirdPartyId(Adherent $localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        //Create a Third Party
-        $thirdparty = new Societe($db);
-        $thirdparty->initAsSpecimen();
-        $result = $thirdparty->create($user);
-        print __METHOD__." third party id=".$thirdparty->id." result=".$result."\n";
-        $this->assertTrue($result > 0, 'Test to create a thirdparty specimen to use it to set as thirdparty of a member');
+		//Create a Third Party
+		$thirdparty = new Societe($db);
+		$thirdparty->initAsSpecimen();
+		$result = $thirdparty->create($user);
+		print __METHOD__." third party id=".$thirdparty->id." result=".$result."\n";
+		$this->assertTrue($result > 0, 'Test to create a thirdparty specimen to use it to set as thirdparty of a member');
 
-        //Set Third Party ID
-        $result = $localobject->setThirdPartyId($thirdparty->id);
-        $this->assertEquals($result, 1, 'Set thirdparty');
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		//Set Third Party ID
+		$result = $localobject->setThirdPartyId($thirdparty->id);
+		$this->assertEquals($result, 1, 'Set thirdparty');
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
-        //Adherent is updated with new data
-        $localobject->fetch($localobject->id);
-        $this->assertEquals($localobject->fk_soc, $thirdparty->id, 'Fetch member');
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		//Adherent is updated with new data
+		$localobject->fetch($localobject->id);
+		$this->assertEquals($localobject->fk_soc, $thirdparty->id, 'Fetch member');
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
-        //We remove the third party association
-        $result = $localobject->setThirdPartyId(0);
-        $this->assertEquals($result, 1, 'Removed the link with thirdparty');
+		//We remove the third party association
+		$result = $localobject->setThirdPartyId(0);
+		$this->assertEquals($result, 1, 'Removed the link with thirdparty');
 
-        //And check if it has been updated
-        $localobject->fetch($localobject->id);
-        $this->assertNull($localobject->fk_soc, 'Check field is null');
+		//And check if it has been updated
+		$localobject->fetch($localobject->id);
+		$this->assertNull($localobject->fk_soc, 'Check field is null');
 
-        //Now we remove the third party
-        $result = $thirdparty->delete($thirdparty->id, $user);
-        $this->assertEquals($result, 1, 'Delete thirdparty');
+		//Now we remove the third party
+		$result = $thirdparty->delete($thirdparty->id, $user);
+		$this->assertEquals($result, 1, 'Delete thirdparty');
 
-        return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testAdherentValid
-     *
-     * @param	Adherent	$localobject	Member instance
-     * @return	Adherent
-     *
-     * @depends	testAdherentSetThirdPartyId
-     * The depends says test is run only if previous is ok
-     */
-    public function testAdherentValidate(Adherent $localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testAdherentValid
+	 *
+	 * @param	Adherent	$localobject	Member instance
+	 * @return	Adherent
+	 *
+	 * @depends	testAdherentSetThirdPartyId
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testAdherentValidate(Adherent $localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=$localobject->validate($user);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		$result=$localobject->validate($user);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testAdherentOther
-     *
-     * @param   Adherent    $localobject    Member instance
-     * @return  int                         Id of object
-     *
-     * @depends testAdherentValidate
-     * The depends says test is run only if previous is ok
-     */
-    public function testAdherentOther(Adherent $localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testAdherentOther
+	 *
+	 * @param   Adherent    $localobject    Member instance
+	 * @return  int                         Id of object
+	 *
+	 * @depends testAdherentValidate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testAdherentOther(Adherent $localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        /*$result=$localobject->setstatus(0);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        */
+		/*$result=$localobject->setstatus(0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		*/
 
-        $localobject->info($localobject->id);
-        print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
-        $this->assertNotEquals($localobject->date_creation, '');
+		$localobject->info($localobject->id);
+		print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
+		$this->assertNotEquals($localobject->date_creation, '');
 
-        return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testAdherentResiliate
-     *
-     * @param   Adherent    $localobject    Member instance
-     * @return  Adherent
-     *
-     * @depends testAdherentOther
-     * The depends says test is run only if previous is ok
-     */
-    public function testAdherentResiliate(Adherent $localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testAdherentResiliate
+	 *
+	 * @param   Adherent    $localobject    Member instance
+	 * @return  Adherent
+	 *
+	 * @depends testAdherentOther
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testAdherentResiliate(Adherent $localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        //Let's resilie un adherent
-        $result = $localobject->resiliate($user);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertEquals($result, 1);
+		//Let's resilie un adherent
+		$result = $localobject->resiliate($user);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertEquals($result, 1);
 
-        //Is statut updated?
-        $this->assertEquals($localobject->statut, 0);
+		//Is statut updated?
+		$this->assertEquals($localobject->statut, 0);
 
-        //We update the object and let's check if it was updated on DB
-        $localobject->fetch($localobject->id);
-        $this->assertEquals($localobject->statut, 0);
+		//We update the object and let's check if it was updated on DB
+		$localobject->fetch($localobject->id);
+		$this->assertEquals($localobject->statut, 0);
 
-        //Now that status=0, resiliate should return 0
-        $result = $localobject->resiliate($user);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertEquals($result, 0);
+		//Now that status=0, resiliate should return 0
+		$result = $localobject->resiliate($user);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertEquals($result, 0);
 
-        return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testAdherentDelete
-     *
-     * @param   Adherent    $localobject    Member instance
-     * @return	void
-     *
-     * @depends	testAdherentResiliate
-     * The depends says test is run only if previous is ok
-     */
-    public function testAdherentDelete($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testAdherentDelete
+	 *
+	 * @param   Adherent    $localobject    Member instance
+	 * @return	void
+	 *
+	 * @depends	testAdherentResiliate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testAdherentDelete($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=$localobject->delete($localobject->id, $user);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		$result=$localobject->delete($localobject->id, $user);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        return $localobject;
-    }
+		return $localobject;
+	}
 
 
-    /**
-     * testAdherentTypeDelete
-     *
-     * @param   Adherent    $localobject    Member instance
-     * @return void
-     *
-     * @depends	testAdherentDelete
-     * The depends says test is run only if previous is ok
-     */
-    public function testAdherentTypeDelete($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testAdherentTypeDelete
+	 *
+	 * @param   Adherent    $localobject    Member instance
+	 * @return void
+	 *
+	 * @depends	testAdherentDelete
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testAdherentTypeDelete($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobjectat=new AdherentType($this->savdb);
-        $result=$localobjectat->fetch($localobject->typeid);
-        $result=$localobjectat->delete();
-        print __METHOD__." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		$localobjectat=new AdherentType($this->savdb);
+		$result=$localobjectat->fetch($localobject->typeid);
+		$result=$localobjectat->delete();
+		print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        return $localobject->id;
-    }
+		return $localobject->id;
+	}
 }
diff --git a/test/phpunit/AdminLibTest.php b/test/phpunit/AdminLibTest.php
index c7b5aee9e37..9ce135da263 100644
--- a/test/phpunit/AdminLibTest.php
+++ b/test/phpunit/AdminLibTest.php
@@ -30,9 +30,9 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/admin.lib.php';
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -46,121 +46,121 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class AdminLibTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return AdminLibTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return AdminLibTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
-    /**
-     * End phpunit tests
-     *
-     * @return	void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testVersionCompare
-     *
-     * @return	void
-     */
-    public function testVersionCompare()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testVersionCompare
+	 *
+	 * @return	void
+	 */
+	public function testVersionCompare()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=versioncompare(array(3,1,-4), array(3,1,1));
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(-3, $result);
-        $result=versioncompare(array(3,1,0), array(3,1,1));
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(-3, $result);
-        $result=versioncompare(array(3,1,0), array(3,2,0));
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(-2, $result);
-        $result=versioncompare(array(3,1,0), array(3,1,0));
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(0, $result);
+		$result=versioncompare(array(3,1,-4), array(3,1,1));
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(-3, $result);
+		$result=versioncompare(array(3,1,0), array(3,1,1));
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(-3, $result);
+		$result=versioncompare(array(3,1,0), array(3,2,0));
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(-2, $result);
+		$result=versioncompare(array(3,1,0), array(3,1,0));
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(0, $result);
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testEnableModule
-     *
-     * @return  void
-     */
-    public function testEnableModule()
-    {
-    	global $conf, $db, $langs, $user;
+	/**
+	 * testEnableModule
+	 *
+	 * @return  void
+	 */
+	public function testEnableModule()
+	{
+		global $conf, $db, $langs, $user;
 
 		require_once dirname(__FILE__).'/../../htdocs/core/modules/modExpenseReport.class.php';
 		print "Enable module modExpenseReport";
@@ -177,5 +177,5 @@ class AdminLibTest extends PHPUnit\Framework\TestCase
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(1, $result);
 		$conf->setValues($db);
-    }
+	}
 }
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index ce7f1074721..2444e8fe9dc 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -33,30 +33,25 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 print 'DOL_MAIN_URL_ROOT='.DOL_MAIN_URL_ROOT."\n";  // constant will be used by other tests
 
 
-if ($langs->defaultlang != 'en_US')
-{
-    print "Error: Default language for company to run tests must be set to en_US or auto. Current is ".$langs->defaultlang."\n";
-    exit(1);
+if ($langs->defaultlang != 'en_US') {
+	print "Error: Default language for company to run tests must be set to en_US or auto. Current is ".$langs->defaultlang."\n";
+	exit(1);
 }
-if (empty($conf->adherent->enabled))
-{
+if (empty($conf->adherent->enabled)) {
 	print "Error: Module member must be enabled to have significant results.\n";
 	exit(1);
 }
-if (! empty($conf->ldap->enabled))
-{
-    print "Error: LDAP module should not be enabled.\n";
-    exit(1);
+if (! empty($conf->ldap->enabled)) {
+	print "Error: LDAP module should not be enabled.\n";
+	exit(1);
 }
-if (! empty($conf->google->enabled))
-{
-    print "Warning: Google module should not be enabled.\n";
+if (! empty($conf->google->enabled)) {
+	print "Warning: Google module should not be enabled.\n";
 }
-if (empty($user->id))
-{
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+if (empty($user->id)) {
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -67,200 +62,200 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class AllTests
 {
-    /**
-     * Function suite to make all PHPUnit tests
-     *
-     * @return	void
-     */
-    public static function suite()
-    {
+	/**
+	 * Function suite to make all PHPUnit tests
+	 *
+	 * @return	void
+	 */
+	public static function suite()
+	{
 
-        $suite = new PHPUnit\Framework\TestSuite('PHPUnit Framework');
+		$suite = new PHPUnit\Framework\TestSuite('PHPUnit Framework');
 
-        //require_once dirname(__FILE__).'/CoreTest.php';
-        //$suite->addTestSuite('CoreTest');
-        require_once dirname(__FILE__).'/AdminLibTest.php';
-        $suite->addTestSuite('AdminLibTest');
-        require_once dirname(__FILE__).'/CompanyLibTest.php';
-        $suite->addTestSuite('CompanyLibTest');
-        require_once dirname(__FILE__).'/DateLibTest.php';
-        $suite->addTestSuite('DateLibTest');
-        require_once dirname(__FILE__).'/UtilsTest.php';
-        $suite->addTestSuite('UtilsTest');
-        require_once dirname(__FILE__).'/LesscTest.php';
-        $suite->addTestSuite('LesscTest');
-        //require_once dirname(__FILE__).'/DateLibTzFranceTest.php';
-        //$suite->addTestSuite('DateLibTzFranceTest');
-        require_once dirname(__FILE__).'/MarginsLibTest.php';
-        $suite->addTestSuite('MarginsLibTest');
-        require_once dirname(__FILE__).'/FilesLibTest.php';
-        $suite->addTestSuite('FilesLibTest');
-        require_once dirname(__FILE__).'/GetUrlLibTest.php';
-        $suite->addTestSuite('GetUrlLibTest');
-        require_once dirname(__FILE__).'/JsonLibTest.php';
-        $suite->addTestSuite('JsonLibTest');
-        require_once dirname(__FILE__).'/ImagesLibTest.php';
-        $suite->addTestSuite('ImagesLibTest');
-        require_once dirname(__FILE__).'/FunctionsLibTest.php';
-        $suite->addTestSuite('FunctionsLibTest');
-        require_once dirname(__FILE__).'/Functions2LibTest.php';
-        $suite->addTestSuite('Functions2LibTest');
-        require_once dirname(__FILE__).'/XCalLibTest.php';
-        $suite->addTestSuite('XCalLibTest');
+		//require_once dirname(__FILE__).'/CoreTest.php';
+		//$suite->addTestSuite('CoreTest');
+		require_once dirname(__FILE__).'/AdminLibTest.php';
+		$suite->addTestSuite('AdminLibTest');
+		require_once dirname(__FILE__).'/CompanyLibTest.php';
+		$suite->addTestSuite('CompanyLibTest');
+		require_once dirname(__FILE__).'/DateLibTest.php';
+		$suite->addTestSuite('DateLibTest');
+		require_once dirname(__FILE__).'/UtilsTest.php';
+		$suite->addTestSuite('UtilsTest');
+		require_once dirname(__FILE__).'/LesscTest.php';
+		$suite->addTestSuite('LesscTest');
+		//require_once dirname(__FILE__).'/DateLibTzFranceTest.php';
+		//$suite->addTestSuite('DateLibTzFranceTest');
+		require_once dirname(__FILE__).'/MarginsLibTest.php';
+		$suite->addTestSuite('MarginsLibTest');
+		require_once dirname(__FILE__).'/FilesLibTest.php';
+		$suite->addTestSuite('FilesLibTest');
+		require_once dirname(__FILE__).'/GetUrlLibTest.php';
+		$suite->addTestSuite('GetUrlLibTest');
+		require_once dirname(__FILE__).'/JsonLibTest.php';
+		$suite->addTestSuite('JsonLibTest');
+		require_once dirname(__FILE__).'/ImagesLibTest.php';
+		$suite->addTestSuite('ImagesLibTest');
+		require_once dirname(__FILE__).'/FunctionsLibTest.php';
+		$suite->addTestSuite('FunctionsLibTest');
+		require_once dirname(__FILE__).'/Functions2LibTest.php';
+		$suite->addTestSuite('Functions2LibTest');
+		require_once dirname(__FILE__).'/XCalLibTest.php';
+		$suite->addTestSuite('XCalLibTest');
 
-        // Rules into source files content
-        require_once dirname(__FILE__).'/LangTest.php';
-        $suite->addTestSuite('LangTest');
-        require_once dirname(__FILE__).'/CodingSqlTest.php';
-        $suite->addTestSuite('CodingSqlTest');
-        require_once dirname(__FILE__).'/CodingPhpTest.php';
-        $suite->addTestSuite('CodingPhpTest');
+		// Rules into source files content
+		require_once dirname(__FILE__).'/LangTest.php';
+		$suite->addTestSuite('LangTest');
+		require_once dirname(__FILE__).'/CodingSqlTest.php';
+		$suite->addTestSuite('CodingSqlTest');
+		require_once dirname(__FILE__).'/CodingPhpTest.php';
+		$suite->addTestSuite('CodingPhpTest');
 
-        require_once dirname(__FILE__).'/SecurityTest.php';
-        $suite->addTestSuite('SecurityTest');
+		require_once dirname(__FILE__).'/SecurityTest.php';
+		$suite->addTestSuite('SecurityTest');
 
-        require_once dirname(__FILE__).'/UserTest.php';
-        $suite->addTestSuite('UserTest');
-        require_once dirname(__FILE__).'/UserGroupTest.php';
-        $suite->addTestSuite('UserGroupTest');
+		require_once dirname(__FILE__).'/UserTest.php';
+		$suite->addTestSuite('UserTest');
+		require_once dirname(__FILE__).'/UserGroupTest.php';
+		$suite->addTestSuite('UserGroupTest');
 
-        require_once dirname(__FILE__).'/NumberingModulesTest.php';
-        $suite->addTestSuite('NumberingModulesTest');
-        require_once dirname(__FILE__).'/PgsqlTest.php';
-        $suite->addTestSuite('PgsqlTest');
-        require_once dirname(__FILE__).'/PdfDocTest.php';
-        $suite->addTestSuite('PdfDocTest');
-        require_once dirname(__FILE__).'/BuildDocTest.php';
-        $suite->addTestSuite('BuildDocTest');
-        require_once dirname(__FILE__).'/CMailFileTest.php';
-        $suite->addTestSuite('CMailFileTest');
+		require_once dirname(__FILE__).'/NumberingModulesTest.php';
+		$suite->addTestSuite('NumberingModulesTest');
+		require_once dirname(__FILE__).'/PgsqlTest.php';
+		$suite->addTestSuite('PgsqlTest');
+		require_once dirname(__FILE__).'/PdfDocTest.php';
+		$suite->addTestSuite('PdfDocTest');
+		require_once dirname(__FILE__).'/BuildDocTest.php';
+		$suite->addTestSuite('BuildDocTest');
+		require_once dirname(__FILE__).'/CMailFileTest.php';
+		$suite->addTestSuite('CMailFileTest');
 
-        require_once dirname(__FILE__).'/CommonObjectTest.php';
-        $suite->addTestSuite('CommonObjectTest');
+		require_once dirname(__FILE__).'/CommonObjectTest.php';
+		$suite->addTestSuite('CommonObjectTest');
 
-        require_once dirname(__FILE__).'/ActionCommTest.php';
-        $suite->addTestSuite('ActionCommTest');
-        require_once dirname(__FILE__).'/SocieteTest.php';
-        $suite->addTestSuite('SocieteTest');
-        require_once dirname(__FILE__).'/ContactTest.php';
-        $suite->addTestSuite('ContactTest');
-        require_once dirname(__FILE__).'/AdherentTest.php';
-        $suite->addTestSuite('AdherentTest');
+		require_once dirname(__FILE__).'/ActionCommTest.php';
+		$suite->addTestSuite('ActionCommTest');
+		require_once dirname(__FILE__).'/SocieteTest.php';
+		$suite->addTestSuite('SocieteTest');
+		require_once dirname(__FILE__).'/ContactTest.php';
+		$suite->addTestSuite('ContactTest');
+		require_once dirname(__FILE__).'/AdherentTest.php';
+		$suite->addTestSuite('AdherentTest');
 
-        require_once dirname(__FILE__).'/ProductTest.php';
-        $suite->addTestSuite('ProductTest');
+		require_once dirname(__FILE__).'/ProductTest.php';
+		$suite->addTestSuite('ProductTest');
 
-        require_once dirname(__FILE__).'/PricesTest.php';
-        $suite->addTestSuite('PricesTest');
-        require_once dirname(__FILE__).'/DiscountTest.php';
-        $suite->addTestSuite('DiscountTest');
+		require_once dirname(__FILE__).'/PricesTest.php';
+		$suite->addTestSuite('PricesTest');
+		require_once dirname(__FILE__).'/DiscountTest.php';
+		$suite->addTestSuite('DiscountTest');
 
-        require_once dirname(__FILE__).'/BOMTest.php';
-        $suite->addTestSuite('BOMTest');
+		require_once dirname(__FILE__).'/BOMTest.php';
+		$suite->addTestSuite('BOMTest');
 
-        require_once dirname(__FILE__).'/ContratTest.php';
-        $suite->addTestSuite('ContratTest');
+		require_once dirname(__FILE__).'/ContratTest.php';
+		$suite->addTestSuite('ContratTest');
 
-        require_once dirname(__FILE__).'/FichinterTest.php';
-        $suite->addTestSuite('FichinterTest');
-        require_once dirname(__FILE__).'/TicketTest.php';
-        $suite->addTestSuite('TicketTest');
+		require_once dirname(__FILE__).'/FichinterTest.php';
+		$suite->addTestSuite('FichinterTest');
+		require_once dirname(__FILE__).'/TicketTest.php';
+		$suite->addTestSuite('TicketTest');
 
-        require_once dirname(__FILE__).'/PropalTest.php';
-        $suite->addTestSuite('PropalTest');
+		require_once dirname(__FILE__).'/PropalTest.php';
+		$suite->addTestSuite('PropalTest');
 
-        require_once dirname(__FILE__).'/SupplierProposalTest.php';
-        $suite->addTestSuite('SupplierProposalTest');
+		require_once dirname(__FILE__).'/SupplierProposalTest.php';
+		$suite->addTestSuite('SupplierProposalTest');
 
-        require_once dirname(__FILE__).'/CommandeTest.php';
-        $suite->addTestSuite('CommandeTest');
+		require_once dirname(__FILE__).'/CommandeTest.php';
+		$suite->addTestSuite('CommandeTest');
 
-        require_once dirname(__FILE__).'/CommandeFournisseurTest.php';
-        $suite->addTestSuite('CommandeFournisseurTest');
+		require_once dirname(__FILE__).'/CommandeFournisseurTest.php';
+		$suite->addTestSuite('CommandeFournisseurTest');
 
-        require_once dirname(__FILE__).'/FactureTest.php';
-        $suite->addTestSuite('FactureTest');
-        require_once dirname(__FILE__).'/FactureRecTest.php';
-        $suite->addTestSuite('FactureRecTest');
-        require_once dirname(__FILE__).'/FactureTestRounding.php';
-        $suite->addTestSuite('FactureTestRounding');
-        require_once dirname(__FILE__).'/FactureFournisseurTest.php';
-        $suite->addTestSuite('FactureFournisseurTest');
+		require_once dirname(__FILE__).'/FactureTest.php';
+		$suite->addTestSuite('FactureTest');
+		require_once dirname(__FILE__).'/FactureRecTest.php';
+		$suite->addTestSuite('FactureRecTest');
+		require_once dirname(__FILE__).'/FactureTestRounding.php';
+		$suite->addTestSuite('FactureTestRounding');
+		require_once dirname(__FILE__).'/FactureFournisseurTest.php';
+		$suite->addTestSuite('FactureFournisseurTest');
 
-        require_once dirname(__FILE__).'/BankAccountTest.php';
-        $suite->addTestSuite('BankAccountTest');
-        require_once dirname(__FILE__).'/CompanyBankAccountTest.php';
-        $suite->addTestSuite('CompanyBankAccountTest');
-        require_once dirname(__FILE__).'/BonPrelevementTest.php';
-        $suite->addTestSuite('BonPrelevementTest');
+		require_once dirname(__FILE__).'/BankAccountTest.php';
+		$suite->addTestSuite('BankAccountTest');
+		require_once dirname(__FILE__).'/CompanyBankAccountTest.php';
+		$suite->addTestSuite('CompanyBankAccountTest');
+		require_once dirname(__FILE__).'/BonPrelevementTest.php';
+		$suite->addTestSuite('BonPrelevementTest');
 
-        require_once dirname(__FILE__).'/ChargeSocialesTest.php';
-        $suite->addTestSuite('ChargeSocialesTest');
-        require_once dirname(__FILE__).'/HolidayTest.php';
-        $suite->addTestSuite('HolidayTest');
-        require_once dirname(__FILE__).'/ExpenseReportTest.php';
-        $suite->addTestSuite('ExpenseReportTest');
-        require_once dirname(__FILE__).'/LoanTest.php';
-        $suite->addTestSuite('LoanTest');
+		require_once dirname(__FILE__).'/ChargeSocialesTest.php';
+		$suite->addTestSuite('ChargeSocialesTest');
+		require_once dirname(__FILE__).'/HolidayTest.php';
+		$suite->addTestSuite('HolidayTest');
+		require_once dirname(__FILE__).'/ExpenseReportTest.php';
+		$suite->addTestSuite('ExpenseReportTest');
+		require_once dirname(__FILE__).'/LoanTest.php';
+		$suite->addTestSuite('LoanTest');
 
-        require_once dirname(__FILE__).'/EntrepotTest.php';
-        $suite->addTestSuite('EntrepotTest');
-        require_once dirname(__FILE__).'/MouvementStockTest.php';
-        $suite->addTestSuite('MouvementStockTest');
+		require_once dirname(__FILE__).'/EntrepotTest.php';
+		$suite->addTestSuite('EntrepotTest');
+		require_once dirname(__FILE__).'/MouvementStockTest.php';
+		$suite->addTestSuite('MouvementStockTest');
 
-        require_once dirname(__FILE__).'/CategorieTest.php';
-        $suite->addTestSuite('CategorieTest');
+		require_once dirname(__FILE__).'/CategorieTest.php';
+		$suite->addTestSuite('CategorieTest');
 
-        require_once dirname(__FILE__).'/AccountingAccountTest.php';
-        $suite->addTestSuite('AccountingAccountTest');
+		require_once dirname(__FILE__).'/AccountingAccountTest.php';
+		$suite->addTestSuite('AccountingAccountTest');
 
-        require_once dirname(__FILE__).'/RestAPIUserTest.php';
-        $suite->addTestSuite('RestAPIUserTest');
-        require_once dirname(__FILE__).'/RestAPIDocumentTest.php';
-        $suite->addTestSuite('RestAPIDocumentTest');
+		require_once dirname(__FILE__).'/RestAPIUserTest.php';
+		$suite->addTestSuite('RestAPIUserTest');
+		require_once dirname(__FILE__).'/RestAPIDocumentTest.php';
+		$suite->addTestSuite('RestAPIDocumentTest');
 
-        // Test only with php7.2 or less
-        //if ((float) phpversion() < 7.3)
-        //{
-        	require_once dirname(__FILE__).'/WebservicesProductsTest.php';
-	        $suite->addTestSuite('WebservicesProductsTest');
-	        require_once dirname(__FILE__).'/WebservicesInvoicesTest.php';
-	        $suite->addTestSuite('WebservicesInvoicesTest');
-	        require_once dirname(__FILE__).'/WebservicesOrdersTest.php';
-	        $suite->addTestSuite('WebservicesOrdersTest');
-	        require_once dirname(__FILE__).'/WebservicesOtherTest.php';
-	        $suite->addTestSuite('WebservicesOtherTest');
-	        require_once dirname(__FILE__).'/WebservicesThirdpartyTest.php';
-	        $suite->addTestSuite('WebservicesThirdpartyTest');
-	        require_once dirname(__FILE__).'/WebservicesUserTest.php';
-	        $suite->addTestSuite('WebservicesUserTest');
-        //}
+		// Test only with php7.2 or less
+		//if ((float) phpversion() < 7.3)
+		//{
+			require_once dirname(__FILE__).'/WebservicesProductsTest.php';
+			$suite->addTestSuite('WebservicesProductsTest');
+			require_once dirname(__FILE__).'/WebservicesInvoicesTest.php';
+			$suite->addTestSuite('WebservicesInvoicesTest');
+			require_once dirname(__FILE__).'/WebservicesOrdersTest.php';
+			$suite->addTestSuite('WebservicesOrdersTest');
+			require_once dirname(__FILE__).'/WebservicesOtherTest.php';
+			$suite->addTestSuite('WebservicesOtherTest');
+			require_once dirname(__FILE__).'/WebservicesThirdpartyTest.php';
+			$suite->addTestSuite('WebservicesThirdpartyTest');
+			require_once dirname(__FILE__).'/WebservicesUserTest.php';
+			$suite->addTestSuite('WebservicesUserTest');
+		//}
 
-        require_once dirname(__FILE__).'/ExportTest.php';
-        $suite->addTestSuite('ExportTest');
-        require_once dirname(__FILE__).'/ImportTest.php';
-        $suite->addTestSuite('ImportTest');
+		require_once dirname(__FILE__).'/ExportTest.php';
+		$suite->addTestSuite('ExportTest');
+		require_once dirname(__FILE__).'/ImportTest.php';
+		$suite->addTestSuite('ImportTest');
 
-        require_once dirname(__FILE__).'/ScriptsTest.php';
-        $suite->addTestSuite('ScriptsTest');
+		require_once dirname(__FILE__).'/ScriptsTest.php';
+		$suite->addTestSuite('ScriptsTest');
 
-        require_once dirname(__FILE__).'/ModulesTest.php';  // At end because it's the longer
-        $suite->addTestSuite('ModulesTest');
+		require_once dirname(__FILE__).'/ModulesTest.php';  // At end because it's the longer
+		$suite->addTestSuite('ModulesTest');
 
 
-        // GUI
-        require_once dirname(__FILE__).'/FormAdminTest.php';
-        $suite->addTestSuite('FormAdminTest');
-        require_once dirname(__FILE__).'/FormTest.php';
-        $suite->addTestSuite('FormTest');
+		// GUI
+		require_once dirname(__FILE__).'/FormAdminTest.php';
+		$suite->addTestSuite('FormAdminTest');
+		require_once dirname(__FILE__).'/FormTest.php';
+		$suite->addTestSuite('FormTest');
 
 
-        // Payment services
-        require_once dirname(__FILE__).'/PaypalTest.php';
-        $suite->addTestSuite('PaypalTest');
-        require_once dirname(__FILE__).'/StripeTest.php';
-        $suite->addTestSuite('StripeTest');
+		// Payment services
+		require_once dirname(__FILE__).'/PaypalTest.php';
+		$suite->addTestSuite('PaypalTest');
+		require_once dirname(__FILE__).'/StripeTest.php';
+		$suite->addTestSuite('StripeTest');
 
-        return $suite;
-    }
+		return $suite;
+	}
 }
diff --git a/test/phpunit/BOMTest.php b/test/phpunit/BOMTest.php
index 872d0b09d18..1d8a6cfbfd2 100644
--- a/test/phpunit/BOMTest.php
+++ b/test/phpunit/BOMTest.php
@@ -75,10 +75,10 @@ class BOMTest extends PHPUnit\Framework\TestCase
 	}
 
 	/**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
 	public static function setUpBeforeClass()
 	{
 		global $conf,$user,$langs,$db;
@@ -87,11 +87,11 @@ class BOMTest extends PHPUnit\Framework\TestCase
 		print __METHOD__."\n";
 	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
 	public static function tearDownAfterClass()
 	{
 		global $conf,$user,$langs,$db;
@@ -129,7 +129,7 @@ class BOMTest extends PHPUnit\Framework\TestCase
 	/**
 	 * testBOMCreate
 	 *
-     * @return int
+	 * @return int
 	 */
 	public function testBOMCreate()
 	{
diff --git a/test/phpunit/BankAccountTest.php b/test/phpunit/BankAccountTest.php
index fd92d242b31..3e229d3b41c 100644
--- a/test/phpunit/BankAccountTest.php
+++ b/test/phpunit/BankAccountTest.php
@@ -30,9 +30,9 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/compta/bank/class/account.class.php';
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -48,189 +48,189 @@ $langs->load("main");
  */
 class BankAccountTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return BankAccountTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return BankAccountTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * End phpunit tests
-     *
-     * @return  void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+	/**
+	 * End phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testBankAccountCreate
-     *
-     * @return  int
-     */
-    public function testBankAccountCreate()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testBankAccountCreate
+	 *
+	 * @return  int
+	 */
+	public function testBankAccountCreate()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Account($this->savdb);
-        $localobject->initAsSpecimen();
-        $localobject->date_solde=dol_now();
-        $result=$localobject->create($user);
+		$localobject=new Account($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date_solde=dol_now();
+		$result=$localobject->create($user);
 
-        print __METHOD__." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testBankAccountFetch
-     *
-     * @param   int $id     Id of contract
-     * @return  int
-     *
-     * @depends testBankAccountCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testBankAccountFetch($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testBankAccountFetch
+	 *
+	 * @param   int $id     Id of contract
+	 * @return  int
+	 *
+	 * @depends testBankAccountCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testBankAccountFetch($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Account($this->savdb);
-        $result=$localobject->fetch($id);
+		$localobject=new Account($this->savdb);
+		$result=$localobject->fetch($id);
 
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testBankAccountOther
-     *
-     * @param   Object  $localobject    Object contract
-     * @return  int
-     *
-     * @depends testBankAccountFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testBankAccountOther($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testBankAccountOther
+	 *
+	 * @param   Account  $localobject    Account
+	 * @return  int
+	 *
+	 * @depends testBankAccountFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testBankAccountOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        /*$result=$localobject->setstatus(0);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        */
+		/*$result=$localobject->setstatus(0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		*/
 
-        $localobject->info($localobject->id);
+		$localobject->info($localobject->id);
 
-        $result = $localobject->needIBAN();
-        //print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
-        $this->assertEquals(1, $result);
+		$result = $localobject->needIBAN();
+		//print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
+		$this->assertEquals(1, $result);
 
-        return $localobject->id;
-    }
+		return $localobject->id;
+	}
 
-    /**
-     * testBankAccountDelete
-     *
-     * @param   int $id     Id of contract
-     * @return  int
-     *
-     * @depends testBankAccountOther
-     * The depends says test is run only if previous is ok
-     */
-    public function testBankAccountDelete($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testBankAccountDelete
+	 *
+	 * @param   int $id     Id of contract
+	 * @return  int
+	 *
+	 * @depends testBankAccountOther
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testBankAccountDelete($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Account($this->savdb);
-        $result=$localobject->fetch($id);
-        $result=$localobject->delete($user);
+		$localobject=new Account($this->savdb);
+		$result=$localobject->fetch($id);
+		$result=$localobject->delete($user);
 
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $result;
-    }
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $result;
+	}
 }
diff --git a/test/phpunit/BonPrelevementTest.php b/test/phpunit/BonPrelevementTest.php
index 135c77dfa2d..314640aefda 100644
--- a/test/phpunit/BonPrelevementTest.php
+++ b/test/phpunit/BonPrelevementTest.php
@@ -29,8 +29,7 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/compta/prelevement/class/bonprelevement.class.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -76,65 +75,65 @@ class BonPrelevementTest extends PHPUnit\Framework\TestCase
 		print "\n";
 	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return	void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return	void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testBonPrevelementCreate
-     *
-     * @return	int
-     */
-    public function testBonPrelevementCreate()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testBonPrevelementCreate
+	 *
+	 * @return	int
+	 */
+	public function testBonPrelevementCreate()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -152,42 +151,42 @@ class BonPrelevementTest extends PHPUnit\Framework\TestCase
 
 		// Create withdraw record and generate SEPA file
 		$localobject=new BonPrelevement($this->savdb);
-    	//$localobject->date_solde=dol_now();
-    	$result=$localobject->Create(0, 0, 'simu');
+		//$localobject->date_solde=dol_now();
+		$result=$localobject->Create(0, 0, 'simu');
 
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals($result, 0);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, 0);
 
-    	// Test SEPA file
+		// Test SEPA file
 
 
-    	return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testBonPrelevementDelete
-     *
-     * @param	int		$id		Id of contract
-     * @return	int
-     *
-     * @depends	testBonPrelevementOther
-     * The depends says test is run only if previous is ok
-     */
-    /*    public function testBonPrelevementDelete($id)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testBonPrelevementDelete
+	 *
+	 * @param	int		$id		Id of contract
+	 * @return	int
+	 *
+	 * @depends	testBonPrelevementOther
+	 * The depends says test is run only if previous is ok
+	 */
+	/*    public function testBonPrelevementDelete($id)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new BonPrelevement($this->savdb);
-    	$result=$localobject->fetch($id);
+		$result=$localobject->fetch($id);
 		$result=$localobject->delete($id);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $result;
-    }
-    */
+		$this->assertLessThan($result, 0);
+		return $result;
+	}
+	*/
 }
diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php
index de4da3790b5..455f2ce513a 100644
--- a/test/phpunit/BuildDocTest.php
+++ b/test/phpunit/BuildDocTest.php
@@ -60,9 +60,9 @@ require_once dirname(__FILE__).'/../../htdocs/core/modules/modExpenseReport.clas
 
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -76,365 +76,379 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class BuildDocTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return BuildDocTest
-     */
-    public function __construct()
-    {
-        parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return BuildDocTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-        //$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 
-        if (! $conf->facture->enabled) { print __METHOD__." invoice module not enabled\n"; die(); }
-        if (! $conf->commande->enabled) { print __METHOD__." order module not enabled\n"; die(); }
-        if (! $conf->propal->enabled) { print __METHOD__." propal module not enabled\n"; die(); }
-        if (! $conf->projet->enabled) { print __METHOD__." project module not enabled\n"; die(); }
-        if (! $conf->expedition->enabled) { print __METHOD__." shipment module not enabled\n"; die(); }
-        if (! $conf->ficheinter->enabled) { print __METHOD__." intervention module not enabled\n"; die(); }
-        if (! $conf->expensereport->enabled) { print __METHOD__." expensereport module not enabled\n"; die(); }
+		if (! $conf->facture->enabled) {
+			print __METHOD__." invoice module not enabled\n"; die();
+		}
+		if (! $conf->commande->enabled) {
+			print __METHOD__." order module not enabled\n"; die();
+		}
+		if (! $conf->propal->enabled) {
+			print __METHOD__." propal module not enabled\n"; die();
+		}
+		if (! $conf->projet->enabled) {
+			print __METHOD__." project module not enabled\n"; die();
+		}
+		if (! $conf->expedition->enabled) {
+			print __METHOD__." shipment module not enabled\n"; die();
+		}
+		if (! $conf->ficheinter->enabled) {
+			print __METHOD__." intervention module not enabled\n"; die();
+		}
+		if (! $conf->expensereport->enabled) {
+			print __METHOD__." expensereport module not enabled\n"; die();
+		}
 
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return	void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
-    /**
-     * End phpunit tests
-     *
-     * @return	void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testFactureBuild
-     *
-     * @return int
-     */
-    public function testFactureBuild()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testFactureBuild
+	 *
+	 * @return int
+	 */
+	public function testFactureBuild()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $conf->facture->dir_output.='/temp';
+		$conf->facture->dir_output.='/temp';
 
-        $localobjectcom=new Commande($this->savdb);
-        $localobjectcom->initAsSpecimen();
+		$localobjectcom=new Commande($this->savdb);
+		$localobjectcom->initAsSpecimen();
 
-        $localobject=new Facture($this->savdb);
-        $localobject->createFromOrder($localobjectcom, $user);
-        $localobject->date_lim_reglement = dol_now() + 3600 * 24 *30;
+		$localobject=new Facture($this->savdb);
+		$localobject->createFromOrder($localobjectcom, $user);
+		$localobject->date_lim_reglement = dol_now() + 3600 * 24 *30;
 
-        // Crabe (english)
-        $localobject->modelpdf='crabe';
-        $result = $localobject->generateDocument($localobject->modelpdf, $langs);
-        $this->assertLessThan($result, 0);
-        print __METHOD__." result=".$result."\n";
+		// Crabe (english)
+		$localobject->model_pdf='crabe';
+		$result = $localobject->generateDocument($localobject->model_pdf, $langs);
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
 
-        // Crabe (japanese)
-        $newlangs1=new Translate("", $conf);
-        $newlangs1->setDefaultLang('ja_JP');
-        $localobject->modelpdf='crabe';
-        $result = $localobject->generateDocument($localobject->modelpdf, $newlangs1);
-        $this->assertLessThan($result, 0);
-        print __METHOD__." result=".$result."\n";
+		// Crabe (japanese)
+		$newlangs1=new Translate("", $conf);
+		$newlangs1->setDefaultLang('ja_JP');
+		$localobject->model_pdf='crabe';
+		$result = $localobject->generateDocument($localobject->model_pdf, $newlangs1);
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
 
-        // Crabe (saudiarabia)
-        $newlangs2a=new Translate("", $conf);
-        $newlangs2a->setDefaultLang('sa_SA');
-        $localobject->modelpdf='crabe';
-        $result = $localobject->generateDocument($localobject->modelpdf, $newlangs2a);
-        $this->assertLessThan($result, 0);
-        print __METHOD__." result=".$result."\n";
+		// Crabe (saudiarabia)
+		$newlangs2a=new Translate("", $conf);
+		$newlangs2a->setDefaultLang('sa_SA');
+		$localobject->model_pdf='crabe';
+		$result = $localobject->generateDocument($localobject->model_pdf, $newlangs2a);
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
 
-        // Crabe (english_saudiarabia)
-        $newlangs2b=new Translate("", $conf);
-        $newlangs2b->setDefaultLang('en_SA');
-        $localobject->modelpdf='crabe';
-        $result = $localobject->generateDocument($localobject->modelpdf, $newlangs2b);
-        $this->assertLessThan($result, 0);
-        print __METHOD__." result=".$result."\n";
+		// Crabe (english_saudiarabia)
+		$newlangs2b=new Translate("", $conf);
+		$newlangs2b->setDefaultLang('en_SA');
+		$localobject->model_pdf='crabe';
+		$result = $localobject->generateDocument($localobject->model_pdf, $newlangs2b);
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
 
-        // Crabe (greek)
-        $newlangs3=new Translate("", $conf);
-        $newlangs3->setDefaultLang('el_GR');
-        $localobject->modelpdf='crabe';
-        $result = $localobject->generateDocument($localobject->modelpdf, $newlangs3);
-        $this->assertLessThan($result, 0);
-        print __METHOD__." result=".$result."\n";
+		// Crabe (greek)
+		$newlangs3=new Translate("", $conf);
+		$newlangs3->setDefaultLang('el_GR');
+		$localobject->model_pdf='crabe';
+		$result = $localobject->generateDocument($localobject->model_pdf, $newlangs3);
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
 
-        // Crabe (chinese)
-        $newlangs4=new Translate("", $conf);
-        $newlangs4->setDefaultLang('zh_CN');
-        $localobject->modelpdf='crabe';
-        $result = $localobject->generateDocument($localobject->modelpdf, $newlangs4);
-        $this->assertLessThan($result, 0);
-        print __METHOD__." result=".$result."\n";
+		// Crabe (chinese)
+		$newlangs4=new Translate("", $conf);
+		$newlangs4->setDefaultLang('zh_CN');
+		$localobject->model_pdf='crabe';
+		$result = $localobject->generateDocument($localobject->model_pdf, $newlangs4);
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
 
-        // Crabe (russian)
-        $newlangs5=new Translate("", $conf);
-        $newlangs5->setDefaultLang('ru_RU');
-        $localobject->modelpdf='crabe';
-        $result = $localobject->generateDocument($localobject->modelpdf, $newlangs5);
-        $this->assertLessThan($result, 0);
-        print __METHOD__." result=".$result."\n";
+		// Crabe (russian)
+		$newlangs5=new Translate("", $conf);
+		$newlangs5->setDefaultLang('ru_RU');
+		$localobject->model_pdf='crabe';
+		$result = $localobject->generateDocument($localobject->model_pdf, $newlangs5);
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
 
-        return 0;
-    }
+		return 0;
+	}
 
-    /**
-    * testFactureFournisseurBuild
-    *
-    * @return int
-    */
-    public function testFactureFournisseurBuild()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	* testFactureFournisseurBuild
+	*
+	* @return int
+	*/
+	public function testFactureFournisseurBuild()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $conf->fournisseur->facture->dir_output.='/temp';
-        $localobject=new FactureFournisseur($this->savdb);
-        $localobject->initAsSpecimen();
+		$conf->fournisseur->facture->dir_output.='/temp';
+		$localobject=new FactureFournisseur($this->savdb);
+		$localobject->initAsSpecimen();
 
-        // Canelle
-        $localobject->modelpdf='canelle';
-        $result = $localobject->generateDocument($localobject->modelpdf, $langs);
+		// Canelle
+		$localobject->model_pdf='canelle';
+		$result = $localobject->generateDocument($localobject->model_pdf, $langs);
 
-        $this->assertLessThan($result, 0);
-        print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
 
-        return 0;
-    }
+		return 0;
+	}
 
-    /**
-     * testCommandeBuild
-     *
-     * @return int
-     */
-    public function testCommandeBuild()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCommandeBuild
+	 *
+	 * @return int
+	 */
+	public function testCommandeBuild()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $conf->commande->dir_output.='/temp';
-        $localobject=new Commande($this->savdb);
-        $localobject->initAsSpecimen();
+		$conf->commande->dir_output.='/temp';
+		$localobject=new Commande($this->savdb);
+		$localobject->initAsSpecimen();
 
-        // Einstein
-        $localobject->modelpdf='einstein';
-        $result = $localobject->generateDocument($localobject->modelpdf, $langs);
+		// Einstein
+		$localobject->model_pdf='einstein';
+		$result = $localobject->generateDocument($localobject->model_pdf, $langs);
 
-        $this->assertLessThan($result, 0);
-        print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
 
-        return 0;
-    }
+		return 0;
+	}
 
 
-    /**
-     * testCommandeFournisseurBuild
-     *
-     * @return int
-     */
-    public function testCommandeFournisseurBuild()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCommandeFournisseurBuild
+	 *
+	 * @return int
+	 */
+	public function testCommandeFournisseurBuild()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $conf->fournisseur->commande->dir_output.='/temp';
-        $localobject=new CommandeFournisseur($this->savdb);
-        $localobject->initAsSpecimen();
+		$conf->fournisseur->commande->dir_output.='/temp';
+		$localobject=new CommandeFournisseur($this->savdb);
+		$localobject->initAsSpecimen();
 
-        // Muscadet
-        $localobject->modelpdf='muscadet';
-        $result= $localobject->generateDocument($localobject->modelpdf, $langs);
+		// Muscadet
+		$localobject->model_pdf='muscadet';
+		$result= $localobject->generateDocument($localobject->model_pdf, $langs);
 
-        $this->assertLessThan($result, 0);
-        print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
 
-        return 0;
-    }
+		return 0;
+	}
 
-    /**
-     * testPropalBuild
-     *
-     * @return int
-     */
-    public function testPropalBuild()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testPropalBuild
+	 *
+	 * @return int
+	 */
+	public function testPropalBuild()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $conf->propal->dir_output.='/temp';
-        $localobject=new Propal($this->savdb);
-        $localobject->initAsSpecimen();
+		$conf->propal->dir_output.='/temp';
+		$localobject=new Propal($this->savdb);
+		$localobject->initAsSpecimen();
 
-        // Azur
-        $localobject->modelpdf='azur';
-        $result = $localobject->generateDocument($localobject->modelpdf, $langs);
+		// Azur
+		$localobject->model_pdf='azur';
+		$result = $localobject->generateDocument($localobject->model_pdf, $langs);
 
-        $this->assertLessThan($result, 0);
-        print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
 
-        return 0;
-    }
+		return 0;
+	}
 
-    /**
-     * testProjectBuild
-     *
-     * @return int
-     */
-    public function testProjectBuild()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-        $conf->projet->dir_output.='/temp';
-        $localobject=new Project($this->savdb);
-        $localobject->initAsSpecimen();
+	/**
+	 * testProjectBuild
+	 *
+	 * @return int
+	 */
+	public function testProjectBuild()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+		$conf->projet->dir_output.='/temp';
+		$localobject=new Project($this->savdb);
+		$localobject->initAsSpecimen();
 
-        // Baleine
-        $localobject->modelpdf='baleine';
-        $result = $localobject->generateDocument($localobject->modelpdf, $langs);
+		// Baleine
+		$localobject->model_pdf='baleine';
+		$result = $localobject->generateDocument($localobject->model_pdf, $langs);
 
-        $this->assertLessThan($result, 0);
-        print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
 
-        return 0;
-    }
+		return 0;
+	}
 
-    /**
-     * testFichinterBuild
-     *
-     * @return int
-     */
-    public function testFichinterBuild()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testFichinterBuild
+	 *
+	 * @return int
+	 */
+	public function testFichinterBuild()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $conf->ficheinter->dir_output.='/temp';
-        $localobject=new Fichinter($this->savdb);
-        $localobject->initAsSpecimen();
+		$conf->ficheinter->dir_output.='/temp';
+		$localobject=new Fichinter($this->savdb);
+		$localobject->initAsSpecimen();
 
-        // Soleil
-        $localobject->modelpdf='soleil';
-        $result=fichinter_create($db, $localobject, $localobject->modelpdf, $langs);
+		// Soleil
+		$localobject->model_pdf='soleil';
+		$result=fichinter_create($db, $localobject, $localobject->model_pdf, $langs);
 
-        $this->assertLessThan($result, 0);
-        print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
 
-        return 0;
-    }
+		return 0;
+	}
 
-    /**
-     * testExpeditionBuild
-     *
-     * @return int
-     */
-    public function testExpeditionBuild()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testExpeditionBuild
+	 *
+	 * @return int
+	 */
+	public function testExpeditionBuild()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $conf->expedition->dir_output.='/temp';
-        $localobject=new Expedition($this->savdb);
-        $localobject->initAsSpecimen();
+		$conf->expedition->dir_output.='/temp';
+		$localobject=new Expedition($this->savdb);
+		$localobject->initAsSpecimen();
 
-        // Merou
-        $localobject->modelpdf='merou';
-        $result= $localobject->generateDocument($localobject->modelpdf, $langs);
+		// Merou
+		$localobject->model_pdf='merou';
+		$result= $localobject->generateDocument($localobject->model_pdf, $langs);
 
-        $this->assertLessThan($result, 0);
-        print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
 
-        // Rouget
-        $localobject->modelpdf='rouget';
-        $result= $localobject->generateDocument($localobject->modelpdf, $langs);
+		// Rouget
+		$localobject->model_pdf='rouget';
+		$result= $localobject->generateDocument($localobject->model_pdf, $langs);
 
-        $this->assertLessThan($result, 0);
-        print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
 
-        return 0;
-    }
+		return 0;
+	}
 }
diff --git a/test/phpunit/CMailFileTest.php b/test/phpunit/CMailFileTest.php
index d407b67d991..7e4b5dbacb7 100755
--- a/test/phpunit/CMailFileTest.php
+++ b/test/phpunit/CMailFileTest.php
@@ -30,9 +30,9 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/class/CMailFile.class.php';
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -46,163 +46,163 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class CMailFileTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return CMailFile
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return CMailFile
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $conf->global->MAIN_DISABLE_ALL_MAILS=1;    // If I comment/remove this lien, unit test still works alone but failed when ran from AllTest. Don't know why.
+		$conf->global->MAIN_DISABLE_ALL_MAILS=1;    // If I comment/remove this lien, unit test still works alone but failed when ran from AllTest. Don't know why.
 
-        print __METHOD__."\n";
-    }
-    /**
-     * End phpunit tests
-     *
-     * @return	void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testCMailFileText
-     *
-     * @return void
-     */
-    public function testCMailFileText()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCMailFileText
+	 *
+	 * @return void
+	 */
+	public function testCMailFileText()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new CMailFile('Test', 'test@test.com', 'from@from.com', 'Message txt', array(), array(), array(), '', '', 1, 0);
+		$localobject=new CMailFile('Test', 'test@test.com', 'from@from.com', 'Message txt', array(), array(), array(), '', '', 1, 0);
 
-        $result=$localobject->sendfile();
-        print __METHOD__." result=".$result."\n";
-        $this->assertFalse($result);   // False because mail send disabled
+		$result=$localobject->sendfile();
+		print __METHOD__." result=".$result."\n";
+		$this->assertFalse($result);   // False because mail send disabled
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testCMailFileStatic
-     *
-     * @return string
-     */
-    public function testCMailFileStatic()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCMailFileStatic
+	 *
+	 * @return string
+	 */
+	public function testCMailFileStatic()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new CMailFile('', '', '', '');
+		$localobject=new CMailFile('', '', '', '');
 
-        $src='John Doe <john@doe.com>';
-        $result=$localobject->getValidAddress($src, 0);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, 'John Doe <john@doe.com>');
+		$src='John Doe <john@doe.com>';
+		$result=$localobject->getValidAddress($src, 0);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, 'John Doe <john@doe.com>');
 
-        $src='John Doe <john@doe.com>';
-        $result=$localobject->getValidAddress($src, 1);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, '<john@doe.com>');
+		$src='John Doe <john@doe.com>';
+		$result=$localobject->getValidAddress($src, 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, '<john@doe.com>');
 
-        $src='John Doe <john@doe.com>';
-        $result=$localobject->getValidAddress($src, 2);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, 'john@doe.com');
+		$src='John Doe <john@doe.com>';
+		$result=$localobject->getValidAddress($src, 2);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, 'john@doe.com');
 
-        $src='John Doe <john@doe.com>';
-        $result=$localobject->getValidAddress($src, 3, 0);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, '"John Doe" <john@doe.com>');
+		$src='John Doe <john@doe.com>';
+		$result=$localobject->getValidAddress($src, 3, 0);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, '"John Doe" <john@doe.com>');
 
-        $src='John Doe <john@doe.com>';
-        $result=$localobject->getValidAddress($src, 3, 1);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, '"=?UTF-8?B?Sm9obiBEb2U=?=" <john@doe.com>');
+		$src='John Doe <john@doe.com>';
+		$result=$localobject->getValidAddress($src, 3, 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, '"=?UTF-8?B?Sm9obiBEb2U=?=" <john@doe.com>');
 
-        $src='John Doe <john@doe.com>';
-        $result=$localobject->getValidAddress($src, 4);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, 'John Doe');
+		$src='John Doe <john@doe.com>';
+		$result=$localobject->getValidAddress($src, 4);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, 'John Doe');
 
-        $src='John Doe <john@doe.com>, John Doe2 <john@doe3.com>, John Doe3 <john@doe2.com>';
-        $result=$localobject->getValidAddress($src, 4);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, 'John Doe,John Doe2,John Doe3');
+		$src='John Doe <john@doe.com>, John Doe2 <john@doe3.com>, John Doe3 <john@doe2.com>';
+		$result=$localobject->getValidAddress($src, 4);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, 'John Doe,John Doe2,John Doe3');
 
-        $src='John Doe <john@doe.com>, John Doe2 <john@doe3.com>, John Doe3 <john@doe2.com>';
-        $result=$localobject->getValidAddress($src, 4, 0, 2);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, 'John Doe,John Doe2...');
+		$src='John Doe <john@doe.com>, John Doe2 <john@doe3.com>, John Doe3 <john@doe2.com>';
+		$result=$localobject->getValidAddress($src, 4, 0, 2);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, 'John Doe,John Doe2...');
 
-        return $result;
-    }
+		return $result;
+	}
 }
diff --git a/test/phpunit/CategorieTest.php b/test/phpunit/CategorieTest.php
index 11aff6b1a79..67e7f937267 100644
--- a/test/phpunit/CategorieTest.php
+++ b/test/phpunit/CategorieTest.php
@@ -31,9 +31,9 @@ require_once dirname(__FILE__).'/../../htdocs/categories/class/categorie.class.p
 require_once dirname(__FILE__).'/../../htdocs/product/class/product.class.php';
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -47,303 +47,303 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class CategorieTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return CategorieTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return CategorieTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
-    /**
-     * End phpunit tests
-     *
-     * @return  void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
+	/**
+	 * End phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testCategorieCreate
-     *
-     * @return int
-     */
-    public function testCategorieCreate()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCategorieCreate
+	 *
+	 * @return int
+	 */
+	public function testCategorieCreate()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
 
-        // We create a category
-        $localobject=new Categorie($this->savdb);
-        $localobject->initAsSpecimen();
+		// We create a category
+		$localobject=new Categorie($this->savdb);
+		$localobject->initAsSpecimen();
 
-        // Check it does not exist (return 0)
-        $resultCheck=$localobject->already_exists();
-        print __METHOD__." resultCheck=".$resultCheck."\n";
-        $this->assertEquals(0, $resultCheck);
+		// Check it does not exist (return 0)
+		$resultCheck=$localobject->already_exists();
+		print __METHOD__." resultCheck=".$resultCheck."\n";
+		$this->assertEquals(0, $resultCheck);
 
-        // Create
-        $resultFirstCreate=$localobject->create($user);
-        print __METHOD__." resultFirstCreate=".$resultFirstCreate."\n";
-        $this->assertGreaterThan(0, $resultFirstCreate);
+		// Create
+		$resultFirstCreate=$localobject->create($user);
+		print __METHOD__." resultFirstCreate=".$resultFirstCreate."\n";
+		$this->assertGreaterThan(0, $resultFirstCreate);
 
-        // We try to create another one with same ref
-        $localobject2=new Categorie($this->savdb);
-        $localobject2->initAsSpecimen();
+		// We try to create another one with same ref
+		$localobject2=new Categorie($this->savdb);
+		$localobject2->initAsSpecimen();
 
-        // Check it does exist (return 1)
-        $resultCheck=$localobject2->already_exists();
-        print __METHOD__." resultCheck=".$resultCheck."\n";
-        $this->assertGreaterThan(0, $resultCheck);
+		// Check it does exist (return 1)
+		$resultCheck=$localobject2->already_exists();
+		print __METHOD__." resultCheck=".$resultCheck."\n";
+		$this->assertGreaterThan(0, $resultCheck);
 
-        $resultSecondCreate=$localobject2->create($user);
-        print __METHOD__." result=".$resultSecondCreate."\n";
-        $this->assertEquals(-4, $resultSecondCreate);
+		$resultSecondCreate=$localobject2->create($user);
+		print __METHOD__." result=".$resultSecondCreate."\n";
+		$this->assertEquals(-4, $resultSecondCreate);
 
-        return $resultFirstCreate;
-    }
+		return $resultFirstCreate;
+	}
 
-    /**
-     * testCategorieProduct
-     *
-     * @param   int $id     Id of category
-     * @return  int
-     *
-     * @depends testCategorieCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testCategorieProduct($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCategorieProduct
+	 *
+	 * @param   int $id     Id of category
+	 * @return  int
+	 *
+	 * @depends testCategorieCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testCategorieProduct($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobjecttmp=new Categorie($this->savdb);
-        $localobjecttmp->initAsSpecimen();
-        $localobjecttmp->label='Specimen Category for product';
-        $localobjecttmp->type=0;    // product category
-        $catid=$localobjecttmp->create($user);
+		$localobjecttmp=new Categorie($this->savdb);
+		$localobjecttmp->initAsSpecimen();
+		$localobjecttmp->label='Specimen Category for product';
+		$localobjecttmp->type=0;    // product category
+		$catid=$localobjecttmp->create($user);
 
-        print __METHOD__." catid=".$catid."\n";
-        $this->assertGreaterThan(0, $catid);
+		print __METHOD__." catid=".$catid."\n";
+		$this->assertGreaterThan(0, $catid);
 
-        // Try to create product linked to category
-        $localobject2=new Product($this->savdb);
-        $localobject2->initAsSpecimen();
-        $localobject2->ref.='-CATEG';
-        $localobject2->tva_npr=1;
-        $result=$localobject2->create($user);
-        $cat = new Categorie($this->savdb);
-        $cat->id = $catid;
-        $cat->type = 0;
-        $result=$cat->add_type($localobject2, "product");
+		// Try to create product linked to category
+		$localobject2=new Product($this->savdb);
+		$localobject2->initAsSpecimen();
+		$localobject2->ref.='-CATEG';
+		$localobject2->tva_npr=1;
+		$result=$localobject2->create($user);
+		$cat = new Categorie($this->savdb);
+		$cat->id = $catid;
+		$cat->type = 0;
+		$result=$cat->add_type($localobject2, "product");
 
-        print __METHOD__." result=".$result."\n";
-        $this->assertGreaterThan(0, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThan(0, $result);
 
-        // Get list of categories for product
-        $localcateg=new Categorie($this->savdb);
-        $listofcateg=$localcateg->containing($localobject2->id, Categorie::TYPE_PRODUCT, 'label');
-        $this->assertTrue(in_array('Specimen Category for product', $listofcateg), 'Categ not found linked to product when it should');
+		// Get list of categories for product
+		$localcateg=new Categorie($this->savdb);
+		$listofcateg=$localcateg->containing($localobject2->id, Categorie::TYPE_PRODUCT, 'label');
+		$this->assertTrue(in_array('Specimen Category for product', $listofcateg), 'Categ not found linked to product when it should');
 
-        return $id;
-    }
+		return $id;
+	}
 
-    /**
-     * testCategorieFetch
-     *
-     * @param   int $id     Id of category
-     * @return  int
-     *
-     * @depends testCategorieProduct
-     * The depends says test is run only if previous is ok
-     */
-    public function testCategorieFetch($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCategorieFetch
+	 *
+	 * @param   int $id     Id of category
+	 * @return  int
+	 *
+	 * @depends testCategorieProduct
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testCategorieFetch($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Categorie($this->savdb);
-        $result=$localobject->fetch($id);
+		$localobject=new Categorie($this->savdb);
+		$result=$localobject->fetch($id);
 
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertGreaterThan(0, $result);
-        return $localobject;
-    }
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertGreaterThan(0, $result);
+		return $localobject;
+	}
 
-    /**
-     * testCategorieUpdate
-     *
-     * @param   Categorie        $localobject        Category
-     * @return  int
+	/**
+	 * testCategorieUpdate
+	 *
+	 * @param   Categorie        $localobject        Category
+	 * @return  int
 
-     * @depends testCategorieFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testCategorieUpdate($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	 * @depends testCategorieFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testCategorieUpdate($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject->note='New note after update';
-        $result=$localobject->update($user);
+		$localobject->note='New note after update';
+		$result=$localobject->update($user);
 
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertGreaterThan(0, $result);
-        return $localobject;
-    }
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertGreaterThan(0, $result);
+		return $localobject;
+	}
 
-    /**
-     * testCategorieOther
-     *
-     * @param   Categorie    $localobject    Category
-     * @return  int
-     *
-     * @depends testCategorieUpdate
-     * The depends says test is run only if previous is ok
-     */
-    public function testCategorieOther($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCategorieOther
+	 *
+	 * @param   Categorie    $localobject    Category
+	 * @return  int
+	 *
+	 * @depends testCategorieUpdate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testCategorieOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        /*$result=$localobject->setstatus(0);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        */
-        $localobject2=new Categorie($db);
-        $localobject2->initAsSpecimen();
+		/*$result=$localobject->setstatus(0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		*/
+		$localobject2=new Categorie($db);
+		$localobject2->initAsSpecimen();
 
-        $retarray=$localobject->liste_photos('/');
-        print __METHOD__." retarray size=".count($retarray)."\n";
-        $this->assertTrue(is_array($retarray));
+		$retarray=$localobject->liste_photos('/');
+		print __METHOD__." retarray size=".count($retarray)."\n";
+		$this->assertTrue(is_array($retarray));
 
-        return $localobject->id;
-    }
+		return $localobject->id;
+	}
 
-    /**
-     * testCategorieDelete
-     *
-     * @param   int $id     Id of category
-     * @return  int
-     *
-     * @depends	testCategorieOther
-     * The depends says test is run only if previous is ok
-     */
-    public function testCategorieDelete($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCategorieDelete
+	 *
+	 * @param   int $id     Id of category
+	 * @return  int
+	 *
+	 * @depends	testCategorieOther
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testCategorieDelete($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Categorie($this->savdb);
-        $result=$localobject->fetch($id);
-        $result=$localobject->delete($user);
+		$localobject=new Categorie($this->savdb);
+		$result=$localobject->fetch($id);
+		$result=$localobject->delete($user);
 
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertGreaterThan(0, $result);
-        return $result;
-    }
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertGreaterThan(0, $result);
+		return $result;
+	}
 
-    /**
-     * testCategorieStatic
-     *
-     * @return  void
-     *
-     * @depends  testCategorieDelete
-     */
-    public function testCategorieStatic()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCategorieStatic
+	 *
+	 * @return  void
+	 *
+	 * @depends  testCategorieDelete
+	 */
+	public function testCategorieStatic()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Categorie($this->savdb);
-        $retarray=$localobject->get_full_arbo(3);
+		$localobject=new Categorie($this->savdb);
+		$retarray=$localobject->get_full_arbo(3);
 
-        print __METHOD__." retarray size=".count($retarray)."\n";
-        $this->assertTrue(is_array($retarray));
-        return $retarray;
-    }
+		print __METHOD__." retarray size=".count($retarray)."\n";
+		$this->assertTrue(is_array($retarray));
+		return $retarray;
+	}
 }
diff --git a/test/phpunit/ChargeSocialesTest.php b/test/phpunit/ChargeSocialesTest.php
index 33349449795..705d21ed95d 100644
--- a/test/phpunit/ChargeSocialesTest.php
+++ b/test/phpunit/ChargeSocialesTest.php
@@ -29,11 +29,10 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/compta/sociales/class/chargesociales.class.php';
 
-if (empty($user->id))
-{
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+if (empty($user->id)) {
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -47,206 +46,206 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class ChargeSocialesTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return ChargeSocialesTest
-     */
-    public function __construct()
-    {
-        parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return ChargeSocialesTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-        //$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return	void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
-    /**
-     * End phpunit tests
-     *
-     * @return	void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testChargeSocialesCreate
-     *
-     * @return	void
-     */
-    public function testChargeSocialesCreate()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testChargeSocialesCreate
+	 *
+	 * @return	void
+	 */
+	public function testChargeSocialesCreate()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new ChargeSociales($this->savdb);
-        $localobject->initAsSpecimen();
-        $result=$localobject->create($user, $langs, $conf);
-        print __METHOD__." result=".$result."\n";
+		$localobject=new ChargeSociales($this->savdb);
+		$localobject->initAsSpecimen();
+		$result=$localobject->create($user, $langs, $conf);
+		print __METHOD__." result=".$result."\n";
 
-        $this->assertLessThan($result, 0);
-        return $result;
-    }
+		$this->assertLessThan($result, 0);
+		return $result;
+	}
 
-    /**
-     * testChargeSocialesFetch
-     *
-     * @param	int		$id		Id of social contribution
-     * @return	void
-     *
-     * @depends	testChargeSocialesCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testChargeSocialesFetch($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testChargeSocialesFetch
+	 *
+	 * @param	int		$id		Id of social contribution
+	 * @return	void
+	 *
+	 * @depends	testChargeSocialesCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testChargeSocialesFetch($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new ChargeSociales($this->savdb);
-        $result=$localobject->fetch($id);
-        print __METHOD__." id=".$id." result=".$result."\n";
+		$localobject=new ChargeSociales($this->savdb);
+		$result=$localobject->fetch($id);
+		print __METHOD__." id=".$id." result=".$result."\n";
 
-        $this->assertLessThan($result, 0);
-        return $localobject;
-    }
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
 
-    /**
-     * testChargeSocialesValid
-     *
-     * @param	Object		$localobject	Social contribution
-     * @return	void
-     *
-     * @depends	testChargeSocialesFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testChargeSocialesValid($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testChargeSocialesValid
+	 *
+	 * @param	ChargeSociales		$localobject	Social contribution
+	 * @return	void
+	 *
+	 * @depends	testChargeSocialesFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testChargeSocialesValid($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=$localobject->set_paid($user);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$result=$localobject->setPaid($user);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
-        $this->assertLessThan($result, 0);
-        return $localobject;
-    }
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
 
-    /**
-     * testChargeSocialesOther
-     *
-     * @param	Object	$localobject		Social contribution
-     * @return	void
-     *
-     * @depends testChargeSocialesValid
-     * The depends says test is run only if previous is ok
-     */
-    public function testChargeSocialesOther($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testChargeSocialesOther
+	 *
+	 * @param	ChargeSociales	$localobject		Social contribution
+	 * @return	void
+	 *
+	 * @depends testChargeSocialesValid
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testChargeSocialesOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=$localobject->getNomUrl(1);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertNotEquals($result, '');
+		$result=$localobject->getNomUrl(1);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertNotEquals($result, '');
 
-        $result=$localobject->getSommePaiement();
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThanOrEqual($result, 0);
+		$result=$localobject->getSommePaiement();
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThanOrEqual($result, 0);
 
-        return $localobject->id;
-    }
+		return $localobject->id;
+	}
 
-    /**
-     * testChargeSocialesDelete
-     *
-     * @param	int		$id			Social contribution
-     * @return 	void
-     *
-     * @depends	testChargeSocialesOther
-     * The depends says test is run only if previous is ok
-     */
-    public function testChargeSocialesDelete($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testChargeSocialesDelete
+	 *
+	 * @param	int		$id			Social contribution
+	 * @return 	void
+	 *
+	 * @depends	testChargeSocialesOther
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testChargeSocialesDelete($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new ChargeSociales($this->savdb);
-        $result=$localobject->fetch($id);
-        $result=$localobject->delete($id);
+		$localobject=new ChargeSociales($this->savdb);
+		$result=$localobject->fetch($id);
+		$result=$localobject->delete($id);
 
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $result;
-    }
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $result;
+	}
 }
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 9acb13432d2..cf58c298206 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -30,22 +30,41 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+if (! defined('NOREQUIREUSER')) {
+	define('NOREQUIREUSER', '1');
+}
+if (! defined('NOREQUIREDB')) {
+	define('NOREQUIREDB', '1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (! defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', '1');
+}
+if (! defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1'); // If there is no menu to show
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (! defined("NOLOGIN")) {
+	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+}
 
-if (empty($user->id))
-{
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+if (empty($user->id)) {
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -59,313 +78,317 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class CodingPhpTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return SecurityTest
-     */
-    public function __construct()
-    {
-        parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return SecurityTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-        //$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * End phpunit tests
-     *
-     * @return  void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+	/**
+	 * End phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testSql
-     *
-     * @return string
-     */
-    public function testPHP()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testSql
+	 *
+	 * @return string
+	 */
+	public function testPHP()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        $filesarray = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, '\.php', null, 'fullname');
-        //$filesarray = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, '\.php', null, 'fullname');
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		$filesarray = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, '\.php', null, 'fullname');
+		//$filesarray = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, '\.php', null, 'fullname');
 
-        foreach ($filesarray as $key => $file)
-        {
-            if (preg_match('/\/htdocs\/includes\//', $file['fullname'])) continue;
-            if (preg_match('/\/htdocs\/custom\//', $file['fullname'])) continue;
-            if (preg_match('/\/htdocs\/dolimed/', $file['fullname'])) continue;
-            if (preg_match('/\/htdocs\/nltechno/', $file['fullname'])) continue;
-            if (preg_match('/\/htdocs\/teclib/', $file['fullname'])) continue;
+		foreach ($filesarray as $key => $file) {
+			if (preg_match('/\/htdocs\/includes\//', $file['fullname'])) {
+				continue;
+			}
+			if (preg_match('/\/htdocs\/custom\//', $file['fullname'])) {
+				continue;
+			}
+			if (preg_match('/\/htdocs\/dolimed/', $file['fullname'])) {
+				continue;
+			}
+			if (preg_match('/\/htdocs\/nltechno/', $file['fullname'])) {
+				continue;
+			}
+			if (preg_match('/\/htdocs\/teclib/', $file['fullname'])) {
+				continue;
+			}
 
-            print 'Check php file '.$file['fullname']."\n";
-            $filecontent=file_get_contents($file['fullname']);
+			print 'Check php file '.$file['fullname']."\n";
+			$filecontent=file_get_contents($file['fullname']);
 
-            if (preg_match('/\.class\.php/', $file['relativename'])
-            	|| preg_match('/boxes\/box_/', $file['relativename'])
-            	|| preg_match('/modules\/.*\/doc\/(doc|pdf)_/', $file['relativename'])
-            	|| preg_match('/modules\/(import|mailings|printing)\//', $file['relativename'])
-            	|| in_array($file['name'], array('modules_boxes.php', 'rapport.pdf.php', 'TraceableDB.php'))) {
-            	if (! in_array($file['name'], array(
-            		'api.class.php',
-            		'actioncomm.class.php',
-            		'commonobject.class.php',
-	            	'conf.class.php',
-            		'html.form.class.php',
-            		'html.formmail.class.php',
-            		'infobox.class.php',
-            		'link.class.php',
-            		'translate.class.php',
-            		'utils.class.php',
-            		'modules_product.class.php',
-            		'modules_societe.class.php',
-            		'TraceableDB.php',
-            		'expeditionbatch.class.php',
-            		'expensereport_ik.class.php',
-            		'expensereport_rule.class.php',
-            		'multicurrency.class.php',
-            		'productbatch.class.php',
-            		'reception.class.php',
-            		'societe.class.php'
-            	))) {
-	            	// Must must not found $db->
-	            	$ok=true;
-	            	$matches=array();
-	            	// Check string get_class...
-	            	preg_match_all('/'.preg_quote('$db->', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
-	            	foreach ($matches as $key => $val)
-	            	{
-	            		$ok=false;
-	            		break;
-	            	}
-	            	//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-	            	$this->assertTrue($ok, 'Found string $db-> into a .class.php file in '.$file['relativename']);
-	            	//exit;
-            	}
-            } else {
-            	if (! in_array($file['name'], array(
-            		'extrafieldsinexport.inc.php',
-            		'DolQueryCollector.php'
-            	))) {
-	            	// Must must not found $this->db->
-	            	$ok=true;
-	            	$matches=array();
-	            	// Check string get_class...
-	            	preg_match_all('/'.preg_quote('$this->db->', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
-	            	foreach ($matches as $key => $val)
-	            	{
-	            		$ok=false;
-	            		break;
-	            	}
-	            	//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-	            	$this->assertTrue($ok, 'Found string $this->db-> in '.$file['relativename']);
-	            	//exit;
-            	}
-            }
+			if (preg_match('/\.class\.php/', $file['relativename'])
+				|| preg_match('/boxes\/box_/', $file['relativename'])
+				|| preg_match('/modules\/.*\/doc\/(doc|pdf)_/', $file['relativename'])
+				|| preg_match('/modules\/(import|mailings|printing)\//', $file['relativename'])
+				|| in_array($file['name'], array('modules_boxes.php', 'rapport.pdf.php', 'TraceableDB.php'))) {
+				if (! in_array($file['name'], array(
+					'api.class.php',
+					'actioncomm.class.php',
+					'commonobject.class.php',
+					'conf.class.php',
+					'html.form.class.php',
+					'html.formmail.class.php',
+					'infobox.class.php',
+					'link.class.php',
+					'translate.class.php',
+					'utils.class.php',
+					'modules_product.class.php',
+					'modules_societe.class.php',
+					'TraceableDB.php',
+					'expeditionbatch.class.php',
+					'expensereport_ik.class.php',
+					'expensereport_rule.class.php',
+					'multicurrency.class.php',
+					'productbatch.class.php',
+					'reception.class.php',
+					'societe.class.php'
+				))) {
+					// Must must not found $db->
+					$ok=true;
+					$matches=array();
+					// Check string get_class...
+					preg_match_all('/'.preg_quote('$db->', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
+					foreach ($matches as $key => $val) {
+						$ok=false;
+						break;
+					}
+					//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+					$this->assertTrue($ok, 'Found string $db-> into a .class.php file in '.$file['relativename']);
+					//exit;
+				}
+			} else {
+				if (! in_array($file['name'], array(
+					'extrafieldsinexport.inc.php',
+					'DolQueryCollector.php'
+				))) {
+					// Must must not found $this->db->
+					$ok=true;
+					$matches=array();
+					// Check string get_class...
+					preg_match_all('/'.preg_quote('$this->db->', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
+					foreach ($matches as $key => $val) {
+						$ok=false;
+						break;
+					}
+					//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+					$this->assertTrue($ok, 'Found string $this->db-> in '.$file['relativename']);
+					//exit;
+				}
+			}
 
+			$ok=true;
+			$matches=array();
+			// Check string get_class...
+			preg_match_all('/'.preg_quote('get_class($this)."::".__METHOD__', '/').'/', $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 get_class($this)."::".__METHOD__ that must be replaced with __METHOD__ only in '.$file['relativename']);
+			//exit;
+
+			$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] != '\'\'') {
+					$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 $this->db->idate to forge a sql request without quotes around this date field '.$file['relativename']);
+			//exit;
+
+
+			$ok=true;
+			$matches=array();
+
+			// Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
+			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;
+
+			// Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
+			preg_match_all('/sql.+\s*\'"\s*\.\s*\$(.........)/', $filecontent, $matches, PREG_SET_ORDER);
+			foreach ($matches as $key => $val) {
+				if (! in_array($val[1], array('this->db-', 'this->esc', 'db->escap', 'dbsession', 'db->idate', 'excludeGr', 'includeGr'))) {
+					$ok=false;
+					break;
+				}
+				//if ($reg[0] != 'db') $ok=false;
+			}
+			//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+			$this->assertTrue($ok, 'Found non escaped string in building of a sql request '.$file['relativename'].': '.$val[0].' - Bad.');
+			//exit;
+
+
+			// Test that output of $_SERVER\[\'QUERY_STRING\'\] is escaped.
+			$ok=true;
+			$matches=array();
+			// Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
+			preg_match_all('/(..............)\$_SERVER\[\'QUERY_STRING\'\]/', $filecontent, $matches, PREG_SET_ORDER);
+			foreach ($matches as $key => $val) {
+				if ($val[1] != 'scape_htmltag(' && $val[1] != 'ing_nohtmltag(' && $val[1] != 'dol_escape_js(') {
+					$ok=false;
+					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.');
+
+
+			// Test that first param of print_liste_field_titre is a translation key and not the translated value
+			$ok=true;
+			$matches=array();
+			// Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
+			preg_match_all('/print_liste_field_titre\(\$langs/', $filecontent, $matches, PREG_SET_ORDER);
+			foreach ($matches as $key => $val) {
+				   $ok=false;
+				   break;
+			}
+			$this->assertTrue($ok, 'Found a use of print_liste_field_titre with first parameter that is a translated value instead of just the translation key in file '.$file['relativename'].'. Bad.');
+
+
+			// Test we don't have <br />
+			$ok=true;
+			$matches=array();
+			// Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
+			preg_match_all('/<br \/>/', $filecontent, $matches, PREG_SET_ORDER);
+			foreach ($matches as $key => $val) {
+				if ($file['name'] != 'functions.lib.php') {
+					$ok=false;
+					break;
+				}
+			}
+			$this->assertTrue($ok, 'Found a tag <br /> that is for xml in file '.$file['relativename'].'. You must use html syntax <br> instead.');
+
+
+			// Test we don't have name="token" value="'.$_SESSION['newtoken'], we must use name="token" value="'.newToken() instead.
+			$ok=true;
+			$matches=array();
+			// Check string   name="token" value="'.$_SESSINON
+			preg_match_all('/name="token" value="\'\s*\.\s*\$_SESSION/', $filecontent, $matches, PREG_SET_ORDER);
+			foreach ($matches as $key => $val) {
+				if ($file['name'] != 'excludefile.php') {
+					$ok=false;
+					break;
+				}
+			}
+			$this->assertTrue($ok, 'Found a forbidden string sequence into '.$file['relativename'].' : name="token" value="\'.$_SESSION[..., you must use a newToken() instead of $_SESSION[\'newtoken\'].');
+
+
+			// Test we don't have @var array(
+			$ok=true;
+			$matches=array();
+			// Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
+			preg_match_all('/@var\s+array\(/', $filecontent, $matches, PREG_SET_ORDER);
+			foreach ($matches as $key => $val) {
+				$ok=false;
+				break;
+			}
+			$this->assertTrue($ok, 'Found a declaration @var array() instead of @var array in file '.$file['relativename'].'.');
+
+
+            // Test we don't have CURDATE()
             $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;
-           		break;
+            preg_match_all('/CURDATE\(\)/', $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 get_class($this)."::".__METHOD__ that must be replaced with __METHOD__ only in '.$file['relativename']);
-            //exit;
-
-            $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] != '\'\'')
-                {
-                    $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 $this->db->idate to forge a sql request without quotes around this date field '.$file['relativename']);
-            //exit;
-
-
-            $ok=true;
-            $matches=array();
-
-            // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
-            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;
-
-            // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
-            preg_match_all('/sql.+\s*\'"\s*\.\s*\$(.........)/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach ($matches as $key => $val)
-            {
-            	if (! in_array($val[1], array('this->db-', 'this->esc', 'db->escap', 'dbsession', 'db->idate', 'excludeGr', 'includeGr'))) {
-            		$ok=false;
-            		break;
-            	}
-            	//if ($reg[0] != 'db') $ok=false;
-            }
-            //print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-            $this->assertTrue($ok, 'Found non escaped string in building of a sql request '.$file['relativename'].': '.$val[0].' - Bad.');
-            //exit;
-
-
-            // Test that output of $_SERVER\[\'QUERY_STRING\'\] is escaped.
-            $ok=true;
-            $matches=array();
-            // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
-            preg_match_all('/(..............)\$_SERVER\[\'QUERY_STRING\'\]/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach ($matches as $key => $val)
-            {
-                if ($val[1] != 'scape_htmltag(' && $val[1] != 'ing_nohtmltag(' && $val[1] != 'dol_escape_js(')
-                {
-                    $ok=false;
-                    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.');
-
-
-            // Test that first param of print_liste_field_titre is a translation key and not the translated value
-            $ok=true;
-            $matches=array();
-            // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
-            preg_match_all('/print_liste_field_titre\(\$langs/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach ($matches as $key => $val)
-            {
-                   $ok=false;
-                   break;
-            }
-            $this->assertTrue($ok, 'Found a use of print_liste_field_titre with first parameter that is a translated value instead of just the translation key in file '.$file['relativename'].'. Bad.');
-
-
-            // Test we don't have <br />
-            $ok=true;
-            $matches=array();
-            // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
-            preg_match_all('/<br \/>/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach ($matches as $key => $val)
-            {
-                if ($file['name'] != 'functions.lib.php')
-                {
-                    $ok=false;
-                    break;
-                }
-            }
-            $this->assertTrue($ok, 'Found a tag <br /> that is for xml in file '.$file['relativename'].'. You must use html syntax <br> instead.');
-
-
-            // Test we don't have name="token" value="'.$_SESSION['newtoken'], we must use name="token" value="'.newToken() instead.
-            $ok=true;
-            $matches=array();
-            // Check string   name="token" value="'.$_SESSINON
-            preg_match_all('/name="token" value="\'\s*\.\s*\$_SESSION/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach ($matches as $key => $val)
-            {
-            	if ($file['name'] != 'excludefile.php')
-            	{
-            		$ok=false;
-            		break;
-            	}
-            }
-            $this->assertTrue($ok, 'Found a forbidden string sequence into '.$file['relativename'].' : name="token" value="\'.$_SESSION[..., you must use a newToken() instead of $_SESSION[\'newtoken\'].');
-
-
-            // Test we don't have @var array(
-            $ok=true;
-            $matches=array();
-            // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
-            preg_match_all('/@var\s+array\(/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach ($matches as $key => $val)
-            {
-                $ok=false;
-                break;
-            }
-            $this->assertTrue($ok, 'Found a declaration @var array() instead of @var array in file '.$file['relativename'].'.');
+            $this->assertTrue($ok, 'Found a CURDATE\(\) into code. Do not use this SQL method in file '.$file['relativename'].'. You must use the PHP function dol_now() instead.');
         }
 
-        return;
-    }
+		return;
+	}
 }
diff --git a/test/phpunit/CodingSqlTest.php b/test/phpunit/CodingSqlTest.php
index 3e065bb141c..9217ebbe7f6 100644
--- a/test/phpunit/CodingSqlTest.php
+++ b/test/phpunit/CodingSqlTest.php
@@ -30,22 +30,41 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+if (! defined('NOREQUIREUSER')) {
+	define('NOREQUIREUSER', '1');
+}
+if (! defined('NOREQUIREDB')) {
+	define('NOREQUIREDB', '1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (! defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', '1');
+}
+if (! defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1'); // If there is no menu to show
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (! defined("NOLOGIN")) {
+	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+}
 
-if (empty($user->id))
-{
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+if (empty($user->id)) {
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -59,205 +78,201 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class CodingSqlTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return SecurityTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return SecurityTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * End phpunit tests
-     *
-     * @return  void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+	/**
+	 * End phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testSql
-     *
-     * @return string
-     */
-    public function testSql()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testSql
+	 *
+	 * @return string
+	 */
+	public function testSql()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $listofsqldir = array(DOL_DOCUMENT_ROOT.'/install/mysql/data', DOL_DOCUMENT_ROOT.'/install/mysql/tables', DOL_DOCUMENT_ROOT.'/install/mysql/migration');
+		$listofsqldir = array(DOL_DOCUMENT_ROOT.'/install/mysql/data', DOL_DOCUMENT_ROOT.'/install/mysql/tables', DOL_DOCUMENT_ROOT.'/install/mysql/migration');
 
-        foreach ($listofsqldir as $dir)
-        {
-            print 'Process dir '.$dir."\n";
-            $filesarray = scandir($dir);
+		foreach ($listofsqldir as $dir) {
+			print 'Process dir '.$dir."\n";
+			$filesarray = scandir($dir);
 
-            foreach ($filesarray as $key => $file)
-            {
-                if (! preg_match('/\.sql$/', $file))
-                    continue;
+			foreach ($filesarray as $key => $file) {
+				if (! preg_match('/\.sql$/', $file)) {
+					continue;
+				}
 
-                print 'Check sql file '.$file."\n";
-                $filecontent = file_get_contents($dir.'/'.$file);
+				print 'Check sql file '.$file."\n";
+				$filecontent = file_get_contents($dir.'/'.$file);
 
-                // Allow ` for 'rank' column name
-                $filecontent = str_replace('`rank`', '_rank_', $filecontent);
+				// Allow ` for 'rank' column name
+				$filecontent = str_replace('`rank`', '_rank_', $filecontent);
 
-                $result=strpos($filecontent, '`');
-                //print __METHOD__." Result for checking we don't have back quote = ".$result."\n";
-                $this->assertTrue($result===false, 'Found back quote into '.$file.'. Bad.');
+				$result=strpos($filecontent, '`');
+				//print __METHOD__." Result for checking we don't have back quote = ".$result."\n";
+				$this->assertTrue($result===false, 'Found back quote into '.$file.'. Bad.');
 
-                $result=strpos($filecontent, '"');
-                if ($result)
-                {
-                	$result=(! strpos($filecontent, '["') && ! strpos($filecontent, '{"'));
-                }
-                //print __METHOD__." Result for checking we don't have double quote = ".$result."\n";
-                $this->assertTrue($result===false, 'Found double quote that is not [" neither {" (used for json content) into '.$file.'. Bad.');
+				$result=strpos($filecontent, '"');
+				if ($result) {
+					$result=(! strpos($filecontent, '["') && ! strpos($filecontent, '{"'));
+				}
+				//print __METHOD__." Result for checking we don't have double quote = ".$result."\n";
+				$this->assertTrue($result===false, 'Found double quote that is not [" neither {" (used for json content) into '.$file.'. Bad.');
 
-                $result=strpos($filecontent, 'int(');
-                //print __METHOD__." Result for checking we don't have 'int(' instead of 'integer' = ".$result."\n";
-                $this->assertTrue($result===false, 'Found int(x) or tinyint(x) instead of integer or tinyint into '.$file.'. Bad.');
+				$result=strpos($filecontent, 'int(');
+				//print __METHOD__." Result for checking we don't have 'int(' instead of 'integer' = ".$result."\n";
+				$this->assertTrue($result===false, 'Found int(x) or tinyint(x) instead of integer or tinyint into '.$file.'. Bad.');
 
-                $result=strpos($filecontent, 'ON DELETE CASCADE');
-                //print __METHOD__." Result for checking we don't have 'ON DELETE CASCADE' = ".$result."\n";
-                $this->assertTrue($result===false, 'Found ON DELETE CASCADE into '.$file.'. Bad.');
+				$result=strpos($filecontent, 'ON DELETE CASCADE');
+				//print __METHOD__." Result for checking we don't have 'ON DELETE CASCADE' = ".$result."\n";
+				$this->assertTrue($result===false, 'Found ON DELETE CASCADE into '.$file.'. Bad.');
 
-                $result=strpos($filecontent, 'NUMERIC(');
-                //print __METHOD__." Result for checking we don't have 'NUMERIC(' = ".$result."\n";
-                $this->assertTrue($result===false, 'Found NUMERIC( into '.$file.'. Bad.');
+				$result=strpos($filecontent, 'NUMERIC(');
+				//print __METHOD__." Result for checking we don't have 'NUMERIC(' = ".$result."\n";
+				$this->assertTrue($result===false, 'Found NUMERIC( into '.$file.'. Bad.');
 
-                $result=strpos($filecontent, 'NUMERIC(');
-                //print __METHOD__." Result for checking we don't have 'curdate(' = ".$result."\n";
-                $this->assertTrue($result===false, 'Found curdate( into '.$file.'. Bad. Current date must be generated with PHP.');
+				$result=strpos($filecontent, 'NUMERIC(');
+				//print __METHOD__." Result for checking we don't have 'curdate(' = ".$result."\n";
+				$this->assertTrue($result===false, 'Found curdate( into '.$file.'. Bad. Current date must be generated with PHP.');
 
-                $result=strpos($filecontent, 'integer(');
-                //print __METHOD__." Result for checking we don't have 'integer(' = ".$result."\n";
-                $this->assertTrue($result===false, 'Found value in parenthesis after the integer. It must be integer not integer(x) into '.$file.'. Bad.');
+				$result=strpos($filecontent, 'integer(');
+				//print __METHOD__." Result for checking we don't have 'integer(' = ".$result."\n";
+				$this->assertTrue($result===false, 'Found value in parenthesis after the integer. It must be integer not integer(x) into '.$file.'. Bad.');
 
-                if ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/migration')
-                {
-                    // Test for migration files only
-                } elseif ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/data')
-                {
-                    // Test for data files only
-                } else {
-                    if (preg_match('/\.key\.sql$/', $file))
-                    {
-                        // Test for key files only
-                    } else {
-                        // Test for non key files only
-                        $result=(strpos($filecontent, 'KEY ') && strpos($filecontent, 'PRIMARY KEY') == 0);
-                        //print __METHOD__." Result for checking we don't have ' KEY ' instead of a sql file to create index = ".$result."\n";
-                        $this->assertTrue($result===false, 'Found KEY into '.$file.'. Bad.');
+				if ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/migration') {
+					// Test for migration files only
+				} elseif ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/data') {
+					// Test for data files only
+				} else {
+					if (preg_match('/\.key\.sql$/', $file)) {
+						// Test for key files only
+					} else {
+						// Test for non key files only
+						$result=(strpos($filecontent, 'KEY ') && strpos($filecontent, 'PRIMARY KEY') == 0);
+						//print __METHOD__." Result for checking we don't have ' KEY ' instead of a sql file to create index = ".$result."\n";
+						$this->assertTrue($result===false, 'Found KEY into '.$file.'. Bad.');
 
-                        $result=stripos($filecontent, 'ENGINE=innodb');
-                        //print __METHOD__." Result for checking we have the ENGINE=innodb string = ".$result."\n";
-                        $this->assertGreaterThan(0, $result, 'The ENGINE=innodb was not found into '.$file.'. Add it or just fix syntax to match case.');
-                    }
-                }
-            }
-        }
+						$result=stripos($filecontent, 'ENGINE=innodb');
+						//print __METHOD__." Result for checking we have the ENGINE=innodb string = ".$result."\n";
+						$this->assertGreaterThan(0, $result, 'The ENGINE=innodb was not found into '.$file.'. Add it or just fix syntax to match case.');
+					}
+				}
+			}
+		}
 
-        return;
-    }
+		return;
+	}
 
-    /**
-     * testInitData
-     *
-     * @return string
-     */
-    public function testInitData()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testInitData
+	 *
+	 * @return string
+	 */
+	public function testInitData()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $filesarray = scandir(DOL_DOCUMENT_ROOT.'/../dev/initdemo');
-        foreach ($filesarray as $key => $file) {
-            if (! preg_match('/\.sql$/', $file))
-                continue;
+		$filesarray = scandir(DOL_DOCUMENT_ROOT.'/../dev/initdemo');
+		foreach ($filesarray as $key => $file) {
+			if (! preg_match('/\.sql$/', $file)) {
+				continue;
+			}
 
-            print 'Check sql file '.$file."\n";
-            $filecontent=file_get_contents(DOL_DOCUMENT_ROOT.'/../dev/initdemo/'.$file);
+			print 'Check sql file '.$file."\n";
+			$filecontent=file_get_contents(DOL_DOCUMENT_ROOT.'/../dev/initdemo/'.$file);
 
-            $result=strpos($filecontent, '@gmail.com');
-            print __METHOD__." Result for checking we don't have personal data = ".$result."\n";
-            $this->assertTrue($result===false, 'Found a bad key @gmail into file '.$file);
+			$result=strpos($filecontent, '@gmail.com');
+			print __METHOD__." Result for checking we don't have personal data = ".$result."\n";
+			$this->assertTrue($result===false, 'Found a bad key @gmail into file '.$file);
 
-            $result=strpos($filecontent, 'eldy@');
-            print __METHOD__." Result for checking we don't have personal data = ".$result."\n";
-            $this->assertTrue($result===false, 'Found a bad key eldy@ into file '.$file);
-        }
+			$result=strpos($filecontent, 'eldy@');
+			print __METHOD__." Result for checking we don't have personal data = ".$result."\n";
+			$this->assertTrue($result===false, 'Found a bad key eldy@ into file '.$file);
+		}
 
-        return;
-    }
+		return;
+	}
 }
diff --git a/test/phpunit/CommandeFournisseurTest.php b/test/phpunit/CommandeFournisseurTest.php
index 0ee65e3383e..28fc9b8daac 100644
--- a/test/phpunit/CommandeFournisseurTest.php
+++ b/test/phpunit/CommandeFournisseurTest.php
@@ -31,9 +31,9 @@ require_once dirname(__FILE__).'/../../htdocs/fourn/class/fournisseur.commande.c
 require_once dirname(__FILE__).'/../../htdocs/fourn/class/fournisseur.product.class.php';
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -48,351 +48,353 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class CommandeFournisseurTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return CommandeFournisseurTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return CommandeFournisseurTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-        //print $db->getVersion()."\n";
-    }
-    /**
-     * End phpunit tests
-     *
-     * @return	void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+		//print $db->getVersion()."\n";
+	}
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testCommandeFournisseurCreate
-     *
-     * @return	int		ID of purchase order
-     */
-    public function testCommandeFournisseurCreate()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCommandeFournisseurCreate
+	 *
+	 * @return	int		ID of purchase order
+	 */
+	public function testCommandeFournisseurCreate()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        // Set supplier and product to use
-        $socid=1;
-        $societe=new Societe($db);
-        $societe->fetch($socid);
-        $product=new ProductFournisseur($db);
-        $product->fetch(0, 'PIDRESS');
-        if ($product->id <= 0) { print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die(); }
+		// Set supplier and product to use
+		$socid=1;
+		$societe=new Societe($db);
+		$societe->fetch($socid);
+		$product=new ProductFournisseur($db);
+		$product->fetch(0, 'PIDRESS');
+		if ($product->id <= 0) {
+			print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die();
+		}
 
-        $quantity=10;
-        $ref_fourn='SUPPLIER_REF_PHPUNIT';
-        $tva_tx=19.6;
+		$quantity=10;
+		$ref_fourn='SUPPLIER_REF_PHPUNIT';
+		$tva_tx=19.6;
 
-        // Delete existing supplier prices
-        // TODO
+		// Delete existing supplier prices
+		// TODO
 
-        // Create 1 supplier price with min qty = 10;
-        $result=$product->add_fournisseur($user, $societe->id, $ref_fourn, $quantity);    // This insert record with no value for price. Values are update later with update_buyprice
-        print __METHOD__." add_fournisseur result=".$result."\n";
-        $this->assertGreaterThanOrEqual(0, $result, 'Create 1 supplier price with min qty = 10 if not exists');
-        $result=$product->update_buyprice($quantity, 20, $user, 'HT', $societe, '', $ref_fourn, $tva_tx, 0, 0);
-        print __METHOD__." update_buyprice result=".$result."\n";
-        $this->assertGreaterThanOrEqual(0, $result, 'Update buyprice');
+		// Create 1 supplier price with min qty = 10;
+		$result=$product->add_fournisseur($user, $societe->id, $ref_fourn, $quantity);    // This insert record with no value for price. Values are update later with update_buyprice
+		print __METHOD__." add_fournisseur result=".$result."\n";
+		$this->assertGreaterThanOrEqual(0, $result, 'Create 1 supplier price with min qty = 10 if not exists');
+		$result=$product->update_buyprice($quantity, 20, $user, 'HT', $societe, '', $ref_fourn, $tva_tx, 0, 0);
+		print __METHOD__." update_buyprice result=".$result."\n";
+		$this->assertGreaterThanOrEqual(0, $result, 'Update buyprice');
 
-        // Create purchase order with a too low quantity and option SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY is on
-        $conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY = 1;
+		// Create purchase order with a too low quantity and option SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY is on
+		$conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY = 1;
 
-        $localobject=new CommandeFournisseur($db);
-        $localobject->initAsSpecimen();
-        $localobject->lines=array();    // Overwrite lines of order
-        $line=new CommandeFournisseurLigne($db);
-        $line->desc=$langs->trans("Description")." specimen line with qty too low";
-        $line->qty=1;                   // So lower than $quantity
-        $line->subprice=100;
-        $line->fk_product=$product->id;
-        $line->ref_fourn=$ref_fourn;
-        $localobject->lines[]=$line;
+		$localobject=new CommandeFournisseur($db);
+		$localobject->initAsSpecimen();
+		$localobject->lines=array();    // Overwrite lines of order
+		$line=new CommandeFournisseurLigne($db);
+		$line->desc=$langs->trans("Description")." specimen line with qty too low";
+		$line->qty=1;                   // So lower than $quantity
+		$line->subprice=100;
+		$line->fk_product=$product->id;
+		$line->ref_fourn=$ref_fourn;
+		$localobject->lines[]=$line;
 
-        $result=$localobject->create($user);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(-1, $result, 'Creation of too low quantity');   // must be -1 because quantity is lower than minimum of supplier price
+		$result=$localobject->create($user);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(-1, $result, 'Creation of too low quantity');   // must be -1 because quantity is lower than minimum of supplier price
 
-        $sql="DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref=''";
-        $db->query($sql);
+		$sql="DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref=''";
+		$db->query($sql);
 
-        // Create purchase order
-        $localobject2=new CommandeFournisseur($db);
-        $localobject2->initAsSpecimen();    // This create 5 lines of first product found for socid 1
-        $localobject2->lines=array();       // Overwrite lines of order
-        $line=new CommandeFournisseurLigne($db);
-        $line->desc=$langs->trans("Description")." specimen line ok";
-        $line->qty=10;                      // So enough quantity
-        $line->subprice=100;
-        $line->fk_product=$product->id;
-        $line->ref_fourn=$ref_fourn;
-        $localobject2->lines[]=$line;
+		// Create purchase order
+		$localobject2=new CommandeFournisseur($db);
+		$localobject2->initAsSpecimen();    // This create 5 lines of first product found for socid 1
+		$localobject2->lines=array();       // Overwrite lines of order
+		$line=new CommandeFournisseurLigne($db);
+		$line->desc=$langs->trans("Description")." specimen line ok";
+		$line->qty=10;                      // So enough quantity
+		$line->subprice=100;
+		$line->fk_product=$product->id;
+		$line->ref_fourn=$ref_fourn;
+		$localobject2->lines[]=$line;
 
-        $result=$localobject2->create($user);
-        print __METHOD__." result=".$result."\n";
-        $this->assertGreaterThan(0, $result);
+		$result=$localobject2->create($user);
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThan(0, $result);
 
 
-        // Create purchase order with a too low quantity but option SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY is off
-        $conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY = 0;
+		// Create purchase order with a too low quantity but option SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY is off
+		$conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY = 0;
 
-        $localobject3=new CommandeFournisseur($db);
-        $localobject3->initAsSpecimen();
-        $localobject3->lines=array();    // Overwrite lines of order
-        $line=new CommandeFournisseurLigne($db);
-        $line->desc=$langs->trans("Description")." specimen line with qty too low";
-        $line->qty=1;                   // So lower than $quantity
-        $line->subprice=100;
-        $line->fk_product=$product->id;
-        $line->ref_fourn=$ref_fourn;
-        $localobject3->lines[]=$line;
+		$localobject3=new CommandeFournisseur($db);
+		$localobject3->initAsSpecimen();
+		$localobject3->lines=array();    // Overwrite lines of order
+		$line=new CommandeFournisseurLigne($db);
+		$line->desc=$langs->trans("Description")." specimen line with qty too low";
+		$line->qty=1;                   // So lower than $quantity
+		$line->subprice=100;
+		$line->fk_product=$product->id;
+		$line->ref_fourn=$ref_fourn;
+		$localobject3->lines[]=$line;
 
-        $result=$localobject3->create($user);
-        print __METHOD__." result=".$result."\n";
-        $this->assertGreaterThan(0, $result, 'Creation of too low quantity should be ok');   // must be id of line because there is no test on minimum quantity
+		$result=$localobject3->create($user);
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThan(0, $result, 'Creation of too low quantity should be ok');   // must be id of line because there is no test on minimum quantity
 
-        $sql="DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref=''";
-        $db->query($sql);
+		$sql="DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref=''";
+		$db->query($sql);
 
-        // Create purchase order
-        $localobject4=new CommandeFournisseur($db);
-        $localobject4->initAsSpecimen();    // This create 5 lines of first product found for socid 1
-        $localobject4->lines=array();       // Overwrite lines of order
-        $line=new CommandeFournisseurLigne($db);
-        $line->desc=$langs->trans("Description")." specimen line ok";
-        $line->qty=10;                      // So enough quantity
-        $line->subprice=100;
-        $line->fk_product=$product->id;
-        $line->ref_fourn=$ref_fourn;
-        $localobject4->lines[]=$line;
+		// Create purchase order
+		$localobject4=new CommandeFournisseur($db);
+		$localobject4->initAsSpecimen();    // This create 5 lines of first product found for socid 1
+		$localobject4->lines=array();       // Overwrite lines of order
+		$line=new CommandeFournisseurLigne($db);
+		$line->desc=$langs->trans("Description")." specimen line ok";
+		$line->qty=10;                      // So enough quantity
+		$line->subprice=100;
+		$line->fk_product=$product->id;
+		$line->ref_fourn=$ref_fourn;
+		$localobject4->lines[]=$line;
 
-        $result=$localobject4->create($user);
-        print __METHOD__." id for purchase order created by testCommandeFournisseurCreate = ".$result."\n";
-        $this->assertGreaterThan(0, $result, 'Test to create a purchase order by testCommandeFournisseurCreate');
+		$result=$localobject4->create($user);
+		print __METHOD__." id for purchase order created by testCommandeFournisseurCreate = ".$result."\n";
+		$this->assertGreaterThan(0, $result, 'Test to create a purchase order by testCommandeFournisseurCreate');
 
-        return $result;
-    }
+		return $result;
+	}
 
 
-    /**
-     * testCommandeFournisseurFetch
-     *
-     * @param   int 		$id     			Id of purchase order
-     * @return  CommandeFournisseur				Purchase order
-     *
-     * @depends testCommandeFournisseurCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testCommandeFournisseurFetch($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCommandeFournisseurFetch
+	 *
+	 * @param   int 		$id     			Id of purchase order
+	 * @return  CommandeFournisseur				Purchase order
+	 *
+	 * @depends testCommandeFournisseurCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testCommandeFournisseurFetch($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new CommandeFournisseur($this->savdb);
-        $result=$localobject->fetch($id);
+		$localobject=new CommandeFournisseur($this->savdb);
+		$result=$localobject->fetch($id);
 
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0, 'Failed to fetch supplier order with id '.$id);
-        return $localobject;
-    }
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0, 'Failed to fetch supplier order with id '.$id);
+		return $localobject;
+	}
 
-    /**
-     * testCommandeFournisseurValid
-     *
-     * @param   Object $localobject     Supplier order
-     * @return  CommandeFournisseur		Supplier order
-     *
-     * @depends testCommandeFournisseurFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testCommandeFournisseurValid($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCommandeFournisseurValid
+	 *
+	 * @param   CommandeFournisseur $localobject     Supplier order
+	 * @return  CommandeFournisseur		Supplier order
+	 *
+	 * @depends testCommandeFournisseurFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testCommandeFournisseurValid($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=$localobject->valid($user);
+		$result=$localobject->valid($user);
 
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $localobject;
-    }
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
 
-    /**
-     * testCommandeFournisseurApprove
-     *
-     * @param   Object $localobject 	Supplier order
-     * @return  CommandeFournisseur		Supplier order
-     *
-     * @depends testCommandeFournisseurValid
-     * The depends says test is run only if previous is ok
-     */
-    public function testCommandeFournisseurApprove($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCommandeFournisseurApprove
+	 *
+	 * @param   CommandeFournisseur $localobject 	Supplier order
+	 * @return  CommandeFournisseur		Supplier order
+	 *
+	 * @depends testCommandeFournisseurValid
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testCommandeFournisseurApprove($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=$localobject->approve($user);
+		$result=$localobject->approve($user);
 
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $localobject;
-    }
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
 
-    /**
-     * testCommandeFournisseurCancel
-     *
-     * @param   Object  $localobject    Supplier order
-     * @return  CommandeFournisseur		Supplier order
-     *
-     * @depends testCommandeFournisseurApprove
-     * The depends says test is run only if previous is ok
-     */
-    public function testCommandeFournisseurCancel($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCommandeFournisseurCancel
+	 *
+	 * @param   CommandeFournisseur  $localobject    Supplier order
+	 * @return  CommandeFournisseur		Supplier order
+	 *
+	 * @depends testCommandeFournisseurApprove
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testCommandeFournisseurCancel($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=$localobject->cancel($user);
+		$result=$localobject->cancel($user);
 
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $localobject;
-    }
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
 
-    /**
-     * testCommandeFournisseurOther
-     *
-     * @param   Object $localobject     Supplier order
-     * @return  int						Id of purchase order
-     *
-     * @depends testCommandeFournisseurCancel
-     * The depends says test is run only if previous is ok
-     */
-    public function testCommandeFournisseurOther($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCommandeFournisseurOther
+	 *
+	 * @param   CommandeFournisseur $localobject     Supplier order
+	 * @return  int						Id of purchase order
+	 *
+	 * @depends testCommandeFournisseurCancel
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testCommandeFournisseurOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        /*$result=$localobject->setstatus(0);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        */
+		/*$result=$localobject->setstatus(0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		*/
 
-        /*$localobject->info($localobject->id);
-        print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
-        $this->assertNotEquals($localobject->date_creation, '');
-        */
-        $this->assertEquals(1, 1);
+		/*$localobject->info($localobject->id);
+		print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
+		$this->assertNotEquals($localobject->date_creation, '');
+		*/
+		$this->assertEquals(1, 1);
 
-        return $localobject->id;
-    }
+		return $localobject->id;
+	}
 
-    /**
-     * testCommandeFournisseurDelete
-     *
-     * @param   int $id     Id of order
-     * @return  int			Result of delete
-     *
-     * @depends testCommandeFournisseurOther
-     * The depends says test is run only if previous is ok
-     */
-    public function testCommandeFournisseurDelete($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCommandeFournisseurDelete
+	 *
+	 * @param   int $id     Id of order
+	 * @return  int			Result of delete
+	 *
+	 * @depends testCommandeFournisseurOther
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testCommandeFournisseurDelete($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new CommandeFournisseur($this->savdb);
-        $result=$localobject->fetch($id);
-        $result=$localobject->delete($user);
+		$localobject=new CommandeFournisseur($this->savdb);
+		$result=$localobject->fetch($id);
+		$result=$localobject->delete($user);
 
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $result;
-    }
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $result;
+	}
 }
diff --git a/test/phpunit/CommandeTest.php b/test/phpunit/CommandeTest.php
index 1decbe4e201..4ab81d63524 100644
--- a/test/phpunit/CommandeTest.php
+++ b/test/phpunit/CommandeTest.php
@@ -30,9 +30,9 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/commande/class/commande.class.php';
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -46,260 +46,262 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class CommandeTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return CommandeTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return CommandeTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        if (empty($conf->commande->enabled)) { print __METHOD__." module customer order must be enabled.\n"; die(); }
+		if (empty($conf->commande->enabled)) {
+			print __METHOD__." module customer order must be enabled.\n"; die();
+		}
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-        //print $db->getVersion()."\n";
-    }
+		print __METHOD__."\n";
+		//print $db->getVersion()."\n";
+	}
 
-    /**
-     * End phpunit tests
-     *
-     * @return  void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+	/**
+	 * End phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testCommandeCreate
-     *
-     * @return  void
-     */
-    public function testCommandeCreate()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCommandeCreate
+	 *
+	 * @return  void
+	 */
+	public function testCommandeCreate()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Commande($this->savdb);
-        $localobject->initAsSpecimen();
-        $result=$localobject->create($user);
+		$localobject=new Commande($this->savdb);
+		$localobject->initAsSpecimen();
+		$result=$localobject->create($user);
 
-        $this->assertLessThan($result, 0);
-        print __METHOD__." result=".$result."\n";
-        return $result;
-    }
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
+		return $result;
+	}
 
-    /**
-     * testCommandeFetch
-     *
-     * @param   int $id     Id order
-     * @return  Commande
-     *
-     * @depends	testCommandeCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testCommandeFetch($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCommandeFetch
+	 *
+	 * @param   int $id     Id order
+	 * @return  Commande
+	 *
+	 * @depends	testCommandeCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testCommandeFetch($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Commande($this->savdb);
-        $result=$localobject->fetch($id);
+		$localobject=new Commande($this->savdb);
+		$result=$localobject->fetch($id);
 
-        $this->assertLessThan($result, 0);
-        print __METHOD__." id=".$id." result=".$result."\n";
-        return $localobject;
-    }
+		$this->assertLessThan($result, 0);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		return $localobject;
+	}
 
-    /**
-     * testCommandeUpdate
-     *
-     * @param	Object		$localobject	Commande
-     * @return	Commande
-     *
-     * @depends	testCommandeFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testCommandeUpdate($localobject)
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+	/**
+	 * testCommandeUpdate
+	 *
+	 * @param	Commande		$localobject	Commande
+	 * @return	Commande
+	 *
+	 * @depends	testCommandeFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testCommandeUpdate($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-    	$localobject->note_private='New note private after update';
-    	$result=$localobject->update($user);
+		$localobject->note_private='New note private after update';
+		$result=$localobject->update($user);
 
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	return $localobject;
-    }
+		$this->assertLessThan($result, 0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		return $localobject;
+	}
 
-    /**
-     * testCommandeValid
-     *
-     * @param   Object  $localobject    Order
-     * @return  Commande
-     *
-     * @depends	testCommandeUpdate
-     * The depends says test is run only if previous is ok
-     */
-    public function testCommandeValid($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCommandeValid
+	 *
+	 * @param   Commande  $localobject    Order
+	 * @return  Commande
+	 *
+	 * @depends	testCommandeUpdate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testCommandeValid($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=$localobject->valid($user);
+		$result=$localobject->valid($user);
 
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $localobject;
-    }
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
 
-    /**
-     * testCommandeCancel
-     *
-     * @param   Object  $localobject    Order
-     * @return  Commande
-     *
-     * @depends testCommandeValid
-     * The depends says test is run only if previous is ok
-     */
-    public function testCommandeCancel($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCommandeCancel
+	 *
+	 * @param   Commande  $localobject    Order
+	 * @return  Commande
+	 *
+	 * @depends testCommandeValid
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testCommandeCancel($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=$localobject->cancel();
+		$result=$localobject->cancel();
 
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $localobject;
-    }
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
 
-    /**
-     * testCommandeOther
-     *
-     * @param   Object  $localobject    Order
-     * @return  int						Order id
-     *
-     * @depends testCommandeCancel
-     * The depends says test is run only if previous is ok
-     */
-    public function testCommandeOther($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCommandeOther
+	 *
+	 * @param   Commande  $localobject    Order
+	 * @return  int						Order id
+	 *
+	 * @depends testCommandeCancel
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testCommandeOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        /*$result=$localobject->setstatus(0);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        */
+		/*$result=$localobject->setstatus(0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		*/
 
-        $localobject->info($localobject->id);
-        print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
-        $this->assertNotEquals($localobject->date_creation, '');
+		$localobject->info($localobject->id);
+		print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
+		$this->assertNotEquals($localobject->date_creation, '');
 
-        return $localobject->id;
-    }
+		return $localobject->id;
+	}
 
-    /**
-     * testCommandeDelete
-     *
-     * @param   int $id         Id of order
-     * @return  void
-     *
-     * @depends testCommandeOther
-     * The depends says test is run only if previous is ok
-     */
-    public function testCommandeDelete($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCommandeDelete
+	 *
+	 * @param   int $id         Id of order
+	 * @return  void
+	 *
+	 * @depends testCommandeOther
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testCommandeDelete($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Commande($this->savdb);
-        $result=$localobject->fetch($id);
-        $result=$localobject->delete($user);
+		$localobject=new Commande($this->savdb);
+		$result=$localobject->fetch($id);
+		$result=$localobject->delete($user);
 
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $result;
-    }
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $result;
+	}
 }
diff --git a/test/phpunit/CommonInvoiceTest.php b/test/phpunit/CommonInvoiceTest.php
index 5e9c45825ec..f4cfaefb809 100644
--- a/test/phpunit/CommonInvoiceTest.php
+++ b/test/phpunit/CommonInvoiceTest.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *      \file       test/phpunit/CommonObjectTest.php
+ *      \file       test/phpunit/CommonInvoiceTest.php
  *      \ingroup    test
  *      \brief      PHPUnit test
  *      \remarks    To run this script as CLI:  phpunit filename.php
@@ -30,9 +30,9 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/compta/facture/class/facture.class.php';
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -46,110 +46,110 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class CommonInvoiceTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return CommonObjectTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return CommonObjectTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
-    /**
-     * End phpunit tests
-     *
-     * @return  void
-    */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
+	/**
+	 * End phpunit tests
+	 *
+	 * @return  void
+	*/
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
 
-    /**
-     *  testFetchUser
-     *
-     *  @return void
-     */
-    public function testCalculateDateLimReglement()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 *  testFetchUser
+	 *
+	 *  @return void
+	 */
+	public function testCalculateDateLimReglement()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Facture($this->savdb);
-        $localobject->fetch(1);
-        $localobject->date = dol_mktime(12, 0, 0, 1, 1, 2010);
+		$localobject=new Facture($this->savdb);
+		$localobject->fetch(1);
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 2010);
 
-        $result = 0;
+		$result = 0;
 
-        // TODO Insert payment terms
+		// TODO Insert payment terms
 
 
-        //$result=$localobject->calculate_date_lim_reglement(1);
-        //print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, 0);
-        return $result;
-    }
+		//$result=$localobject->calculate_date_lim_reglement(1);
+		//print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, 0);
+		return $result;
+	}
 }
diff --git a/test/phpunit/CommonObjectTest.php b/test/phpunit/CommonObjectTest.php
index 6c68423e8a9..7a01f750eef 100644
--- a/test/phpunit/CommonObjectTest.php
+++ b/test/phpunit/CommonObjectTest.php
@@ -31,9 +31,9 @@ require_once dirname(__FILE__).'/../../htdocs/commande/class/commande.class.php'
 require_once dirname(__FILE__).'/../../htdocs/projet/class/project.class.php';
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -47,150 +47,150 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class CommonObjectTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return CommonObjectTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return CommonObjectTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
-    /**
-     * End phpunit tests
-     *
-     * @return  void
-    */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
+	/**
+	 * End phpunit tests
+	 *
+	 * @return  void
+	*/
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
 
-    /**
-     *  testFetchUser
-     *
-     *  @return void
-     */
-    public function testFetchUser()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 *  testFetchUser
+	 *
+	 *  @return void
+	 */
+	public function testFetchUser()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Commande($this->savdb);
-        $localobject->fetch(1);
+		$localobject=new Commande($this->savdb);
+		$localobject->fetch(1);
 
-        $result=$localobject->fetch_user(1);
+		$result=$localobject->fetch_user(1);
 
-        print __METHOD__." result=".$result."\n";
-        $this->assertLessThan($localobject->user->id, 0);
-        return $result;
-    }
+		print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($localobject->user->id, 0);
+		return $result;
+	}
 
-    /**
-     *  testFetchProjet
-     *
-     *  @return void
-     */
-    public function testFetchProjet()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 *  testFetchProjet
+	 *
+	 *  @return void
+	 */
+	public function testFetchProjet()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Commande($this->savdb);
-        $localobject->fetch(1);
-        $result=$localobject->fetch_projet();
+		$localobject=new Commande($this->savdb);
+		$localobject->fetch(1);
+		$result=$localobject->fetch_projet();
 
-        print __METHOD__." result=".$result."\n";
-        $this->assertLessThanOrEqual($result, 0);
-        return $result;
-    }
+		print __METHOD__." result=".$result."\n";
+		$this->assertLessThanOrEqual($result, 0);
+		return $result;
+	}
 
-    /**
-     *  testFetchThirdParty
-     *
-     *  @return void
-     */
-    public function testFetchThirdParty()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 *  testFetchThirdParty
+	 *
+	 *  @return void
+	 */
+	public function testFetchThirdParty()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Commande($this->savdb);
-        $localobject->fetch(1);
+		$localobject=new Commande($this->savdb);
+		$localobject->fetch(1);
 
-        $result=$localobject->fetch_thirdparty();
+		$result=$localobject->fetch_thirdparty();
 
-        print __METHOD__." result=".$result."\n";
-        $this->assertLessThanOrEqual($result, 0);
-        return $result;
-    }
+		print __METHOD__." result=".$result."\n";
+		$this->assertLessThanOrEqual($result, 0);
+		return $result;
+	}
 }
diff --git a/test/phpunit/CompanyBankAccountTest.php b/test/phpunit/CompanyBankAccountTest.php
index 1979f89fabb..8b78712209f 100644
--- a/test/phpunit/CompanyBankAccountTest.php
+++ b/test/phpunit/CompanyBankAccountTest.php
@@ -29,8 +29,7 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/societe/class/companybankaccount.class.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -74,40 +73,40 @@ class CompanyBankAccountTest extends PHPUnit\Framework\TestCase
 		print "\n";
 	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -115,132 +114,132 @@ class CompanyBankAccountTest extends PHPUnit\Framework\TestCase
 
 		print __METHOD__."\n";
 		//print $db->getVersion()."\n";
-    }
+	}
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testCompanyBankAccountCreate
-     *
-     * @return	int
-     */
-    public function testCompanyBankAccountCreate()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testCompanyBankAccountCreate
+	 *
+	 * @return	int
+	 */
+	public function testCompanyBankAccountCreate()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new CompanyBankAccount($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+		$localobject->initAsSpecimen();
+		$result=$localobject->create($user);
 
-    	print __METHOD__." result=".$result." id=".$localobject->id."\n";
-    	$this->assertLessThan($result, 0);
-    	return $localobject->id;
-    }
+		print __METHOD__." result=".$result." id=".$localobject->id."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject->id;
+	}
 
-    /**
-     * testCompanyBankAccountFetch
-     *
-     * @param	int		$id		Id of bank account
-     * @return	Object          Bank account object
-     *
-     * @depends	testCompanyBankAccountCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testCompanyBankAccountFetch($id)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testCompanyBankAccountFetch
+	 *
+	 * @param	int		$id			Id of bank account
+	 * @return	CompanyBankAccount  Bank account object
+	 *
+	 * @depends	testCompanyBankAccountCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testCompanyBankAccountFetch($id)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new CompanyBankAccount($this->savdb);
-    	$result=$localobject->fetch($id);
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
-    }
+		$result=$localobject->fetch($id);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
 
-    /**
-     * testCompanyBankAccountSetAsDefault
-     *
-     * @param   Object  $localobject    Bank account
-     * @return  int
-     *
-     * @depends testCompanyBankAccountFetch
-     */
-    public function testCompanyBankAccountSetAsDefault($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCompanyBankAccountSetAsDefault
+	 *
+	 * @param   CompanyBankAccount  $localobject    Bank account
+	 * @return  int
+	 *
+	 * @depends testCompanyBankAccountFetch
+	 */
+	public function testCompanyBankAccountSetAsDefault($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=$localobject->setAsDefault($localobject->id);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $localobject;
-    }
+		$result=$localobject->setAsDefault($localobject->id);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
 
-    /**
-     * testCompanyBankAccountUpdate
-     *
-     * @param	Object	$localobject	Bank account object
-     * @return	int
-     *
-     * @depends	testCompanyBankAccountFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testCompanyBankAccountUpdate($localobject)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testCompanyBankAccountUpdate
+	 *
+	 * @param	CompanyBankAccount	$localobject	Bank account object
+	 * @return	int
+	 *
+	 * @depends	testCompanyBankAccountFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testCompanyBankAccountUpdate($localobject)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject->owner='New owner';
-    	$result=$localobject->update($user);
+		$result=$localobject->update($user);
 
-	   	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
-    }
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
 
-    /**
-     * testCompanyBankAccountOther
-     *
-     * @param	Object	$localobject	Bank account
-     * @return	int
-     *
-     * @depends testCompanyBankAccountFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testCompanyBankAccountOther($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testCompanyBankAccountOther
+	 *
+	 * @param	CompanyBankAccount	$localobject	Bank account
+	 * @return	int
+	 *
+	 * @depends testCompanyBankAccountFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testCompanyBankAccountOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject->owner='New owner';
-        $result=$localobject->update($user);
+		$localobject->owner='New owner';
+		$result=$localobject->update($user);
 
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $localobject->id;
-    }
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject->id;
+	}
 }
diff --git a/test/phpunit/CompanyLibTest.php b/test/phpunit/CompanyLibTest.php
index ab9eb414634..a2a83ee70a7 100644
--- a/test/phpunit/CompanyLibTest.php
+++ b/test/phpunit/CompanyLibTest.php
@@ -30,9 +30,9 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/company.lib.php';
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -46,108 +46,108 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class CompanyLibTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return AdminLibTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return AdminLibTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
-    /**
-     * End phpunit tests
-     *
-     * @return	void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testNameCurrency
-     *
-     * @return	void
-     */
-    public function testNameCurrency()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testNameCurrency
+	 *
+	 * @return	void
+	 */
+	public function testNameCurrency()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=currency_name('USD');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('US Dollars', $result, 'Test to get currency name USD in default language '.$langs->defaultlang);
+		$result=currency_name('USD');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('US Dollars', $result, 'Test to get currency name USD in default language '.$langs->defaultlang);
 
-        $outputlangs=new Translate('', $conf);
-        $outputlangs->setDefaultLang('fr_FR');
+		$outputlangs=new Translate('', $conf);
+		$outputlangs->setDefaultLang('fr_FR');
 
-        $result=currency_name('USD', 1, $outputlangs);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('USD - Dollars US', $result, 'Test to get currency name USD in default language '.$outputlangs->getDefaultLang());
+		$result=currency_name('USD', 1, $outputlangs);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('USD - Dollars US', $result, 'Test to get currency name USD in default language '.$outputlangs->getDefaultLang());
 
-        return $result;
-    }
+		return $result;
+	}
 }
diff --git a/test/phpunit/ContactTest.php b/test/phpunit/ContactTest.php
index 7d7e2740bc1..1f8977f6919 100755
--- a/test/phpunit/ContactTest.php
+++ b/test/phpunit/ContactTest.php
@@ -30,14 +30,12 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/contact/class/contact.class.php';
 $langs->load("dict");
 
-if ($langs->defaultlang != 'en_US')
-{
+if ($langs->defaultlang != 'en_US') {
 	print "Error: Default language for company to run tests must be set to en_US or auto. Current is ".$langs->defaultlang."\n";
 	exit(1);
 }
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -82,118 +80,118 @@ class ContactTest extends PHPUnit\Framework\TestCase
 		print "\n";
 	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testContactCreate
-     *
-     * @return	int
-     */
-    public function testContactCreate()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testContactCreate
+	 *
+	 * @return	int
+	 */
+	public function testContactCreate()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new Contact($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+		$localobject->initAsSpecimen();
+		$result=$localobject->create($user);
 
-        print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-    	return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testContactFetch
-     *
-     * @param	int		$id		Id of contact
-     * @return	int
-     * @depends	testContactCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testContactFetch($id)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testContactFetch
+	 *
+	 * @param	int		$id		Id of contact
+	 * @return	int
+	 * @depends	testContactCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testContactFetch($id)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new Contact($this->savdb);
-    	$result=$localobject->fetch($id);
+		$result=$localobject->fetch($id);
 
-        print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-    	return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testContactUpdate
-     *
-     * @param	Contact		$localobject	Contact
-     * @return	int
-     *
-     * @depends	testContactFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testContactUpdate($localobject)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testContactUpdate
+	 *
+	 * @param	Contact		$localobject	Contact
+	 * @return	int
+	 *
+	 * @depends	testContactFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testContactUpdate($localobject)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -208,8 +206,8 @@ class ContactTest extends PHPUnit\Framework\TestCase
 		$localobject->address='New address';
 		$localobject->zip='New zip';
 		$localobject->town='New town';
-    	$localobject->country_id=2;
-    	//$localobject->status=0;
+		$localobject->country_id=2;
+		//$localobject->status=0;
 		$localobject->phone_pro='New tel pro';
 		$localobject->phone_perso='New tel perso';
 		$localobject->phone_mobile='New tel mobile';
@@ -219,8 +217,8 @@ class ContactTest extends PHPUnit\Framework\TestCase
 		$localobject->default_lang='es_ES';
 
 		$result=$localobject->update($localobject->id, $user);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0, 'Contact::update error');
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0, 'Contact::update error');
 
 		$result=$localobject->update_note($localobject->note_private, '_private');
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -231,60 +229,60 @@ class ContactTest extends PHPUnit\Framework\TestCase
 		$this->assertLessThan($result, 0, 'Contact::update_note (public) error');
 
 		$newobject=new Contact($this->savdb);
-    	$result=$newobject->fetch($localobject->id);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0, 'Contact::fetch error');
+		$result=$newobject->fetch($localobject->id);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0, 'Contact::fetch error');
 
-    	print __METHOD__." old=".$localobject->note_private." new=".$newobject->note_private."\n";
-    	$this->assertEquals($localobject->note_private, $newobject->note_private);
-    	//print __METHOD__." old=".$localobject->note_public." new=".$newobject->note_public."\n";
-    	//$this->assertEquals($localobject->note_public, $newobject->note_public);
-    	print __METHOD__." old=".$localobject->lastname." new=".$newobject->lastname."\n";
-    	$this->assertEquals($localobject->lastname, $newobject->lastname);
-    	print __METHOD__." old=".$localobject->firstname." new=".$newobject->firstname."\n";
-    	$this->assertEquals($localobject->firstname, $newobject->firstname);
-    	print __METHOD__." old=".$localobject->address." new=".$newobject->address."\n";
-    	$this->assertEquals($localobject->address, $newobject->address);
-    	print __METHOD__." old=".$localobject->zip." new=".$newobject->zip."\n";
-    	$this->assertEquals($localobject->zip, $newobject->zip);
-    	print __METHOD__." old=".$localobject->town." new=".$newobject->town."\n";
-    	$this->assertEquals($localobject->town, $newobject->town);
-    	print __METHOD__." old=".$localobject->country_id." new=".$newobject->country_id."\n";
-    	$this->assertEquals($localobject->country_id, $newobject->country_id);
-    	print __METHOD__." old=BE new=".$newobject->country_code."\n";
-    	$this->assertEquals('BE', $newobject->country_code);
-    	//print __METHOD__." old=".$localobject->status." new=".$newobject->status."\n";
-    	//$this->assertEquals($localobject->status, $newobject->status);
-    	print __METHOD__." old=".$localobject->phone_pro." new=".$newobject->phone_pro."\n";
-    	$this->assertEquals($localobject->phone_pro, $newobject->phone_pro);
-    	print __METHOD__." old=".$localobject->phone_pro." new=".$newobject->phone_pro."\n";
-    	$this->assertEquals($localobject->phone_perso, $newobject->phone_perso);
-    	print __METHOD__." old=".$localobject->phone_mobile." new=".$newobject->phone_mobile."\n";
-    	$this->assertEquals($localobject->phone_mobile, $newobject->phone_mobile);
-    	print __METHOD__." old=".$localobject->fax." new=".$newobject->fax."\n";
-    	$this->assertEquals($localobject->fax, $newobject->fax);
-    	print __METHOD__." old=".$localobject->email." new=".$newobject->email."\n";
-    	$this->assertEquals($localobject->email, $newobject->email);
-    	print __METHOD__." old=".$localobject->socialnetworks['jabber']." new=".$newobject->socialnetworks['jabber']."\n";
-    	$this->assertEquals($localobject->socialnetworks['jabber'], $newobject->socialnetworks['jabber']);
-    	print __METHOD__." old=".$localobject->default_lang." new=".$newobject->default_lang."\n";
-    	$this->assertEquals($localobject->default_lang, $newobject->default_lang);
+		print __METHOD__." old=".$localobject->note_private." new=".$newobject->note_private."\n";
+		$this->assertEquals($localobject->note_private, $newobject->note_private);
+		//print __METHOD__." old=".$localobject->note_public." new=".$newobject->note_public."\n";
+		//$this->assertEquals($localobject->note_public, $newobject->note_public);
+		print __METHOD__." old=".$localobject->lastname." new=".$newobject->lastname."\n";
+		$this->assertEquals($localobject->lastname, $newobject->lastname);
+		print __METHOD__." old=".$localobject->firstname." new=".$newobject->firstname."\n";
+		$this->assertEquals($localobject->firstname, $newobject->firstname);
+		print __METHOD__." old=".$localobject->address." new=".$newobject->address."\n";
+		$this->assertEquals($localobject->address, $newobject->address);
+		print __METHOD__." old=".$localobject->zip." new=".$newobject->zip."\n";
+		$this->assertEquals($localobject->zip, $newobject->zip);
+		print __METHOD__." old=".$localobject->town." new=".$newobject->town."\n";
+		$this->assertEquals($localobject->town, $newobject->town);
+		print __METHOD__." old=".$localobject->country_id." new=".$newobject->country_id."\n";
+		$this->assertEquals($localobject->country_id, $newobject->country_id);
+		print __METHOD__." old=BE new=".$newobject->country_code."\n";
+		$this->assertEquals('BE', $newobject->country_code);
+		//print __METHOD__." old=".$localobject->status." new=".$newobject->status."\n";
+		//$this->assertEquals($localobject->status, $newobject->status);
+		print __METHOD__." old=".$localobject->phone_pro." new=".$newobject->phone_pro."\n";
+		$this->assertEquals($localobject->phone_pro, $newobject->phone_pro);
+		print __METHOD__." old=".$localobject->phone_pro." new=".$newobject->phone_pro."\n";
+		$this->assertEquals($localobject->phone_perso, $newobject->phone_perso);
+		print __METHOD__." old=".$localobject->phone_mobile." new=".$newobject->phone_mobile."\n";
+		$this->assertEquals($localobject->phone_mobile, $newobject->phone_mobile);
+		print __METHOD__." old=".$localobject->fax." new=".$newobject->fax."\n";
+		$this->assertEquals($localobject->fax, $newobject->fax);
+		print __METHOD__." old=".$localobject->email." new=".$newobject->email."\n";
+		$this->assertEquals($localobject->email, $newobject->email);
+		print __METHOD__." old=".$localobject->socialnetworks['jabber']." new=".$newobject->socialnetworks['jabber']."\n";
+		$this->assertEquals($localobject->socialnetworks['jabber'], $newobject->socialnetworks['jabber']);
+		print __METHOD__." old=".$localobject->default_lang." new=".$newobject->default_lang."\n";
+		$this->assertEquals($localobject->default_lang, $newobject->default_lang);
 
-    	return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testContactOther
-     *
-     * @param	Contact		$localobject		Contact
-     * @return	void
-     *
-     * @depends	testContactUpdate
-     * The depends says test is run only if previous is ok
-     */
-    public function testContactOther($localobject)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testContactOther
+	 *
+	 * @param	Contact		$localobject		Contact
+	 * @return	void
+	 *
+	 * @depends	testContactUpdate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testContactOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -292,108 +290,108 @@ class ContactTest extends PHPUnit\Framework\TestCase
 
 		//$localobject->fetch($localobject->id);
 
-        $result=$localobject->getNomUrl(1);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertNotEquals($result, '');
+		$result=$localobject->getNomUrl(1);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertNotEquals($result, '');
 
-        $result=$localobject->getFullAddress(1);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertContains("New address\nNew zip New town\nBelgium", $result);
+		$result=$localobject->getFullAddress(1);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertContains("New address\nNew zip New town\nBelgium", $result);
 
-        $localobject->info($localobject->id);
-        print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
-        $this->assertNotEquals($localobject->date_creation, '');
+		$localobject->info($localobject->id);
+		print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
+		$this->assertNotEquals($localobject->date_creation, '');
 
-        return $localobject->id;
-    }
+		return $localobject->id;
+	}
 
-    /**
-     * testContactDelete
-     *
-     * @param	int		$id		Id of contact
-     * @return	void
-     *
-     * @depends	testContactOther
-     * The depends says test is run only if previous is ok
-     */
-    public function testContactDelete($id)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testContactDelete
+	 *
+	 * @param	int		$id		Id of contact
+	 * @return	void
+	 *
+	 * @depends	testContactOther
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testContactDelete($id)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new Contact($this->savdb);
-    	$result=$localobject->fetch($id);
+		$result=$localobject->fetch($id);
 
-    	$result=$localobject->delete(0);
+		$result=$localobject->delete(0);
 		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+		$this->assertLessThan($result, 0);
 
-    	return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testContactGetFullAddress
-     *
-     * @return	int		$id				Id of company
-     */
-    public function testContactGetFullAddress()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testContactGetFullAddress
+	 *
+	 * @return	int		$id				Id of company
+	 */
+	public function testContactGetFullAddress()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobjectadd=new Contact($db);
-        $localobjectadd->initAsSpecimen();
+		$localobjectadd=new Contact($db);
+		$localobjectadd->initAsSpecimen();
 
-        // France
-        unset($localobjectadd->country_code);
-        $localobjectadd->country_id=1;
-        $localobjectadd->name='New name';
-        $localobjectadd->address='New address';
-        $localobjectadd->zip='New zip';
-        $localobjectadd->town='New town';
-        $result=$localobjectadd->getFullAddress(1);
-        print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
-        $this->assertContains("New address\nNew zip New town\nFrance", $result);
+		// France
+		unset($localobjectadd->country_code);
+		$localobjectadd->country_id=1;
+		$localobjectadd->name='New name';
+		$localobjectadd->address='New address';
+		$localobjectadd->zip='New zip';
+		$localobjectadd->town='New town';
+		$result=$localobjectadd->getFullAddress(1);
+		print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
+		$this->assertContains("New address\nNew zip New town\nFrance", $result);
 
-        // Belgium
-        unset($localobjectadd->country_code);
-        $localobjectadd->country_id=2;
-        $localobjectadd->name='New name';
-        $localobjectadd->address='New address';
-        $localobjectadd->zip='New zip';
-        $localobjectadd->town='New town';
-        $result=$localobjectadd->getFullAddress(1);
-        print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
-        $this->assertContains("New address\nNew zip New town\nBelgium", $result);
+		// Belgium
+		unset($localobjectadd->country_code);
+		$localobjectadd->country_id=2;
+		$localobjectadd->name='New name';
+		$localobjectadd->address='New address';
+		$localobjectadd->zip='New zip';
+		$localobjectadd->town='New town';
+		$result=$localobjectadd->getFullAddress(1);
+		print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
+		$this->assertContains("New address\nNew zip New town\nBelgium", $result);
 
-        // Switzerland
-        unset($localobjectadd->country_code);
-        $localobjectadd->country_id=6;
-        $localobjectadd->name='New name';
-        $localobjectadd->address='New address';
-        $localobjectadd->zip='New zip';
-        $localobjectadd->town='New town';
-        $result=$localobjectadd->getFullAddress(1);
-        print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
-        $this->assertContains("New address\nNew zip New town\nSwitzerland", $result);
+		// Switzerland
+		unset($localobjectadd->country_code);
+		$localobjectadd->country_id=6;
+		$localobjectadd->name='New name';
+		$localobjectadd->address='New address';
+		$localobjectadd->zip='New zip';
+		$localobjectadd->town='New town';
+		$result=$localobjectadd->getFullAddress(1);
+		print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
+		$this->assertContains("New address\nNew zip New town\nSwitzerland", $result);
 
-        // USA
-        unset($localobjectadd->country_code);
-        $localobjectadd->country_id=11;
-        $localobjectadd->name='New name';
-        $localobjectadd->address='New address';
-        $localobjectadd->zip='New zip';
-        $localobjectadd->town='New town';
-        $result=$localobjectadd->getFullAddress(1);
-        print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
-        $this->assertContains("New address\nNew town, New zip\nUnited States", $result);
+		// USA
+		unset($localobjectadd->country_code);
+		$localobjectadd->country_id=11;
+		$localobjectadd->name='New name';
+		$localobjectadd->address='New address';
+		$localobjectadd->zip='New zip';
+		$localobjectadd->town='New town';
+		$result=$localobjectadd->getFullAddress(1);
+		print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
+		$this->assertContains("New address\nNew town, New zip\nUnited States", $result);
 
-        return $localobjectadd->id;
-    }
+		return $localobjectadd->id;
+	}
 }
diff --git a/test/phpunit/ContratTest.php b/test/phpunit/ContratTest.php
index d364d6c9dff..5749d08cbae 100644
--- a/test/phpunit/ContratTest.php
+++ b/test/phpunit/ContratTest.php
@@ -29,11 +29,10 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/contrat/class/contrat.class.php';
 
-if (empty($user->id))
-{
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+if (empty($user->id)) {
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -47,185 +46,185 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class ContratTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return ContratTest
-     */
-    public function __construct()
-    {
-        parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return ContratTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-        //$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return	void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
-    /**
-     * End phpunit tests
-     *
-     * @return	void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testContratCreate
-     *
-     * @return	int
-     */
-    public function testContratCreate()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testContratCreate
+	 *
+	 * @return	int
+	 */
+	public function testContratCreate()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Contrat($this->savdb);
-        $localobject->initAsSpecimen();
-        $result=$localobject->create($user);
+		$localobject=new Contrat($this->savdb);
+		$localobject->initAsSpecimen();
+		$result=$localobject->create($user);
 
-        print __METHOD__." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testContratFetch
-     *
-     * @param	int		$id		Id of contract
-     * @return	int
-     *
-     * @depends	testContratCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testContratFetch($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testContratFetch
+	 *
+	 * @param	int		$id		Id of contract
+	 * @return	int
+	 *
+	 * @depends	testContratCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testContratFetch($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Contrat($this->savdb);
-        $result=$localobject->fetch($id);
+		$localobject=new Contrat($this->savdb);
+		$result=$localobject->fetch($id);
 
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testContratOther
-     *
-     * @param	Object	$localobject	Object contract
-     * @return	int
-     *
-     * @depends testContratFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testContratOther($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testContratOther
+	 *
+	 * @param	Object	$localobject	Object contract
+	 * @return	int
+	 *
+	 * @depends testContratFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testContratOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        /*$result=$localobject->setstatus(0);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        */
+		/*$result=$localobject->setstatus(0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		*/
 
-        $localobject->info($localobject->id);
-        print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
-        $this->assertNotEquals($localobject->date_creation, '');
+		$localobject->info($localobject->id);
+		print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
+		$this->assertNotEquals($localobject->date_creation, '');
 
-        return $localobject->id;
-    }
+		return $localobject->id;
+	}
 
-    /**
-     * testContratDelete
-     *
-     * @param	int		$id		Id of contract
-     * @return	int
-     *
-     * @depends	testContratOther
-     * The depends says test is run only if previous is ok
-     */
-    public function testContratDelete($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testContratDelete
+	 *
+	 * @param	int		$id		Id of contract
+	 * @return	int
+	 *
+	 * @depends	testContratOther
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testContratDelete($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Contrat($this->savdb);
-        $result=$localobject->fetch($id);
-        $result=$localobject->delete($user);
+		$localobject=new Contrat($this->savdb);
+		$result=$localobject->fetch($id);
+		$result=$localobject->delete($user);
 
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $result;
-    }
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $result;
+	}
 }
diff --git a/test/phpunit/CoreTest.php b/test/phpunit/CoreTest.php
index 22649a80724..87f3a3940f4 100644
--- a/test/phpunit/CoreTest.php
+++ b/test/phpunit/CoreTest.php
@@ -28,16 +28,36 @@ global $conf,$user,$langs,$db;
 //require_once 'PHPUnit/Autoload.php';
 //require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+if (! defined('NOREQUIREUSER')) {
+	define('NOREQUIREUSER', '1');
+}
+if (! defined('NOREQUIREDB')) {
+	define('NOREQUIREDB', '1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (! defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', '1');
+}
+if (! defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1'); // If there is no menu to show
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (! defined("NOLOGIN")) {
+	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+}
 
 
 /**
@@ -49,191 +69,190 @@ if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page i
  */
 class CoreTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return CoreTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return CoreTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        //print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		//print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        //$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		//$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        //$db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		//$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-    */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	*/
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
-    /**
-     * End phpunit tests
-     *
-     * @return  void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
+	/**
+	 * End phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
 
-    /**
-     * testDetectURLROOT
-     *
-     * @return	void
-     */
-    public function testDetectURLROOT()
-    {
-        global $dolibarr_main_prod;
+	/**
+	 * testDetectURLROOT
+	 *
+	 * @return	void
+	 */
+	public function testDetectURLROOT()
+	{
+		global $dolibarr_main_prod;
 
-        global $dolibarr_main_url_root;
-        global $dolibarr_main_data_root;
-        global $dolibarr_main_document_root;
-        global $dolibarr_main_data_root_alt;
-        global $dolibarr_main_document_root_alt;
-        global $dolibarr_main_db_host;
-        global $dolibarr_main_db_port;
-        global $dolibarr_main_db_type;
-        global $dolibarr_main_db_prefix;
+		global $dolibarr_main_url_root;
+		global $dolibarr_main_data_root;
+		global $dolibarr_main_document_root;
+		global $dolibarr_main_data_root_alt;
+		global $dolibarr_main_document_root_alt;
+		global $dolibarr_main_db_host;
+		global $dolibarr_main_db_port;
+		global $dolibarr_main_db_type;
+		global $dolibarr_main_db_prefix;
 
-        $testtodo=0;
+		$testtodo=0;
 
-        // Case 1:
-        // Test for subdir dolibarrnew (that point to htdocs) in root directory /var/www
-        // URL: http://localhost/dolibarrnew/admin/system/phpinfo.php
-        // To prepare this test:
-        // - Create link from htdocs to /var/www/dolibarrnew
-        // - Put into conf.php $dolibarr_main_document_root='/var/www/dolibarrnew';
-        if ($testtodo == 1) {
-            $_SERVER["HTTPS"]='';
-            $_SERVER["SERVER_NAME"]='localhost';
-            $_SERVER["SERVER_PORT"]='80';
-            $_SERVER["DOCUMENT_ROOT"]='/var/www';
-            $_SERVER["SCRIPT_NAME"]='/dolibarrnew/admin/system/phpinfo.php';
-            $expectedresult='/dolibarrnew';
-        }
+		// Case 1:
+		// Test for subdir dolibarrnew (that point to htdocs) in root directory /var/www
+		// URL: http://localhost/dolibarrnew/admin/system/phpinfo.php
+		// To prepare this test:
+		// - Create link from htdocs to /var/www/dolibarrnew
+		// - Put into conf.php $dolibarr_main_document_root='/var/www/dolibarrnew';
+		if ($testtodo == 1) {
+			$_SERVER["HTTPS"]='';
+			$_SERVER["SERVER_NAME"]='localhost';
+			$_SERVER["SERVER_PORT"]='80';
+			$_SERVER["DOCUMENT_ROOT"]='/var/www';
+			$_SERVER["SCRIPT_NAME"]='/dolibarrnew/admin/system/phpinfo.php';
+			$expectedresult='/dolibarrnew';
+		}
 
-        // Case 2:
-        // Test for subdir aaa (that point to dolibarr) in root directory /var/www
-        // URL: http://localhost/aaa/htdocs/admin/system/phpinfo.php
-        // To prepare this test:
-        // - Create link from dolibarr to /var/www/aaa
-        // - Put into conf.php $dolibarr_main_document_root='/var/www/aaa/htdocs';
-        if ($testtodo == 2) {
-            $_SERVER["HTTPS"]='';
-            $_SERVER["SERVER_NAME"]='localhost';
-            $_SERVER["SERVER_PORT"]='80';
-            $_SERVER["DOCUMENT_ROOT"]='/var/www';
-            $_SERVER["SCRIPT_NAME"]='/aaa/htdocs/admin/system/phpinfo.php';
-            $expectedresult='/aaa/htdocs';
-        }
+		// Case 2:
+		// Test for subdir aaa (that point to dolibarr) in root directory /var/www
+		// URL: http://localhost/aaa/htdocs/admin/system/phpinfo.php
+		// To prepare this test:
+		// - Create link from dolibarr to /var/www/aaa
+		// - Put into conf.php $dolibarr_main_document_root='/var/www/aaa/htdocs';
+		if ($testtodo == 2) {
+			$_SERVER["HTTPS"]='';
+			$_SERVER["SERVER_NAME"]='localhost';
+			$_SERVER["SERVER_PORT"]='80';
+			$_SERVER["DOCUMENT_ROOT"]='/var/www';
+			$_SERVER["SCRIPT_NAME"]='/aaa/htdocs/admin/system/phpinfo.php';
+			$expectedresult='/aaa/htdocs';
+		}
 
-        // Case 3:
-        // Test for virtual host localhostdolibarrnew that point to htdocs directory with
-        // a direct document root
-        // URL: http://localhostdolibarrnew/admin/system/phpinfo.php
-        // To prepare this test:
-        // - Create virtual host localhostdolibarrnew that point to /home/ldestailleur/git/dolibarr/htdocs
-        // - Put into conf.php $dolibarr_main_document_root='/home/ldestailleur/git/dolibarr/htdocs';
-        if ($testtodo == 3) {
-            $_SERVER["HTTPS"]='';
-            $_SERVER["SERVER_NAME"]='localhostdolibarrnew';
-            $_SERVER["SERVER_PORT"]='80';
-            $_SERVER["DOCUMENT_ROOT"]='/home/ldestailleur/git/dolibarr/htdocs';
-            $_SERVER["SCRIPT_NAME"]='/admin/system/phpinfo.php';
-            $expectedresult='';
-        }
+		// Case 3:
+		// Test for virtual host localhostdolibarrnew that point to htdocs directory with
+		// a direct document root
+		// URL: http://localhostdolibarrnew/admin/system/phpinfo.php
+		// To prepare this test:
+		// - Create virtual host localhostdolibarrnew that point to /home/ldestailleur/git/dolibarr/htdocs
+		// - Put into conf.php $dolibarr_main_document_root='/home/ldestailleur/git/dolibarr/htdocs';
+		if ($testtodo == 3) {
+			$_SERVER["HTTPS"]='';
+			$_SERVER["SERVER_NAME"]='localhostdolibarrnew';
+			$_SERVER["SERVER_PORT"]='80';
+			$_SERVER["DOCUMENT_ROOT"]='/home/ldestailleur/git/dolibarr/htdocs';
+			$_SERVER["SCRIPT_NAME"]='/admin/system/phpinfo.php';
+			$expectedresult='';
+		}
 
-        // Case 4:
-        // Test for virtual host localhostdolibarrnew that point to htdocs directory with
-        // a symbolic link
-        // URL: http://localhostdolibarrnew/admin/system/phpinfo.php
-        if ($testtodo == 4) {
-            $_SERVER["HTTPS"]='';
-            $_SERVER["SERVER_NAME"]='localhostdolibarrnew';
-            $_SERVER["SERVER_PORT"]='80';
-            $_SERVER["DOCUMENT_ROOT"]='/var/www/dolibarr';	// This is a link that point to /home/ldestail/workspace/dolibarr/htdocs
-            $_SERVER["SCRIPT_NAME"]='/admin/system/phpinfo.php';
-            $expectedresult='';
-        }
+		// Case 4:
+		// Test for virtual host localhostdolibarrnew that point to htdocs directory with
+		// a symbolic link
+		// URL: http://localhostdolibarrnew/admin/system/phpinfo.php
+		if ($testtodo == 4) {
+			$_SERVER["HTTPS"]='';
+			$_SERVER["SERVER_NAME"]='localhostdolibarrnew';
+			$_SERVER["SERVER_PORT"]='80';
+			$_SERVER["DOCUMENT_ROOT"]='/var/www/dolibarr';	// This is a link that point to /home/ldestail/workspace/dolibarr/htdocs
+			$_SERVER["SCRIPT_NAME"]='/admin/system/phpinfo.php';
+			$expectedresult='';
+		}
 
-        // Case 5:
-        // Test for alias /dolibarralias, Test when using nginx, Test when using lighttpd
-        // URL: http://localhost/dolibarralias/admin/system/phpinfo.php
-        // To prepare this test:
-        // - Copy content of dolibarr project into /var/www/dolibarr
-        // - Put into conf.php $dolibarr_main_document_root='/var/www/dolibarr/htdocs';
-        // - Put into conf.php $dolibarr_main_url_root='http://localhost/dolibarralias';  (because autodetect will fails in this case)
-        if ($testtodo == 5) {
-            $_SERVER["HTTPS"]='';
-            $_SERVER["SERVER_NAME"]='localhost';
-            $_SERVER["SERVER_PORT"]='80';
-            $_SERVER["DOCUMENT_ROOT"]='/var/www';
-            $_SERVER["SCRIPT_NAME"]='/dolibarralias/admin/system/phpinfo.php';
-            $expectedresult='/dolibarralias';
-        }
+		// Case 5:
+		// Test for alias /dolibarralias, Test when using nginx, Test when using lighttpd
+		// URL: http://localhost/dolibarralias/admin/system/phpinfo.php
+		// To prepare this test:
+		// - Copy content of dolibarr project into /var/www/dolibarr
+		// - Put into conf.php $dolibarr_main_document_root='/var/www/dolibarr/htdocs';
+		// - Put into conf.php $dolibarr_main_url_root='http://localhost/dolibarralias';  (because autodetect will fails in this case)
+		if ($testtodo == 5) {
+			$_SERVER["HTTPS"]='';
+			$_SERVER["SERVER_NAME"]='localhost';
+			$_SERVER["SERVER_PORT"]='80';
+			$_SERVER["DOCUMENT_ROOT"]='/var/www';
+			$_SERVER["SCRIPT_NAME"]='/dolibarralias/admin/system/phpinfo.php';
+			$expectedresult='/dolibarralias';
+		}
 
-        // Force to rerun filefunc.inc.php
-        include dirname(__FILE__).'/../../htdocs/filefunc.inc.php';
+		// Force to rerun filefunc.inc.php
+		include dirname(__FILE__).'/../../htdocs/filefunc.inc.php';
 
-        if ($testtodo != 0)
-        {
-        	print __METHOD__." DOL_MAIN_URL_ROOT=".DOL_MAIN_URL_ROOT."\n";
-        	print __METHOD__." DOL_URL_ROOT=".DOL_URL_ROOT."\n";
-        	$this->assertEquals($expectedresult, DOL_URL_ROOT);
-        }
+		if ($testtodo != 0) {
+			print __METHOD__." DOL_MAIN_URL_ROOT=".DOL_MAIN_URL_ROOT."\n";
+			print __METHOD__." DOL_URL_ROOT=".DOL_URL_ROOT."\n";
+			$this->assertEquals($expectedresult, DOL_URL_ROOT);
+		}
 
-        return true;
-    }
+		return true;
+	}
 }
diff --git a/test/phpunit/DateLibTest.php b/test/phpunit/DateLibTest.php
index 2d5598f49b3..366a8fd4ec8 100644
--- a/test/phpunit/DateLibTest.php
+++ b/test/phpunit/DateLibTest.php
@@ -29,8 +29,7 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -75,64 +74,64 @@ class DateLibTest extends PHPUnit\Framework\TestCase
 	}
 
 	/**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testNumBetweenDay
-     *
-     * @return	void
-     */
-    public function testNumBetweenDay()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testNumBetweenDay
+	 *
+	 * @return	void
+	 */
+	public function testNumBetweenDay()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -143,11 +142,11 @@ class DateLibTest extends PHPUnit\Framework\TestCase
 		$date2=dol_mktime(0, 0, 0, 1, 2, 2012);
 
 		$result=num_between_day($date1, $date2, 1);
-    	print __METHOD__." result=".$result."\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(2, $result);
 
 		$result=num_between_day($date1, $date2, 0);
-    	print __METHOD__." result=".$result."\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(1, $result);
 
 		// With different hours
@@ -155,11 +154,11 @@ class DateLibTest extends PHPUnit\Framework\TestCase
 		$date2=dol_mktime(12, 0, 0, 1, 2, 2012);
 
 		$result=num_between_day($date1, $date2, 1);
-    	print __METHOD__." result=".$result."\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(2, $result);
 
 		$result=num_between_day($date1, $date2, 0);
-    	print __METHOD__." result=".$result."\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(1, $result);
 
 		// With different date before and after sunlight hour (day to change sunlight hour is 2014-03-30)
@@ -167,277 +166,277 @@ class DateLibTest extends PHPUnit\Framework\TestCase
 		$date2=dol_mktime(0, 0, 0, 3, 31, 2014, true);
 
 		$result=num_between_day($date1, $date2, 1);
-    	print __METHOD__." result=".$result."\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(4, $result);
 
 		$result=num_between_day($date1, $date2, 0);
-    	print __METHOD__." result=".$result."\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(3, $result);
 
 		return $result;
-    }
+	}
 
-    /**
-     * testNumPublicHoliday
-     *
-     * @return	void
-     */
-    public function testNumPublicHoliday()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testNumPublicHoliday
+	 *
+	 * @return	void
+	 */
+	public function testNumPublicHoliday()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        // With same hours - Tuesday/Wednesday jan 2013
-        $date1=dol_mktime(0, 0, 0, 1, 1, 2013);
-        $date2=dol_mktime(0, 0, 0, 1, 2, 2013);
-        $date3=dol_mktime(0, 0, 0, 1, 3, 2013);
+		// With same hours - Tuesday/Wednesday jan 2013
+		$date1=dol_mktime(0, 0, 0, 1, 1, 2013);
+		$date2=dol_mktime(0, 0, 0, 1, 2, 2013);
+		$date3=dol_mktime(0, 0, 0, 1, 3, 2013);
 
-        $result=num_public_holiday($date1, $date2, 'FR', 1);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for FR');   // 1 closed days (country france)
+		$result=num_public_holiday($date1, $date2, 'FR', 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for FR');   // 1 closed days (country france)
 
-        $result=num_public_holiday($date1, $date2, 'XX', 1);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for XX');   // 1 closed days (country unknown)
+		$result=num_public_holiday($date1, $date2, 'XX', 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for XX');   // 1 closed days (country unknown)
 
-        $result=num_public_holiday($date2, $date3, 'FR', 1);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(0, $result, 'NumPublicHoliday for Wednesday 2 - Thursday 3 jan 2013 for FR');   // no closed days
+		$result=num_public_holiday($date2, $date3, 'FR', 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(0, $result, 'NumPublicHoliday for Wednesday 2 - Thursday 3 jan 2013 for FR');   // no closed days
 
-        // Check with easter monday
-        $date1=dol_mktime(0, 0, 0, 4, 21, 2019);
-        $date2=dol_mktime(0, 0, 0, 4, 23, 2019);
+		// Check with easter monday
+		$date1=dol_mktime(0, 0, 0, 4, 21, 2019);
+		$date2=dol_mktime(0, 0, 0, 4, 23, 2019);
 
-        $result=num_public_holiday($date1, $date2, 'XX', 1);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(1, $result, 'NumPublicHoliday including eastermonday for XX');   // 2 opened day, 1 closed days (sunday)
+		$result=num_public_holiday($date1, $date2, 'XX', 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(1, $result, 'NumPublicHoliday including eastermonday for XX');   // 2 opened day, 1 closed days (sunday)
 
-        $result=num_public_holiday($date1, $date2, 'FR', 1);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(2, $result, 'NumPublicHoliday including eastermonday for FR');   // 1 opened day, 2 closed days (sunday + easter monday)
+		$result=num_public_holiday($date1, $date2, 'FR', 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(2, $result, 'NumPublicHoliday including eastermonday for FR');   // 1 opened day, 2 closed days (sunday + easter monday)
 
-        // Check for sunday/saturday - Friday 4 - Sunday 6 jan 2013
-        $date1=dol_mktime(0, 0, 0, 1, 4, 2013);
-        $date2=dol_mktime(0, 0, 0, 1, 6, 2013);
+		// Check for sunday/saturday - Friday 4 - Sunday 6 jan 2013
+		$date1=dol_mktime(0, 0, 0, 1, 4, 2013);
+		$date2=dol_mktime(0, 0, 0, 1, 6, 2013);
 
-        $result=num_public_holiday($date1, $date2, 'FR', 1);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(2, $result, 'NumPublicHoliday for FR');   // 1 opened day, 2 closed days
+		$result=num_public_holiday($date1, $date2, 'FR', 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(2, $result, 'NumPublicHoliday for FR');   // 1 opened day, 2 closed days
 
-        $result=num_public_holiday($date1, $date2, 'FR', 1, 1, 1);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(2, $result, 'NumPublicHoliday for FR');   // 1 opened day, 2 closed days
+		$result=num_public_holiday($date1, $date2, 'FR', 1, 1, 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(2, $result, 'NumPublicHoliday for FR');   // 1 opened day, 2 closed days
 
-        $result=num_public_holiday($date1, $date2, 'FR', 1, 1, 0);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(1, $result, 'NumPublicHoliday for FR');   // 2 opened day, 1 closed days
+		$result=num_public_holiday($date1, $date2, 'FR', 1, 1, 0);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(1, $result, 'NumPublicHoliday for FR');   // 2 opened day, 1 closed days
 
-        $result=num_public_holiday($date1, $date2, 'FR', 1, 0, 0);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(0, $result, 'NumPublicHoliday for FR');   // 3 opened day, 0 closed days
+		$result=num_public_holiday($date1, $date2, 'FR', 1, 0, 0);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(0, $result, 'NumPublicHoliday for FR');   // 3 opened day, 0 closed days
 
-        $result=num_public_holiday($date1, $date2, 'XX', 1);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(2, $result, 'NumPublicHoliday for XX');   // 1 opened day, 2 closed days (even if country unknown)
-    }
+		$result=num_public_holiday($date1, $date2, 'XX', 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(2, $result, 'NumPublicHoliday for XX');   // 1 opened day, 2 closed days (even if country unknown)
+	}
 
-    /**
-     * testNumOpenDay
-     *
-     * @return	void
-     */
-    public function testNumOpenDay()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testNumOpenDay
+	 *
+	 * @return	void
+	 */
+	public function testNumOpenDay()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        // With same hours - Tuesday/Wednesday jan 2013
-        $date1=dol_mktime(0, 0, 0, 1, 1, 2013);
-        $date2=dol_mktime(0, 0, 0, 1, 2, 2013);
-        $date3=dol_mktime(0, 0, 0, 1, 3, 2013);
+		// With same hours - Tuesday/Wednesday jan 2013
+		$date1=dol_mktime(0, 0, 0, 1, 1, 2013);
+		$date2=dol_mktime(0, 0, 0, 1, 2, 2013);
+		$date3=dol_mktime(0, 0, 0, 1, 3, 2013);
 
-        $result=num_open_day($date1, $date2, 0, 1, 0, 'FR');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(1, $result, 'NumOpenDay Tuesday 1 - Wednesday 2 jan 2013 for FR');   // 1 opened days (country france)
+		$result=num_open_day($date1, $date2, 0, 1, 0, 'FR');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(1, $result, 'NumOpenDay Tuesday 1 - Wednesday 2 jan 2013 for FR');   // 1 opened days (country france)
 
-        $result=num_open_day($date1, $date2, 0, 1, 0, 'XX');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(1, $result, 'NumOpenDay Tuesday 1 - Wednesday 2 jan 2013 for XX');   // 1 opened days (country unknown)
+		$result=num_open_day($date1, $date2, 0, 1, 0, 'XX');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(1, $result, 'NumOpenDay Tuesday 1 - Wednesday 2 jan 2013 for XX');   // 1 opened days (country unknown)
 
-        $result=num_open_day($date2, $date3, 0, 1, 0, 'FR');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(2, $result, 'NumOpenDay Wednesday 2 - Thursday 3 jan 2013 for FR');   // 2 opened days
+		$result=num_open_day($date2, $date3, 0, 1, 0, 'FR');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(2, $result, 'NumOpenDay Wednesday 2 - Thursday 3 jan 2013 for FR');   // 2 opened days
 
-        // With same hours - Friday/Sunday jan 2013
-        $date1=dol_mktime(0, 0, 0, 1, 4, 2013);
-        $date2=dol_mktime(0, 0, 0, 1, 6, 2013);
+		// With same hours - Friday/Sunday jan 2013
+		$date1=dol_mktime(0, 0, 0, 1, 4, 2013);
+		$date2=dol_mktime(0, 0, 0, 1, 6, 2013);
 
-        $result=num_open_day($date1, $date2, 0, 1, 0, 'FR');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(1, $result, 'NumOpenDay for FR');   // 1 opened day, 2 closed
+		$result=num_open_day($date1, $date2, 0, 1, 0, 'FR');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(1, $result, 'NumOpenDay for FR');   // 1 opened day, 2 closed
 
-        $result=num_open_day($date1, $date2, 'XX', 1);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(1, $result, 'NumOpenDay for XX');   // 1 opened day, 2 closes (even if country unknown)
-    }
+		$result=num_open_day($date1, $date2, 'XX', 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(1, $result, 'NumOpenDay for XX');   // 1 opened day, 2 closes (even if country unknown)
+	}
 
-    /**
-     * testConvertTime2Seconds
-     *
-     * @return	void
-     */
-    public function testConvertTime2Seconds()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testConvertTime2Seconds
+	 *
+	 * @return	void
+	 */
+	public function testConvertTime2Seconds()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$result=convertTime2Seconds(1, 1, 2);
-    	print __METHOD__." result=".$result."\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(3662, $result);
 
 		return $result;
-    }
+	}
 
-    /**
-     * testConvertSecondToTime
-     *
-     * @return void
-     */
-    public function testConvertSecondToTime()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testConvertSecondToTime
+	 *
+	 * @return void
+	 */
+	public function testConvertSecondToTime()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$result=convertSecondToTime(0, 'all', 86400);
-    	print __METHOD__." result=".$result."\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('0', $result);
 
 		$result=convertSecondToTime(86400, 'all', 86400);
-    	print __METHOD__." result=".$result."\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertSame('1 '.$langs->trans("Day"), $result);
 
 
 		return $result;
-    }
+	}
 
-    /**
-     * testDolPrintDate
-     *
-     * @return void
-     */
-    public function testDolPrintDate()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testDolPrintDate
+	 *
+	 * @return void
+	 */
+	public function testDolPrintDate()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-    	// Check %Y-%m-%d %H:%M:%S format
-        $result=dol_print_date(0, '%Y-%m-%d %H:%M:%S', true);
-       	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1970-01-01 00:00:00', $result);
+		// Check %Y-%m-%d %H:%M:%S format
+		$result=dol_print_date(0, '%Y-%m-%d %H:%M:%S', true);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('1970-01-01 00:00:00', $result);
 
-    	// Check %Y-%m-%d %H:%M:%S format
-    	$result=dol_print_date(16725225600, '%Y-%m-%d %H:%M:%S', true);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('2500-01-01 00:00:00', $result);
+		// Check %Y-%m-%d %H:%M:%S format
+		$result=dol_print_date(16725225600, '%Y-%m-%d %H:%M:%S', true);	// http://www.epochconverter.com/
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('2500-01-01 00:00:00', $result);
 
-    	// Check %Y-%m-%d %H:%M:%S format
-    	$result=dol_print_date(-1830384000, '%Y-%m-%d %H:%M:%S', true);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1912-01-01 00:00:00', $result);	// dol_print_date use TZ (good) but epoch converter does not use it.
+		// Check %Y-%m-%d %H:%M:%S format
+		$result=dol_print_date(-1830384000, '%Y-%m-%d %H:%M:%S', true);	// http://www.epochconverter.com/
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('1912-01-01 00:00:00', $result);	// dol_print_date use TZ (good) but epoch converter does not use it.
 
-    	// Check %Y-%m-%d %H:%M:%S format
-    	$result=dol_print_date(-11676096000, '%Y-%m-%d %H:%M:%S', true);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1600-01-01 00:00:00', $result);
+		// Check %Y-%m-%d %H:%M:%S format
+		$result=dol_print_date(-11676096000, '%Y-%m-%d %H:%M:%S', true);	// http://www.epochconverter.com/
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('1600-01-01 00:00:00', $result);
 
-    	// test with negative timezone
-    	$result=dol_print_date(-1, '%Y-%m-%d %H:%M:%S', true);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1969-12-31 23:59:59', $result);
+		// test with negative timezone
+		$result=dol_print_date(-1, '%Y-%m-%d %H:%M:%S', true);	// http://www.epochconverter.com/
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('1969-12-31 23:59:59', $result);
 
-    	// Check dayhour format for fr_FR
-    	$outputlangs=new Translate('', $conf);
-    	$outputlangs->setDefaultLang('fr_FR');
-    	$outputlangs->load("main");
+		// Check dayhour format for fr_FR
+		$outputlangs=new Translate('', $conf);
+		$outputlangs->setDefaultLang('fr_FR');
+		$outputlangs->load("main");
 
-    	$result=dol_print_date(0+24*3600, 'dayhour', true, $outputlangs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('02/01/1970 00:00', $result);
+		$result=dol_print_date(0+24*3600, 'dayhour', true, $outputlangs);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('02/01/1970 00:00', $result);
 
-    	// Check %a and %b format for fr_FR
-    	$result=dol_print_date(0, '%a %b %B', true, $outputlangs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('Jeu Jan. Janvier', $result);
+		// Check %a and %b format for fr_FR
+		$result=dol_print_date(0, '%a %b %B', true, $outputlangs);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('Jeu Jan. Janvier', $result);
 
-    	// Check day format for en_US
-    	$outputlangs=new Translate('', $conf);
-    	$outputlangs->setDefaultLang('en_US');
-    	$outputlangs->load("main");
+		// Check day format for en_US
+		$outputlangs=new Translate('', $conf);
+		$outputlangs->setDefaultLang('en_US');
+		$outputlangs->load("main");
 
-    	$result=dol_print_date(0+24*3600, 'day', true, $outputlangs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('01/02/1970', $result);
+		$result=dol_print_date(0+24*3600, 'day', true, $outputlangs);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('01/02/1970', $result);
 
-    	// Check %a and %b format for en_US
-    	$result=dol_print_date(0, '%a %b %B', true, $outputlangs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('Thu Jan January', $result);
+		// Check %a and %b format for en_US
+		$result=dol_print_date(0, '%a %b %B', true, $outputlangs);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('Thu Jan January', $result);
 
-    	return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testDolTimePlusDuree
-     *
-     * @return int
-     */
-    public function testDolTimePlusDuree()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testDolTimePlusDuree
+	 *
+	 * @return int
+	 */
+	public function testDolTimePlusDuree()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        // Check dayhour format for fr_FR
-        $outputlangs=new Translate('', $conf);
-        $outputlangs->setDefaultLang('fr_FR');
-        $outputlangs->load("main");
+		// Check dayhour format for fr_FR
+		$outputlangs=new Translate('', $conf);
+		$outputlangs->setDefaultLang('fr_FR');
+		$outputlangs->load("main");
 
-        $result=dol_print_date(dol_time_plus_duree(dol_time_plus_duree(dol_time_plus_duree(0, 1, 'm'), 1, 'y'), 1, 'd'), 'dayhour', true, $outputlangs);
-       	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('02/02/1971 00:00', $result);
+		$result=dol_print_date(dol_time_plus_duree(dol_time_plus_duree(dol_time_plus_duree(0, 1, 'm'), 1, 'y'), 1, 'd'), 'dayhour', true, $outputlangs);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('02/02/1971 00:00', $result);
 
-    	return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testDolStringToTime
-     *
-     * @return int
-     */
-    public function testDolStringToTime()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testDolStringToTime
+	 *
+	 * @return int
+	 */
+	public function testDolStringToTime()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
 		$stime='19700102';
 		$result=dol_stringtotime($stime);
@@ -445,18 +444,18 @@ class DateLibTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals(86400, $result);
 
 		$stime='1970-01-01T02:00:00Z';
-        $result=dol_stringtotime($stime);
-    	print __METHOD__." result=".$result."\n";
+		$result=dol_stringtotime($stime);
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(7200, $result);
 
-        $stime='1970-01-01 02:00:00';
-        $result=dol_stringtotime($stime);
-    	print __METHOD__." result=".$result."\n";
+		$stime='1970-01-01 02:00:00';
+		$result=dol_stringtotime($stime);
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(7200, $result);
 
-        $stime='19700101T020000Z';
-        $result=dol_stringtotime($stime);
-    	print __METHOD__." result=".$result."\n";
+		$stime='19700101T020000Z';
+		$result=dol_stringtotime($stime);
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(7200, $result);
 
 		$stime='19700101020000';
@@ -464,26 +463,26 @@ class DateLibTest extends PHPUnit\Framework\TestCase
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(7200, $result);
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testDolGetFirstDayWeek
-     *
-     * @return int
-     */
-    public function testDolGetFirstDayWeek()
-    {
-    	global $conf;
+	/**
+	 * testDolGetFirstDayWeek
+	 *
+	 * @return int
+	 */
+	public function testDolGetFirstDayWeek()
+	{
+		global $conf;
 
-    	$day=3; $month=2; $year=2015;
-    	$conf->global->MAIN_START_WEEK = 1;	// start on monday
-   		$prev = dol_get_first_day_week($day, $month, $year);
+		$day=3; $month=2; $year=2015;
+		$conf->global->MAIN_START_WEEK = 1;	// start on monday
+		$prev = dol_get_first_day_week($day, $month, $year);
 		$this->assertEquals(2, (int) $prev['first_day']);		// monday for month 2, year 2014 is the 2
 
-    	$day=3; $month=2; $year=2015;
-    	$conf->global->MAIN_START_WEEK = 0;	// start on sunday
-   		$prev = dol_get_first_day_week($day, $month, $year);
+		$day=3; $month=2; $year=2015;
+		$conf->global->MAIN_START_WEEK = 0;	// start on sunday
+		$prev = dol_get_first_day_week($day, $month, $year);
 		$this->assertEquals(1, (int) $prev['first_day']);		// sunday for month 2, year 2015 is the 1st
-    }
+	}
 }
diff --git a/test/phpunit/DateLibTzFranceTest.php b/test/phpunit/DateLibTzFranceTest.php
index 7e96e39030e..63893a9c881 100644
--- a/test/phpunit/DateLibTzFranceTest.php
+++ b/test/phpunit/DateLibTzFranceTest.php
@@ -29,8 +29,7 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -74,139 +73,139 @@ class DateLibTzFranceTest extends PHPUnit\Framework\TestCase
 		print "\n";
 	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 
-    	if (getServerTimeZoneString() != 'Europe/Paris') {
-    		print "\n".__METHOD__." This PHPUnit test can be launched manually only onto a server with PHP timezone set to TZ+1 Europe/Paris, not a TZ=".getServerTimeZoneString().".\n"; die();
-    	}
+		if (getServerTimeZoneString() != 'Europe/Paris') {
+			print "\n".__METHOD__." This PHPUnit test can be launched manually only onto a server with PHP timezone set to TZ+1 Europe/Paris, not a TZ=".getServerTimeZoneString().".\n"; die();
+		}
 
-    	$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testDolPrintDateTzFrance
-     * Same than official testDolPrintDate but with parameter tzoutput that is false='tzserver'.
-     * This test works only onto a server using TZ+1 Europe/Paris.
-     *
-     * You can use http://www.epochconverter.com/ to generate more tests.
-     *
-     * @return void
-     */
-    public function testDolPrintDateTzFrance()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testDolPrintDateTzFrance
+	 * Same than official testDolPrintDate but with parameter tzoutput that is false='tzserver'.
+	 * This test works only onto a server using TZ+1 Europe/Paris.
+	 *
+	 * You can use http://www.epochconverter.com/ to generate more tests.
+	 *
+	 * @return void
+	 */
+	public function testDolPrintDateTzFrance()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-    	// Check %Y-%m-%d %H:%M:%S format
-        $result=dol_print_date(0, '%Y-%m-%d %H:%M:%S', false);
-       	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1970-01-01 01:00:00', $result);
+		// Check %Y-%m-%d %H:%M:%S format
+		$result=dol_print_date(0, '%Y-%m-%d %H:%M:%S', false);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('1970-01-01 01:00:00', $result);
 
-    	// Check %Y-%m-%d %H:%M:%S format
-        $result=dol_print_date(16725225600, '%Y-%m-%d %H:%M:%S', false);
-       	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('2500-01-01 01:00:00', $result);
+		// Check %Y-%m-%d %H:%M:%S format
+		$result=dol_print_date(16725225600, '%Y-%m-%d %H:%M:%S', false);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('2500-01-01 01:00:00', $result);
 
-    	// Check %Y-%m-%d %H:%M:%S format
-    	$result=dol_print_date(-1830384000, '%Y-%m-%d %H:%M:%S', false);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1912-01-01 01:00:00', $result);		// dol_print_date use a timezone, not epoch converter as it did not exists this year
+		// Check %Y-%m-%d %H:%M:%S format
+		$result=dol_print_date(-1830384000, '%Y-%m-%d %H:%M:%S', false);	// http://www.epochconverter.com/
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('1912-01-01 01:00:00', $result);		// dol_print_date use a timezone, not epoch converter as it did not exists this year
 
-    	// Specific cas during war
+		// Specific cas during war
 
-    	// 1940, no timezone
-    	$result=dol_print_date(-946771200, '%Y-%m-%d %H:%M:%S', false);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1940-01-01 01:00:00', $result);		//  dol_print_date use a modern timezone, not epoch converter as it did not exists this year
+		// 1940, no timezone
+		$result=dol_print_date(-946771200, '%Y-%m-%d %H:%M:%S', false);	// http://www.epochconverter.com/
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('1940-01-01 01:00:00', $result);		//  dol_print_date use a modern timezone, not epoch converter as it did not exists this year
 
-    	// 1941, timezone is added by germany to +2 (same for 1942)
-    	$result=dol_print_date(-915148800, '%Y-%m-%d %H:%M:%S', false);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1941-01-01 01:00:00', $result);		// dol_print_date use a modern timezone, epoch converter use historic timezone
+		// 1941, timezone is added by germany to +2 (same for 1942)
+		$result=dol_print_date(-915148800, '%Y-%m-%d %H:%M:%S', false);	// http://www.epochconverter.com/
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('1941-01-01 01:00:00', $result);		// dol_print_date use a modern timezone, epoch converter use historic timezone
 
-    	// 1943, timezone is +1
-    	$result=dol_print_date(-852076800, '%Y-%m-%d %H:%M:%S', false);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1943-01-01 01:00:00', $result);
+		// 1943, timezone is +1
+		$result=dol_print_date(-852076800, '%Y-%m-%d %H:%M:%S', false);	// http://www.epochconverter.com/
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('1943-01-01 01:00:00', $result);
 
-    	// test with negative timezone
-    	$result=dol_print_date(-1, '%Y-%m-%d %H:%M:%S', false);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1970-01-01 00:59:59', $result);
+		// test with negative timezone
+		$result=dol_print_date(-1, '%Y-%m-%d %H:%M:%S', false);	// http://www.epochconverter.com/
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('1970-01-01 00:59:59', $result);
 
-    	// Check dayhour format for fr_FR
-    	$outputlangs=new Translate('', $conf);
-    	$outputlangs->setDefaultLang('fr_FR');
-    	$outputlangs->load("main");
+		// Check dayhour format for fr_FR
+		$outputlangs=new Translate('', $conf);
+		$outputlangs->setDefaultLang('fr_FR');
+		$outputlangs->load("main");
 
-    	$result=dol_print_date(0+24*3600, 'dayhour', false, $outputlangs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('02/01/1970 01:00', $result);
+		$result=dol_print_date(0+24*3600, 'dayhour', false, $outputlangs);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('02/01/1970 01:00', $result);
 
-    	// Check day format for en_US
-    	$outputlangs=new Translate('', $conf);
-    	$outputlangs->setDefaultLang('en_US');
-    	$outputlangs->load("main");
+		// Check day format for en_US
+		$outputlangs=new Translate('', $conf);
+		$outputlangs->setDefaultLang('en_US');
+		$outputlangs->load("main");
 
-    	$result=dol_print_date(0+24*3600, 'day', false, $outputlangs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('01/02/1970', $result);
+		$result=dol_print_date(0+24*3600, 'day', false, $outputlangs);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('01/02/1970', $result);
 
-    	// Check %a and %b format for en_US
-    	$result=dol_print_date(0, '%a %b', false, $outputlangs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('Thu Jan', $result);
+		// Check %a and %b format for en_US
+		$result=dol_print_date(0, '%a %b', false, $outputlangs);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('Thu Jan', $result);
 
-    	return $result;
-    }
+		return $result;
+	}
 }
diff --git a/test/phpunit/DiscountTest.php b/test/phpunit/DiscountTest.php
index 9eba2460655..5841ba59c37 100644
--- a/test/phpunit/DiscountTest.php
+++ b/test/phpunit/DiscountTest.php
@@ -29,8 +29,7 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/class/discount.class.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -75,39 +74,39 @@ class DiscountTest extends PHPUnit\Framework\TestCase
 	}
 
 	/**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -115,87 +114,87 @@ class DiscountTest extends PHPUnit\Framework\TestCase
 
 		print __METHOD__."\n";
 		//print $db->getVersion()."\n";
-    }
+	}
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testDiscountCreate
-     *
-     * @return	int
-     */
-    public function testDiscountCreate()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testDiscountCreate
+	 *
+	 * @return	int
+	 */
+	public function testDiscountCreate()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new DiscountAbsolute($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+		$localobject->initAsSpecimen();
+		$result=$localobject->create($user);
 
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
-    	return $result;
-    }
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
+		return $result;
+	}
 
-    /**
-     * testDiscountFetch
-     *
-     * @param	int	$id		Id of discount
-     * @return	int
-     *
-     * @depends	testDiscountCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testDiscountFetch($id)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testDiscountFetch
+	 *
+	 * @param	int	$id		Id of discount
+	 * @return	int
+	 *
+	 * @depends	testDiscountCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testDiscountFetch($id)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new DiscountAbsolute($this->savdb);
-    	$result=$localobject->fetch($id);
+		$result=$localobject->fetch($id);
 
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	return $id;
-    }
+		$this->assertLessThan($result, 0);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		return $id;
+	}
 
-    /**
-     * testDiscountDelete
-     *
-     * @param	int		$id		Id of discount
-     * @return	int
-     *
-     * @depends	testDiscountFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testDiscountDelete($id)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testDiscountDelete
+	 *
+	 * @param	int		$id		Id of discount
+	 * @return	int
+	 *
+	 * @depends	testDiscountFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testDiscountDelete($id)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new DiscountAbsolute($this->savdb);
-    	$result=$localobject->fetch($id);
+		$result=$localobject->fetch($id);
 		$result=$localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $result;
-    }
+		$this->assertLessThan($result, 0);
+		return $result;
+	}
 }
diff --git a/test/phpunit/EntrepotTest.php b/test/phpunit/EntrepotTest.php
index 8cad99243cc..6be9b5ba349 100644
--- a/test/phpunit/EntrepotTest.php
+++ b/test/phpunit/EntrepotTest.php
@@ -29,8 +29,7 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/product/stock/class/entrepot.class.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -74,146 +73,148 @@ class EntrepotTest extends PHPUnit\Framework\TestCase
 		print "\n";
 	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 
-    	if (empty($conf->stock->enabled)) { print __METHOD__." Module Stock must be enabled.\n"; die(); }
+		if (empty($conf->stock->enabled)) {
+			print __METHOD__." Module Stock must be enabled.\n"; die();
+		}
 
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testEntrepotCreate
-     *
-     * @return	void
-     */
-    public function testEntrepotCreate()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testEntrepotCreate
+	 *
+	 * @return	void
+	 */
+	public function testEntrepotCreate()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new Entrepot($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+		$localobject->initAsSpecimen();
+		$result=$localobject->create($user);
 
-        print __METHOD__." result=".$result."\n";
-        $this->assertGreaterThan(0, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThan(0, $result);
 
-    	return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testEntrepotFetch
-     *
-     * @param	int		$id		Id entrepot
-     * @return	Entrepot
-     *
-     * @depends	testEntrepotCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testEntrepotFetch($id)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testEntrepotFetch
+	 *
+	 * @param	int		$id		Id entrepot
+	 * @return	Entrepot
+	 *
+	 * @depends	testEntrepotCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testEntrepotFetch($id)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new Entrepot($this->savdb);
-    	$result=$localobject->fetch($id);
-        print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+		$result=$localobject->fetch($id);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-    	return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testEntrepotUpdate
-     *
-     * @param	Entrepot	$localobject	Entrepot
-     * @return	void
-     *
-     * @depends	testEntrepotFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testEntrepotUpdate($localobject)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testEntrepotUpdate
+	 *
+	 * @param	Entrepot	$localobject	Entrepot
+	 * @return	void
+	 *
+	 * @depends	testEntrepotFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testEntrepotUpdate($localobject)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject->note='New note after update';
-    	$result=$localobject->update($localobject->id, $user);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+		$result=$localobject->update($localobject->id, $user);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-    	return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testEntrepotOther
-     *
-     * @param	Entrepot	$localobject	Entrepot
-     * @return	void
-     *
-     * @depends	testEntrepotUpdate
-     * The depends says test is run only if previous is ok
-     */
-    public function testEntrepotOther($localobject)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testEntrepotOther
+	 *
+	 * @param	Entrepot	$localobject	Entrepot
+	 * @return	void
+	 *
+	 * @depends	testEntrepotUpdate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testEntrepotOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -222,33 +223,33 @@ class EntrepotTest extends PHPUnit\Framework\TestCase
 		$result = $localobject->get_full_arbo();
 		$this->assertEquals('WAREHOUSE SPECIMEN', $result);
 
-        return $localobject->id;
-    }
+		return $localobject->id;
+	}
 
-    /**
-     * testEntrepotDelete
-     *
-     * @param		int		$id		Id of entrepot
-     * @return		void
-     *
-     * @depends	testEntrepotOther
-     * The depends says test is run only if previous is ok
-     */
-    public function testEntrepotDelete($id)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testEntrepotDelete
+	 *
+	 * @param		int		$id		Id of entrepot
+	 * @return		void
+	 *
+	 * @depends	testEntrepotOther
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testEntrepotDelete($id)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new Entrepot($this->savdb);
-    	$result=$localobject->fetch($id);
+		$result=$localobject->fetch($id);
 
-    	$result=$localobject->delete($user);
+		$result=$localobject->delete($user);
 		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0, $localobject->errorsToString());
+		$this->assertLessThan($result, 0, $localobject->errorsToString());
 
-    	return $result;
-    }
+		return $result;
+	}
 }
diff --git a/test/phpunit/ExpenseReportTest.php b/test/phpunit/ExpenseReportTest.php
index 2d6fdca3b27..c24bf9d19e9 100644
--- a/test/phpunit/ExpenseReportTest.php
+++ b/test/phpunit/ExpenseReportTest.php
@@ -30,9 +30,9 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/expensereport/class/expensereport.class.php';
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -47,270 +47,270 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class ExpenseReportTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return ExpenseReportTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return ExpenseReportTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-        //print $db->getVersion()."\n";
-    }
-    /**
-     * End phpunit tests
-     *
-     * @return	void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+		//print $db->getVersion()."\n";
+	}
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testExpenseReportCreate
-     *
-     * @return	void
-     */
-    public function testExpenseReportCreate()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testExpenseReportCreate
+	 *
+	 * @return	void
+	 */
+	public function testExpenseReportCreate()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        // Create supplier order with a too low quantity
-        $localobject=new ExpenseReport($db);
-        $localobject->initAsSpecimen();         // Init a specimen with lines
-        $localobject->status = 0;
-        $localobject->fk_statut = 0;
-        $localobject->date_fin = null;  // Force bad value
+		// Create supplier order with a too low quantity
+		$localobject=new ExpenseReport($db);
+		$localobject->initAsSpecimen();         // Init a specimen with lines
+		$localobject->status = 0;
+		$localobject->fk_statut = 0;
+		$localobject->date_fin = null;  // Force bad value
 
-        $result=$localobject->create($user);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(-1, $result, "Error on test ExpenseReport create 1 : ".$localobject->error);       // must be -1 because of missing mandatory fields
+		$result=$localobject->create($user);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(-1, $result, "Error on test ExpenseReport create 1 : ".$localobject->error);       // must be -1 because of missing mandatory fields
 
-        $sql="DELETE FROM ".MAIN_DB_PREFIX."expensereport where ref=''";
-        $db->query($sql);
+		$sql="DELETE FROM ".MAIN_DB_PREFIX."expensereport where ref=''";
+		$db->query($sql);
 
-        // Create supplier order
-        $localobject2=new ExpenseReport($db);
-        $localobject2->initAsSpecimen();        // Init a specimen with lines
-        $localobject2->status = 0;
-        $localobject2->fk_statut = 0;
+		// Create supplier order
+		$localobject2=new ExpenseReport($db);
+		$localobject2->initAsSpecimen();        // Init a specimen with lines
+		$localobject2->status = 0;
+		$localobject2->fk_statut = 0;
 
-        $result=$localobject2->create($user);
-        print __METHOD__." result=".$result."\n";
-        $this->assertGreaterThanOrEqual(0, $result, "Error on test ExpenseReport create 2 : ".$localobject2->error);
+		$result=$localobject2->create($user);
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThanOrEqual(0, $result, "Error on test ExpenseReport create 2 : ".$localobject2->error);
 
-        return $result;
-    }
+		return $result;
+	}
 
 
-    /**
-     * testExpenseReportFetch
-     *
-     * @param   int $id     Id of supplier order
-     * @return  void
-     *
-     * @depends testExpenseReportCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testExpenseReportFetch($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testExpenseReportFetch
+	 *
+	 * @param   int $id     Id of supplier order
+	 * @return  void
+	 *
+	 * @depends testExpenseReportCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testExpenseReportFetch($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new ExpenseReport($this->savdb);
-        $result=$localobject->fetch($id);
+		$localobject=new ExpenseReport($this->savdb);
+		$result=$localobject->fetch($id);
 
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $localobject;
-    }
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
 
-    /**
-     * testExpenseReportValid
-     *
-     * @param   Object $localobject     Supplier order
-     * @return  void
-     *
-     * @depends testExpenseReportFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testExpenseReportValid($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testExpenseReportValid
+	 *
+	 * @param   Object $localobject     Supplier order
+	 * @return  void
+	 *
+	 * @depends testExpenseReportFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testExpenseReportValid($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=$localobject->setValidate($user);
+		$result=$localobject->setValidate($user);
 
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $localobject;
-    }
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
 
-    /**
-     * testExpenseReportApprove
-     *
-     * @param   Object $localobject Supplier order
-     * @return  void
-     *
-     * @depends testExpenseReportValid
-     * The depends says test is run only if previous is ok
-     */
-    public function testExpenseReportApprove($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testExpenseReportApprove
+	 *
+	 * @param   Object $localobject Supplier order
+	 * @return  void
+	 *
+	 * @depends testExpenseReportValid
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testExpenseReportApprove($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=$localobject->setApproved($user);
+		$result=$localobject->setApproved($user);
 
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $localobject;
-    }
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
 
-    /**
-     * testExpenseReportCancel
-     *
-     * @param   Object  $localobject        Supplier order
-     * @return  void
-     *
-     * @depends testExpenseReportApprove
-     * The depends says test is run only if previous is ok
-     */
-    public function testExpenseReportCancel($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testExpenseReportCancel
+	 *
+	 * @param   Object  $localobject        Supplier order
+	 * @return  void
+	 *
+	 * @depends testExpenseReportApprove
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testExpenseReportCancel($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=$localobject->set_cancel($user, 'Because...');
+		$result=$localobject->set_cancel($user, 'Because...');
 
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $localobject;
-    }
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
 
-    /**
-     * testExpenseReportOther
-     *
-     * @param   Object $localobject     Supplier order
-     * @return  void
-     *
-     * @depends testExpenseReportCancel
-     * The depends says test is run only if previous is ok
-     */
-    public function testExpenseReportOther($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testExpenseReportOther
+	 *
+	 * @param   Object $localobject     Supplier order
+	 * @return  void
+	 *
+	 * @depends testExpenseReportCancel
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testExpenseReportOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=$localobject->getSumPayments();
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertGreaterThanOrEqual(0, $result);
+		$result=$localobject->getSumPayments();
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertGreaterThanOrEqual(0, $result);
 
-        return $localobject->id;
-    }
+		return $localobject->id;
+	}
 
-    /**
-     * testExpenseReportDelete
-     *
-     * @param   int $id     Id of order
-     * @return  void
-     *
-     * @depends testExpenseReportOther
-     * The depends says test is run only if previous is ok
-     */
-    public function testExpenseReportDelete($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testExpenseReportDelete
+	 *
+	 * @param   int $id     Id of order
+	 * @return  void
+	 *
+	 * @depends testExpenseReportOther
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testExpenseReportDelete($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new ExpenseReport($this->savdb);
-        $result=$localobject->fetch($id);
-        $result=$localobject->delete($user);
+		$localobject=new ExpenseReport($this->savdb);
+		$result=$localobject->fetch($id);
+		$result=$localobject->delete($user);
 
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertGreaterThan(0, $result);
-        return $result;
-    }
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertGreaterThan(0, $result);
+		return $result;
+	}
 }
diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php
index 0f5b0bd82e3..4051deb125b 100644
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
@@ -30,16 +30,36 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/exports/class/export.class.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/files.lib.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+if (! defined('NOREQUIREUSER')) {
+	define('NOREQUIREUSER', '1');
+}
+if (! defined('NOREQUIREDB')) {
+	define('NOREQUIREDB', '1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (! defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', '1');
+}
+if (! defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1'); // If there is no menu to show
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (! defined("NOLOGIN")) {
+	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+}
 
 
 /**
@@ -79,296 +99,293 @@ class ExportTest extends PHPUnit\Framework\TestCase
 	}
 
 	/**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 		//$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		//$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
 
-    /**
-     * Other tests
-     *
-     * @return void
-     */
-    public function testExportOther()
-    {
-        global $conf,$user,$langs,$db;
-
-        $model='csv';
-
-        $conf->global->EXPORT_CSV_SEPARATOR_TO_USE = ',';
-        print 'EXPORT_CSV_SEPARATOR_TO_USE = '.$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
-
-        // Creation of class to export using model ExportXXX
-        $dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";
-        $file = "export_".$model.".modules.php";
-        $classname = "Export".$model;
-        require_once $dir.$file;
-        $objmodel = new $classname($db);
-
-        // First test without option USE_STRICT_CSV_RULES
-        unset($conf->global->USE_STRICT_CSV_RULES);
-
-        $valtotest='A simple string';
-        print __METHOD__." valtotest=".$valtotest."\n";
-        $result = $objmodel->csvClean($valtotest, $langs->charset_output);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, 'A simple string');
-
-        $valtotest='A string with , and ; inside';
-        print __METHOD__." valtotest=".$valtotest."\n";
-        $result = $objmodel->csvClean($valtotest, $langs->charset_output);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, '"A string with , and ; inside"', 'Error in csvClean for '.$file);
-
-        $valtotest='A string with " inside';
-        print __METHOD__." valtotest=".$valtotest."\n";
-        $result = $objmodel->csvClean($valtotest, $langs->charset_output);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, '"A string with "" inside"');
-
-        $valtotest='A string with " inside and '."\r\n".' carriage returns';
-        print __METHOD__." valtotest=".$valtotest."\n";
-        $result = $objmodel->csvClean($valtotest, $langs->charset_output);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, '"A string with "" inside and \n carriage returns"');
-
-        $valtotest='A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
-        print __METHOD__." valtotest=".$valtotest."\n";
-        $result = $objmodel->csvClean($valtotest, $langs->charset_output);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, '"A string with <a href=""aaa""><strong>html<br>content</strong></a> inside"');
-
-        // Same tests with strict mode
-        $conf->global->USE_STRICT_CSV_RULES = 1;
-
-        $valtotest='A simple string';
-        print __METHOD__." valtotest=".$valtotest."\n";
-        $result = $objmodel->csvClean($valtotest, $langs->charset_output);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, 'A simple string');
-
-        $valtotest='A string with , and ; inside';
-        print __METHOD__." valtotest=".$valtotest."\n";
-        $result = $objmodel->csvClean($valtotest, $langs->charset_output);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, '"A string with , and ; inside"');
-
-        $valtotest='A string with " inside';
-        print __METHOD__." valtotest=".$valtotest."\n";
-        $result = $objmodel->csvClean($valtotest, $langs->charset_output);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, '"A string with "" inside"');
-
-        $valtotest='A string with " inside and '."\r\n".' carriage returns';
-        print __METHOD__." valtotest=".$valtotest."\n";
-        $result = $objmodel->csvClean($valtotest, $langs->charset_output);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, "\"A string with \"\" inside and \r\n carriage returns\"");
-
-        $valtotest='A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
-        print __METHOD__." valtotest=".$valtotest."\n";
-        $result = $objmodel->csvClean($valtotest, $langs->charset_output);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, '"A string with <a href=""aaa""><strong>html<br>content</strong></a> inside"');
-    }
-
-    /**
-     * Test export function for a personalized dataset
-     *
-     * @depends	testExportOther
+	/**
+	 * Other tests
+	 *
 	 * @return void
-     */
-    public function testExportPersonalizedExport()
-    {
-        global $conf,$user,$langs,$db;
+	 */
+	public function testExportOther()
+	{
+		global $conf,$user,$langs,$db;
 
-        $sql = "SELECT f.ref as f_ref, f.total as f_total, f.tva as f_tva FROM ".MAIN_DB_PREFIX."facture f";
+		$model='csv';
 
-        $objexport=new Export($db);
-        //$objexport->load_arrays($user,$datatoexport);
+		$conf->global->EXPORT_CSV_SEPARATOR_TO_USE = ',';
+		print 'EXPORT_CSV_SEPARATOR_TO_USE = '.$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
 
-        // Define properties
-        $datatoexport='test';
-        $array_selected = array("f.ref"=>1, "f.total"=>2, "f.tva"=>3);
-        $array_export_fields = array("f.ref"=>"FacNumber", "f.total"=>"FacTotal", "f.tva"=>"FacVat");
-        $array_alias = array("f_ref"=>"ref", "f_total"=>"total", "f_tva"=>"tva");
-        $objexport->array_export_fields[0]=$array_export_fields;
-        $objexport->array_export_alias[0]=$array_alias;
+		// Creation of class to export using model ExportXXX
+		$dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";
+		$file = "export_".$model.".modules.php";
+		$classname = "Export".$model;
+		require_once $dir.$file;
+		$objmodel = new $classname($db);
 
-        dol_mkdir($conf->export->dir_temp);
+		// First test without option USE_STRICT_CSV_RULES
+		unset($conf->global->USE_STRICT_CSV_RULES);
 
-        $model='csv';
+		$valtotest='A simple string';
+		print __METHOD__." valtotest=".$valtotest."\n";
+		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, 'A simple string');
 
-        // Build export file
-        print "Process build_file for model = ".$model."\n";
-        $result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
+		$valtotest='A string with , and ; inside';
+		print __METHOD__." valtotest=".$valtotest."\n";
+		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, '"A string with , and ; inside"', 'Error in csvClean for '.$file);
+
+		$valtotest='A string with " inside';
+		print __METHOD__." valtotest=".$valtotest."\n";
+		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, '"A string with "" inside"');
+
+		$valtotest='A string with " inside and '."\r\n".' carriage returns';
+		print __METHOD__." valtotest=".$valtotest."\n";
+		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, '"A string with "" inside and \n carriage returns"');
+
+		$valtotest='A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
+		print __METHOD__." valtotest=".$valtotest."\n";
+		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, '"A string with <a href=""aaa""><strong>html<br>content</strong></a> inside"');
+
+		// Same tests with strict mode
+		$conf->global->USE_STRICT_CSV_RULES = 1;
+
+		$valtotest='A simple string';
+		print __METHOD__." valtotest=".$valtotest."\n";
+		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, 'A simple string');
+
+		$valtotest='A string with , and ; inside';
+		print __METHOD__." valtotest=".$valtotest."\n";
+		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, '"A string with , and ; inside"');
+
+		$valtotest='A string with " inside';
+		print __METHOD__." valtotest=".$valtotest."\n";
+		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, '"A string with "" inside"');
+
+		$valtotest='A string with " inside and '."\r\n".' carriage returns';
+		print __METHOD__." valtotest=".$valtotest."\n";
+		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, "\"A string with \"\" inside and \r\n carriage returns\"");
+
+		$valtotest='A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
+		print __METHOD__." valtotest=".$valtotest."\n";
+		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, '"A string with <a href=""aaa""><strong>html<br>content</strong></a> inside"');
+	}
+
+	/**
+	 * Test export function for a personalized dataset
+	 *
+	 * @depends	testExportOther
+	 * @return void
+	 */
+	public function testExportPersonalizedExport()
+	{
+		global $conf,$user,$langs,$db;
+
+		$sql = "SELECT f.ref as f_ref, f.total as f_total, f.tva as f_tva FROM ".MAIN_DB_PREFIX."facture f";
+
+		$objexport=new Export($db);
+		//$objexport->load_arrays($user,$datatoexport);
+
+		// Define properties
+		$datatoexport='test';
+		$array_selected = array("f.ref"=>1, "f.total"=>2, "f.tva"=>3);
+		$array_export_fields = array("f.ref"=>"FacNumber", "f.total"=>"FacTotal", "f.tva"=>"FacVat");
+		$array_alias = array("f_ref"=>"ref", "f_total"=>"total", "f_tva"=>"tva");
+		$objexport->array_export_fields[0]=$array_export_fields;
+		$objexport->array_export_alias[0]=$array_alias;
+
+		dol_mkdir($conf->export->dir_temp);
+
+		$model='csv';
+
+		// Build export file
+		print "Process build_file for model = ".$model."\n";
+		$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
 		$expectedresult = 1;
-        $this->assertEquals($expectedresult, $result, 'Error in CSV export');
+		$this->assertEquals($expectedresult, $result, 'Error in CSV export');
 
-        $model='tsv';
+		$model='tsv';
 
-        // Build export file
-        print "Process build_file for model = ".$model."\n";
-        $result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
+		// Build export file
+		print "Process build_file for model = ".$model."\n";
+		$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
 		$expectedresult=1;
-        $this->assertEquals($expectedresult, $result, 'Error in TSV export');
+		$this->assertEquals($expectedresult, $result, 'Error in TSV export');
 
-        $model='excel2007new';
+        $model='excel2007';
 
-        // Build export file
-        /* ko on php 7.4 on travis (zip not available) */
-        print "Process build_file for model = ".$model."\n";
-        $result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
+		// Build export file
+		/* ko on php 7.4 on travis (zip not available) */
+		print "Process build_file for model = ".$model."\n";
+		$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
 		$expectedresult=1;
-        $this->assertEquals($expectedresult, $result, 'Error in Excel2007new export');
+        $this->assertEquals($expectedresult, $result, 'Error in Excel2007 export');
 
+		return true;
+	}
 
-        return true;
-    }
-
-    /**
-     * Test export function for a personalized dataset with filters
-     *
-     * @depends	testExportPersonalizedExport
-     * @return void
-     */
-    public function testExportPersonalizedWithFilter()
-    {
-    	global $conf,$user,$langs,$db;
-        /*
-    	$sql = "SELECT f.ref as f_ref, f.total as f_total, f.tva as f_tva FROM ".MAIN_DB_PREFIX."facture f";
-
-    	$objexport=new Export($db);
-    	//$objexport->load_arrays($user,$datatoexport);
-
-    	// Define properties
-    	$datatoexport='test_filtered';
-    	$array_selected = array("f.ref"=>1, "f.total"=>2, "f.tva"=>3);
-    	$array_export_fields = array("f.ref"=>"FacNumber", "f.total"=>"FacTotal", "f.tva"=>"FacVat");
-    	$array_filtervalue = array("f.total" => ">100");
-    	$array_filtered = array("f.total" => 1);
-    	$array_alias = array("f_ref"=>"ref", "f_total"=>"total", "f_tva"=>"tva");
-    	$objexport->array_export_fields[0]=$array_export_fields;
-    	$objexport->array_export_alias[0]=$array_alias;
-
-    	dol_mkdir($conf->export->dir_temp);
-
-    	$model='csv';
-
-    	// Build export file
-    	$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, $array_filtervalue, $sql);
-    	$expectedresult=1;
-    	$this->assertEquals($expectedresult,$result);
-
-    	$model='tsv';
-
-    	// Build export file
-    	$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, $array_filtervalue, $sql);
-    	$expectedresult=1;
-    	$this->assertEquals($expectedresult,$result);
-
-    	$model='excel';
-
-    	// Build export file
-    	$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, $array_filtervalue, $sql);
-    	$expectedresult=1;
-    	$this->assertEquals($expectedresult,$result);
-        */
-    	$this->assertEquals(true, true);
-    	return true;
-    }
-
-    /**
-     * Test export function for all dataset predefined into modules
-     *
-     * @depends	testExportPersonalizedWithFilter
+	/**
+	 * Test export function for a personalized dataset with filters
+	 *
+	 * @depends	testExportPersonalizedExport
 	 * @return void
-     */
-    public function testExportModulesDatasets()
-    {
-        global $conf,$user,$langs,$db;
+	 */
+	public function testExportPersonalizedWithFilter()
+	{
+		global $conf,$user,$langs,$db;
+		/*
+		$sql = "SELECT f.ref as f_ref, f.total as f_total, f.tva as f_tva FROM ".MAIN_DB_PREFIX."facture f";
 
-        $model='csv';
+		$objexport=new Export($db);
+		//$objexport->load_arrays($user,$datatoexport);
 
-        $filterdatatoexport='';
-        //$filterdatatoexport='';
-        //$array_selected = array("s.rowid"=>1, "s.nom"=>2);	// Mut be fields found into declaration of dataset
+		// Define properties
+		$datatoexport='test_filtered';
+		$array_selected = array("f.ref"=>1, "f.total"=>2, "f.tva"=>3);
+		$array_export_fields = array("f.ref"=>"FacNumber", "f.total"=>"FacTotal", "f.tva"=>"FacVat");
+		$array_filtervalue = array("f.total" => ">100");
+		$array_filtered = array("f.total" => 1);
+		$array_alias = array("f_ref"=>"ref", "f_total"=>"total", "f_tva"=>"tva");
+		$objexport->array_export_fields[0]=$array_export_fields;
+		$objexport->array_export_alias[0]=$array_alias;
 
-        // Load properties of arrays to make export
-        $objexport=new Export($db);
-        $result=$objexport->load_arrays($user, $filterdatatoexport);	// This load ->array_export_xxx properties for datatoexport
+		dol_mkdir($conf->export->dir_temp);
 
-        // Loop on each dataset
-        foreach ($objexport->array_export_code as $key => $datatoexport)
-        {
-        	$exportfile=$conf->export->dir_temp.'/'.$user->id.'/export_'.$datatoexport.'.csv';
-	        print "Process export for dataset ".$datatoexport." into ".$exportfile."\n";
-	        dol_delete_file($exportfile);
+		$model='csv';
 
-	        // Generate $array_selected
-	        $i=0;
-	        $array_selected=array();
-			foreach ($objexport->array_export_fields[$key] as $key => $val)
-			{
+		// Build export file
+		$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, $array_filtervalue, $sql);
+		$expectedresult=1;
+		$this->assertEquals($expectedresult,$result);
+
+		$model='tsv';
+
+		// Build export file
+		$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, $array_filtervalue, $sql);
+		$expectedresult=1;
+		$this->assertEquals($expectedresult,$result);
+
+		$model='excel';
+
+		// Build export file
+		$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, $array_filtervalue, $sql);
+		$expectedresult=1;
+		$this->assertEquals($expectedresult,$result);
+		*/
+		$this->assertEquals(true, true);
+		return true;
+	}
+
+	/**
+	 * Test export function for all dataset predefined into modules
+	 *
+	 * @depends	testExportPersonalizedWithFilter
+	 * @return void
+	 */
+	public function testExportModulesDatasets()
+	{
+		global $conf,$user,$langs,$db;
+
+		$model='csv';
+
+		$filterdatatoexport='';
+		//$filterdatatoexport='';
+		//$array_selected = array("s.rowid"=>1, "s.nom"=>2);	// Mut be fields found into declaration of dataset
+
+		// Load properties of arrays to make export
+		$objexport=new Export($db);
+		$result=$objexport->load_arrays($user, $filterdatatoexport);	// This load ->array_export_xxx properties for datatoexport
+
+		// Loop on each dataset
+		foreach ($objexport->array_export_code as $key => $datatoexport) {
+			$exportfile=$conf->export->dir_temp.'/'.$user->id.'/export_'.$datatoexport.'.csv';
+			print "Process export for dataset ".$datatoexport." into ".$exportfile."\n";
+			dol_delete_file($exportfile);
+
+			// Generate $array_selected
+			$i=0;
+			$array_selected=array();
+			foreach ($objexport->array_export_fields[$key] as $key => $val) {
 				$array_selected[$key]=$i++;
 			}
 			//var_dump($array_selected);
 
-	        // Build export file
-        	$sql = "";
+			// Build export file
+			$sql = "";
 			$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
 			$expectedresult = 1;
-	        $this->assertEquals($expectedresult, $result, "Call build_file() to export ".$exportfile.' failed: '.$objexport->error);
-	        $result=dol_is_file($exportfile);
-	        $this->assertTrue($result, 'File '.$exportfile.' not found');
-        }
+			$this->assertEquals($expectedresult, $result, "Call build_file() to export ".$exportfile.' failed: '.$objexport->error);
+			$result=dol_is_file($exportfile);
+			$this->assertTrue($result, 'File '.$exportfile.' not found');
+		}
 
-        return true;
-    }
+		return true;
+	}
 }
diff --git a/test/phpunit/FactureFournisseurTest.php b/test/phpunit/FactureFournisseurTest.php
index d9cd44a40d2..c7873ae3206 100644
--- a/test/phpunit/FactureFournisseurTest.php
+++ b/test/phpunit/FactureFournisseurTest.php
@@ -30,8 +30,7 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/fourn/class/fournisseur.facture.class.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -76,204 +75,204 @@ class FactureFournisseurTest extends PHPUnit\Framework\TestCase
 	}
 
 	/**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testFactureFournisseurCreate
-     *
-     * @return int
-     */
-    public function testFactureFournisseurCreate()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testFactureFournisseurCreate
+	 *
+	 * @return int
+	 */
+	public function testFactureFournisseurCreate()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new FactureFournisseur($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+		$localobject->initAsSpecimen();
+		$result=$localobject->create($user);
 
-    	$this->assertLessThan($result, 0, $localobject->errorsToString());
-    	print __METHOD__." result=".$result."\n";
-    	return $result;
-    }
+		$this->assertLessThan($result, 0, $localobject->errorsToString());
+		print __METHOD__." result=".$result."\n";
+		return $result;
+	}
 
-    /**
-     * testFactureFournisseurFetch
-     *
-     * @param	int		$id		If supplier invoice
-     * @return	void
-     *
-     * @depends	testFactureFournisseurCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testFactureFournisseurFetch($id)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testFactureFournisseurFetch
+	 *
+	 * @param	int		$id		If supplier invoice
+	 * @return	void
+	 *
+	 * @depends	testFactureFournisseurCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testFactureFournisseurFetch($id)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new FactureFournisseur($this->savdb);
-    	$result=$localobject->fetch($id);
+		$result=$localobject->fetch($id);
 
-    	$this->assertLessThan($result, 0, $localobject->errorsToString());
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	return $localobject;
-    }
+		$this->assertLessThan($result, 0, $localobject->errorsToString());
+		print __METHOD__." id=".$id." result=".$result."\n";
+		return $localobject;
+	}
 
-    /**
-     * testFactureFournisseurUpdate
-     *
-     * @param	Object	$localobject	Supplier invoice
-     * @return	int
-     *
-     * @depends	testFactureFournisseurFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testFactureFournisseurUpdate($localobject)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testFactureFournisseurUpdate
+	 *
+	 * @param	Object	$localobject	Supplier invoice
+	 * @return	int
+	 *
+	 * @depends	testFactureFournisseurFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testFactureFournisseurUpdate($localobject)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject->note='New note after update';
-    	$result=$localobject->update($user);
+		$result=$localobject->update($user);
 
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0, $localobject->errorsToString());
-    	return $localobject;
-    }
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0, $localobject->errorsToString());
+		return $localobject;
+	}
 
-    /**
-     * testFactureFournisseurValid
-     *
-     * @param	Object	$localobject	Supplier invoice
-     * @return	void
-     *
-     * @depends	testFactureFournisseurUpdate
-     * The depends says test is run only if previous is ok
-     */
-    public function testFactureFournisseurValid($localobject)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testFactureFournisseurValid
+	 *
+	 * @param	Object	$localobject	Supplier invoice
+	 * @return	void
+	 *
+	 * @depends	testFactureFournisseurUpdate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testFactureFournisseurValid($localobject)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
-    	$result=$localobject->validate($user);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$result=$localobject->validate($user);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
-    	$this->assertLessThan($result, 0, $localobject->errorsToString());
-    	return $localobject;
-    }
+		$this->assertLessThan($result, 0, $localobject->errorsToString());
+		return $localobject;
+	}
 
-    /**
-     * testFactureFournisseurOther
-     *
-     * @param	Object	$localobject		Supplier invoice
-     * @return	void
-     *
-     * @depends testFactureFournisseurValid
-     * The depends says test is run only if previous is ok
-     */
-    public function testFactureFournisseurOther($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testFactureFournisseurOther
+	 *
+	 * @param	Object	$localobject		Supplier invoice
+	 * @return	void
+	 *
+	 * @depends testFactureFournisseurValid
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testFactureFournisseurOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        /*$result=$localobject->setstatus(0);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        */
+		/*$result=$localobject->setstatus(0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		*/
 
-        $localobject->info($localobject->id);
-        print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
-        $this->assertNotEquals($localobject->date_creation, '');
+		$localobject->info($localobject->id);
+		print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
+		$this->assertNotEquals($localobject->date_creation, '');
 
-        return $localobject->id;
-    }
+		return $localobject->id;
+	}
 
-    /**
-     * testFactureFournisseurDelete
-     *
-     * @param	int		$id		Id of supplier invoice
-     * @return	void
-     *
-     * @depends	testFactureFournisseurOther
-     * The depends says test is run only if previous is ok
-     */
-    public function testFactureFournisseurDelete($id)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testFactureFournisseurDelete
+	 *
+	 * @param	int		$id		Id of supplier invoice
+	 * @return	void
+	 *
+	 * @depends	testFactureFournisseurOther
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testFactureFournisseurDelete($id)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new FactureFournisseur($this->savdb);
-    	$result=$localobject->fetch($id);
+		$result=$localobject->fetch($id);
 		$result=$localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0, $localobject->errorsToString());
-    	return $result;
-    }
+		return $result;
+	}
 }
diff --git a/test/phpunit/FactureRecTest.php b/test/phpunit/FactureRecTest.php
index 0250b659e47..459bea8ae87 100644
--- a/test/phpunit/FactureRecTest.php
+++ b/test/phpunit/FactureRecTest.php
@@ -30,8 +30,7 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/compta/facture/class/facture.class.php';
 require_once dirname(__FILE__).'/../../htdocs/compta/facture/class/facture-rec.class.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -75,66 +74,66 @@ class FactureRecTest extends PHPUnit\Framework\TestCase
 		print "\n";
 	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testFactureCreate
-     *
-     * @return int
-     */
-    public function testFactureRecCreate()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testFactureCreate
+	 *
+	 * @return int
+	 */
+	public function testFactureRecCreate()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -145,60 +144,62 @@ class FactureRecTest extends PHPUnit\Framework\TestCase
 		$localobjectinv->create($user);
 
 		$localobject=new FactureRec($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user, $localobjectinv->id);
+		$localobject->initAsSpecimen();
+		$result=$localobject->create($user, $localobjectinv->id);
 
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
-    	return $result;
-    }
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
+		return $result;
+	}
 
 
 
 
 
 
-    /**
-     * Edit an object to test updates
-     *
-     * @param 	mixed	$localobject		Object Facture
-     * @return	void
-     */
-    public function changeProperties(&$localobject)
-    {
-        $localobject->note_private='New note';
-        //$localobject->note='New note after update';
-    }
+	/**
+	 * Edit an object to test updates
+	 *
+	 * @param 	mixed	$localobject		Object Facture
+	 * @return	void
+	 */
+	public function changeProperties(&$localobject)
+	{
+		$localobject->note_private='New note';
+		//$localobject->note='New note after update';
+	}
 
-    /**
-     * Compare all public properties values of 2 objects
-     *
-     * @param 	Object		$oA						Object operand 1
-     * @param 	Object		$oB						Object operand 2
-     * @param	boolean		$ignoretype				False will not report diff if type of value differs
-     * @param	array		$fieldstoignorearray	Array of fields to ignore in diff
+	/**
+	 * Compare all public properties values of 2 objects
+	 *
+	 * @param 	Object		$oA						Object operand 1
+	 * @param 	Object		$oB						Object operand 2
+	 * @param	boolean		$ignoretype				False will not report diff if type of value differs
+	 * @param	array		$fieldstoignorearray	Array of fields to ignore in diff
 	 * @return	array								Array with differences
-     */
-    public function objCompare($oA, $oB, $ignoretype = true, $fieldstoignorearray = array('id'))
-    {
-        $retAr=array();
+	 */
+	public function objCompare($oA, $oB, $ignoretype = true, $fieldstoignorearray = array('id'))
+	{
+		$retAr=array();
 
-        if (get_class($oA) !== get_class($oB)) {
-            $retAr[]="Supplied objects are not of same class.";
-        } else {
-            $oVarsA=get_object_vars($oA);
-            $oVarsB=get_object_vars($oB);
-            $aKeys=array_keys($oVarsA);
-            foreach ($aKeys as $sKey) {
-                if (in_array($sKey, $fieldstoignorearray)) continue;
-                if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
-                    $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
-                }
-                if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
-                    $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
-                }
-            }
-        }
-        return $retAr;
-    }
+		if (get_class($oA) !== get_class($oB)) {
+			$retAr[]="Supplied objects are not of same class.";
+		} else {
+			$oVarsA=get_object_vars($oA);
+			$oVarsB=get_object_vars($oB);
+			$aKeys=array_keys($oVarsA);
+			foreach ($aKeys as $sKey) {
+				if (in_array($sKey, $fieldstoignorearray)) {
+					continue;
+				}
+				if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
+					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+				}
+				if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
+					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+				}
+			}
+		}
+		return $retAr;
+	}
 }
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index 64959e1cd4f..700507a4edf 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -31,9 +31,9 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/compta/facture/class/facture.class.php';
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -47,338 +47,344 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class FactureTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return FactureTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return FactureTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 
-        if (empty($conf->facture->enabled)) { print __METHOD__." module customer invoice must be enabled.\n"; die(); }
-        if (! empty($conf->ecotaxdeee->enabled)) { print __METHOD__." ecotaxdeee module must not be enabled.\n"; die(); }
+		if (empty($conf->facture->enabled)) {
+			print __METHOD__." module customer invoice must be enabled.\n"; die();
+		}
+		if (! empty($conf->ecotaxdeee->enabled)) {
+			print __METHOD__." ecotaxdeee module must not be enabled.\n"; die();
+		}
 
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * End phpunit tests
-     *
-     * @return  void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+	/**
+	 * End phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testFactureCreate
-     *
-     * @return int
-     */
-    public function testFactureCreate()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testFactureCreate
+	 *
+	 * @return int
+	 */
+	public function testFactureCreate()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Facture($this->savdb);
-        $localobject->initAsSpecimen();
-        $result=$localobject->create($user);
-        $this->assertLessThan($result, 0);
-        print __METHOD__." result=".$result."\n";
-        return $result;
-    }
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$result=$localobject->create($user);
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
+		return $result;
+	}
 
-    /**
-     * testFactureFetch
-     *
-     * @param   int $id     Id invoice
-     * @return  int
-     *
-     * @depends testFactureCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testFactureFetch($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testFactureFetch
+	 *
+	 * @param   int $id     Id invoice
+	 * @return  int
+	 *
+	 * @depends testFactureCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testFactureFetch($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Facture($this->savdb);
-        $result=$localobject->fetch($id);
+		$localobject=new Facture($this->savdb);
+		$result=$localobject->fetch($id);
 
-        $this->assertLessThan($result, 0);
-        print __METHOD__." id=".$id." result=".$result."\n";
-        return $localobject;
-    }
+		$this->assertLessThan($result, 0);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		return $localobject;
+	}
 
-    /**
-     * testFactureFetch
-     *
-     * @param   Object $localobject Invoice
-     * @return  int
-     *
-     * @depends testFactureFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testFactureUpdate($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testFactureFetch
+	 *
+	 * @param   Object $localobject Invoice
+	 * @return  int
+	 *
+	 * @depends testFactureFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testFactureUpdate($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $this->changeProperties($localobject);
-        $result=$localobject->update($user);
+		$this->changeProperties($localobject);
+		$result=$localobject->update($user);
 
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $localobject;
-    }
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
 
-    /**
-     * testFactureValid
-     *
-     * @param   Object $localobject Invoice
-     * @return  void
-     *
-     * @depends testFactureUpdate
-     * The depends says test is run only if previous is ok
-     */
-    public function testFactureValid($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testFactureValid
+	 *
+	 * @param   Object $localobject Invoice
+	 * @return  void
+	 *
+	 * @depends testFactureUpdate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testFactureValid($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=$localobject->validate($user);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$result=$localobject->validate($user);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
-        $this->assertLessThan($result, 0);
+		$this->assertLessThan($result, 0);
 
-        // Test everything are still same than specimen
-        $newlocalobject=new Facture($this->savdb);
-        $newlocalobject->initAsSpecimen();
-        $this->changeProperties($newlocalobject);
+		// Test everything are still same than specimen
+		$newlocalobject=new Facture($this->savdb);
+		$newlocalobject->initAsSpecimen();
+		$this->changeProperties($newlocalobject);
 
-        // Hack to avoid test to be wrong when module sellyoursaas is on
-        unset($localobject->array_options['options_commission']);
-        unset($localobject->array_options['options_reseller']);
+		// Hack to avoid test to be wrong when module sellyoursaas is on
+		unset($localobject->array_options['options_commission']);
+		unset($localobject->array_options['options_reseller']);
 
-        $arraywithdiff = $this->objCompare(
+		$arraywithdiff = $this->objCompare(
 			$localobject,
 			$newlocalobject,
 			true,
 			array(
 				'newref','oldref','id','lines','client','thirdparty','brouillon','user_author','date_creation','date_validation','datem','date_modification',
-				'ref','statut','paye','specimen','ref','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement',
+				'ref','statut','status','paye','specimen','ref','actiontypecode','actionmsg2','actionmsg','mode_reglement','cond_reglement',
 				'cond_reglement_doc', 'modelpdf',
 				'multicurrency_total_ht','multicurrency_total_tva',	'multicurrency_total_ttc','fk_multicurrency','multicurrency_code','multicurrency_tx',
 				'retained_warranty' ,'retained_warranty_date_limit', 'retained_warranty_fk_cond_reglement', 'specimen', 'situation_cycle_ref', 'situation_counter', 'situation_final',
 				'trackid','user_creat','user_valid'
 			)
 		);
-        $this->assertEquals($arraywithdiff, array());    // Actual, Expected
+		$this->assertEquals($arraywithdiff, array());    // Actual, Expected
 
-        return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testFactureOther
-     *
-     * @param   Object $localobject Invoice
-     * @return  int
-     *
-     * @depends testFactureValid
-     * The depends says test is run only if previous is ok
-     */
-    public function testFactureOther($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testFactureOther
+	 *
+	 * @param   Object $localobject Invoice
+	 * @return  int
+	 *
+	 * @depends testFactureValid
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testFactureOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        /*$result=$localobject->setstatus(0);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        */
+		/*$result=$localobject->setstatus(0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		*/
 
-        $localobject->info($localobject->id);
-        print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
-        $this->assertNotEquals($localobject->date_creation, '');
+		$localobject->info($localobject->id);
+		print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
+		$this->assertNotEquals($localobject->date_creation, '');
 
-        $result=$localobject->demande_prelevement($user);
-        print __METHOD__." result=".$result."\n";
-       	$this->assertLessThan($result, 0);
+		$result=$localobject->demande_prelevement($user);
+		print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        return $localobject->id;
-    }
+		return $localobject->id;
+	}
 
-    /**
-     * testFactureDelete
-     *
-     * @param   int $id     Id of invoice
-     * @return  int
-     *
-     * @depends testFactureOther
-     * The depends says test is run only if previous is ok
-     */
-    public function testFactureDelete($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testFactureDelete
+	 *
+	 * @param   int $id     Id of invoice
+	 * @return  int
+	 *
+	 * @depends testFactureOther
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testFactureDelete($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        // Force default setup
-        unset($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED);
-        unset($conf->global->INVOICE_CAN_NEVER_BE_REMOVED);
+		// Force default setup
+		unset($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED);
+		unset($conf->global->INVOICE_CAN_NEVER_BE_REMOVED);
 
-        $localobject=new Facture($this->savdb);
-        $result=$localobject->fetch($id);
+		$localobject=new Facture($this->savdb);
+		$result=$localobject->fetch($id);
 
-        // Create another invoice and validate it after $localobject
-        $localobject2=new Facture($this->savdb);
-        $result=$localobject2->initAsSpecimen();
-        $result=$localobject2->create($user);
-        $result=$localobject2->validate($user);
+		// Create another invoice and validate it after $localobject
+		$localobject2=new Facture($this->savdb);
+		$result=$localobject2->initAsSpecimen();
+		$result=$localobject2->create($user);
+		$result=$localobject2->validate($user);
 		print 'Invoice $localobject ref = '.$localobject->ref."\n";
-        print 'Invoice $localobject2 created with ref = '.$localobject2->ref."\n";
+		print 'Invoice $localobject2 created with ref = '.$localobject2->ref."\n";
 
-        $conf->global->INVOICE_CAN_NEVER_BE_REMOVED = 1;
+		$conf->global->INVOICE_CAN_NEVER_BE_REMOVED = 1;
 
-        $result=$localobject2->delete($user);					// Deletion is KO, option INVOICE_CAN_NEVER_BE_REMOVED is on
-        print __METHOD__." id=".$localobject2->id." ref=".$localobject2->ref." result=".$result."\n";
-        $this->assertEquals(0, $result, 'Deletion should fail, option INVOICE_CAN_NEVER_BE_REMOVED is on');
+		$result=$localobject2->delete($user);					// Deletion is KO, option INVOICE_CAN_NEVER_BE_REMOVED is on
+		print __METHOD__." id=".$localobject2->id." ref=".$localobject2->ref." result=".$result."\n";
+		$this->assertEquals(0, $result, 'Deletion should fail, option INVOICE_CAN_NEVER_BE_REMOVED is on');
 
-        unset($conf->global->INVOICE_CAN_NEVER_BE_REMOVED);
+		unset($conf->global->INVOICE_CAN_NEVER_BE_REMOVED);
 
-        $result=$localobject->delete($user);					// Deletion is KO, it is not last invoice
-        print __METHOD__." id=".$localobject->id." ref=".$localobject->ref." result=".$result."\n";
-        $this->assertEquals(0, $result, 'Deletion should fail, it is not last invoice');
+		$result=$localobject->delete($user);					// Deletion is KO, it is not last invoice
+		print __METHOD__." id=".$localobject->id." ref=".$localobject->ref." result=".$result."\n";
+		$this->assertEquals(0, $result, 'Deletion should fail, it is not last invoice');
 
-        $result=$localobject2->delete($user);					// Deletion is OK, it is last invoice
-        print __METHOD__." id=".$localobject2->id." ref=".$localobject2->ref." result=".$result."\n";
-        $this->assertGreaterThan(0, $result, 'Deletion should work, it is last invoice');
+		$result=$localobject2->delete($user);					// Deletion is OK, it is last invoice
+		print __METHOD__." id=".$localobject2->id." ref=".$localobject2->ref." result=".$result."\n";
+		$this->assertGreaterThan(0, $result, 'Deletion should work, it is last invoice');
 
-        $result=$localobject->delete($user);					// Deletion is KO, it is not last invoice
-        print __METHOD__." id=".$localobject->id." ref=".$localobject->ref." result=".$result."\n";
-        $this->assertGreaterThan(0, $result, 'Deletion should work, it is again last invoice');
+		$result=$localobject->delete($user);					// Deletion is KO, it is not last invoice
+		print __METHOD__." id=".$localobject->id." ref=".$localobject->ref." result=".$result."\n";
+		$this->assertGreaterThan(0, $result, 'Deletion should work, it is again last invoice');
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Edit an object to test updates
-     *
-     * @param   mixed $localobject        Object Facture
-     * @return  void
-     */
-    public function changeProperties(&$localobject)
-    {
-        $localobject->note_private='New note';
-        //$localobject->note='New note after update';
-    }
+	/**
+	 * Edit an object to test updates
+	 *
+	 * @param   mixed $localobject        Object Facture
+	 * @return  void
+	 */
+	public function changeProperties(&$localobject)
+	{
+		$localobject->note_private='New note';
+		//$localobject->note='New note after update';
+	}
 
-    /**
-     * Compare all public properties values of 2 objects
-     *
-     * @param   Object $oA                      Object operand 1
-     * @param   Object $oB                      Object operand 2
-     * @param   boolean $ignoretype             False will not report diff if type of value differs
-     * @param   array $fieldstoignorearray      Array of fields to ignore in diff
-     * @return  array                           Array with differences
-     */
-    public function objCompare($oA, $oB, $ignoretype = true, $fieldstoignorearray = array('id'))
-    {
-        $retAr=array();
+	/**
+	 * Compare all public properties values of 2 objects
+	 *
+	 * @param   Object $oA                      Object operand 1
+	 * @param   Object $oB                      Object operand 2
+	 * @param   boolean $ignoretype             False will not report diff if type of value differs
+	 * @param   array $fieldstoignorearray      Array of fields to ignore in diff
+	 * @return  array                           Array with differences
+	 */
+	public function objCompare($oA, $oB, $ignoretype = true, $fieldstoignorearray = array('id'))
+	{
+		$retAr=array();
 
-        if (get_class($oA) !== get_class($oB)) {
-            $retAr[]="Supplied objects are not of same class.";
-        } else {
-            $oVarsA=get_object_vars($oA);
-            $oVarsB=get_object_vars($oB);
-            $aKeys=array_keys($oVarsA);
-            foreach ($aKeys as $sKey) {
-                if (in_array($sKey, $fieldstoignorearray)) continue;
-                if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
-                    $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
-                }
-                if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
-                    $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
-                }
-            }
-        }
-        return $retAr;
-    }
+		if (get_class($oA) !== get_class($oB)) {
+			$retAr[]="Supplied objects are not of same class.";
+		} else {
+			$oVarsA=get_object_vars($oA);
+			$oVarsB=get_object_vars($oB);
+			$aKeys=array_keys($oVarsA);
+			foreach ($aKeys as $sKey) {
+				if (in_array($sKey, $fieldstoignorearray)) {
+					continue;
+				}
+				if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
+					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+				}
+				if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
+					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+				}
+			}
+		}
+		return $retAr;
+	}
 }
diff --git a/test/phpunit/FactureTestRounding.php b/test/phpunit/FactureTestRounding.php
index f0165a88d0b..7c225167e35 100644
--- a/test/phpunit/FactureTestRounding.php
+++ b/test/phpunit/FactureTestRounding.php
@@ -29,8 +29,7 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/compta/facture/class/facture.class.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -75,272 +74,270 @@ class FactureTestRounding extends PHPUnit\Framework\TestCase
 	}
 
 	/**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
 
 
-    /**
-     * testFactureRoundingCreate1
-     * Test according to page http://wiki.dolibarr.org/index.php/Draft:VAT_calculation_and_rounding#Standard_usage
-     *
-     * @return int
-     */
-    public function testFactureRoundingCreate1()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testFactureRoundingCreate1
+	 * Test according to page http://wiki.dolibarr.org/index.php/Draft:VAT_calculation_and_rounding#Standard_usage
+	 *
+	 * @return int
+	 */
+	public function testFactureRoundingCreate1()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
 		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
 
-        $localobject=new Facture($this->savdb);
-        $localobject->initAsSpecimen();
-        $localobject->lines=array();
-        unset($localobject->total_ht);
-        unset($localobject->total_ttc);
-        unset($localobject->total_tva);
-        $result=$localobject->create($user);
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->lines=array();
+		unset($localobject->total_ht);
+		unset($localobject->total_ttc);
+		unset($localobject->total_tva);
+		$result=$localobject->create($user);
 
-        // Add two lines
-        for ($i=0; $i<2; $i++)
-        {
-            $localobject->addline('Description '.$i, 1.24, 1, 10);
-        }
+		// Add two lines
+		for ($i=0; $i<2; $i++) {
+			$localobject->addline('Description '.$i, 1.24, 1, 10);
+		}
 
-        $newlocalobject=new Facture($this->savdb);
-        $newlocalobject->fetch($result);
-        //var_dump($newlocalobject);
+		$newlocalobject=new Facture($this->savdb);
+		$newlocalobject->fetch($result);
+		//var_dump($newlocalobject);
 
-        $this->assertEquals($newlocalobject->total_ht, 2.48);
-        $this->assertEquals($newlocalobject->total_tva, 0.24);
-        $this->assertEquals($newlocalobject->total_ttc, 2.72);
-        return $result;
-    }
+		$this->assertEquals($newlocalobject->total_ht, 2.48);
+		$this->assertEquals($newlocalobject->total_tva, 0.24);
+		$this->assertEquals($newlocalobject->total_ttc, 2.72);
+		return $result;
+	}
 
 
-    /**
-     * testFactureRoundingCreate2
-     *
-     * @return int
-     *
-     * @depends	testFactureRoundingCreate1
-     * Test according to page http://wiki.dolibarr.org/index.php/Draft:VAT_calculation_and_rounding#Standard_usage
-     */
-    public function testFactureRoundingCreate2()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testFactureRoundingCreate2
+	 *
+	 * @return int
+	 *
+	 * @depends	testFactureRoundingCreate1
+	 * Test according to page http://wiki.dolibarr.org/index.php/Draft:VAT_calculation_and_rounding#Standard_usage
+	 */
+	public function testFactureRoundingCreate2()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
+		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
 
-        $localobject=new Facture($this->savdb);
-        $localobject->initAsSpecimen();
-        $localobject->lines=array();
-        unset($localobject->total_ht);
-        unset($localobject->total_ttc);
-        unset($localobject->total_vat);
-        $result=$localobject->create($user);
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->lines=array();
+		unset($localobject->total_ht);
+		unset($localobject->total_ttc);
+		unset($localobject->total_vat);
+		$result=$localobject->create($user);
 
-        // Add two lines
-        for ($i=0; $i<2; $i++)
-        {
-            $localobject->addline('Description '.$i, 1.24, 1, 10);
-        }
+		// Add two lines
+		for ($i=0; $i<2; $i++) {
+			$localobject->addline('Description '.$i, 1.24, 1, 10);
+		}
 
-        $newlocalobject=new Facture($this->savdb);
-        $newlocalobject->fetch($result);
-        //var_dump($newlocalobject);
+		$newlocalobject=new Facture($this->savdb);
+		$newlocalobject->fetch($result);
+		//var_dump($newlocalobject);
 
-        $this->assertEquals($newlocalobject->total_ht, 2.48);
-        //$this->assertEquals($newlocalobject->total_tva, 0.25);
-        //$this->assertEquals($newlocalobject->total_ttc, 2.73);
-        return $result;
-    }
+		$this->assertEquals($newlocalobject->total_ht, 2.48);
+		//$this->assertEquals($newlocalobject->total_tva, 0.25);
+		//$this->assertEquals($newlocalobject->total_ttc, 2.73);
+		return $result;
+	}
 
 
-    /**
-     * testFactureAddLine1
-     *
-     * @return	void
-     */
-    public function testFactureAddLine1()
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+	/**
+	 * testFactureAddLine1
+	 *
+	 * @return	void
+	 */
+	public function testFactureAddLine1()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-    	// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0
-    	$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
+		// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0
+		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
 
-    	$localobject1a=new Facture($this->savdb);
-    	$localobject1a->initAsSpecimen('nolines');
-    	$facid=$localobject1a->create($user);
-    	$localobject1a->addline('Line 1', 6.36, 15, 21);	// This include update_price
-    	print __METHOD__." id=".$facid." total_ttc=".$localobject1a->total_ttc."\n";
-    	$this->assertEquals(95.40, $localobject1a->total_ht);
-    	$this->assertEquals(20.03, $localobject1a->total_tva);
-    	$this->assertEquals(115.43, $localobject1a->total_ttc);
+		$localobject1a=new Facture($this->savdb);
+		$localobject1a->initAsSpecimen('nolines');
+		$facid=$localobject1a->create($user);
+		$localobject1a->addline('Line 1', 6.36, 15, 21);	// This include update_price
+		print __METHOD__." id=".$facid." total_ttc=".$localobject1a->total_ttc."\n";
+		$this->assertEquals(95.40, $localobject1a->total_ht);
+		$this->assertEquals(20.03, $localobject1a->total_tva);
+		$this->assertEquals(115.43, $localobject1a->total_ttc);
 
-    	// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1
-    	$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=1;
+		// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1
+		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=1;
 
-    	$localobject1b=new Facture($this->savdb);
-    	$localobject1b->initAsSpecimen('nolines');
-    	$facid=$localobject1b->create($user);
-    	$localobject1b->addline('Line 1', 6.36, 15, 21);	// This include update_price
-    	print __METHOD__." id=".$facid." total_ttc=".$localobject1b->total_ttc."\n";
-    	$this->assertEquals(95.40, $localobject1b->total_ht, 'testFactureAddLine1 total_ht');
-    	$this->assertEquals(20.03, $localobject1b->total_tva, 'testFactureAddLine1 total_tva');
-    	$this->assertEquals(115.43, $localobject1b->total_ttc, 'testFactureAddLine1 total_ttc');
-    }
+		$localobject1b=new Facture($this->savdb);
+		$localobject1b->initAsSpecimen('nolines');
+		$facid=$localobject1b->create($user);
+		$localobject1b->addline('Line 1', 6.36, 15, 21);	// This include update_price
+		print __METHOD__." id=".$facid." total_ttc=".$localobject1b->total_ttc."\n";
+		$this->assertEquals(95.40, $localobject1b->total_ht, 'testFactureAddLine1 total_ht');
+		$this->assertEquals(20.03, $localobject1b->total_tva, 'testFactureAddLine1 total_tva');
+		$this->assertEquals(115.43, $localobject1b->total_ttc, 'testFactureAddLine1 total_ttc');
+	}
 
-    /**
-     * testFactureAddLine2
-     *
-     * @return	void
-     *
-     * @depends	testFactureAddLine1
-     * The depends says test is run only if previous is ok
-     */
-    public function testFactureAddLine2()
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+	/**
+	 * testFactureAddLine2
+	 *
+	 * @return	void
+	 *
+	 * @depends	testFactureAddLine1
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testFactureAddLine2()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-    	// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0
-    	$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
+		// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0
+		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
 
-    	$localobject2=new Facture($this->savdb);
-    	$localobject2->initAsSpecimen('nolines');
-    	$facid=$localobject2->create($user);
-    	$localobject2->addline('Line 1', 6.36, 5, 21);
-    	$localobject2->addline('Line 2', 6.36, 5, 21);
-    	$localobject2->addline('Line 3', 6.36, 5, 21);
-    	print __METHOD__." id=".$facid." total_ttc=".$localobject2->total_ttc."\n";
-    	$this->assertEquals(95.40, $localobject2->total_ht);
-    	$this->assertEquals(20.04, $localobject2->total_tva);
-    	$this->assertEquals(115.44, $localobject2->total_ttc);
+		$localobject2=new Facture($this->savdb);
+		$localobject2->initAsSpecimen('nolines');
+		$facid=$localobject2->create($user);
+		$localobject2->addline('Line 1', 6.36, 5, 21);
+		$localobject2->addline('Line 2', 6.36, 5, 21);
+		$localobject2->addline('Line 3', 6.36, 5, 21);
+		print __METHOD__." id=".$facid." total_ttc=".$localobject2->total_ttc."\n";
+		$this->assertEquals(95.40, $localobject2->total_ht);
+		$this->assertEquals(20.04, $localobject2->total_tva);
+		$this->assertEquals(115.44, $localobject2->total_ttc);
 
-    	// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1
-    	$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=1;
+		// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1
+		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=1;
 
-    	$localobject2=new Facture($this->savdb);
-    	$localobject2->initAsSpecimen('nolines');
-    	$facid=$localobject2->create($user);
-    	$localobject2->addline('Line 1', 6.36, 5, 21);
-    	$localobject2->addline('Line 2', 6.36, 5, 21);
-    	$localobject2->addline('Line 3', 6.36, 5, 21);
-    	print __METHOD__." id=".$facid." total_ttc=".$localobject2->total_ttc."\n";
-    	$this->assertEquals(95.40, $localobject2->total_ht);
-    	$this->assertEquals(20.03, $localobject2->total_tva);
-    	$this->assertEquals(115.43, $localobject2->total_ttc);
-    }
+		$localobject2=new Facture($this->savdb);
+		$localobject2->initAsSpecimen('nolines');
+		$facid=$localobject2->create($user);
+		$localobject2->addline('Line 1', 6.36, 5, 21);
+		$localobject2->addline('Line 2', 6.36, 5, 21);
+		$localobject2->addline('Line 3', 6.36, 5, 21);
+		print __METHOD__." id=".$facid." total_ttc=".$localobject2->total_ttc."\n";
+		$this->assertEquals(95.40, $localobject2->total_ht);
+		$this->assertEquals(20.03, $localobject2->total_tva);
+		$this->assertEquals(115.43, $localobject2->total_ttc);
+	}
 
-    /**
-     * testFactureAddLine3
-     *
-     * @return	void
-     *
-     * @depends	testFactureAddLine2
-     * The depends says test is run only if previous is ok
-     */
-    public function testFactureAddLine3()
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+	/**
+	 * testFactureAddLine3
+	 *
+	 * @return	void
+	 *
+	 * @depends	testFactureAddLine2
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testFactureAddLine3()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-    	// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0
-    	$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
+		// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 0
+		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
 
-    	$localobject3=new Facture($this->savdb);
-    	$localobject3->initAsSpecimen('nolines');
-    	$facid=$localobject3->create($user);
-    	$localobject3->addline('Line 1', 6.36, 3, 21);
-    	$localobject3->addline('Line 2', 6.36, 3, 21);
-    	$localobject3->addline('Line 3', 6.36, 3, 21);
-    	$localobject3->addline('Line 4', 6.36, 3, 21);
-    	$localobject3->addline('Line 5', 6.36, 3, 21);
-    	print __METHOD__." id=".$facid." total_ttc=".$localobject3->total_ttc."\n";
-    	$this->assertEquals(95.40, $localobject3->total_ht);
-    	$this->assertEquals(20.05, $localobject3->total_tva);
-    	$this->assertEquals(115.45, $localobject3->total_ttc);
+		$localobject3=new Facture($this->savdb);
+		$localobject3->initAsSpecimen('nolines');
+		$facid=$localobject3->create($user);
+		$localobject3->addline('Line 1', 6.36, 3, 21);
+		$localobject3->addline('Line 2', 6.36, 3, 21);
+		$localobject3->addline('Line 3', 6.36, 3, 21);
+		$localobject3->addline('Line 4', 6.36, 3, 21);
+		$localobject3->addline('Line 5', 6.36, 3, 21);
+		print __METHOD__." id=".$facid." total_ttc=".$localobject3->total_ttc."\n";
+		$this->assertEquals(95.40, $localobject3->total_ht);
+		$this->assertEquals(20.05, $localobject3->total_tva);
+		$this->assertEquals(115.45, $localobject3->total_ttc);
 
-    	// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1
-    	$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=1;
+		// With option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND = 1
+		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=1;
 
-    	$localobject3=new Facture($this->savdb);
-    	$localobject3->initAsSpecimen('nolines');
-    	$facid=$localobject3->create($user);
-    	$localobject3->addline('Line 1', 6.36, 3, 21);
-    	$localobject3->addline('Line 2', 6.36, 3, 21);
-    	$localobject3->addline('Line 3', 6.36, 3, 21);
-    	$localobject3->addline('Line 4', 6.36, 3, 21);
-    	$localobject3->addline('Line 5', 6.36, 3, 21);
-    	print __METHOD__." id=".$facid." total_ttc=".$localobject3->total_ttc."\n";
-    	$this->assertEquals(95.40, $localobject3->total_ht);
-    	$this->assertEquals(20.03, $localobject3->total_tva);
-    	$this->assertEquals(115.43, $localobject3->total_ttc);
-    }
+		$localobject3=new Facture($this->savdb);
+		$localobject3->initAsSpecimen('nolines');
+		$facid=$localobject3->create($user);
+		$localobject3->addline('Line 1', 6.36, 3, 21);
+		$localobject3->addline('Line 2', 6.36, 3, 21);
+		$localobject3->addline('Line 3', 6.36, 3, 21);
+		$localobject3->addline('Line 4', 6.36, 3, 21);
+		$localobject3->addline('Line 5', 6.36, 3, 21);
+		print __METHOD__." id=".$facid." total_ttc=".$localobject3->total_ttc."\n";
+		$this->assertEquals(95.40, $localobject3->total_ht);
+		$this->assertEquals(20.03, $localobject3->total_tva);
+		$this->assertEquals(115.43, $localobject3->total_ttc);
+	}
 }
diff --git a/test/phpunit/FichinterTest.php b/test/phpunit/FichinterTest.php
index f78e9250471..b2b0b3daf91 100644
--- a/test/phpunit/FichinterTest.php
+++ b/test/phpunit/FichinterTest.php
@@ -29,8 +29,7 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/fichinter/class/fichinter.class.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -75,181 +74,181 @@ class FichinterTest extends PHPUnit\Framework\TestCase
 	}
 
 	/**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testFichinterCreate
-     *
-     * @return	int
-     */
-    public function testFichinterCreate()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testFichinterCreate
+	 *
+	 * @return	int
+	 */
+	public function testFichinterCreate()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new Fichinter($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+		$localobject->initAsSpecimen();
+		$result=$localobject->create($user);
 
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-    	return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testFichinterFetch
-     *
-     * @param	int		$id		Id of intervention
-     * @return	int
-     *
-     * @depends	testFichinterCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testFichinterFetch($id)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testFichinterFetch
+	 *
+	 * @param	int		$id		Id of intervention
+	 * @return	int
+	 *
+	 * @depends	testFichinterCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testFichinterFetch($id)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new Fichinter($this->savdb);
-    	$result=$localobject->fetch($id);
+		$result=$localobject->fetch($id);
 
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-    	return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testFichinterValid
-     *
-     * @param	Fichinter		$localobject		Intervention
-     * @return	int
-     *
-     * @depends	testFichinterFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testFichinterValid($localobject)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testFichinterValid
+	 *
+	 * @param	Fichinter		$localobject		Intervention
+	 * @return	int
+	 *
+	 * @depends	testFichinterFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testFichinterValid($localobject)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
-    	$result=$localobject->setValid($user);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$result=$localobject->setValid($user);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
-    }
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
 
-    /**
-     * testFichinterValid
-     *
-     * @param	Object	$localobject	Object intervention
-     * @return	int
-     *
-     * @depends testFichinterValid
-     * The depends says test is run only if previous is ok
-     */
-    public function testFichinterOther($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testFichinterValid
+	 *
+	 * @param	Object	$localobject	Object intervention
+	 * @return	int
+	 *
+	 * @depends testFichinterValid
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testFichinterOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        /*$result=$localobject->setstatus(0);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        */
+		/*$result=$localobject->setstatus(0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		*/
 
-        $localobject->info($localobject->id);
-        print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
-        $this->assertNotEquals($localobject->date_creation, '');
+		$localobject->info($localobject->id);
+		print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
+		$this->assertNotEquals($localobject->date_creation, '');
 
-        return $localobject->id;
-    }
+		return $localobject->id;
+	}
 
-    /**
-     * testFichinterDelete
-     *
-     * @param	int		$id		Id of intervention
-     * @return	int
-     *
-     * @depends	testFichinterOther
-     * The depends says test is run only if previous is ok
-     */
-    public function testFichinterDelete($id)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testFichinterDelete
+	 *
+	 * @param	int		$id		Id of intervention
+	 * @return	int
+	 *
+	 * @depends	testFichinterOther
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testFichinterDelete($id)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new Fichinter($this->savdb);
-    	$result=$localobject->fetch($id);
+		$result=$localobject->fetch($id);
 		$result=$localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $result;
-    }
+		$this->assertLessThan($result, 0);
+		return $result;
+	}
 }
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index ae8ea17efb6..5d73067760d 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -32,8 +32,7 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/files.lib.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -77,97 +76,97 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
 		print "\n";
 	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
 
 	/**
-     * testDolBasename
-     *
-     * @return	void
-     */
-    public function testDolBasename()
-    {
-    	global $conf,$user,$langs,$db;
+	 * testDolBasename
+	 *
+	 * @return	void
+	 */
+	public function testDolBasename()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
-        $result=dol_basename('adir/afile');
-    	print __METHOD__." result=".$result."\n";
+		$result=dol_basename('adir/afile');
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('afile', $result);
 
 		$result=dol_basename('adir/afile/');
-    	print __METHOD__." result=".$result."\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('afile', $result);
 
 		$result=dol_basename('adir/νεο');    // With cyrillic data. Here basename fails to return correct value
-    	print __METHOD__." result=".$result."\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('νεο', $result);
 
 		$result=dol_basename('adir/νεο/');    // With cyrillic data. Here basename fails to return correct value
-    	print __METHOD__." result=".$result."\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('νεο', $result);
-    }
+	}
 
 
-    /**
-     * testDolCountNbOfLine
-     *
-     * @return	int
-     */
-    public function testDolCountNbOfLine()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testDolCountNbOfLine
+	 *
+	 * @return	int
+	 */
+	public function testDolCountNbOfLine()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -175,20 +174,20 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
 
 		$file=dirname(__FILE__).'/Example_import_company_1.csv';
 		$result=dol_count_nb_of_line($file);
-    	print __METHOD__." result=".$result."\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(3, $result);
 
 		return $result;
-    }
+	}
 
-    /**
-     * testDolIsFileDir
-     *
-     * @return	int
-     */
-    public function testDolIsFileDir()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testDolIsFileDir
+	 *
+	 * @return	int
+	 */
+	public function testDolIsFileDir()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -197,322 +196,322 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
 		$file=dirname(__FILE__).'/Example_import_company_1.csv';
 
 		$result=dol_is_file($file);
-    	print __METHOD__." result=".$result."\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertTrue($result);
 
 		$result=dol_is_dir($file);
-    	print __METHOD__." result=".$result."\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertFalse($result);
 
 		return $result;
-    }
+	}
 
-    /**
-     * testDolOther
-     *
-     * @return boolean
-    */
-    public function testDolOther()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testDolOther
+	 *
+	 * @return boolean
+	*/
+	public function testDolOther()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $url='http://www.dolibarr.org';
-  		$result=dol_is_url($url);
-        print __METHOD__." result=".$result."\n";
-        $this->assertTrue($result);
+		$url='http://www.dolibarr.org';
+		$result=dol_is_url($url);
+		print __METHOD__." result=".$result."\n";
+		$this->assertTrue($result);
 
-        $url='https://www.dolibarr.org';
-  		$result=dol_is_url($url);
-        print __METHOD__." result=".$result."\n";
-        $this->assertTrue($result);
+		$url='https://www.dolibarr.org';
+		$result=dol_is_url($url);
+		print __METHOD__." result=".$result."\n";
+		$this->assertTrue($result);
 
-        $url='file://www.dolibarr.org/download/file.zip';
-        $result=dol_is_url($url);
-        print __METHOD__." result=".$result."\n";
-        $this->assertTrue($result);
+		$url='file://www.dolibarr.org/download/file.zip';
+		$result=dol_is_url($url);
+		print __METHOD__." result=".$result."\n";
+		$this->assertTrue($result);
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testDolMimeType
-     *
-     * @return	void
-     */
-    public function testDolMimeType()
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+	/**
+	 * testDolMimeType
+	 *
+	 * @return	void
+	 */
+	public function testDolMimeType()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-    	// file.png
-    	$result=dol_mimetype('file.png', '', 0);
-    	$this->assertEquals('image/png', $result);
-    	$result=dol_mimetype('file.png', '', 1);
-    	$this->assertEquals('png', $result);
-    	$result=dol_mimetype('file.png', '', 2);
-    	$this->assertEquals('image.png', $result);
-    	$result=dol_mimetype('file.png', '', 3);
-    	$this->assertEquals('', $result);
-    	// file.odt
-    	$result=dol_mimetype('file.odt', '', 0);
-    	$this->assertEquals('application/vnd.oasis.opendocument.text', $result);
-    	$result=dol_mimetype('file.odt', '', 1);
-    	$this->assertEquals('vnd.oasis.opendocument.text', $result);
-    	$result=dol_mimetype('file.odt', '', 2);
-    	$this->assertEquals('ooffice.png', $result);
-    	$result=dol_mimetype('file.odt', '', 3);
-    	$this->assertEquals('', $result);
-    	// file.php
-    	$result=dol_mimetype('file.php', '', 0);
-    	$this->assertEquals('text/plain', $result);
-    	$result=dol_mimetype('file.php', '', 1);
-    	$this->assertEquals('plain', $result);
-    	$result=dol_mimetype('file.php', '', 2);
-    	$this->assertEquals('php.png', $result);
-    	$result=dol_mimetype('file.php', '', 3);
-    	$this->assertEquals('php', $result);
-    	// file.php.noexe
-    	$result=dol_mimetype('file.php.noexe', '', 0);
-    	$this->assertEquals('text/plain', $result);
-    }
+		// file.png
+		$result=dol_mimetype('file.png', '', 0);
+		$this->assertEquals('image/png', $result);
+		$result=dol_mimetype('file.png', '', 1);
+		$this->assertEquals('png', $result);
+		$result=dol_mimetype('file.png', '', 2);
+		$this->assertEquals('image.png', $result);
+		$result=dol_mimetype('file.png', '', 3);
+		$this->assertEquals('', $result);
+		// file.odt
+		$result=dol_mimetype('file.odt', '', 0);
+		$this->assertEquals('application/vnd.oasis.opendocument.text', $result);
+		$result=dol_mimetype('file.odt', '', 1);
+		$this->assertEquals('vnd.oasis.opendocument.text', $result);
+		$result=dol_mimetype('file.odt', '', 2);
+		$this->assertEquals('ooffice.png', $result);
+		$result=dol_mimetype('file.odt', '', 3);
+		$this->assertEquals('', $result);
+		// file.php
+		$result=dol_mimetype('file.php', '', 0);
+		$this->assertEquals('text/plain', $result);
+		$result=dol_mimetype('file.php', '', 1);
+		$this->assertEquals('plain', $result);
+		$result=dol_mimetype('file.php', '', 2);
+		$this->assertEquals('php.png', $result);
+		$result=dol_mimetype('file.php', '', 3);
+		$this->assertEquals('php', $result);
+		// file.php.noexe
+		$result=dol_mimetype('file.php.noexe', '', 0);
+		$this->assertEquals('text/plain', $result);
+	}
 
 
-    /**
-     * testDolDeleteDir
-     *
-     * @return	void
-     */
-    public function testDolDeleteDir()
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+	/**
+	 * testDolDeleteDir
+	 *
+	 * @return	void
+	 */
+	public function testDolDeleteDir()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-    	$dirout=$conf->admin->dir_temp.'/test';
-    	$dirout2=$conf->admin->dir_temp.'/test2';
+		$dirout=$conf->admin->dir_temp.'/test';
+		$dirout2=$conf->admin->dir_temp.'/test2';
 
-    	$count=0;
-    	$result=dol_delete_dir_recursive($dirout, $count);	// If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThanOrEqual(0, $result);
+		$count=0;
+		$result=dol_delete_dir_recursive($dirout, $count);	// If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThanOrEqual(0, $result);
 
-    	$count=0;
-    	$countdeleted=0;
-    	$result=dol_delete_dir_recursive($dirout, $count, 1, 0, $countdeleted);	// If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThanOrEqual(0, $result);
-    	$this->assertGreaterThanOrEqual(0, $countdeleted);
+		$count=0;
+		$countdeleted=0;
+		$result=dol_delete_dir_recursive($dirout, $count, 1, 0, $countdeleted);	// If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThanOrEqual(0, $result);
+		$this->assertGreaterThanOrEqual(0, $countdeleted);
 
-    	dol_mkdir($dirout2);
-    	$count=0;
-    	$countdeleted=0;
-    	$result=dol_delete_dir_recursive($dirout2, $count, 1, 0, $countdeleted);	// If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThanOrEqual(1, $result);
-    	$this->assertGreaterThanOrEqual(1, $countdeleted);
-    }
+		dol_mkdir($dirout2);
+		$count=0;
+		$countdeleted=0;
+		$result=dol_delete_dir_recursive($dirout2, $count, 1, 0, $countdeleted);	// If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThanOrEqual(1, $result);
+		$this->assertGreaterThanOrEqual(1, $countdeleted);
+	}
 
 
-    /**
-     * testDolCopyMoveDelete
-     *
-     * @return	void
-     */
-    public function testDolCopyMoveDelete()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testDolCopyMoveDelete
+	 *
+	 * @return	void
+	 */
+	public function testDolCopyMoveDelete()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $file=dirname(__FILE__).'/Example_import_company_1.csv';
+		$file=dirname(__FILE__).'/Example_import_company_1.csv';
 
-        $result=dol_copy($file, '/adir/that/does/not/exists/file.csv');
-        print __METHOD__." result=".$result."\n";
-        $this->assertLessThan(0, $result, 'copy dir that does not exists');    // We should have error
+		$result=dol_copy($file, '/adir/that/does/not/exists/file.csv');
+		print __METHOD__." result=".$result."\n";
+		$this->assertLessThan(0, $result, 'copy dir that does not exists');    // We should have error
 
-        $result=dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 1);
-        print __METHOD__." result=".$result."\n";
-        $this->assertGreaterThanOrEqual(1, $result, 'copy file ('.$file.') into a dir that exists ('.$conf->admin->dir_temp.'/file.csv)');    // Should be 1
+		$result=dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThanOrEqual(1, $result, 'copy file ('.$file.') into a dir that exists ('.$conf->admin->dir_temp.'/file.csv)');    // Should be 1
 
-        // Again to test with overwriting=0
-        $result=dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 0);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(0, $result, 'copy destination already exists, no overwrite');    // Should be 0
+		// Again to test with overwriting=0
+		$result=dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 0);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(0, $result, 'copy destination already exists, no overwrite');    // Should be 0
 
-        // Again to test with overwriting=1
-        $result=dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 1);
-        print __METHOD__." result=".$result."\n";
-        $this->assertGreaterThanOrEqual(1, $result, 'copy destination already exists, overwrite');    // Should be 1
+		// Again to test with overwriting=1
+		$result=dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThanOrEqual(1, $result, 'copy destination already exists, overwrite');    // Should be 1
 
-        // To test a move that should work
-        $result=dol_move($conf->admin->dir_temp.'/file.csv', $conf->admin->dir_temp.'/file2.csv', 0, 1);
-        print __METHOD__." result=".$result."\n";
-        $this->assertTrue($result, 'move with default mask');
+		// To test a move that should work
+		$result=dol_move($conf->admin->dir_temp.'/file.csv', $conf->admin->dir_temp.'/file2.csv', 0, 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertTrue($result, 'move with default mask');
 
-        // To test a move that should work with forced mask
-        $result=dol_move($conf->admin->dir_temp.'/file2.csv', $conf->admin->dir_temp.'/file3.csv', '0754', 1); // file should be rwxr-wr--
-        print __METHOD__." result=".$result."\n";
-        $this->assertTrue($result, 'move with forced mask');
+		// To test a move that should work with forced mask
+		$result=dol_move($conf->admin->dir_temp.'/file2.csv', $conf->admin->dir_temp.'/file3.csv', '0754', 1); // file should be rwxr-wr--
+		print __METHOD__." result=".$result."\n";
+		$this->assertTrue($result, 'move with forced mask');
 
-        // To test a delete that should success
-        $result=dol_delete_file($conf->admin->dir_temp.'/file3.csv');
-        print __METHOD__." result=".$result."\n";
-        $this->assertTrue($result, 'delete file');
+		// To test a delete that should success
+		$result=dol_delete_file($conf->admin->dir_temp.'/file3.csv');
+		print __METHOD__." result=".$result."\n";
+		$this->assertTrue($result, 'delete file');
 
-        // Again to test there is error when deleting a non existing file with option disableglob
-        $result=dol_delete_file($conf->admin->dir_temp.'/file3.csv', 1, 1);
-        print __METHOD__." result=".$result."\n";
-        $this->assertFalse($result, 'delete file that does not exists with disableglo must return ko');
+		// Again to test there is error when deleting a non existing file with option disableglob
+		$result=dol_delete_file($conf->admin->dir_temp.'/file3.csv', 1, 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertFalse($result, 'delete file that does not exists with disableglo must return ko');
 
-        // Again to test there is no error when deleting a non existing file without option disableglob
-        $result=dol_delete_file($conf->admin->dir_temp.'/file3csv', 0, 1);
-        print __METHOD__." result=".$result."\n";
-        $this->assertTrue($result, 'delete file that does not exists without disabling glob must return ok');
+		// Again to test there is no error when deleting a non existing file without option disableglob
+		$result=dol_delete_file($conf->admin->dir_temp.'/file3csv', 0, 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertTrue($result, 'delete file that does not exists without disabling glob must return ok');
 
-        // Test copy with special char / delete with blob
-        $result=dol_copy($file, $conf->admin->dir_temp.'/file with [x] and é.csv', 0, 1);
-        print __METHOD__." result=".$result."\n";
-        $this->assertGreaterThanOrEqual(1, $result, 'copy file with special chars, overwrite');    // Should be 1
+		// Test copy with special char / delete with blob
+		$result=dol_copy($file, $conf->admin->dir_temp.'/file with [x] and é.csv', 0, 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThanOrEqual(1, $result, 'copy file with special chars, overwrite');    // Should be 1
 
-        // Try to delete using a glob criteria
-        $result=dol_delete_file($conf->admin->dir_temp.'/file with [x]*é.csv');
-        print __METHOD__." result=".$result."\n";
-        $this->assertTrue($result, 'delete file using glob');
-    }
+		// Try to delete using a glob criteria
+		$result=dol_delete_file($conf->admin->dir_temp.'/file with [x]*é.csv');
+		print __METHOD__." result=".$result."\n";
+		$this->assertTrue($result, 'delete file using glob');
+	}
 
-    /**
-     * testDolCompressUnCompress
-     *
-     * @return	void
-     */
-    public function testDolCompressUnCompress()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testDolCompressUnCompress
+	 *
+	 * @return	void
+	 */
+	public function testDolCompressUnCompress()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $format='zip';
-        $filein=dirname(__FILE__).'/Example_import_company_1.csv';
-        $fileout=$conf->admin->dir_temp.'/test.'.$format;
-        $dirout=$conf->admin->dir_temp.'/test';
+		$format='zip';
+		$filein=dirname(__FILE__).'/Example_import_company_1.csv';
+		$fileout=$conf->admin->dir_temp.'/test.'.$format;
+		$dirout=$conf->admin->dir_temp.'/test';
 
-        dol_delete_file($fileout);
-        $count=0;
-        dol_delete_dir_recursive($dirout, $count, 1);
+		dol_delete_file($fileout);
+		$count=0;
+		dol_delete_dir_recursive($dirout, $count, 1);
 
-        $errorstring = '';
+		$errorstring = '';
 
-        dol_mkdir($conf->admin->dir_temp);
-        $conf->global->MAIN_ENABLE_LOG_TO_HTML=1; $conf->syslog->enabled=1; $_REQUEST['logtohtml']=1;
-        $conf->logbuffer=array();
+		dol_mkdir($conf->admin->dir_temp);
+		$conf->global->MAIN_ENABLE_LOG_TO_HTML=1; $conf->syslog->enabled=1; $_REQUEST['logtohtml']=1;
+		$conf->logbuffer=array();
 
-        $result=dol_compress_file($filein, $fileout, $format, $errorstring);
-        print __METHOD__." result=".$result."\n";
-        print join(', ', $conf->logbuffer);
-        $this->assertGreaterThanOrEqual(1, $result, "Pb with dol_compress_file on ".$filein." into ".$fileout." : ".$errorstring);
+		$result=dol_compress_file($filein, $fileout, $format, $errorstring);
+		print __METHOD__." result=".$result."\n";
+		print join(', ', $conf->logbuffer);
+		$this->assertGreaterThanOrEqual(1, $result, "Pb with dol_compress_file on ".$filein." into ".$fileout." : ".$errorstring);
 
-        $result=dol_uncompress($fileout, $dirout);
-        print __METHOD__." result=".join(',', $result)."\n";
-        $this->assertEquals(0, count($result), "Pb with dol_uncompress_file of file ".$fileout);
-    }
+		$result=dol_uncompress($fileout, $dirout);
+		print __METHOD__." result=".join(',', $result)."\n";
+		$this->assertEquals(0, count($result), "Pb with dol_uncompress_file of file ".$fileout);
+	}
 
-    /**
-     * testDolDirList
-     *
-     * @return	void
-     *
-     * @depends	testDolCompressUnCompress
-     * The depends says test is run only if previous is ok
-     */
-    public function testDolDirList()
-    {
-        global $conf,$user,$langs,$db;
+	/**
+	 * testDolDirList
+	 *
+	 * @return	void
+	 *
+	 * @depends	testDolCompressUnCompress
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testDolDirList()
+	{
+		global $conf,$user,$langs,$db;
 
-        // Scan dir to guaruante we on't have library jquery twice (we accept exception of duplicte into ckeditor because all dir is removed for debian package, so there is no duplicate).
-        $founddirs=dol_dir_list(DOL_DOCUMENT_ROOT.'/includes/', 'files', 1, '^jquery\.js', array('ckeditor'));
-        print __METHOD__." count(founddirs)=".count($founddirs)."\n";
-        $this->assertEquals(1, count($founddirs));
-    }
+		// Scan dir to guaruante we on't have library jquery twice (we accept exception of duplicte into ckeditor because all dir is removed for debian package, so there is no duplicate).
+		$founddirs=dol_dir_list(DOL_DOCUMENT_ROOT.'/includes/', 'files', 1, '^jquery\.js', array('ckeditor'));
+		print __METHOD__." count(founddirs)=".count($founddirs)."\n";
+		$this->assertEquals(1, count($founddirs));
+	}
 
 
-    /**
-     * testDolCheckSecureAccessDocument
-     *
-     * @return void
-     */
-    public function testDolCheckSecureAccessDocument()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testDolCheckSecureAccessDocument
+	 *
+	 * @return void
+	 */
+	public function testDolCheckSecureAccessDocument()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
 
-        //$dummyuser=new User($db);
-        //$result=restrictedArea($dummyuser,'societe');
+		//$dummyuser=new User($db);
+		//$result=restrictedArea($dummyuser,'societe');
 
-        // We save user properties
-        $savpermlire = $user->rights->facture->lire;
-        $savpermcreer = $user->rights->facture->creer;
+		// We save user properties
+		$savpermlire = $user->rights->facture->lire;
+		$savpermcreer = $user->rights->facture->creer;
 
 
 		// Check access to SPECIMEN
-        $user->rights->facture->lire = 0;
-        $user->rights->facture->creer = 0;
-        $filename='SPECIMEN.pdf';             // Filename relative to module part
-        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
-        $this->assertEquals(1, $result['accessallowed']);
+		$user->rights->facture->lire = 0;
+		$user->rights->facture->creer = 0;
+		$filename='SPECIMEN.pdf';             // Filename relative to module part
+		$result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
+		$this->assertEquals(1, $result['accessallowed']);
 
 
-        // Check read permission
-        $user->rights->facture->lire = 1;
-        $user->rights->facture->creer = 1;
-        $filename='FA010101/FA010101.pdf';    // Filename relative to module part
-        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
-        $this->assertEquals(1, $result['accessallowed']);
+		// Check read permission
+		$user->rights->facture->lire = 1;
+		$user->rights->facture->creer = 1;
+		$filename='FA010101/FA010101.pdf';    // Filename relative to module part
+		$result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
+		$this->assertEquals(1, $result['accessallowed']);
 
-        $user->rights->facture->lire = 0;
-        $user->rights->facture->creer = 0;
-        $filename='FA010101/FA010101.pdf';    // Filename relative to module part
-        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
-        $this->assertEquals(0, $result['accessallowed']);
+		$user->rights->facture->lire = 0;
+		$user->rights->facture->creer = 0;
+		$filename='FA010101/FA010101.pdf';    // Filename relative to module part
+		$result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
+		$this->assertEquals(0, $result['accessallowed']);
 
-        // Check write permission
-        $user->rights->facture->lire = 0;
-        $user->rights->facture->creer = 0;
-        $filename='FA010101/FA010101.pdf';    // Filename relative to module part
-        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
-        $this->assertEquals(0, $result['accessallowed']);
+		// Check write permission
+		$user->rights->facture->lire = 0;
+		$user->rights->facture->creer = 0;
+		$filename='FA010101/FA010101.pdf';    // Filename relative to module part
+		$result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
+		$this->assertEquals(0, $result['accessallowed']);
 
-        $user->rights->facture->lire = 1;
-        $user->rights->facture->creer = 1;
-        $filename='FA010101/FA010101.pdf';    // Filename relative to module part
-        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
-        $this->assertEquals(1, $result['accessallowed']);
+		$user->rights->facture->lire = 1;
+		$user->rights->facture->creer = 1;
+		$filename='FA010101/FA010101.pdf';    // Filename relative to module part
+		$result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
+		$this->assertEquals(1, $result['accessallowed']);
 
-        $user->rights->facture->lire = 1;
-        $user->rights->facture->creer = 0;
-        $filename='FA010101/FA010101.pdf';    // Filename relative to module part
-        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
-        $this->assertEquals(0, $result['accessallowed']);
+		$user->rights->facture->lire = 1;
+		$user->rights->facture->creer = 0;
+		$filename='FA010101/FA010101.pdf';    // Filename relative to module part
+		$result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
+		$this->assertEquals(0, $result['accessallowed']);
 
 
-        // We restore user properties
-        $user->rights->facture->lire = $savpermlire;
-        $user->rights->facture->creer = $savpermcreer;
-    }
+		// We restore user properties
+		$user->rights->facture->lire = $savpermlire;
+		$user->rights->facture->creer = $savpermcreer;
+	}
 }
diff --git a/test/phpunit/FormAdminTest.php b/test/phpunit/FormAdminTest.php
index a434841930c..79019e1e7ed 100644
--- a/test/phpunit/FormAdminTest.php
+++ b/test/phpunit/FormAdminTest.php
@@ -29,8 +29,7 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/class/html.formadmin.class.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -75,75 +74,75 @@ class FormAdminTest extends PHPUnit\Framework\TestCase
 	}
 
 	/**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * End phpunit tests
 	 *
-     * @return	void
-     */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	 * @return	void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testSelectPaperFormat
-     *
-     * @return int
-     */
-    public function testSelectPaperFormat()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testSelectPaperFormat
+	 *
+	 * @return int
+	 */
+	public function testSelectPaperFormat()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new FormAdmin($this->savdb);
-    	$result=$localobject->select_paper_format('', 'paperformat_id', 'A4');
+		$result=$localobject->select_paper_format('', 'paperformat_id', 'A4');
 
-    	$this->assertEquals($result, '<select class="flat" id="paperformat_id" name="paperformat_id"><option value="EUA4">Format A4 - 210x297 mm</option></select>');
-    	print __METHOD__." result=".$result."\n";
-    	return $result;
-    }
+		$this->assertEquals($result, '<select class="flat" id="paperformat_id" name="paperformat_id"><option value="EUA4">Format A4 - 210x297 mm</option></select>');
+		print __METHOD__." result=".$result."\n";
+		return $result;
+	}
 }
diff --git a/test/phpunit/FormTest.php b/test/phpunit/FormTest.php
index 76e7c4e69a8..3345c7ddd1e 100644
--- a/test/phpunit/FormTest.php
+++ b/test/phpunit/FormTest.php
@@ -29,8 +29,7 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/class/html.form.class.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -75,46 +74,46 @@ class FormTest extends PHPUnit\Framework\TestCase
 	}
 
 	/**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-  	public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * End phpunit tests
@@ -122,18 +121,18 @@ class FormTest extends PHPUnit\Framework\TestCase
 	 * @return	void
 	 */
 	protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testSelectProduitsList
-     *
-     * @return int
-     */
-    public function testSelectProduitsList()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testSelectProduitsList
+	 *
+	 * @return int
+	 */
+	public function testSelectProduitsList()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -142,16 +141,16 @@ class FormTest extends PHPUnit\Framework\TestCase
 		$localobject=new Form($this->savdb);
 		$result=$localobject->select_produits_list('', 'productid', '', 5, 0, '', 1, 2, 1);
 
-    	$this->assertEquals(count($result), 5);
-    	print __METHOD__." count result=".count($result)."\n";
+		$this->assertEquals(count($result), 5);
+		print __METHOD__." count result=".count($result)."\n";
 
-    	$conf->global->ENTREPOT_EXTRA_STATUS = 1;
+		$conf->global->ENTREPOT_EXTRA_STATUS = 1;
 
-    	// Exclude stock in warehouseinternal
-    	$result=$localobject->select_produits_list('', 'productid', '', 5, 0, '', 1, 2, 1, 0, '1', 0, '', 0, 'warehouseclosed,warehouseopen');
-    	$this->assertEquals(count($result), 5);
-    	print __METHOD__." count result=".count($result)."\n";
+		// Exclude stock in warehouseinternal
+		$result=$localobject->select_produits_list('', 'productid', '', 5, 0, '', 1, 2, 1, 0, '1', 0, '', 0, 'warehouseclosed,warehouseopen');
+		$this->assertEquals(count($result), 5);
+		print __METHOD__." count result=".count($result)."\n";
 
-    	return $result;
-    }
+		return $result;
+	}
 }
diff --git a/test/phpunit/Functions2LibTest.php b/test/phpunit/Functions2LibTest.php
index be050b83b4f..db131fee67c 100644
--- a/test/phpunit/Functions2LibTest.php
+++ b/test/phpunit/Functions2LibTest.php
@@ -29,16 +29,36 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/functions2.lib.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+if (! defined('NOREQUIREUSER')) {
+	define('NOREQUIREUSER', '1');
+}
+if (! defined('NOREQUIREDB')) {
+	define('NOREQUIREDB', '1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (! defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', '1');
+}
+if (! defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1'); // If there is no menu to show
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (! defined("NOLOGIN")) {
+	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+}
 
 
 /**
@@ -50,216 +70,216 @@ if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page i
  */
 class Functions2LibTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return CoreTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return CoreTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        //$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		//$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        //$db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		//$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
 
-    /**
-     * testJsUnEscape
-     *
-     * @return void
-     */
-    public function testJsUnEscape()
-    {
-        $result=jsUnEscape('%u03BD%u03B5%u03BF');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('νεο', $result);
-    }
+	/**
+	 * testJsUnEscape
+	 *
+	 * @return void
+	 */
+	public function testJsUnEscape()
+	{
+		$result=jsUnEscape('%u03BD%u03B5%u03BF');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('νεο', $result);
+	}
 
-    /**
-     * testIsValidMailDomain
-     *
-     * @return void
-     */
-    public function testIsValidMailDomain()
-    {
-    	$mail = 'bidon@unvalid.unvalid';
-    	$result = isValidMailDomain($mail);
-    	$this->assertEquals(0, $result, 'Email isValidMailDomain('.$mail.') should return 0 (not valid) but returned '.$result);
+	/**
+	 * testIsValidMailDomain
+	 *
+	 * @return void
+	 */
+	public function testIsValidMailDomain()
+	{
+		$mail = 'bidon@unvalid.unvalid';
+		$result = isValidMailDomain($mail);
+		$this->assertEquals(0, $result, 'Email isValidMailDomain('.$mail.') should return 0 (not valid) but returned '.$result);
 
-    	$mail = 'bidon@dolibarr.org';
-    	$result = isValidMailDomain($mail);
-    	$this->assertEquals(1, $result, 'Email isValidMailDomain('.$mail.') should return 1 (valid) but returned '.$result);
-    }
+		$mail = 'bidon@dolibarr.org';
+		$result = isValidMailDomain($mail);
+		$this->assertEquals(1, $result, 'Email isValidMailDomain('.$mail.') should return 1 (valid) but returned '.$result);
+	}
 
-    /**
-     * testIsValidURL
-     *
-     * @return	void
-     */
-    public function testIsValidUrl()
-    {
-	    //Simple check
-	    $result = isValidUrl('http://google.com');
-	    $this->assertEquals(1, $result);
+	/**
+	 * testIsValidURL
+	 *
+	 * @return	void
+	 */
+	public function testIsValidUrl()
+	{
+		//Simple check
+		$result = isValidUrl('http://google.com');
+		$this->assertEquals(1, $result);
 
-	    $result = isValidUrl('goo=gle');	// This is good, it might be an alias of hostname
-	    $this->assertEquals(1, $result);
+		$result = isValidUrl('goo=gle');	// This is good, it might be an alias of hostname
+		$this->assertEquals(1, $result);
 
-	    //With scheme check
-    	$result = isValidUrl('http://www.google.com', 1);
-	    $this->assertEquals(1, $result);
+		//With scheme check
+		$result = isValidUrl('http://www.google.com', 1);
+		$this->assertEquals(1, $result);
 
-	    $result = isValidUrl('ftp://www.google.com', 1);
-	    $this->assertEquals(0, $result);
+		$result = isValidUrl('ftp://www.google.com', 1);
+		$this->assertEquals(0, $result);
 
-	    //With password check invalid. This test should be ko but currently it is not
-	    //$result = isValidUrl('http://user:password@http://www.google.com', 1, 1);
-	    //$this->assertEquals(0, $result);
+		//With password check invalid. This test should be ko but currently it is not
+		//$result = isValidUrl('http://user:password@http://www.google.com', 1, 1);
+		//$this->assertEquals(0, $result);
 
-	    //With password check valid
-	    $result = isValidUrl('http://user:password@www.google.com', 1, 1);
-	    $this->assertEquals(1, $result);
+		//With password check valid
+		$result = isValidUrl('http://user:password@www.google.com', 1, 1);
+		$this->assertEquals(1, $result);
 
-	    $result = isValidUrl('http://www.google.com', 1, 1);
-	    $this->assertEquals(0, $result);
+		$result = isValidUrl('http://www.google.com', 1, 1);
+		$this->assertEquals(0, $result);
 
-	    //With port check
-	    $result = isValidUrl('http://google.com:8080', 0, 0, 1);
-	    $this->assertEquals(1, $result);
+		//With port check
+		$result = isValidUrl('http://google.com:8080', 0, 0, 1);
+		$this->assertEquals(1, $result);
 
-	    $result = isValidUrl('http://google.com', 0, 0, 1);
-	    $this->assertEquals(0, $result);
+		$result = isValidUrl('http://google.com', 0, 0, 1);
+		$this->assertEquals(0, $result);
 
-	    //With path check
-	    $result = isValidUrl('http://google.com/search', 0, 0, 0, 1);
-	    $this->assertEquals(1, $result);
+		//With path check
+		$result = isValidUrl('http://google.com/search', 0, 0, 0, 1);
+		$this->assertEquals(1, $result);
 
-	    $result = isValidUrl('http://google.com', 0, 0, 0, 0);
-	    $this->assertEquals(1, $result);
+		$result = isValidUrl('http://google.com', 0, 0, 0, 0);
+		$this->assertEquals(1, $result);
 
-	    //With query check
-	    $result = isValidUrl('http://google.com/search?test=test', 0, 0, 0, 0, 1);
-	    $this->assertEquals(1, $result);
+		//With query check
+		$result = isValidUrl('http://google.com/search?test=test', 0, 0, 0, 0, 1);
+		$this->assertEquals(1, $result);
 
-	    //With query check
-	    $result = isValidUrl('http://google.com?test=test', 0, 0, 0, 0, 1);
-	    $this->assertEquals(1, $result);
+		//With query check
+		$result = isValidUrl('http://google.com?test=test', 0, 0, 0, 0, 1);
+		$this->assertEquals(1, $result);
 
-	    $result = isValidUrl('http://google.com', 0, 0, 0, 0, 1);
-	    $this->assertEquals(0, $result);
+		$result = isValidUrl('http://google.com', 0, 0, 0, 0, 1);
+		$this->assertEquals(0, $result);
 
-	    //With anchor check
-	    $result = isValidUrl('http://google.com/search#done', 0, 0, 0, 0, 0, 1);
-	    $this->assertEquals(1, $result);
+		//With anchor check
+		$result = isValidUrl('http://google.com/search#done', 0, 0, 0, 0, 0, 1);
+		$this->assertEquals(1, $result);
 
-	    $result = isValidUrl('http://google.com/search', 0, 0, 0, 0, 0, 1);
-	    $this->assertEquals(0, $result);
-    }
+		$result = isValidUrl('http://google.com/search', 0, 0, 0, 0, 0, 1);
+		$this->assertEquals(0, $result);
+	}
 
-    /**
-     * testIsIP
-     *
-     * @return	void
-     */
-    public function testIsIP()
-    {
-    	// Not valid
-    	$ip='a299.299.299.299';
-    	$result=is_ip($ip);
-        print __METHOD__." for ".$ip." result=".$result."\n";
-    	$this->assertEquals(0, $result, $ip);
+	/**
+	 * testIsIP
+	 *
+	 * @return	void
+	 */
+	public function testIsIP()
+	{
+		// Not valid
+		$ip='a299.299.299.299';
+		$result=is_ip($ip);
+		print __METHOD__." for ".$ip." result=".$result."\n";
+		$this->assertEquals(0, $result, $ip);
 
-    	// Reserved IP range (not checked by is_ip function)
-    	$ip='169.254.0.0';
-    	$result=is_ip($ip);
-        print __METHOD__." for ".$ip." result=".$result."\n";
-    	//$this->assertEquals(2,$result,$ip);      // Assertion disabled because returned value differs between PHP patch version
+		// Reserved IP range (not checked by is_ip function)
+		$ip='169.254.0.0';
+		$result=is_ip($ip);
+		print __METHOD__." for ".$ip." result=".$result."\n";
+		//$this->assertEquals(2,$result,$ip);      // Assertion disabled because returned value differs between PHP patch version
 
-    	$ip='1.2.3.4';
-    	$result=is_ip($ip);
-        print __METHOD__." for ".$ip." result=".$result."\n";
-    	$this->assertEquals(1, $result, $ip);
+		$ip='1.2.3.4';
+		$result=is_ip($ip);
+		print __METHOD__." for ".$ip." result=".$result."\n";
+		$this->assertEquals(1, $result, $ip);
 
-    	// Private IP ranges
-    	$ip='10.0.0.0';
-    	$result=is_ip($ip);
-        print __METHOD__." for ".$ip." result=".$result."\n";
-    	$this->assertEquals(2, $result, $ip);
+		// Private IP ranges
+		$ip='10.0.0.0';
+		$result=is_ip($ip);
+		print __METHOD__." for ".$ip." result=".$result."\n";
+		$this->assertEquals(2, $result, $ip);
 
-    	$ip='172.16.0.0';
-    	$result=is_ip($ip);
-        print __METHOD__." for ".$ip." result=".$result."\n";
-    	$this->assertEquals(2, $result, $ip);
+		$ip='172.16.0.0';
+		$result=is_ip($ip);
+		print __METHOD__." for ".$ip." result=".$result."\n";
+		$this->assertEquals(2, $result, $ip);
 
-        $ip='192.168.0.0';
-        $result=is_ip($ip);
-        print __METHOD__." for ".$ip." result=".$result."\n";
-        $this->assertEquals(2, $result, $ip);
-    }
+		$ip='192.168.0.0';
+		$result=is_ip($ip);
+		print __METHOD__." for ".$ip." result=".$result."\n";
+		$this->assertEquals(2, $result, $ip);
+	}
 }
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index 8dc903642e0..4f6bfb1963e 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -30,16 +30,36 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+if (! defined('NOREQUIREUSER')) {
+	define('NOREQUIREUSER', '1');
+}
+if (! defined('NOREQUIREDB')) {
+	define('NOREQUIREDB', '1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (! defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', '1');
+}
+if (! defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1'); // If there is no menu to show
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (! defined("NOLOGIN")) {
+	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+}
 
 /**
  * Class for PHPUnit tests
@@ -50,1445 +70,1447 @@ if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page i
  */
 class FunctionsLibTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
-
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return CoreTest
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-        //$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
-
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
-
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        //$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
-
-        if (! function_exists('mb_substr')) { print "\n".__METHOD__." function mb_substr must be enabled.\n"; die(); }
-
-        print __METHOD__."\n";
-    }
-
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        //$db->rollback();
-
-        print __METHOD__."\n";
-    }
-
-    /**
-     * Init phpunit tests
-     *
-     * @return	void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        print __METHOD__."\n";
-    }
-
-    /**
-     * End phpunit tests
-     *
-     * @return	void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
-
-    /**
-     * testIsValidEmail
-     *
-     * @return void
-     */
-    public function testIsValidEmail()
-    {
-    	// Nb of line is same than entry text
-
-    	$input="bidon@bademail";
-    	$result=isValidEmail($input);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertFalse($result, 'Check isValidEmail '.$input);
-
-    	$input="test@yahoo.com";
-    	$result=isValidEmail($input);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertTrue($result, 'Check isValidEmail '.$input);
-
-    	$input="The name of sender <test@yahoo.com>";
-    	$result=isValidEmail($input);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertFalse($result, 'Check isValidEmail '.$input);
-
-    	$input="1234.abcdefg@domainame.com.br";
-    	$result=isValidEmail($input);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertTrue($result, 'Check isValidEmail '.$input);
-    }
-
-    /**
-     * testIsValidMXRecord
-     *
-     * @return void
-     */
-    public function testIsValidMXRecord()
-    {
-        // Nb of line is same than entry text
-
-        $input="yahoo.com";
-        $result=isValidMXRecord($input);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(1, $result);
-
-        $input="yhaoo.com";
-        $result=isValidMXRecord($input);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(0, $result);
-
-        $input="dolibarr.fr";
-        $result=isValidMXRecord($input);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(0, $result);
-    }
-
-    /**
-     * testDolGetFirstLineOfText
-     *
-     * @return void
-     */
-    public function testDolGetFirstLineOfText()
-    {
-        // Nb of line is same than entry text
-
-        $input="aaaa";
-        $result=dolGetFirstLineOfText($input);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals("aaaa", $result);
-
-        $input="aaaa\nbbbbbbbbbbbb\n";
-        $result=dolGetFirstLineOfText($input, 2);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals("aaaa\nbbbbbbbbbbbb", $result);
-
-        $input="aaaa<br>bbbbbbbbbbbb<br>";
-        $result=dolGetFirstLineOfText($input, 2);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals("aaaa<br>\nbbbbbbbbbbbb", $result);
-
-        // Nb of line is lower
-
-        $input="aaaa\nbbbbbbbbbbbb\ncccccc\n";
-        $result=dolGetFirstLineOfText($input);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals("aaaa...", $result);
-
-        $input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
-        $result=dolGetFirstLineOfText($input);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals("aaaa...", $result);
-
-        $input="aaaa\nbbbbbbbbbbbb\ncccccc\n";
-        $result=dolGetFirstLineOfText($input, 2);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals("aaaa\nbbbbbbbbbbbb...", $result);
-
-        $input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
-        $result=dolGetFirstLineOfText($input, 2);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals("aaaa<br>\nbbbbbbbbbbbb...", $result);
-
-        // Nb of line is higher
-
-        $input="aaaa<br>bbbbbbbbbbbb<br>cccccc";
-        $result=dolGetFirstLineOfText($input, 100);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals("aaaa<br>\nbbbbbbbbbbbb<br>\ncccccc", $result, 'dolGetFirstLineOfText with nb 100 a');
-
-        $input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
-        $result=dolGetFirstLineOfText($input, 100);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals("aaaa<br>\nbbbbbbbbbbbb<br>\ncccccc", $result, 'dolGetFirstLineOfText with nb 100 b');
-
-        $input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>\n";
-        $result=dolGetFirstLineOfText($input, 100);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals("aaaa<br>\nbbbbbbbbbbbb<br>\ncccccc", $result, 'dolGetFirstLineOfText with nb 100 c');
-    }
-
-
-    /**
-     * testDolBuildPath
-     *
-     * @return void
-     */
-    public function testDolBuildPath()
-    {
-        /*$tmp=dol_buildpath('/google/oauth2callback.php', 0);
-        var_dump($tmp);
-        */
-
-        /*$tmp=dol_buildpath('/google/oauth2callback.php', 1);
-        var_dump($tmp);
-        */
-
-        $result=dol_buildpath('/google/oauth2callback.php', 2);
-        print __METHOD__." result=".$result."\n";
-        $this->assertStringStartsWith('http', $result);
-
-        $result=dol_buildpath('/google/oauth2callback.php', 3);
-        print __METHOD__." result=".$result."\n";
-        $this->assertStringStartsWith('http', $result);
-    }
-
-
-    /**
-    * testGetBrowserInfo
-    *
-    * @return void
-    */
-    public function testGetBrowserInfo()
-    {
-        // MSIE 5.0
-        $user_agent ='Mozilla/4.0 (compatible; MSIE 5.0; Windows 98; DigExt; KITV4 Wanadoo; KITV5 Wanadoo)';
-        $tmp=getBrowserInfo($user_agent);
-        $this->assertEquals('ie', $tmp['browsername']);
-        $this->assertEquals('5.0', $tmp['browserversion']);
-        $this->assertEmpty($tmp['phone']);
-        $this->assertFalse($tmp['tablet']);
-        $this->assertEquals('classic', $tmp['layout']);
-
-        // Firefox 0.9.1
-        $user_agent ='Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.5a) Gecko/20030728 Mozilla Firefox/0.9.1';
-        $tmp=getBrowserInfo($user_agent);
-        $this->assertEquals('firefox', $tmp['browsername']);
-        $this->assertEquals('0.9.1', $tmp['browserversion']);
-        $this->assertEmpty($tmp['phone']);
-        $this->assertFalse($tmp['tablet']);
-        $this->assertEquals('classic', $tmp['layout']);
-
-        $user_agent ='Mozilla/3.0 (Windows 98; U) Opera 6.03  [en]';
-        $tmp=getBrowserInfo($user_agent);
-        $this->assertEquals('opera', $tmp['browsername']);
-        $this->assertEquals('6.03', $tmp['browserversion']);
-        $this->assertEmpty($tmp['phone']);
-        $this->assertFalse($tmp['tablet']);
-        $this->assertEquals('classic', $tmp['layout']);
-
-        $user_agent ='Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.21 (KHTML, like Gecko) Chrome/19.0.1042.0 Safari/535.21';
-        $tmp=getBrowserInfo($user_agent);
-        $this->assertEquals('chrome', $tmp['browsername']);
-        $this->assertEquals('19.0.1042.0', $tmp['browserversion']);
-        $this->assertEmpty($tmp['phone']);
-        $this->assertFalse($tmp['tablet']);
-        $this->assertEquals('classic', $tmp['layout']);
-
-        $user_agent ='chrome (Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.56 Safari/535.11)';
-        $tmp=getBrowserInfo($user_agent);
-        $this->assertEquals('chrome', $tmp['browsername']);
-        $this->assertEquals('17.0.963.56', $tmp['browserversion']);
-        $this->assertEmpty($tmp['phone']);
-        $this->assertFalse($tmp['tablet']);
-        $this->assertEquals('classic', $tmp['layout']);
-
-        $user_agent ='Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_8; de-at) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1';
-        $tmp=getBrowserInfo($user_agent);
-        $this->assertEquals('safari', $tmp['browsername']);
-        $this->assertEquals('533.21.1', $tmp['browserversion']);
-        $this->assertEmpty($tmp['phone']);
-        $this->assertFalse($tmp['tablet']);
-        $this->assertEquals('classic', $tmp['layout']);
-
-        //Internet Explorer 11
-        $user_agent = 'Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv:11.0) like Gecko';
-        $tmp=getBrowserInfo($user_agent);
-        $this->assertEquals('ie', $tmp['browsername']);
-        $this->assertEquals('11.0', $tmp['browserversion']);
-        $this->assertEmpty($tmp['phone']);
-        $this->assertFalse($tmp['tablet']);
-        $this->assertEquals('classic', $tmp['layout']);
-
-        //Internet Explorer 11 bis
-        $user_agent = 'Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; NP06; rv:11.0) like Gecko';
-        $tmp=getBrowserInfo($user_agent);
-        $this->assertEquals('ie', $tmp['browsername']);
-        $this->assertEquals('11.0', $tmp['browserversion']);
-        $this->assertEmpty($tmp['phone']);
-        $this->assertFalse($tmp['tablet']);
-        $this->assertEquals('classic', $tmp['layout']);
-
-        //iPad
-        $user_agent = 'Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5355d Safari/8536.25';
-        $tmp=getBrowserInfo($user_agent);
-        $this->assertEquals('safari', $tmp['browsername']);
-        $this->assertEquals('8536.25', $tmp['browserversion']);
-        $this->assertEquals('ios', $tmp['browseros']);
-        $this->assertEquals('tablet', $tmp['layout']);
-        $this->assertEquals('iphone', $tmp['phone']);
-    }
-
-
-    /**
-     * testGetLanguageCodeFromCountryCode
-     *
-     * @return void
-     */
-    public function testGetLanguageCodeFromCountryCode()
-    {
-        global $mysoc;
-
-        $language = getLanguageCodeFromCountryCode('US');
-        $this->assertEquals('en_US', $language, 'US');
-
-        $language = getLanguageCodeFromCountryCode('ES');
-        $this->assertEquals('es_ES', $language, 'ES');
-
-        $language = getLanguageCodeFromCountryCode('CL');
-        $this->assertEquals('es_CL', $language, 'CL');
-
-        $language = getLanguageCodeFromCountryCode('CA');
-        $this->assertEquals('en_CA', $language, 'CA');
-
-        $language = getLanguageCodeFromCountryCode('MQ');
-        $this->assertEquals('fr_CA', $language);
-
-        $language = getLanguageCodeFromCountryCode('FR');
-        $this->assertEquals('fr_FR', $language);
-
-        $language = getLanguageCodeFromCountryCode('BE');
-        $this->assertEquals('fr_BE', $language);
-
-        $mysoc->country_code = 'FR';
-        $language = getLanguageCodeFromCountryCode('CH');
-        $this->assertEquals('fr_CH', $language);
-
-        $mysoc->country_code = 'DE';
-        $language = getLanguageCodeFromCountryCode('CH');
-        $this->assertEquals('de_CH', $language);
-
-        $language = getLanguageCodeFromCountryCode('DE');
-        $this->assertEquals('de_DE', $language);
-
-        $language = getLanguageCodeFromCountryCode('SA');
-        $this->assertEquals('ar_SA', $language);
-
-        $language = getLanguageCodeFromCountryCode('SE');
-        $this->assertEquals('sv_SE', $language);
-
-        $language = getLanguageCodeFromCountryCode('DK');
-        $this->assertEquals('da_DK', $language);
-    }
-
-    /**
-     * testDolTextIsHtml
-     *
-     * @return void
-     */
-    public function testDolTextIsHtml()
-    {
-        // True
-        $input='<html>xxx</html>';
-        $after=dol_textishtml($input);
-        $this->assertTrue($after, 'Test with html tag');
-        $input='<body>xxx</body>';
-        $after=dol_textishtml($input);
-        $this->assertTrue($after, 'Test with body tag');
-        $input='xxx <b>yyy</b> zzz';
-        $after=dol_textishtml($input);
-        $this->assertTrue($after, 'Test with b tag');
-        $input='xxx <u>yyy</u> zzz';
-        $after=dol_textishtml($input);
-        $this->assertTrue($after, 'Test with u tag');
-        $input='text with <div>some div</div>';
-        $after=dol_textishtml($input);
-        $this->assertTrue($after, 'Test with div tag');
-        $input='text with HTML &nbsp; entities';
-        $after=dol_textishtml($input);
-        $this->assertTrue($after, 'Test with entities tag');
-        $input='xxx<br>';
-        $after=dol_textishtml($input);
-        $this->assertTrue($after, 'Test with entities br');
-        $input='xxx<br >';
-        $after=dol_textishtml($input);
-        $this->assertTrue($after, 'Test with entities br');
-        $input='xxx<br style="eee">';
-        $after=dol_textishtml($input);
-        $this->assertTrue($after, 'Test with entities br and attributes');
-        $input='xxx<br style="eee" >';
-        $after=dol_textishtml($input);
-        $this->assertTrue($after, 'Test with entities br and attributes bis');
-        $input='<h2>abc</h2>';
-        $after=dol_textishtml($input);
-        $this->assertTrue($after, 'Test with entities h2');
-        $input='<img id="abc" src="https://xxx.com/aaa/image.png" />';
-        $after=dol_textishtml($input);
-        $this->assertTrue($after, 'Test with img tag');
-        $input='<a class="azerty" href="https://xxx.com/aaa/image.png" />';
-        $after=dol_textishtml($input);
-        $this->assertTrue($after, 'Test with a tag');
-        $input='This is a text with&nbsp;html spaces';
-        $after=dol_textishtml($input);
-        $this->assertTrue($after, 'Test with a &nbsp;');
-        $input='This is a text with accent &eacute;';
-        $after=dol_textishtml($input);
-        $this->assertTrue($after, 'Test with a &eacute;');
-
-        // False
-        $input='xxx < br>';
-        $after=dol_textishtml($input);
-        $this->assertFalse($after);
-        $input='xxx <email@email.com>';	// <em> is html, <em... is not
-        $after=dol_textishtml($input);
-        $this->assertFalse($after);
-        $input='xxx <brstyle="ee">';
-        $after=dol_textishtml($input);
-        $this->assertFalse($after);
-        $input='This is a text with html comments <!-- comment -->';	// we suppose this is not enough to be html content
-        $after=dol_textishtml($input);
-        $this->assertFalse($after);
-    }
-
-
-    /**
-     * testDolHtmlCleanLastBr
-     *
-     * @return boolean
-     */
-    public function testDolHtmlCleanLastBr()
-    {
-        $input="A string\n";
-        $after=dol_htmlcleanlastbr($input);
-        $this->assertEquals("A string", $after);
-
-        $input="A string first\nA string second\n";
-        $after=dol_htmlcleanlastbr($input);
-        $this->assertEquals("A string first\nA string second", $after);
-
-        $input="A string\n\n\n";
-        $after=dol_htmlcleanlastbr($input);
-        $this->assertEquals("A string", $after);
-
-        $input="A string<br>";
-        $after=dol_htmlcleanlastbr($input);
-        $this->assertEquals("A string", $after);
-
-        $input="A string first<br>\nA string second<br>";
-        $after=dol_htmlcleanlastbr($input);
-        $this->assertEquals("A string first<br>\nA string second", $after);
-
-        $input="A string\n<br type=\"_moz\" />\n";
-        $after=dol_htmlcleanlastbr($input);
-        $this->assertEquals("A string", $after);
-
-        $input="A string\n<br><br />\n\n";
-        $after=dol_htmlcleanlastbr($input);
-        $this->assertEquals("A string", $after);
-
-        return true;
-    }
-
-    /**
-     * testDolConcat
-     *
-     * @return boolean
-     */
-    public function testDolConcat()
-    {
-        $text1="A string 1"; $text2="A string 2";	// text 1 and 2 are text, concat need only \n
-        $after=dol_concatdesc($text1, $text2);
-        $this->assertEquals("A string 1\nA string 2", $after);
-
-        $text1="A<br>string 1"; $text2="A string 2";	// text 1 is html, concat need <br>\n
-        $after=dol_concatdesc($text1, $text2);
-        $this->assertEquals("A<br>string 1<br>\nA string 2", $after);
-
-        $text1="A string 1"; $text2="A <b>string</b> 2";	// text 2 is html, concat need <br>\n
-        $after=dol_concatdesc($text1, $text2);
-        $this->assertEquals("A string 1<br>\nA <b>string</b> 2", $after);
-
-        return true;
-    }
-
-
-    /**
-     * testDolStringNohtmltag
-     *
-     * @return boolean
-     */
-    public function testDolStringNohtmltag()
-    {
-        $text="A\nstring\n\nand more\n";
-        $after=dol_string_nohtmltag($text, 0);
-        $this->assertEquals("A\nstring\n\nand more", $after, "test1a");
-
-        $text="A <b>string<b><br>\n<br>\n\nwith html tag<br>\n";
-        $after=dol_string_nohtmltag($text, 0);
-        $this->assertEquals("A string\n\n\n\n\nwith html tag", $after, 'test2a 2 br and 3 \n give 5 \n');
-
-        $text="A <b>string<b><br>\n<br>\n\nwith html tag<br>\n";
-        $after=dol_string_nohtmltag($text, 1);
-        $this->assertEquals("A string with html tag", $after, 'test2b 2 br and 3 \n give 1 space');
-
-        $text="A <b>string<b><br>\n<br>\n\nwith html tag<br>\n";
-        $after=dol_string_nohtmltag($text, 2);
-        $this->assertEquals("A string\n\nwith html tag", $after, 'test2c 2 br and 3 \n give 2 \n');
-
-        $text="A <b>string<b><br>\r\n<br>\r\n\r\nwith html tag<br>\n";
-        $after=dol_string_nohtmltag($text, 2);
-        $this->assertEquals("A string\n\nwith html tag", $after, 'test2c 2 br and 3 \r\n give 2 \n');
-
-        $text="A string<br>Another string";
-        $after=dol_string_nohtmltag($text, 0);
-        $this->assertEquals("A string\nAnother string", $after, "test4");
-
-        $text="A string<br>Another string";
-        $after=dol_string_nohtmltag($text, 1);
-        $this->assertEquals("A string Another string", $after, "test5");
-
-        $text='<a href="/myurl" title="<u>Afficher projet</u>">ABC</a>';
-        $after=dol_string_nohtmltag($text, 1);
-        $this->assertEquals("ABC", $after, "test6");
-
-        $text='<a href="/myurl" title="&lt;u&gt;Afficher projet&lt;/u&gt;">DEF</a>';
-        $after=dol_string_nohtmltag($text, 1);
-        $this->assertEquals("DEF", $after, "test7");
-
-        $text='<a href="/myurl" title="<u>A title</u>">HIJ</a>';
-        $after=dol_string_nohtmltag($text, 0);
-        $this->assertEquals("HIJ", $after, "test8");
-
-        $text="A <b>string<b>\n\nwith html tag and '<' chars<br>\n";
-        $after=dol_string_nohtmltag($text, 0);
-        $this->assertEquals("A string\n\nwith html tag and '<' chars", $after, "test9");
-
-        $text="A <b>string<b>\n\nwith tag with < chars<br>\n";
-        $after=dol_string_nohtmltag($text, 1);
-        $this->assertEquals("A string with tag with < chars", $after, "test10");
-
-        return true;
-    }
-
-
-
-    /**
-     * testDolHtmlEntitiesBr
-     *
-     * @return boolean
-     */
-    public function testDolHtmlEntitiesBr()
-    {
-        // Text not already HTML
-
-        $input="A string\nwith a é, &, < and >.";
-        $after=dol_htmlentitiesbr($input, 0);    // Add <br> before \n
-        $this->assertEquals("A string<br>\nwith a &eacute;, &amp;, &lt; and &gt;.", $after);
-
-        $input="A string\nwith a é, &, < and >.";
-        $after=dol_htmlentitiesbr($input, 1);    // Replace \n with <br>
-        $this->assertEquals("A string<br>with a &eacute;, &amp;, &lt; and &gt;.", $after);
-
-        $input="A string\nwith a é, &, < and >.\n\n";	// With some \n at end that should be cleaned
-        $after=dol_htmlentitiesbr($input, 0);    // Add <br> before \n
-        $this->assertEquals("A string<br>\nwith a &eacute;, &amp;, &lt; and &gt;.", $after);
-
-        $input="A string\nwith a é, &, < and >.\n\n";	// With some \n at end that should be cleaned
-        $after=dol_htmlentitiesbr($input, 1);    // Replace \n with <br>
-        $this->assertEquals("A string<br>with a &eacute;, &amp;, &lt; and &gt;.", $after);
-
-        // Text already HTML, so &,<,> should not be converted
-
-        $input="A string<br>\nwith a é, &, < and >.";
-        $after=dol_htmlentitiesbr($input);
-        $this->assertEquals("A string<br>\nwith a &eacute;, &, < and >.", $after);
-
-        $input="<li>\nA string with a é, &, < and >.</li>\nAnother string";
-        $after=dol_htmlentitiesbr($input);
-        $this->assertEquals("<li>\nA string with a &eacute;, &, < and >.</li>\nAnother string", $after);
-
-        $input="A string<br>\nwith a é, &, < and >.<br>";	// With some <br> at end that should be cleaned
-        $after=dol_htmlentitiesbr($input);
-        $this->assertEquals("A string<br>\nwith a &eacute;, &, < and >.", $after);
-
-        $input="<li>\nA string with a é, &, < and >.</li>\nAnother string<br>";	// With some <br> at end that should be cleaned
-        $after=dol_htmlentitiesbr($input);
-        $this->assertEquals("<li>\nA string with a &eacute;, &, < and >.</li>\nAnother string", $after);
-
-        // TODO Add test with param $removelasteolbr = 0
-
-        return true;
-    }
-
-
-    /**
-     * testDolNbOfLinesBis
-     *
-     * @return boolean
-     */
-    public function testDolNbOfLinesBis()
-    {
-        // This is not a html string so nb of lines depends on \n
-        $input="A string\nwith a é, &, < and > and bold tag.\nThird line";
-        $after=dol_nboflines_bis($input, 0);
-        $this->assertEquals($after, 3);
-
-        // This is a html string so nb of lines depends on <br>
-        $input="A string\nwith a é, &, < and > and <b>bold</b> tag.\nThird line";
-        $after=dol_nboflines_bis($input, 0);
-        $this->assertEquals($after, 1);
-
-        // This is a html string so nb of lines depends on <br>
-        $input="A string<br>with a é, &, < and > and <b>bold</b> tag.<br>Third line";
-        $after=dol_nboflines_bis($input, 0);
-        $this->assertEquals($after, 3);
-
-        return true;
-    }
-
-
-    /**
-     * testDolUnaccent
-     *
-     * @return boolean
-     */
-    public function testDolUnaccent()
-    {
-        // Text not already HTML
-
-        $input="A string\nwith a à ä é è ë ï ü ö ÿ, &, < and >.";
-        $after=dol_string_unaccent($input);
-        $this->assertEquals("A string\nwith a a a e e e i u o y, &, < and >.", $after);
-    }
-
-
-    /**
-     * testDolUtf8Check
-     *
-     * @return void
-     */
-    public function testDolUtf8Check()
-    {
-        // True
-        $result=utf8_check('azerty');
-        $this->assertTrue($result);
-
-        $file=dirname(__FILE__).'/textutf8.txt';
-        $filecontent=file_get_contents($file);
-        $result=utf8_check($filecontent);
-        $this->assertTrue($result);
-
-        $file=dirname(__FILE__).'/textiso.txt';
-        $filecontent=file_get_contents($file);
-        $result=utf8_check($filecontent);
-        $this->assertFalse($result);
-    }
-
-    /**
-     * testDolAsciiCheck
-     *
-     * @return void
-     */
-    public function testDolAsciiCheck()
-    {
-    	// True
-    	$result=ascii_check('azerty');
-    	$this->assertTrue($result);
-
-    	$result=ascii_check('é');
-    	$this->assertFalse($result);
-
-    	$file=dirname(__FILE__).'/textutf8.txt';
-    	$filecontent=file_get_contents($file);
-    	$result=ascii_check($filecontent);
-    	$this->assertFalse($result);
-    }
-
-    /**
-     * testDolTrunc
-     *
-     * @return boolean
-     */
-    public function testDolTrunc()
-    {
-        // Default trunc (will add ... if truncation truncation or keep last char if only one char)
-        $input="éeéeéeàa";
-        $after=dol_trunc($input, 3);
-        $this->assertEquals("éeé...", $after, 'Test A1');
-        $after=dol_trunc($input, 2);
-        $this->assertEquals("ée...", $after, 'Test A2');
-        $after=dol_trunc($input, 1);
-        $this->assertEquals("é...", $after, 'Test A3');
-        $input="éeéeé";
-        $after=dol_trunc($input, 3);
-        $this->assertEquals("éeéeé", $after, 'Test B1');
-        $after=dol_trunc($input, 2);
-        $this->assertEquals("éeéeé", $after, 'Test B2');
-        $after=dol_trunc($input, 1);
-        $this->assertEquals("é...", $after, 'Test B3');
-        $input="éeée";
-        $after=dol_trunc($input, 3);
-        $this->assertEquals("éeée", $after, 'Test C1');
-        $after=dol_trunc($input, 2);
-        $this->assertEquals("éeée", $after, 'Test C2');
-        $after=dol_trunc($input, 1);
-        $this->assertEquals("éeée", $after, 'Test C3');
-        $input="éeé";
-        $after=dol_trunc($input, 3);
-        $this->assertEquals("éeé", $after, 'Test C');
-        $after=dol_trunc($input, 2);
-        $this->assertEquals("éeé", $after, 'Test D');
-        $after=dol_trunc($input, 1);
-        $this->assertEquals("éeé", $after, 'Test E');
-        // Trunc with no ...
-        $input="éeéeéeàa";
-        $after=dol_trunc($input, 3, 'right', 'UTF-8', 1);
-        $this->assertEquals("éeé", $after, 'Test F');
-        $after=dol_trunc($input, 2, 'right', 'UTF-8', 1);
-        $this->assertEquals("ée", $after, 'Test G');
-        $input="éeé";
-        $after=dol_trunc($input, 3, 'right', 'UTF-8', 1);
-        $this->assertEquals("éeé", $after, 'Test H');
-        $after=dol_trunc($input, 2, 'right', 'UTF-8', 1);
-        $this->assertEquals("ée", $after, 'Test I');
-        $after=dol_trunc($input, 1, 'right', 'UTF-8', 1);
-        $this->assertEquals("é", $after, 'Test J');
-        $input="éeéeéeàa";
-        $after=dol_trunc($input, 4, 'middle');
-        $this->assertEquals("ée...àa", $after, 'Test K');
-
-        return true;
-    }
-
-    /**
-     * testDolMkTime
-     *
-     * @return	void
-     */
-    public function testDolMkTime()
-    {
-        global $conf;
-
-        $savtz=date_default_timezone_get();
-
-        // Some test for UTC TZ
-        date_default_timezone_set('UTC');
-
-        // Check bad hours
-        $result=dol_mktime(25, 0, 0, 1, 1, 1970, 1, 1);    // Error (25 hours)
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('', $result);
-        $result=dol_mktime(2, 61, 0, 1, 1, 1970, 1, 1);    // Error (61 minutes)
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('', $result);
-        $result=dol_mktime(2, 1, 61, 1, 1, 1970, 1, 1);    // Error (61 seconds)
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('', $result);
-        $result=dol_mktime(2, 1, 1, 1, 32, 1970, 1, 1);    // Error (day 32)
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('', $result);
-        $result=dol_mktime(2, 1, 1, 13, 1, 1970, 1, 1);    // Error (month 13)
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('', $result);
-
-        $result=dol_mktime(2, 1, 1, 1, 1, 1970, 1);    // 1970-01-01 02:01:01 in GMT area -> 7261
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(7261, $result);
-
-        $result=dol_mktime(2, 0, 0, 1, 1, 1970, 0);                // 1970-01-01 02:00:00 = 7200 in local area Europe/Paris = 3600 GMT
-        print __METHOD__." result=".$result."\n";
-        $tz=getServerTimeZoneInt('winter');                  // +1 in Europe/Paris at this time (this time is winter)
-        $this->assertEquals(7200-($tz*3600), $result);        // 7200 if we are at greenwich winter, 7200-($tz*3600) at local winter
-
-        // Some test for local TZ Europe/Paris
-        date_default_timezone_set('Europe/Paris');
-
-        // Check that tz for paris in winter is used
-        $result=dol_mktime(2, 0, 0, 1, 1, 1970, 'server');         // 1970-01-01 02:00:00 = 7200 in local area Europe/Paris = 3600 GMT
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(3600, $result);        			 // 7200 if we are at greenwich winter, 3600 at Europe/Paris
-
-        // Check that daylight saving time is used
-        $result=dol_mktime(2, 0, 0, 6, 1, 2014, 0);         		// 2014-06-01 02:00:00 = 1401588000-3600(location)-3600(daylight) in local area Europe/Paris = 1401588000 GMT
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(1401588000-3600-3600, $result);  // 1401588000 are at greenwich summer, 1401588000-3600(location)-3600(daylight) at Europe/Paris summer
-
-        date_default_timezone_set($savtz);
-    }
-
-
-    /**
-     * testDolEscapeJs
-     *
-     * @return	void
-     */
-    public function testDolEscapeJs()
-    {
-        $input="x&<b>#</b>,\"'";    // " will be converted into '
-        $result=dol_escape_js($input);
-        $this->assertEquals("x&<b>#</b>,\'\'", $result, "Test mode=0");
-
-        $result=dol_escape_js($input, 1);
-        $this->assertEquals("x&<b>#</b>,\"\'", $result, "Test mode=1");
-
-        $result=dol_escape_js($input, 2);
-        $this->assertEquals("x&<b>#</b>,\\\"'", $result, "Test mode=2");
-    }
-
-
-    /**
-    * testDolEscapeHtmlTag
-    *
-    * @return	void
-    */
-    public function testDolEscapeHtmlTag()
-    {
-        $input='x&<b>#</b>,"';    // & and " are converted into html entities, <b> are removed
-        $result=dol_escape_htmltag($input);
-        $this->assertEquals('x&amp;#,&quot;', $result);
-
-        $input='x&<b>#</b>,"';    // & and " are converted into html entities, <b> are not removed
-        $result=dol_escape_htmltag($input, 1);
-        $this->assertEquals('x&amp;&lt;b&gt;#&lt;/b&gt;,&quot;', $result);
-    }
-
-
-    /**
-     * testDolFormatAddress
-     *
-     * @return	void
-     */
-    public function testDolFormatAddress()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $object=new Societe($db);
-        $object->initAsSpecimen();
-
-        $object->country_code='FR';
-        $address=dol_format_address($object);
-        $this->assertEquals("21 jump street\n99999 MyTown", $address);
-
-        $object->country_code='GB';
-        $address=dol_format_address($object);
-        $this->assertEquals("21 jump street\nMyTown, MyState\n99999", $address);
-
-        $object->country_code='US';
-        $address=dol_format_address($object);
-        $this->assertEquals("21 jump street\nMyTown, MyState, 99999", $address);
-
-        $object->country_code='AU';
-        $address=dol_format_address($object);
-        $this->assertEquals("21 jump street\nMyTown, MyState, 99999", $address);
-    }
-
-
-    /**
-     * testDolFormatAddress
-     *
-     * @return	void
-     */
-    public function testDolPrintPhone()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $object=new Societe($db);
-        $object->initAsSpecimen();
-
-        $object->country_code='FR';
-        $phone=dol_print_phone('1234567890', $object->country_code);
-        $this->assertEquals('<span style="margin-right: 10px;">12&nbsp;34&nbsp;56&nbsp;78&nbsp;90</span>', $phone, 'Phone for FR 1');
-
-        $object->country_code='FR';
-        $phone=dol_print_phone('1234567890', $object->country_code, 0, 0, 0, '');
-        $this->assertEquals('<span style="margin-right: 10px;">1234567890</span>', $phone, 'Phone for FR 2');
-
-        $object->country_code='FR';
-        $phone=dol_print_phone('1234567890', $object->country_code, 0, 0, 0, ' ');
-        $this->assertEquals('<span style="margin-right: 10px;">12 34 56 78 90</span>', $phone, 'Phone for FR 3');
-
-        $object->country_code='CA';
-        $phone=dol_print_phone('1234567890', $object->country_code, 0, 0, 0, ' ');
-        $this->assertEquals('<span style="margin-right: 10px;">(123) 456-7890</span>', $phone, 'Phone for CA 1');
-    }
-
-
-    /**
-     * testImgPicto
-     *
-     * @return	void
-     */
-    public function testImgPicto()
-    {
-        $s=img_picto('title', 'user');
-        print __METHOD__." s=".$s."\n";
-        $this->assertContains('fa-user', $s, 'testImgPicto1');
-
-        $s=img_picto('title', 'img.png', 'style="float: right"', 0);
-        print __METHOD__." s=".$s."\n";
-        $this->assertContains('theme', $s, 'testImgPicto2');
-        $this->assertContains('style="float: right"', $s, 'testImgPicto2');
-
-        $s=img_picto('title', '/fullpath/img.png', '', 1);
-        print __METHOD__." s=".$s."\n";
-        $this->assertEquals('<img src="/fullpath/img.png" alt="" title="title" class="inline-block">', $s, 'testImgPicto3');
-
-        $s=img_picto('title', '/fullpath/img.png', '', true);
-        print __METHOD__." s=".$s."\n";
-        $this->assertEquals('<img src="/fullpath/img.png" alt="" title="title" class="inline-block">', $s, 'testImgPicto4');
-
-        $s=img_picto('title', 'delete', '', 0, 1);
-        print __METHOD__." s=".$s."\n";
-        $this->assertEquals(DOL_URL_ROOT.'/theme/eldy/img/delete.png', $s, 'testImgPicto5');
-    }
-
-    /**
-     * testDolNow
-     *
-     * @return	void
-     */
-    public function testDolNow()
-    {
-        $now=dol_now('gmt');
-        $nowtzserver=dol_now('tzserver');
-        print __METHOD__." getServerTimeZoneInt=".(getServerTimeZoneInt('now')*3600)."\n";
-        $this->assertEquals(getServerTimeZoneInt('now')*3600, ($nowtzserver-$now));
-    }
-
-    /**
-     * testVerifCond
-     *
-     * @return	void
-     */
-    public function testVerifCond()
-    {
-        $verifcond=verifCond('1==1');
-        $this->assertTrue($verifcond, 'Test a true comparison');
-
-        $verifcond=verifCond('1==2');
-        $this->assertFalse($verifcond, 'Test a false comparison');
-
-        $verifcond=verifCond('$conf->facture->enabled');
-        $this->assertTrue($verifcond, 'Test that conf property of a module report true when enabled');
-
-        $verifcond=verifCond('$conf->moduledummy->enabled');
-        $this->assertFalse($verifcond, 'Test that conf property of a module report false when disabled');
-
-        $verifcond=verifCond('');
-        $this->assertTrue($verifcond);
-    }
-
-    /**
-     * testGetDefaultTva
-     *
-     * @return	void
-     */
-    public function testGetDefaultTva()
-    {
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
-
-        // Sellers
-        $companyfrnovat=new Societe($db);
-        $companyfrnovat->country_code='FR';
-        $companyfrnovat->tva_assuj=0;
-
-        $companyfr=new Societe($db);
-        $companyfr->country_code='FR';
-        $companyfr->tva_assuj=1;
-        $companyfr->tva_intra='FR9999';
-
-        // Buyers
-        $companymc=new Societe($db);
-        $companymc->country_code='MC';
-        $companymc->tva_assuj=1;
-        $companyfr->tva_intra='MC9999';
-
-        $companyit=new Societe($db);
-        $companyit->country_code='IT';
-        $companyit->tva_assuj=1;
-        $companyit->tva_intra='IT99999';
-
-        $companyde=new Societe($db);
-        $companyde->country_code='DE';
-        $companyde->tva_assuj=1;
-        $companyde->tva_intra='DE99999';
-
-        $notcompanyde=new Societe($db);
-        $notcompanyde->country_code='DE';
-        $notcompanyde->tva_assuj=0;
-        $notcompanyde->tva_intra='';
-        $notcompanyde->typent_code='TE_PRIVATE';
-
-        $companyus=new Societe($db);
-        $companyus->country_code='US';
-        $companyus->tva_assuj=1;
-        $companyus->tva_intra='';
-
-
-        // Test RULE 0 (FR-DE)
-        // Not tested
-
-        // Test RULE 1
-        $vat=get_default_tva($companyfrnovat, $companymc, 0);
-        $this->assertEquals(0, $vat, 'RULE 1');
-
-        // Test RULE 2 (FR-FR)
-        $vat=get_default_tva($companyfr, $companyfr, 0);
-        $this->assertEquals(20, $vat, 'RULE 2');
-
-        // Test RULE 2 (FR-MC)
-        $vat=get_default_tva($companyfr, $companymc, 0);
-        $this->assertEquals(20, $vat, 'RULE 2');
-
-        // Test RULE 3 (FR-DE company)
-        $vat=get_default_tva($companyfr, $companyit, 0);
-        $this->assertEquals(0, $vat, 'RULE 3');
-
-        // Test RULE 4 (FR-DE not a company)
-        $vat=get_default_tva($companyfr, $notcompanyde, 0);
-        $this->assertEquals(20, $vat, 'RULE 4');
-
-        // Test RULE 5 (FR-US)
-        $vat=get_default_tva($companyfr, $companyus, 0);
-        $this->assertEquals(0, $vat, 'RULE 5');
-
-
-        // We do same tests but with option SERVICE_ARE_ECOMMERCE_200238EC on.
-        $conf->global->SERVICE_ARE_ECOMMERCE_200238EC = 1;
-
-
-        // Test RULE 1 (FR-US)
-        $vat=get_default_tva($companyfr, $companyus, 0);
-        $this->assertEquals(0, $vat, 'RULE 1 ECOMMERCE_200238EC');
-
-        // Test RULE 2 (FR-FR)
-        $vat=get_default_tva($companyfr, $companyfr, 0);
-        $this->assertEquals(20, $vat, 'RULE 2 ECOMMERCE_200238EC');
-
-        // Test RULE 3 (FR-DE company)
-        $vat=get_default_tva($companyfr, $companyde, 0);
-        $this->assertEquals(0, $vat, 'RULE 3 ECOMMERCE_200238EC');
-
-        // Test RULE 4 (FR-DE not a company)
-        $vat=get_default_tva($companyfr, $notcompanyde, 0);
-        $this->assertEquals(19, $vat, 'RULE 4 ECOMMERCE_200238EC');
-
-        // Test RULE 5 (FR-US)
-        $vat=get_default_tva($companyfr, $companyus, 0);
-        $this->assertEquals(0, $vat, 'RULE 5 ECOMMERCE_200238EC');
-    }
-
-    /**
-     * testGetDefaultTva
-     *
-     * @return	void
-     */
-    public function testGetDefaultLocalTax()
-    {
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
-
-        $companyfrnovat=new Societe($db);
-        $companyfrnovat->country_code='FR';
-        $companyfrnovat->tva_assuj=0;
-        $companyfrnovat->localtax1_assuj=0;
-        $companyfrnovat->localtax2_assuj=0;
-
-        $companyes=new Societe($db);
-        $companyes->country_code='ES';
-        $companyes->tva_assuj=1;
-        $companyes->localtax1_assuj=1;
-        $companyes->localtax2_assuj=1;
-
-        $companymc=new Societe($db);
-        $companymc->country_code='MC';
-        $companymc->tva_assuj=1;
-        $companymc->localtax1_assuj=0;
-        $companymc->localtax2_assuj=0;
-
-        $companyit=new Societe($db);
-        $companyit->country_code='IT';
-        $companyit->tva_assuj=1;
-        $companyit->tva_intra='IT99999';
-        $companyit->localtax1_assuj=0;
-        $companyit->localtax2_assuj=0;
-
-        $notcompanyit=new Societe($db);
-        $notcompanyit->country_code='IT';
-        $notcompanyit->tva_assuj=1;
-        $notcompanyit->tva_intra='';
-        $notcompanyit->typent_code='TE_PRIVATE';
-        $notcompanyit->localtax1_assuj=0;
-        $notcompanyit->localtax2_assuj=0;
-
-        $companyus=new Societe($db);
-        $companyus->country_code='US';
-        $companyus->tva_assuj=1;
-        $companyus->tva_intra='';
-        $companyus->localtax1_assuj=0;
-        $companyus->localtax2_assuj=0;
-
-        // Test RULE FR-MC
-        $vat1=get_default_localtax($companyfrnovat, $companymc, 1, 0);
-        $vat2=get_default_localtax($companyfrnovat, $companymc, 2, 0);
-        $this->assertEquals(0, $vat1);
-        $this->assertEquals(0, $vat2);
-
-        // Test RULE ES-ES
-        $vat1=get_default_localtax($companyes, $companyes, 1, 0);
-        $vat2=get_default_localtax($companyes, $companyes, 2, 0);
-        $this->assertEquals($vat1, 5.2);
-        $this->assertStringStartsWith((string) $vat2, '-19:-15:-9');       // Can be -19 (old version) or '-19:-15:-9' (new setup)
-
-        // Test RULE ES-IT
-        $vat1=get_default_localtax($companyes, $companyit, 1, 0);
-        $vat2=get_default_localtax($companyes, $companyit, 2, 0);
-        $this->assertEquals(0, $vat1);
-        $this->assertEquals(0, $vat2);
-
-        // Test RULE ES-IT
-        $vat1=get_default_localtax($companyes, $notcompanyit, 1, 0);
-        $vat2=get_default_localtax($companyes, $notcompanyit, 2, 0);
-        $this->assertEquals(0, $vat1);
-        $this->assertEquals(0, $vat2);
-
-        // Test RULE FR-IT
-        // Not tested
-
-        // Test RULE ES-US
-        $vat1=get_default_localtax($companyes, $companyus, 1, 0);
-        $vat2=get_default_localtax($companyes, $companyus, 2, 0);
-        $this->assertEquals(0, $vat1);
-        $this->assertEquals(0, $vat2);
-    }
-
-
-    /**
-     * testDolExplodeIntoArray
-     *
-     * @return	void
-     */
-    public function testDolExplodeIntoArray()
-    {
-        $stringtoexplode='AA=B/B.CC=.EE=FF.HH=GG;.';
-        $tmp=dolExplodeIntoArray($stringtoexplode, '.', '=');
-
-        print __METHOD__." tmp=".json_encode($tmp)."\n";
-        $this->assertEquals('{"AA":"B\/B","CC":"","EE":"FF","HH":"GG;"}', json_encode($tmp));
-    }
-
-    /**
-     * dol_nl2br
-     *
-     * @return void
-     */
-    public function testDolNl2Br()
-    {
-
-        //String to encode
-        $string = "a\na";
-
-        $this->assertEquals(dol_nl2br($string), "a<br>\na");
-
-        //With $forxml parameter
-        $this->assertEquals(dol_nl2br($string, 0, 1), "a<br />\na");
-
-        //Replacing \n by br
-        $this->assertEquals(dol_nl2br($string, 1), "a<br>a");
-
-        //With $forxml parameter
-        $this->assertEquals(dol_nl2br($string, 1, 1), "a<br />a");
-    }
-
-    /**
-     * testDolPrice2Num
-     *
-     * @return boolean
-     */
-    public function testDolPrice2Num()
-    {
-    	global $langs, $conf;
-
-    	$oldlangs = $langs;
-
-    	$newlangs = new Translate('', $conf);
-    	$newlangs->setDefaultLang('en_US');
-    	$newlangs->load("main");
-    	$langs = $newlangs;
-
-    	$this->assertEquals(150, price2num('(SELECT/**/CASE/**/WHEN/**/(0<1)/**/THEN/**/SLEEP(5)/**/ELSE/**/SLEEP(0)/**/END)'));
-
-    	$this->assertEquals(1000, price2num('1 000.0'));
-        $this->assertEquals(1000, price2num('1 000', 'MT'));
-        $this->assertEquals(1000, price2num('1 000', 'MU'));
-
-        $this->assertEquals(1000.123456, price2num('1 000.123456'));
-
-        // Round down
-        $this->assertEquals(1000.12, price2num('1 000.123452', 'MT'));
-        $this->assertEquals(1000.12345, price2num('1 000.123452', 'MU'), "Test MU");
-
-        // Round up
-        $this->assertEquals(1000.13, price2num('1 000.125456', 'MT'));
-        $this->assertEquals(1000.12546, price2num('1 000.125456', 'MU'), "Test MU");
-
-        $this->assertEquals(1, price2num('1.000'), 'Test 1.000 give 1 with english language');
-
-        // Text can't be converted
-        $this->assertEquals('12.4$', price2num('12.4$'));
-        $this->assertEquals('12.4$', price2num('12r.4$'));
-
-        // For spanish language
-        $newlangs2 = new Translate('', $conf);
-        $newlangs2->setDefaultLang('es_ES');
-        $newlangs2->load("main");
-        $langs = $newlangs2;
-
-        // Test with 3 chars after . or ,
-        // If a . is used and there is 3 digits after, it is a thousand separator
-        $this->assertEquals(1234, price2num('1.234', '', 2), 'Test 1.234 give 1234 with spanish language if user input');
-        $this->assertEquals(1.234, price2num('1,234', '', 2), 'Test 1,234 give 1234 with spanish language if user input');
-        $this->assertEquals(1234, price2num('1 234', '', 2), 'Test 1 234 give 1234 with spanish language if user input');
-        $this->assertEquals(-1.234, price2num('-1.234'), 'Test 1.234 give 1.234 with spanish language');
-        $this->assertEquals(-1.234, price2num('-1,234'), 'Test 1,234 give 1234 with spanish language');
-        $this->assertEquals(-1234, price2num('-1 234'), 'Test 1 234 give 1234 with spanish language');
-        $this->assertEquals(21500123, price2num('21.500.123'), 'Test 21.500.123 give 21500123 with spanish language');
-        $this->assertEquals(21500123, price2num('21500.123', 0, 2), 'Test 21500.123 give 21500123 with spanish language if user input');
-        $this->assertEquals(21500.123, price2num('21500.123'), 'Test 21500.123 give 21500123 with spanish language');
-        $this->assertEquals(21500.123, price2num('21500,123'), 'Test 21500,123 give 21500.123 with spanish language');
-        // Test with 2 digits
-        $this->assertEquals(21500.12, price2num('21500.12'), 'Test 21500.12 give 21500.12 with spanish language');
-        $this->assertEquals(21500.12, price2num('21500,12'), 'Test 21500,12 give 21500.12 with spanish language');
-        // Test with 3 digits
-        $this->assertEquals(12123, price2num('12.123', '', 2), 'Test 12.123 give 12123 with spanish language if user input');
-        $this->assertEquals(12.123, price2num('12,123', '', 2), 'Test 12,123 give 12.123 with spanish language if user input');
-        $this->assertEquals(12.123, price2num('12.123'), 'Test 12.123 give 12.123 with spanish language');
-        $this->assertEquals(12.123, price2num('12,123'), 'Test 12,123 give 12.123 with spanish language');
-
-        // For french language
-        $newlangs3 = new Translate('', $conf);
-        $newlangs3->setDefaultLang('fr_FR');
-        $newlangs3->load("main");
-        $langs = $newlangs3;
-
-        $this->assertEquals(1, price2num('1.000', '', 2), 'Test 1.000 give 1 with french language if user input');
-        $this->assertEquals(1, price2num('1.000'), 'Test 1.000 give 1 with french language');
-        $this->assertEquals(1000, price2num('1 000'), 'Test 1.000 give 1 with french language');
-        $this->assertEquals(1.234, price2num('1.234', '', 2), 'Test 1.234 give 1.234 with french language if user input');
-        $this->assertEquals(1.234, price2num('1.234'), 'Test 1.234 give 1.234 with french language');
-        $this->assertEquals(1.234, price2num('1,234', '', 2), 'Test 1,234 give 1.234 with french language if user input');
-        $this->assertEquals(1.234, price2num('1,234'), 'Test 1,234 give 1.234 with french language');
-        $this->assertEquals(21500000, price2num('21500 000'), 'Test 21500 000 give 21500000 with french language');
-        $this->assertEquals(21500000, price2num('21 500 000'), 'Test 21 500 000 give 21500000 with french language');
-        $this->assertEquals(21500, price2num('21500.00'), 'Test 21500.00 give 21500 with french language');
-        $this->assertEquals(21500, price2num('21500,00'), 'Test 21500,00 give 21500 with french language');
-
-        $langs = $oldlangs;
-
-        return true;
-    }
-
-    /**
-     * testDolGetDate
-     *
-     * @return boolean
-     */
-    public function testDolGetDate()
-    {
-        global $conf;
-
-        $conf->global->MAIN_START_WEEK = 0;
-
-        $tmp=dol_getdate(24*60*60+1);		// 2/1/1970 and 1 second = friday
-        $this->assertEquals(5, $tmp['wday']);
-
-        $conf->global->MAIN_START_WEEK = 1;
-
-        $tmp=dol_getdate(1);				// 1/1/1970 and 1 second = thirday
-        $this->assertEquals(4, $tmp['wday']);
-
-        $tmp=dol_getdate(24*60*60+1);		// 2/1/1970 and 1 second = friday
-        $this->assertEquals(5, $tmp['wday']);
-
-        $tmp=dol_getdate(1, false, "Europe/Paris");						// 1/1/1970 and 1 second = thirday
-        $this->assertEquals(1970, $tmp['year']);
-        $this->assertEquals(1, $tmp['mon']);
-        $this->assertEquals(1, $tmp['mday']);
-        $this->assertEquals(4, $tmp['wday']);
-        $this->assertEquals(0, $tmp['yday']);
-        $this->assertEquals(1, $tmp['hours']);		// We are winter, so we are GMT+1 even during summer
-        $this->assertEquals(0, $tmp['minutes']);
-        $this->assertEquals(1, $tmp['seconds']);
-
-        $tmp=dol_getdate(15638401, false, "Europe/Paris");					// 1/7/1970 and 1 second = wednesday
-        $this->assertEquals(1970, $tmp['year']);
-        $this->assertEquals(7, $tmp['mon']);
-        $this->assertEquals(1, $tmp['mday']);
-        $this->assertEquals(3, $tmp['wday']);
-        $this->assertEquals(181, $tmp['yday']);
-        $this->assertEquals(1, $tmp['hours']);		// There is no daylight in 1970, so we are GMT+1 even during summer
-        $this->assertEquals(0, $tmp['minutes']);
-        $this->assertEquals(1, $tmp['seconds']);
-
-        $tmp=dol_getdate(1593561601, false, "Europe/Paris");				// 1/7/2020 and 1 second = wednesday
-        $this->assertEquals(2020, $tmp['year']);
-        $this->assertEquals(7, $tmp['mon']);
-        $this->assertEquals(1, $tmp['mday']);
-        $this->assertEquals(3, $tmp['wday']);
-        $this->assertEquals(182, $tmp['yday']);		// 182 and not 181, due to the 29th february
-        $this->assertEquals(2, $tmp['hours']);		// There is a daylight, so we are GMT+2
-        $this->assertEquals(0, $tmp['minutes']);
-        $this->assertEquals(1, $tmp['seconds']);
-
-        $conf->global->MAIN_USE_OLD_FUNCTIONS_FOR_GETDATE = 1;
-
-        $tmp=dol_getdate(1);						// 1/1/1970 and 1 second = thirday
-        $this->assertEquals(1970, $tmp['year']);
-        $this->assertEquals(1, $tmp['mon']);
-        $this->assertEquals(1, $tmp['mday']);
-        $this->assertEquals(4, $tmp['wday']);
-        $this->assertEquals(0, $tmp['yday']);
-        // We must disable this because on CI, timezone is may be UTC or something else
-        //$this->assertEquals(1, $tmp['hours']);		// We are winter, so we are GMT+1 even during summer
-        $this->assertEquals(0, $tmp['minutes']);
-        $this->assertEquals(1, $tmp['seconds']);
-
-        $tmp=dol_getdate(15638401);					// 1/7/1970 and 1 second = wednesday
-        $this->assertEquals(1970, $tmp['year']);
-        $this->assertEquals(7, $tmp['mon']);
-        $this->assertEquals(1, $tmp['mday']);
-        $this->assertEquals(3, $tmp['wday']);
-        $this->assertEquals(181, $tmp['yday']);
-        // We must disable this because on CI, timezone is may be UTC or something else
-        //$this->assertEquals(1, $tmp['hours']);		// There is no daylight in 1970, so we are GMT+1 even during summer
-        $this->assertEquals(0, $tmp['minutes']);
-        $this->assertEquals(1, $tmp['seconds']);
-
-        $tmp=dol_getdate(1593561601);				// 1/7/2020 and 1 second = wednesday
-        $this->assertEquals(2020, $tmp['year']);
-        $this->assertEquals(7, $tmp['mon']);
-        $this->assertEquals(1, $tmp['mday']);
-        $this->assertEquals(3, $tmp['wday']);
-        $this->assertEquals(182, $tmp['yday']);		// 182 and not 181, due to the 29th february
-        // We must disable this because on CI, timezone is may be UTC or something else
-        //$this->assertEquals(2, $tmp['hours']);		// There is a daylight, so we are GMT+2
-        $this->assertEquals(0, $tmp['minutes']);
-        $this->assertEquals(1, $tmp['seconds']);
-
-        return true;
-    }
-
-
-    /**
-     * testMakeSubstitutions
-     *
-     * @return boolean
-     */
-    public function testMakeSubstitutions()
-    {
-        global $conf, $langs;
-        $langs->load("main");
-
-        $substit=array("AAA"=>'Not used', "BBB"=>'Not used', "CCC"=>"C replaced");
-        $chaine='This is a string with __[MAIN_THEME]__ and __(DIRECTION)__ and __CCC__';
-        $newstring = make_substitutions($chaine, $substit);
-        $this->assertEquals($newstring, 'This is a string with eldy and ltr and __C replaced__');
-
-        return true;
-    }
-
-    /**
-     * testDolStringIsGoodIso
-     *
-     * @return boolean
-     */
-    public function testDolStringIsGoodIso()
-    {
-    	global $conf, $langs;
-
-    	$chaine='This is an ISO string';
-    	$result = dol_string_is_good_iso($chaine);
-    	$this->assertEquals($result, 1);
-
-    	$chaine='This is a not ISO string '.chr(0);
-    	$result = dol_string_is_good_iso($chaine);
-    	$this->assertEquals($result, 0);
-
-    	return true;
-    }
-
-
-    /**
-     * testGetUserRemoteIP
-     *
-     * @return boolean
-     */
-    public function testGetUserRemoteIP()
-    {
-    	global $conf, $langs;
-
-    	$_SERVER['HTTP_X_FORWARDED_FOR']='1.2.3.4';
-    	$_SERVER['HTTP_CLIENT_IP']='5.6.7.8';
-    	$result = getUserRemoteIP();
-    	$this->assertEquals($result, '1.2.3.4');
-
-    	$_SERVER['HTTP_X_FORWARDED_FOR']='1.2.3.4<corrupted>';
-    	$_SERVER['HTTP_CLIENT_IP']='5.6.7.8';
-    	$result = getUserRemoteIP();
-    	$this->assertEquals($result, '5.6.7.8');
-
-    	$_SERVER['HTTP_X_FORWARDED_FOR']='[1:2:3:4]';
-    	$_SERVER['HTTP_CLIENT_IP']='5.6.7.8';
-    	$result = getUserRemoteIP();
-    	$this->assertEquals($result, '[1:2:3:4]');
-
-    	return true;
-    }
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return CoreTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
+
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
+
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		//$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+
+		if (! function_exists('mb_substr')) {
+			print "\n".__METHOD__." function mb_substr must be enabled.\n"; die();
+		}
+
+		print __METHOD__."\n";
+	}
+
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		//$db->rollback();
+
+		print __METHOD__."\n";
+	}
+
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		print __METHOD__."\n";
+	}
+
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
+
+	/**
+	 * testIsValidEmail
+	 *
+	 * @return void
+	 */
+	public function testIsValidEmail()
+	{
+		// Nb of line is same than entry text
+
+		$input="bidon@bademail";
+		$result=isValidEmail($input);
+		print __METHOD__." result=".$result."\n";
+		$this->assertFalse($result, 'Check isValidEmail '.$input);
+
+		$input="test@yahoo.com";
+		$result=isValidEmail($input);
+		print __METHOD__." result=".$result."\n";
+		$this->assertTrue($result, 'Check isValidEmail '.$input);
+
+		$input="The name of sender <test@yahoo.com>";
+		$result=isValidEmail($input);
+		print __METHOD__." result=".$result."\n";
+		$this->assertFalse($result, 'Check isValidEmail '.$input);
+
+		$input="1234.abcdefg@domainame.com.br";
+		$result=isValidEmail($input);
+		print __METHOD__." result=".$result."\n";
+		$this->assertTrue($result, 'Check isValidEmail '.$input);
+	}
+
+	/**
+	 * testIsValidMXRecord
+	 *
+	 * @return void
+	 */
+	public function testIsValidMXRecord()
+	{
+		// Nb of line is same than entry text
+
+		$input="yahoo.com";
+		$result=isValidMXRecord($input);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(1, $result);
+
+		$input="yhaoo.com";
+		$result=isValidMXRecord($input);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(0, $result);
+
+		$input="dolibarr.fr";
+		$result=isValidMXRecord($input);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(0, $result);
+	}
+
+	/**
+	 * testDolGetFirstLineOfText
+	 *
+	 * @return void
+	 */
+	public function testDolGetFirstLineOfText()
+	{
+		// Nb of line is same than entry text
+
+		$input="aaaa";
+		$result=dolGetFirstLineOfText($input);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals("aaaa", $result);
+
+		$input="aaaa\nbbbbbbbbbbbb\n";
+		$result=dolGetFirstLineOfText($input, 2);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals("aaaa\nbbbbbbbbbbbb", $result);
+
+		$input="aaaa<br>bbbbbbbbbbbb<br>";
+		$result=dolGetFirstLineOfText($input, 2);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals("aaaa<br>\nbbbbbbbbbbbb", $result);
+
+		// Nb of line is lower
+
+		$input="aaaa\nbbbbbbbbbbbb\ncccccc\n";
+		$result=dolGetFirstLineOfText($input);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals("aaaa...", $result);
+
+		$input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
+		$result=dolGetFirstLineOfText($input);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals("aaaa...", $result);
+
+		$input="aaaa\nbbbbbbbbbbbb\ncccccc\n";
+		$result=dolGetFirstLineOfText($input, 2);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals("aaaa\nbbbbbbbbbbbb...", $result);
+
+		$input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
+		$result=dolGetFirstLineOfText($input, 2);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals("aaaa<br>\nbbbbbbbbbbbb...", $result);
+
+		// Nb of line is higher
+
+		$input="aaaa<br>bbbbbbbbbbbb<br>cccccc";
+		$result=dolGetFirstLineOfText($input, 100);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals("aaaa<br>\nbbbbbbbbbbbb<br>\ncccccc", $result, 'dolGetFirstLineOfText with nb 100 a');
+
+		$input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>";
+		$result=dolGetFirstLineOfText($input, 100);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals("aaaa<br>\nbbbbbbbbbbbb<br>\ncccccc", $result, 'dolGetFirstLineOfText with nb 100 b');
+
+		$input="aaaa<br>bbbbbbbbbbbb<br>cccccc<br>\n";
+		$result=dolGetFirstLineOfText($input, 100);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals("aaaa<br>\nbbbbbbbbbbbb<br>\ncccccc", $result, 'dolGetFirstLineOfText with nb 100 c');
+	}
+
+
+	/**
+	 * testDolBuildPath
+	 *
+	 * @return void
+	 */
+	public function testDolBuildPath()
+	{
+		/*$tmp=dol_buildpath('/google/oauth2callback.php', 0);
+		var_dump($tmp);
+		*/
+
+		/*$tmp=dol_buildpath('/google/oauth2callback.php', 1);
+		var_dump($tmp);
+		*/
+
+		$result=dol_buildpath('/google/oauth2callback.php', 2);
+		print __METHOD__." result=".$result."\n";
+		$this->assertStringStartsWith('http', $result);
+
+		$result=dol_buildpath('/google/oauth2callback.php', 3);
+		print __METHOD__." result=".$result."\n";
+		$this->assertStringStartsWith('http', $result);
+	}
+
+
+	/**
+	* testGetBrowserInfo
+	*
+	* @return void
+	*/
+	public function testGetBrowserInfo()
+	{
+		// MSIE 5.0
+		$user_agent ='Mozilla/4.0 (compatible; MSIE 5.0; Windows 98; DigExt; KITV4 Wanadoo; KITV5 Wanadoo)';
+		$tmp=getBrowserInfo($user_agent);
+		$this->assertEquals('ie', $tmp['browsername']);
+		$this->assertEquals('5.0', $tmp['browserversion']);
+		$this->assertEmpty($tmp['phone']);
+		$this->assertFalse($tmp['tablet']);
+		$this->assertEquals('classic', $tmp['layout']);
+
+		// Firefox 0.9.1
+		$user_agent ='Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.5a) Gecko/20030728 Mozilla Firefox/0.9.1';
+		$tmp=getBrowserInfo($user_agent);
+		$this->assertEquals('firefox', $tmp['browsername']);
+		$this->assertEquals('0.9.1', $tmp['browserversion']);
+		$this->assertEmpty($tmp['phone']);
+		$this->assertFalse($tmp['tablet']);
+		$this->assertEquals('classic', $tmp['layout']);
+
+		$user_agent ='Mozilla/3.0 (Windows 98; U) Opera 6.03  [en]';
+		$tmp=getBrowserInfo($user_agent);
+		$this->assertEquals('opera', $tmp['browsername']);
+		$this->assertEquals('6.03', $tmp['browserversion']);
+		$this->assertEmpty($tmp['phone']);
+		$this->assertFalse($tmp['tablet']);
+		$this->assertEquals('classic', $tmp['layout']);
+
+		$user_agent ='Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.21 (KHTML, like Gecko) Chrome/19.0.1042.0 Safari/535.21';
+		$tmp=getBrowserInfo($user_agent);
+		$this->assertEquals('chrome', $tmp['browsername']);
+		$this->assertEquals('19.0.1042.0', $tmp['browserversion']);
+		$this->assertEmpty($tmp['phone']);
+		$this->assertFalse($tmp['tablet']);
+		$this->assertEquals('classic', $tmp['layout']);
+
+		$user_agent ='chrome (Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.56 Safari/535.11)';
+		$tmp=getBrowserInfo($user_agent);
+		$this->assertEquals('chrome', $tmp['browsername']);
+		$this->assertEquals('17.0.963.56', $tmp['browserversion']);
+		$this->assertEmpty($tmp['phone']);
+		$this->assertFalse($tmp['tablet']);
+		$this->assertEquals('classic', $tmp['layout']);
+
+		$user_agent ='Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_8; de-at) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1';
+		$tmp=getBrowserInfo($user_agent);
+		$this->assertEquals('safari', $tmp['browsername']);
+		$this->assertEquals('533.21.1', $tmp['browserversion']);
+		$this->assertEmpty($tmp['phone']);
+		$this->assertFalse($tmp['tablet']);
+		$this->assertEquals('classic', $tmp['layout']);
+
+		//Internet Explorer 11
+		$user_agent = 'Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv:11.0) like Gecko';
+		$tmp=getBrowserInfo($user_agent);
+		$this->assertEquals('ie', $tmp['browsername']);
+		$this->assertEquals('11.0', $tmp['browserversion']);
+		$this->assertEmpty($tmp['phone']);
+		$this->assertFalse($tmp['tablet']);
+		$this->assertEquals('classic', $tmp['layout']);
+
+		//Internet Explorer 11 bis
+		$user_agent = 'Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; NP06; rv:11.0) like Gecko';
+		$tmp=getBrowserInfo($user_agent);
+		$this->assertEquals('ie', $tmp['browsername']);
+		$this->assertEquals('11.0', $tmp['browserversion']);
+		$this->assertEmpty($tmp['phone']);
+		$this->assertFalse($tmp['tablet']);
+		$this->assertEquals('classic', $tmp['layout']);
+
+		//iPad
+		$user_agent = 'Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5355d Safari/8536.25';
+		$tmp=getBrowserInfo($user_agent);
+		$this->assertEquals('safari', $tmp['browsername']);
+		$this->assertEquals('8536.25', $tmp['browserversion']);
+		$this->assertEquals('ios', $tmp['browseros']);
+		$this->assertEquals('tablet', $tmp['layout']);
+		$this->assertEquals('iphone', $tmp['phone']);
+	}
+
+
+	/**
+	 * testGetLanguageCodeFromCountryCode
+	 *
+	 * @return void
+	 */
+	public function testGetLanguageCodeFromCountryCode()
+	{
+		global $mysoc;
+
+		$language = getLanguageCodeFromCountryCode('US');
+		$this->assertEquals('en_US', $language, 'US');
+
+		$language = getLanguageCodeFromCountryCode('ES');
+		$this->assertEquals('es_ES', $language, 'ES');
+
+		$language = getLanguageCodeFromCountryCode('CL');
+		$this->assertEquals('es_CL', $language, 'CL');
+
+		$language = getLanguageCodeFromCountryCode('CA');
+		$this->assertEquals('en_CA', $language, 'CA');
+
+		$language = getLanguageCodeFromCountryCode('MQ');
+		$this->assertEquals('fr_CA', $language);
+
+		$language = getLanguageCodeFromCountryCode('FR');
+		$this->assertEquals('fr_FR', $language);
+
+		$language = getLanguageCodeFromCountryCode('BE');
+		$this->assertEquals('fr_BE', $language);
+
+		$mysoc->country_code = 'FR';
+		$language = getLanguageCodeFromCountryCode('CH');
+		$this->assertEquals('fr_CH', $language);
+
+		$mysoc->country_code = 'DE';
+		$language = getLanguageCodeFromCountryCode('CH');
+		$this->assertEquals('de_CH', $language);
+
+		$language = getLanguageCodeFromCountryCode('DE');
+		$this->assertEquals('de_DE', $language);
+
+		$language = getLanguageCodeFromCountryCode('SA');
+		$this->assertEquals('ar_SA', $language);
+
+		$language = getLanguageCodeFromCountryCode('SE');
+		$this->assertEquals('sv_SE', $language);
+
+		$language = getLanguageCodeFromCountryCode('DK');
+		$this->assertEquals('da_DK', $language);
+	}
+
+	/**
+	 * testDolTextIsHtml
+	 *
+	 * @return void
+	 */
+	public function testDolTextIsHtml()
+	{
+		// True
+		$input='<html>xxx</html>';
+		$after=dol_textishtml($input);
+		$this->assertTrue($after, 'Test with html tag');
+		$input='<body>xxx</body>';
+		$after=dol_textishtml($input);
+		$this->assertTrue($after, 'Test with body tag');
+		$input='xxx <b>yyy</b> zzz';
+		$after=dol_textishtml($input);
+		$this->assertTrue($after, 'Test with b tag');
+		$input='xxx <u>yyy</u> zzz';
+		$after=dol_textishtml($input);
+		$this->assertTrue($after, 'Test with u tag');
+		$input='text with <div>some div</div>';
+		$after=dol_textishtml($input);
+		$this->assertTrue($after, 'Test with div tag');
+		$input='text with HTML &nbsp; entities';
+		$after=dol_textishtml($input);
+		$this->assertTrue($after, 'Test with entities tag');
+		$input='xxx<br>';
+		$after=dol_textishtml($input);
+		$this->assertTrue($after, 'Test with entities br');
+		$input='xxx<br >';
+		$after=dol_textishtml($input);
+		$this->assertTrue($after, 'Test with entities br');
+		$input='xxx<br style="eee">';
+		$after=dol_textishtml($input);
+		$this->assertTrue($after, 'Test with entities br and attributes');
+		$input='xxx<br style="eee" >';
+		$after=dol_textishtml($input);
+		$this->assertTrue($after, 'Test with entities br and attributes bis');
+		$input='<h2>abc</h2>';
+		$after=dol_textishtml($input);
+		$this->assertTrue($after, 'Test with entities h2');
+		$input='<img id="abc" src="https://xxx.com/aaa/image.png" />';
+		$after=dol_textishtml($input);
+		$this->assertTrue($after, 'Test with img tag');
+		$input='<a class="azerty" href="https://xxx.com/aaa/image.png" />';
+		$after=dol_textishtml($input);
+		$this->assertTrue($after, 'Test with a tag');
+		$input='This is a text with&nbsp;html spaces';
+		$after=dol_textishtml($input);
+		$this->assertTrue($after, 'Test with a &nbsp;');
+		$input='This is a text with accent &eacute;';
+		$after=dol_textishtml($input);
+		$this->assertTrue($after, 'Test with a &eacute;');
+
+		// False
+		$input='xxx < br>';
+		$after=dol_textishtml($input);
+		$this->assertFalse($after);
+		$input='xxx <email@email.com>';	// <em> is html, <em... is not
+		$after=dol_textishtml($input);
+		$this->assertFalse($after);
+		$input='xxx <brstyle="ee">';
+		$after=dol_textishtml($input);
+		$this->assertFalse($after);
+		$input='This is a text with html comments <!-- comment -->';	// we suppose this is not enough to be html content
+		$after=dol_textishtml($input);
+		$this->assertFalse($after);
+	}
+
+
+	/**
+	 * testDolHtmlCleanLastBr
+	 *
+	 * @return boolean
+	 */
+	public function testDolHtmlCleanLastBr()
+	{
+		$input="A string\n";
+		$after=dol_htmlcleanlastbr($input);
+		$this->assertEquals("A string", $after);
+
+		$input="A string first\nA string second\n";
+		$after=dol_htmlcleanlastbr($input);
+		$this->assertEquals("A string first\nA string second", $after);
+
+		$input="A string\n\n\n";
+		$after=dol_htmlcleanlastbr($input);
+		$this->assertEquals("A string", $after);
+
+		$input="A string<br>";
+		$after=dol_htmlcleanlastbr($input);
+		$this->assertEquals("A string", $after);
+
+		$input="A string first<br>\nA string second<br>";
+		$after=dol_htmlcleanlastbr($input);
+		$this->assertEquals("A string first<br>\nA string second", $after);
+
+		$input="A string\n<br type=\"_moz\" />\n";
+		$after=dol_htmlcleanlastbr($input);
+		$this->assertEquals("A string", $after);
+
+		$input="A string\n<br><br />\n\n";
+		$after=dol_htmlcleanlastbr($input);
+		$this->assertEquals("A string", $after);
+
+		return true;
+	}
+
+	/**
+	 * testDolConcat
+	 *
+	 * @return boolean
+	 */
+	public function testDolConcat()
+	{
+		$text1="A string 1"; $text2="A string 2";	// text 1 and 2 are text, concat need only \n
+		$after=dol_concatdesc($text1, $text2);
+		$this->assertEquals("A string 1\nA string 2", $after);
+
+		$text1="A<br>string 1"; $text2="A string 2";	// text 1 is html, concat need <br>\n
+		$after=dol_concatdesc($text1, $text2);
+		$this->assertEquals("A<br>string 1<br>\nA string 2", $after);
+
+		$text1="A string 1"; $text2="A <b>string</b> 2";	// text 2 is html, concat need <br>\n
+		$after=dol_concatdesc($text1, $text2);
+		$this->assertEquals("A string 1<br>\nA <b>string</b> 2", $after);
+
+		return true;
+	}
+
+
+	/**
+	 * testDolStringNohtmltag
+	 *
+	 * @return boolean
+	 */
+	public function testDolStringNohtmltag()
+	{
+		$text="A\nstring\n\nand more\n";
+		$after=dol_string_nohtmltag($text, 0);
+		$this->assertEquals("A\nstring\n\nand more", $after, "test1a");
+
+		$text="A <b>string<b><br>\n<br>\n\nwith html tag<br>\n";
+		$after=dol_string_nohtmltag($text, 0);
+		$this->assertEquals("A string\n\n\n\n\nwith html tag", $after, 'test2a 2 br and 3 \n give 5 \n');
+
+		$text="A <b>string<b><br>\n<br>\n\nwith html tag<br>\n";
+		$after=dol_string_nohtmltag($text, 1);
+		$this->assertEquals("A string with html tag", $after, 'test2b 2 br and 3 \n give 1 space');
+
+		$text="A <b>string<b><br>\n<br>\n\nwith html tag<br>\n";
+		$after=dol_string_nohtmltag($text, 2);
+		$this->assertEquals("A string\n\nwith html tag", $after, 'test2c 2 br and 3 \n give 2 \n');
+
+		$text="A <b>string<b><br>\r\n<br>\r\n\r\nwith html tag<br>\n";
+		$after=dol_string_nohtmltag($text, 2);
+		$this->assertEquals("A string\n\nwith html tag", $after, 'test2c 2 br and 3 \r\n give 2 \n');
+
+		$text="A string<br>Another string";
+		$after=dol_string_nohtmltag($text, 0);
+		$this->assertEquals("A string\nAnother string", $after, "test4");
+
+		$text="A string<br>Another string";
+		$after=dol_string_nohtmltag($text, 1);
+		$this->assertEquals("A string Another string", $after, "test5");
+
+		$text='<a href="/myurl" title="<u>Afficher projet</u>">ABC</a>';
+		$after=dol_string_nohtmltag($text, 1);
+		$this->assertEquals("ABC", $after, "test6");
+
+		$text='<a href="/myurl" title="&lt;u&gt;Afficher projet&lt;/u&gt;">DEF</a>';
+		$after=dol_string_nohtmltag($text, 1);
+		$this->assertEquals("DEF", $after, "test7");
+
+		$text='<a href="/myurl" title="<u>A title</u>">HIJ</a>';
+		$after=dol_string_nohtmltag($text, 0);
+		$this->assertEquals("HIJ", $after, "test8");
+
+		$text="A <b>string<b>\n\nwith html tag and '<' chars<br>\n";
+		$after=dol_string_nohtmltag($text, 0);
+		$this->assertEquals("A string\n\nwith html tag and '<' chars", $after, "test9");
+
+		$text="A <b>string<b>\n\nwith tag with < chars<br>\n";
+		$after=dol_string_nohtmltag($text, 1);
+		$this->assertEquals("A string with tag with < chars", $after, "test10");
+
+		return true;
+	}
+
+
+
+	/**
+	 * testDolHtmlEntitiesBr
+	 *
+	 * @return boolean
+	 */
+	public function testDolHtmlEntitiesBr()
+	{
+		// Text not already HTML
+
+		$input="A string\nwith a é, &, < and >.";
+		$after=dol_htmlentitiesbr($input, 0);    // Add <br> before \n
+		$this->assertEquals("A string<br>\nwith a &eacute;, &amp;, &lt; and &gt;.", $after);
+
+		$input="A string\nwith a é, &, < and >.";
+		$after=dol_htmlentitiesbr($input, 1);    // Replace \n with <br>
+		$this->assertEquals("A string<br>with a &eacute;, &amp;, &lt; and &gt;.", $after);
+
+		$input="A string\nwith a é, &, < and >.\n\n";	// With some \n at end that should be cleaned
+		$after=dol_htmlentitiesbr($input, 0);    // Add <br> before \n
+		$this->assertEquals("A string<br>\nwith a &eacute;, &amp;, &lt; and &gt;.", $after);
+
+		$input="A string\nwith a é, &, < and >.\n\n";	// With some \n at end that should be cleaned
+		$after=dol_htmlentitiesbr($input, 1);    // Replace \n with <br>
+		$this->assertEquals("A string<br>with a &eacute;, &amp;, &lt; and &gt;.", $after);
+
+		// Text already HTML, so &,<,> should not be converted
+
+		$input="A string<br>\nwith a é, &, < and >.";
+		$after=dol_htmlentitiesbr($input);
+		$this->assertEquals("A string<br>\nwith a &eacute;, &, < and >.", $after);
+
+		$input="<li>\nA string with a é, &, < and >.</li>\nAnother string";
+		$after=dol_htmlentitiesbr($input);
+		$this->assertEquals("<li>\nA string with a &eacute;, &, < and >.</li>\nAnother string", $after);
+
+		$input="A string<br>\nwith a é, &, < and >.<br>";	// With some <br> at end that should be cleaned
+		$after=dol_htmlentitiesbr($input);
+		$this->assertEquals("A string<br>\nwith a &eacute;, &, < and >.", $after);
+
+		$input="<li>\nA string with a é, &, < and >.</li>\nAnother string<br>";	// With some <br> at end that should be cleaned
+		$after=dol_htmlentitiesbr($input);
+		$this->assertEquals("<li>\nA string with a &eacute;, &, < and >.</li>\nAnother string", $after);
+
+		// TODO Add test with param $removelasteolbr = 0
+
+		return true;
+	}
+
+
+	/**
+	 * testDolNbOfLinesBis
+	 *
+	 * @return boolean
+	 */
+	public function testDolNbOfLinesBis()
+	{
+		// This is not a html string so nb of lines depends on \n
+		$input="A string\nwith a é, &, < and > and bold tag.\nThird line";
+		$after=dol_nboflines_bis($input, 0);
+		$this->assertEquals($after, 3);
+
+		// This is a html string so nb of lines depends on <br>
+		$input="A string\nwith a é, &, < and > and <b>bold</b> tag.\nThird line";
+		$after=dol_nboflines_bis($input, 0);
+		$this->assertEquals($after, 1);
+
+		// This is a html string so nb of lines depends on <br>
+		$input="A string<br>with a é, &, < and > and <b>bold</b> tag.<br>Third line";
+		$after=dol_nboflines_bis($input, 0);
+		$this->assertEquals($after, 3);
+
+		return true;
+	}
+
+
+	/**
+	 * testDolUnaccent
+	 *
+	 * @return boolean
+	 */
+	public function testDolUnaccent()
+	{
+		// Text not already HTML
+
+		$input="A string\nwith a à ä é è ë ï ü ö ÿ, &, < and >.";
+		$after=dol_string_unaccent($input);
+		$this->assertEquals("A string\nwith a a a e e e i u o y, &, < and >.", $after);
+	}
+
+
+	/**
+	 * testDolUtf8Check
+	 *
+	 * @return void
+	 */
+	public function testDolUtf8Check()
+	{
+		// True
+		$result=utf8_check('azerty');
+		$this->assertTrue($result);
+
+		$file=dirname(__FILE__).'/textutf8.txt';
+		$filecontent=file_get_contents($file);
+		$result=utf8_check($filecontent);
+		$this->assertTrue($result);
+
+		$file=dirname(__FILE__).'/textiso.txt';
+		$filecontent=file_get_contents($file);
+		$result=utf8_check($filecontent);
+		$this->assertFalse($result);
+	}
+
+	/**
+	 * testDolAsciiCheck
+	 *
+	 * @return void
+	 */
+	public function testDolAsciiCheck()
+	{
+		// True
+		$result=ascii_check('azerty');
+		$this->assertTrue($result);
+
+		$result=ascii_check('é');
+		$this->assertFalse($result);
+
+		$file=dirname(__FILE__).'/textutf8.txt';
+		$filecontent=file_get_contents($file);
+		$result=ascii_check($filecontent);
+		$this->assertFalse($result);
+	}
+
+	/**
+	 * testDolTrunc
+	 *
+	 * @return boolean
+	 */
+	public function testDolTrunc()
+	{
+		// Default trunc (will add ... if truncation truncation or keep last char if only one char)
+		$input="éeéeéeàa";
+		$after=dol_trunc($input, 3);
+		$this->assertEquals("éeé...", $after, 'Test A1');
+		$after=dol_trunc($input, 2);
+		$this->assertEquals("ée...", $after, 'Test A2');
+		$after=dol_trunc($input, 1);
+		$this->assertEquals("é...", $after, 'Test A3');
+		$input="éeéeé";
+		$after=dol_trunc($input, 3);
+		$this->assertEquals("éeéeé", $after, 'Test B1');
+		$after=dol_trunc($input, 2);
+		$this->assertEquals("éeéeé", $after, 'Test B2');
+		$after=dol_trunc($input, 1);
+		$this->assertEquals("é...", $after, 'Test B3');
+		$input="éeée";
+		$after=dol_trunc($input, 3);
+		$this->assertEquals("éeée", $after, 'Test C1');
+		$after=dol_trunc($input, 2);
+		$this->assertEquals("éeée", $after, 'Test C2');
+		$after=dol_trunc($input, 1);
+		$this->assertEquals("éeée", $after, 'Test C3');
+		$input="éeé";
+		$after=dol_trunc($input, 3);
+		$this->assertEquals("éeé", $after, 'Test C');
+		$after=dol_trunc($input, 2);
+		$this->assertEquals("éeé", $after, 'Test D');
+		$after=dol_trunc($input, 1);
+		$this->assertEquals("éeé", $after, 'Test E');
+		// Trunc with no ...
+		$input="éeéeéeàa";
+		$after=dol_trunc($input, 3, 'right', 'UTF-8', 1);
+		$this->assertEquals("éeé", $after, 'Test F');
+		$after=dol_trunc($input, 2, 'right', 'UTF-8', 1);
+		$this->assertEquals("ée", $after, 'Test G');
+		$input="éeé";
+		$after=dol_trunc($input, 3, 'right', 'UTF-8', 1);
+		$this->assertEquals("éeé", $after, 'Test H');
+		$after=dol_trunc($input, 2, 'right', 'UTF-8', 1);
+		$this->assertEquals("ée", $after, 'Test I');
+		$after=dol_trunc($input, 1, 'right', 'UTF-8', 1);
+		$this->assertEquals("é", $after, 'Test J');
+		$input="éeéeéeàa";
+		$after=dol_trunc($input, 4, 'middle');
+		$this->assertEquals("ée...àa", $after, 'Test K');
+
+		return true;
+	}
+
+	/**
+	 * testDolMkTime
+	 *
+	 * @return	void
+	 */
+	public function testDolMkTime()
+	{
+		global $conf;
+
+		$savtz=date_default_timezone_get();
+
+		// Some test for UTC TZ
+		date_default_timezone_set('UTC');
+
+		// Check bad hours
+		$result=dol_mktime(25, 0, 0, 1, 1, 1970, 1, 1);    // Error (25 hours)
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('', $result);
+		$result=dol_mktime(2, 61, 0, 1, 1, 1970, 1, 1);    // Error (61 minutes)
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('', $result);
+		$result=dol_mktime(2, 1, 61, 1, 1, 1970, 1, 1);    // Error (61 seconds)
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('', $result);
+		$result=dol_mktime(2, 1, 1, 1, 32, 1970, 1, 1);    // Error (day 32)
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('', $result);
+		$result=dol_mktime(2, 1, 1, 13, 1, 1970, 1, 1);    // Error (month 13)
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('', $result);
+
+		$result=dol_mktime(2, 1, 1, 1, 1, 1970, 1);    // 1970-01-01 02:01:01 in GMT area -> 7261
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(7261, $result);
+
+		$result=dol_mktime(2, 0, 0, 1, 1, 1970, 0);                // 1970-01-01 02:00:00 = 7200 in local area Europe/Paris = 3600 GMT
+		print __METHOD__." result=".$result."\n";
+		$tz=getServerTimeZoneInt('winter');                  // +1 in Europe/Paris at this time (this time is winter)
+		$this->assertEquals(7200-($tz*3600), $result);        // 7200 if we are at greenwich winter, 7200-($tz*3600) at local winter
+
+		// Some test for local TZ Europe/Paris
+		date_default_timezone_set('Europe/Paris');
+
+		// Check that tz for paris in winter is used
+		$result=dol_mktime(2, 0, 0, 1, 1, 1970, 'server');         // 1970-01-01 02:00:00 = 7200 in local area Europe/Paris = 3600 GMT
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(3600, $result);        			 // 7200 if we are at greenwich winter, 3600 at Europe/Paris
+
+		// Check that daylight saving time is used
+		$result=dol_mktime(2, 0, 0, 6, 1, 2014, 0);         		// 2014-06-01 02:00:00 = 1401588000-3600(location)-3600(daylight) in local area Europe/Paris = 1401588000 GMT
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(1401588000-3600-3600, $result);  // 1401588000 are at greenwich summer, 1401588000-3600(location)-3600(daylight) at Europe/Paris summer
+
+		date_default_timezone_set($savtz);
+	}
+
+
+	/**
+	 * testDolEscapeJs
+	 *
+	 * @return	void
+	 */
+	public function testDolEscapeJs()
+	{
+		$input="x&<b>#</b>,\"'";    // " will be converted into '
+		$result=dol_escape_js($input);
+		$this->assertEquals("x&<b>#</b>,\'\'", $result, "Test mode=0");
+
+		$result=dol_escape_js($input, 1);
+		$this->assertEquals("x&<b>#</b>,\"\'", $result, "Test mode=1");
+
+		$result=dol_escape_js($input, 2);
+		$this->assertEquals("x&<b>#</b>,\\\"'", $result, "Test mode=2");
+	}
+
+
+	/**
+	* testDolEscapeHtmlTag
+	*
+	* @return	void
+	*/
+	public function testDolEscapeHtmlTag()
+	{
+		$input='x&<b>#</b>,"';    // & and " are converted into html entities, <b> are removed
+		$result=dol_escape_htmltag($input);
+		$this->assertEquals('x&amp;#,&quot;', $result);
+
+		$input='x&<b>#</b>,"';    // & and " are converted into html entities, <b> are not removed
+		$result=dol_escape_htmltag($input, 1);
+		$this->assertEquals('x&amp;&lt;b&gt;#&lt;/b&gt;,&quot;', $result);
+	}
+
+
+	/**
+	 * testDolFormatAddress
+	 *
+	 * @return	void
+	 */
+	public function testDolFormatAddress()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$object=new Societe($db);
+		$object->initAsSpecimen();
+
+		$object->country_code='FR';
+		$address=dol_format_address($object);
+		$this->assertEquals("21 jump street\n99999 MyTown", $address);
+
+		$object->country_code='GB';
+		$address=dol_format_address($object);
+		$this->assertEquals("21 jump street\nMyTown, MyState\n99999", $address);
+
+		$object->country_code='US';
+		$address=dol_format_address($object);
+		$this->assertEquals("21 jump street\nMyTown, MyState, 99999", $address);
+
+		$object->country_code='AU';
+		$address=dol_format_address($object);
+		$this->assertEquals("21 jump street\nMyTown, MyState, 99999", $address);
+	}
+
+
+	/**
+	 * testDolFormatAddress
+	 *
+	 * @return	void
+	 */
+	public function testDolPrintPhone()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$object=new Societe($db);
+		$object->initAsSpecimen();
+
+		$object->country_code='FR';
+		$phone=dol_print_phone('1234567890', $object->country_code);
+		$this->assertEquals('<span style="margin-right: 10px;">12&nbsp;34&nbsp;56&nbsp;78&nbsp;90</span>', $phone, 'Phone for FR 1');
+
+		$object->country_code='FR';
+		$phone=dol_print_phone('1234567890', $object->country_code, 0, 0, 0, '');
+		$this->assertEquals('<span style="margin-right: 10px;">1234567890</span>', $phone, 'Phone for FR 2');
+
+		$object->country_code='FR';
+		$phone=dol_print_phone('1234567890', $object->country_code, 0, 0, 0, ' ');
+		$this->assertEquals('<span style="margin-right: 10px;">12 34 56 78 90</span>', $phone, 'Phone for FR 3');
+
+		$object->country_code='CA';
+		$phone=dol_print_phone('1234567890', $object->country_code, 0, 0, 0, ' ');
+		$this->assertEquals('<span style="margin-right: 10px;">(123) 456-7890</span>', $phone, 'Phone for CA 1');
+	}
+
+
+	/**
+	 * testImgPicto
+	 *
+	 * @return	void
+	 */
+	public function testImgPicto()
+	{
+		$s=img_picto('title', 'user');
+		print __METHOD__." s=".$s."\n";
+		$this->assertContains('fa-user', $s, 'testImgPicto1');
+
+		$s=img_picto('title', 'img.png', 'style="float: right"', 0);
+		print __METHOD__." s=".$s."\n";
+		$this->assertContains('theme', $s, 'testImgPicto2');
+		$this->assertContains('style="float: right"', $s, 'testImgPicto2');
+
+		$s=img_picto('title', '/fullpath/img.png', '', 1);
+		print __METHOD__." s=".$s."\n";
+		$this->assertEquals('<img src="/fullpath/img.png" alt="" title="title" class="inline-block">', $s, 'testImgPicto3');
+
+		$s=img_picto('title', '/fullpath/img.png', '', true);
+		print __METHOD__." s=".$s."\n";
+		$this->assertEquals('<img src="/fullpath/img.png" alt="" title="title" class="inline-block">', $s, 'testImgPicto4');
+
+		$s=img_picto('title', 'delete', '', 0, 1);
+		print __METHOD__." s=".$s."\n";
+		$this->assertEquals(DOL_URL_ROOT.'/theme/eldy/img/delete.png', $s, 'testImgPicto5');
+	}
+
+	/**
+	 * testDolNow
+	 *
+	 * @return	void
+	 */
+	public function testDolNow()
+	{
+		$now=dol_now('gmt');
+		$nowtzserver=dol_now('tzserver');
+		print __METHOD__." getServerTimeZoneInt=".(getServerTimeZoneInt('now')*3600)."\n";
+		$this->assertEquals(getServerTimeZoneInt('now')*3600, ($nowtzserver-$now));
+	}
+
+	/**
+	 * testVerifCond
+	 *
+	 * @return	void
+	 */
+	public function testVerifCond()
+	{
+		$verifcond=verifCond('1==1');
+		$this->assertTrue($verifcond, 'Test a true comparison');
+
+		$verifcond=verifCond('1==2');
+		$this->assertFalse($verifcond, 'Test a false comparison');
+
+		$verifcond=verifCond('$conf->facture->enabled');
+		$this->assertTrue($verifcond, 'Test that conf property of a module report true when enabled');
+
+		$verifcond=verifCond('$conf->moduledummy->enabled');
+		$this->assertFalse($verifcond, 'Test that conf property of a module report false when disabled');
+
+		$verifcond=verifCond('');
+		$this->assertTrue($verifcond);
+	}
+
+	/**
+	 * testGetDefaultTva
+	 *
+	 * @return	void
+	 */
+	public function testGetDefaultTva()
+	{
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
+
+		// Sellers
+		$companyfrnovat=new Societe($db);
+		$companyfrnovat->country_code='FR';
+		$companyfrnovat->tva_assuj=0;
+
+		$companyfr=new Societe($db);
+		$companyfr->country_code='FR';
+		$companyfr->tva_assuj=1;
+		$companyfr->tva_intra='FR9999';
+
+		// Buyers
+		$companymc=new Societe($db);
+		$companymc->country_code='MC';
+		$companymc->tva_assuj=1;
+		$companyfr->tva_intra='MC9999';
+
+		$companyit=new Societe($db);
+		$companyit->country_code='IT';
+		$companyit->tva_assuj=1;
+		$companyit->tva_intra='IT99999';
+
+		$companyde=new Societe($db);
+		$companyde->country_code='DE';
+		$companyde->tva_assuj=1;
+		$companyde->tva_intra='DE99999';
+
+		$notcompanyde=new Societe($db);
+		$notcompanyde->country_code='DE';
+		$notcompanyde->tva_assuj=0;
+		$notcompanyde->tva_intra='';
+		$notcompanyde->typent_code='TE_PRIVATE';
+
+		$companyus=new Societe($db);
+		$companyus->country_code='US';
+		$companyus->tva_assuj=1;
+		$companyus->tva_intra='';
+
+
+		// Test RULE 0 (FR-DE)
+		// Not tested
+
+		// Test RULE 1
+		$vat=get_default_tva($companyfrnovat, $companymc, 0);
+		$this->assertEquals(0, $vat, 'RULE 1');
+
+		// Test RULE 2 (FR-FR)
+		$vat=get_default_tva($companyfr, $companyfr, 0);
+		$this->assertEquals(20, $vat, 'RULE 2');
+
+		// Test RULE 2 (FR-MC)
+		$vat=get_default_tva($companyfr, $companymc, 0);
+		$this->assertEquals(20, $vat, 'RULE 2');
+
+		// Test RULE 3 (FR-DE company)
+		$vat=get_default_tva($companyfr, $companyit, 0);
+		$this->assertEquals(0, $vat, 'RULE 3');
+
+		// Test RULE 4 (FR-DE not a company)
+		$vat=get_default_tva($companyfr, $notcompanyde, 0);
+		$this->assertEquals(20, $vat, 'RULE 4');
+
+		// Test RULE 5 (FR-US)
+		$vat=get_default_tva($companyfr, $companyus, 0);
+		$this->assertEquals(0, $vat, 'RULE 5');
+
+
+		// We do same tests but with option SERVICE_ARE_ECOMMERCE_200238EC on.
+		$conf->global->SERVICE_ARE_ECOMMERCE_200238EC = 1;
+
+
+		// Test RULE 1 (FR-US)
+		$vat=get_default_tva($companyfr, $companyus, 0);
+		$this->assertEquals(0, $vat, 'RULE 1 ECOMMERCE_200238EC');
+
+		// Test RULE 2 (FR-FR)
+		$vat=get_default_tva($companyfr, $companyfr, 0);
+		$this->assertEquals(20, $vat, 'RULE 2 ECOMMERCE_200238EC');
+
+		// Test RULE 3 (FR-DE company)
+		$vat=get_default_tva($companyfr, $companyde, 0);
+		$this->assertEquals(0, $vat, 'RULE 3 ECOMMERCE_200238EC');
+
+		// Test RULE 4 (FR-DE not a company)
+		$vat=get_default_tva($companyfr, $notcompanyde, 0);
+		$this->assertEquals(19, $vat, 'RULE 4 ECOMMERCE_200238EC');
+
+		// Test RULE 5 (FR-US)
+		$vat=get_default_tva($companyfr, $companyus, 0);
+		$this->assertEquals(0, $vat, 'RULE 5 ECOMMERCE_200238EC');
+	}
+
+	/**
+	 * testGetDefaultTva
+	 *
+	 * @return	void
+	 */
+	public function testGetDefaultLocalTax()
+	{
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
+
+		$companyfrnovat=new Societe($db);
+		$companyfrnovat->country_code='FR';
+		$companyfrnovat->tva_assuj=0;
+		$companyfrnovat->localtax1_assuj=0;
+		$companyfrnovat->localtax2_assuj=0;
+
+		$companyes=new Societe($db);
+		$companyes->country_code='ES';
+		$companyes->tva_assuj=1;
+		$companyes->localtax1_assuj=1;
+		$companyes->localtax2_assuj=1;
+
+		$companymc=new Societe($db);
+		$companymc->country_code='MC';
+		$companymc->tva_assuj=1;
+		$companymc->localtax1_assuj=0;
+		$companymc->localtax2_assuj=0;
+
+		$companyit=new Societe($db);
+		$companyit->country_code='IT';
+		$companyit->tva_assuj=1;
+		$companyit->tva_intra='IT99999';
+		$companyit->localtax1_assuj=0;
+		$companyit->localtax2_assuj=0;
+
+		$notcompanyit=new Societe($db);
+		$notcompanyit->country_code='IT';
+		$notcompanyit->tva_assuj=1;
+		$notcompanyit->tva_intra='';
+		$notcompanyit->typent_code='TE_PRIVATE';
+		$notcompanyit->localtax1_assuj=0;
+		$notcompanyit->localtax2_assuj=0;
+
+		$companyus=new Societe($db);
+		$companyus->country_code='US';
+		$companyus->tva_assuj=1;
+		$companyus->tva_intra='';
+		$companyus->localtax1_assuj=0;
+		$companyus->localtax2_assuj=0;
+
+		// Test RULE FR-MC
+		$vat1=get_default_localtax($companyfrnovat, $companymc, 1, 0);
+		$vat2=get_default_localtax($companyfrnovat, $companymc, 2, 0);
+		$this->assertEquals(0, $vat1);
+		$this->assertEquals(0, $vat2);
+
+		// Test RULE ES-ES
+		$vat1=get_default_localtax($companyes, $companyes, 1, 0);
+		$vat2=get_default_localtax($companyes, $companyes, 2, 0);
+		$this->assertEquals($vat1, 5.2);
+		$this->assertStringStartsWith((string) $vat2, '-19:-15:-9');       // Can be -19 (old version) or '-19:-15:-9' (new setup)
+
+		// Test RULE ES-IT
+		$vat1=get_default_localtax($companyes, $companyit, 1, 0);
+		$vat2=get_default_localtax($companyes, $companyit, 2, 0);
+		$this->assertEquals(0, $vat1);
+		$this->assertEquals(0, $vat2);
+
+		// Test RULE ES-IT
+		$vat1=get_default_localtax($companyes, $notcompanyit, 1, 0);
+		$vat2=get_default_localtax($companyes, $notcompanyit, 2, 0);
+		$this->assertEquals(0, $vat1);
+		$this->assertEquals(0, $vat2);
+
+		// Test RULE FR-IT
+		// Not tested
+
+		// Test RULE ES-US
+		$vat1=get_default_localtax($companyes, $companyus, 1, 0);
+		$vat2=get_default_localtax($companyes, $companyus, 2, 0);
+		$this->assertEquals(0, $vat1);
+		$this->assertEquals(0, $vat2);
+	}
+
+
+	/**
+	 * testDolExplodeIntoArray
+	 *
+	 * @return	void
+	 */
+	public function testDolExplodeIntoArray()
+	{
+		$stringtoexplode='AA=B/B.CC=.EE=FF.HH=GG;.';
+		$tmp=dolExplodeIntoArray($stringtoexplode, '.', '=');
+
+		print __METHOD__." tmp=".json_encode($tmp)."\n";
+		$this->assertEquals('{"AA":"B\/B","CC":"","EE":"FF","HH":"GG;"}', json_encode($tmp));
+	}
+
+	/**
+	 * dol_nl2br
+	 *
+	 * @return void
+	 */
+	public function testDolNl2Br()
+	{
+
+		//String to encode
+		$string = "a\na";
+
+		$this->assertEquals(dol_nl2br($string), "a<br>\na");
+
+		//With $forxml parameter
+		$this->assertEquals(dol_nl2br($string, 0, 1), "a<br />\na");
+
+		//Replacing \n by br
+		$this->assertEquals(dol_nl2br($string, 1), "a<br>a");
+
+		//With $forxml parameter
+		$this->assertEquals(dol_nl2br($string, 1, 1), "a<br />a");
+	}
+
+	/**
+	 * testDolPrice2Num
+	 *
+	 * @return boolean
+	 */
+	public function testDolPrice2Num()
+	{
+		global $langs, $conf;
+
+		$oldlangs = $langs;
+
+		$newlangs = new Translate('', $conf);
+		$newlangs->setDefaultLang('en_US');
+		$newlangs->load("main");
+		$langs = $newlangs;
+
+		$this->assertEquals(150, price2num('(SELECT/**/CASE/**/WHEN/**/(0<1)/**/THEN/**/SLEEP(5)/**/ELSE/**/SLEEP(0)/**/END)'));
+
+		$this->assertEquals(1000, price2num('1 000.0'));
+		$this->assertEquals(1000, price2num('1 000', 'MT'));
+		$this->assertEquals(1000, price2num('1 000', 'MU'));
+
+		$this->assertEquals(1000.123456, price2num('1 000.123456'));
+
+		// Round down
+		$this->assertEquals(1000.12, price2num('1 000.123452', 'MT'));
+		$this->assertEquals(1000.12345, price2num('1 000.123452', 'MU'), "Test MU");
+
+		// Round up
+		$this->assertEquals(1000.13, price2num('1 000.125456', 'MT'));
+		$this->assertEquals(1000.12546, price2num('1 000.125456', 'MU'), "Test MU");
+
+		$this->assertEquals(1, price2num('1.000'), 'Test 1.000 give 1 with english language');
+
+		// Text can't be converted
+		$this->assertEquals('12.4$', price2num('12.4$'));
+		$this->assertEquals('12.4$', price2num('12r.4$'));
+
+		// For spanish language
+		$newlangs2 = new Translate('', $conf);
+		$newlangs2->setDefaultLang('es_ES');
+		$newlangs2->load("main");
+		$langs = $newlangs2;
+
+		// Test with 3 chars after . or ,
+		// If a . is used and there is 3 digits after, it is a thousand separator
+		$this->assertEquals(1234, price2num('1.234', '', 2), 'Test 1.234 give 1234 with spanish language if user input');
+		$this->assertEquals(1.234, price2num('1,234', '', 2), 'Test 1,234 give 1234 with spanish language if user input');
+		$this->assertEquals(1234, price2num('1 234', '', 2), 'Test 1 234 give 1234 with spanish language if user input');
+		$this->assertEquals(-1.234, price2num('-1.234'), 'Test 1.234 give 1.234 with spanish language');
+		$this->assertEquals(-1.234, price2num('-1,234'), 'Test 1,234 give 1234 with spanish language');
+		$this->assertEquals(-1234, price2num('-1 234'), 'Test 1 234 give 1234 with spanish language');
+		$this->assertEquals(21500123, price2num('21.500.123'), 'Test 21.500.123 give 21500123 with spanish language');
+		$this->assertEquals(21500123, price2num('21500.123', 0, 2), 'Test 21500.123 give 21500123 with spanish language if user input');
+		$this->assertEquals(21500.123, price2num('21500.123'), 'Test 21500.123 give 21500123 with spanish language');
+		$this->assertEquals(21500.123, price2num('21500,123'), 'Test 21500,123 give 21500.123 with spanish language');
+		// Test with 2 digits
+		$this->assertEquals(21500.12, price2num('21500.12'), 'Test 21500.12 give 21500.12 with spanish language');
+		$this->assertEquals(21500.12, price2num('21500,12'), 'Test 21500,12 give 21500.12 with spanish language');
+		// Test with 3 digits
+		$this->assertEquals(12123, price2num('12.123', '', 2), 'Test 12.123 give 12123 with spanish language if user input');
+		$this->assertEquals(12.123, price2num('12,123', '', 2), 'Test 12,123 give 12.123 with spanish language if user input');
+		$this->assertEquals(12.123, price2num('12.123'), 'Test 12.123 give 12.123 with spanish language');
+		$this->assertEquals(12.123, price2num('12,123'), 'Test 12,123 give 12.123 with spanish language');
+
+		// For french language
+		$newlangs3 = new Translate('', $conf);
+		$newlangs3->setDefaultLang('fr_FR');
+		$newlangs3->load("main");
+		$langs = $newlangs3;
+
+		$this->assertEquals(1, price2num('1.000', '', 2), 'Test 1.000 give 1 with french language if user input');
+		$this->assertEquals(1, price2num('1.000'), 'Test 1.000 give 1 with french language');
+		$this->assertEquals(1000, price2num('1 000'), 'Test 1.000 give 1 with french language');
+		$this->assertEquals(1.234, price2num('1.234', '', 2), 'Test 1.234 give 1.234 with french language if user input');
+		$this->assertEquals(1.234, price2num('1.234'), 'Test 1.234 give 1.234 with french language');
+		$this->assertEquals(1.234, price2num('1,234', '', 2), 'Test 1,234 give 1.234 with french language if user input');
+		$this->assertEquals(1.234, price2num('1,234'), 'Test 1,234 give 1.234 with french language');
+		$this->assertEquals(21500000, price2num('21500 000'), 'Test 21500 000 give 21500000 with french language');
+		$this->assertEquals(21500000, price2num('21 500 000'), 'Test 21 500 000 give 21500000 with french language');
+		$this->assertEquals(21500, price2num('21500.00'), 'Test 21500.00 give 21500 with french language');
+		$this->assertEquals(21500, price2num('21500,00'), 'Test 21500,00 give 21500 with french language');
+
+		$langs = $oldlangs;
+
+		return true;
+	}
+
+	/**
+	 * testDolGetDate
+	 *
+	 * @return boolean
+	 */
+	public function testDolGetDate()
+	{
+		global $conf;
+
+		$conf->global->MAIN_START_WEEK = 0;
+
+		$tmp=dol_getdate(24*60*60+1);		// 2/1/1970 and 1 second = friday
+		$this->assertEquals(5, $tmp['wday']);
+
+		$conf->global->MAIN_START_WEEK = 1;
+
+		$tmp=dol_getdate(1);				// 1/1/1970 and 1 second = thirday
+		$this->assertEquals(4, $tmp['wday']);
+
+		$tmp=dol_getdate(24*60*60+1);		// 2/1/1970 and 1 second = friday
+		$this->assertEquals(5, $tmp['wday']);
+
+		$tmp=dol_getdate(1, false, "Europe/Paris");						// 1/1/1970 and 1 second = thirday
+		$this->assertEquals(1970, $tmp['year']);
+		$this->assertEquals(1, $tmp['mon']);
+		$this->assertEquals(1, $tmp['mday']);
+		$this->assertEquals(4, $tmp['wday']);
+		$this->assertEquals(0, $tmp['yday']);
+		$this->assertEquals(1, $tmp['hours']);		// We are winter, so we are GMT+1 even during summer
+		$this->assertEquals(0, $tmp['minutes']);
+		$this->assertEquals(1, $tmp['seconds']);
+
+		$tmp=dol_getdate(15638401, false, "Europe/Paris");					// 1/7/1970 and 1 second = wednesday
+		$this->assertEquals(1970, $tmp['year']);
+		$this->assertEquals(7, $tmp['mon']);
+		$this->assertEquals(1, $tmp['mday']);
+		$this->assertEquals(3, $tmp['wday']);
+		$this->assertEquals(181, $tmp['yday']);
+		$this->assertEquals(1, $tmp['hours']);		// There is no daylight in 1970, so we are GMT+1 even during summer
+		$this->assertEquals(0, $tmp['minutes']);
+		$this->assertEquals(1, $tmp['seconds']);
+
+		$tmp=dol_getdate(1593561601, false, "Europe/Paris");				// 1/7/2020 and 1 second = wednesday
+		$this->assertEquals(2020, $tmp['year']);
+		$this->assertEquals(7, $tmp['mon']);
+		$this->assertEquals(1, $tmp['mday']);
+		$this->assertEquals(3, $tmp['wday']);
+		$this->assertEquals(182, $tmp['yday']);		// 182 and not 181, due to the 29th february
+		$this->assertEquals(2, $tmp['hours']);		// There is a daylight, so we are GMT+2
+		$this->assertEquals(0, $tmp['minutes']);
+		$this->assertEquals(1, $tmp['seconds']);
+
+		$conf->global->MAIN_USE_OLD_FUNCTIONS_FOR_GETDATE = 1;
+
+		$tmp=dol_getdate(1);						// 1/1/1970 and 1 second = thirday
+		$this->assertEquals(1970, $tmp['year']);
+		$this->assertEquals(1, $tmp['mon']);
+		$this->assertEquals(1, $tmp['mday']);
+		$this->assertEquals(4, $tmp['wday']);
+		$this->assertEquals(0, $tmp['yday']);
+		// We must disable this because on CI, timezone is may be UTC or something else
+		//$this->assertEquals(1, $tmp['hours']);		// We are winter, so we are GMT+1 even during summer
+		$this->assertEquals(0, $tmp['minutes']);
+		$this->assertEquals(1, $tmp['seconds']);
+
+		$tmp=dol_getdate(15638401);					// 1/7/1970 and 1 second = wednesday
+		$this->assertEquals(1970, $tmp['year']);
+		$this->assertEquals(7, $tmp['mon']);
+		$this->assertEquals(1, $tmp['mday']);
+		$this->assertEquals(3, $tmp['wday']);
+		$this->assertEquals(181, $tmp['yday']);
+		// We must disable this because on CI, timezone is may be UTC or something else
+		//$this->assertEquals(1, $tmp['hours']);		// There is no daylight in 1970, so we are GMT+1 even during summer
+		$this->assertEquals(0, $tmp['minutes']);
+		$this->assertEquals(1, $tmp['seconds']);
+
+		$tmp=dol_getdate(1593561601);				// 1/7/2020 and 1 second = wednesday
+		$this->assertEquals(2020, $tmp['year']);
+		$this->assertEquals(7, $tmp['mon']);
+		$this->assertEquals(1, $tmp['mday']);
+		$this->assertEquals(3, $tmp['wday']);
+		$this->assertEquals(182, $tmp['yday']);		// 182 and not 181, due to the 29th february
+		// We must disable this because on CI, timezone is may be UTC or something else
+		//$this->assertEquals(2, $tmp['hours']);		// There is a daylight, so we are GMT+2
+		$this->assertEquals(0, $tmp['minutes']);
+		$this->assertEquals(1, $tmp['seconds']);
+
+		return true;
+	}
+
+
+	/**
+	 * testMakeSubstitutions
+	 *
+	 * @return boolean
+	 */
+	public function testMakeSubstitutions()
+	{
+		global $conf, $langs;
+		$langs->load("main");
+
+		$substit=array("AAA"=>'Not used', "BBB"=>'Not used', "CCC"=>"C replaced");
+		$chaine='This is a string with __[MAIN_THEME]__ and __(DIRECTION)__ and __CCC__';
+		$newstring = make_substitutions($chaine, $substit);
+		$this->assertEquals($newstring, 'This is a string with eldy and ltr and __C replaced__');
+
+		return true;
+	}
+
+	/**
+	 * testDolStringIsGoodIso
+	 *
+	 * @return boolean
+	 */
+	public function testDolStringIsGoodIso()
+	{
+		global $conf, $langs;
+
+		$chaine='This is an ISO string';
+		$result = dol_string_is_good_iso($chaine);
+		$this->assertEquals($result, 1);
+
+		$chaine='This is a not ISO string '.chr(0);
+		$result = dol_string_is_good_iso($chaine);
+		$this->assertEquals($result, 0);
+
+		return true;
+	}
+
+
+	/**
+	 * testGetUserRemoteIP
+	 *
+	 * @return boolean
+	 */
+	public function testGetUserRemoteIP()
+	{
+		global $conf, $langs;
+
+		$_SERVER['HTTP_X_FORWARDED_FOR']='1.2.3.4';
+		$_SERVER['HTTP_CLIENT_IP']='5.6.7.8';
+		$result = getUserRemoteIP();
+		$this->assertEquals($result, '1.2.3.4');
+
+		$_SERVER['HTTP_X_FORWARDED_FOR']='1.2.3.4<corrupted>';
+		$_SERVER['HTTP_CLIENT_IP']='5.6.7.8';
+		$result = getUserRemoteIP();
+		$this->assertEquals($result, '5.6.7.8');
+
+		$_SERVER['HTTP_X_FORWARDED_FOR']='[1:2:3:4]';
+		$_SERVER['HTTP_CLIENT_IP']='5.6.7.8';
+		$result = getUserRemoteIP();
+		$this->assertEquals($result, '[1:2:3:4]');
+
+		return true;
+	}
 }
diff --git a/test/phpunit/GetUrlLibTest.php b/test/phpunit/GetUrlLibTest.php
index 268122c8d48..97878ef9589 100644
--- a/test/phpunit/GetUrlLibTest.php
+++ b/test/phpunit/GetUrlLibTest.php
@@ -30,11 +30,10 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/geturl.lib.php';
 
-if (empty($user->id))
-{
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+if (empty($user->id)) {
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -48,202 +47,202 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class GetUrlLibTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return FilesLibTest
-     */
-    public function __construct()
-    {
-        parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return FilesLibTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-        //$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return	void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
-    /**
-     * End phpunit tests
-     *
-     * @return	void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
 
-    /**
-     * testGetRootURLFromURL
-     *
-     * @return	int
-     */
-    public function testGetRootURLFromURL()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testGetRootURLFromURL
+	 *
+	 * @return	int
+	 */
+	public function testGetRootURLFromURL()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=getRootURLFromURL('http://www.dolimed.com/screenshots/afile');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('http://www.dolimed.com', $result, 'Test 1');
+		$result=getRootURLFromURL('http://www.dolimed.com/screenshots/afile');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('http://www.dolimed.com', $result, 'Test 1');
 
-        $result=getRootURLFromURL('https://www.dolimed.com/screenshots/afile');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('https://www.dolimed.com', $result, 'Test 2');
+		$result=getRootURLFromURL('https://www.dolimed.com/screenshots/afile');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('https://www.dolimed.com', $result, 'Test 2');
 
-        $result=getRootURLFromURL('http://www.dolimed.com/screenshots');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('http://www.dolimed.com', $result);
+		$result=getRootURLFromURL('http://www.dolimed.com/screenshots');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('http://www.dolimed.com', $result);
 
-        $result=getRootURLFromURL('https://www.dolimed.com/screenshots');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('https://www.dolimed.com', $result);
+		$result=getRootURLFromURL('https://www.dolimed.com/screenshots');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('https://www.dolimed.com', $result);
 
-        $result=getRootURLFromURL('http://www.dolimed.com/');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('http://www.dolimed.com', $result);
+		$result=getRootURLFromURL('http://www.dolimed.com/');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('http://www.dolimed.com', $result);
 
-        $result=getRootURLFromURL('https://www.dolimed.com/');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('https://www.dolimed.com', $result);
+		$result=getRootURLFromURL('https://www.dolimed.com/');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('https://www.dolimed.com', $result);
 
-        $result=getRootURLFromURL('http://www.dolimed.com');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('http://www.dolimed.com', $result);
+		$result=getRootURLFromURL('http://www.dolimed.com');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('http://www.dolimed.com', $result);
 
-        $result=getRootURLFromURL('https://www.dolimed.com');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('https://www.dolimed.com', $result);
+		$result=getRootURLFromURL('https://www.dolimed.com');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('https://www.dolimed.com', $result);
 
-        return 1;
-    }
+		return 1;
+	}
 
-    /**
-     * testGetDomainFromURL
-     *
-     * @return	int
-     */
-    public function testGetDomainFromURL()
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+	/**
+	 * testGetDomainFromURL
+	 *
+	 * @return	int
+	 */
+	public function testGetDomainFromURL()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-    	$result=getDomainFromURL('http://localhost');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('localhost', $result, 'Test 0a');
+		$result=getDomainFromURL('http://localhost');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('localhost', $result, 'Test 0a');
 
-    	$result=getDomainFromURL('http://localhost', 1);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('localhost', $result, 'Test 0b');
+		$result=getDomainFromURL('http://localhost', 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('localhost', $result, 'Test 0b');
 
-    	$result=getDomainFromURL('https://dolimed.com');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('dolimed', $result, 'Test 1');
+		$result=getDomainFromURL('https://dolimed.com');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('dolimed', $result, 'Test 1');
 
-    	$result=getDomainFromURL('http://www.dolimed.com/screenshots/afile');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('dolimed', $result, 'Test 2');
+		$result=getDomainFromURL('http://www.dolimed.com/screenshots/afile');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('dolimed', $result, 'Test 2');
 
-    	$result=getDomainFromURL('http://www.with.dolimed.com/screenshots/afile');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('dolimed', $result, 'Test 3');
+		$result=getDomainFromURL('http://www.with.dolimed.com/screenshots/afile');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('dolimed', $result, 'Test 3');
 
-    	$result=getDomainFromURL('https://dolimed.com', 1);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('dolimed.com', $result, 'Test 4');
+		$result=getDomainFromURL('https://dolimed.com', 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('dolimed.com', $result, 'Test 4');
 
-    	$result=getDomainFromURL('http://www.dolimed.com/screenshots/afile', 1);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('dolimed.com', $result, 'Test 5');
+		$result=getDomainFromURL('http://www.dolimed.com/screenshots/afile', 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('dolimed.com', $result, 'Test 5');
 
-    	$result=getDomainFromURL('http://www.with.dolimed.com/screenshots/afile', 1);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('dolimed.com', $result, 'Test 6');
+		$result=getDomainFromURL('http://www.with.dolimed.com/screenshots/afile', 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('dolimed.com', $result, 'Test 6');
 
-    	return 1;
-    }
+		return 1;
+	}
 
-    /**
-     * testRemoveHtmlComment
-     *
-     * @return	int
-     */
-    public function testRemoveHtmlComment()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testRemoveHtmlComment
+	 *
+	 * @return	int
+	 */
+	public function testRemoveHtmlComment()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=removeHtmlComment('abc<!--[if lt IE 8]>aaaa<![endif]-->def');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('abcdef', $result, 'Test 1');
+		$result=removeHtmlComment('abc<!--[if lt IE 8]>aaaa<![endif]-->def');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('abcdef', $result, 'Test 1');
 
-        $result=removeHtmlComment('abc<!--[if lt IE 8]>aa-->bb<!--aa<![endif]-->def');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('abcbbdef', $result, 'Test 1');
+		$result=removeHtmlComment('abc<!--[if lt IE 8]>aa-->bb<!--aa<![endif]-->def');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('abcbbdef', $result, 'Test 1');
 
-        return 1;
-    }
+		return 1;
+	}
 }
diff --git a/test/phpunit/HolidayTest.php b/test/phpunit/HolidayTest.php
index e7ad436b586..bba5d68c41e 100644
--- a/test/phpunit/HolidayTest.php
+++ b/test/phpunit/HolidayTest.php
@@ -30,11 +30,10 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/holiday/class/holiday.class.php';
 $langs->load("dict");
 
-if (empty($user->id))
-{
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+if (empty($user->id)) {
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
@@ -49,324 +48,324 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class HolidayTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return HolidayTest
-     */
-    public function __construct()
-    {
-        parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return HolidayTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-        //$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return	void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
-    /**
-     * End phpunit tests
-     *
-     * @return	void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testHolidayCreate
-     *
-     * @return	int
-     */
-    public function testHolidayCreate()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testHolidayCreate
+	 *
+	 * @return	int
+	 */
+	public function testHolidayCreate()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Holiday($this->savdb);
-        $localobject->initAsSpecimen();
-        $result=$localobject->create($user);
+		$localobject=new Holiday($this->savdb);
+		$localobject->initAsSpecimen();
+		$result=$localobject->create($user);
 
-        print __METHOD__." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testHolidayFetch
-     *
-     * @param	int		$id		Id of Holiday
-     * @return	int
-     * @depends	testHolidayCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testHolidayFetch($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testHolidayFetch
+	 *
+	 * @param	int		$id		Id of Holiday
+	 * @return	int
+	 * @depends	testHolidayCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testHolidayFetch($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Holiday($this->savdb);
-        $result=$localobject->fetch($id);
+		$localobject=new Holiday($this->savdb);
+		$result=$localobject->fetch($id);
 
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testHolidayUpdate
-     *
-     * @param	Holiday		$localobject	Holiday
-     * @return	int
-     *
-     * @depends	testHolidayFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testHolidayUpdate($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testHolidayUpdate
+	 *
+	 * @param	Holiday		$localobject	Holiday
+	 * @return	int
+	 *
+	 * @depends	testHolidayFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testHolidayUpdate($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject->oldcopy = clone $localobject;
+		$localobject->oldcopy = clone $localobject;
 
-        $localobject->note_private='New private note after update';
-        $localobject->note_public='New public note after update';
-        $localobject->lastname='New name';
-        $localobject->firstname='New firstname';
-        $localobject->address='New address';
-        $localobject->zip='New zip';
-        $localobject->town='New town';
-        $localobject->country_id=2;
-        //$localobject->status=0;
-        $localobject->phone_pro='New tel pro';
-        $localobject->phone_perso='New tel perso';
-        $localobject->phone_mobile='New tel mobile';
-        $localobject->fax='New fax';
-        $localobject->email='newemail@newemail.com';
-        $localobject->jabberid='New im id';
-        $localobject->default_lang='es_ES';
+		$localobject->note_private='New private note after update';
+		$localobject->note_public='New public note after update';
+		$localobject->lastname='New name';
+		$localobject->firstname='New firstname';
+		$localobject->address='New address';
+		$localobject->zip='New zip';
+		$localobject->town='New town';
+		$localobject->country_id=2;
+		//$localobject->status=0;
+		$localobject->phone_pro='New tel pro';
+		$localobject->phone_perso='New tel perso';
+		$localobject->phone_mobile='New tel mobile';
+		$localobject->fax='New fax';
+		$localobject->email='newemail@newemail.com';
+		$localobject->jabberid='New im id';
+		$localobject->default_lang='es_ES';
 
-        $result=$localobject->update($localobject->id, $user);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0, 'Holiday::update error');
+		$result=$localobject->update($localobject->id, $user);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0, 'Holiday::update error');
 
-        $result=$localobject->update_note($localobject->note_private, '_private');
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0, 'Holiday::update_note (private) error');
+		$result=$localobject->update_note($localobject->note_private, '_private');
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0, 'Holiday::update_note (private) error');
 
-        $result=$localobject->update_note($localobject->note_public, '_public');
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0, 'Holiday::update_note (public) error');
+		$result=$localobject->update_note($localobject->note_public, '_public');
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0, 'Holiday::update_note (public) error');
 
 
-        $newobject=new Holiday($this->savdb);
-        $result=$newobject->fetch($localobject->id);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0, 'Holiday::fetch error');
+		$newobject=new Holiday($this->savdb);
+		$result=$newobject->fetch($localobject->id);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0, 'Holiday::fetch error');
 
-        print __METHOD__." old=".$localobject->note." new=".$newobject->note."\n";
-        $this->assertEquals($localobject->note, $newobject->note, 'Holiday::update_note error compare note');
-        //print __METHOD__." old=".$localobject->note_public." new=".$newobject->note_public."\n";
-        //$this->assertEquals($localobject->note_public, $newobject->note_public);
+		print __METHOD__." old=".$localobject->note." new=".$newobject->note."\n";
+		$this->assertEquals($localobject->note, $newobject->note, 'Holiday::update_note error compare note');
+		//print __METHOD__." old=".$localobject->note_public." new=".$newobject->note_public."\n";
+		//$this->assertEquals($localobject->note_public, $newobject->note_public);
 
-        return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testHolidayOther
-     *
-     * @param	Holiday		$localobject		Holiday
-     * @return	void
-     *
-     * @depends	testHolidayUpdate
-     * The depends says test is run only if previous is ok
-     */
-    public function testHolidayOther($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testHolidayOther
+	 *
+	 * @param	Holiday		$localobject		Holiday
+	 * @return	void
+	 *
+	 * @depends	testHolidayUpdate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testHolidayOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result = $localobject->fetchUsers(true, true, '');
-        $this->assertNotEquals($result, -1);
+		$result = $localobject->fetchUsers(true, true, '');
+		$this->assertNotEquals($result, -1);
 
-        $result = $localobject->fetchUsers(true, false, '');
-        $this->assertNotEquals($result, -1);
+		$result = $localobject->fetchUsers(true, false, '');
+		$this->assertNotEquals($result, -1);
 
-        $result = $localobject->fetchUsers(false, true, '');
-        $this->assertNotEquals($result, -1);
+		$result = $localobject->fetchUsers(false, true, '');
+		$this->assertNotEquals($result, -1);
 
-        $result = $localobject->fetchUsers(false, false, '');
-        $this->assertNotEquals($result, -1);
+		$result = $localobject->fetchUsers(false, false, '');
+		$this->assertNotEquals($result, -1);
 
-        return $localobject->id;
-    }
+		return $localobject->id;
+	}
 
-    /**
-     * testHolidayDelete
-     *
-     * @param	int		$id		Id of Holiday
-     * @return	void
-     *
-     * @depends	testHolidayOther
-     * The depends says test is run only if previous is ok
-     */
-    public function testHolidayDelete($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testHolidayDelete
+	 *
+	 * @param	int		$id		Id of Holiday
+	 * @return	void
+	 *
+	 * @depends	testHolidayOther
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testHolidayDelete($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Holiday($this->savdb);
-        $result=$localobject->fetch($id);
+		$localobject=new Holiday($this->savdb);
+		$result=$localobject->fetch($id);
 
-        $result=$localobject->delete(0);
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		$result=$localobject->delete(0);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testVerifDateHolidayCP
-     *
-     * @return void
-     */
-    public function testVerifDateHolidayCP()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testVerifDateHolidayCP
+	 *
+	 * @return void
+	 */
+	public function testVerifDateHolidayCP()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        // Create a leave request the 1st morning only
-        $localobjecta=new Holiday($this->savdb);
-        $localobjecta->initAsSpecimen();
-        $localobjecta->date_debut = dol_mktime(0, 0, 0, 1, 1, 2020);
-        $localobjecta->date_fin = dol_mktime(0, 0, 0, 1, 1, 2020);
-        $localobjecta->halfday = 1;
-        $result=$localobjecta->create($user);
+		// Create a leave request the 1st morning only
+		$localobjecta=new Holiday($this->savdb);
+		$localobjecta->initAsSpecimen();
+		$localobjecta->date_debut = dol_mktime(0, 0, 0, 1, 1, 2020);
+		$localobjecta->date_fin = dol_mktime(0, 0, 0, 1, 1, 2020);
+		$localobjecta->halfday = 1;
+		$result=$localobjecta->create($user);
 
-        // Create a leave request the 2 afternoon only
-        $localobjectb=new Holiday($this->savdb);
-        $localobjectb->initAsSpecimen();
-        $localobjectb->date_debut = dol_mktime(0, 0, 0, 1, 2, 2020);
-        $localobjectb->date_fin = dol_mktime(0, 0, 0, 1, 2, 2020);
-        $localobjectb->halfday = -1;
-        $result=$localobjectb->create($user);
+		// Create a leave request the 2 afternoon only
+		$localobjectb=new Holiday($this->savdb);
+		$localobjectb->initAsSpecimen();
+		$localobjectb->date_debut = dol_mktime(0, 0, 0, 1, 2, 2020);
+		$localobjectb->date_fin = dol_mktime(0, 0, 0, 1, 2, 2020);
+		$localobjectb->halfday = -1;
+		$result=$localobjectb->create($user);
 
-        $date_debut = dol_mktime(0, 0, 0, 1, 1, 2020);
-        $date_fin = dol_mktime(0, 0, 0, 1, 2, 2020);
+		$date_debut = dol_mktime(0, 0, 0, 1, 1, 2020);
+		$date_fin = dol_mktime(0, 0, 0, 1, 2, 2020);
 
-        $localobjectc=new Holiday($this->savdb);
+		$localobjectc=new Holiday($this->savdb);
 
-        $result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, 0);
-        $this->assertFalse($result, 'result should be false, there is overlapping, full day is not available.');
-        $result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 0);
-        $this->assertFalse($result, 'result should be false, there is overlapping, full day is not available.');
-        $result=$localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, 0);
-        $this->assertFalse($result, 'result should be false, there is overlapping, full day is not available.');
+		$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, 0);
+		$this->assertFalse($result, 'result should be false, there is overlapping, full day is not available.');
+		$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 0);
+		$this->assertFalse($result, 'result should be false, there is overlapping, full day is not available.');
+		$result=$localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, 0);
+		$this->assertFalse($result, 'result should be false, there is overlapping, full day is not available.');
 
-        $result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, 1);
-        $this->assertFalse($result, 'result should be false, there is overlapping, morning of first day is not available.');
-        $result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 1);
-        $this->assertFalse($result, 'result should be false, there is overlapping, morning of first day is not available.');
-        $result=$localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, 1);
-        $this->assertTrue($result, 'result should be true, there is no overlapping');
+		$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, 1);
+		$this->assertFalse($result, 'result should be false, there is overlapping, morning of first day is not available.');
+		$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 1);
+		$this->assertFalse($result, 'result should be false, there is overlapping, morning of first day is not available.');
+		$result=$localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, 1);
+		$this->assertTrue($result, 'result should be true, there is no overlapping');
 
-        $result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, -1);
-        $this->assertTrue($result, 'result should be true, there is no overlapping');
-        $result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, -1);
-        $this->assertFalse($result, 'result should be false, there is overlapping, afternoon of second day is not available');
-        $result=$localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, -1);
-        $this->assertFalse($result, 'result should be false, there is overlapping, afternoon of second day is not available');
+		$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, -1);
+		$this->assertTrue($result, 'result should be true, there is no overlapping');
+		$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, -1);
+		$this->assertFalse($result, 'result should be false, there is overlapping, afternoon of second day is not available');
+		$result=$localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, -1);
+		$this->assertFalse($result, 'result should be false, there is overlapping, afternoon of second day is not available');
 
-        $result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 2);	// start afternoon and end morning
-        $this->assertTrue($result, 'result should be true, there is no overlapping');
-    }
+		$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 2);	// start afternoon and end morning
+		$this->assertTrue($result, 'result should be true, there is no overlapping');
+	}
 
-    /**
-     * testUpdateBalance
-     *
-     * @return void
-     */
-    public function testUpdateBalance()
-    {
-    	$localobjecta=new Holiday($this->savdb);
+	/**
+	 * testUpdateBalance
+	 *
+	 * @return void
+	 */
+	public function testUpdateBalance()
+	{
+		$localobjecta=new Holiday($this->savdb);
 
-    	$localobjecta->updateConfCP('lastUpdate', '20100101120000');
-    	$result = $localobjecta->updateBalance();
-    	$this->assertEquals($result, 1);
-    }
+		$localobjecta->updateConfCP('lastUpdate', '20100101120000');
+		$result = $localobjecta->updateBalance();
+		$this->assertEquals($result, 1);
+	}
 }
diff --git a/test/phpunit/ImagesLibTest.php b/test/phpunit/ImagesLibTest.php
index 3bfb676f3be..d50d90b9069 100644
--- a/test/phpunit/ImagesLibTest.php
+++ b/test/phpunit/ImagesLibTest.php
@@ -30,8 +30,7 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/images.lib.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -76,81 +75,81 @@ class ImagesLibTest extends PHPUnit\Framework\TestCase
 	}
 
 	/**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testDolCountNbOfLine
-     *
-     * @return	int
-     */
-    public function testgetImageSize()
-    {
+	/**
+	 * testDolCountNbOfLine
+	 *
+	 * @return	int
+	 */
+	public function testgetImageSize()
+	{
 		$file=dirname(__FILE__).'/img250x50.jpg';
 		$tmp=dol_getImageSize($file);
-    	print __METHOD__." result=".$tmp['width'].'/'.$tmp['height']."\n";
+		print __METHOD__." result=".$tmp['width'].'/'.$tmp['height']."\n";
 		$this->assertEquals($tmp['width'], 250);
 		$this->assertEquals($tmp['height'], 50);
 
 		$file=dirname(__FILE__).'/img250x20.png';
 		$tmp=dol_getImageSize($file);
-    	print __METHOD__." result=".$tmp['width'].'/'.$tmp['height']."\n";
+		print __METHOD__." result=".$tmp['width'].'/'.$tmp['height']."\n";
 		$this->assertEquals($tmp['width'], 250);
 		$this->assertEquals($tmp['height'], 20);
 
 		/*$file=dirname(__FILE__).'/filenotfound.png';
 		$tmp=dol_getImageSize($file);
-    	print __METHOD__." result=".$tmp['width'].'/'.$tmp['height']."\n";
+		print __METHOD__." result=".$tmp['width'].'/'.$tmp['height']."\n";
 		$this->assertEquals($tmp['width'],250);
 		$this->assertEquals($tmp['height'],20);*/
 
 		return 1;
-    }
+	}
 }
diff --git a/test/phpunit/ImportTest.php b/test/phpunit/ImportTest.php
index e9bf019740c..1dd0853829c 100644
--- a/test/phpunit/ImportTest.php
+++ b/test/phpunit/ImportTest.php
@@ -28,16 +28,36 @@ global $conf,$user,$langs,$db;
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+if (! defined('NOREQUIREUSER')) {
+	define('NOREQUIREUSER', '1');
+}
+if (! defined('NOREQUIREDB')) {
+	define('NOREQUIREDB', '1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (! defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', '1');
+}
+if (! defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1'); // If there is no menu to show
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (! defined("NOLOGIN")) {
+	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+}
 
 
 /**
@@ -77,71 +97,71 @@ class ImportTest extends PHPUnit\Framework\TestCase
 	}
 
 	/**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 		//$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		//$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
 
-    /**
-     * testImportSample1
-     *
-     * @return boolean
-     */
-    public function testImportSample1()
-    {
-        $file=dirname(__FILE__).'/Example_import_company_1.csv';
+	/**
+	 * testImportSample1
+	 *
+	 * @return boolean
+	 */
+	public function testImportSample1()
+	{
+		$file=dirname(__FILE__).'/Example_import_company_1.csv';
 
-        // TODO
-        // Run import on file and check the record with field "auto" are filled
-        // according to option
-        $this->assertEquals(0, 0);
+		// TODO
+		// Run import on file and check the record with field "auto" are filled
+		// according to option
+		$this->assertEquals(0, 0);
 
 		return true;
-    }
+	}
 }
diff --git a/test/phpunit/JsonLibTest.php b/test/phpunit/JsonLibTest.php
index 7d2678b0ec7..ddb62a90204 100644
--- a/test/phpunit/JsonLibTest.php
+++ b/test/phpunit/JsonLibTest.php
@@ -28,16 +28,36 @@ global $conf,$user,$langs,$db;
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+if (! defined('NOREQUIREUSER')) {
+	define('NOREQUIREUSER', '1');
+}
+if (! defined('NOREQUIREDB')) {
+	define('NOREQUIREDB', '1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (! defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', '1');
+}
+if (! defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1'); // If there is no menu to show
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (! defined("NOLOGIN")) {
+	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+}
 
 
 /**
@@ -49,133 +69,133 @@ if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page i
  */
 class JsonLibTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return CoreTest
-     */
-    public function __construct()
-    {
-        parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return CoreTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-        //$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        //$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		//$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        //$db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		//$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return	void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
-    /**
-     * End phpunit tests
-     *
-     * @return	void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testJsonEncode
-     *
-     * @return  void
-     */
-    public function testJsonEncode()
-    {
-        //$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+	/**
+	 * testJsonEncode
+	 *
+	 * @return  void
+	 */
+	public function testJsonEncode()
+	{
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        // Do a test with an array starting with 0
-        $arraytotest=array(0=>array('key'=>1,'value'=>'PRODREF','label'=>'Product ref with é and special chars \\ \' "'));
-        $arrayencodedexpected='[{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}]';
+		// Do a test with an array starting with 0
+		$arraytotest=array(0=>array('key'=>1,'value'=>'PRODREF','label'=>'Product ref with é and special chars \\ \' "'));
+		$arrayencodedexpected='[{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}]';
 
-        $encoded=json_encode($arraytotest);
-        $this->assertEquals($arrayencodedexpected, $encoded);
-        $decoded=json_decode($encoded, true);
-        $this->assertEquals($arraytotest, $decoded, 'test for json_xxx');
+		$encoded=json_encode($arraytotest);
+		$this->assertEquals($arrayencodedexpected, $encoded);
+		$decoded=json_decode($encoded, true);
+		$this->assertEquals($arraytotest, $decoded, 'test for json_xxx');
 
-        $encoded=dol_json_encode($arraytotest);
-        $this->assertEquals($arrayencodedexpected, $encoded);
-        $decoded=dol_json_decode($encoded, true);
-        $this->assertEquals($arraytotest, $decoded, 'test for dol_json_xxx');
+		$encoded=dol_json_encode($arraytotest);
+		$this->assertEquals($arrayencodedexpected, $encoded);
+		$decoded=dol_json_decode($encoded, true);
+		$this->assertEquals($arraytotest, $decoded, 'test for dol_json_xxx');
 
-        // Same test but array start with 2 instead of 0
-        $arraytotest=array(2=>array('key'=>1,'value'=>'PRODREF','label'=>'Product ref with é and special chars \\ \' "'));
-        $arrayencodedexpected='{"2":{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}}';
+		// Same test but array start with 2 instead of 0
+		$arraytotest=array(2=>array('key'=>1,'value'=>'PRODREF','label'=>'Product ref with é and special chars \\ \' "'));
+		$arrayencodedexpected='{"2":{"key":1,"value":"PRODREF","label":"Product ref with \u00e9 and special chars \\\\ \' \""}}';
 
-        $encoded=json_encode($arraytotest);
-        $this->assertEquals($arrayencodedexpected, $encoded);
-        $decoded=json_decode($encoded, true);
-        $this->assertEquals($arraytotest, $decoded, 'test for json_xxx');
+		$encoded=json_encode($arraytotest);
+		$this->assertEquals($arrayencodedexpected, $encoded);
+		$decoded=json_decode($encoded, true);
+		$this->assertEquals($arraytotest, $decoded, 'test for json_xxx');
 
-        $encoded=dol_json_encode($arraytotest);
-        $this->assertEquals($arrayencodedexpected, $encoded);
-        $decoded=dol_json_decode($encoded, true);
-        $this->assertEquals($arraytotest, $decoded, 'test for dol_json_xxx');
+		$encoded=dol_json_encode($arraytotest);
+		$this->assertEquals($arrayencodedexpected, $encoded);
+		$decoded=dol_json_decode($encoded, true);
+		$this->assertEquals($arraytotest, $decoded, 'test for dol_json_xxx');
 
-        // Test with object
-        $now=gmmktime(12, 0, 0, 1, 1, 1970);
-        $objecttotest=new stdClass();
-        $objecttotest->property1='abc';
-        $objecttotest->property2=1234;
-        $objecttotest->property3=$now;
-        $encoded=dol_json_encode($objecttotest);
-        $this->assertEquals('{"property1":"abc","property2":1234,"property3":43200}', $encoded);
-    }
+		// Test with object
+		$now=gmmktime(12, 0, 0, 1, 1, 1970);
+		$objecttotest=new stdClass();
+		$objecttotest->property1='abc';
+		$objecttotest->property2=1234;
+		$objecttotest->property3=$now;
+		$encoded=dol_json_encode($objecttotest);
+		$this->assertEquals('{"property1":"abc","property2":1234,"property3":43200}', $encoded);
+	}
 }
diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index 1c1f8ed0e8a..ad76667d560 100644
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -30,22 +30,41 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+if (! defined('NOREQUIREUSER')) {
+	define('NOREQUIREUSER', '1');
+}
+if (! defined('NOREQUIREDB')) {
+	define('NOREQUIREDB', '1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (! defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', '1');
+}
+if (! defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1'); // If there is no menu to show
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (! defined("NOLOGIN")) {
+	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+}
 
-if (empty($user->id))
-{
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+if (empty($user->id)) {
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -87,81 +106,82 @@ class LangTest extends PHPUnit\Framework\TestCase
 	}
 
 	/**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testLang
-     *
-     * @return string
-     */
-    public function testLang()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testLang
+	 *
+	 * @return string
+	 */
+	public function testLang()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
-        include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 
 		$filesarray = scandir(DOL_DOCUMENT_ROOT.'/langs');
-		foreach ($filesarray as $key => $code)
-		{
-			if (! preg_match('/^[a-z]+_[A-Z]+$/', $code)) continue;
+		foreach ($filesarray as $key => $code) {
+			if (! preg_match('/^[a-z]+_[A-Z]+$/', $code)) {
+				continue;
+			}
 
 			print 'Check language file for lang code='.$code."\n";
 			$tmplangs=new Translate('', $conf);
-    		$langcode=$code;
-        	$tmplangs->setDefaultLang($langcode);
+			$langcode=$code;
+			$tmplangs->setDefaultLang($langcode);
 			$tmplangs->load("main");
 
 			$result=$tmplangs->transnoentitiesnoconv("SeparatorDecimal");
@@ -201,29 +221,29 @@ class LangTest extends PHPUnit\Framework\TestCase
 			}
 		}
 
-        return;
-    }
+		return;
+	}
 
-    /**
-     * testTrans
-     *
-     * @return string
-     */
-    public function testTrans()
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+	/**
+	 * testTrans
+	 *
+	 * @return string
+	 */
+	public function testTrans()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-    	$tmplangs=new Translate('', $conf);
-    	$langcode='en_US';
-    	$tmplangs->setDefaultLang($langcode);
-    	$tmplangs->load("main");
+		$tmplangs=new Translate('', $conf);
+		$langcode='en_US';
+		$tmplangs->setDefaultLang($langcode);
+		$tmplangs->load("main");
 
-    	$result = $tmplangs->trans("FilterOnInto", "<input autofocus onfocus='alert(1337)' <--!");
-    	print __METHOD__." result trans FilterOnInto = ".$result."\n";
-    	$this->assertEquals($result, "Search criteria '<b>&lt;input autofocus onfocus='alert(1337)' &lt;--!</b>' into fields ", 'Result of lang->trans must have original translation string with its original HTML tag, but inserted values must be fully encoded.');
-    }
+		$result = $tmplangs->trans("FilterOnInto", "<input autofocus onfocus='alert(1337)' <--!");
+		print __METHOD__." result trans FilterOnInto = ".$result."\n";
+		$this->assertEquals($result, "Search criteria '<b>&lt;input autofocus onfocus='alert(1337)' &lt;--!</b>' into fields ", 'Result of lang->trans must have original translation string with its original HTML tag, but inserted values must be fully encoded.');
+	}
 }
diff --git a/test/phpunit/LesscTest.php b/test/phpunit/LesscTest.php
index a4ce302c540..691d413d020 100644
--- a/test/phpunit/LesscTest.php
+++ b/test/phpunit/LesscTest.php
@@ -30,22 +30,41 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+if (! defined('NOREQUIREUSER')) {
+	define('NOREQUIREUSER', '1');
+}
+if (! defined('NOREQUIREDB')) {
+	define('NOREQUIREDB', '1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (! defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', '1');
+}
+if (! defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1'); // If there is no menu to show
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (! defined("NOLOGIN")) {
+	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+}
 
-if (empty($user->id))
-{
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+if (empty($user->id)) {
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -87,92 +106,92 @@ class LesscTest extends PHPUnit\Framework\TestCase
 	}
 
 	/**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testLess
-     *
-     * @return string
-     */
-    public function testLessc()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testLess
+	 *
+	 * @return string
+	 */
+	public function testLessc()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
-        include_once DOL_DOCUMENT_ROOT.'/core/class/lessc.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/class/lessc.class.php';
 
-        $lesscobj = new Lessc();
+		$lesscobj = new Lessc();
 
-        $cssfile = "
+		$cssfile = "
         a { font-size: 10px; }
         b .test {
         	font-size: 10px;
         }
         ";
 
-        try {
-        	$contentforlessc = ".bodywebsite {\n".$cssfile."\n}\n";
-        	//print '<pre>'.$contentforlessc.'</pre>';
-        	$result = $lesscobj->compile($contentforlessc);
-        	//var_dump($contentforlessc); exit;
-        } catch (exception $e) {
-        	//echo "failed to compile lessc";
-        	dol_syslog("Failed to compile the CSS with lessc: ".$e->getMessage(), LOG_WARNING);
-        }
+		try {
+			$contentforlessc = ".bodywebsite {\n".$cssfile."\n}\n";
+			//print '<pre>'.$contentforlessc.'</pre>';
+			$result = $lesscobj->compile($contentforlessc);
+			//var_dump($contentforlessc); exit;
+		} catch (exception $e) {
+			//echo "failed to compile lessc";
+			dol_syslog("Failed to compile the CSS with lessc: ".$e->getMessage(), LOG_WARNING);
+		}
 
-        $cssexpected = "
+		$cssexpected = "
 .bodywebsite a {
   font-size: 10px;
 }
@@ -184,6 +203,6 @@ class LesscTest extends PHPUnit\Framework\TestCase
 		print __METHOD__." SeparatorDecimal=".$result."\n";
 		$this->assertEquals(trim($result), trim($cssexpected));
 
-        return;
-    }
+		return;
+	}
 }
diff --git a/test/phpunit/LoanTest.php b/test/phpunit/LoanTest.php
index 253e779ac03..3dba569c4e9 100644
--- a/test/phpunit/LoanTest.php
+++ b/test/phpunit/LoanTest.php
@@ -29,8 +29,7 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/loan/class/loan.class.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -75,39 +74,39 @@ class LoanTest extends PHPUnit\Framework\TestCase
 	}
 
 	/**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -115,111 +114,111 @@ class LoanTest extends PHPUnit\Framework\TestCase
 
 		print __METHOD__."\n";
 		//print $db->getVersion()."\n";
-    }
+	}
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
-
-    /**
-     * testLoanCreate
-     *
-     * @return	void
-     */
-    public function testLoanCreate()
-    {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Loan($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
-    	return $result;
-    }
-
-    /**
-     * testLoanFetch
-     *
-     * @param	int		$id		Id of object
-     * @return	void
-     *
-     * @depends	testLoanCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testLoanFetch($id)
-    {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Loan($this->savdb);
-    	$result=$localobject->fetch($id);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	return $localobject;
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
 	/**
-     * testLoanOther
-     *
-     * @param	Loan	$localobject	Loan
-     * @return	int
-     *
-     * @depends testLoanFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testLoanOther($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $result=$localobject->set_paid($user);
-
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-        return $localobject->id;
-    }
-
-    /**
-     * testLoanDelete
-     *
-     * @param	int		$id		Id of loan
-     * @return	void
-     *
-     * @depends	testLoanCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testLoanDelete($id)
-    {
-    	global $conf,$user,$langs,$db;
+	 * testLoanCreate
+	 *
+	 * @return	void
+	 */
+	public function testLoanCreate()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new Loan($this->savdb);
-    	$result=$localobject->fetch($id);
+		$localobject->initAsSpecimen();
+		$result=$localobject->create($user);
+
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
+		return $result;
+	}
+
+	/**
+	 * testLoanFetch
+	 *
+	 * @param	int		$id		Id of object
+	 * @return	void
+	 *
+	 * @depends	testLoanCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testLoanFetch($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$localobject=new Loan($this->savdb);
+		$result=$localobject->fetch($id);
+
+		$this->assertLessThan($result, 0);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		return $localobject;
+	}
+
+	/**
+	 * testLoanOther
+	 *
+	 * @param	Loan	$localobject	Loan
+	 * @return	int
+	 *
+	 * @depends testLoanFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testLoanOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$result=$localobject->setPaid($user);
+
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject->id;
+	}
+
+	/**
+	 * testLoanDelete
+	 *
+	 * @param	int		$id		Id of loan
+	 * @return	void
+	 *
+	 * @depends	testLoanCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testLoanDelete($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$localobject=new Loan($this->savdb);
+		$result=$localobject->fetch($id);
 		$result=$localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $result;
-    }
+		$this->assertLessThan($result, 0);
+		return $result;
+	}
 }
diff --git a/test/phpunit/MarginsLibTest.php b/test/phpunit/MarginsLibTest.php
index e451262546d..1c7553eb76f 100644
--- a/test/phpunit/MarginsLibTest.php
+++ b/test/phpunit/MarginsLibTest.php
@@ -29,8 +29,7 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/margin/lib/margins.lib.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -74,65 +73,65 @@ class MarginsLibTest extends PHPUnit\Framework\TestCase
 		print "\n";
 	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin();   // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin();   // This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testGetMarginInfos
-     *
-     * @return	void
-     */
-    public function testGetMarginInfos()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testGetMarginInfos
+	 *
+	 * @return	void
+	 */
+	public function testGetMarginInfos()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -156,5 +155,5 @@ class MarginsLibTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals(1/9*100, $result[2]);
 
 		return 0;
-    }
+	}
 }
diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php
index 32652200c2c..79e3013ae11 100755
--- a/test/phpunit/ModulesTest.php
+++ b/test/phpunit/ModulesTest.php
@@ -28,8 +28,7 @@ global $conf,$user,$langs,$db;
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -74,64 +73,64 @@ class ModulesTest extends PHPUnit\Framework\TestCase
 	}
 
 	/**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testModulesInit
-     *
-     * @return int
-     */
-    public function testModulesInit()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testModulesInit
+	 *
+	 * @return int
+	 */
+	public function testModulesInit()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -144,22 +143,20 @@ class ModulesTest extends PHPUnit\Framework\TestCase
 		'Mailing','MailmanSpip','Margin','ModuleBuilder','MultiCurrency',
 		'Notification','Oauth','OpenSurvey','Paybox','Paypal','Prelevement','Printing','Product','ProductBatch','Projet','Propale','ReceiptPrinter','Resource',
 		'Salaries','Service','SocialNetworks','Societe','Stock','Stripe','SupplierProposal','Syslog','TakePos','Tax','Ticket','User','Variants','WebServices','WebServicesClient','Website','Workflow');
-		foreach ($modulelist as $modlabel)
-		{
-    		require_once DOL_DOCUMENT_ROOT.'/core/modules/mod'.$modlabel.'.class.php';
-            $class='mod'.$modlabel;
-    		$mod=new $class($db);
-            $result=$mod->remove();
-            $result=$mod->init();
-        	$this->assertLessThan($result, 0, $modlabel);
-        	print __METHOD__." test remove/init for module ".$modlabel.", result=".$result."\n";
+		foreach ($modulelist as $modlabel) {
+			require_once DOL_DOCUMENT_ROOT.'/core/modules/mod'.$modlabel.'.class.php';
+			$class='mod'.$modlabel;
+			$mod=new $class($db);
+			$result=$mod->remove();
+			$result=$mod->init();
+			$this->assertLessThan($result, 0, $modlabel);
+			print __METHOD__." test remove/init for module ".$modlabel.", result=".$result."\n";
 
-        	if (in_array($modlabel, array('Ldap', 'MailmanSpip')))
-        	{
-        	    $result=$mod->remove();
-        	}
+			if (in_array($modlabel, array('Ldap', 'MailmanSpip'))) {
+				$result=$mod->remove();
+			}
 		}
 
-        return 0;
-    }
+		return 0;
+	}
 }
diff --git a/test/phpunit/MouvementStockTest.php b/test/phpunit/MouvementStockTest.php
index 1f27b4c71de..b68a8c90d0a 100644
--- a/test/phpunit/MouvementStockTest.php
+++ b/test/phpunit/MouvementStockTest.php
@@ -31,8 +31,7 @@ require_once dirname(__FILE__).'/../../htdocs/product/stock/class/mouvementstock
 require_once dirname(__FILE__).'/../../htdocs/product/stock/class/entrepot.class.php';
 require_once dirname(__FILE__).'/../../htdocs/product/class/product.class.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -77,66 +76,68 @@ class MouvementStockTest extends PHPUnit\Framework\TestCase
 	}
 
 	/**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
-		if (empty($conf->productbatch->enabled)) { print "\n".__METHOD__." module Lot/Serial must be enabled.\n"; die(); }
+		if (empty($conf->productbatch->enabled)) {
+			print "\n".__METHOD__." module Lot/Serial must be enabled.\n"; die();
+		}
 
 		print __METHOD__."\n";
-    }
+	}
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testMouvementCreate
-     *
-     * @return	MouvementStock
-     */
-    public function testMouvementCreate()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testMouvementCreate
+	 *
+	 * @return	MouvementStock
+	 */
+	public function testMouvementCreate()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -201,76 +202,76 @@ class MouvementStockTest extends PHPUnit\Framework\TestCase
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(-3, $result, 'Test to check we can t create a movement for a lot with a different eatby date');
 
-    	// Do a list of movement into warehouse 1
+		// Do a list of movement into warehouse 1
 
-    	// Create an input movement (type = 3) of price 9.9 -> should update PMP to 9.9
+		// Create an input movement (type = 3) of price 9.9 -> should update PMP to 9.9
 		$result=$localobject->reception($user, $product1id, $warehouse1id, 10, 9.9, 'Movement for unit test 1', '', '', '', '', 0, 'Inventory Code Test');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThan(0, $result, 'Return code of 0 was expected for the reception test 1');
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThan(0, $result, 'Return code of 0 was expected for the reception test 1');
 
-    	// Create an input movement (type = 3) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->reception($user, $product1id, $warehouse1id, 10, 9.7, 'Movement for unit test 2', '', '', '', '', 0, 'Inventory Code Test');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThan(0, $result);
+		// Create an input movement (type = 3) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
+		$result=$localobject->reception($user, $product1id, $warehouse1id, 10, 9.7, 'Movement for unit test 2', '', '', '', '', 0, 'Inventory Code Test');
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThan(0, $result);
 
-    	// Create an output movement (type = 2) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->livraison($user, $product1id, $warehouse1id, 5, 999, 'Movement for unit test 3', '', '', '', '', 0, 'Inventory Code Test');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThan(0, $result);
+		// Create an output movement (type = 2) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
+		$result=$localobject->livraison($user, $product1id, $warehouse1id, 5, 999, 'Movement for unit test 3', '', '', '', '', 0, 'Inventory Code Test');
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThan(0, $result);
 
-    	// Create an output movement (type = 1) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse1id, 1, 0, 0, 'Input from transfer', 'Transfert X');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThan(0, $result);
+		// Create an output movement (type = 1) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
+		$result=$localobject->_create($user, $product1id, $warehouse1id, 1, 0, 0, 'Input from transfer', 'Transfert X');
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThan(0, $result);
 
-    	// Create an output movement (type = 1) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse1id, -2, 1, 0, 'Output from transfer', 'Transfert Y');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThan(0, $result);
+		// Create an output movement (type = 1) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
+		$result=$localobject->_create($user, $product1id, $warehouse1id, -2, 1, 0, 'Output from transfer', 'Transfert Y');
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThan(0, $result);
 
 
-    	// Do same but into warehouse 2
+		// Do same but into warehouse 2
 
-    	// Create an input movement (type = 3) of price 9.9 -> should update PMP to 9.9
-    	$result=$localobject->reception($user, $product1id, $warehouse2id, 10, 9.9, 'Movement for unit test 1 wh 2', '', '', '', '', 0, 'Inventory Code Test 2');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThan(0, $result);
+		// Create an input movement (type = 3) of price 9.9 -> should update PMP to 9.9
+		$result=$localobject->reception($user, $product1id, $warehouse2id, 10, 9.9, 'Movement for unit test 1 wh 2', '', '', '', '', 0, 'Inventory Code Test 2');
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThan(0, $result);
 
-    	// Create an input movement (type = 3) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->reception($user, $product1id, $warehouse2id, 10, 9.7, 'Movement for unit test 2 wh 2', '', '', '', '', 0, 'Inventory Code Test 2');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThan(0, $result);
+		// Create an input movement (type = 3) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
+		$result=$localobject->reception($user, $product1id, $warehouse2id, 10, 9.7, 'Movement for unit test 2 wh 2', '', '', '', '', 0, 'Inventory Code Test 2');
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThan(0, $result);
 
-    	// Create an output movement (type = 2) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->livraison($user, $product1id, $warehouse2id, 5, 999, 'Movement for unit test 3 wh 2', '', '', '', '', 0, 'Inventory Code Test 2');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThan(0, $result);
+		// Create an output movement (type = 2) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
+		$result=$localobject->livraison($user, $product1id, $warehouse2id, 5, 999, 'Movement for unit test 3 wh 2', '', '', '', '', 0, 'Inventory Code Test 2');
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThan(0, $result);
 
-    	// Create an output movement (type = 1) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse2id, 1, 0, 0, 'Input from transfer wh 2', 'Transfert X 2');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThan(0, $result);
+		// Create an output movement (type = 1) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
+		$result=$localobject->_create($user, $product1id, $warehouse2id, 1, 0, 0, 'Input from transfer wh 2', 'Transfert X 2');
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThan(0, $result);
 
-    	// Create an output movement (type = 1) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
-    	$result=$localobject->_create($user, $product1id, $warehouse2id, -2, 1, 0, 'Output from transfer wh 2', 'Transfert Y 2');
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThan(0, $result);
+		// Create an output movement (type = 1) of price 9.7 -> should update PMP to 9.9/9.7 = 9.8
+		$result=$localobject->_create($user, $product1id, $warehouse2id, -2, 1, 0, 'Output from transfer wh 2', 'Transfert Y 2');
+		print __METHOD__." result=".$result."\n";
+		$this->assertGreaterThan(0, $result);
 
-    	return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testMouvementCheck
-     *
-     * @param	MouvementStock		$localobject	Movement object we created
-     * @return	MouvementStock
-     *
-     * @depends	testMouvementCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testMouvementCheck($localobject)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testMouvementCheck
+	 *
+	 * @param	MouvementStock		$localobject	Movement object we created
+	 * @return	MouvementStock
+	 *
+	 * @depends	testMouvementCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testMouvementCheck($localobject)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -284,12 +285,12 @@ class MouvementStockTest extends PHPUnit\Framework\TestCase
 		$producttotest = new Product($db);
 		$producttotest->fetch($productid);
 
-    	print __METHOD__." producttotest->stock_reel=".$producttotest->stock_reel."\n";
-    	$this->assertEquals($producttotest->stock_reel, 28);	// 28 is result of stock movement defined into testMouvementCreate
+		print __METHOD__." producttotest->stock_reel=".$producttotest->stock_reel."\n";
+		$this->assertEquals($producttotest->stock_reel, 28);	// 28 is result of stock movement defined into testMouvementCreate
 
-    	print __METHOD__." producttotest->pmp=".$producttotest->pmp."\n";
-    	$this->assertEquals($producttotest->pmp, 9.8);
+		print __METHOD__." producttotest->pmp=".$producttotest->pmp."\n";
+		$this->assertEquals($producttotest->pmp, 9.8);
 
-    	return $localobject;
-    }
+		return $localobject;
+	}
 }
diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php
index 089a2c2f4cf..a34d3b28d1c 100644
--- a/test/phpunit/NumberingModulesTest.php
+++ b/test/phpunit/NumberingModulesTest.php
@@ -28,8 +28,7 @@ global $conf,$user,$langs,$db;
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -74,66 +73,66 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
 	}
 
 	/**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 
-    	$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testFactureMercure
-     *
-     * @return int
-     */
-    public function testFactureMercure()
-    {
-    	global $conf,$user,$langs,$db,$mysoc;
+	/**
+	 * testFactureMercure
+	 *
+	 * @return int
+	 */
+	public function testFactureMercure()
+	{
+		global $conf,$user,$langs,$db,$mysoc;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -237,13 +236,13 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
 		$result2=$localobject2->create($user, 1);
 		$result3=$localobject2->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('192101-0001', $result);			// counter must be reseted to 1
-    	$result=$localobject2->is_erasable();
-    	print __METHOD__." is_erasable=".$result."\n";
-    	$this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
-    	$result=$localobject->is_erasable();
-    	print __METHOD__." is_erasable=".$result."\n";
-    	$this->assertGreaterThanOrEqual(1, $result);						// Case 1 can be deleted (because there was a reset for case 2)
+		$this->assertEquals('192101-0001', $result);			// counter must be reseted to 1
+		$result=$localobject2->is_erasable();
+		print __METHOD__." is_erasable=".$result."\n";
+		$this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
+		$result=$localobject->is_erasable();
+		print __METHOD__." is_erasable=".$result."\n";
+		$this->assertGreaterThanOrEqual(1, $result);						// Case 1 can be deleted (because there was a reset for case 2)
 
 		// Same but we add month before year and use a year on 2 digits
 		$conf->global->FACTURE_MERCURE_MASK_CREDIT='[mm}{yy}-{0000@1}';
@@ -268,319 +267,319 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
 		$result2=$localobject2->create($user, 1);
 		$result3=$localobject2->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('0125-0002', $result, 'Test for {mm}{yy}-{0000@1} 2st invoice');			// counter must be now 2
-    	$result=$localobject2->is_erasable();
-    	print __METHOD__." is_erasable=".$result."\n";
-    	$this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
-    	$result=$localobject->is_erasable();
-    	print __METHOD__." is_erasable=".$result."\n";
-    	$this->assertLessThanOrEqual(0, $result);						// Case 1 can not be deleted (because there is an invoice 2)
+		$this->assertEquals('0125-0002', $result, 'Test for {mm}{yy}-{0000@1} 2st invoice');			// counter must be now 2
+		$result=$localobject2->is_erasable();
+		print __METHOD__." is_erasable=".$result."\n";
+		$this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
+		$result=$localobject->is_erasable();
+		print __METHOD__." is_erasable=".$result."\n";
+		$this->assertLessThanOrEqual(0, $result);						// Case 1 can not be deleted (because there is an invoice 2)
 		$localobject3=new Facture($this->savdb);
 		$localobject3->initAsSpecimen();
 		$localobject3->date=dol_mktime(12, 0, 0, 1, 1, 1926);	// we use following year for third invoice (and there is a reset required)
 		$numbering=new mod_facture_mercure();
 		$result=$numbering->getNextValue($mysoc, $localobject3);
 		print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('0126-0001', $result, 'Test for {mm}{yy}-{0000@1} 3rd invoice');			// counter must be now 1
+		$this->assertEquals('0126-0001', $result, 'Test for {mm}{yy}-{0000@1} 3rd invoice');			// counter must be now 1
 
-    	// Try an offset when an invoice already exists
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000+9990}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000+9990}';
-    	$result=$numbering->getNextValue($mysoc, $localobject2);
+		// Try an offset when an invoice already exists
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000+9990}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000+9990}';
+		$result=$numbering->getNextValue($mysoc, $localobject2);
 
 		// Now we try with a different fiscal month (forced by mask)
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@6}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@6}';
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@6}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@6}';
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1930);	// we use year 1930 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject, 'last');
-    	print __METHOD__." result for last=".$result."\n";
-    	$this->assertEquals('', $result);						// no existing ref into reset range
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user, 1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('193001-0001', $result);			// counter must start to 1
-    	$result=$numbering->getNextValue($mysoc, $localobject, 'last');
-    	print __METHOD__." result for last=".$result."\n";
-    	$this->assertEquals('193001-0001', $result);			// last ref into reset range should be same than last created
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1930);	// we use year 1930 to be sure to not have existing invoice for this year
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject, 'last');
+		print __METHOD__." result for last=".$result."\n";
+		$this->assertEquals('', $result);						// no existing ref into reset range
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		$result2=$localobject->create($user, 1);
+		$result3=$localobject->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('193001-0001', $result);			// counter must start to 1
+		$result=$numbering->getNextValue($mysoc, $localobject, 'last');
+		print __METHOD__." result for last=".$result."\n";
+		$this->assertEquals('193001-0001', $result);			// last ref into reset range should be same than last created
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1930);	// we use same year but fiscal month after
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject, 'last');
-    	print __METHOD__." result for last=".$result."\n";
-    	$this->assertEquals('', $result);						// last ref into reset range should be ''
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user, 1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('193012-0001', $result);	// counter must be reset to 1
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1930);	// we use same year but fiscal month after
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject, 'last');
+		print __METHOD__." result for last=".$result."\n";
+		$this->assertEquals('', $result);						// last ref into reset range should be ''
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		$result2=$localobject->create($user, 1);
+		$result3=$localobject->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('193012-0001', $result);	// counter must be reset to 1
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1931);	// we use same fiscal year but different year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user, 1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('193101-0002', $result);	// counter must be 2
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1931);	// we use same fiscal year but different year
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		$result2=$localobject->create($user, 1);
+		$result3=$localobject->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('193101-0002', $result);	// counter must be 2
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1931);	// we use different fiscal year but same year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('193112-0001', $result);	// counter must be reset to 1
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1931);	// we use different fiscal year but same year
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('193112-0001', $result);	// counter must be reset to 1
 
 
-    	// Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START)
-    	$conf->global->SOCIETE_FISCAL_MONTH_START=6;
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@0}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@0}';
+		// Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START)
+		$conf->global->SOCIETE_FISCAL_MONTH_START=6;
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@0}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@0}';
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1940);	// we use year 1940 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user, 1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('194001-0001', $result);	// counter must start to 1
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1940);	// we use year 1940 to be sure to not have existing invoice for this year
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		$result2=$localobject->create($user, 1);
+		$result3=$localobject->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('194001-0001', $result);	// counter must start to 1
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1940);	// we use same year but fiscal month after
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user, 1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('194012-0001', $result);	// counter must be reset to 1
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1940);	// we use same year but fiscal month after
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		$result2=$localobject->create($user, 1);
+		$result3=$localobject->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('194012-0001', $result);	// counter must be reset to 1
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1941);	// we use same fiscal year but different year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user, 1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('194101-0002', $result);	// counter must be 2
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1941);	// we use same fiscal year but different year
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		$result2=$localobject->create($user, 1);
+		$result3=$localobject->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('194101-0002', $result);	// counter must be 2
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1941);	// we use different discal year but same year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('194112-0001', $result);	// counter must be reset to 1
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1941);	// we use different discal year but same year
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('194112-0001', $result);	// counter must be reset to 1
 
 
-    	// Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START) and we always want year of element
-    	$conf->global->SOCIETE_FISCAL_MONTH_START=6;
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@=}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@=}';
+		// Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START) and we always want year of element
+		$conf->global->SOCIETE_FISCAL_MONTH_START=6;
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@=}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@=}';
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1950);	// we use year 1950 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user, 1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('195001-0001', $result);	// counter must start to 1
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1950);	// we use year 1950 to be sure to not have existing invoice for this year
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		$result2=$localobject->create($user, 1);
+		$result3=$localobject->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('195001-0001', $result);	// counter must start to 1
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1950);	// we use same year but fiscal month after
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user, 1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('195012-0001', $result);	// counter must be reset to 1
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1950);	// we use same year but fiscal month after
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		$result2=$localobject->create($user, 1);
+		$result3=$localobject->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('195012-0001', $result);	// counter must be reset to 1
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1951);	// we use same fiscal year but different year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user, 1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('195101-0002', $result);	// counter must be 2
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1951);	// we use same fiscal year but different year
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		$result2=$localobject->create($user, 1);
+		$result3=$localobject->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('195101-0002', $result);	// counter must be 2
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1951);	// we use different discal year but same year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('195112-0001', $result);	// counter must be reset to 1
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1951);	// we use different discal year but same year
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('195112-0001', $result);	// counter must be reset to 1
 
 
-    	// Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START) and we always want start year
-    	$conf->global->SOCIETE_FISCAL_MONTH_START=6;
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@-}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@-}';
+		// Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START) and we always want start year
+		$conf->global->SOCIETE_FISCAL_MONTH_START=6;
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@-}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@-}';
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1960);	// we use year 1960 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user, 1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('195901-0001', $result);	// counter must start to 1
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1960);	// we use year 1960 to be sure to not have existing invoice for this year
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		$result2=$localobject->create($user, 1);
+		$result3=$localobject->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('195901-0001', $result);	// counter must start to 1
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1960);	// we use same year but fiscal month after
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user, 1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('196012-0001', $result);	// counter must be reset to 1
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1960);	// we use same year but fiscal month after
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		$result2=$localobject->create($user, 1);
+		$result3=$localobject->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('196012-0001', $result);	// counter must be reset to 1
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1961);	// we use same fiscal year but different year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user, 1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('196001-0002', $result);	// counter must be 2
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1961);	// we use same fiscal year but different year
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		$result2=$localobject->create($user, 1);
+		$result3=$localobject->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('196001-0002', $result);	// counter must be 2
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1961);	// we use different discal year but same year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('196112-0001', $result);	// counter must be reset to 1
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1961);	// we use different discal year but same year
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('196112-0001', $result);	// counter must be reset to 1
 
 
-    	// Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START) and we always want end year
-    	$conf->global->SOCIETE_FISCAL_MONTH_START=6;
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@+}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@+}';
+		// Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START) and we always want end year
+		$conf->global->SOCIETE_FISCAL_MONTH_START=6;
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@+}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@+}';
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1970);	// we use year 1970 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user, 1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('197001-0001', $result);	// counter must start to 1
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1970);	// we use year 1970 to be sure to not have existing invoice for this year
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		$result2=$localobject->create($user, 1);
+		$result3=$localobject->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('197001-0001', $result);	// counter must start to 1
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1970);	// we use same year but fiscal month after
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user, 1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('197112-0001', $result);	// counter must be reset to 1
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1970);	// we use same year but fiscal month after
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		$result2=$localobject->create($user, 1);
+		$result3=$localobject->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('197112-0001', $result);	// counter must be reset to 1
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1971);	// we use same fiscal year but different year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user, 1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('197101-0002', $result);	// counter must be 2
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1971);	// we use same fiscal year but different year
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		$result2=$localobject->create($user, 1);
+		$result3=$localobject->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('197101-0002', $result);	// counter must be 2
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1971);	// we use different fiscal year but same year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('197212-0001', $result);	// counter must be reset to 1
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1971);	// we use different fiscal year but same year
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('197212-0001', $result);	// counter must be reset to 1
 
-    	// Now we try with a reset every month (@99)
-    	$conf->global->SOCIETE_FISCAL_MONTH_START=6;
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@99}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@99}';
+		// Now we try with a reset every month (@99)
+		$conf->global->SOCIETE_FISCAL_MONTH_START=6;
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@99}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@99}';
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1980);	// we use year 1980 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user, 1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('198001-0001', $result);	// counter must start to 1
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1980);	// we use year 1980 to be sure to not have existing invoice for this year
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		$result2=$localobject->create($user, 1);
+		$result3=$localobject->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('198001-0001', $result);	// counter must start to 1
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1980);	// we use year 1980 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user, 1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('198001-0002', $result);	// counter must start to 2
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1980);	// we use year 1980 to be sure to not have existing invoice for this year
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		$result2=$localobject->create($user, 1);
+		$result3=$localobject->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('198001-0002', $result);	// counter must start to 2
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 2, 1, 1980);	// we use year 1980 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user, 1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('198002-0001', $result);	// counter must start to 1
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 2, 1, 1980);	// we use year 1980 to be sure to not have existing invoice for this year
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		$result2=$localobject->create($user, 1);
+		$result3=$localobject->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('198002-0001', $result);	// counter must start to 1
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1981);	// we use year 1981 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($mysoc, $localobject);
-    	$result2=$localobject->create($user, 1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('198101-0001', $result);	// counter must start to 1
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1981);	// we use year 1981 to be sure to not have existing invoice for this year
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($mysoc, $localobject);
+		$result2=$localobject->create($user, 1);
+		$result3=$localobject->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('198101-0001', $result);	// counter must start to 1
 
-    	// Test with {t} tag
-    	$conf->global->SOCIETE_FISCAL_MONTH_START=1;
-    	$conf->global->FACTURE_MERCURE_MASK_CREDIT='{t}{yyyy}{mm}-{0000}';
-    	$conf->global->FACTURE_MERCURE_MASK_INVOICE='{t}{yyyy}{mm}-{0000}';
+		// Test with {t} tag
+		$conf->global->SOCIETE_FISCAL_MONTH_START=1;
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{t}{yyyy}{mm}-{0000}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{t}{yyyy}{mm}-{0000}';
 
-    	$tmpthirdparty=new Societe($this->savdb);
-    	$tmpthirdparty->initAsSpecimen();
-    	$tmpthirdparty->typent_code = 'TE_ABC';
+		$tmpthirdparty=new Societe($this->savdb);
+		$tmpthirdparty->initAsSpecimen();
+		$tmpthirdparty->typent_code = 'TE_ABC';
 
-    	$localobject=new Facture($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1982);	// we use year 1982 to be sure to not have existing invoice for this year
-    	$numbering=new mod_facture_mercure();
-    	$result=$numbering->getNextValue($tmpthirdparty, $localobject);
-    	$result2=$localobject->create($user, 1);
-    	$result3=$localobject->validate($user, $result);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('A198201-0001', $result);	// counter must start to 1
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen();
+		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1982);	// we use year 1982 to be sure to not have existing invoice for this year
+		$numbering=new mod_facture_mercure();
+		$result=$numbering->getNextValue($tmpthirdparty, $localobject);
+		$result2=$localobject->create($user, 1);
+		$result3=$localobject->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('A198201-0001', $result);	// counter must start to 1
 
 
 
-    	return $result;
-    }
+		return $result;
+	}
 }
diff --git a/test/phpunit/PaypalTest.php b/test/phpunit/PaypalTest.php
index 7a2e31cbdad..3177e5555ed 100644
--- a/test/phpunit/PaypalTest.php
+++ b/test/phpunit/PaypalTest.php
@@ -30,8 +30,7 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/geturl.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/paypal/lib/paypal.lib.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -75,69 +74,71 @@ class PaypalTest extends PHPUnit\Framework\TestCase
 		print "\n";
 	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 
-    	if (empty($conf->paypal->enabled)) { print __METHOD__." Module Paypal must be enabled.\n"; die(); }
+		if (empty($conf->paypal->enabled)) {
+			print __METHOD__." Module Paypal must be enabled.\n"; die();
+		}
 
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testPaypalOk
-     *
-     * @return	void
-     */
-    public function testPaypalOk()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testPaypalOk
+	 *
+	 * @return	void
+	 */
+	public function testPaypalOk()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -148,9 +149,9 @@ class PaypalTest extends PHPUnit\Framework\TestCase
 
 		$result=getURLContent($urltotest, 'GET', '', 1, array(), array('http', 'https'), 2);
 
-        print __METHOD__." result=".$result['http_code']."\n";
-        $this->assertEquals(200, $result['http_code']);
+		print __METHOD__." result=".$result['http_code']."\n";
+		$this->assertEquals(200, $result['http_code']);
 
-    	return $result;
-    }
+		return $result;
+	}
 }
diff --git a/test/phpunit/PdfDocTest.php b/test/phpunit/PdfDocTest.php
index c323c2bb6f8..4c07f970c24 100644
--- a/test/phpunit/PdfDocTest.php
+++ b/test/phpunit/PdfDocTest.php
@@ -32,8 +32,7 @@ require_once dirname(__FILE__).'/../../htdocs/product/class/product.class.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/pdf.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/doc.lib.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -77,65 +76,65 @@ class PdfDocTest extends PHPUnit\Framework\TestCase
 		print "\n";
 	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testPdfDocGetLineDesc
-     *
-     * @return void
-     */
-    public function testPdfDocGetLineDesc()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testPdfDocGetLineDesc
+	 *
+	 * @return void
+	 */
+	public function testPdfDocGetLineDesc()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -144,7 +143,9 @@ class PdfDocTest extends PHPUnit\Framework\TestCase
 		$localproduct=new Product($this->savdb);
 		$localproduct->fetch(0, 'PIDRESS');
 		$product_id=$localproduct->id;
-		if ($product_id <= 0) { print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die(); }
+		if ($product_id <= 0) {
+			print "\n".__METHOD__." A product with ref PIDRESS must exists into database"; die();
+		}
 
 		$localobject=new Facture($this->savdb);
 		$localobject->initAsSpecimen();
@@ -154,29 +155,29 @@ class PdfDocTest extends PHPUnit\Framework\TestCase
 		$localobject->lines[0]->label='Label 1';
 		$localobject->lines[0]->desc="This is a description with a é accent\n(Country of origin: France)";
 
-    	$result=pdf_getlinedesc($localobject, 0, $langs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals($result, "PIDRESS - Label 1<br>This is a description with a &eacute; accent<br>(Country of origin: France)");
+		$result=pdf_getlinedesc($localobject, 0, $langs);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, "PIDRESS - Label 1<br>This is a description with a &eacute; accent<br>(Country of origin: France)");
 
-    	$result=doc_getlinedesc($localobject->lines[0], $langs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals($result, "PIDRESS - Label 1\nThis is a description with a é accent\n(Country of origin: France)");
-    }
+		$result=doc_getlinedesc($localobject->lines[0], $langs);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, "PIDRESS - Label 1\nThis is a description with a é accent\n(Country of origin: France)");
+	}
 
-    /**
-    * testPdfGetHeightForLogo
-    *
-    * @return void
-    */
-    public function testPdfGetHeightForLogo()
-    {
-        $file=dirname(__FILE__).'/img250x50.jpg';
-        $result=pdf_getHeightForLogo($file);
-        print __METHOD__." result=".$result."\n";
-    	$this->assertEquals($result, 20);
-        $file=dirname(__FILE__).'/img250x20.png';
-        $result=pdf_getHeightForLogo($file);
-        print __METHOD__." result=".$result."\n";
-    	$this->assertEquals($result, 10.4);
-    }
+	/**
+	* testPdfGetHeightForLogo
+	*
+	* @return void
+	*/
+	public function testPdfGetHeightForLogo()
+	{
+		$file=dirname(__FILE__).'/img250x50.jpg';
+		$result=pdf_getHeightForLogo($file);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, 20);
+		$file=dirname(__FILE__).'/img250x20.png';
+		$result=pdf_getHeightForLogo($file);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, 10.4);
+	}
 }
diff --git a/test/phpunit/PgsqlTest.php b/test/phpunit/PgsqlTest.php
index 5a09e7fc55a..044d4576067 100644
--- a/test/phpunit/PgsqlTest.php
+++ b/test/phpunit/PgsqlTest.php
@@ -30,8 +30,7 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/db/pgsql.class.php';
 $langs->load("dict");
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -76,114 +75,114 @@ class PgsqlTest extends PHPUnit\Framework\TestCase
 		print "\n";
 	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testConvertSQLFromMysql
-     *
-     * @return	int
-     */
-    public function testConvertSQLFromMysql()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testConvertSQLFromMysql
+	 *
+	 * @return	int
+	 */
+	public function testConvertSQLFromMysql()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
-        $sql="ALTER TABLE llx_table RENAME TO llx_table_new;";
-        $result=DoliDBPgsql::convertSQLFromMysql($sql);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, "ALTER TABLE llx_table RENAME TO llx_table_new;");
+		$sql="ALTER TABLE llx_table RENAME TO llx_table_new;";
+		$result=DoliDBPgsql::convertSQLFromMysql($sql);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, "ALTER TABLE llx_table RENAME TO llx_table_new;");
 
-        $sql="ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;";
-        $result=DoliDBPgsql::convertSQLFromMysql($sql);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, "ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0';");
+		$sql="ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;";
+		$result=DoliDBPgsql::convertSQLFromMysql($sql);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, "ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0';");
 
-        $sql="ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);";
-        $result=DoliDBPgsql::convertSQLFromMysql($sql);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, "-- ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60); replaced by --\nALTER TABLE llx_table RENAME COLUMN oldname TO newname");
+		$sql="ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);";
+		$result=DoliDBPgsql::convertSQLFromMysql($sql);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, "-- ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60); replaced by --\nALTER TABLE llx_table RENAME COLUMN oldname TO newname");
 
-        $sql="ALTER TABLE llx_table DROP COLUMN oldname;";
-        $result=DoliDBPgsql::convertSQLFromMysql($sql);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, $sql);
+		$sql="ALTER TABLE llx_table DROP COLUMN oldname;";
+		$result=DoliDBPgsql::convertSQLFromMysql($sql);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, $sql);
 
-        $sql="ALTER TABLE llx_table MODIFY name varchar(60);";
-        $result=DoliDBPgsql::convertSQLFromMysql($sql);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, "-- ALTER TABLE llx_table MODIFY name varchar(60); replaced by --\nALTER TABLE llx_table ALTER COLUMN name TYPE varchar(60);");
+		$sql="ALTER TABLE llx_table MODIFY name varchar(60);";
+		$result=DoliDBPgsql::convertSQLFromMysql($sql);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, "-- ALTER TABLE llx_table MODIFY name varchar(60); replaced by --\nALTER TABLE llx_table ALTER COLUMN name TYPE varchar(60);");
 
-        // Create a constraint
+		// Create a constraint
 		$sql='ALTER TABLE llx_tablechild ADD CONSTRAINT fk_tablechild_fk_fieldparent FOREIGN KEY (fk_fieldparent) REFERENCES llx_tableparent (rowid)';
 		$result=DoliDBPgsql::convertSQLFromMysql($sql);
-        print __METHOD__." result=".$result."\n";
-    	$this->assertEquals($result, $sql.' DEFERRABLE INITIALLY IMMEDIATE;');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, $sql.' DEFERRABLE INITIALLY IMMEDIATE;');
 
-        // Test GROUP_CONCAT (without SEPARATOR)
+		// Test GROUP_CONCAT (without SEPARATOR)
 		$sql="SELECT a.b, GROUP_CONCAT(a.c) FROM table GROUP BY a.b";
 		$result=DoliDBPgsql::convertSQLFromMysql($sql);
-        print __METHOD__." result=".$result."\n";
-    	$this->assertEquals($result, "SELECT a.b, STRING_AGG(a.c, ',') FROM table GROUP BY a.b", 'Test GROUP_CONCAT (without SEPARATOR)');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, "SELECT a.b, STRING_AGG(a.c, ',') FROM table GROUP BY a.b", 'Test GROUP_CONCAT (without SEPARATOR)');
 
-        // Test GROUP_CONCAT (with SEPARATOR)
+		// Test GROUP_CONCAT (with SEPARATOR)
 		$sql="SELECT a.b, GROUP_CONCAT(a.c SEPARATOR ',') FROM table GROUP BY a.b";
 		$result=DoliDBPgsql::convertSQLFromMysql($sql);
-        print __METHOD__." result=".$result."\n";
-    	$this->assertEquals($result, "SELECT a.b, STRING_AGG(a.c, ',') FROM table GROUP BY a.b", 'Test GROUP_CONCAT (with SEPARATOR)');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, "SELECT a.b, STRING_AGG(a.c, ',') FROM table GROUP BY a.b", 'Test GROUP_CONCAT (with SEPARATOR)');
 
-    	return $result;
-    }
+		return $result;
+	}
 }
diff --git a/test/phpunit/PricesTest.php b/test/phpunit/PricesTest.php
index 0c47ec4f275..1845bf05149 100755
--- a/test/phpunit/PricesTest.php
+++ b/test/phpunit/PricesTest.php
@@ -31,18 +31,16 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/price.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/compta/facture/class/facture.class.php';
 
-if (empty($user->id))
-{
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+if (empty($user->id)) {
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
-if (! empty($conf->global->MAIN_ROUNDING_RULE_TOT))
-{
-    print "Parameter MAIN_ROUNDING_RULE_TOT must be set to 0 or not set.\n";
-    exit(1);
+if (! empty($conf->global->MAIN_ROUNDING_RULE_TOT)) {
+	print "Parameter MAIN_ROUNDING_RULE_TOT must be set to 0 or not set.\n";
+	exit(1);
 }
 
 /**
@@ -54,311 +52,311 @@ if (! empty($conf->global->MAIN_ROUNDING_RULE_TOT))
  */
 class PricesTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return CoreTest
-     */
-    public function __construct()
-    {
-        parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return CoreTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-        //$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        //$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		//$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        //$db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		//$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return	void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * End phpunit tests
-     *
-     * @return	void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
 
-    /**
-     * Test function calcul_price_total
-     *
-     * @return 	boolean
-     * @see		http://wiki.dolibarr.org/index.php/Draft:VAT_calculation_and_rounding#Standard_usage
-     */
-    public function testCalculPriceTotal()
-    {
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+	/**
+	 * Test function calcul_price_total
+	 *
+	 * @return 	boolean
+	 * @see		http://wiki.dolibarr.org/index.php/Draft:VAT_calculation_and_rounding#Standard_usage
+	 */
+	public function testCalculPriceTotal()
+	{
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        global $mysoc;
-        $mysoc=new Societe($db);
+		global $mysoc;
+		$mysoc=new Societe($db);
 
-        // To force status that say module multicompany is on
-        //$conf->multicurrency=new stdClass();
-        //$conf->multicurrency->enabled = 0;
+		// To force status that say module multicompany is on
+		//$conf->multicurrency=new stdClass();
+		//$conf->multicurrency->enabled = 0;
 
 
-        /*
-         *  Country France
-         */
+		/*
+		 *  Country France
+		 */
 
-        // qty=1, unit_price=1.24, discount_line=0, vat_rate=10, price_base_type='HT' (method we provide value)
-        $mysoc->country_code='FR';
-        $mysoc->country_id=1;
-        $result1=calcul_price_total(1, 1.24, 0, 10, 0, 0, 0, 'HT', 0, 0);
-        print __METHOD__." result1=".join(', ', $result1)."\n";
-        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(1.24, 0.12, 1.36, 1.24, 0.124, 1.364, 1.24, 0.12, 1.36, 0, 0, 0, 0, 0, 0, 0, 1.24, 0.12, 1.36, 1.24, 0.124, 1.364, 1.24, 0.12, 1.36, 0, 0), $result1, 'Test1 FR');
+		// qty=1, unit_price=1.24, discount_line=0, vat_rate=10, price_base_type='HT' (method we provide value)
+		$mysoc->country_code='FR';
+		$mysoc->country_id=1;
+		$result1=calcul_price_total(1, 1.24, 0, 10, 0, 0, 0, 'HT', 0, 0);
+		print __METHOD__." result1=".join(', ', $result1)."\n";
+		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+		$this->assertEquals(array(1.24, 0.12, 1.36, 1.24, 0.124, 1.364, 1.24, 0.12, 1.36, 0, 0, 0, 0, 0, 0, 0, 1.24, 0.12, 1.36, 1.24, 0.124, 1.364, 1.24, 0.12, 1.36, 0, 0), $result1, 'Test1 FR');
 
-        // qty=1, unit_price=1.24, discount_line=0, vat_rate=10, price_base_type='HT', multicurrency_tx=1.09205 (method we provide value)
-        $mysoc->country_code='FR';
-        $mysoc->country_id=1;
-        $result1=calcul_price_total(2, 8.56, 0, 10, 0, 0, 0, 'HT', 0, 0, '', '', 100, 1.09205);
-        print __METHOD__." result1=".join(', ', $result1)."\n";
-        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(17.12, 1.71, 18.83, 8.56, 0.856, 9.416, 17.12, 1.71, 18.83, 0, 0, 0, 0, 0, 0, 0, 18.7, 1.87, 20.57, 9.34795, 0.93479, 10.28274, 18.7, 1.87, 20.57, 0, 0), $result1, 'Test1b FR');
+		// qty=1, unit_price=1.24, discount_line=0, vat_rate=10, price_base_type='HT', multicurrency_tx=1.09205 (method we provide value)
+		$mysoc->country_code='FR';
+		$mysoc->country_id=1;
+		$result1=calcul_price_total(2, 8.56, 0, 10, 0, 0, 0, 'HT', 0, 0, '', '', 100, 1.09205);
+		print __METHOD__." result1=".join(', ', $result1)."\n";
+		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+		$this->assertEquals(array(17.12, 1.71, 18.83, 8.56, 0.856, 9.416, 17.12, 1.71, 18.83, 0, 0, 0, 0, 0, 0, 0, 18.7, 1.87, 20.57, 9.34795, 0.93479, 10.28274, 18.7, 1.87, 20.57, 0, 0), $result1, 'Test1b FR');
 
-        // qty=2, unit_price=0, discount_line=0, vat_rate=10, price_base_type='HT', multicurrency_tx=1.09205 (method we provide value), pu_ht_devise=100
-        $mysoc->country_code='FR';
-        $mysoc->country_id=1;
-        $result1=calcul_price_total(2, 0, 0, 10, 0, 0, 0, 'HT', 0, 0, '', '', 100, 1.09205, 20);
-        print __METHOD__." result1=".join(', ', $result1)."\n";
-        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(36.63, 3.66, 40.29, 18.31418, 1.83142, 20.1456, 36.63, 3.66, 40.29, 0, 0, 0, 0, 0, 0, 0, 40, 4, 44, 20, 2, 22, 40, 4, 44, 0, 0), $result1, 'Test1c FR');
+		// qty=2, unit_price=0, discount_line=0, vat_rate=10, price_base_type='HT', multicurrency_tx=1.09205 (method we provide value), pu_ht_devise=100
+		$mysoc->country_code='FR';
+		$mysoc->country_id=1;
+		$result1=calcul_price_total(2, 0, 0, 10, 0, 0, 0, 'HT', 0, 0, '', '', 100, 1.09205, 20);
+		print __METHOD__." result1=".join(', ', $result1)."\n";
+		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+		$this->assertEquals(array(36.63, 3.66, 40.29, 18.31418, 1.83142, 20.1456, 36.63, 3.66, 40.29, 0, 0, 0, 0, 0, 0, 0, 40, 4, 44, 20, 2, 22, 40, 4, 44, 0, 0), $result1, 'Test1c FR');
 
-        /*
-         *  Country Spain
-         */
+		/*
+		 *  Country Spain
+		 */
 
-        // 10 * 10 HT - 0% discount with 10% vat, seller not using localtax1, not localtax2 (method we provide value)
-        $mysoc->country_code='ES';
-        $mysoc->country_id=4;
-        $mysoc->localtax1_assuj=0;
-        $mysoc->localtax2_assuj=0;
-        $result2=calcul_price_total(10, 10, 0, 10, 0, 0, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2
-        print __METHOD__." result2=".join(', ', $result2)."\n";
-        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0), $result2, 'Test1 ES');
+		// 10 * 10 HT - 0% discount with 10% vat, seller not using localtax1, not localtax2 (method we provide value)
+		$mysoc->country_code='ES';
+		$mysoc->country_id=4;
+		$mysoc->localtax1_assuj=0;
+		$mysoc->localtax2_assuj=0;
+		$result2=calcul_price_total(10, 10, 0, 10, 0, 0, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2
+		print __METHOD__." result2=".join(', ', $result2)."\n";
+		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+		$this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0), $result2, 'Test1 ES');
 
-        // 10 * 10 HT - 0% discount with 10% vat, seller not using localtax1, not localtax2 (other method autodetect)
-        $mysoc->country_code='ES';
-        $mysoc->country_id=4;
-        $mysoc->localtax1_assuj=0;
-        $mysoc->localtax2_assuj=0;
-        $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2
-        print __METHOD__." result2=".join(', ', $result2)."\n";
-        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0), $result2, 'Test2 ES');
+		// 10 * 10 HT - 0% discount with 10% vat, seller not using localtax1, not localtax2 (other method autodetect)
+		$mysoc->country_code='ES';
+		$mysoc->country_id=4;
+		$mysoc->localtax1_assuj=0;
+		$mysoc->localtax2_assuj=0;
+		$result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2
+		print __METHOD__." result2=".join(', ', $result2)."\n";
+		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+		$this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0), $result2, 'Test2 ES');
 
-        // --------------------------------------------------------
+		// --------------------------------------------------------
 
-        // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (method we provide value)
-        $mysoc->country_code='ES';
-        $mysoc->country_id=4;
-        $mysoc->localtax1_assuj=1;
-        $mysoc->localtax2_assuj=0;
-        $result2=calcul_price_total(10, 10, 0, 10, 1.4, 0, 0, 'HT', 0, 0);
-        print __METHOD__." result2=".join(', ', $result2)."\n";
-        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0, 100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0), $result2, 'Test3 ES');
+		// 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (method we provide value)
+		$mysoc->country_code='ES';
+		$mysoc->country_id=4;
+		$mysoc->localtax1_assuj=1;
+		$mysoc->localtax2_assuj=0;
+		$result2=calcul_price_total(10, 10, 0, 10, 1.4, 0, 0, 'HT', 0, 0);
+		print __METHOD__." result2=".join(', ', $result2)."\n";
+		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+		$this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0, 100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0), $result2, 'Test3 ES');
 
-        // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect)
-        $mysoc->country_code='ES';
-        $mysoc->country_id=4;
-        $mysoc->localtax1_assuj=1;
-        $mysoc->localtax2_assuj=0;
-        $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);
-        print __METHOD__." result2=".join(', ', $result2)."\n";
-        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0, 100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0), $result2, 'Test4 ES');
+		// 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect)
+		$mysoc->country_code='ES';
+		$mysoc->country_id=4;
+		$mysoc->localtax1_assuj=1;
+		$mysoc->localtax2_assuj=0;
+		$result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);
+		print __METHOD__." result2=".join(', ', $result2)."\n";
+		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+		$this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0, 100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0), $result2, 'Test4 ES');
 
-        // --------------------------------------------------------
+		// --------------------------------------------------------
 
-        // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value), we provide a service and not a product
-        $mysoc->country_code='ES';
-        $mysoc->country_id=4;
-        $mysoc->localtax1_assuj=0;
-        $mysoc->localtax2_assuj=1;
-        $result2=calcul_price_total(10, 10, 0, 10, 0, -19, 0, 'HT', 0, 1);
-        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19, 100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19), $result2, 'Test5 ES for service');
+		// 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value), we provide a service and not a product
+		$mysoc->country_code='ES';
+		$mysoc->country_id=4;
+		$mysoc->localtax1_assuj=0;
+		$mysoc->localtax2_assuj=1;
+		$result2=calcul_price_total(10, 10, 0, 10, 0, -19, 0, 'HT', 0, 1);
+		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+		$this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19, 100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19), $result2, 'Test5 ES for service');
 
-        // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect), we provide a service and not a product
-        $mysoc->country_code='ES';
-        $mysoc->country_id=4;
-        $mysoc->localtax1_assuj=0;
-        $mysoc->localtax2_assuj=1;
-        $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);
-        print __METHOD__." result2=".join(', ', $result2)."\n";
-        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0), $result2, 'Test6 ES for product');
+		// 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect), we provide a service and not a product
+		$mysoc->country_code='ES';
+		$mysoc->country_id=4;
+		$mysoc->localtax1_assuj=0;
+		$mysoc->localtax2_assuj=1;
+		$result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);
+		print __METHOD__." result2=".join(', ', $result2)."\n";
+		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+		$this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0), $result2, 'Test6 ES for product');
 
-        // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect), we provide a product and not a service
-        $mysoc->country_code='ES';
-        $mysoc->country_id=4;
-        $mysoc->localtax1_assuj=0;
-        $mysoc->localtax2_assuj=1;
-        $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 1);
-        print __METHOD__." result2=".join(', ', $result2)."\n";
-        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19, 100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19), $result2, 'Test6 ES for service');
+		// 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect), we provide a product and not a service
+		$mysoc->country_code='ES';
+		$mysoc->country_id=4;
+		$mysoc->localtax1_assuj=0;
+		$mysoc->localtax2_assuj=1;
+		$result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 1);
+		print __METHOD__." result2=".join(', ', $result2)."\n";
+		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+		$this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19, 100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19), $result2, 'Test6 ES for service');
 
-        // --------------------------------------------------------
+		// --------------------------------------------------------
 
-        // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value), we provide a product and not a service
-        $mysoc->country_code='ES';
-        $mysoc->country_id=4;
-        $mysoc->localtax1_assuj=0;
-        $mysoc->localtax2_assuj=1;
-        $result2=calcul_price_total(10, -10, 0, 10, 0, 19, 0, 'HT', 0, 0);
-        print __METHOD__." result2=".join(', ', $result2)."\n";
-        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(-100, -10, -110, -10, -1, -11, -100, -10, -110, 0, 0, 0, 0, 0, 0, 0, -100, -10, -110, -10, -1, -11, -100, -10, -110, 0, 0), $result2, 'Test7 ES for product');
+		// Credit Note: 10 * -10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value), we provide a product and not a service
+		$mysoc->country_code='ES';
+		$mysoc->country_id=4;
+		$mysoc->localtax1_assuj=0;
+		$mysoc->localtax2_assuj=1;
+		$result2=calcul_price_total(10, -10, 0, 10, 0, 19, 0, 'HT', 0, 0);
+		print __METHOD__." result2=".join(', ', $result2)."\n";
+		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+		$this->assertEquals(array(-100, -10, -110, -10, -1, -11, -100, -10, -110, 0, 0, 0, 0, 0, 0, 0, -100, -10, -110, -10, -1, -11, -100, -10, -110, 0, 0), $result2, 'Test7 ES for product');
 
-        // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect), we provide a service and not a product
-        $mysoc->country_code='ES';
-        $mysoc->country_id=4;
-        $mysoc->localtax1_assuj=0;
-        $mysoc->localtax2_assuj=1;
-        $result2=calcul_price_total(10, -10, 0, 10, -1, -1, 0, 'HT', 0, 1);
-        print __METHOD__." result2=".join(', ', $result2)."\n";
-        $this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10, -91, 0, 19, 0, 1.90, 0, 0, 19, -100, -10, -91, -10, -1, -9.1, -100, -10, -91, 0, 19), $result2, 'Test8 ES for service');
+		// Credit Note: 10 * -10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect), we provide a service and not a product
+		$mysoc->country_code='ES';
+		$mysoc->country_id=4;
+		$mysoc->localtax1_assuj=0;
+		$mysoc->localtax2_assuj=1;
+		$result2=calcul_price_total(10, -10, 0, 10, -1, -1, 0, 'HT', 0, 1);
+		print __METHOD__." result2=".join(', ', $result2)."\n";
+		$this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10, -91, 0, 19, 0, 1.90, 0, 0, 19, -100, -10, -91, -10, -1, -9.1, -100, -10, -91, 0, 19), $result2, 'Test8 ES for service');
 
 
-        /*
-         * Country Côte d'Ivoire
-         */
+		/*
+		 * Country Côte d'Ivoire
+		 */
 
-        // 10 * 10 HT - 0% discount with 18% vat, seller using localtax1 type 2, not localtax2 (method we provide value)
-        $mysoc->country_code='CI';
-        $mysoc->country_id=21;
-        $mysoc->localtax1_assuj=1;
-        $mysoc->localtax2_assuj=0;
-        //$localtaxes=getLocalTaxesFromRate(18, 0, null, $mysoc);
-        //var_dump($locataxes);
-        $result3=calcul_price_total(10, 10, 0, 18, 7.5, 0, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2
-        print __METHOD__." result3=".join(', ', $result3)."\n";
-        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0, 100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0), $result3, 'Test9 CI');
+		// 10 * 10 HT - 0% discount with 18% vat, seller using localtax1 type 2, not localtax2 (method we provide value)
+		$mysoc->country_code='CI';
+		$mysoc->country_id=21;
+		$mysoc->localtax1_assuj=1;
+		$mysoc->localtax2_assuj=0;
+		//$localtaxes=getLocalTaxesFromRate(18, 0, null, $mysoc);
+		//var_dump($locataxes);
+		$result3=calcul_price_total(10, 10, 0, 18, 7.5, 0, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2
+		print __METHOD__." result3=".join(', ', $result3)."\n";
+		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+		$this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0, 100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0), $result3, 'Test9 CI');
 
-        // 10 * 10 HT - 0% discount with 18% vat, seller using localtax1 type 2, not localtax2 (other method autodetect)
-        $mysoc->country_code='CI';
-        $mysoc->country_id=21;
-        $mysoc->localtax1_assuj=1;
-        $mysoc->localtax2_assuj=0;
-        $result3=calcul_price_total(10, 10, 0, 18, -1, -1, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2
-        print __METHOD__." result3=".join(', ', $result3)."\n";
-        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-        $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0, 100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0), $result3, 'Test10 CI');
+		// 10 * 10 HT - 0% discount with 18% vat, seller using localtax1 type 2, not localtax2 (other method autodetect)
+		$mysoc->country_code='CI';
+		$mysoc->country_id=21;
+		$mysoc->localtax1_assuj=1;
+		$mysoc->localtax2_assuj=0;
+		$result3=calcul_price_total(10, 10, 0, 18, -1, -1, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2
+		print __METHOD__." result3=".join(', ', $result3)."\n";
+		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+		$this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0, 100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0), $result3, 'Test10 CI');
 
-        return true;
-    }
+		return true;
+	}
 
 
-    /**
-     * Test function addline and update_price
-     *
-     * @return 	boolean
-     * @see		http://wiki.dolibarr.org/index.php/Draft:VAT_calculation_and_rounding#Standard_usage
-     */
-    public function testUpdatePrice()
-    {
-        //$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+	/**
+	 * Test function addline and update_price
+	 *
+	 * @return 	boolean
+	 * @see		http://wiki.dolibarr.org/index.php/Draft:VAT_calculation_and_rounding#Standard_usage
+	 */
+	public function testUpdatePrice()
+	{
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
+		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
 
-        // Two lines of 1.24 give 2.48 HT and 2.72 TTC with standard vat rounding mode
-        $localobject=new Facture($this->savdb);
-        $localobject->initAsSpecimen('nolines');
-        $invoiceid=$localobject->create($user);
+		// Two lines of 1.24 give 2.48 HT and 2.72 TTC with standard vat rounding mode
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen('nolines');
+		$invoiceid=$localobject->create($user);
 
-        $localobject->addline('Desc', 1.24, 1, 10, 0, 0, 0, 0, '', '', 0, 0, 0, 'HT');
-        $localobject->addline('Desc', 1.24, 1, 10, 0, 0, 0, 0, '', '', 0, 0, 0, 'HT');
+		$localobject->addline('Desc', 1.24, 1, 10, 0, 0, 0, 0, '', '', 0, 0, 0, 'HT');
+		$localobject->addline('Desc', 1.24, 1, 10, 0, 0, 0, 0, '', '', 0, 0, 0, 'HT');
 
-        $newlocalobject=new Facture($this->savdb);
-        $newlocalobject->fetch($invoiceid);
+		$newlocalobject=new Facture($this->savdb);
+		$newlocalobject->fetch($invoiceid);
 
-        $this->assertEquals(2.48, $newlocalobject->total_ht, "testUpdatePrice test1");
-        $this->assertEquals(0.24, $newlocalobject->total_tva, "testUpdatePrice test2");
-        $this->assertEquals(2.72, $newlocalobject->total_ttc, "testUpdatePrice test3");
+		$this->assertEquals(2.48, $newlocalobject->total_ht, "testUpdatePrice test1");
+		$this->assertEquals(0.24, $newlocalobject->total_tva, "testUpdatePrice test2");
+		$this->assertEquals(2.72, $newlocalobject->total_ttc, "testUpdatePrice test3");
 
 
-        // Two lines of 1.24 give 2.48 HT and 2.73 TTC with global vat rounding mode
-        $localobject=new Facture($this->savdb);
-        $localobject->initAsSpecimen('nolines');
-        $invoiceid=$localobject->create($user);
+		// Two lines of 1.24 give 2.48 HT and 2.73 TTC with global vat rounding mode
+		$localobject=new Facture($this->savdb);
+		$localobject->initAsSpecimen('nolines');
+		$invoiceid=$localobject->create($user);
 
-        $localobject->addline('Desc', 1.24, 1, 10, 0, 0, 0, 0, '', '', 0, 0, 0, 'HT');
-        $localobject->addline('Desc', 1.24, 1, 10, 0, 0, 0, 0, '', '', 0, 0, 0, 'HT');
+		$localobject->addline('Desc', 1.24, 1, 10, 0, 0, 0, 0, '', '', 0, 0, 0, 'HT');
+		$localobject->addline('Desc', 1.24, 1, 10, 0, 0, 0, 0, '', '', 0, 0, 0, 'HT');
 
-        $newlocalobject=new Facture($this->savdb);
-        $newlocalobject->fetch($invoiceid);
+		$newlocalobject=new Facture($this->savdb);
+		$newlocalobject->fetch($invoiceid);
 
-        $this->assertEquals(2.48, $newlocalobject->total_ht, "testUpdatePrice test4");
-        //$this->assertEquals(0.25,$newlocalobject->total_tva);
-        //$this->assertEquals(2.73,$newlocalobject->total_ttc);
-    }
+		$this->assertEquals(2.48, $newlocalobject->total_ht, "testUpdatePrice test4");
+		//$this->assertEquals(0.25,$newlocalobject->total_tva);
+		//$this->assertEquals(2.73,$newlocalobject->total_ttc);
+	}
 }
diff --git a/test/phpunit/ProductTest.php b/test/phpunit/ProductTest.php
index e574d3e1d20..a7267251ed0 100644
--- a/test/phpunit/ProductTest.php
+++ b/test/phpunit/ProductTest.php
@@ -29,11 +29,10 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/product/class/product.class.php';
 
-if (empty($user->id))
-{
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+if (empty($user->id)) {
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -47,208 +46,210 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class ProductTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return ProductTest
-     */
-    public function __construct()
-    {
-        parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return ProductTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-        //$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 
-        if (empty($conf->produit->enabled)) { print __METHOD__." Module Product must be enabled.\n"; die(); }
+		if (empty($conf->produit->enabled)) {
+			print __METHOD__." Module Product must be enabled.\n"; die();
+		}
 
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-    */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	*/
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * End phpunit tests
-     *
-     * @return  void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+	/**
+	 * End phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testProductCreate
-     *
-     * @return  void
-     */
-    public function testProductCreate()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testProductCreate
+	 *
+	 * @return  void
+	 */
+	public function testProductCreate()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Product($this->savdb);
-        $localobject->initAsSpecimen();
-        $result=$localobject->create($user);
+		$localobject=new Product($this->savdb);
+		$localobject->initAsSpecimen();
+		$result=$localobject->create($user);
 
-        print __METHOD__." result=".$result."\n";
-        $this->assertLessThanOrEqual($result, 0, "Creation of product");
+		print __METHOD__." result=".$result."\n";
+		$this->assertLessThanOrEqual($result, 0, "Creation of product");
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testProductFetch
-     *
-     * @param   int $id     Id product
-     * @return  Product
-     *
-     * @depends testProductCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testProductFetch($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testProductFetch
+	 *
+	 * @param   int $id     Id product
+	 * @return  Product
+	 *
+	 * @depends testProductCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testProductFetch($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Product($this->savdb);
-        $result=$localobject->fetch($id);
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		$localobject=new Product($this->savdb);
+		$result=$localobject->fetch($id);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testProductUpdate
-     *
-     * @param   Product $localobject    Product
-     * @return  void
-     *
-     * @depends testProductFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testProductUpdate($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testProductUpdate
+	 *
+	 * @param   Product $localobject    Product
+	 * @return  void
+	 *
+	 * @depends testProductFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testProductUpdate($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject->note_public = 'New public note after update';
-        $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);
+		$localobject->note_public = 'New public note after update';
+		$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);
 
-        return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testProductOther
-     *
-     * @param   Product $localobject    Product
-     * @return  void
-     *
-     * @depends	testProductUpdate
-     * The depends says test is run only if previous is ok
-     */
-    public function testProductOther($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testProductOther
+	 *
+	 * @param   Product $localobject    Product
+	 * @return  void
+	 *
+	 * @depends	testProductUpdate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testProductOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $this->assertEquals(0, 0);
+		$this->assertEquals(0, 0);
 
-        return $localobject->id;
-    }
+		return $localobject->id;
+	}
 
-    /**
-     * testProductDelete
-     *
-     * @param       int $id     Id of product
-     * @return      void
-     *
-     * @depends testProductOther
-     * The depends says test is run only if previous is ok
-     */
-    public function testProductDelete($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testProductDelete
+	 *
+	 * @param       int $id     Id of product
+	 * @return      void
+	 *
+	 * @depends testProductOther
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testProductDelete($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Product($this->savdb);
-        $result=$localobject->fetch($id);
+		$localobject=new Product($this->savdb);
+		$result=$localobject->fetch($id);
 
-        $result=$localobject->delete($user);
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		$result=$localobject->delete($user);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        return $result;
-    }
+		return $result;
+	}
 }
diff --git a/test/phpunit/ProjectTest.php b/test/phpunit/ProjectTest.php
index 8a7e0540b9a..d9f76f26635 100644
--- a/test/phpunit/ProjectTest.php
+++ b/test/phpunit/ProjectTest.php
@@ -30,8 +30,7 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/projet/class/project.class.php';
 require_once dirname(__FILE__).'/../../htdocs/projet/class/task.class.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -75,40 +74,40 @@ class ProjectTest extends PHPUnit\Framework\TestCase
 		print "\n";
 	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -116,135 +115,135 @@ class ProjectTest extends PHPUnit\Framework\TestCase
 
 		print __METHOD__."\n";
 		//print $db->getVersion()."\n";
-    }
+	}
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
-
-    /**
-     * testProjectCreate
-     *
-     * @return	void
-     */
-    public function testProjectCreate()
-    {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Project($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
-    	return $result;
-    }
-
-    /**
-     * testProjectFetch
-     *
-     * @param	int		$id		Id of object
-     * @return	void
-     *
-     * @depends	testProjectCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testProjectFetch($id)
-    {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Project($this->savdb);
-    	$result=$localobject->fetch($id);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	return $localobject;
-    }
-
-    /**
-     * testProjectValid
-     *
-     * @param	Project	$localobject	Project
-     * @return	Project
-     *
-     * @depends	testProjectFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testProjectValid($localobject)
-    {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-    	$result=$localobject->setValid($user);
-
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
 	/**
-     * testProjectClose
-     *
-     * @param	Project	$localobject	Project
-     * @return	int
-     *
-     * @depends testProjectValid
-     * The depends says test is run only if previous is ok
-     */
-    public function testProjectOther($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $result=$localobject->setClose($user);
-
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-        return $localobject->id;
-    }
-
-    /**
-     * testProjectDelete
-     *
-     * @param	int		$id		Id of project
-     * @return	void
-     *
-     * @depends	testProjectClose
-     * The depends says test is run only if previous is ok
-     */
-    public function testProjectDelete($id)
-    {
-    	global $conf,$user,$langs,$db;
+	 * testProjectCreate
+	 *
+	 * @return	void
+	 */
+	public function testProjectCreate()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new Project($this->savdb);
-    	$result=$localobject->fetch($id);
+		$localobject->initAsSpecimen();
+		$result=$localobject->create($user);
+
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
+		return $result;
+	}
+
+	/**
+	 * testProjectFetch
+	 *
+	 * @param	int		$id		Id of object
+	 * @return	void
+	 *
+	 * @depends	testProjectCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testProjectFetch($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$localobject=new Project($this->savdb);
+		$result=$localobject->fetch($id);
+
+		$this->assertLessThan($result, 0);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		return $localobject;
+	}
+
+	/**
+	 * testProjectValid
+	 *
+	 * @param	Project	$localobject	Project
+	 * @return	Project
+	 *
+	 * @depends	testProjectFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testProjectValid($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$result=$localobject->setValid($user);
+
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
+
+	/**
+	 * testProjectClose
+	 *
+	 * @param	Project	$localobject	Project
+	 * @return	int
+	 *
+	 * @depends testProjectValid
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testProjectOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$result=$localobject->setClose($user);
+
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject->id;
+	}
+
+	/**
+	 * testProjectDelete
+	 *
+	 * @param	int		$id		Id of project
+	 * @return	void
+	 *
+	 * @depends	testProjectClose
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testProjectDelete($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$localobject=new Project($this->savdb);
+		$result=$localobject->fetch($id);
 		$result=$localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $result;
-    }
+		$this->assertLessThan($result, 0);
+		return $result;
+	}
 }
diff --git a/test/phpunit/PropalTest.php b/test/phpunit/PropalTest.php
index ea678e8df34..235cc81e10c 100644
--- a/test/phpunit/PropalTest.php
+++ b/test/phpunit/PropalTest.php
@@ -29,8 +29,7 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/comm/propal/class/propal.class.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -74,40 +73,40 @@ class PropalTest extends PHPUnit\Framework\TestCase
 		print "\n";
 	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -115,190 +114,190 @@ class PropalTest extends PHPUnit\Framework\TestCase
 
 		print __METHOD__."\n";
 		//print $db->getVersion()."\n";
-    }
+	}
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testPropalCreate
-     *
-     * @return	void
-     */
-    public function testPropalCreate()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testPropalCreate
+	 *
+	 * @return	void
+	 */
+	public function testPropalCreate()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new Propal($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+		$localobject->initAsSpecimen();
+		$result=$localobject->create($user);
 
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
-    	return $result;
-    }
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
+		return $result;
+	}
 
-    /**
-     * testPropalFetch
-     *
-     * @param	int		$id		Id of object
-     * @return	Propal
-     *
-     * @depends	testPropalCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testPropalFetch($id)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testPropalFetch
+	 *
+	 * @param	int		$id		Id of object
+	 * @return	Propal
+	 *
+	 * @depends	testPropalCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testPropalFetch($id)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new Propal($this->savdb);
-    	$result=$localobject->fetch($id);
+		$result=$localobject->fetch($id);
 
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	return $localobject;
-    }
+		$this->assertLessThan($result, 0);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		return $localobject;
+	}
 
-    /**
-     * testPropalUpdate
-     *
-     * @param	Propal		$localobject	Proposal
-     * @return	Propal
-     *
-     * @depends	testPropalFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testPropalUpdate($localobject)
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$localobject->note_private = 'New note private after update';
-    	$result = $localobject->update($user);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	return $localobject;
-    }
-
-    /**
-     * testPropalAddLine
-     *
-     * @param	Propal		$localobject	Proposal
-     * @return	Propal
-     *
-     * @depends	testPropalUpdate
-     * The depends says test is run only if previous is ok
-     */
-    public function testPropalAddLine($localobject)
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-        $localobject->fetch_thirdparty();
-    	$result=$localobject->addline('Added line', 10, 2, 19.6);
-
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	return $localobject;
-    }
-
-    /**
-     * testPropalValid
-     *
-     * @param	Propal	$localobject	Proposal
-     * @return	Propal
-     *
-     * @depends	testPropalAddLine
-     * The depends says test is run only if previous is ok
-     */
-    public function testPropalValid($localobject)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testPropalUpdate
+	 *
+	 * @param	Propal		$localobject	Proposal
+	 * @return	Propal
+	 *
+	 * @depends	testPropalFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testPropalUpdate($localobject)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
-    	$result=$localobject->valid($user);
+		$localobject->note_private = 'New note private after update';
+		$result = $localobject->update($user);
 
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
-    }
+		$this->assertLessThan($result, 0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		return $localobject;
+	}
 
-    /**
-     * testPropalOther
-     *
-     * @param	Propal	$localobject	Proposal
-     * @return	int
-     *
-     * @depends testPropalValid
-     * The depends says test is run only if previous is ok
-     */
-    public function testPropalOther($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testPropalAddLine
+	 *
+	 * @param	Propal		$localobject	Proposal
+	 * @return	Propal
+	 *
+	 * @depends	testPropalUpdate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testPropalAddLine($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        /*$result=$localobject->setstatus(0);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        */
+		$localobject->fetch_thirdparty();
+		$result=$localobject->addline('Added line', 10, 2, 19.6);
 
-        $localobject->info($localobject->id);
-        print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
-        $this->assertNotEquals($localobject->date_creation, '');
+		$this->assertLessThan($result, 0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		return $localobject;
+	}
 
-        return $localobject->id;
-    }
+	/**
+	 * testPropalValid
+	 *
+	 * @param	Propal	$localobject	Proposal
+	 * @return	Propal
+	 *
+	 * @depends	testPropalAddLine
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testPropalValid($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-    /**
-     * testPropalDelete
-     *
-     * @param	int		$id		Id of proposal
-     * @return	void
-     *
-     * @depends	testPropalOther
-     * The depends says test is run only if previous is ok
-     */
-    public function testPropalDelete($id)
-    {
-    	global $conf,$user,$langs,$db;
+		$result=$localobject->valid($user);
+
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
+
+	/**
+	 * testPropalOther
+	 *
+	 * @param	Propal	$localobject	Proposal
+	 * @return	int
+	 *
+	 * @depends testPropalValid
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testPropalOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		/*$result=$localobject->setstatus(0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		*/
+
+		$localobject->info($localobject->id);
+		print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
+		$this->assertNotEquals($localobject->date_creation, '');
+
+		return $localobject->id;
+	}
+
+	/**
+	 * testPropalDelete
+	 *
+	 * @param	int		$id		Id of proposal
+	 * @return	void
+	 *
+	 * @depends	testPropalOther
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testPropalDelete($id)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new Propal($this->savdb);
-    	$result=$localobject->fetch($id);
+		$result=$localobject->fetch($id);
 		$result=$localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $result;
-    }
+		$this->assertLessThan($result, 0);
+		return $result;
+	}
 }
diff --git a/test/phpunit/RestAPIDocumentTest.php b/test/phpunit/RestAPIDocumentTest.php
index e38f1fbae12..c71ef7bcf63 100644
--- a/test/phpunit/RestAPIDocumentTest.php
+++ b/test/phpunit/RestAPIDocumentTest.php
@@ -31,9 +31,9 @@ require_once dirname(__FILE__).'/../../htdocs/core/lib/geturl.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/files.lib.php';
 
 if (empty($user->id)) {
-    echo "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	echo "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 $conf->global->MAIN_UMASK = '0666';
@@ -47,204 +47,204 @@ $conf->global->MAIN_UMASK = '0666';
  */
 class RestAPIDocumentTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
-    protected $api_url;
-    protected $api_key;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+	protected $api_url;
+	protected $api_key;
 
-    /**
-     * Constructor
-     * We save global variables into local variables.
-     *
-     * @return DateLibTest
-     */
-    public function __construct()
-    {
-        parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables.
+	 *
+	 * @return DateLibTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-        //$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf = $conf;
-        $this->savuser = $user;
-        $this->savlangs = $langs;
-        $this->savdb = $db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
-        echo __METHOD__.' db->type='.$db->type.' user->id='.$user->id;
-        //print " - db ".$db->db;
-        echo "\n";
-    }
+		echo __METHOD__.' db->type='.$db->type.' user->id='.$user->id;
+		//print " - db ".$db->db;
+		echo "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        echo __METHOD__."\n";
-    }
+		echo __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        echo __METHOD__."\n";
-    }
+		echo __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests.
-     * @return void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf = $this->savconf;
-        $user = $this->savuser;
-        $langs = $this->savlangs;
-        $db = $this->savdb;
+	/**
+	 * Init phpunit tests.
+	 * @return void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-        $this->api_url = DOL_MAIN_URL_ROOT.'/api/index.php';
+		$this->api_url = DOL_MAIN_URL_ROOT.'/api/index.php';
 
-        $login = 'admin';
-        $password = 'admin';
-        $url = $this->api_url.'/login?login='.$login.'&password='.$password;
-        // Call the API login method to save api_key for this test class
-        $result = getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
-        echo __METHOD__.' result = '.var_export($result, true)."\n";
-        echo __METHOD__.' curl_error_no: '.$result['curl_error_no']."\n";
-        $this->assertEquals($result['curl_error_no'], '');
-        $object = json_decode($result['content'], true);
-        $this->assertNotNull($object, 'Parsing of json result must no be null');
-        $this->assertEquals('200', $object['success']['code']);
+		$login = 'admin';
+		$password = 'admin';
+		$url = $this->api_url.'/login?login='.$login.'&password='.$password;
+		// Call the API login method to save api_key for this test class
+		$result = getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
+		echo __METHOD__.' result = '.var_export($result, true)."\n";
+		echo __METHOD__.' curl_error_no: '.$result['curl_error_no']."\n";
+		$this->assertEquals($result['curl_error_no'], '');
+		$object = json_decode($result['content'], true);
+		$this->assertNotNull($object, 'Parsing of json result must no be null');
+		$this->assertEquals('200', $object['success']['code']);
 
-        $this->api_key = $object['success']['token'];
-        echo __METHOD__." api_key: $this->api_key \n";
+		$this->api_key = $object['success']['token'];
+		echo __METHOD__." api_key: $this->api_key \n";
 
-        echo __METHOD__."\n";
-    }
+		echo __METHOD__."\n";
+	}
 
-    /**
-     * End phpunit tests.
-     * @return void
-     */
-    protected function tearDown()
-    {
-        echo __METHOD__."\n";
-    }
+	/**
+	 * End phpunit tests.
+	 * @return void
+	 */
+	protected function tearDown()
+	{
+		echo __METHOD__."\n";
+	}
 
-    /**
-     * testPushDocument.
-     *
-     * @return int
-     */
-    public function testPushDocument()
-    {
-        global $conf,$user,$langs,$db;
+	/**
+	 * testPushDocument.
+	 *
+	 * @return int
+	 */
+	public function testPushDocument()
+	{
+		global $conf,$user,$langs,$db;
 
-        $url = $this->api_url.'/documents/upload?api_key='.$this->api_key;
+		$url = $this->api_url.'/documents/upload?api_key='.$this->api_key;
 
-        echo __METHOD__.' Request POST url='.$url."\n";
+		echo __METHOD__.' Request POST url='.$url."\n";
 
 
-        // Send to non existent directory
+		// Send to non existent directory
 
-        dol_delete_dir_recursive(DOL_DATA_ROOT.'/medias/tmpphpunit/tmpphpunit1');
+		dol_delete_dir_recursive(DOL_DATA_ROOT.'/medias/tmpphpunit/tmpphpunit1');
 
-        //$data = '{ "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "mysubdir1/mysubdir2", "filecontent": "content text", "fileencoding": "" }';
-        $data = array(
-            'filename'=>"mynewfile.txt",
-            'modulepart'=>"medias",
-            'subdir'=>"tmpphpunit/tmpphpunit1",
-            'filecontent'=>"content text",
-            'fileencoding'=>"",
-        	'overwriteifexists'=>0,
-        	'createdirifnotexists'=>0
-        );
+		//$data = '{ "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "mysubdir1/mysubdir2", "filecontent": "content text", "fileencoding": "" }';
+		$data = array(
+			'filename'=>"mynewfile.txt",
+			'modulepart'=>"medias",
+			'subdir'=>"tmpphpunit/tmpphpunit1",
+			'filecontent'=>"content text",
+			'fileencoding'=>"",
+			'overwriteifexists'=>0,
+			'createdirifnotexists'=>0
+		);
 
-        $param = '';
-        foreach ($data as $key => $val) {
-        	$param .= '&'.$key.'='.urlencode($val);
-        }
+		$param = '';
+		foreach ($data as $key => $val) {
+			$param .= '&'.$key.'='.urlencode($val);
+		}
 
-        $result = getURLContent($url, 'POST', $param, 1, array(), array('http', 'https'), 2);
-        echo __METHOD__.' Result for sending document: '.var_export($result, true)."\n";
-        echo __METHOD__.' curl_error_no: '.$result['curl_error_no']."\n";
-        $object = json_decode($result['content'], true);
-        $this->assertNotNull($object, 'Parsing of json result must not be null');
-        $this->assertEquals('401', $result['http_code'], 'Return code is not 401');
-        $this->assertEquals('401', empty($object['error']['code']) ? '' : $object['error']['code'], 'Error code is not 401');
+		$result = getURLContent($url, 'POST', $param, 1, array(), array('http', 'https'), 2);
+		echo __METHOD__.' Result for sending document: '.var_export($result, true)."\n";
+		echo __METHOD__.' curl_error_no: '.$result['curl_error_no']."\n";
+		$object = json_decode($result['content'], true);
+		$this->assertNotNull($object, 'Parsing of json result must not be null');
+		$this->assertEquals('401', $result['http_code'], 'Return code is not 401');
+		$this->assertEquals('401', empty($object['error']['code']) ? '' : $object['error']['code'], 'Error code is not 401');
 
 
-        // Send to existent directory
+		// Send to existent directory
 
-        dol_delete_dir_recursive(DOL_DATA_ROOT.'/medias/tmpphpunit/tmpphpunit2');
-        dol_mkdir(DOL_DATA_ROOT.'/medias/tmpphpunit/tmpphpunit2');
+		dol_delete_dir_recursive(DOL_DATA_ROOT.'/medias/tmpphpunit/tmpphpunit2');
+		dol_mkdir(DOL_DATA_ROOT.'/medias/tmpphpunit/tmpphpunit2');
 
-        $data = array(
-            'filename'=>"mynewfile.txt",
-            'modulepart'=>"medias",
-            'ref'=>"",
-            'subdir'=>"tmpphpunit/tmpphpunit2",
-            'filecontent'=>"content text",
-            'fileencoding'=>"",
-        	'overwriteifexists'=>0,
-        	'createdirifnotexists'=>0
-        );
+		$data = array(
+			'filename'=>"mynewfile.txt",
+			'modulepart'=>"medias",
+			'ref'=>"",
+			'subdir'=>"tmpphpunit/tmpphpunit2",
+			'filecontent'=>"content text",
+			'fileencoding'=>"",
+			'overwriteifexists'=>0,
+			'createdirifnotexists'=>0
+		);
 
-        $param = '';
-        foreach ($data as $key => $val) {
-        	$param .= '&'.$key.'='.urlencode($val);
-        }
+		$param = '';
+		foreach ($data as $key => $val) {
+			$param .= '&'.$key.'='.urlencode($val);
+		}
 
-        $result2 = getURLContent($url, 'POST', $param, 1, array(), array('http', 'https'), 2);
-        echo __METHOD__.' Result for sending document: '.var_export($result2, true)."\n";
-        echo __METHOD__.' curl_error_no: '.$result2['curl_error_no']."\n";
-        $object2 = json_decode($result2['content'], true);
-        //$this->assertNotNull($object2, 'Parsing of json result must not be null');
-        $this->assertEquals('200', $result2['http_code'], 'Return code must be 200');
-        $this->assertEquals($result2['curl_error_no'], '');
-        $this->assertEquals($object2, 'mynewfile.txt', 'Must contains basename of file');
+		$result2 = getURLContent($url, 'POST', $param, 1, array(), array('http', 'https'), 2);
+		echo __METHOD__.' Result for sending document: '.var_export($result2, true)."\n";
+		echo __METHOD__.' curl_error_no: '.$result2['curl_error_no']."\n";
+		$object2 = json_decode($result2['content'], true);
+		//$this->assertNotNull($object2, 'Parsing of json result must not be null');
+		$this->assertEquals('200', $result2['http_code'], 'Return code must be 200');
+		$this->assertEquals($result2['curl_error_no'], '');
+		$this->assertEquals($object2, 'mynewfile.txt', 'Must contains basename of file');
 
 
-        dol_delete_dir_recursive(DOL_DATA_ROOT.'/medias/tmpphpunit/tmpphpunit3');
+		dol_delete_dir_recursive(DOL_DATA_ROOT.'/medias/tmpphpunit/tmpphpunit3');
 
-        $data = array(
-        	'filename'=>"mynewfile.txt",
-        	'modulepart'=>"medias",
-        	'ref'=>"",
-        	'subdir'=>"tmpphpunit/tmpphpunit3",
-        	'filecontent'=>"content text",
-        	'fileencoding'=>"",
-        	'overwriteifexists'=>0,
-        	'createdirifnotexists'=>1
-        );
+		$data = array(
+			'filename'=>"mynewfile.txt",
+			'modulepart'=>"medias",
+			'ref'=>"",
+			'subdir'=>"tmpphpunit/tmpphpunit3",
+			'filecontent'=>"content text",
+			'fileencoding'=>"",
+			'overwriteifexists'=>0,
+			'createdirifnotexists'=>1
+		);
 
-        $param = '';
-        foreach ($data as $key => $val) {
-        	$param .= '&'.$key.'='.urlencode($val);
-        }
+		$param = '';
+		foreach ($data as $key => $val) {
+			$param .= '&'.$key.'='.urlencode($val);
+		}
 
-        $result3 = getURLContent($url, 'POST', $param, 1, array(), array('http', 'https'), 2);
-        echo __METHOD__.' Result for sending document: '.var_export($result3, true)."\n";
-        echo __METHOD__.' curl_error_no: '.$result3['curl_error_no']."\n";
-        $object3 = json_decode($result3['content'], true);
-        //$this->assertNotNull($object2, 'Parsing of json result must not be null');
-        $this->assertEquals('200', $result3['http_code'], 'Return code must be 200');
-        $this->assertEquals($result3['curl_error_no'], '');
-        $this->assertEquals($object3, 'mynewfile.txt', 'Must contains basename of file');
+		$result3 = getURLContent($url, 'POST', $param, 1, array(), array('http', 'https'), 2);
+		echo __METHOD__.' Result for sending document: '.var_export($result3, true)."\n";
+		echo __METHOD__.' curl_error_no: '.$result3['curl_error_no']."\n";
+		$object3 = json_decode($result3['content'], true);
+		//$this->assertNotNull($object2, 'Parsing of json result must not be null');
+		$this->assertEquals('200', $result3['http_code'], 'Return code must be 200');
+		$this->assertEquals($result3['curl_error_no'], '');
+		$this->assertEquals($object3, 'mynewfile.txt', 'Must contains basename of file');
 
 
-        dol_delete_dir_recursive(DOL_DATA_ROOT.'/medias/tmpphpunit');
-    }
+		dol_delete_dir_recursive(DOL_DATA_ROOT.'/medias/tmpphpunit');
+	}
 }
diff --git a/test/phpunit/RestAPIUserTest.php b/test/phpunit/RestAPIUserTest.php
index 6222f7fcaf7..a534c5f5910 100644
--- a/test/phpunit/RestAPIUserTest.php
+++ b/test/phpunit/RestAPIUserTest.php
@@ -32,9 +32,9 @@ require_once dirname(__FILE__).'/../../htdocs/core/lib/geturl.lib.php';
 
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 $conf->global->MAIN_UMASK='0666';
@@ -49,193 +49,195 @@ $conf->global->MAIN_UMASK='0666';
  */
 class RestAPIUserTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
-    protected $api_url;
-    protected $api_key;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+	protected $api_url;
+	protected $api_key;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return DateLibTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return DateLibTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        if (empty($conf->api->enabled)) { print __METHOD__." module api must be enabled.\n"; die(); }
+		if (empty($conf->api->enabled)) {
+			print __METHOD__." module api must be enabled.\n"; die();
+		}
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-    */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	*/
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $this->api_url=DOL_MAIN_URL_ROOT.'/api/index.php';
+		$this->api_url=DOL_MAIN_URL_ROOT.'/api/index.php';
 
-        $login='admin';
-        $password='admin';
-        $url=$this->api_url.'/login?login='.$login.'&password='.$password;
-        // Call the API login method to save api_key for this test class
-        $result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
-        print __METHOD__." result = ".var_export($result, true)."\n";
-        print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
-        $this->assertEquals($result['curl_error_no'], '');
-        $object=json_decode($result['content'], true);
-        $this->assertNotNull($object, "Parsing of json result must not be null");
-        $this->assertEquals('200', $object['success']['code']);
+		$login='admin';
+		$password='admin';
+		$url=$this->api_url.'/login?login='.$login.'&password='.$password;
+		// Call the API login method to save api_key for this test class
+		$result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
+		print __METHOD__." result = ".var_export($result, true)."\n";
+		print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
+		$this->assertEquals($result['curl_error_no'], '');
+		$object=json_decode($result['content'], true);
+		$this->assertNotNull($object, "Parsing of json result must not be null");
+		$this->assertEquals('200', $object['success']['code']);
 
-        $this->api_key = $object['success']['token'];
-        print __METHOD__." api_key: $this->api_key \n";
+		$this->api_key = $object['success']['token'];
+		print __METHOD__." api_key: $this->api_key \n";
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * End phpunit tests
-     *
-     * @return void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+	/**
+	 * End phpunit tests
+	 *
+	 * @return void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
 
-    /**
-     * testRestGetUser
-     *
-     * @return int
-     */
-    public function testRestGetUser()
-    {
-        global $conf,$user,$langs,$db;
+	/**
+	 * testRestGetUser
+	 *
+	 * @return int
+	 */
+	public function testRestGetUser()
+	{
+		global $conf,$user,$langs,$db;
 
-        $url = $this->api_url.'/users/123456789?api_key='.$this->api_key;
-        //$addheaders=array('Content-Type: application/json');
+		$url = $this->api_url.'/users/123456789?api_key='.$this->api_key;
+		//$addheaders=array('Content-Type: application/json');
 
-        print __METHOD__." Request GET url=".$url."\n";
-        $result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
-        //print __METHOD__." result for get on unexisting user: ".var_export($result, true)."\n";
-        print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
-        $this->assertEquals($result['curl_error_no'], '');
-        $object=json_decode($result['content'], true);
-        $this->assertNotNull($object, "Parsing of json result must not be null");
-        $this->assertEquals(404, $object['error']['code'], 'Error code is not 404');
+		print __METHOD__." Request GET url=".$url."\n";
+		$result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
+		//print __METHOD__." result for get on unexisting user: ".var_export($result, true)."\n";
+		print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
+		$this->assertEquals($result['curl_error_no'], '');
+		$object=json_decode($result['content'], true);
+		$this->assertNotNull($object, "Parsing of json result must not be null");
+		$this->assertEquals(404, $object['error']['code'], 'Error code is not 404');
 
-        $url = $this->api_url.'/users/1?api_key='.$this->api_key;
+		$url = $this->api_url.'/users/1?api_key='.$this->api_key;
 
-        print __METHOD__." Request GET url=".$url."\n";
-        $result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
-        print __METHOD__." result for get on an existing user: ".var_export($result, true)."\n";
-        print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
-        $this->assertEquals($result['curl_error_no'], '');
-        $object=json_decode($result['content'], true);
-        $this->assertNotNull($object, "Parsing of json result must not be null");
-        $this->assertEquals(1, $object['statut']);
-    }
+		print __METHOD__." Request GET url=".$url."\n";
+		$result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
+		print __METHOD__." result for get on an existing user: ".var_export($result, true)."\n";
+		print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
+		$this->assertEquals($result['curl_error_no'], '');
+		$object=json_decode($result['content'], true);
+		$this->assertNotNull($object, "Parsing of json result must not be null");
+		$this->assertEquals(1, $object['statut']);
+	}
 
-    /**
-     * testRestCreateUser
-     *
-     * @return void
-     */
-    public function testRestCreateUser()
-    {
-        // attemp to create without mandatory fields :
-        $url = $this->api_url.'/users?api_key='.$this->api_key;
-        $addheaders=array('Content-Type: application/json');
+	/**
+	 * testRestCreateUser
+	 *
+	 * @return void
+	 */
+	public function testRestCreateUser()
+	{
+		// attemp to create without mandatory fields :
+		$url = $this->api_url.'/users?api_key='.$this->api_key;
+		$addheaders=array('Content-Type: application/json');
 
-        $bodyobj = array(
-            "lastname"=>"testRestUser",
-            "password"=>"testRestPassword",
-            "email"=>"test@restuser.com"
-        );
-        $body = json_encode($bodyobj);
+		$bodyobj = array(
+			"lastname"=>"testRestUser",
+			"password"=>"testRestPassword",
+			"email"=>"test@restuser.com"
+		);
+		$body = json_encode($bodyobj);
 
-        print __METHOD__." Request POST url=".$url."\n";
-        $result=getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
-        //print __METHOD__." Result for creating incomplete user".var_export($result, true)."\n";
-        print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
-        $this->assertEquals($result['curl_error_no'], '');
-        $object=json_decode($result['content'], true);
-        $this->assertNotNull($object, "Parsing of json result must no be null");
-        $this->assertEquals(500, $object['error']['code'], $object['error']['code'].' '.$object['error']['message']);
+		print __METHOD__." Request POST url=".$url."\n";
+		$result=getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
+		//print __METHOD__." Result for creating incomplete user".var_export($result, true)."\n";
+		print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
+		$this->assertEquals($result['curl_error_no'], '');
+		$object=json_decode($result['content'], true);
+		$this->assertNotNull($object, "Parsing of json result must no be null");
+		$this->assertEquals(500, $object['error']['code'], $object['error']['code'].' '.$object['error']['message']);
 
-        // create regular user
-        unset($result);
-        $bodyobj = array(
-            "login"=>"testRestLogin".mt_rand(),
-            "lastname"=>"testRestUser",
-            "password"=>"testRestPassword",
-            "email"=>"test@restuser.com"
-        );
-        $body = json_encode($bodyobj);
-        print __METHOD__." Request POST url=".$url."\n";
-        $result=getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
-        print __METHOD__." rclsesult code for creating user ".var_export($result, true)."\n";
-        print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
-        $this->assertEquals($result['curl_error_no'], '');
-        $resid=json_decode($result['content'], true);
-        $this->assertNotNull($resid, "Parsing of json result must no be null");
-        $this->assertGreaterThan(0, $resid, $object['error']['code'].' '.$object['error']['message']);
+		// create regular user
+		unset($result);
+		$bodyobj = array(
+			"login"=>"testRestLogin".mt_rand(),
+			"lastname"=>"testRestUser",
+			"password"=>"testRestPassword",
+			"email"=>"test@restuser.com"
+		);
+		$body = json_encode($bodyobj);
+		print __METHOD__." Request POST url=".$url."\n";
+		$result=getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
+		print __METHOD__." rclsesult code for creating user ".var_export($result, true)."\n";
+		print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
+		$this->assertEquals($result['curl_error_no'], '');
+		$resid=json_decode($result['content'], true);
+		$this->assertNotNull($resid, "Parsing of json result must no be null");
+		$this->assertGreaterThan(0, $resid, $object['error']['code'].' '.$object['error']['message']);
 
-        // attempt to create duplicated user
-        print __METHOD__." Request POST url=".$url."\n";
-        $result=getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
-        //print __METHOD__." Result for creating duplicate user".var_export($result, true)."\n";
-        print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
-        $this->assertEquals($result['curl_error_no'], '');
-        $object=json_decode($result['content'], true);
-        $this->assertNotNull($object, "Parsing of json result must no be null");
-        $this->assertEquals(500, $object['error']['code'], $object['error']['code'].' '.$object['error']['message']);
-    }
+		// attempt to create duplicated user
+		print __METHOD__." Request POST url=".$url."\n";
+		$result=getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
+		//print __METHOD__." Result for creating duplicate user".var_export($result, true)."\n";
+		print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
+		$this->assertEquals($result['curl_error_no'], '');
+		$object=json_decode($result['content'], true);
+		$this->assertNotNull($object, "Parsing of json result must no be null");
+		$this->assertEquals(500, $object['error']['code'], $object['error']['code'].' '.$object['error']['message']);
+	}
 }
diff --git a/test/phpunit/ScriptsTest.php b/test/phpunit/ScriptsTest.php
index 82d1ee28e39..fa0a4a9d72b 100644
--- a/test/phpunit/ScriptsTest.php
+++ b/test/phpunit/ScriptsTest.php
@@ -30,22 +30,41 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
 
-if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
-if (! defined('NOREQUIREDB'))    define('NOREQUIREDB', '1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+if (! defined('NOREQUIREUSER')) {
+	define('NOREQUIREUSER', '1');
+}
+if (! defined('NOREQUIREDB')) {
+	define('NOREQUIREDB', '1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (! defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', '1');
+}
+if (! defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1'); // If there is no menu to show
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (! defined("NOLOGIN")) {
+	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+}
 
-if (empty($user->id))
-{
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+if (empty($user->id)) {
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -86,66 +105,66 @@ class ScriptsTest extends PHPUnit\Framework\TestCase
 		print "\n";
 	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testBank
-     *
-     * @return string
-     */
-    public function testBank()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testBank
+	 *
+	 * @return string
+	 */
+	public function testBank()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -164,18 +183,18 @@ class ScriptsTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals($result, 'Failed to find bank account with ref BANKDUMMY.');
 		$this->assertEquals($returnvar, 255);
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testCompany
-     *
-     * @depends	testBank
-     * @return string
-     */
-    public function testCompany()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testCompany
+	 *
+	 * @depends	testBank
+	 * @return string
+	 */
+	public function testCompany()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -193,88 +212,88 @@ class ScriptsTest extends PHPUnit\Framework\TestCase
 		*/
 		$this->assertEquals(0, 0);
 
-        return '';
-    }
+		return '';
+	}
 
-    /**
-     * testContracts
-     *
-     * @depends	testCompany
-     * @return string
-     */
-    public function testContracts()
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+	/**
+	 * testContracts
+	 *
+	 * @depends	testCompany
+	 * @return string
+	 */
+	public function testContracts()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-    	$returnvar = 0;
-    	$output = array();
+		$returnvar = 0;
+		$output = array();
 
-    	$script=dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_customers.php test thirdparties';
-    	$result=exec($script, $output, $returnvar);
-    	print __METHOD__." result=".$result."\n";
-    	print __METHOD__." output=".join("\n", $output)."\n";
-    	print __METHOD__." returnvar=".$returnvar."\n";
-    	$this->assertEquals($returnvar, 0, 'email_expire_services_to_customers.php thirdparties');
+		$script=dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_customers.php test thirdparties';
+		$result=exec($script, $output, $returnvar);
+		print __METHOD__." result=".$result."\n";
+		print __METHOD__." output=".join("\n", $output)."\n";
+		print __METHOD__." returnvar=".$returnvar."\n";
+		$this->assertEquals($returnvar, 0, 'email_expire_services_to_customers.php thirdparties');
 
-    	$script=dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_customers.php test contacts -30';
-    	$result=exec($script, $output, $returnvar);
-    	print __METHOD__." result=".$result."\n";
-    	print __METHOD__." output=".join("\n", $output)."\n";
-    	print __METHOD__." returnvar=".$returnvar."\n";
-    	$this->assertEquals($returnvar, 0, 'email_expire_services_to_customers.php contacts');
+		$script=dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_customers.php test contacts -30';
+		$result=exec($script, $output, $returnvar);
+		print __METHOD__." result=".$result."\n";
+		print __METHOD__." output=".join("\n", $output)."\n";
+		print __METHOD__." returnvar=".$returnvar."\n";
+		$this->assertEquals($returnvar, 0, 'email_expire_services_to_customers.php contacts');
 
-    	$script=dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_representatives.php test -30';
-    	$result=exec($script, $output, $returnvar);
-    	print __METHOD__." result=".$result."\n";
-    	print __METHOD__." output=".join("\n", $output)."\n";
-    	print __METHOD__." returnvar=".$returnvar."\n";
-    	$this->assertEquals($returnvar, 0, 'email_expire_services_to_representatives.php');
+		$script=dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_representatives.php test -30';
+		$result=exec($script, $output, $returnvar);
+		print __METHOD__." result=".$result."\n";
+		print __METHOD__." output=".join("\n", $output)."\n";
+		print __METHOD__." returnvar=".$returnvar."\n";
+		$this->assertEquals($returnvar, 0, 'email_expire_services_to_representatives.php');
 
-    	return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testInvoices
-     *
-     * @depends	testContracts
-     * @return string
-     */
-    public function testInvoices()
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+	/**
+	 * testInvoices
+	 *
+	 * @depends	testContracts
+	 * @return string
+	 */
+	public function testInvoices()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-    	$returnvar = 0;
-    	$output = array();
+		$returnvar = 0;
+		$output = array();
 
-    	$script=dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_customers.php test thirdparties';
-    	$result=exec($script, $output, $returnvar);
-    	print __METHOD__." result=".$result."\n";
-    	print __METHOD__." output=".join("\n", $output)."\n";
-    	print __METHOD__." returnvar=".$returnvar."\n";
-    	$this->assertEquals($returnvar, 0, 'email_unpaid_invoices_to_customers.php thirdparties');
+		$script=dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_customers.php test thirdparties';
+		$result=exec($script, $output, $returnvar);
+		print __METHOD__." result=".$result."\n";
+		print __METHOD__." output=".join("\n", $output)."\n";
+		print __METHOD__." returnvar=".$returnvar."\n";
+		$this->assertEquals($returnvar, 0, 'email_unpaid_invoices_to_customers.php thirdparties');
 
-    	$script=dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_customers.php test contacts -30';
-    	$result=exec($script, $output, $returnvar);
-    	print __METHOD__." result=".$result."\n";
-    	print __METHOD__." output=".join("\n", $output)."\n";
-    	print __METHOD__." returnvar=".$returnvar."\n";
-    	$this->assertEquals($returnvar, 0, 'email_unpaid_invoices_to_customers.php contacts');
+		$script=dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_customers.php test contacts -30';
+		$result=exec($script, $output, $returnvar);
+		print __METHOD__." result=".$result."\n";
+		print __METHOD__." output=".join("\n", $output)."\n";
+		print __METHOD__." returnvar=".$returnvar."\n";
+		$this->assertEquals($returnvar, 0, 'email_unpaid_invoices_to_customers.php contacts');
 
-    	$script=dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_representatives.php test thirdparties';
-    	$result=exec($script, $output, $returnvar);
-    	print __METHOD__." result=".$result."\n";
-    	print __METHOD__." output=".join("\n", $output)."\n";
-    	print __METHOD__." returnvar=".$returnvar."\n";
-    	$this->assertEquals($returnvar, 0, 'email_unpaid_invoices_to_customers.php thirdparties');
+		$script=dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_representatives.php test thirdparties';
+		$result=exec($script, $output, $returnvar);
+		print __METHOD__." result=".$result."\n";
+		print __METHOD__." output=".join("\n", $output)."\n";
+		print __METHOD__." returnvar=".$returnvar."\n";
+		$this->assertEquals($returnvar, 0, 'email_unpaid_invoices_to_customers.php thirdparties');
 
-    	return $result;
-    }
+		return $result;
+	}
 }
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 3eda8354113..6b157d2dcab 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -27,25 +27,40 @@ global $conf,$user,$langs,$db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 
-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 there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (! defined("NOLOGIN"))        define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
-if (! defined("NOSESSION"))      define("NOSESSION", '1');
+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 there is no menu to show
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (! defined("NOLOGIN")) {
+	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+}
+if (! defined("NOSESSION")) {
+	define("NOSESSION", '1');
+}
 
 require_once dirname(__FILE__).'/../../htdocs/main.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
 
 
-if (empty($user->id))
-{
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+if (empty($user->id)) {
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -86,141 +101,145 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		print "\n";
 	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testSetLang
-     *
-     * @return string
-     */
-    public function testSetLang()
-    {
-    	global $conf;
-    	$conf=$this->savconf;
+	/**
+	 * testSetLang
+	 *
+	 * @return string
+	 */
+	public function testSetLang()
+	{
+		global $conf;
+		$conf=$this->savconf;
 
-    	$tmplangs = new Translate('', $conf);
+		$tmplangs = new Translate('', $conf);
 
-    	$_SERVER['HTTP_ACCEPT_LANGUAGE'] = "' malicious text with quote";
-    	$tmplangs->setDefaultLang('auto');
-    	print __METHOD__.' $tmplangs->defaultlang='.$tmplangs->defaultlang."\n";
-    	$this->assertEquals($tmplangs->defaultlang, 'malicioustextwithquote_MALICIOUSTEXTWITHQUOTE');
-    }
+		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = "' malicious text with quote";
+		$tmplangs->setDefaultLang('auto');
+		print __METHOD__.' $tmplangs->defaultlang='.$tmplangs->defaultlang."\n";
+		$this->assertEquals($tmplangs->defaultlang, 'malicioustextwithquote_MALICIOUSTEXTWITHQUOTE');
+	}
 
-    /**
-     * testSqlAndScriptInjectWithPHPUnit
-     *
-     * @return  void
-     */
-    public function testSqlAndScriptInjectWithPHPUnit()
-    {
-    	// Run tests
-    	// More on https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet
+	/**
+	 * testSqlAndScriptInjectWithPHPUnit
+	 *
+	 * @return  void
+	 */
+	public function testSqlAndScriptInjectWithPHPUnit()
+	{
+		// Run tests
+		// More on https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet
 
-    	// Should be OK
-    	$expectedresult=0;
+		// Should be OK
+		$expectedresult=0;
 
-    	$_SERVER["PHP_SELF"]='/DIR WITH SPACE/htdocs/admin/index.php?mainmenu=home&leftmenu=setup&username=weservices';
-    	$result=testSqlAndScriptInject($_SERVER["PHP_SELF"], 2);
-    	$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject 1a');
+		$_SERVER["PHP_SELF"]='/DIR WITH SPACE/htdocs/admin/index.php?mainmenu=home&leftmenu=setup&username=weservices';
+		$result=testSqlAndScriptInject($_SERVER["PHP_SELF"], 2);
+		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject expected 0a');
 
-    	// Should detect XSS
-    	$expectedresult=1;
+		$test = 'This is a < inside string with < and > also and tag like <a> before the >';
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject expected 0b');
 
-    	$_SERVER["PHP_SELF"]='/DIR WITH SPACE/htdocs/admin/index.php?mainmenu=home&leftmenu=setup&username=weservices;badaction';
-    	$result=testSqlAndScriptInject($_SERVER["PHP_SELF"], 2);
-    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject 1b');
+		// Should detect XSS
+		$expectedresult=1;
 
-    	$test="<img src='1.jpg' onerror =javascript:alert('XSS')>";
-    	$result=testSqlAndScriptInject($test, 0);
-    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa');
+		$_SERVER["PHP_SELF"]='/DIR WITH SPACE/htdocs/admin/index.php?mainmenu=home&leftmenu=setup&username=weservices;badaction';
+		$result=testSqlAndScriptInject($_SERVER["PHP_SELF"], 2);
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject 1b');
 
-    	$test="<img src='1.jpg' onerror =javascript:alert('XSS')>";
-    	$result=testSqlAndScriptInject($test, 2);
-    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa2');
+		$test="<img src='1.jpg' onerror =javascript:alert('XSS')>";
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa');
 
-    	$test='<IMG SRC=# onmouseover="alert(1)">';
-    	$result=testSqlAndScriptInject($test, 0);
-    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa3');
-    	$test='<IMG SRC onmouseover="alert(1)">';
-    	$result=testSqlAndScriptInject($test, 0);
-    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa4');
-    	$test='<IMG onmouseover="alert(1)">';
-    	$result=testSqlAndScriptInject($test, 0);
-    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa5');
-    	$test='<IMG SRC=/ onerror="alert(1)">';
-    	$result=testSqlAndScriptInject($test, 0);
-    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa6');
-    	$test='<IMG SRC=" &#14;  javascript:alert(1);">';
-    	$result=testSqlAndScriptInject($test, 0);
-    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa7');
+		$test="<img src='1.jpg' onerror =javascript:alert('XSS')>";
+		$result=testSqlAndScriptInject($test, 2);
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa2');
 
-    	$test='<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>';
-    	$result=testSqlAndScriptInject($test, 0);
-    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject bbb');
+		$test='<IMG SRC=# onmouseover="alert(1)">';
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa3');
+		$test='<IMG SRC onmouseover="alert(1)">';
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa4');
+		$test='<IMG onmouseover="alert(1)">';
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa5');
+		$test='<IMG SRC=/ onerror="alert(1)">';
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa6');
+		$test='<IMG SRC=" &#14;  javascript:alert(1);">';
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa7');
 
-    	$test='<SCRIPT SRC=http://xss.rocks/xss.js></SCRIPT>';
-    	$result=testSqlAndScriptInject($test, 0);
-    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject ccc');
+		$test='<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>';
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject bbb');
 
-    	$test='<IMG SRC="javascript:alert(\'XSS\');">';
-    	$result=testSqlAndScriptInject($test, 1);
-    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject ddd');
+		$test='<SCRIPT SRC=http://xss.rocks/xss.js></SCRIPT>';
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject ccc');
 
-    	$test='<IMG """><SCRIPT>alert("XSS")</SCRIPT>">';
-    	$result=testSqlAndScriptInject($test, 0);
-    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject eee');
+		$test='<IMG SRC="javascript:alert(\'XSS\');">';
+		$result=testSqlAndScriptInject($test, 1);
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject ddd');
 
-    	$test='<!-- Google analytics -->
+		$test='<IMG """><SCRIPT>alert("XSS")</SCRIPT>">';
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject eee');
+
+		$test='<!-- Google analytics -->
 			<script>
 			  (function(i,s,o,g,r,a,m){i[\'GoogleAnalyticsObject\']=r;i[r]=i[r]||function(){
 			  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -231,262 +250,299 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 			  ga(\'send\', \'pageview\');
 
 			</script>';
-    	$result=testSqlAndScriptInject($test, 0);
-    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject eee');
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject eee');
 
-    	$test="<IMG SRC=\"jav\tascript:alert('XSS');\">";		// Is locked by some browser like chrome because the default directive no-referrer-when-downgrade is sent when requesting the SRC and then refused because of browser protection on img src load without referrer.
-    	$test="<IMG SRC=\"jav&#x0D;ascript:alert('XSS');\">";	// Same
+		$test="<IMG SRC=\"jav\tascript:alert('XSS');\">";		// Is locked by some browser like chrome because the default directive no-referrer-when-downgrade is sent when requesting the SRC and then refused because of browser protection on img src load without referrer.
+		$test="<IMG SRC=\"jav&#x0D;ascript:alert('XSS');\">";	// Same
 
-    	$test='<SCRIPT/XSS SRC="http://xss.rocks/xss.js"></SCRIPT>';
-    	$result=testSqlAndScriptInject($test, 0);
-    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject fff1');
-    	$test='<SCRIPT/SRC="http://xss.rocks/xss.js"></SCRIPT>';
-    	$result=testSqlAndScriptInject($test, 0);
-    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject fff2');
+		$test='<SCRIPT/XSS SRC="http://xss.rocks/xss.js"></SCRIPT>';
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject fff1');
+		$test='<SCRIPT/SRC="http://xss.rocks/xss.js"></SCRIPT>';
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject fff2');
 
-    	// This case seems to be filtered by browsers now.
-    	$test='<BODY onload!#$%&()*~+-_.,:;?@[/|\]^`=alert(1)>';
-    	//$result=testSqlAndScriptInject($test, 0);
-    	//$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject ggg');
+		// This case seems to be filtered by browsers now.
+		$test='<BODY onload!#$%&()*~+-_.,:;?@[/|\]^`=alert(1)>';
+		//$result=testSqlAndScriptInject($test, 0);
+		//$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject ggg');
 
-    	$test='<iframe src=http://xss.rocks/scriptlet.html <';
-    	$result=testSqlAndScriptInject($test, 0);
-    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject hhh');
+		$test='<iframe src=http://xss.rocks/scriptlet.html <';
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject hhh');
 
-    	$test='Set.constructor`alert\x281\x29```';
-    	$result=testSqlAndScriptInject($test, 0);
-    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject iii');
+		$test='Set.constructor`alert\x281\x29```';
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject iii');
 
-    	$test="on<!-- ab\nc -->error=alert(1)";
-    	$result=testSqlAndScriptInject($test, 0);
-    	$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject jjj');
-    }
+		$test="on<!-- ab\nc -->error=alert(1)";
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject jjj');
 
-    /**
-     * testGETPOST
-     *
-     * @return string
-     */
-    public function testGETPOST()
-    {
-    	global $conf,$user,$langs,$db;
+		$test="<img src=x one<a>rror=alert(document.location)";
+		$result=testSqlAndScriptInject($test, 0);
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject kkk');
+	}
+
+	/**
+	 * testGETPOST
+	 *
+	 * @return string
+	 */
+	public function testGETPOST()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
-        $_COOKIE["id"]=111;
+		$_COOKIE["id"]=111;
 		$_GET["param1"]="222";
-        $_POST["param1"]="333";
+		$_POST["param1"]="333";
 		$_GET["param2"]='a/b#e(pr)qq-rr\cc';
-        $_GET["param3"]='"&#110;a/b#e(pr)qq-rr\cc';    // Same than param2 + " and &#110;
-        $_GET["param4"]='../dir';
-        $_GET["param5"]="a_1-b";
-        $_POST["param6"]="&quot;&gt;<svg o&#110;load='console.log(&quot;123&quot;)'&gt;";
-        $_GET["param7"]='"c:\this is a path~1\aaa&#110;" abc<bad>def</bad>';
-        $_POST["param8"]="Hacker<svg o&#110;load='console.log(&quot;123&quot;)'";	// html tag is not closed so it is not detected as html tag but is still harmfull
+		$_GET["param3"]='"&#110;a/b#e(pr)qq-rr\cc';    // Same than param2 + " and &#110;
+		$_GET["param4"]='../dir';
+		$_GET["param5"]="a_1-b";
+		$_POST["param6"]="&quot;&gt;<svg o&#110;load='console.log(&quot;123&quot;)'&gt;";
+		$_GET["param7"]='"c:\this is a path~1\aaa&#110;" abc<bad>def</bad>';
+		$_POST["param8a"]="Hacker<svg o&#110;load='console.log(&quot;123&quot;)'";	// html tag is not closed so it is not detected as html tag but is still harmfull
+		$_POST['param8b']='<img src=x onerror=alert(document.location) t=';		// this is html obfuscated by non closing tag
+		$_POST['param8c']='< with space after is ok';
+		$_POST['param8d']='<abc123 is html to clean';
+		$_POST['param8e']='<123abc is not html to clean';
 		$_POST["param9"]='is_object($object) ? ($object->id < 10 ? round($object->id / 2, 2) : (2 * $user->id) * (int) substr($mysoc->zip, 1, 2)) : \'objnotdefined\'';
 		$_POST["param10"]='is_object($object) ? ($object->id < 10 ? round($object->id / 2, 2) : (2 * $user->id) * (int) substr($mysoc->zip, 1, 2)) : \'<abc>objnotdefined\'';
+		$_POST["param11"]=' Name <email@email.com> ';
 
 		$result=GETPOST('id', 'int');              // Must return nothing
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, '');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, '');
 
-        $result=GETPOST("param1", 'int');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, 222);
+		$result=GETPOST("param1", 'int');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, 222, 'Test on param1 with no 3rd param');
 
-        $result=GETPOST("param1", 'int', 2);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, 333);
+		$result=GETPOST("param1", 'int', 2);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, 333, 'Test on param1 with 3rd param = 2');
 
-        // Test alpha
-        $result=GETPOST("param2", 'alpha');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, $_GET["param2"]);
+		// Test alpha
+		$result=GETPOST("param2", 'alpha');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, $_GET["param2"], 'Test on param2');
 
-        $result=GETPOST("param3", 'alpha');  // Must return string sanitized from char "
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, 'na/b#e(pr)qq-rr\cc');
+		$result=GETPOST("param3", 'alpha');  // Must return string sanitized from char "
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, 'na/b#e(pr)qq-rr\cc', 'Test on param3');
 
-        $result=GETPOST("param4", 'alpha');  // Must return string sanitized from ../
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, 'dir');
+		$result=GETPOST("param4", 'alpha');  // Must return string sanitized from ../
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, 'dir');
 
-        // Test aZ09
-        $result=GETPOST("param1", 'aZ09');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, $_GET["param1"]);
+		// Test aZ09
+		$result=GETPOST("param1", 'aZ09');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, $_GET["param1"]);
 
-        $result=GETPOST("param2", 'aZ09');  // Must return '' as string contains car not in aZ09 definition
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, '');
+		$result=GETPOST("param2", 'aZ09');  // Must return '' as string contains car not in aZ09 definition
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, '');
 
-        $result=GETPOST("param3", 'aZ09');  // Must return '' as string contains car not in aZ09 definition
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, '');
+		$result=GETPOST("param3", 'aZ09');  // Must return '' as string contains car not in aZ09 definition
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, '');
 
-        $result=GETPOST("param4", 'aZ09');  // Must return '' as string contains car not in aZ09 definition
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('', $result);
+		$result=GETPOST("param4", 'aZ09');  // Must return '' as string contains car not in aZ09 definition
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('', $result);
 
-        $result=GETPOST("param5", 'aZ09');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($_GET["param5"], $result);
+		$result=GETPOST("param5", 'aZ09');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($_GET["param5"], $result);
 
-        $result=GETPOST("param6", 'nohtml');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('">', $result);
+		$result=GETPOST("param6", 'alpha');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('>', $result);
 
-        // With restricthtml we must remove html open/close tag and content but not htmlentities like &#110;
-        $result=GETPOST("param7", 'restricthtml');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('"c:\this is a path~1\aaa&#110;" abcdef', $result);
+		$result=GETPOST("param6", 'nohtml');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('">', $result);
 
-        // With alphanohtml, we must convert the html entities like &#110;
-        $result=GETPOST("param8", 'alphanohtml');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals("Hacker<svg onload='console.log(123)'", $result);
+		// With restricthtml we must remove html open/close tag and content but not htmlentities like &#110;
+		$result=GETPOST("param7", 'restricthtml');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('"c:\this is a path~1\aaa&#110;" abcdef', $result);
 
-        $result=GETPOST("param9", 'alphanohtml');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($_POST["param9"], $result);
+		// With alphanohtml, we must convert the html entities like &#110; and disable all entities
+		$result=GETPOST("param8a", 'alphanohtml');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals("Hackersvg onload='console.log(123)'", $result);
 
-        $result=GETPOST("param10", 'alphanohtml');
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals($_POST["param9"], $result, 'We should get param9 after processing param10');
+		$result=GETPOST("param8b", 'alphanohtml');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('img src=x onerror=alert(document.location) t=', $result, 'Test a string with non closing html tag with alphanohtml');
 
-        return $result;
-    }
+		$result=GETPOST("param8c", 'alphanohtml');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($_POST['param8c'], $result, 'Test a string with non closing html tag with alphanohtml');
 
-    /**
-     * testCheckLoginPassEntity
-     *
-     * @return	void
-     */
-    public function testCheckLoginPassEntity()
-    {
-        $login=checkLoginPassEntity('loginbidon', 'passwordbidon', 1, array('dolibarr'));
-        print __METHOD__." login=".$login."\n";
-        $this->assertEquals($login, '');
+    	$result=GETPOST("param8d", 'alphanohtml');
+    	print __METHOD__." result=".$result."\n";
+    	$this->assertEquals('abc123 is html to clean', $result, 'Test a string with non closing html tag with alphanohtml');
 
-        $login=checkLoginPassEntity('admin', 'passwordbidon', 1, array('dolibarr'));
-        print __METHOD__." login=".$login."\n";
-        $this->assertEquals($login, '');
+    	$result=GETPOST("param8e", 'alphanohtml');
+    	print __METHOD__." result=".$result."\n";
+    	$this->assertEquals($_POST['param8e'], $result, 'Test a string with non closing html tag with alphanohtml');
 
-        $login=checkLoginPassEntity('admin', 'admin', 1, array('dolibarr'));            // Should works because admin/admin exists
-        print __METHOD__." login=".$login."\n";
-        $this->assertEquals($login, 'admin', 'The test to check if pass of user "admin" is "admin" has failed');
+    	$result=GETPOST("param9", 'alphanohtml');
+    	print __METHOD__." result=".$result."\n";
+    	$this->assertEquals($_POST["param9"], $result);
 
-        $login=checkLoginPassEntity('admin', 'admin', 1, array('http','dolibarr'));    // Should work because of second authetntication method
-        print __METHOD__." login=".$login."\n";
-        $this->assertEquals($login, 'admin');
+		$result=GETPOST("param10", 'alphanohtml');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($_POST["param9"], $result, 'We should get param9 after processing param10');
 
-        $login=checkLoginPassEntity('admin', 'admin', 1, array('forceuser'));
-        print __METHOD__." login=".$login."\n";
-        $this->assertEquals($login, '');    // Expected '' because should failed because login 'auto' does not exists
-    }
+		$result=GETPOST("param11", 'alphanohtml');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals("Name", $result, 'Test an email string with alphanohtml');
 
-    /**
-     * testEncodeDecode
-     *
-     * @return number
-     */
-    public function testEncodeDecode()
-    {
-        $stringtotest="This is a string to test encode/decode. This is a string to test encode/decode. This is a string to test encode/decode.";
+		$result=GETPOST("param11", 'alphawithlgt');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(trim($_POST["param11"]), $result, 'Test an email string with alphawithlgt');
 
-        $encodedstring=dol_encode($stringtotest);
-        $decodedstring=dol_decode($encodedstring);
-        print __METHOD__." encodedstring=".$encodedstring." ".base64_encode($stringtotest)."\n";
-        $this->assertEquals($stringtotest, $decodedstring, 'Use dol_encode/decode with no parameter');
+		return $result;
+	}
 
-        $encodedstring=dol_encode($stringtotest, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
-        $decodedstring=dol_decode($encodedstring, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
-        print __METHOD__." encodedstring=".$encodedstring." ".base64_encode($stringtotest)."\n";
-        $this->assertEquals($stringtotest, $decodedstring, 'Use dol_encode/decode with a key parameter');
+	/**
+	 * testCheckLoginPassEntity
+	 *
+	 * @return	void
+	 */
+	public function testCheckLoginPassEntity()
+	{
+		$login=checkLoginPassEntity('loginbidon', 'passwordbidon', 1, array('dolibarr'));
+		print __METHOD__." login=".$login."\n";
+		$this->assertEquals($login, '');
 
-        return 0;
-    }
+		$login=checkLoginPassEntity('admin', 'passwordbidon', 1, array('dolibarr'));
+		print __METHOD__." login=".$login."\n";
+		$this->assertEquals($login, '');
 
-    /**
-     * testDolStringOnlyTheseHtmlTags
-     *
-     * @return number
-     */
-    public function testDolHTMLEntityDecode()
-    {
-    	$stringtotest = 'a &colon; b &quot; c &#039; d &apos; e &eacute;';
-    	$decodedstring = dol_html_entity_decode($stringtotest, ENT_QUOTES);
-    	$this->assertEquals('a &colon; b " c \' d &apos; e é', $decodedstring, 'Function did not sanitize correclty');
+		$login=checkLoginPassEntity('admin', 'admin', 1, array('dolibarr'));            // Should works because admin/admin exists
+		print __METHOD__." login=".$login."\n";
+		$this->assertEquals($login, 'admin', 'The test to check if pass of user "admin" is "admin" has failed');
 
-    	$stringtotest = 'a &colon; b &quot; c &#039; d &apos; e &eacute;';
-    	$decodedstring = dol_html_entity_decode($stringtotest, ENT_QUOTES|ENT_HTML5);
-    	$this->assertEquals('a : b " c \' d \' e é', $decodedstring, 'Function did not sanitize correclty');
+		$login=checkLoginPassEntity('admin', 'admin', 1, array('http','dolibarr'));    // Should work because of second authetntication method
+		print __METHOD__." login=".$login."\n";
+		$this->assertEquals($login, 'admin');
 
-    	return 0;
-    }
+		$login=checkLoginPassEntity('admin', 'admin', 1, array('forceuser'));
+		print __METHOD__." login=".$login."\n";
+		$this->assertEquals($login, '');    // Expected '' because should failed because login 'auto' does not exists
+	}
 
-    /**
-     * testDolStringOnlyTheseHtmlTags
-     *
-     * @return number
-     */
-    public function testDolStringOnlyTheseHtmlTags()
-    {
-    	$stringtotest = '<a href="javascript:aaa">bbbڴ';
-    	$decodedstring = dol_string_onlythesehtmltags($stringtotest, 1, 1, 1);
-        $this->assertEquals('<a href="aaa">bbbڴ', $decodedstring, 'Function did not sanitize correclty with test 1');
+	/**
+	 * testEncodeDecode
+	 *
+	 * @return number
+	 */
+	public function testEncodeDecode()
+	{
+		$stringtotest="This is a string to test encode/decode. This is a string to test encode/decode. This is a string to test encode/decode.";
 
-        $stringtotest = '<a href="java'.chr(0).'script:aaa">bbbڴ';
-        $decodedstring = dol_string_onlythesehtmltags($stringtotest, 1, 1, 1);
-        $this->assertEquals('<a href="aaa">bbbڴ', $decodedstring, 'Function did not sanitize correclty with test 2');
+		$encodedstring=dol_encode($stringtotest);
+		$decodedstring=dol_decode($encodedstring);
+		print __METHOD__." encodedstring=".$encodedstring." ".base64_encode($stringtotest)."\n";
+		$this->assertEquals($stringtotest, $decodedstring, 'Use dol_encode/decode with no parameter');
 
-        $stringtotest = '<a href="javascript&colon;aaa">bbbڴ';
-        $decodedstring = dol_string_onlythesehtmltags($stringtotest, 1, 1, 1);
-        $this->assertEquals('<a href="aaa">bbbڴ', $decodedstring, 'Function did not sanitize correclty with test 3');
+		$encodedstring=dol_encode($stringtotest, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
+		$decodedstring=dol_decode($encodedstring, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
+		print __METHOD__." encodedstring=".$encodedstring." ".base64_encode($stringtotest)."\n";
+		$this->assertEquals($stringtotest, $decodedstring, 'Use dol_encode/decode with a key parameter');
 
-        return 0;
-    }
+		return 0;
+	}
 
-    /**
-     * testGetRandomPassword
-     *
-     * @return number
-     */
-    public function testGetRandomPassword()
-    {
-        global $conf;
+	/**
+	 * testDolStringOnlyTheseHtmlTags
+	 *
+	 * @return number
+	 */
+	public function testDolHTMLEntityDecode()
+	{
+		$stringtotest = 'a &colon; b &quot; c &#039; d &apos; e &eacute;';
+		$decodedstring = dol_html_entity_decode($stringtotest, ENT_QUOTES);
+		$this->assertEquals('a &colon; b " c \' d &apos; e é', $decodedstring, 'Function did not sanitize correclty');
 
-        $genpass1=getRandomPassword(true);				// Should be a string return by dol_hash (if no option set, will be md5)
-        print __METHOD__." genpass1=".$genpass1."\n";
-        $this->assertEquals(strlen($genpass1), 32);
+		$stringtotest = 'a &colon; b &quot; c &#039; d &apos; e &eacute;';
+		$decodedstring = dol_html_entity_decode($stringtotest, ENT_QUOTES|ENT_HTML5);
+		$this->assertEquals('a : b " c \' d \' e é', $decodedstring, 'Function did not sanitize correclty');
 
-        $genpass1=getRandomPassword(true, array('I'));	// Should be a string return by dol_hash (if no option set, will be md5)
-        print __METHOD__." genpass1=".$genpass1."\n";
-        $this->assertEquals(strlen($genpass1), 32);
+		return 0;
+	}
 
-        $conf->global->USER_PASSWORD_GENERATED='None';
-        $genpass2=getRandomPassword(false);				// Should return an empty string
-        print __METHOD__." genpass2=".$genpass2."\n";
-        $this->assertEquals($genpass2, '');
+	/**
+	 * testDolStringOnlyTheseHtmlTags
+	 *
+	 * @return number
+	 */
+	public function testDolStringOnlyTheseHtmlTags()
+	{
+		$stringtotest = '<a href="javascript:aaa">bbbڴ';
+		$decodedstring = dol_string_onlythesehtmltags($stringtotest, 1, 1, 1);
+		$this->assertEquals('<a href="aaa">bbbڴ', $decodedstring, 'Function did not sanitize correclty with test 1');
 
-        $conf->global->USER_PASSWORD_GENERATED='Standard';
-        $genpass3=getRandomPassword(false);				// Should return a password of 10 chars
-        print __METHOD__." genpass3=".$genpass3."\n";
-        $this->assertEquals(strlen($genpass3), 10);
+		$stringtotest = '<a href="java'.chr(0).'script:aaa">bbbڴ';
+		$decodedstring = dol_string_onlythesehtmltags($stringtotest, 1, 1, 1);
+		$this->assertEquals('<a href="aaa">bbbڴ', $decodedstring, 'Function did not sanitize correclty with test 2');
 
-        return 0;
-    }
+		$stringtotest = '<a href="javascript&colon;aaa">bbbڴ';
+		$decodedstring = dol_string_onlythesehtmltags($stringtotest, 1, 1, 1);
+		$this->assertEquals('<a href="aaa">bbbڴ', $decodedstring, 'Function did not sanitize correclty with test 3');
 
-    /**
-     * testRestrictedArea
-     *
-     * @return void
-     */
-    public function testRestrictedArea()
-    {
-    	global $conf,$user,$langs,$db;
+		return 0;
+	}
+
+	/**
+	 * testGetRandomPassword
+	 *
+	 * @return number
+	 */
+	public function testGetRandomPassword()
+	{
+		global $conf;
+
+		$genpass1=getRandomPassword(true);				// Should be a string return by dol_hash (if no option set, will be md5)
+		print __METHOD__." genpass1=".$genpass1."\n";
+		$this->assertEquals(strlen($genpass1), 32);
+
+		$genpass1=getRandomPassword(true, array('I'));	// Should be a string return by dol_hash (if no option set, will be md5)
+		print __METHOD__." genpass1=".$genpass1."\n";
+		$this->assertEquals(strlen($genpass1), 32);
+
+		$conf->global->USER_PASSWORD_GENERATED='None';
+		$genpass2=getRandomPassword(false);				// Should return an empty string
+		print __METHOD__." genpass2=".$genpass2."\n";
+		$this->assertEquals($genpass2, '');
+
+		$conf->global->USER_PASSWORD_GENERATED='Standard';
+		$genpass3=getRandomPassword(false);				// Should return a password of 10 chars
+		print __METHOD__." genpass3=".$genpass3."\n";
+		$this->assertEquals(strlen($genpass3), 10);
+
+		return 0;
+	}
+
+	/**
+	 * testRestrictedArea
+	 *
+	 * @return void
+	 */
+	public function testRestrictedArea()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -497,83 +553,83 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 
 		$result=restrictedArea($user, 'societe');
 		$this->assertEquals(1, $result);
-    }
+	}
 
 
-    /**
-     * testGetRandomPassword
-     *
-     * @return number
-     */
-    public function testGetURLContent()
-    {
-    	global $conf;
-    	include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+	/**
+	 * testGetRandomPassword
+	 *
+	 * @return number
+	 */
+	public function testGetURLContent()
+	{
+		global $conf;
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
-    	$url = 'ftp://mydomain.com';
-    	$tmp = getURLContent($url);
-    	print __METHOD__." url=".$url."\n";
-    	$this->assertGreaterThan(0, strpos($tmp['curl_error_msg'], 'not supported'));	// Test error if return does not contains 'not supported'
+		$url = 'ftp://mydomain.com';
+		$tmp = getURLContent($url);
+		print __METHOD__." url=".$url."\n";
+		$this->assertGreaterThan(0, strpos($tmp['curl_error_msg'], 'not supported'));	// Test error if return does not contains 'not supported'
 
-    	$url = 'https://www.dolibarr.fr';	// This is a redirect 301 page
-    	$tmp = getURLContent($url, 'GET', '', 0);	// We do NOT follow
-    	print __METHOD__." url=".$url."\n";
-    	$this->assertEquals(301, $tmp['http_code'], 'GET url 301 without following -> 301');
+		$url = 'https://www.dolibarr.fr';	// This is a redirect 301 page
+		$tmp = getURLContent($url, 'GET', '', 0);	// We do NOT follow
+		print __METHOD__." url=".$url."\n";
+		$this->assertEquals(301, $tmp['http_code'], 'GET url 301 without following -> 301');
 
-    	$url = 'https://www.dolibarr.fr';	// This is a redirect 301 page
-    	$tmp = getURLContent($url);		// We DO follow
-    	print __METHOD__." url=".$url."\n";
-    	$this->assertEquals(200, $tmp['http_code'], 'GET url 301 with following -> 200');	// Test error if return does not contains 'not supported'
+		$url = 'https://www.dolibarr.fr';	// This is a redirect 301 page
+		$tmp = getURLContent($url);		// We DO follow
+		print __METHOD__." url=".$url."\n";
+		$this->assertEquals(200, $tmp['http_code'], 'GET url 301 with following -> 200');	// Test error if return does not contains 'not supported'
 
-    	$url = 'http://localhost';
-    	$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
-    	print __METHOD__." url=".$url."\n";
-    	$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that resolves to a local URL');	// Test we receive an error because localtest.me is not an external URL
+		$url = 'http://localhost';
+		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
+		print __METHOD__." url=".$url."\n";
+		$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that resolves to a local URL');	// Test we receive an error because localtest.me is not an external URL
 
-    	$url = 'http://127.0.0.1';
-    	$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
-    	print __METHOD__." url=".$url."\n";
-    	$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that is a local URL');	// Test we receive an error because localtest.me is not an external URL
+		$url = 'http://127.0.0.1';
+		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
+		print __METHOD__." url=".$url."\n";
+		$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that is a local URL');	// Test we receive an error because localtest.me is not an external URL
 
-    	$url = 'https://169.254.0.1';
-    	$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
-    	print __METHOD__." url=".$url."\n";
-    	$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that is a local URL');	// Test we receive an error because localtest.me is not an external URL
+		$url = 'https://169.254.0.1';
+		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
+		print __METHOD__." url=".$url."\n";
+		$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that is a local URL');	// Test we receive an error because localtest.me is not an external URL
 
-    	$url = 'http://[::1]';
-    	$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
-    	print __METHOD__." url=".$url."\n";
-    	$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that is a local URL');	// Test we receive an error because localtest.me is not an external URL
+		$url = 'http://[::1]';
+		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
+		print __METHOD__." url=".$url."\n";
+		$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that is a local URL');	// Test we receive an error because localtest.me is not an external URL
 
-    	/*$url = 'localtest.me';
-    	$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
-    	print __METHOD__." url=".$url."\n";
-    	$this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that resolves to a local URL');	// Test we receive an error because localtest.me is not an external URL
-		*/
+		/*$url = 'localtest.me';
+		 $tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
+		 print __METHOD__." url=".$url."\n";
+		 $this->assertEquals(400, $tmp['http_code'], 'GET url to '.$url.' that resolves to a local URL');	// Test we receive an error because localtest.me is not an external URL
+		 */
 
-    	return 0;
-    }
+		return 0;
+	}
 
-    /**
-     * testDolSanitizeFileName
-     *
-     * @return void
-     */
-    public function testDolSanitizeFileName()
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+	/**
+	 * testDolSanitizeFileName
+	 *
+	 * @return void
+	 */
+	public function testDolSanitizeFileName()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-    	//$dummyuser=new User($db);
-    	//$result=restrictedArea($dummyuser,'societe');
+		//$dummyuser=new User($db);
+		//$result=restrictedArea($dummyuser,'societe');
 
-    	$result=dol_sanitizeFileName('bad file | evilaction');
-    	$this->assertEquals('bad file _ evilaction', $result);
+		$result=dol_sanitizeFileName('bad file | evilaction');
+		$this->assertEquals('bad file _ evilaction', $result);
 
-    	$result=dol_sanitizeFileName('bad file --evilparam');
-    	$this->assertEquals('bad file _evilparam', $result);
-    }
+		$result=dol_sanitizeFileName('bad file --evilparam');
+		$this->assertEquals('bad file _evilparam', $result);
+	}
 }
diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 0ca6cc8792b..32b224bb584 100755
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -31,9 +31,9 @@ require_once dirname(__FILE__).'/../../htdocs/societe/class/societe.class.php';
 $langs->load("dict");
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -47,179 +47,183 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class SocieteTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return SocieteTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return SocieteTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 
-        if ($conf->global->SOCIETE_CODECLIENT_ADDON != 'mod_codeclient_monkey') { print "\n".__METHOD__." third party ref checker must be setup to 'mod_codeclient_monkey' not to '".$conf->global->SOCIETE_CODECLIENT_ADDON."'.\n"; die(); }
+		if ($conf->global->SOCIETE_CODECLIENT_ADDON != 'mod_codeclient_monkey') {
+			print "\n".__METHOD__." third party ref checker must be setup to 'mod_codeclient_monkey' not to '".$conf->global->SOCIETE_CODECLIENT_ADDON."'.\n"; die();
+		}
 
-        if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) { print "\n".__METHOD__." constant MAIN_DISABLEPROFIDRULES must be empty (if a module set it, disable module).\n"; die(); }
+		if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+			print "\n".__METHOD__." constant MAIN_DISABLEPROFIDRULES must be empty (if a module set it, disable module).\n"; die();
+		}
 
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return	void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * End phpunit tests
-     *
-     * @return  void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+	/**
+	 * End phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testSocieteCreate
-     *
-     * @return int
-     */
-    public function testSocieteCreate()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testSocieteCreate
+	 *
+	 * @return int
+	 */
+	public function testSocieteCreate()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Societe($this->savdb);
-        $localobject->initAsSpecimen();
-        $result=$localobject->create($user);
+		$localobject=new Societe($this->savdb);
+		$localobject->initAsSpecimen();
+		$result=$localobject->create($user);
 
-        print __METHOD__." result=".$result."\n";
-        $this->assertLessThanOrEqual($result, 0);
+		print __METHOD__." result=".$result."\n";
+		$this->assertLessThanOrEqual($result, 0);
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testSocieteFetch
-     *
-     * @param   int     $id             Company id
-     * @return  Societe $localobject    Company
-     *
-     * @depends	testSocieteCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testSocieteFetch($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testSocieteFetch
+	 *
+	 * @param   int     $id             Company id
+	 * @return  Societe $localobject    Company
+	 *
+	 * @depends	testSocieteCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testSocieteFetch($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Societe($this->savdb);
-        $result=$localobject->fetch($id);
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		$localobject=new Societe($this->savdb);
+		$result=$localobject->fetch($id);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        $result=$localobject->verify();
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertEquals($result, 0);
+		$result=$localobject->verify();
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertEquals($result, 0);
 
-        return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testSocieteUpdate
-     *
-     * @param   Societe $localobject    Company
-     * @return  Societe $localobject    Company
-    *
-     * @depends testSocieteFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testSocieteUpdate($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testSocieteUpdate
+	 *
+	 * @param   Societe $localobject    Company
+	 * @return  Societe $localobject    Company
+	*
+	 * @depends testSocieteFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testSocieteUpdate($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject->note_private='New private note after update';
-        $localobject->note_public='New public note after update';
-        $localobject->name='New name';
-        $localobject->address='New address';
-        $localobject->zip='New zip';
-        $localobject->town='New town';
-        $localobject->country_id=2;
-        $localobject->status=0;
-        $localobject->phone='New tel';
-        $localobject->fax='New fax';
-        $localobject->email='newemail@newemail.com';
-        $localobject->url='New url';
-        $localobject->idprof1='new idprof1';
-        $localobject->idprof2='new idprof2';
-        $localobject->idprof3='new idprof3';
-        $localobject->idprof4='new idprof4';
+		$localobject->note_private='New private note after update';
+		$localobject->note_public='New public note after update';
+		$localobject->name='New name';
+		$localobject->address='New address';
+		$localobject->zip='New zip';
+		$localobject->town='New town';
+		$localobject->country_id=2;
+		$localobject->status=0;
+		$localobject->phone='New tel';
+		$localobject->fax='New fax';
+		$localobject->email='newemail@newemail.com';
+		$localobject->url='New url';
+		$localobject->idprof1='new idprof1';
+		$localobject->idprof2='new idprof2';
+		$localobject->idprof3='new idprof3';
+		$localobject->idprof4='new idprof4';
 
-        $result=$localobject->update($localobject->id, $user);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		$result=$localobject->update($localobject->id, $user);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
 		$result=$localobject->update_note($localobject->note_private, '_private');
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -229,221 +233,221 @@ class SocieteTest extends PHPUnit\Framework\TestCase
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0, 'Holiday::update_note (public) error');
 
-        $newobject=new Societe($this->savdb);
-        $result=$newobject->fetch($localobject->id);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		$newobject=new Societe($this->savdb);
+		$result=$newobject->fetch($localobject->id);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        $this->assertEquals($localobject->note_private, $newobject->note_private);
-        //$this->assertEquals($localobject->note_public, $newobject->note_public);
-        $this->assertEquals($localobject->name, $newobject->name);
-        $this->assertEquals($localobject->address, $newobject->address);
-        $this->assertEquals($localobject->zip, $newobject->zip);
-        $this->assertEquals($localobject->town, $newobject->town);
-        $this->assertEquals($localobject->country_id, $newobject->country_id);
-        $this->assertEquals('BE', $newobject->country_code);
-        $this->assertEquals($localobject->status, $newobject->status);
-        $this->assertEquals($localobject->phone, $newobject->phone);
-        $this->assertEquals($localobject->fax, $newobject->fax);
-        $this->assertEquals($localobject->email, $newobject->email);
-        $this->assertEquals($localobject->url, $newobject->url);
-        $this->assertEquals($localobject->idprof1, $newobject->idprof1);
-        $this->assertEquals($localobject->idprof2, $newobject->idprof2);
-        $this->assertEquals($localobject->idprof3, $newobject->idprof3);
-        $this->assertEquals($localobject->idprof4, $newobject->idprof4);
+		$this->assertEquals($localobject->note_private, $newobject->note_private);
+		//$this->assertEquals($localobject->note_public, $newobject->note_public);
+		$this->assertEquals($localobject->name, $newobject->name);
+		$this->assertEquals($localobject->address, $newobject->address);
+		$this->assertEquals($localobject->zip, $newobject->zip);
+		$this->assertEquals($localobject->town, $newobject->town);
+		$this->assertEquals($localobject->country_id, $newobject->country_id);
+		$this->assertEquals('BE', $newobject->country_code);
+		$this->assertEquals($localobject->status, $newobject->status);
+		$this->assertEquals($localobject->phone, $newobject->phone);
+		$this->assertEquals($localobject->fax, $newobject->fax);
+		$this->assertEquals($localobject->email, $newobject->email);
+		$this->assertEquals($localobject->url, $newobject->url);
+		$this->assertEquals($localobject->idprof1, $newobject->idprof1);
+		$this->assertEquals($localobject->idprof2, $newobject->idprof2);
+		$this->assertEquals($localobject->idprof3, $newobject->idprof3);
+		$this->assertEquals($localobject->idprof4, $newobject->idprof4);
 
-        return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testIdProfCheck
-     *
-     * @param   Societe $localobject    Company
-     * @return  Societe $localobject    Company
-     *
-     * @depends testSocieteUpdate
-     * The depends says test is run only if previous is ok
-     */
-    public function testIdProfCheck($localobject)
-    {
-        // OK FR
-        $localobject->country_code='FR';
-        $localobject->idprof1=493861496;
-        $localobject->idprof2=49386149600021;
-        $result=$localobject->id_prof_check(1, $localobject);    // Must be > 0
-        print __METHOD__." OK FR idprof1 result=".$result."\n";
-        $this->assertGreaterThanOrEqual(1, $result);
-        $result=$localobject->id_prof_check(2, $localobject);    // Must be > 0
-        print __METHOD__." OK FR idprof2 result=".$result."\n";
-        $this->assertGreaterThanOrEqual(1, $result);
+	/**
+	 * testIdProfCheck
+	 *
+	 * @param   Societe $localobject    Company
+	 * @return  Societe $localobject    Company
+	 *
+	 * @depends testSocieteUpdate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testIdProfCheck($localobject)
+	{
+		// OK FR
+		$localobject->country_code='FR';
+		$localobject->idprof1=493861496;
+		$localobject->idprof2=49386149600021;
+		$result=$localobject->id_prof_check(1, $localobject);    // Must be > 0
+		print __METHOD__." OK FR idprof1 result=".$result."\n";
+		$this->assertGreaterThanOrEqual(1, $result);
+		$result=$localobject->id_prof_check(2, $localobject);    // Must be > 0
+		print __METHOD__." OK FR idprof2 result=".$result."\n";
+		$this->assertGreaterThanOrEqual(1, $result);
 
-        // KO FR
-        $localobject->country_code='FR';
-        $localobject->idprof1='id1ko';
-        $localobject->idprof2='id2ko';
-        $result=$localobject->id_prof_check(1, $localobject);    // Must be <= 0
-        print __METHOD__." KO FR idprof1 result=".$result."\n";
-        $this->assertLessThan(1, $result);
-        $result=$localobject->id_prof_check(2, $localobject);    // Must be <= 0
-        print __METHOD__." KO FR idprof2 result=".$result."\n";
-        $this->assertLessThan(1, $result);
+		// KO FR
+		$localobject->country_code='FR';
+		$localobject->idprof1='id1ko';
+		$localobject->idprof2='id2ko';
+		$result=$localobject->id_prof_check(1, $localobject);    // Must be <= 0
+		print __METHOD__." KO FR idprof1 result=".$result."\n";
+		$this->assertLessThan(1, $result);
+		$result=$localobject->id_prof_check(2, $localobject);    // Must be <= 0
+		print __METHOD__." KO FR idprof2 result=".$result."\n";
+		$this->assertLessThan(1, $result);
 
-        // KO ES
-        $localobject->country_code='ES';
-        $localobject->idprof1='id1ko';
-        $result=$localobject->id_prof_check(1, $localobject);    // Must be <= 0
-        print __METHOD__." KO ES idprof1 result=".$result."\n";
-        $this->assertLessThan(1, $result);
+		// KO ES
+		$localobject->country_code='ES';
+		$localobject->idprof1='id1ko';
+		$result=$localobject->id_prof_check(1, $localobject);    // Must be <= 0
+		print __METHOD__." KO ES idprof1 result=".$result."\n";
+		$this->assertLessThan(1, $result);
 
-        // OK AR
-        $localobject->country_code='AR';
-        $localobject->idprof1='id1ko';
-        $localobject->idprof2='id2ko';
-        $result=$localobject->id_prof_check(1, $localobject);    // Must be > 0
-        print __METHOD__." OK AR idprof1 result=".$result."\n";
-        $this->assertGreaterThanOrEqual(0, $result);
-        $result=$localobject->id_prof_check(2, $localobject);    // Must be > 0
-        print __METHOD__." OK AR idprof2 result=".$result."\n";
-        $this->assertGreaterThanOrEqual(1, $result);
+		// OK AR
+		$localobject->country_code='AR';
+		$localobject->idprof1='id1ko';
+		$localobject->idprof2='id2ko';
+		$result=$localobject->id_prof_check(1, $localobject);    // Must be > 0
+		print __METHOD__." OK AR idprof1 result=".$result."\n";
+		$this->assertGreaterThanOrEqual(0, $result);
+		$result=$localobject->id_prof_check(2, $localobject);    // Must be > 0
+		print __METHOD__." OK AR idprof2 result=".$result."\n";
+		$this->assertGreaterThanOrEqual(1, $result);
 
-        return $localobject;
-    }
+		return $localobject;
+	}
 
 
-    /**
-     * testSocieteOther
-     *
-     * @param   Societe $localobject    Company
-     * @return  int     $id             Id of company
-     *
-     * @depends testIdProfCheck
-     * The depends says test is run only if previous is ok
-     */
-    public function testSocieteOther($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testSocieteOther
+	 *
+	 * @param   Societe $localobject    Company
+	 * @return  int     $id             Id of company
+	 *
+	 * @depends testIdProfCheck
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testSocieteOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=$localobject->set_as_client();
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		$result=$localobject->set_as_client();
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        $result=$localobject->set_price_level(1, $user);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		$result=$localobject->set_price_level(1, $user);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        $result=$localobject->set_remise_client(10, 'Gift', $user);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		$result=$localobject->set_remise_client(10, 'Gift', $user);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        $result=$localobject->getNomUrl(1);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertNotEquals($result, '');
+		$result=$localobject->getNomUrl(1);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertNotEquals($result, '');
 
-        $result=$localobject->isInEEC();
-        print __METHOD__." id=".$localobject->id." country_code=".$localobject->country_code." result=".$result."\n";
-        $this->assertTrue(true, $result);
+		$result=$localobject->isInEEC();
+		print __METHOD__." id=".$localobject->id." country_code=".$localobject->country_code." result=".$result."\n";
+		$this->assertTrue(true, $result);
 
-        $localobject->info($localobject->id);
-        print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
-        $this->assertNotEquals($localobject->date_creation, '');
+		$localobject->info($localobject->id);
+		print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
+		$this->assertNotEquals($localobject->date_creation, '');
 
-        return $localobject->id;
-    }
+		return $localobject->id;
+	}
 
 
-    /**
-     * testSocieteDelete
-     *
-     * @param   int     $id     Id of company
-     * @return  int
-     *
-     * @depends testSocieteOther
-     * The depends says test is run only if previous is ok
-     */
-    public function testSocieteDelete($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testSocieteDelete
+	 *
+	 * @param   int     $id     Id of company
+	 * @return  int
+	 *
+	 * @depends testSocieteOther
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testSocieteDelete($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Societe($this->savdb);
-        $result=$localobject->fetch($id);
+		$localobject=new Societe($this->savdb);
+		$result=$localobject->fetch($id);
 
-        $result=$localobject->delete($id, $user);
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		$result=$localobject->delete($id, $user);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        return $result;
-    }
+		return $result;
+	}
 
 
-    /**
-     * testSocieteGetFullAddress
-     *
-     * @return  int     $id             Id of company
-     */
-    public function testSocieteGetFullAddress()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testSocieteGetFullAddress
+	 *
+	 * @return  int     $id             Id of company
+	 */
+	public function testSocieteGetFullAddress()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobjectadd=new Societe($db);
-        $localobjectadd->initAsSpecimen();
+		$localobjectadd=new Societe($db);
+		$localobjectadd->initAsSpecimen();
 
-        // France
-        unset($localobjectadd->country_code);
-        $localobjectadd->country_id=1;
-        $localobjectadd->name='New name';
-        $localobjectadd->address='New address';
-        $localobjectadd->zip='New zip';
-        $localobjectadd->town='New town';
-        $result=$localobjectadd->getFullAddress(1);
-        print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
-        $this->assertContains("New address\nNew zip New town\nFrance", $result);
+		// France
+		unset($localobjectadd->country_code);
+		$localobjectadd->country_id=1;
+		$localobjectadd->name='New name';
+		$localobjectadd->address='New address';
+		$localobjectadd->zip='New zip';
+		$localobjectadd->town='New town';
+		$result=$localobjectadd->getFullAddress(1);
+		print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
+		$this->assertContains("New address\nNew zip New town\nFrance", $result);
 
-        // Belgium
-        unset($localobjectadd->country_code);
-        $localobjectadd->country_id=2;
-        $localobjectadd->name='New name';
-        $localobjectadd->address='New address';
-        $localobjectadd->zip='New zip';
-        $localobjectadd->town='New town';
-        $result=$localobjectadd->getFullAddress(1);
-        print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
-        $this->assertContains("New address\nNew zip New town\nBelgium", $result);
+		// Belgium
+		unset($localobjectadd->country_code);
+		$localobjectadd->country_id=2;
+		$localobjectadd->name='New name';
+		$localobjectadd->address='New address';
+		$localobjectadd->zip='New zip';
+		$localobjectadd->town='New town';
+		$result=$localobjectadd->getFullAddress(1);
+		print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
+		$this->assertContains("New address\nNew zip New town\nBelgium", $result);
 
-        // Switzerland
-        unset($localobjectadd->country_code);
-        $localobjectadd->country_id=6;
-        $localobjectadd->name='New name';
-        $localobjectadd->address='New address';
-        $localobjectadd->zip='New zip';
-        $localobjectadd->town='New town';
-        $result=$localobjectadd->getFullAddress(1);
-        print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
-        $this->assertContains("New address\nNew zip New town\nSwitzerland", $result);
+		// Switzerland
+		unset($localobjectadd->country_code);
+		$localobjectadd->country_id=6;
+		$localobjectadd->name='New name';
+		$localobjectadd->address='New address';
+		$localobjectadd->zip='New zip';
+		$localobjectadd->town='New town';
+		$result=$localobjectadd->getFullAddress(1);
+		print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
+		$this->assertContains("New address\nNew zip New town\nSwitzerland", $result);
 
-        // USA
-        unset($localobjectadd->country_code);
-        $localobjectadd->country_id=11;
-        $localobjectadd->name='New name';
-        $localobjectadd->address='New address';
-        $localobjectadd->zip='New zip';
-        $localobjectadd->town='New town';
-        $localobjectadd->state='New state';
-        $result=$localobjectadd->getFullAddress(1);
-        print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
-        $this->assertContains("New address\nNew town, New state, New zip\nUnited States", $result);
+		// USA
+		unset($localobjectadd->country_code);
+		$localobjectadd->country_id=11;
+		$localobjectadd->name='New name';
+		$localobjectadd->address='New address';
+		$localobjectadd->zip='New zip';
+		$localobjectadd->town='New town';
+		$localobjectadd->state='New state';
+		$result=$localobjectadd->getFullAddress(1);
+		print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
+		$this->assertContains("New address\nNew town, New state, New zip\nUnited States", $result);
 
-        return $localobjectadd->id;
-    }
+		return $localobjectadd->id;
+	}
 }
diff --git a/test/phpunit/StripeTest.php b/test/phpunit/StripeTest.php
index 72d4722b34e..9425cc47aa0 100644
--- a/test/phpunit/StripeTest.php
+++ b/test/phpunit/StripeTest.php
@@ -30,8 +30,7 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/geturl.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/stripe/lib/stripe.lib.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -75,69 +74,71 @@ class StripeTest extends PHPUnit\Framework\TestCase
 		print "\n";
 	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 
-    	if (empty($conf->stripe->enabled)) { print __METHOD__." Module Stripe must be enabled.\n"; die(); }
+		if (empty($conf->stripe->enabled)) {
+			print __METHOD__." Module Stripe must be enabled.\n"; die();
+		}
 
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testStripeOk
-     *
-     * @return	void
-     */
-    public function testStripeOk()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testStripeOk
+	 *
+	 * @return	void
+	 */
+	public function testStripeOk()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -148,9 +149,9 @@ class StripeTest extends PHPUnit\Framework\TestCase
 
 		$result=getURLContent($urltotest, 'GET', '', 1, array(), array('http', 'https'), 2);
 
-        print __METHOD__." result=".$result['http_code']."\n";
-        $this->assertEquals(200, $result['http_code']);
+		print __METHOD__." result=".$result['http_code']."\n";
+		$this->assertEquals(200, $result['http_code']);
 
-    	return $result;
-    }
+		return $result;
+	}
 }
diff --git a/test/phpunit/SupplierProposalTest.php b/test/phpunit/SupplierProposalTest.php
index 27414ecab0a..65df065529f 100644
--- a/test/phpunit/SupplierProposalTest.php
+++ b/test/phpunit/SupplierProposalTest.php
@@ -29,8 +29,7 @@ global $conf,$user,$langs,$db;
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/supplier_proposal/class/supplier_proposal.class.php';
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for user nb 1 (that should be admin)\n";
 	$user->fetch(1);
 
@@ -63,7 +62,7 @@ class SupplierProposalTest extends PHPUnit\Framework\TestCase
 	 */
 	public function __construct()
 	{
-        parent::__construct();
+		parent::__construct();
 
 		//$this->sharedFixture
 		global $conf,$user,$langs,$db;
@@ -78,41 +77,43 @@ class SupplierProposalTest extends PHPUnit\Framework\TestCase
 	}
 
 	/**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-    	global $conf,$user,$langs,$db;
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-		if (empty($conf->global->MAIN_MODULE_SUPPLIERPROPOSAL)) { print "\n".__METHOD__." module Supplier proposal must be enabled.\n"; die(); }
+		if (empty($conf->global->MAIN_MODULE_SUPPLIERPROPOSAL)) {
+			print "\n".__METHOD__." module Supplier proposal must be enabled.\n"; die();
+		}
 
-    	print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -124,102 +125,102 @@ class SupplierProposalTest extends PHPUnit\Framework\TestCase
 		// Set permission not set by default sql sample
 		$user->addrights(0, 'supplier_proposal');
 		$user->getrights('supplier_proposal', 1);
-    }
+	}
 
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testSupplierProposalCreate
-     *
-     * @return	void
-     */
-    public function testSupplierProposalCreate()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testSupplierProposalCreate
+	 *
+	 * @return	void
+	 */
+	public function testSupplierProposalCreate()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new SupplierProposal($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+		$localobject->initAsSpecimen();
+		$result=$localobject->create($user);
 
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." result=".$result."\n";
-    	return $result;
-    }
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
+		return $result;
+	}
 
-    /**
-     * testSupplierProposalFetch
-     *
-     * @param	int		$id		Id of object
-     * @return	void
-     *
-     * @depends	testSupplierProposalCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testSupplierProposalFetch($id)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testSupplierProposalFetch
+	 *
+	 * @param	int		$id		Id of object
+	 * @return	void
+	 *
+	 * @depends	testSupplierProposalCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testSupplierProposalFetch($id)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new SupplierProposal($this->savdb);
-    	$result=$localobject->fetch($id);
+		$result=$localobject->fetch($id);
 
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	return $localobject;
-    }
+		$this->assertLessThan($result, 0);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		return $localobject;
+	}
 
-    /**
-     * testSupplierProposalAddLine
-     *
-     * @param	int		$localobject	Proposal
-     * @return	void
-     *
-     * @depends	testSupplierProposalFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testSupplierProposalAddLine($localobject)
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+	/**
+	 * testSupplierProposalAddLine
+	 *
+	 * @param	int		$localobject	Proposal
+	 * @return	void
+	 *
+	 * @depends	testSupplierProposalFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testSupplierProposalAddLine($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-    	$localobject->fetch_thirdparty();
-    	$result=$localobject->addline('Added line', 10, 2, 19.6);
+		$localobject->fetch_thirdparty();
+		$result=$localobject->addline('Added line', 10, 2, 19.6);
 
-    	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	return $localobject;
-    }
+		$this->assertLessThan($result, 0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		return $localobject;
+	}
 
-    /**
-     * testSupplierProposalValid
-     *
-     * @param	SupplierProposal	$localobject	Proposal
-     * @return	SupplierProposal
-     *
-     * @depends	testSupplierProposalAddLine
-     * The depends says test is run only if previous is ok
-     */
-    public function testSupplierProposalValid($localobject)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testSupplierProposalValid
+	 *
+	 * @param	SupplierProposal	$localobject	Proposal
+	 * @return	SupplierProposal
+	 *
+	 * @depends	testSupplierProposalAddLine
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testSupplierProposalValid($localobject)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -234,63 +235,63 @@ class SupplierProposalTest extends PHPUnit\Framework\TestCase
 		$result=$localobject->valid($user);
 		$this->assertLessThan($result, 0);
 
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $localobject;
-    }
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
 
-    /**
-     * testSupplierProposalOther
-     *
-     * @param	SupplierProposal	$localobject	Proposal
-     * @return	int
-     *
-     * @depends testSupplierProposalValid
-     * The depends says test is run only if previous is ok
-     */
-    public function testSupplierProposalOther($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testSupplierProposalOther
+	 *
+	 * @param	SupplierProposal	$localobject	Proposal
+	 * @return	int
+	 *
+	 * @depends testSupplierProposalValid
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testSupplierProposalOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        /*$result=$localobject->setstatus(0);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        */
+		/*$result=$localobject->setstatus(0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		*/
 
-        $localobject->info($localobject->id);
-        print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
-        $this->assertNotEquals($localobject->date_creation, '');
+		$localobject->info($localobject->id);
+		print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
+		$this->assertNotEquals($localobject->date_creation, '');
 
-        return $localobject->id;
-    }
+		return $localobject->id;
+	}
 
-    /**
-     * testSupplierProposalDelete
-     *
-     * @param	int		$id		Id of proposal
-     * @return	void
-     *
-     * @depends	testSupplierProposalOther
-     * The depends says test is run only if previous is ok
-     */
-    public function testSupplierProposalDelete($id)
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * testSupplierProposalDelete
+	 *
+	 * @param	int		$id		Id of proposal
+	 * @return	void
+	 *
+	 * @depends	testSupplierProposalOther
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testSupplierProposalDelete($id)
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		$localobject=new SupplierProposal($this->savdb);
-    	$result=$localobject->fetch($id);
+		$result=$localobject->fetch($id);
 		$result=$localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $result;
-    }
+		$this->assertLessThan($result, 0);
+		return $result;
+	}
 }
diff --git a/test/phpunit/TicketTest.php b/test/phpunit/TicketTest.php
index c13bdcfb959..60aea4b8098 100644
--- a/test/phpunit/TicketTest.php
+++ b/test/phpunit/TicketTest.php
@@ -75,10 +75,10 @@ class TicketTest extends PHPUnit\Framework\TestCase
 	}
 
 	/**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
 	public static function setUpBeforeClass()
 	{
 		global $conf,$user,$langs,$db;
@@ -87,11 +87,11 @@ class TicketTest extends PHPUnit\Framework\TestCase
 		print __METHOD__."\n";
 	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
 	public static function tearDownAfterClass()
 	{
 		global $conf,$user,$langs,$db;
@@ -306,7 +306,7 @@ class TicketTest extends PHPUnit\Framework\TestCase
 		$user_id_to_assign = 1;
 
 		$result=$localobject->assignUser($user, $user_id_to_assign);
-        ;
+		;
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertGreaterThan(0, $result);
diff --git a/test/phpunit/UserGroupTest.php b/test/phpunit/UserGroupTest.php
index 3ec92449f08..b529496fcfa 100644
--- a/test/phpunit/UserGroupTest.php
+++ b/test/phpunit/UserGroupTest.php
@@ -30,9 +30,9 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/user/class/usergroup.class.php';
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -46,246 +46,246 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class UserGroupTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return UserGroupTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return UserGroupTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-    */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	*/
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * End phpunit tests
-     *
-     * @return  void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+	/**
+	 * End phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testUserGroupCreate
-     *
-     * @return	void
-     */
-    public function testUserGroupCreate()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testUserGroupCreate
+	 *
+	 * @return	void
+	 */
+	public function testUserGroupCreate()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new UserGroup($this->savdb);
-        $localobject->initAsSpecimen();
-        $result=$localobject->create($user);
+		$localobject=new UserGroup($this->savdb);
+		$localobject->initAsSpecimen();
+		$result=$localobject->create($user);
 
-        $this->assertLessThan($result, 0);
-        print __METHOD__." result=".$result."\n";
-        return $result;
-    }
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
+		return $result;
+	}
 
-    /**
-     * testUserGroupFetch
-     *
-     * @param   int $id             Id of group
-     * @return  void
-     * @depends testUserGroupCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testUserGroupFetch($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testUserGroupFetch
+	 *
+	 * @param   int $id             Id of group
+	 * @return  void
+	 * @depends testUserGroupCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testUserGroupFetch($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new UserGroup($this->savdb);
-        $result=$localobject->fetch($id);
+		$localobject=new UserGroup($this->savdb);
+		$result=$localobject->fetch($id);
 
-        $this->assertLessThan($result, 0);
-        print __METHOD__." id=".$id." result=".$result."\n";
-        return $localobject;
-    }
+		$this->assertLessThan($result, 0);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		return $localobject;
+	}
 
-    /**
-     * testUserGroupUpdate
-     *
-     * @param   Object $localobject Group
-     * @return  void
-     * @depends testUserGroupFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testUserGroupUpdate($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testUserGroupUpdate
+	 *
+	 * @param   Object $localobject Group
+	 * @return  void
+	 * @depends testUserGroupFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testUserGroupUpdate($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject->note='New note after update';
-        $result=$localobject->update($user);
+		$localobject->note='New note after update';
+		$result=$localobject->update($user);
 
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $localobject;
-    }
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
 
-    /**
-     * testUserGroupAddRight
-     *
-     * @param   Object $localobject Object to show
-     * @return  void
-     * @depends testUserGroupUpdate
-     * The depends says test is run only if previous is ok
-     */
-    public function testUserGroupAddRight($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testUserGroupAddRight
+	 *
+	 * @param   Object $localobject Object to show
+	 * @return  void
+	 * @depends testUserGroupUpdate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testUserGroupAddRight($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=$localobject->addrights(1, 'bookmarks');
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$result=$localobject->addrights(1, 'bookmarks');
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
-        $this->assertLessThan($result, 0);
-        return $localobject;
-    }
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
 
-    /**
-     * testUserGroupDelRight
-     *
-     * @param   Object $localobject Object
-     * @return  void
-     * @depends testUserGroupAddRight
-     * The depends says test is run only if previous is ok
-     */
-    public function testUserGroupDelRight($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testUserGroupDelRight
+	 *
+	 * @param   Object $localobject Object
+	 * @return  void
+	 * @depends testUserGroupAddRight
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testUserGroupDelRight($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=$localobject->delrights(1, 'bookmarks');
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$result=$localobject->delrights(1, 'bookmarks');
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
-        $this->assertLessThan($result, 0);
-        return $localobject;
-    }
+		$this->assertLessThan($result, 0);
+		return $localobject;
+	}
 
-    /**
-     * testUserGroupOther
-     *
-     * @param   Object $localobject Object
-     * @return  void
-     * @depends testUserGroupDelRight
-     * The depends says test is run only if previous is ok
-     */
-    public function testUserGroupOther($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testUserGroupOther
+	 *
+	 * @param   Object $localobject Object
+	 * @return  void
+	 * @depends testUserGroupDelRight
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testUserGroupOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result = $localobject->generateDocument('templatenamethadoesnotexist', $langs);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(-1, $result, 'Calling generateDocument with a not existing template should return 0');
+		$result = $localobject->generateDocument('templatenamethadoesnotexist', $langs);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals(-1, $result, 'Calling generateDocument with a not existing template should return 0');
 
-        return $localobject->id;
-    }
+		return $localobject->id;
+	}
 
-    /**
-     * testUserGroupDelete
-     *
-     * @param   int $id             Id of object
-     * @return  void
-     * @depends testUserGroupOther
-     * The depends says test is run only if previous is ok
-     */
-    public function testUserGroupDelete($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testUserGroupDelete
+	 *
+	 * @param   int $id             Id of object
+	 * @return  void
+	 * @depends testUserGroupOther
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testUserGroupDelete($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new UserGroup($this->savdb);
-        $result=$localobject->fetch($id);
-        $result=$localobject->delete($user);
+		$localobject=new UserGroup($this->savdb);
+		$result=$localobject->fetch($id);
+		$result=$localobject->delete($user);
 
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $result;
-    }
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $result;
+	}
 }
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index a8486451c47..124ff17c135 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -30,9 +30,9 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/user/class/user.class.php';
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -46,309 +46,313 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class UserTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return UserTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return UserTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 
-        if (! empty($conf->global->MAIN_MODULE_LDAP)) { print "\n".__METHOD__." module LDAP must be disabled.\n"; die(); }
+		if (! empty($conf->global->MAIN_MODULE_LDAP)) {
+			print "\n".__METHOD__." module LDAP must be disabled.\n"; die();
+		}
 
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return	void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * End phpunit tests
-     *
-     * @return	void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testUserCreate
-     *
-     * @return  void
-     */
-    public function testUserCreate()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testUserCreate
+	 *
+	 * @return  void
+	 */
+	public function testUserCreate()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new User($this->savdb);
-        $localobject->initAsSpecimen();
-        $result=$localobject->create($user);
+		$localobject=new User($this->savdb);
+		$localobject->initAsSpecimen();
+		$result=$localobject->create($user);
 
-        $this->assertLessThan($result, 0);
-        print __METHOD__." result=".$result."\n";
-        return $result;
-    }
+		$this->assertLessThan($result, 0);
+		print __METHOD__." result=".$result."\n";
+		return $result;
+	}
 
-    /**
-     * testUserFetch
-     *
-     * @param   int $id             Id of user
-     * @return  void
-     * @depends testUserCreate
-     * The depends says test is run only if previous is ok
-     */
-    public function testUserFetch($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testUserFetch
+	 *
+	 * @param   int $id             Id of user
+	 * @return  void
+	 * @depends testUserCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testUserFetch($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new User($this->savdb);
-        $result=$localobject->fetch($id);
+		$localobject=new User($this->savdb);
+		$result=$localobject->fetch($id);
 
-        $this->assertLessThan($result, 0);
-        print __METHOD__." id=".$id." result=".$result."\n";
-        return $localobject;
-    }
+		$this->assertLessThan($result, 0);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		return $localobject;
+	}
 
-    /**
-     * testUserUpdate
-     *
-     * @param   Object  $localobject     User
-     * @return  void
-     * @depends testUserFetch
-     * The depends says test is run only if previous is ok
-     */
-    public function testUserUpdate($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testUserUpdate
+	 *
+	 * @param   Object  $localobject     User
+	 * @return  void
+	 * @depends testUserFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testUserUpdate($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $this->changeProperties($localobject);
-        $result=$localobject->update($user);
+		$this->changeProperties($localobject);
+		$result=$localobject->update($user);
 
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
 
-        // Test everything are still same than specimen
-        $newlocalobject=new User($this->savdb);
-        $newlocalobject->initAsSpecimen();
-        $this->changeProperties($newlocalobject);
-        $this->assertEquals($this->objCompare($localobject, $newlocalobject, true, array('id','socid','societe_id','specimen','note','ref','pass','pass_indatabase','pass_indatabase_crypted','pass_temp','datec','datem','datelastlogin','datepreviouslogin','trackid')), array());    // Actual, Expected
+		// Test everything are still same than specimen
+		$newlocalobject=new User($this->savdb);
+		$newlocalobject->initAsSpecimen();
+		$this->changeProperties($newlocalobject);
+		$this->assertEquals($this->objCompare($localobject, $newlocalobject, true, array('id','socid','societe_id','specimen','note','ref','pass','pass_indatabase','pass_indatabase_crypted','pass_temp','datec','datem','datelastlogin','datepreviouslogin','trackid')), array());    // Actual, Expected
 
-        return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testUserDisable
-     *
-     * @param   Object  $localobject     User
-     * @return  void
-     * @depends testUserUpdate
-     * The depends says test is run only if previous is ok
-     */
-    public function testUserDisable($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testUserDisable
+	 *
+	 * @param   Object  $localobject     User
+	 * @return  void
+	 * @depends testUserUpdate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testUserDisable($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $result=$localobject->setstatus(0);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$result=$localobject->setstatus(0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
-        $this->assertLessThan($result, 0);
+		$this->assertLessThan($result, 0);
 
-        return $localobject;
-    }
+		return $localobject;
+	}
 
-    /**
-     * testUserOther
-     *
-     * @param   Object  $localobject     User
-     * @return  void
-     * @depends testUserDisable
-     * The depends says test is run only if previous is ok
-     */
-    public function testUserOther($localobject)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testUserOther
+	 *
+	 * @param   Object  $localobject     User
+	 * @return  void
+	 * @depends testUserDisable
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testUserOther($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        /*$result=$localobject->setstatus(0);
-        print __METHOD__." id=".$localobject->id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        */
+		/*$result=$localobject->setstatus(0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		*/
 
-        $localobject->info($localobject->id);
-        print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
-        $this->assertNotEquals($localobject->date_creation, '');
+		$localobject->info($localobject->id);
+		print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
+		$this->assertNotEquals($localobject->date_creation, '');
 
-        return $localobject->id;
-    }
+		return $localobject->id;
+	}
 
-    /**
-     * testUserDelete
-     *
-     * @param   Object  $id      User
-     * @return  void
-     * @depends testUserOther
-     * The depends says test is run only if previous is ok
-     */
-    public function testUserDelete($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testUserDelete
+	 *
+	 * @param   Object  $id      User
+	 * @return  void
+	 * @depends testUserOther
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testUserDelete($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new User($this->savdb);
-        $result=$localobject->fetch($id);
-        $result=$localobject->delete($user);
+		$localobject=new User($this->savdb);
+		$result=$localobject->fetch($id);
+		$result=$localobject->delete($user);
 
-        print __METHOD__." id=".$id." result=".$result."\n";
-        $this->assertLessThan($result, 0);
-        return $result;
-    }
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $result;
+	}
 
-    /**
-     * testUserAddPermission
-     *
-     * @param   Object  $id      User
-     * @return  void
-     * @depends testUserDelete
-     * The depends says test is run only if previous is ok
-     */
-    public function testUserAddPermission($id)
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+	/**
+	 * testUserAddPermission
+	 *
+	 * @param   Object  $id      User
+	 * @return  void
+	 * @depends testUserDelete
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testUserAddPermission($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-    	$localobject=new User($this->savdb);
-    	$result=$localobject->fetch(1);			// Other tests use the user id 1
-    	$result=$localobject->addrights(0, 'supplier_proposal');
+		$localobject=new User($this->savdb);
+		$result=$localobject->fetch(1);			// Other tests use the user id 1
+		$result=$localobject->addrights(0, 'supplier_proposal');
 
-    	print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-    	return $result;
-    }
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $result;
+	}
 
 
 
-    /**
-     * Edit an object to test updates
-     *
-     * @param   mixed   $localobject        Object User
-     * @return  void
-     */
-    public function changeProperties(&$localobject)
-    {
-        $localobject->note_private='New note after update';
-    }
+	/**
+	 * Edit an object to test updates
+	 *
+	 * @param   mixed   $localobject        Object User
+	 * @return  void
+	 */
+	public function changeProperties(&$localobject)
+	{
+		$localobject->note_private='New note after update';
+	}
 
-    /**
-     * Compare all public properties values of 2 objects
-     *
-     * @param   Object      $oA                     Object operand 1
-     * @param   Object      $oB                     Object operand 2
-     * @param   boolean     $ignoretype             False will not report diff if type of value differs
-     * @param   array       $fieldstoignorearray    Array of fields to ignore in diff
-     * @return  array                               Array with differences
-     */
-    public function objCompare($oA, $oB, $ignoretype = true, $fieldstoignorearray = array('id'))
-    {
-        $retAr=array();
+	/**
+	 * Compare all public properties values of 2 objects
+	 *
+	 * @param   Object      $oA                     Object operand 1
+	 * @param   Object      $oB                     Object operand 2
+	 * @param   boolean     $ignoretype             False will not report diff if type of value differs
+	 * @param   array       $fieldstoignorearray    Array of fields to ignore in diff
+	 * @return  array                               Array with differences
+	 */
+	public function objCompare($oA, $oB, $ignoretype = true, $fieldstoignorearray = array('id'))
+	{
+		$retAr=array();
 
-        if (get_class($oA) !== get_class($oB)) {
-            $retAr[]="Supplied objects are not of same class.";
-        } else {
-            $oVarsA=get_object_vars($oA);
-            $oVarsB=get_object_vars($oB);
-            $aKeys=array_keys($oVarsA);
-            foreach ($aKeys as $sKey) {
-                if (in_array($sKey, $fieldstoignorearray)) continue;
-                if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
-                    $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
-                }
-                if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
-                    $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
-                }
-            }
-        }
-        return $retAr;
-    }
+		if (get_class($oA) !== get_class($oB)) {
+			$retAr[]="Supplied objects are not of same class.";
+		} else {
+			$oVarsA=get_object_vars($oA);
+			$oVarsB=get_object_vars($oB);
+			$aKeys=array_keys($oVarsA);
+			foreach ($aKeys as $sKey) {
+				if (in_array($sKey, $fieldstoignorearray)) {
+					continue;
+				}
+				if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
+					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+				}
+				if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
+					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+				}
+			}
+		}
+		return $retAr;
+	}
 }
diff --git a/test/phpunit/UtilsTest.php b/test/phpunit/UtilsTest.php
index dd5ba68ca8f..91ba85a7656 100644
--- a/test/phpunit/UtilsTest.php
+++ b/test/phpunit/UtilsTest.php
@@ -30,9 +30,9 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/class/utils.class.php';
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -46,114 +46,114 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class UtilsTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return UserTest
-     */
-    public function __construct()
-    {
-        parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return UserTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-        //$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return	void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * End phpunit tests
-     *
-     * @return	void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testExecuteCLI
-     *
-     * @return  void
-     */
-    public function testExecuteCLI()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testExecuteCLI
+	 *
+	 * @return  void
+	 */
+	public function testExecuteCLI()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $localobject=new Utils($this->savdb);
-        $result = $localobject->executeCLI('ls', $conf->admin->dir_temp.'/out.tmp', 1);
+		$localobject=new Utils($this->savdb);
+		$result = $localobject->executeCLI('ls', $conf->admin->dir_temp.'/out.tmp', 1);
 		print var_export($result, true);
-        $this->assertEquals($result['result'], 0);
-        $this->assertEquals($result['error'], '');
-        //$this->assertEquals(preg_match('/phpunit/', $result['output']), 1);
+		$this->assertEquals($result['result'], 0);
+		$this->assertEquals($result['error'], '');
+		//$this->assertEquals(preg_match('/phpunit/', $result['output']), 1);
 
-        $localobject=new Utils($this->savdb);
-        $result = $localobject->executeCLI('ls', $conf->admin->dir_temp.'/out.tmp', 2);
+		$localobject=new Utils($this->savdb);
+		$result = $localobject->executeCLI('ls', $conf->admin->dir_temp.'/out.tmp', 2);
 		print var_export($result, true);
-        $this->assertEquals($result['result'], 0);
-        $this->assertEquals($result['error'], '');
-        //$this->assertEquals(preg_match('/phpunit/', $result['output']), 1);
+		$this->assertEquals($result['result'], 0);
+		$this->assertEquals($result['error'], '');
+		//$this->assertEquals(preg_match('/phpunit/', $result['output']), 1);
 
-        print __METHOD__." result=".$result['result']."\n";
-        return $result;
-    }
+		print __METHOD__." result=".$result['result']."\n";
+		return $result;
+	}
 }
diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index 6bedda43fa4..f6f499357a4 100644
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -31,8 +31,7 @@ require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
 require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
 
 
-if (empty($user->id))
-{
+if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
@@ -85,8 +84,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
 		$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_invoice.php';
 		print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
 		$this->soapclient = new nusoap_client($WS_DOL_URL);
-		if ($this->soapclient)
-		{
+		if ($this->soapclient) {
 			$this->soapclient->soap_defencoding='UTF-8';
 			$this->soapclient->decodeUTF8(false);
 		}
@@ -96,16 +94,16 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
 		print "\n";
 	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
 
-        $now = dol_now();
+		$now = dol_now();
 
 		// create a third_party, needed to create an invoice
 		//
@@ -134,8 +132,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
 		$societe->particulier=0;
 
 		$societe->create($user);
-		if (empty($societe->id))
-		{
+		if (empty($societe->id)) {
 			// Create failed, may be the thirdparty already exists, we fetch it
 			$societe->fetch(0, 'name');
 		}
@@ -146,66 +143,66 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
 
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return void
-     */
-    public static function tearDownAfterClass()
-    {
-    	global $conf,$user,$langs,$db;
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
 		$db->rollback();
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * Init phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function setUp()
-    {
-    	global $conf,$user,$langs,$db;
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
 		print __METHOD__."\n";
-    }
+	}
 
 	/**
 	 * End phpunit tests
 	 *
 	 * @return	void
 	 */
-    protected function tearDown()
-    {
-    	print __METHOD__."\n";
-    }
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
 
-    /**
-     * testWSInvoicesCreateInvoice
-     *
-     * @return	int		invoice created
-     */
-    public function testWSInvoicesCreateInvoice()
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+	/**
+	 * testWSInvoicesCreateInvoice
+	 *
+	 * @return	int		invoice created
+	 */
+	public function testWSInvoicesCreateInvoice()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-    	$WS_METHOD  = 'createInvoice';
+		$WS_METHOD  = 'createInvoice';
 
-    	$body = array (
-    			"id" => null,
+		$body = array (
+				"id" => null,
 				"ref" => null,
 				"ref_ext" => "ref-phpunit-2",
 				"thirdparty_id" => self::$socid,
@@ -246,120 +243,117 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
 					"product_desc" => "" ))
 					);
 
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    	'sourceapplication'=>'DEMO',
-    	'login'=>'admin',
-    	'password'=>$this->pass,
-    	'entity'=>'');
+		// Call the WebService method and store its result in $result.
+		$authentication=array(
+		'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+		'sourceapplication'=>'DEMO',
+		'login'=>'admin',
+		'password'=>$this->pass,
+		'entity'=>'');
 
-    	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication,'invoice'=>$body);
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
-    	} catch (SoapFault $exception) {
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! $result || ! empty($result['faultstring']))
-    	{
-    		//var_dump($soapclient);
-    		print $this->soapclient->error_str;
-    		print "\n<br>\n";
-    		print $this->soapclient->request;
-    		print "\n<br>\n";
-    		print $this->soapclient->response;
-    		print "\n";
-    	}
+		// Test URL
+		$result='';
+		$parameters = array('authentication'=>$authentication,'invoice'=>$body);
+		print __METHOD__." call method ".$WS_METHOD."\n";
+		try {
+			$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
+		} catch (SoapFault $exception) {
+			echo $exception;
+			$result=0;
+		}
+		if (! $result || ! empty($result['faultstring'])) {
+			//var_dump($soapclient);
+			print $this->soapclient->error_str;
+			print "\n<br>\n";
+			print $this->soapclient->request;
+			print "\n<br>\n";
+			print $this->soapclient->response;
+			print "\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']);
+		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']);
 
 
-    	return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testWSInvoicesGetInvoiceByRefExt
-     *
-     * Retrieve an invoice using ref_ext
-     * @depends testWSInvoicesCreateInvoice
-     *
-     * @param	array	$result		Invoice created by create method
-     * @return	array				Invoice
-     */
-    public function testWSInvoicesGetInvoiceByRefExt($result)
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+	/**
+	 * testWSInvoicesGetInvoiceByRefExt
+	 *
+	 * Retrieve an invoice using ref_ext
+	 * @depends testWSInvoicesCreateInvoice
+	 *
+	 * @param	array	$result		Invoice created by create method
+	 * @return	array				Invoice
+	 */
+	public function testWSInvoicesGetInvoiceByRefExt($result)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-    	$WS_METHOD  = 'getInvoice';
+		$WS_METHOD  = 'getInvoice';
 
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    	'sourceapplication'=>'DEMO',
-    	'login'=>'admin',
-    	'password'=>$this->pass,
-    	'entity'=>'');
+		// Call the WebService method and store its result in $result.
+		$authentication=array(
+		'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+		'sourceapplication'=>'DEMO',
+		'login'=>'admin',
+		'password'=>$this->pass,
+		'entity'=>'');
 
-    	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication, 'id'=>null, 'ref'=>null, 'ref_ext'=>'ref-phpunit-2');
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
-    	} catch (SoapFault $exception)
-    	{
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! $result || ! empty($result['faultstring']))
-    	{
-    		print $this->soapclient->error_str;
-    		print "\n<br>\n";
-    		print $this->soapclient->request;
-    		print "\n<br>\n";
-    		print $this->soapclient->response;
-    		print "\n";
-    	}
-    	print __METHOD__." result=".$result['result']['result_code']."\n";
-    	$this->assertEquals('OK', $result['result']['result_code']);
-    	$this->assertEquals('ref-phpunit-2', $result['invoice']['ref_ext']);
+		// Test URL
+		$result='';
+		$parameters = array('authentication'=>$authentication, 'id'=>null, 'ref'=>null, 'ref_ext'=>'ref-phpunit-2');
+		print __METHOD__." call method ".$WS_METHOD."\n";
+		try {
+			$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
+		} catch (SoapFault $exception) {
+			echo $exception;
+			$result=0;
+		}
+		if (! $result || ! empty($result['faultstring'])) {
+			print $this->soapclient->error_str;
+			print "\n<br>\n";
+			print $this->soapclient->request;
+			print "\n<br>\n";
+			print $this->soapclient->response;
+			print "\n";
+		}
+		print __METHOD__." result=".$result['result']['result_code']."\n";
+		$this->assertEquals('OK', $result['result']['result_code']);
+		$this->assertEquals('ref-phpunit-2', $result['invoice']['ref_ext']);
 
 
-    	return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testWSInvoicesUpdateInvoiceByRefExt
-     *
-     * Update an invoice using ref_ext
-     * @depends testWSInvoicesCreateInvoice
-     *
-     * @param	array	$result		invoice created by create method
-     * @return	array 				Invoice
-     */
-    public function testWSInvoicesUpdateInvoiceByRefExt($result)
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+	/**
+	 * testWSInvoicesUpdateInvoiceByRefExt
+	 *
+	 * Update an invoice using ref_ext
+	 * @depends testWSInvoicesCreateInvoice
+	 *
+	 * @param	array	$result		invoice created by create method
+	 * @return	array 				Invoice
+	 */
+	public function testWSInvoicesUpdateInvoiceByRefExt($result)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-    	$WS_METHOD  = 'updateInvoice';
+		$WS_METHOD  = 'updateInvoice';
 
-    	// update status to 2
-    	$body = array (
-    		"id" => null,
+		// update status to 2
+		$body = array (
+			"id" => null,
 			"ref" => null,
 			"ref_ext" => "ref-phpunit-2",
 			"thirdparty_id" => self::$socid,
@@ -401,39 +395,37 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
 				"product_desc" => "" ))
 			);
 
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    	'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    	'sourceapplication'=>'DEMO',
-    	'login'=>'admin',
-    	'password'=>$this->pass,
-    	'entity'=>'');
+		// Call the WebService method and store its result in $result.
+		$authentication=array(
+		'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+		'sourceapplication'=>'DEMO',
+		'login'=>'admin',
+		'password'=>$this->pass,
+		'entity'=>'');
 
-    	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication,'invoice'=>$body);
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
-    	} catch (SoapFault $exception)
-    	{
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! $result || ! empty($result['faultstring']))
-    	{
-    		print $this->soapclient->error_str;
-    		print "\n<br>\n";
-    		print $this->soapclient->request;
-    		print "\n<br>\n";
-    		print $this->soapclient->response;
-    		print "\n";
-    	}
+		// Test URL
+		$result='';
+		$parameters = array('authentication'=>$authentication,'invoice'=>$body);
+		print __METHOD__." call method ".$WS_METHOD."\n";
+		try {
+			$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
+		} catch (SoapFault $exception) {
+			echo $exception;
+			$result=0;
+		}
+		if (! $result || ! empty($result['faultstring'])) {
+			print $this->soapclient->error_str;
+			print "\n<br>\n";
+			print $this->soapclient->request;
+			print "\n<br>\n";
+			print $this->soapclient->response;
+			print "\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']);
+		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']);
 
-    	return $result;
-    }
+		return $result;
+	}
 }
diff --git a/test/phpunit/WebservicesOrdersTest.php b/test/phpunit/WebservicesOrdersTest.php
index fb649a52e44..9ffa00226e0 100644
--- a/test/phpunit/WebservicesOrdersTest.php
+++ b/test/phpunit/WebservicesOrdersTest.php
@@ -32,9 +32,9 @@ require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
 
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -50,142 +50,142 @@ $conf->global->MAIN_UMASK='0666';
  */
 class WebservicesOrdersTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return DateLibTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return DateLibTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * End phpunit tests
-     *
-     * @return  void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+	/**
+	 * End phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
 
-    /**
-     * testWSOrderGetOrder
-     *
-     * @return int
-     */
-    public function testWSOrderGetOrder()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testWSOrderGetOrder
+	 *
+	 * @return int
+	 */
+	public function testWSOrderGetOrder()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_order.php';
-        $WS_METHOD  = 'getOrder';
-        $ns='http://www.dolibarr.org/ns/';
+		$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_order.php';
+		$WS_METHOD  = 'getOrder';
+		$ns='http://www.dolibarr.org/ns/';
 
-        // Set the WebService URL
-        print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
-        $soapclient = new nusoap_client($WS_DOL_URL);
-        if ($soapclient) {
-            $soapclient->soap_defencoding='UTF-8';
-            $soapclient->decodeUTF8(false);
-        }
+		// Set the WebService URL
+		print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
+		$soapclient = new nusoap_client($WS_DOL_URL);
+		if ($soapclient) {
+			$soapclient->soap_defencoding='UTF-8';
+			$soapclient->decodeUTF8(false);
+		}
 
-        // Call the WebService method and store its result in $result.
-        $authentication=array(
-            'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-            'sourceapplication'=>'DEMO',
-            'login'=>'admin',
-            'password'=>'admin',
-            'entity'=>''
-        );
+		// Call the WebService method and store its result in $result.
+		$authentication=array(
+			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+			'sourceapplication'=>'DEMO',
+			'login'=>'admin',
+			'password'=>'admin',
+			'entity'=>''
+		);
 
-        // Test URL
-        $parameters = array('authentication'=>$authentication,'id'=>1);
-        print __METHOD__." call method ".$WS_METHOD."\n";
-        try {
-            $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch (SoapFault $exception) {
-            echo $exception;
-            $result=0;
-        }
-        if (! $result || ! empty($result['faultstring'])) {
-            //var_dump($soapclient);
-            print $soapclient->error_str;
-            print "\n<br>\n";
-            print $soapclient->request;
-            print "\n<br>\n";
-            print $soapclient->response;
-            print "\n";
-        }
+		// Test URL
+		$parameters = array('authentication'=>$authentication,'id'=>1);
+		print __METHOD__." call method ".$WS_METHOD."\n";
+		try {
+			$result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
+		} catch (SoapFault $exception) {
+			echo $exception;
+			$result=0;
+		}
+		if (! $result || ! empty($result['faultstring'])) {
+			//var_dump($soapclient);
+			print $soapclient->error_str;
+			print "\n<br>\n";
+			print $soapclient->request;
+			print "\n<br>\n";
+			print $soapclient->response;
+			print "\n";
+		}
 
-        print __METHOD__." count(result)=".count($result)."\n";
-        $this->assertEquals('OK', $result['result']['result_code']);
+		print __METHOD__." count(result)=".count($result)."\n";
+		$this->assertEquals('OK', $result['result']['result_code']);
 
-        return $result;
-    }
+		return $result;
+	}
 }
diff --git a/test/phpunit/WebservicesOtherTest.php b/test/phpunit/WebservicesOtherTest.php
index 69449320537..0e788a195a7 100644
--- a/test/phpunit/WebservicesOtherTest.php
+++ b/test/phpunit/WebservicesOtherTest.php
@@ -32,9 +32,9 @@ require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
 
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -50,171 +50,171 @@ $conf->global->MAIN_UMASK='0666';
  */
 class WebservicesOtherTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return DateLibTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return DateLibTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-    */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	*/
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * End phpunit tests
-     *
-     * @return  void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+	/**
+	 * End phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
 
-    /**
-     * testWSOtherGetVersions
-     *
-     * @return int
-     */
-    public function testWSOtherGetVersions()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testWSOtherGetVersions
+	 *
+	 * @return int
+	 */
+	public function testWSOtherGetVersions()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_other.php';
-        $WS_METHOD  = 'getVersions';
-        $ns='http://www.dolibarr.org/ns/';
+		$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_other.php';
+		$WS_METHOD  = 'getVersions';
+		$ns='http://www.dolibarr.org/ns/';
 
-        // Set the WebService URL
-        print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
-        $soapclient = new nusoap_client($WS_DOL_URL);
-        if ($soapclient) {
-            $soapclient->soap_defencoding='UTF-8';
-            $soapclient->decodeUTF8(false);
-        }
+		// Set the WebService URL
+		print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
+		$soapclient = new nusoap_client($WS_DOL_URL);
+		if ($soapclient) {
+			$soapclient->soap_defencoding='UTF-8';
+			$soapclient->decodeUTF8(false);
+		}
 
-        // Call the WebService method and store its result in $result.
-        $authentication=array(
-            'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-            'sourceapplication'=>'DEMO',
-            'login'=>'admin',
-            'password'=>'admin',
-            'entity'=>''
-        );
+		// Call the WebService method and store its result in $result.
+		$authentication=array(
+			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+			'sourceapplication'=>'DEMO',
+			'login'=>'admin',
+			'password'=>'admin',
+			'entity'=>''
+		);
 
-        // Test URL
-        $result='';
-        $parameters = array('authentication'=>$authentication);
-        print __METHOD__." call method ".$WS_METHOD."\n";
-        try {
-            $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch (SoapFault $exception) {
-            echo $exception;
-            $result=0;
-        }
-        if (! empty($result['faultstring'])) {
-            print $result['faultstring']."\n";
-            $result=0;
-        }
-        if (! $result) {
-            //var_dump($soapclient);
-            print $soapclient->error_str;
-            print "\n<br>\n";
-            print $soapclient->request;
-            print "\n<br>\n";
-            print $soapclient->response;
-            print "\n";
-        }
+		// Test URL
+		$result='';
+		$parameters = array('authentication'=>$authentication);
+		print __METHOD__." call method ".$WS_METHOD."\n";
+		try {
+			$result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
+		} catch (SoapFault $exception) {
+			echo $exception;
+			$result=0;
+		}
+		if (! empty($result['faultstring'])) {
+			print $result['faultstring']."\n";
+			$result=0;
+		}
+		if (! $result) {
+			//var_dump($soapclient);
+			print $soapclient->error_str;
+			print "\n<br>\n";
+			print $soapclient->request;
+			print "\n<br>\n";
+			print $soapclient->response;
+			print "\n";
+		}
 
-        print __METHOD__." count(result)=".count($result)."\n";
-        $this->assertEquals('OK', $result['result']['result_code']);
+		print __METHOD__." count(result)=".count($result)."\n";
+		$this->assertEquals('OK', $result['result']['result_code']);
 
-        // Test method that does not exists
-        $WS_METHOD='methodthatdoesnotexists';
-        $result='';
-        $parameters = array('authentication'=>$authentication);
-        print __METHOD__." call method ".$WS_METHOD."\n";
-        try {
-            $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch (SoapFault $exception) {
-            echo $exception;
-            $result=0;
-        }
-        if (! $result || ! empty($result['faultstring'])) {
-            //var_dump($soapclient);
-            print $soapclient->error_str;
-            print "\n<br>\n";
-            print $soapclient->request;
-            print "\n<br>\n";
-            print $soapclient->response;
-            print "\n";
-        }
+		// Test method that does not exists
+		$WS_METHOD='methodthatdoesnotexists';
+		$result='';
+		$parameters = array('authentication'=>$authentication);
+		print __METHOD__." call method ".$WS_METHOD."\n";
+		try {
+			$result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
+		} catch (SoapFault $exception) {
+			echo $exception;
+			$result=0;
+		}
+		if (! $result || ! empty($result['faultstring'])) {
+			//var_dump($soapclient);
+			print $soapclient->error_str;
+			print "\n<br>\n";
+			print $soapclient->request;
+			print "\n<br>\n";
+			print $soapclient->response;
+			print "\n";
+		}
 
-        print __METHOD__." count(result)=".count($result)."\n";
-        $this->assertEquals("SOAP-ENV:Client: Operation 'methodthatdoesnotexists' is not defined in the WSDL for this service", $soapclient->error_str);
+		print __METHOD__." count(result)=".count($result)."\n";
+		$this->assertEquals("SOAP-ENV:Client: Operation 'methodthatdoesnotexists' is not defined in the WSDL for this service", $soapclient->error_str);
 
-        return $result;
-    }
+		return $result;
+	}
 }
diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index b78650cc480..a31d147b9d7 100644
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -34,16 +34,15 @@ require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
 
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
 $conf->global->MAIN_UMASK='0666';
 
-if (empty($conf->service->enabled))
-{
+if (empty($conf->service->enabled)) {
 	print "Error: Module service must be enabled.\n";
 	exit(1);
 }
@@ -57,283 +56,283 @@ if (empty($conf->service->enabled))
  */
 class WebservicesProductsTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return DateLibTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return DateLibTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * End phpunit tests
-     *
-     * @return  void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+	/**
+	 * End phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
 
-    /**
-     * testWSProductsCreateProductOrService
-     *
-     * @return int
-     */
-    public function testWSProductsCreateProductOrService()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testWSProductsCreateProductOrService
+	 *
+	 * @return int
+	 */
+	public function testWSProductsCreateProductOrService()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $datestring=dol_print_date(dol_now(), 'dayhourlog');
+		$datestring=dol_print_date(dol_now(), 'dayhourlog');
 
-        $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php';
-        $WS_METHOD  = 'createProductOrService';
-        $ns='http://www.dolibarr.org/ns/';
+		$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php';
+		$WS_METHOD  = 'createProductOrService';
+		$ns='http://www.dolibarr.org/ns/';
 
-        // Set the WebService URL
-        print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
-        $soapclient = new nusoap_client($WS_DOL_URL);
-        if ($soapclient) {
-            $soapclient->soap_defencoding='UTF-8';
-            $soapclient->decodeUTF8(false);
-        }
+		// Set the WebService URL
+		print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
+		$soapclient = new nusoap_client($WS_DOL_URL);
+		if ($soapclient) {
+			$soapclient->soap_defencoding='UTF-8';
+			$soapclient->decodeUTF8(false);
+		}
 
-        // Call the WebService method and store its result in $result.
-        $authentication=array(
-            'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-            'sourceapplication'=>'DEMO',
-            'login'=>'admin',
-            'password'=>'admin',
-            'entity'=>''
-        );
+		// Call the WebService method and store its result in $result.
+		$authentication=array(
+			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+			'sourceapplication'=>'DEMO',
+			'login'=>'admin',
+			'password'=>'admin',
+			'entity'=>''
+		);
 
-        // Test URL
-        $result='';
-        $parameters = array(
-            'authentication'=>$authentication,'product'=>array(
-                'ref'=>'NewProductFromWS'.$datestring,
-                'label'=>'New Product From WS '.$datestring,
-                'type'=>1,
-                'description'=>'This is a new product created from WS PHPUnit test case',
-                'barcode'=>'123456789012',
-                'barcode_type'=>2,
-            	'price_net'=>10,
-            	'status_tosell'=>1,
-            	'status_tobuy'=>1
-            )
-        );
-        print __METHOD__." call method ".$WS_METHOD."\n";
-        try {
-            $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch (SoapFault $exception) {
-            echo $exception;
-            $result=0;
-        }
-        if (! $result || ! empty($result['faultstring']) || $result['result']['result_code'] != 'OK') {
-            //var_dump($soapclient);
-            print $soapclient->error_str;
-            print "\n<br>\n";
-            print $soapclient->request;
-            print "\n<br>\n";
-            print $soapclient->response;
-            print "\n";
-        }
-        print var_export($result, true);
-        print __METHOD__." count(result)=".(is_array($result) ? count($result) : '')."\n";
-        $this->assertEquals('OK', $result['result']['result_code']);
+		// Test URL
+		$result='';
+		$parameters = array(
+			'authentication'=>$authentication,'product'=>array(
+				'ref'=>'NewProductFromWS'.$datestring,
+				'label'=>'New Product From WS '.$datestring,
+				'type'=>1,
+				'description'=>'This is a new product created from WS PHPUnit test case',
+				'barcode'=>'123456789012',
+				'barcode_type'=>2,
+				'price_net'=>10,
+				'status_tosell'=>1,
+				'status_tobuy'=>1
+			)
+		);
+		print __METHOD__." call method ".$WS_METHOD."\n";
+		try {
+			$result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
+		} catch (SoapFault $exception) {
+			echo $exception;
+			$result=0;
+		}
+		if (! $result || ! empty($result['faultstring']) || $result['result']['result_code'] != 'OK') {
+			//var_dump($soapclient);
+			print $soapclient->error_str;
+			print "\n<br>\n";
+			print $soapclient->request;
+			print "\n<br>\n";
+			print $soapclient->response;
+			print "\n";
+		}
+		print var_export($result, true);
+		print __METHOD__." count(result)=".(is_array($result) ? count($result) : '')."\n";
+		$this->assertEquals('OK', $result['result']['result_code']);
 
-        return $result['id'];
-    }
+		return $result['id'];
+	}
 
-    /**
-     * testWSProductsGetProductOrService
-     *
-     * @param   int $id     Id of product or service
-     * @return  int         Id of product or service
-     *
-     * @depends	testWSProductsCreateProductOrService
-     */
-    public function testWSProductsGetProductOrService($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testWSProductsGetProductOrService
+	 *
+	 * @param   int $id     Id of product or service
+	 * @return  int         Id of product or service
+	 *
+	 * @depends	testWSProductsCreateProductOrService
+	 */
+	public function testWSProductsGetProductOrService($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php';
-        $WS_METHOD  = 'getProductOrService';
-        $ns='http://www.dolibarr.org/ns/';
+		$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php';
+		$WS_METHOD  = 'getProductOrService';
+		$ns='http://www.dolibarr.org/ns/';
 
-        // Set the WebService URL
-        print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
-        $soapclient = new nusoap_client($WS_DOL_URL);
-        if ($soapclient) {
-            $soapclient->soap_defencoding='UTF-8';
-            $soapclient->decodeUTF8(false);
-        }
+		// Set the WebService URL
+		print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
+		$soapclient = new nusoap_client($WS_DOL_URL);
+		if ($soapclient) {
+			$soapclient->soap_defencoding='UTF-8';
+			$soapclient->decodeUTF8(false);
+		}
 
-        // Call the WebService method and store its result in $result.
-        $authentication=array(
-            'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-            'sourceapplication'=>'DEMO',
-            'login'=>'admin',
-            'password'=>'admin',
-            'entity'=>''
-        );
+		// Call the WebService method and store its result in $result.
+		$authentication=array(
+			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+			'sourceapplication'=>'DEMO',
+			'login'=>'admin',
+			'password'=>'admin',
+			'entity'=>''
+		);
 
-        // Test URL
-        $result='';
-        $parameters = array('authentication'=>$authentication,'id'=>$id,'ref'=>'');
-        print __METHOD__." call method ".$WS_METHOD."\n";
-        try {
-            $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch (SoapFault $exception) {
-            echo $exception;
-            $result=0;
-        }
-        if (! $result || ! empty($result['faultstring'])) {
-            //var_dump($soapclient);
-            print $soapclient->error_str;
-            print "\n<br>\n";
-            print $soapclient->request;
-            print "\n<br>\n";
-            print $soapclient->response;
-            print "\n";
-        }
+		// Test URL
+		$result='';
+		$parameters = array('authentication'=>$authentication,'id'=>$id,'ref'=>'');
+		print __METHOD__." call method ".$WS_METHOD."\n";
+		try {
+			$result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
+		} catch (SoapFault $exception) {
+			echo $exception;
+			$result=0;
+		}
+		if (! $result || ! empty($result['faultstring'])) {
+			//var_dump($soapclient);
+			print $soapclient->error_str;
+			print "\n<br>\n";
+			print $soapclient->request;
+			print "\n<br>\n";
+			print $soapclient->response;
+			print "\n";
+		}
 
-        print __METHOD__." count(result)=".count($result)."\n";
-        $this->assertEquals('OK', $result['result']['result_code']);
+		print __METHOD__." count(result)=".count($result)."\n";
+		$this->assertEquals('OK', $result['result']['result_code']);
 
-        return $id;
-    }
+		return $id;
+	}
 
-    /**
-     * testWSProductsDeleteProductOrService
-     *
-     * @param   int $id     Id of product or service
-     * @return  int         0
-     *
-     * @depends testWSProductsGetProductOrService
-     */
-    public function testWSProductsDeleteProductOrService($id)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testWSProductsDeleteProductOrService
+	 *
+	 * @param   int $id     Id of product or service
+	 * @return  int         0
+	 *
+	 * @depends testWSProductsGetProductOrService
+	 */
+	public function testWSProductsDeleteProductOrService($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php';
-        $WS_METHOD  = 'deleteProductOrService';
-        $ns='http://www.dolibarr.org/ns/';
+		$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_productorservice.php';
+		$WS_METHOD  = 'deleteProductOrService';
+		$ns='http://www.dolibarr.org/ns/';
 
-        // Set the WebService URL
-        print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
-        $soapclient = new nusoap_client($WS_DOL_URL);
-        if ($soapclient) {
-            $soapclient->soap_defencoding='UTF-8';
-            $soapclient->decodeUTF8(false);
-        }
+		// Set the WebService URL
+		print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
+		$soapclient = new nusoap_client($WS_DOL_URL);
+		if ($soapclient) {
+			$soapclient->soap_defencoding='UTF-8';
+			$soapclient->decodeUTF8(false);
+		}
 
-        // Call the WebService method and store its result in $result.
-        $authentication=array(
-            'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-            'sourceapplication'=>'DEMO',
-            'login'=>'admin',
-            'password'=>'admin',
-            'entity'=>''
-        );
+		// Call the WebService method and store its result in $result.
+		$authentication=array(
+			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+			'sourceapplication'=>'DEMO',
+			'login'=>'admin',
+			'password'=>'admin',
+			'entity'=>''
+		);
 
-        // Test URL
-        $result='';
-        $parameters = array('authentication'=>$authentication,'listofid'=>$id);
-        print __METHOD__." call method ".$WS_METHOD."\n";
-        try {
-            $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch (SoapFault $exception) {
-            echo $exception;
-            $result=0;
-        }
-        if (! $result || ! empty($result['faultstring']) || $result['result']['result_code'] != 'OK') {
-            //var_dump($soapclient);
-            print $soapclient->error_str;
-            print "\n<br>\n";
-            print $soapclient->request;
-            print "\n<br>\n";
-            print $soapclient->response;
-            print "\n";
-        }
+		// Test URL
+		$result='';
+		$parameters = array('authentication'=>$authentication,'listofid'=>$id);
+		print __METHOD__." call method ".$WS_METHOD."\n";
+		try {
+			$result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
+		} catch (SoapFault $exception) {
+			echo $exception;
+			$result=0;
+		}
+		if (! $result || ! empty($result['faultstring']) || $result['result']['result_code'] != 'OK') {
+			//var_dump($soapclient);
+			print $soapclient->error_str;
+			print "\n<br>\n";
+			print $soapclient->request;
+			print "\n<br>\n";
+			print $soapclient->response;
+			print "\n";
+		}
 
-        print __METHOD__." count(result)=".count($result)."\n";
-        $this->assertEquals('OK', $result['result']['result_code']);
+		print __METHOD__." count(result)=".count($result)."\n";
+		$this->assertEquals('OK', $result['result']['result_code']);
 
-        return 0;
-    }
+		return 0;
+	}
 }
diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php
index cf56066ba6a..fe9b15cee50 100644
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@@ -32,9 +32,9 @@ require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
 
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -50,361 +50,361 @@ $conf->global->MAIN_UMASK='0666';
  */
 class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
-    protected $soapclient;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+	protected $soapclient;
 
-    private $ns='http://www.dolibarr.org/ns/';
+	private $ns='http://www.dolibarr.org/ns/';
 
 
 
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return DateLibTest
-     */
-    public function __construct()
-    {
-        parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return DateLibTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_thirdparty.php';
+		$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_thirdparty.php';
 
-        // Set the WebService URL
-        print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
-        $this->soapclient = new nusoap_client($WS_DOL_URL);
-        if ($this->soapclient) {
-        	$this->soapclient->soap_defencoding='UTF-8';
-        	$this->soapclient->decodeUTF8(false);
-        }
+		// Set the WebService URL
+		print __METHOD__." create nusoap_client for URL=".$WS_DOL_URL."\n";
+		$this->soapclient = new nusoap_client($WS_DOL_URL);
+		if ($this->soapclient) {
+			$this->soapclient->soap_defencoding='UTF-8';
+			$this->soapclient->decodeUTF8(false);
+		}
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * End phpunit tests
-     *
-     * @return  void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+	/**
+	 * End phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
-    /**
-     * testWSThirdpartycreateThirdParty
-     *
-     * @return array thirdparty created
-     */
-    public function testWSThirdpartycreateThirdParty()
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+	/**
+	 * testWSThirdpartycreateThirdParty
+	 *
+	 * @return array thirdparty created
+	 */
+	public function testWSThirdpartycreateThirdParty()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-    	$WS_METHOD  = 'createThirdParty';
+		$WS_METHOD  = 'createThirdParty';
 
 
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    			'sourceapplication'=>'DEMO',
-    			'login'=>'admin',
-    			'password'=>'admin',
-    			'entity'=>'');
+		// Call the WebService method and store its result in $result.
+		$authentication=array(
+				'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+				'sourceapplication'=>'DEMO',
+				'login'=>'admin',
+				'password'=>'admin',
+				'entity'=>'');
 
-    	$body = array (
-    			"id" => null,
-    			"ref" => "name",
-    			"ref_ext" => "12",
-    			"fk_user_author" => null,
-    			"status" => null,
-    			"client" => 1,
-    			"supplier" => 0,
-    			"customer_code" => "CU0901-5678",
-    			"supplier_code" => "SU0901-5678",
-    			"customer_code_accountancy" => "",
-    			"supplier_code_accountancy" => "",
-    			"date_creation" => "", // dateTime
-    			"date_modification" => "", // dateTime
-    			"note_private" => "",
-    			"note_public" => "",
-    			"address" => "",
-    			"zip" => "",
-    			"town" => "",
-    			"province_id" => "",
-    			"country_id" => "",
-    			"country_code" => "",
-    			"country" => "",
-    			"phone" => "",
-    			"fax" => "",
-    			"email" => "",
-    			"url" => "",
-    			"profid1" => "",
-    			"profid2" => "",
-    			"profid3" => "",
-    			"profid4" => "",
-    			"profid5" => "",
-    			"profid6" => "",
-    			"capital" => "",
-    			"vat_used" => "",
-    			"vat_number" => ""
-    	);
+		$body = array (
+				"id" => null,
+				"ref" => "name",
+				"ref_ext" => "12",
+				"fk_user_author" => null,
+				"status" => null,
+				"client" => 1,
+				"supplier" => 0,
+				"customer_code" => "CU0901-5678",
+				"supplier_code" => "SU0901-5678",
+				"customer_code_accountancy" => "",
+				"supplier_code_accountancy" => "",
+				"date_creation" => "", // dateTime
+				"date_modification" => "", // dateTime
+				"note_private" => "",
+				"note_public" => "",
+				"address" => "",
+				"zip" => "",
+				"town" => "",
+				"province_id" => "",
+				"country_id" => "",
+				"country_code" => "",
+				"country" => "",
+				"phone" => "",
+				"fax" => "",
+				"email" => "",
+				"url" => "",
+				"profid1" => "",
+				"profid2" => "",
+				"profid3" => "",
+				"profid4" => "",
+				"profid5" => "",
+				"profid6" => "",
+				"capital" => "",
+				"vat_used" => "",
+				"vat_number" => ""
+		);
 
-    	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication, 'thirdparty'=>$body);
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
-    	} catch (SoapFault $exception) {
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! $result || ! empty($result['faultstring'])) {
-    		//var_dump($soapclient);
-    		print $this->soapclient->error_str;
-    		print "\n<br>\n";
-    		print $this->soapclient->request;
-    		print "\n<br>\n";
-    		print $this->soapclient->response;
-    		print "\n";
-    	}
+		// Test URL
+		$result='';
+		$parameters = array('authentication'=>$authentication, 'thirdparty'=>$body);
+		print __METHOD__." call method ".$WS_METHOD."\n";
+		try {
+			$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
+		} catch (SoapFault $exception) {
+			echo $exception;
+			$result=0;
+		}
+		if (! $result || ! empty($result['faultstring'])) {
+			//var_dump($soapclient);
+			print $this->soapclient->error_str;
+			print "\n<br>\n";
+			print $this->soapclient->request;
+			print "\n<br>\n";
+			print $this->soapclient->response;
+			print "\n";
+		}
 
-    	print __METHOD__." result=".$result['result']['result_code']."\n";
-    	$this->assertEquals('OK', $result['result']['result_code']);
-    	$this->assertEquals('name', $result['ref']);
+		print __METHOD__." result=".$result['result']['result_code']."\n";
+		$this->assertEquals('OK', $result['result']['result_code']);
+		$this->assertEquals('name', $result['ref']);
 
-    	return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testWSThirdpartygetThirdPartyById
-     *
-     * Use id to retrieve thirdparty
-     * @depends testWSThirdpartycreateThirdParty
-     *
-     * @param	array	$result		thirdparty created by create method
-     * @return	array				thirpdarty updated
-     */
-    public function testWSThirdpartygetThirdPartyById($result)
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-        $id = $result['id'];
-
-        $WS_METHOD  = 'getThirdParty';
-
-        // Call the WebService method and store its result in $result.
-        $authentication=array(
-        'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-        'sourceapplication'=>'DEMO',
-        'login'=>'admin',
-        'password'=>'admin',
-        'entity'=>'');
-
-        $result='';
-        $parameters = array('authentication'=>$authentication, 'id'=>$id);
-        print __METHOD__." call method ".$WS_METHOD."\n";
-        try {
-            $result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
-        } catch (SoapFault $exception) {
-            echo $exception;
-            $result=0;
-        }
-        if (! $result || ! empty($result['faultstring'])) {
-            //var_dump($soapclient);
-            print $this->soapclient->error_str;
-            print "\n<br>\n";
-            print $this->soapclient->request;
-            print "\n<br>\n";
-            print $this->soapclient->response;
-            print "\n";
-        }
-
-        print __METHOD__." result=".$result['result']['result_code']."\n";
-        $this->assertEquals('OK', $result['result']['result_code']);
-        $this->assertEquals($id, $result['thirdparty']['id']);
-        $this->assertEquals('name', $result['thirdparty']['ref']);
-        $this->assertEquals('12', $result['thirdparty']['ref_ext']);
-        $this->assertEquals('0', $result['thirdparty']['status']);
-        $this->assertEquals('1', $result['thirdparty']['client']);
-        $this->assertEquals('0', $result['thirdparty']['supplier']);
-
-
-        return $result;
-    }
-
-    /**
-     * testWSThirdpartygetThirdPartyByRefExt
-     *
-     * Use ref_ext to retrieve thirdparty
-     *
+	/**
+	 * testWSThirdpartygetThirdPartyById
+	 *
+	 * Use id to retrieve thirdparty
 	 * @depends testWSThirdpartycreateThirdParty
 	 *
-     * @param	array	$result		thirdparty created by create method
-     * @return	array				thirdparty
-     */
-    public function testWSThirdpartygetThirdPartyByRefExt($result)
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-    	$id = $result['id'];
+	 * @param	array	$result		thirdparty created by create method
+	 * @return	array				thirpdarty updated
+	 */
+	public function testWSThirdpartygetThirdPartyById($result)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+		$id = $result['id'];
 
-    	$WS_METHOD  = 'getThirdParty';
+		$WS_METHOD  = 'getThirdParty';
 
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    			'sourceapplication'=>'DEMO',
-    			'login'=>'admin',
-    			'password'=>'admin',
-    			'entity'=>'');
+		// Call the WebService method and store its result in $result.
+		$authentication=array(
+		'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+		'sourceapplication'=>'DEMO',
+		'login'=>'admin',
+		'password'=>'admin',
+		'entity'=>'');
 
-    	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication, 'id'=>'', 'ref'=>'', 'ref_ext'=>'12');
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
-    	} catch (SoapFault $exception) {
-    		echo $exception;
-    		$result=0;
-    	}
-    	print $this->soapclient->response;
-    	if (! $result || ! empty($result['faultstring'])) {
-    		//var_dump($soapclient);
-    		print $this->soapclient->error_str;
-    		print "\n<br>\n";
-    		print $this->soapclient->request;
-    		print "\n<br>\n";
-    		print $this->soapclient->response;
-    		print "\n";
-    	}
+		$result='';
+		$parameters = array('authentication'=>$authentication, 'id'=>$id);
+		print __METHOD__." call method ".$WS_METHOD."\n";
+		try {
+			$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
+		} catch (SoapFault $exception) {
+			echo $exception;
+			$result=0;
+		}
+		if (! $result || ! empty($result['faultstring'])) {
+			//var_dump($soapclient);
+			print $this->soapclient->error_str;
+			print "\n<br>\n";
+			print $this->soapclient->request;
+			print "\n<br>\n";
+			print $this->soapclient->response;
+			print "\n";
+		}
 
-    	print __METHOD__." result=".$result['result']['result_code']."\n";
-    	$this->assertEquals('OK', $result['result']['result_code']);
-    	$this->assertEquals($id, $result['thirdparty']['id']);
-    	$this->assertEquals('name', $result['thirdparty']['ref']);
-    	$this->assertEquals('12', $result['thirdparty']['ref_ext']);
-    	$this->assertEquals('0', $result['thirdparty']['status']);
-    	$this->assertEquals('1', $result['thirdparty']['client']);
-    	$this->assertEquals('0', $result['thirdparty']['supplier']);
+		print __METHOD__." result=".$result['result']['result_code']."\n";
+		$this->assertEquals('OK', $result['result']['result_code']);
+		$this->assertEquals($id, $result['thirdparty']['id']);
+		$this->assertEquals('name', $result['thirdparty']['ref']);
+		$this->assertEquals('12', $result['thirdparty']['ref_ext']);
+		$this->assertEquals('0', $result['thirdparty']['status']);
+		$this->assertEquals('1', $result['thirdparty']['client']);
+		$this->assertEquals('0', $result['thirdparty']['supplier']);
 
 
-    	return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * testWSThirdpartydeleteThirdParty
-     *
-     * @depends testWSThirdpartycreateThirdParty
-     *
-     * @param	array	$result		thirdparty created by create method
-     * @return	array				thirdparty
-     */
-    public function testWSThirdpartydeleteThirdPartyById($result)
-    {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-    	$id = $result['id'];
+	/**
+	 * testWSThirdpartygetThirdPartyByRefExt
+	 *
+	 * Use ref_ext to retrieve thirdparty
+	 *
+	 * @depends testWSThirdpartycreateThirdParty
+	 *
+	 * @param	array	$result		thirdparty created by create method
+	 * @return	array				thirdparty
+	 */
+	public function testWSThirdpartygetThirdPartyByRefExt($result)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+		$id = $result['id'];
 
-    	$WS_METHOD  = 'deleteThirdParty';
+		$WS_METHOD  = 'getThirdParty';
 
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    			'sourceapplication'=>'DEMO',
-    			'login'=>'admin',
-    			'password'=>'admin',
-    			'entity'=>'');
+		// Call the WebService method and store its result in $result.
+		$authentication=array(
+				'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+				'sourceapplication'=>'DEMO',
+				'login'=>'admin',
+				'password'=>'admin',
+				'entity'=>'');
 
-    	$result='';
-    	$parameters = array('authentication'=>$authentication, 'id'=>$id, 'ref'=>'', 'ref_ext'=>'');
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
-    	} catch (SoapFault $exception) {
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! $result || ! empty($result['faultstring'])) {
-    		print $this->soapclient->error_str;
-    		print "\n<br>\n";
-    		print $this->soapclient->request;
-    		print "\n<br>\n";
-    		print $this->soapclient->response;
-    		print "\n";
-    	}
+		// Test URL
+		$result='';
+		$parameters = array('authentication'=>$authentication, 'id'=>'', 'ref'=>'', 'ref_ext'=>'12');
+		print __METHOD__." call method ".$WS_METHOD."\n";
+		try {
+			$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
+		} catch (SoapFault $exception) {
+			echo $exception;
+			$result=0;
+		}
+		print $this->soapclient->response;
+		if (! $result || ! empty($result['faultstring'])) {
+			//var_dump($soapclient);
+			print $this->soapclient->error_str;
+			print "\n<br>\n";
+			print $this->soapclient->request;
+			print "\n<br>\n";
+			print $this->soapclient->response;
+			print "\n";
+		}
 
-    	print __METHOD__." result=".$result['result']['result_code']."\n";
-    	$this->assertEquals('OK', $result['result']['result_code']);
+		print __METHOD__." result=".$result['result']['result_code']."\n";
+		$this->assertEquals('OK', $result['result']['result_code']);
+		$this->assertEquals($id, $result['thirdparty']['id']);
+		$this->assertEquals('name', $result['thirdparty']['ref']);
+		$this->assertEquals('12', $result['thirdparty']['ref_ext']);
+		$this->assertEquals('0', $result['thirdparty']['status']);
+		$this->assertEquals('1', $result['thirdparty']['client']);
+		$this->assertEquals('0', $result['thirdparty']['supplier']);
 
-    	return $result;
-    }
+
+		return $result;
+	}
+
+	/**
+	 * testWSThirdpartydeleteThirdParty
+	 *
+	 * @depends testWSThirdpartycreateThirdParty
+	 *
+	 * @param	array	$result		thirdparty created by create method
+	 * @return	array				thirdparty
+	 */
+	public function testWSThirdpartydeleteThirdPartyById($result)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+		$id = $result['id'];
+
+		$WS_METHOD  = 'deleteThirdParty';
+
+		// Call the WebService method and store its result in $result.
+		$authentication=array(
+				'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+				'sourceapplication'=>'DEMO',
+				'login'=>'admin',
+				'password'=>'admin',
+				'entity'=>'');
+
+		$result='';
+		$parameters = array('authentication'=>$authentication, 'id'=>$id, 'ref'=>'', 'ref_ext'=>'');
+		print __METHOD__." call method ".$WS_METHOD."\n";
+		try {
+			$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
+		} catch (SoapFault $exception) {
+			echo $exception;
+			$result=0;
+		}
+		if (! $result || ! empty($result['faultstring'])) {
+			print $this->soapclient->error_str;
+			print "\n<br>\n";
+			print $this->soapclient->request;
+			print "\n<br>\n";
+			print $this->soapclient->response;
+			print "\n";
+		}
+
+		print __METHOD__." result=".$result['result']['result_code']."\n";
+		$this->assertEquals('OK', $result['result']['result_code']);
+
+		return $result;
+	}
 }
diff --git a/test/phpunit/WebservicesUserTest.php b/test/phpunit/WebservicesUserTest.php
index a683c99eac3..e3072844580 100644
--- a/test/phpunit/WebservicesUserTest.php
+++ b/test/phpunit/WebservicesUserTest.php
@@ -32,9 +32,9 @@ require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
 
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -50,172 +50,172 @@ $conf->global->MAIN_UMASK='0666';
  */
 class WebservicesUserTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return DateLibTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return DateLibTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-    */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	*/
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * End phpunit tests
-     *
-     * @return void
-     */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+	/**
+	 * End phpunit tests
+	 *
+	 * @return void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
 
-    /**
-     * testWSUserGetUser
-     *
-     * @return int
-     */
-    public function testWSUserGetUser()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testWSUserGetUser
+	 *
+	 * @return int
+	 */
+	public function testWSUserGetUser()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_user.php';
-        $WS_METHOD  = 'getUser';
-        $ns='http://www.dolibarr.org/ns/';
+		$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_user.php';
+		$WS_METHOD  = 'getUser';
+		$ns='http://www.dolibarr.org/ns/';
 
-        // Set the WebService URL
-        print __METHOD__." Create nusoap_client for URL=".$WS_DOL_URL."\n";
-        $soapclient = new nusoap_client($WS_DOL_URL);
-        if ($soapclient) {
-            $soapclient->soap_defencoding='UTF-8';
-            $soapclient->decodeUTF8(false);
-        }
+		// Set the WebService URL
+		print __METHOD__." Create nusoap_client for URL=".$WS_DOL_URL."\n";
+		$soapclient = new nusoap_client($WS_DOL_URL);
+		if ($soapclient) {
+			$soapclient->soap_defencoding='UTF-8';
+			$soapclient->decodeUTF8(false);
+		}
 
-        //$soapclient->setDebugLevel(5);
+		//$soapclient->setDebugLevel(5);
 
-        // Call the WebService method and store its result in $result.
-        $authentication=array(
-            'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-            'sourceapplication'=>'DEMO',
-            'login'=>'admin',
-            'password'=>'admin',
-            'entity'=>''
-        );
+		// Call the WebService method and store its result in $result.
+		$authentication=array(
+			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+			'sourceapplication'=>'DEMO',
+			'login'=>'admin',
+			'password'=>'admin',
+			'entity'=>''
+		);
 
-        // Test URL
-        $result='';
-        $parameters = array('authentication'=>$authentication,'id'=>0,'ref'=>'admin');
-        print __METHOD__." Call method ".$WS_METHOD."\n";
-        try {
-            $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch (SoapFault $exception) {
-            echo $exception;
-            $result=0;
-        }
-        if (! empty($result['faultstring'])) {
-            print $result['faultstring']."\n";
-            $result=0;
-        }
-        if (! $result) {
-            //var_dump($soapclient);
-            print $soapclient->error_str;
-            print "\n<br>\n";
-            print $soapclient->request;
-            print "\n<br>\n";
-            print $soapclient->response;
-            print "\n";
-        }
+		// Test URL
+		$result='';
+		$parameters = array('authentication'=>$authentication,'id'=>0,'ref'=>'admin');
+		print __METHOD__." Call method ".$WS_METHOD."\n";
+		try {
+			$result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
+		} catch (SoapFault $exception) {
+			echo $exception;
+			$result=0;
+		}
+		if (! empty($result['faultstring'])) {
+			print $result['faultstring']."\n";
+			$result=0;
+		}
+		if (! $result) {
+			//var_dump($soapclient);
+			print $soapclient->error_str;
+			print "\n<br>\n";
+			print $soapclient->request;
+			print "\n<br>\n";
+			print $soapclient->response;
+			print "\n";
+		}
 
-        print __METHOD__." count(result)=".count($result)."\n";
-        $this->assertEquals('OK', empty($result['result']['result_code'])?'':$result['result']['result_code'], 'Test on ref admin');
+		print __METHOD__." count(result)=".count($result)."\n";
+		$this->assertEquals('OK', empty($result['result']['result_code'])?'':$result['result']['result_code'], 'Test on ref admin');
 
-        // Test URL
-        $result='';
-        $parameters = array('authentication'=>$authentication,'id'=>0,'ref'=>'refthatdoesnotexists');
-        print __METHOD__."Call method ".$WS_METHOD."\n";
-        try {
-            $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch (SoapFault $exception) {
-            echo $exception;
-            $result=0;
-        }
-        if (! $result || ! empty($result['faultstring'])) {
-            //var_dump($soapclient);
-            print $soapclient->error_str;
-            print "\n<br>\n";
-            print $soapclient->request;
-            print "\n<br>\n";
-            print $soapclient->response;
-            print "\n";
-        }
+		// Test URL
+		$result='';
+		$parameters = array('authentication'=>$authentication,'id'=>0,'ref'=>'refthatdoesnotexists');
+		print __METHOD__."Call method ".$WS_METHOD."\n";
+		try {
+			$result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
+		} catch (SoapFault $exception) {
+			echo $exception;
+			$result=0;
+		}
+		if (! $result || ! empty($result['faultstring'])) {
+			//var_dump($soapclient);
+			print $soapclient->error_str;
+			print "\n<br>\n";
+			print $soapclient->request;
+			print "\n<br>\n";
+			print $soapclient->response;
+			print "\n";
+		}
 
-        print __METHOD__." count(result)=".count($result)."\n";
-        $this->assertEquals('NOT_FOUND', $result['result']['result_code'], 'Test on ref that does not exists');
+		print __METHOD__." count(result)=".count($result)."\n";
+		$this->assertEquals('NOT_FOUND', $result['result']['result_code'], 'Test on ref that does not exists');
 
-        return $result;
-    }
+		return $result;
+	}
 }
diff --git a/test/phpunit/XCalLibTest.php b/test/phpunit/XCalLibTest.php
index 9fb1975a1fd..9c81c25c46e 100644
--- a/test/phpunit/XCalLibTest.php
+++ b/test/phpunit/XCalLibTest.php
@@ -30,9 +30,9 @@ require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/xcal.lib.php';
 
 if (empty($user->id)) {
-    print "Load permissions for admin user nb 1\n";
-    $user->fetch(1);
-    $user->getrights();
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -46,105 +46,105 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  */
 class XCalLibTest extends PHPUnit\Framework\TestCase
 {
-    protected $savconf;
-    protected $savuser;
-    protected $savlangs;
-    protected $savdb;
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
 
-    /**
-     * Constructor
-     * We save global variables into local variables
-     *
-     * @return FilesLibTest
-     */
-    public function __construct()
-    {
-    	parent::__construct();
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return FilesLibTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
 
-    	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
 
-        print __METHOD__." db->type=".$db->type." user->id=".$user->id;
-        //print " - db ".$db->db;
-        print "\n";
-    }
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
-    public static function tearDownAfterClass()
-    {
-        global $conf,$user,$langs,$db;
-        $db->rollback();
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
 
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
 
-    /**
-     * Init phpunit tests
-     *
-     * @return  void
-     */
-    protected function setUp()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        print __METHOD__."\n";
-    }
-    /**
-     * End phpunit tests
-     *
-     * @return	void
-    */
-    protected function tearDown()
-    {
-        print __METHOD__."\n";
-    }
+		print __METHOD__."\n";
+	}
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	*/
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
 
 
-    /**
-     * testQuotedPrintEncodeDecode
-     *
-     * @return  void
-     */
-    public function testQuotedPrintEncodeDecode()
-    {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+	/**
+	 * testQuotedPrintEncodeDecode
+	 *
+	 * @return  void
+	 */
+	public function testQuotedPrintEncodeDecode()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-        $stringtoencode='ABCD=1234;';
-        $result=quotedPrintEncode($stringtoencode);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals('ABCD=3D1234;', $result);
+		$stringtoencode='ABCD=1234;';
+		$result=quotedPrintEncode($stringtoencode);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('ABCD=3D1234;', $result);
 
-        $resultback=quotedPrintDecode($result);
-        print __METHOD__." result=".$resultback."\n";
-        $this->assertEquals($stringtoencode, $resultback);
-    }
+		$resultback=quotedPrintDecode($result);
+		print __METHOD__." result=".$resultback."\n";
+		$this->assertEquals($stringtoencode, $resultback);
+	}
 }
diff --git a/test/phpunit/functional/InstallTest.php b/test/phpunit/functional/InstallTest.php
index 7474b66555c..394a8c626b7 100644
--- a/test/phpunit/functional/InstallTest.php
+++ b/test/phpunit/functional/InstallTest.php
@@ -42,11 +42,11 @@ class InstallTest extends PHPUnit_Extensions_Selenium2TestCase
 		)
 	);
 
-    /**
-     * setUpBeforeClass
-     *
-     * @return	void
-     */
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return	void
+	 */
 	public static function setUpBeforeClass()
 	{
 		// Make sure we backup and remove the configuration file to force new install.
@@ -59,22 +59,22 @@ class InstallTest extends PHPUnit_Extensions_Selenium2TestCase
 		self::shareSession(true);
 	}
 
-    /**
-     * dropTestDatabase
-     *
-     * @return	void
-     */
+	/**
+	 * dropTestDatabase
+	 *
+	 * @return	void
+	 */
 	protected static function dropTestDatabase()
 	{
 		$mysqli = new mysqli(self::$db_host, self::$db_admin_user, self::$db_admin_pass);
 		$mysqli->query("DROP DATABASE " . self::$db_name);
 	}
 
-    /**
-     * tearDownAfterClass
-     *
-     * @return	void
-     */
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
 	public static function tearDownAfterClass()
 	{
 		// Remove the generated configuration and restore the backed up file.
@@ -85,11 +85,11 @@ class InstallTest extends PHPUnit_Extensions_Selenium2TestCase
 		self::dropTestDatabase();
 	}
 
-    /**
-     * setUp
-     *
-     * @return  void
-     */
+	/**
+	 * setUp
+	 *
+	 * @return  void
+	 */
 	public function setUp()
 	{
 		// Populating the database can take quite long.
@@ -97,32 +97,32 @@ class InstallTest extends PHPUnit_Extensions_Selenium2TestCase
 		$this->setBrowserUrl(self::$url);
 	}
 
-    /**
-     * testInstallRedirect
-     *
-     * @return  void
-     */
+	/**
+	 * testInstallRedirect
+	 *
+	 * @return  void
+	 */
 	public function testInstallRedirect()
 	{
 		$this->url('/');
 		$this->assertContains('/install/index.php', $this->url());
 	}
 
-    /**
-     * testInstallPageTitle
-     *
-     * @return  void
-     */
+	/**
+	 * testInstallPageTitle
+	 *
+	 * @return  void
+	 */
 	public function testInstallPageTitle()
 	{
 		$this->assertContains('Dolibarr', $this->title());
 	}
 
-    /**
-     * testInstallProcess
-     *
-     * @return  void
-     */
+	/**
+	 * testInstallProcess
+	 *
+	 * @return  void
+	 */
 	public function testInstallProcess()
 	{
 		// FIXME: the button itself should have an ID
@@ -130,11 +130,11 @@ class InstallTest extends PHPUnit_Extensions_Selenium2TestCase
 		$this->assertContains('/install/check.php', $this->url());
 	}
 
-    /**
-     * testCheckPage
-     *
-     * @return  void
-     */
+	/**
+	 * testCheckPage
+	 *
+	 * @return  void
+	 */
 	public function testCheckPage()
 	{
 		$unavailable_choices = $this->byId('navail_choices');
@@ -149,11 +149,11 @@ class InstallTest extends PHPUnit_Extensions_Selenium2TestCase
 		$this->assertContains('/install/fileconf.php', $this->url());
 	}
 
-    /**
-     * testForm
-     *
-     * @return  void
-     */
+	/**
+	 * testForm
+	 *
+	 * @return  void
+	 */
 	public function testForm()
 	{
 		$this->assertFalse($this->byClassName('hideroot')->displayed());
@@ -198,22 +198,22 @@ class InstallTest extends PHPUnit_Extensions_Selenium2TestCase
 		$this->byId('db_pass_root')->value('');
 	}
 
-    /**
-     * testFormSubmit
-     *
-     * @return  void
-     */
+	/**
+	 * testFormSubmit
+	 *
+	 * @return  void
+	 */
 	public function testFormSubmit()
 	{
 		$this->byName('forminstall')->submit();
 		$this->assertContains('/install/step1.php', $this->url());
 	}
 
-    /**
-     * testStep1
-     *
-     * @return  void
-     */
+	/**
+	 * testStep1
+	 *
+	 * @return  void
+	 */
 	public function testStep1()
 	{
 		$this->assertFalse($this->byId('pleasewait')->displayed());
@@ -225,11 +225,11 @@ class InstallTest extends PHPUnit_Extensions_Selenium2TestCase
 		$this->assertContains('/install/step2.php', $this->url());
 	}
 
-    /**
-     * testStep2
-     *
-     * @return  void
-     */
+	/**
+	 * testStep2
+	 *
+	 * @return  void
+	 */
 	public function testStep2()
 	{
 		$this->byName('forminstall')->submit();
@@ -238,11 +238,11 @@ class InstallTest extends PHPUnit_Extensions_Selenium2TestCase
 
 	// There is no step 3
 
-    /**
-     * testStep4
-     *
-     * @return  void
-     */
+	/**
+	 * testStep4
+	 *
+	 * @return  void
+	 */
 	public function testStep4()
 	{
 		// FIXME: should have an ID
@@ -256,11 +256,11 @@ class InstallTest extends PHPUnit_Extensions_Selenium2TestCase
 		$this->assertContains('/install/step5.php', $this->url());
 	}
 
-    /**
-     * testStep5
-     *
-     * @return  void
-     */
+	/**
+	 * testStep5
+	 *
+	 * @return  void
+	 */
 	public function testStep5()
 	{
 		// FIXME: this button should have an ID
@@ -268,11 +268,11 @@ class InstallTest extends PHPUnit_Extensions_Selenium2TestCase
 		$this->assertContains('/admin/index.php', $this->url());
 	}
 
-    /**
-     * testFirstLogin
-     *
-     * @return  void
-     */
+	/**
+	 * testFirstLogin
+	 *
+	 * @return  void
+	 */
 	public function testFirstLogin()
 	{
 		$this->assertEquals('login', $this->byTag('form')->attribute('id'));
diff --git a/test/phpunit/functional/TakePosFunctionalTest.php b/test/phpunit/functional/TakePosFunctionalTest.php
index 597a893c67b..5b9d03dcfef 100644
--- a/test/phpunit/functional/TakePosFunctionalTest.php
+++ b/test/phpunit/functional/TakePosFunctionalTest.php
@@ -44,16 +44,19 @@ class TakePosFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 	// TODO: move to a global configuration file?
 	/** @var string Base URL of the webserver under test */
 	protected static $base_url = 'http://dev.zenfusion.fr';
+
 	/**
 	 * @var string Dolibarr admin username
 	 * @see authenticate
 	 */
 	protected static $dol_admin_user = 'admin';
+
 	/**
 	 * @var string Dolibarr admin password
 	 * @see authenticate
 	 */
 	protected static $dol_admin_pass = 'admin';
+
 	/** @var int Dolibarr module ID */
 	private static $module_id = 500000; // TODO: autodetect?
 
@@ -67,14 +70,14 @@ class TakePosFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 		),
 		// Geckodriver does not keep the session at the moment?!
 		// XPath selectors also don't seem to work
-        //array(
-        //    'browser' => 'Mozilla Firefox on Linux',
-        //    'browserName' => 'firefox',
-        //    'sessionStrategy' => 'shared',
-        //    'desiredCapabilities' => array(
-        //        'marionette' => true
-        //    )
-        //)
+		//array(
+		//    'browser' => 'Mozilla Firefox on Linux',
+		//    'browserName' => 'firefox',
+		//    'sessionStrategy' => 'shared',
+		//    'desiredCapabilities' => array(
+		//        'marionette' => true
+		//    )
+		//)
 	);
 
 	/**